预约执法人员多选

src/views/administrative/appointment.vue

@@ -98,13 +98,22 @@
                         readonly
                         label="执法人员"
                 />
-                <van-field
+                <van-field v-for="(item, index) in data.lawCer" :key="index"
-                        v-model="submitData.lawEnforcerTextTwo"
+                           v-model="item.show"
-                        readonly
                            label="执法人员"
+                           readonly
+                           placeholder="请选择"
                            right-icon="add-o"
-                        @click="showPopup"
+                           @click="showPopup(index)"
                 />
+                <van-button icon="add-o" block="true" square="true" type="default" @click.stop="addLawCer" />
+<!--                <van-field-->
+<!--                        v-model="submitData.lawEnforcerTextTwo"-->
+<!--                        readonly-->
+<!--                        label="执法人员"-->
+<!--                        right-icon="add-o"-->
+<!--                        @click="showPopup"-->
+<!--                />-->
                 <van-field
                         v-model="submitData.remark"
                         label="备注"
@@ -232,6 +241,8 @@
         notifyShow: false,
         notifyContent: "",
         tempDate: null,
+        lawCerFlag: 0,
+        lawCer:[{ text:"", id:"", show:"", num:"" }],
     });
     //保存参数
     const submitData = reactive({
@@ -327,8 +338,11 @@
         console.log('failed', errorInfo);
     };
 
-
+    const addLawCer = () =>{
-    const showPopup = () => {
+        data.lawCer.push({ text:"", id:"", show:"", num:"" });
+    }
+    const showPopup = (flag) => {
+        data.lawCerFlag = flag;
         data.popupVisible = true;
     }
     const closePopup = () => {
@@ -336,10 +350,15 @@
         data.deptChecked = false;
     }
     const reciveVisible = (item) => {
-        submitData.lawEnforcerTwo = item.userName
+        data.lawCer[data.lawCerFlag].id = item.userId;
-        submitData.lawCertificateNumTwo = item.lawCertificateNum;
+        data.lawCer[data.lawCerFlag].text = item.userName;
-        submitData.lawEnforcerTwoId = item.userId;
+        data.lawCer[data.lawCerFlag].num = item.lawCertificateNum;
-        submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo
+        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
     }
 
@@ -405,6 +424,21 @@
         submitData.lawCertificateNum = null;
         submitData.isUnite = 0;
         if (data.checked) { submitData.isUnite = 1; }
+        // 执法人员
+        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 => {
             //跳转企业二维码地址
             if (success.success) {
@@ -424,6 +458,21 @@
         submitData.lawCertificateNum = null;
         submitData.isUnite = 0;
         if (data.checked) { submitData.isUnite = 1; }
+        // 执法人员
+        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);
         editEnterpriseLawEnforcement(submitData, success => {
             //跳转企业二维码地址
             if (success.success) {

src/views/administrative/appointmentEdit.vue

@@ -95,12 +95,21 @@
                         readonly
                         label="执法人员"
                 />
-                <van-field
+                <van-field v-for="(item, index) in data.lawCer" :key="index"
-                        v-model="submitData.lawEnforcerTextTwo"
+                           v-model="item.show"
-                        readonly
                            label="执法人员"
-                        @click="showPopup"
+                           readonly
+                           placeholder="请选择"
+                           right-icon="add-o"
+                           @click="showPopup(index)"
                 />
+                <van-button icon="add-o" block="true" square="true" type="default" @click.stop="addLawCer" />
+<!--                <van-field-->
+<!--                        v-model="submitData.lawEnforcerTextTwo"-->
+<!--                        readonly-->
+<!--                        label="执法人员"-->
+<!--                        @click="showPopup"-->
+<!--                />-->
                 <van-field
                         v-model="submitData.remark"
                         label="备注"
@@ -214,6 +223,8 @@
         deptChecked: false,
         deptContent: '',
         mainDeputyOrder: 1,
+        lawCerFlag: 0,
+        lawCer:[{ text:"", id:"", show:"", num:"" }],
     });
     //保存参数
     const submitData = reactive({
@@ -282,7 +293,8 @@
     };
 
 
-    const showPopup = () =>{
+    const showPopup = (flag) =>{
+        data.lawCerFlag = flag;
         data.popupVisible = true;
     }
     const closePopup = () =>{
@@ -290,10 +302,15 @@
         data.deptChecked = false;
     }
     const reciveVisible = (item) =>{
-        submitData.lawEnforcerTwo = item.userName
+        data.lawCer[data.lawCerFlag].id = item.userId;
-        submitData.lawCertificateNumTwo = item.lawCertificateNum;
+        data.lawCer[data.lawCerFlag].text = item.userName;
-        submitData.lawEnforcerTwoId = item.userId;
+        data.lawCer[data.lawCerFlag].num = item.lawCertificateNum;
-        submitData.lawEnforcerTextTwo = submitData.lawEnforcerTwo +" "+ submitData.lawCertificateNumTwo
+        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
     }
 
@@ -348,9 +365,6 @@
             console.log(success);
             //跳转企业二维码地址
             if(success.success){
-                console.log("==================")
-                console.log(success.data)
-                console.log("==================")
                 data.mainDeputyOrder = success.data.mainDeputyOrder;
                 Object.keys(submitData).forEach((item) => {
                     submitData[item] = success.data[item] ? success.data[item] : "";
@@ -369,6 +383,21 @@
                     submitData.deptTexts += success.data.deptObjs[i].deptName+";";
                     submitData.deptObjs.push({ deptId: success.data.deptObjs[i].deptId, deptName: success.data.deptObjs[i].deptName });
                 }
+                // 执法人员
+                console.log("===========> : ", success.data)
+                submitData.lawEnforcerTwoId = success.data['lawEnforcerTwoId'];
+                submitData.lawEnforcerTwo = success.data['lawEnforcerTwo'];
+                var lawEnforcer2ShowStr = success.data['lawEnforcer2Show'];
+                if ((null != submitData.lawEnforcerTwoId && submitData.lawEnforcerTwoId.length > 0)
+                    && (null != submitData.lawEnforcerTwo && submitData.lawEnforcerTwo.length > 0)) {
+                    var tmpEnforceId = submitData.lawEnforcerTwoId.split(',');
+                    var tmpEnforceText = submitData.lawEnforcerTwo.split(',');
+                    var lawEnforcer2Show = lawEnforcer2ShowStr.split(',');
+                    data.lawCer = [];
+                    for (var i = 0; i < tmpEnforceId.length; i++) {
+                        data.lawCer.push({text: tmpEnforceText[i], id: tmpEnforceId[i], show: lawEnforcer2Show[i]});
+                    }
+                }
                 // showSuccessToast('保存成功');
             }
         },error=>{
@@ -385,6 +414,21 @@
             submitData.deptTexts = "";
             submitData.deptObjs = [];
         }
+        // 执法人员
+        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 =>{
             //跳转企业二维码地址
             if(success.success){
@@ -408,6 +452,21 @@
             submitData.deptTexts = "";
             submitData.deptObjs = [];
         }
+        // 执法人员
+        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);
         if(data.mainDeputyOrder == 0) {
             editEnterpriseLawEnforcementDeputyOrder(submitData,success =>{
                 //跳转企业二维码地址
@@ -437,6 +496,10 @@
         }
     }
 
+    const addLawCer = () =>{
+        data.lawCer.push({ text:"", id:"", show:"", num:"" });
+    }
+
     const getLinkageByValueAndParentId = (value, parentId) => {
         // 查询检查要求字典信息
         queryLinkageDictByValueAndParentId({"value":value, "parentId": parentId}, success => {

src/views/enforce/sign.vue

@@ -398,7 +398,7 @@ onMounted(() =>{
             submitData.lawEnforcerId = success.data.userId
             submitData.lawEnforcement = success.data.dept.deptName;
             submitData.lawEnforcementId = success.data.dept.deptId;
-            // submitData.bureauDeptName = success.data.dept.deptName;
+            submitData.bureauDeptName = success.data.dept.deptName;
         }
     },error=>{
 

src/views/enterprise/complaintDetailView.vue

@@ -72,15 +72,20 @@
                   />
                   <van-divider class="divdsty"/>
                   <div class="file-upload">
-                      <div class="file-upload-center">
+                      <van-image v-for="(item, index) in submitData.fileList" :key="index"
-                          <label>上传附件</label> <span>(不多于9张)</span>
+                              width="100"
-                      </div>
+                              height="100"
-                      <van-uploader v-model="submitData.fileListObj" class="file" multiple max-count="9"
+                              :src="item.url"
-                                    :after-read="uploadFiles" :before-delete="deleteFile">
+                      />
-                          <template #preview-cover="{ file }">
+<!--                      <div class="file-upload-center">-->
-                              <div class="preview-cover van-ellipsis">{{ file.name }}</div>
+<!--                          <label>上传附件</label> <span>(不多于9张)</span>-->
-                          </template>
+<!--                      </div>-->
-                      </van-uploader>
+<!--                      <van-uploader v-model="submitData.fileListObj" class="file" multiple max-count="9"-->
+<!--                                    :after-read="uploadFiles" :before-delete="deleteFile">-->
+<!--                          <template #preview-cover="{ file }">-->
+<!--                              <div class="preview-cover van-ellipsis">{{ file.name }}</div>-->
+<!--                          </template>-->
+<!--                      </van-uploader>-->
 
                   </div>
                   <van-divider class="divdsty"/>
@@ -264,15 +269,11 @@
       return true;
   }
   onMounted(() => {
-      console.log("================")
-      console.log(submitData.userId);
-      console.log("================")
       submitData.relId = route?.query?.id;
       submitData.lawEnforcementIncidentText = route?.query?.lawEnforcementItemText;
       data.isSelect = route?.query?.isSelect;
       submitData.comOrOpi = route?.query?.comOrOpi;
       complaintInfoById({id:route?.query?.id},success =>{
-        console.log(success.data);
         submitData.problemDescription = success.data.problemDescription;
         submitData.enterpriseAddress = success.data.enterpriseAddress;
         submitData.linkman = success.data.linkman;
@@ -287,8 +288,16 @@
                 deptCode: success.data.params.res.handleOrgCode,
                 evaluatorName: success.data.params.res.replyDetails,
                 evaluatorPapersPhone: success.data.linkmanTel,
-                // backUrl: "http://jdm.szssfj.cn/enterprise",  // 正式环境用这个
+                backUrl: "http://jdm.szssfj.cn/enterprise",  // 正式环境用这个
-                backUrl: "http://192.168.31.196:3301/",
+                // backUrl: "http://192.168.31.196:3301/",
+            }
+        }
+
+        if (null!=success.data.params.file && success.data.params.file.length > 0) {
+            for (var i=0; i<success.data.params.file.length; i++) {
+                console.log("===> ", success.data.params.file[i].uploadPath)
+                // submitData.fileList.push({"url": "http://127.0.0.1:85/"+success.data.params.file[i].uploadPath})
+                submitData.fileList.push({"url": "http://10.132.108.3:85/"+success.data.params.file[i].uploadPath})
             }
         }
 

src/views/enterprise/registrationDetail.vue

@@ -80,8 +80,7 @@
                       rows="2"
                       autosize
                       type="textarea"
-                      maxlength=""
+                      maxlength="50"
-                      placeholder=""
                       show-word-limit
                       readonly
                     />