Browse Source

bug修改

v3
蟑螂恶霸 2 years ago
parent
commit
01a67138ff
  1. 1
      src/views/enforce/sign.vue
  2. 66
      src/views/enterprise/registrationDetail.vue
  3. 17
      src/views/enterprise/registrationEdit.vue
  4. 2
      src/views/enterprise/registrationList.vue

1
src/views/enforce/sign.vue

@ -148,6 +148,7 @@
</van-cell>
<div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
<p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span>
</p>

66
src/views/enterprise/registrationDetail.vue

@ -22,7 +22,7 @@
<van-divider class="divdsty" />
<van-cell-group>
<div class="zf-name">执法信息</div>
<div class="zf-name">执法信息<span class="joint-mark">联</span></div>
<van-field
v-model="submitData.lawEnforcement"
label="执法部门"
@ -41,6 +41,15 @@
readonly
/>
</div>
<van-divider class="divdsty" />
<div class="add-inspect">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
<p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span>
</p>
</div>
<!--
<van-field v-for="(item, index) in data.lawCer" :key="index"
v-model="item.show"
@ -243,6 +252,12 @@ const submitData = reactive({
authorization:0,
lawFieldText:"",
checkCategoryText:"",
deptTexts: "",
deptObjs: [],
userObjs: [],
isUnite: 0,
isSubmit: 0,
uniteCheck:"",
})
const tapGood = () => {
@ -368,6 +383,22 @@ onMounted(() =>{
}
}
// 是否联合执法
if (success.data.userObjs.length > 1) {
data.checked = true;
}
// submitData.deptTexts = "";
// submitData.deptObjs = [];
// for (var i=0; i<success.data.deptObjs.length; i++) {
// submitData.deptTexts += success.data.deptObjs[i].deptName+";";
// submitData.deptObjs.push({ deptId: success.data.deptObjs[i].deptId, deptName: success.data.deptObjs[i].deptName });
// }
submitData.userObjs = [];
console.log("success.data.userObjs : ", success.data.userObjs);
for (var i=0; i<success.data.userObjs.length; i++) {
submitData.userObjs.push({ strUserId: success.data.userObjs[i].strUserId, userName: success.data.userObjs[i].userName, deptId: success.data.userObjs[i].deptId, deptName: success.data.userObjs[i].deptName });
}
// 执法人员
submitData.lawEnforcerIdTwo = success.data.lawEnforcerIdTwo;
submitData.lawEnforcerTwo = success.data.lawEnforcerTwo;
@ -385,7 +416,7 @@ onMounted(() =>{
// setLinkageItem(submitData.lawEnforcementItem);
// setLinkageGA(submitData.lawEnforcementBasis);
},error=>{
})
@ -393,12 +424,31 @@ onMounted(() =>{
setAttr();
})
// 返回
const goBack = () => {
router.go(-1);
};
const checkUnite = () => {
if (data.checked) {
data.deptChecked=true;
} else {
data.deptChecked=false;
}
}
const reciveDept = (item) => {
submitData.deptTexts = "";
submitData.deptObjs = [];
submitData.userObjs = [];
for (var i=0; i<item.length; i++) {
submitData.deptTexts += item[i].deptName+";";
submitData.deptObjs.push({deptId: item[i].deptId, deptName: item[i].deptName });
submitData.userObjs.push({strUserId: item[i].userId, userName: item[i].userName, deptId: item[i].deptId, deptName: item[i].deptName });
}
}
const uploadFiles = (file) =>{
uploadFile(file,(res) =>{
@ -652,4 +702,16 @@ const reciveData2 = (item) =>{
padding-bottom: 0.27rem;
}
.joint-mark {
display: inline-block;
margin: 0 0.25rem;
width: 0.5rem;
height: 0.5rem;
background: #2d94fa;
border-radius: 50%;
color: #fff;
font-size: 0.3rem;
line-height: 1.75;
text-align: center;
}
</style>

17
src/views/enterprise/registrationEdit.vue

@ -232,6 +232,7 @@
</van-cell>
<div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
<p v-for="(item, index) in submitData.userObjs" :key="index">
<span class="add-dept">{{item.deptName}}</span><span class="add-name">{{item.userName}}</span>
</p>
@ -685,6 +686,22 @@
submitData.lawEnforcementBasis = submitData.lawEnforcementBasis.substring(0, submitData.lawEnforcementBasis.length - 1);
submitData.lawEnforcementBasisText = submitData.lawEnforcementBasisText.substring(0, submitData.lawEnforcementBasisText.length - 1);
// 是否联合执法
if (success.data.userObjs.length > 1) {
data.checked = true;
}
// submitData.deptTexts = "";
// submitData.deptObjs = [];
// for (var i=0; i<success.data.deptObjs.length; i++) {
// submitData.deptTexts += success.data.deptObjs[i].deptName+";";
// submitData.deptObjs.push({ deptId: success.data.deptObjs[i].deptId, deptName: success.data.deptObjs[i].deptName });
// }
submitData.userObjs = [];
console.log("success.data.userObjs : ", success.data.userObjs);
for (var i=0; i<success.data.userObjs.length; i++) {
submitData.userObjs.push({ strUserId: success.data.userObjs[i].strUserId, userName: success.data.userObjs[i].userName, deptId: success.data.userObjs[i].deptId, deptName: success.data.userObjs[i].deptName });
}
// 执法人员
submitData.lawEnforcerIdTwo = "";
submitData.lawEnforcerTwo = "";

2
src/views/enterprise/registrationList.vue

@ -76,7 +76,7 @@
<p>检查时间:{{ item.createTime }}</p>
<div class="act-btn">
<span class="card_box_action"></span>
<span v-if="null != item.enforce" class="joint-mark">联</span>
<span class="joint-mark">联</span>
</div>
</div>

Loading…
Cancel
Save