Merge remote-tracking branch 'origin/v2' into v2

src/api/enterprise.js

@@ -17,6 +17,8 @@ export const addEnterpriseComplaint = (params, success, error) => _post("/app/co
 export const getEnterpriseComplaintById = (id, success, error) => _get("/app/code/complaint/getById/"+id,null,success,error)
 //查询投诉工单详情
 export const complaintInfoById = (params, success, error) => _get("/app/code/complaint/queryById",params,success,error)
+//工单办结
+export const mssqQueryEndInfo = (params, success, error) => _get("/app/code/complaint/mssqQueryEndInfo",params,success,error)
 // 诉求工单评价页面
 export const toMssqAppraise = (params, success, error) => _post("/app/code/complaint/mssqAppraise",params,success,error)
 

src/config/env.js

@@ -1,8 +1,8 @@
 //本地环境
 // let baseUrl="http://139.186.135.156:86";
 // let baseUrl="http://10.132.108.1:85";
-let baseUrl="http://jdm.szssfj.cn/jdmApi";
+// let baseUrl="http://jdm.szssfj.cn/jdmApi";
-// let baseUrl="http://127.0.0.1:85";
+let baseUrl="http://127.0.0.1:85";
 // let wsUrl='ws://10.76.108.1:9326';
 export {
     baseUrl,

src/views/enforce/sign.vue

@@ -32,16 +32,15 @@
                       required
                       :rules="[{ required: true, message: '请加载执法人员' }]"
                     />
-                    <van-field
+                    <van-field v-for="(item, index) in data.lawCer" :key="index"
-                      v-model="submitData.lawCertificateNumTwoText"
+                      v-model="item.show"
                       label="执法人员"
                       readonly
-                      required
                       placeholder="请选择"
                       right-icon="add-o"
-                      @click="showPopup"
+                      @click="showPopup(index)"
-                      :rules="[{ required: true, message: '请选择执法人员' }]"
                     />
+                    <van-button icon="add-o" block="true" square="true" type="default" @click.stop="addLawCer" />
                     <!-- <van-field
                       v-model="submitData.subsidiaryerText"
                       label="辅助人员"
@@ -267,6 +266,10 @@ const data = reactive({
     isNoScan: false,
     lawChecked: false,
     lawContent: "",
+    lawCliekFlag: 0,
+    lawList: [{ text:"", id:"" }],
+    lawCerFlag: 0,
+    lawCer:[{ text:"", id:"" }],
 });
 var fileSize = 0;
 //保存参数
@@ -388,12 +391,14 @@ onMounted(() =>{
     //查询执法部门信息
     queryUserInfo(useCommon.userId,success =>{
         if (null != success.data) {
+            console.log("-=-=-=-=> : ", success.data);
             submitData.lawEnforcer = success.data.userName
             submitData.lawCertificateNumText = success.data.userName + " " + success.data.lawCertificateNum
             // submitData.lawCertificateNumText = success.data.userName
             submitData.lawEnforcerId = success.data.userId
             submitData.lawEnforcement = success.data.dept.deptName;
             submitData.lawEnforcementId = success.data.dept.deptId;
+            // submitData.bureauDeptName = success.data.dept.deptName;
         }
     },error=>{
 
@@ -467,7 +472,6 @@ const gaCancel = () => {
 const dataFillIn = () => {
     // getRegByUserIdAndZero(useCommon.userId,success =>{
     getByUserIdAndEnterpriseNumber(useCommon.userId, submitData.enterpriseNumber,success =>{
-        console.log("========> : ", success);
         //跳转企业二维码地址
         if(success.success){
             Object.keys(submitData).forEach((item) => {
@@ -480,16 +484,35 @@ const dataFillIn = () => {
             // submitData.lawCertificateNumText =success.data['lawEnforcer'];
             submitData.lawCertificateNumTwoText =success.data['lawEnforcerTwo'];
             submitData.subsidiaryerText =success.data['subsidiaryer'];
+
+            // 执法依据
             submitData.lawEnforcementBasis = success.data['lawEnforcementBasis'];
             submitData.lawEnforcementBasisText = success.data['lawEnforcementBasisText'];
+            if ((null != submitData.lawEnforcementBasis && submitData.lawEnforcementBasis.length > 0)
+                && (null != submitData.lawEnforcementBasisText && submitData.lawEnforcementBasisText.length > 0)) {
                 var tmpBasis = submitData.lawEnforcementBasis.split(',');
                 var tmpBasisText = submitData.lawEnforcementBasisText.split(',');
                 data.lawList = [];
                 for (var i = 0; i < tmpBasis.length; i++) {
-                data.lawList.push({
+                    data.lawList.push({text: tmpBasisText[i], id: tmpBasis[i]});
-                    index: i, text:tmpBasisText[i], id:tmpBasis[i]
+                }
-                });
             }
+
+            // 执法人员
+            submitData.lawEnforcerIdTwo = success.data['lawEnforcerIdTwo'];
+            submitData.lawEnforcerTwo = success.data['lawEnforcerTwo'];
+            var lawEnforcer2ShowStr = success.data['lawEnforcer2Show'];
+            if ((null != submitData.lawEnforcerIdTwo && submitData.lawEnforcerIdTwo.length > 0)
+                && (null != submitData.lawEnforcerTwo && submitData.lawEnforcerTwo.length > 0)) {
+                var tmpEnforceId = submitData.lawEnforcerIdTwo.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]});
+                }
+            }
+
             if(success.data['reslut']==0) {
                 tapGood();
             } else {
@@ -507,6 +530,8 @@ const dataFillIn = () => {
 const tmpSave = () => {
     showSuccessToast('临时保存');
     submitData.userId = useCommon.userId;
+
+    // 执法依据
     submitData.lawEnforcementBasis = "";
     submitData.lawEnforcementBasisText = "";
     for (var i=0; i<data.lawList.length; i++) {
@@ -515,6 +540,16 @@ const tmpSave = () => {
     }
     submitData.lawEnforcementBasis = submitData.lawEnforcementBasis.substring(0, submitData.lawEnforcementBasis.length - 1);
     submitData.lawEnforcementBasisText = submitData.lawEnforcementBasisText.substring(0, submitData.lawEnforcementBasisText.length - 1);
+
+    // 执法人员
+    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 =>{
         //跳转企业二维码地址
         if(success.success){
@@ -529,6 +564,8 @@ const tmpSave = () => {
 const submit = (type) =>{
     submitData.isSubmit = type;
     submitData.userId = useCommon.userId;
+
+    // 执法依据
     submitData.lawEnforcementBasis = "";
     submitData.lawEnforcementBasisText = "";
     for (var i=0; i<data.lawList.length; i++) {
@@ -537,6 +574,17 @@ const submit = (type) =>{
     }
     submitData.lawEnforcementBasis = submitData.lawEnforcementBasis.substring(0, submitData.lawEnforcementBasis.length - 1);
     submitData.lawEnforcementBasisText = submitData.lawEnforcementBasisText.substring(0, submitData.lawEnforcementBasisText.length - 1);
+
+    // 执法人员
+    submitData.lawEnforcerTwo = "";
+    submitData.lawEnforcerIdTwo = "";
+    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);
+
     form.value.validate().then(() => {
         editEnforcementRegistration(submitData, success => {
             //跳转首页
@@ -550,7 +598,8 @@ const submit = (type) =>{
     });
 }
 
-const showPopup = () =>{
+const showPopup = (flag) =>{
+    data.lawCerFlag = flag;
     data.popupVisible = true;
 }
 const showPopup2 = () =>{
@@ -561,7 +610,10 @@ const showPopupqz = (flag) =>{
     data.popupVisibleqz = true;
 }
 const addField = () =>{
-    data.lawList.push({ text:"", id:"" });
+    data.lawList.push({ text:"", id:"", "show":"" });
+}
+const addLawCer = () =>{
+    data.lawCer.push({ text:"", id:"" });
 }
 const closePopup = () =>{
     data.popupVisible = false;
@@ -570,10 +622,13 @@ const closePopup = () =>{
     data.lawChecked = false;
 }
 const reciveData = (item) =>{
-    submitData.lawEnforcerTwo = item.userName;
+    data.lawCer[data.lawCerFlag].id = item.userId;
-    submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
+    data.lawCer[data.lawCerFlag].text = item.userName;
-    // submitData.lawCertificateNumTwoText = item.userName;
+    data.lawCer[data.lawCerFlag].show = item.userName + " " + item.lawCertificateNum;
-    submitData.lawEnforcerIdTwo = item.userId;
+
+    // submitData.lawEnforcerTwo = item.userName;
+    // submitData.lawCertificateNumTwoText = item.userName + " " + item.lawCertificateNum
+    // submitData.lawEnforcerIdTwo = item.userId;
 }
 const reciveData2 = (item) =>{
     submitData.subsidiaryer = item.userName;

src/views/enterprise/complaintDetailView.vue

@@ -93,7 +93,6 @@
                           type="textarea"
                           placeholder="请填写详细地址"
                           readonly
-                          :rules="[{ required: true, message: '请填写详细地址' }]"
                           show-word-limit
                   />
                   <van-divider class="divdsty"/>
@@ -123,9 +122,9 @@
                       <span class="accept-item">注：选择“同意”，处置部门将通过登记的联系人、联系电话与您联系，并对您的个人信息严格保密。</span>
                   </div>
               </van-cell-group>
-              <!-- <van-action-bar>
+              <van-action-bar v-if="data.isMssq">
-                  <van-button round block type="info" native-type="submit">提交</van-button>
+                  <van-button round block type="info" @click="mssq">评价</van-button>
-              </van-action-bar> -->
+              </van-action-bar>
           </van-form>
       </div>
   </div>
@@ -134,7 +133,7 @@
 <script setup name="register">
 
   import {showSuccessToast, showLoadingToast, closeToast, Toast} from 'vant';
-  import {addEnterpriseComplaint,complaintInfoById} from '../../api/enterprise'
+  import {addEnterpriseComplaint, complaintInfoById, mssqQueryEndInfo, toMssqAppraise} from '../../api/enterprise'
   import {getDict} from '../../api/Home'
   import {uploadFile} from '../../util/fileUpload'
   import {reactive, ref} from "vue";
@@ -153,6 +152,8 @@
       isSelect: true,
       isCheckedon: true,
       isCheckedoff: false,
+      isMssq: false,
+      mssqParams: {},
   });
   //保存参数
   const submitData = reactive({
@@ -276,6 +277,21 @@
         submitData.enterpriseAddress = success.data.enterpriseAddress;
         submitData.linkman = success.data.linkman;
         submitData.linkmanTel = success.data.linkmanTel;
+
+        if ("0"!=success.data.params.res) {
+            data.isMssq = true;
+            data.mssqParams = {
+                assessServiceCode: success.data.params.res.proWoCode,
+                assessObjectName: success.data.params.res.handleOrgName,
+                assessObjectCode: success.data.params.res.proWoCode,
+                deptCode: success.data.params.res.handleOrgCode,
+                evaluatorName: success.data.params.res.replyDetails,
+                evaluatorPapersPhone: success.data.linkmanTel,
+                // backUrl: "http://jdm.szssfj.cn/enterprise",  // 正式环境用这个
+                backUrl: "http://192.168.31.196:3301/",
+            }
+        }
+
         if (success.data.authorization == 0) {
           data.isCheckedon = false;
           data.isCheckedoff = true;
@@ -285,6 +301,11 @@
       }
       },error =>{})
   });
+  const queryEndInfo = (proWoCode) => {
+      mssqQueryEndInfo({"proWoCode":proWoCode},success =>{
+          console.log("====> : ", success.data);
+      },error =>{})
+  }
   const toNoScanView = () => {
       router.push({
           path: "/enterprise/complaintNoScan"
@@ -340,6 +361,22 @@
           });
   }
 
+  const mssq = () => {
+      // let params = {
+      //     assessServiceCode: "672407221630025057401",
+      //     assessObjectName: "深圳市卫生健康委员会",
+      //     assessObjectCode: "672407221630025057401",
+      //     deptCode: "152076",
+      //     evaluatorName: "测试",
+      //     evaluatorPapersPhone: "18520089969",
+      //     // backUrl: "http://jdm.szssfj.cn/enterprise",  // 正式环境用这个
+      //     backUrl: "http://192.168.31.196:3301/",
+      // }
+      toMssqAppraise(data.mssqParams, success => {
+          window.location.href = success.data;
+      });
+  }
+
 </script>
 <script>
   //案件筛选弹窗

src/views/enterprise/enterpriseInspectionDetail.vue

@@ -35,22 +35,46 @@
               label="检查时间"
 
             />
+
             <van-field
                     v-model="submitData.checkItem"
                     label="检查事项"
-              type="textarea"
+                    rows="2"
-              rows="1"
                     autosize
                     readonly
+                    type="textarea"
+                    maxlength="50"
+                    placeholder="请输入检查事项"
+                    show-word-limit
             />
             <van-field
                     v-model="submitData.checkRequire"
                     label="检查要求"
-              type="textarea"
+                    rows="2"
-              rows="1"
                     autosize
                     readonly
+                    type="textarea"
+                    maxlength="50"
+                    placeholder="请输入检查要求"
+                    show-word-limit
             />
+
+<!--            <van-field-->
+<!--              v-model="submitData.checkItem"-->
+<!--              label="检查事项"-->
+<!--              type="textarea"-->
+<!--              rows="1"-->
+<!--              autosize-->
+<!--              readonly-->
+<!--            />-->
+<!--            <van-field-->
+<!--              v-model="submitData.checkRequire"-->
+<!--              label="检查要求"-->
+<!--              type="textarea"-->
+<!--              rows="1"-->
+<!--              autosize-->
+<!--              readonly-->
+<!--            />-->
             <van-field
                 v-if="!data.isEnterprise"
                 v-model="submitData.lawEnforcement"

src/views/enterprise/registrationDetail.vue

@@ -20,8 +20,8 @@
                       label="执法人员"
                       readonly
                     />
-                    <van-field
+                    <van-field v-for="(item, index) in data.lawCer" :key="index"
-                      v-model="submitData.lawEnforcerTwo"
+                      v-model="item.show"
                       label="执法人员"
                       readonly
                       @click="showPopup"
@@ -42,20 +42,18 @@
                     </view>
                     <van-field
                       v-model="submitData.lawEnforcementItemText"
-                      required
                       label="检查事项"
-                      :rules="[{ required: true, message: '必填项' }]"
+                      rows="2"
-                      placeholder="检查事项"
+                      autosize
                       readonly
                       type="textarea"
-                      rows="1"
+                      maxlength="50"
-                      autosize
+                      placeholder="请输入检查事项"
+                      show-word-limit
                     />
-                    <van-field
+                    <van-field v-for="(item, index) in data.lawList" :key="index"
-                      v-model="submitData.lawEnforcementBasisText"
+                      v-model="item.text"
-                      required
                       label="检查依据"
-                      :rules="[{ required: true, message: '必填项' }]"
                       placeholder="检查依据"
                       readonly
                       type="textarea"
@@ -170,6 +168,8 @@ const data = reactive({
     popupVisible2: false,
     popupContent2: '',
     imgstr: "",
+    lawList: [{ text:"", id:"" }],
+    lawCer:[{ text:"", id:"" }],
 });
 //保存参数
 const submitData = reactive({
@@ -265,9 +265,9 @@ onMounted(() =>{
         submitData.lawEnforcementId = success.data.lawEnforcementId;
         submitData.lawEnforcementItem = success.data.lawEnforcementItem;
         submitData.lawEnforcementItemText = success.data.lawEnforcementItemText;
-        submitData.lawEnforcementBasis = success.data.lawEnforcementBasis;
+        // submitData.lawEnforcementBasis = success.data.lawEnforcementBasis;
-        submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText;
+        // submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText;
-        submitData.lawEnforcerIdTwo = success.data.lawEnforcerIdTwo;
+        // submitData.lawEnforcerIdTwo = success.data.lawEnforcerIdTwo;
         submitData.lawEnforcer = success.data.lawEnforcer;
         submitData.remark = success.data.remark;
         submitData.enforce = success.data.enforce;
@@ -279,6 +279,34 @@ onMounted(() =>{
           data.bad = "#7FFFD4";
         }
 
+        // 执法依据
+        submitData.lawEnforcementBasis = success.data.lawEnforcementBasis;
+        submitData.lawEnforcementBasisText = success.data.lawEnforcementBasisText;
+        if ((null != submitData.lawEnforcementBasis && submitData.lawEnforcementBasis.length > 0)
+            && (null != submitData.lawEnforcementBasisText && submitData.lawEnforcementBasisText.length > 0)) {
+            var tmpBasis = submitData.lawEnforcementBasis.split(',');
+            var tmpBasisText = submitData.lawEnforcementBasisText.split(',');
+            data.lawList = [];
+            for (var i = 0; i < tmpBasis.length; i++) {
+                data.lawList.push({text: tmpBasisText[i], id: tmpBasis[i]});
+            }
+        }
+
+        // 执法人员
+        submitData.lawEnforcerIdTwo = success.data.lawEnforcerIdTwo;
+        submitData.lawEnforcerTwo = success.data.lawEnforcerTwo;
+        var lawEnforcer2ShowStr = success.data.lawEnforcer2Show;
+        if ((null != submitData.lawEnforcerIdTwo && submitData.lawEnforcerIdTwo.length > 0)
+            && (null != submitData.lawEnforcerTwo && submitData.lawEnforcerTwo.length > 0)) {
+            var tmpEnforceId = submitData.lawEnforcerIdTwo.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]});
+            }
+        }
+
         // setLinkageItem(submitData.lawEnforcementItem);
         // setLinkageGA(submitData.lawEnforcementBasis);
     },error=>{