chenrui
/
zdxtLawEnforcementCodeView
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug修改

v3
蟑螂恶霸 2 years ago
parent
01a67138ff
commit
65cbdf0af8
6 changed files with 76 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/administrative/appointment.vue
  2. 2
      src/views/administrative/appointmentDetail.vue
  3. 2
      src/views/administrative/appointmentEdit.vue
  4. 2
      src/views/enforce/sign.vue
  5. 33
      src/views/enterprise/registrationDetail.vue
  6. 70
      src/views/enterprise/registrationEdit.vue

2
src/views/administrative/appointment.vue
View File

@ -202,7 +202,7 @@
<!-- @click="data.deptChecked=true"-->
<!-- />-->
<div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
<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>

2
src/views/administrative/appointmentDetail.vue
View File

@ -100,7 +100,7 @@
<van-divider class="divdsty" />
<div class="add-inspect">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
<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>

2
src/views/administrative/appointmentEdit.vue
View File

@ -165,7 +165,7 @@
<!-- @click="selectDepts"-->
<!-- />-->
<div class="add-inspect" v-if="data.checked || submitData.isSubmit == 1">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
<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>

2
src/views/enforce/sign.vue
View File

@ -148,7 +148,7 @@
</van-cell>
<div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
<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>

33
src/views/enterprise/registrationDetail.vue
View File

@ -45,7 +45,7 @@
<van-divider class="divdsty" />
<div class="add-inspect">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
<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>
@ -205,7 +205,7 @@ const data = reactive({
popupContent2: '',
imgstr: "",
lawList: [{ text:"", id:"" }],
lawCer:[{ text:"", id:"" }],
lawCer:[{ text:"", id:"", show:"", num:"" }],
imageList:[],
show: ref(false)
});
@ -258,6 +258,22 @@ const submitData = reactive({
isUnite: 0,
isSubmit: 0,
uniteCheck:"",
/** 执法部门 */
lawEnforcement:"",
/** 执法部门ID */
lawEnforcementId:"",
/** 执法人员 */
lawEnforcer:"",
lawCertificateNum:"",
lawEnforcerText: "",
/** 执法人员ID */
lawEnforcerId:"",
/** 执法人员2 */
lawEnforcerTwo:"",
lawCertificateNumTwo:"",
lawEnforcerTextTwo: "",
/** 执法人员2ID */
lawEnforcerTwoId:"",
})
const tapGood = () => {
@ -431,6 +447,19 @@ const goBack = () => {
router.go(-1);
};
const reciveVisible = (item) =>{
data.lawCer[data.lawCerFlag].id = item.userId;
data.lawCer[data.lawCerFlag].text = item.userName;
data.lawCer[data.lawCerFlag].num = item.lawCertificateNum;
data.lawCer[data.lawCerFlag].show = item.userName + " " + item.lawCertificateNum;
// submitData.lawEnforcerTwo = item.userName
// submitData.lawCertificateNumTwo = item.lawCertificateNum;
// submitData.lawEnforcerTwoId = item.userId;
// submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo
// submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo
}
const checkUnite = () => {
if (data.checked) {
data.deptChecked=true;

70
src/views/enterprise/registrationEdit.vue
View File

@ -232,7 +232,7 @@
</van-cell>
<div class="add-inspect" v-if="data.checked">
<p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
<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>
@ -665,7 +665,7 @@
// status: 'done', // 图片状态，'uploading'、'done'或者'failed'
// }
// )
}
},error=>{
console.log("保存失败")
@ -676,6 +676,27 @@
showSuccessToast('临时保存');
submitData.userId = useCommon.userId;
if (submitData.lawCertificateNumText.length <= 0
|| submitData.bureauDeptName.length <= 0
// || submitData.lawFieldText.length <= 0
|| submitData.checkCategoryText.length <= 0
|| data.lawCer[0].id.length <= 0) {
return null;
}
data.overlayShow = true; // 遮罩层
submitData.userId = useCommon.userId;
submitData.isUnite = 0;
if (data.checked) { submitData.isUnite = 1; }
//联合检查
// 处理回显附件
for (var k = 0; k < data.fileListObj.length; k++) {
var url = data.fileListObj[k].url;
if (null != url) {
submitData.fileList.push(url);
}
}
// 执法依据
submitData.lawEnforcementBasis = "";
submitData.lawEnforcementBasisText = "";
@ -686,36 +707,27 @@
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 = "";
for (var i=0; i<data.lawCer.length; i++) {
submitData.lawEnforcerIdTwo += data.lawCer[i].id +",";
submitData.lawEnforcerTwo += data.lawCer[i].text +",";
}
submitData.lawEnforcerIdTwo = submitData.lawEnforcerIdTwo.substring(0, submitData.lawEnforcerIdTwo.length - 1);
submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
addEnforcementRegistration(submitData,success =>{
// 执法人员
submitData.lawEnforcerTwoId = "";
submitData.lawEnforcerTwo = "";
submitData.lawCertificateNum = "";
submitData.lawEnforcerTextTwo = "";
for (var i=0; i<data.lawCer.length; i++) {
submitData.lawEnforcerTwoId += data.lawCer[i].id +",";
submitData.lawEnforcerTwo += data.lawCer[i].text +",";
submitData.lawCertificateNum += data.lawCer[i].num +",";
submitData.lawEnforcerTextTwo += data.lawCer[i].show +",";
}
submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1);
submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
submitData.lawEnforcerTextTwo = submitData.lawEnforcerTextTwo.substring(0, submitData.lawEnforcerTextTwo.length - 1);
addEnterpriseLawEnforcement(submitData,success =>{
data.overlayShow = false; // 遮罩层
//跳转企业二维码地址
if(success.success){
showSuccessToast('保存成功');
router.push({ path: "/enforceHome" });
router.push({ path: "/historyCheck" });
}
},error=>{
console.log("保存失败")

Write Preview
Loading…
Cancel
Save