From 26953c067f9a4fb57c7fae239242f64e38018194 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Thu, 29 Aug 2024 15:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E4=BC=81=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BC=81=E4=B8=9A=E7=94=BB=E5=83=8F=E8=90=A5=E4=B8=9A?=
 =?UTF-8?q?=E6=9C=9F=E9=99=90=20=E6=8A=95=E8=AF=89=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enforce/enterpriseBaseInfo.vue      |  12 +-
 src/views/enforce/evaluate.vue                |   2 +-
 src/views/enforce/lawFilter.vue               |  21 ++-
 src/views/enforce/sign.vue                    |   3 +-
 .../enterprise/compaint/compaintBase.vue      |   2 +-
 src/views/enterprise/complaintDetail.vue      |   4 +-
 src/views/enterprise/complaintDetailView.vue  |  41 ++++-
 src/views/enterprise/complaintNoScan.vue      | 149 ++++++++++++------
 8 files changed, 162 insertions(+), 72 deletions(-)

diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index 37f844a..ac7a94f 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -299,9 +299,17 @@
                 data.enterpriseInfo.registeredCapital = amount + ' (万元人民币)'
                 // data.enterpriseInfo.operatingTerm = success.data.operatingTerm
                 var tmpoperatingTerm = success.data.operatingTerm;
-                if (tmpoperatingTerm.indexOf('null') >= 0) {
-                    tmpoperatingTerm = tmpoperatingTerm.substring(0, tmpoperatingTerm.indexOf('null')) + " 无固定期限";
+                var tmpoperatingTermEnd = success.data.operatingTermEnd;
+                debugger
+                if(tmpoperatingTermEnd == null || tmpoperatingTermEnd == "undefined"){
+                  tmpoperatingTerm = tmpoperatingTerm + " 至 " + "无固定期限";
+                }else{
+                  tmpoperatingTerm = tmpoperatingTerm + " 至 " + tmpoperatingTermEnd;
                 }
+                // if (tmpoperatingTerm.indexOf('null') >= 0) {
+                //     tmpoperatingTerm = tmpoperatingTerm.substring(0, tmpoperatingTerm.indexOf('null')) + " 无固定期限";
+                // }
+
                 data.enterpriseInfo.operatingTerm = tmpoperatingTerm;
                 data.enterpriseInfo.businessScope = success.data.businessScope
                 data.enterpriseInfo.establishmentTime = format(success.data.establishmentTime, 'yyyy-MM-dd');
diff --git a/src/views/enforce/evaluate.vue b/src/views/enforce/evaluate.vue
index be68f07..71fa77c 100644
--- a/src/views/enforce/evaluate.vue
+++ b/src/views/enforce/evaluate.vue
@@ -22,7 +22,7 @@
                       autosize
                       label="评价｜建议"
                       type="textarea"
-                      maxlength="300"
+                      maxlength="100"
                       placeholder="请输入评价｜意见建议"
                       required
                       :rules="[{ required: true, message: '请输入评价｜意见建议' }]"
diff --git a/src/views/enforce/lawFilter.vue b/src/views/enforce/lawFilter.vue
index db15254..5639f52 100644
--- a/src/views/enforce/lawFilter.vue
+++ b/src/views/enforce/lawFilter.vue
@@ -20,8 +20,8 @@
                     <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
                         <div class="case-item" v-for="(item, index) in dataList" :key="index" >
                           <span class="selectButton" @click="selectData(item)">一键关联</span>
-                        <div class="case-title">{{ item.checkItemText }}</div>
-                        <div class="case-time">检查时间：{{ item.checkTime }}</div>
+                        <div class="case-title">执法事项：{{ item.checkItemText }}</div>
+                        <div class="case-time">执法时间：{{ item.checkTime }}</div>
 
                     </div>
                     </van-list>
@@ -33,9 +33,8 @@
 </template>
 
 <script setup>
-    import {ref,defineEmits,getCurrentInstance } from 'vue';
+    import {ref,defineEmits,getCurrentInstance,defineProps } from 'vue';
     import {queryEnforcementList} from '@/api/enterprise'
-    import { defineProps } from 'vue'
     const emits = defineEmits(['reciveData','close']);
     const props = defineProps({
         visible: {
@@ -292,14 +291,14 @@
     }
     .selectButton {
       position: absolute;
-      bottom: 10%;
-      right: 0;
-      padding: 0.05rem 0.15rem 0;
-      background-color: #d9e7f9;
-      color: #0140f9;
-      font-size: 0.3rem;
+      width: 20%;
+      height: 34%;
+      top: 30%;
+      right: 1%;
+      background-color: #1367fe;
+      color: #fff;
       text-align: center;
-      border-radius: 0.15rem;
+      border-radius: 0.1rem;
     }
 
 
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 552fa48..e012fba 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -106,8 +106,7 @@
                                 rows="1"
                                 autosize
                                 :right-icon="(data.lawList.length - index ) == 1 ? 'add-o' : 'close'"
-                                @click-right-icon="(data.lawList.length - index ) == 1 ? addField(index) : cancelEnforcement(index)"
-                        />
+                                @click-right-icon="(data.lawList.length - index ) == 1 ? addField(index) : cancelEnforcement(index)" />
                     </div>
                     <!-- <div class="addbtn" @click.stop="addField"><van-icon name="add-o" /></div> -->
                   </div>
diff --git a/src/views/enterprise/compaint/compaintBase.vue b/src/views/enterprise/compaint/compaintBase.vue
index f1b5d41..ace4d90 100644
--- a/src/views/enterprise/compaint/compaintBase.vue
+++ b/src/views/enterprise/compaint/compaintBase.vue
@@ -27,7 +27,7 @@
                   <registrationListView isReg="0" />
               </div>
               <div v-if="data.TabId == 1" style="height: calc(100vh - 1.5rem);">
-                  <complaintNoScan isReg="1" />
+                  <complaintNoScan isReg="1" :isNoScan="true" />
               </div>
           </van-tab>
       </van-tabs>
diff --git a/src/views/enterprise/complaintDetail.vue b/src/views/enterprise/complaintDetail.vue
index 29cfc0e..f9c0b3a 100644
--- a/src/views/enterprise/complaintDetail.vue
+++ b/src/views/enterprise/complaintDetail.vue
@@ -38,7 +38,7 @@
                             autosize
                             label="意见|建议"
                             type="textarea"
-                            maxlength="300"
+                            maxlength="100"
                             placeholder="请输入"
                             required
                             :rules="[{ required: true, message: '请输入意见|建议' }]"
@@ -119,7 +119,7 @@
                             autosize
                             label="诉投诉内容"
                             type="textarea"
-                            maxlength="300"
+                            maxlength="100"
                             placeholder="请输入"
                             required
                             :rules="[{ required: true, message: '请输入投诉内容' }]"
diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue
index aaa6ace..1ae156e 100644
--- a/src/views/enterprise/complaintDetailView.vue
+++ b/src/views/enterprise/complaintDetailView.vue
@@ -11,10 +11,19 @@
                               readonly
                       />
                   </view>
-                  <view v-if="data.isNoScan==false">
+                  <view v-if="data.isNoScan==true">
+                      <van-field
+                              v-for="(item,index) in deptArr"
+                              v-model="item.value"
+                              :key="index"
+                              :label="item.label"
+                              readonly
+                      />
+                  </view>
+                  <view v-if="data.isNoScan==true">
                       <van-field
-                              v-model="submitData.bureauDeptName"
-                              label="执法部门"
+                              v-model="submitData.enforcementTime"
+                              label="执法时间"
                               readonly
                       />
                   </view>
@@ -145,6 +154,7 @@
       // 判断是否入企不扫码
       isNoScan: false,
   });
+  const deptArr = ref([]);
   //保存参数
   const submitData = reactive({
       // 用户id
@@ -178,6 +188,10 @@
       comOrOpi: 0,
       //执法部门-局级
       bureauDeptName:"",
+      complaintTime:"",
+      complaintDepartments:"",
+      complaintDepartmentIds:"",
+      enforcementTime:"",
   })
   //接收组件传参
   const props = defineProps({
@@ -279,6 +293,27 @@
         // 判断是否入企不扫码
           if (null == success.data.enforceType || null == success.data.relId) {
               data.isNoScan = true;
+              submitData.complaintTime = success.data.complaintTime;
+              submitData.complaintDepartments = success.data.complaintDepartments;
+              submitData.enforcementTime = success.data.enforcementTime;
+              const depts = submitData.complaintDepartments.split(",");
+              for (let index = 0; index < depts.length; index++) {
+                const element = depts[index];
+                if(index == 0 ){
+                  var obj = {
+                    label:"执法部门",
+                    value: element
+                  }
+                  deptArr.value.push(obj)
+                }else{
+                  var obj = {
+                    label:"  ",
+                    value: element
+                  }
+                  deptArr.value.push(obj)
+                }
+              }
+              console.log(deptArr.value)
           }
         if(success.data.status == 1){
           data.isMssq = true;
diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue
index 8d65c3b..41f34a8 100644
--- a/src/views/enterprise/complaintNoScan.vue
+++ b/src/views/enterprise/complaintNoScan.vue
@@ -33,26 +33,34 @@
                             required
                             :rules="[{ required: true, message: '请选择投诉事项' }]"
                     />
-                    <!--        <van-popup v-model:show="data.showPicker" position="bottom">
-                            <van-picker
-                              v-model="data.selectTypeValue"
-                              :columns="data.columns"
-                              @cancel="data.showPicker = false"
-                              @confirm="onConfirm"
-                            />
-                          </van-popup>-->
+                    <div class="add-box">
+                    <div v-for="(item, index) in data.depts" :key="index">
+                        <van-field
+                                v-if="isNoScan"
+                                v-model="item.text"
+                                label="执法部门"
+                                readonly
+                                required
+                                clickable
+                                :right-icon="(data.depts.length - index ) == 1 ? 'add-o' : 'close'"
+                                @click-right-icon="(data.depts.length - index ) == 1 ? addDept(index) : cancelDept(index)"
+                                :rules="[{ required: true, message: '请选择执法部门' }]"
+                                placeholder="请选择执法部门"
+                                @click-input="showPopup(index)"
+                        />
+                    </div>
+                  </div>
                     <van-divider class="divdsty"/>
                     <van-field
-                            v-model="submitData.complaintTime"
+                            v-model="submitData.enforcementTime"
                             label="检查时间"
                             placeholder="请选择"
                             is-link
                             required
                             :rules="[{ required: true, message: '请选择执法时间' }]"
-                            @click=""/>
+                            @click="selectTime"/>
                             <van-popup v-model:show="data.showTimePicker" position="bottom" :style="{ height: '30%' }">
                             <van-date-picker
-                                    v-if="data.showNom"
                                     type="time"
                                     v-model="data.currentDate"
                                     @confirm="onConfirm"
@@ -147,6 +155,8 @@
             </van-form>
         </div>
     </div>
+    <DeptPopup :visible="data.popupVisible" :content="data.deptContent" @close="closePopup"
+                   @reciveData="reciveDept"/>
 </template>
 
 <script setup name="register">
@@ -155,10 +165,17 @@
     import {addEnterpriseComplaint} from '../../api/enterprise'
     import {getDict} from '../../api/Home'
     import {uploadFile} from '../../util/fileUpload'
-    import {reactive, ref} from "vue";
-
-    const {useCommon, useMy} = $globalStore
-
+    import {reactive, ref,defineProps} from "vue";
+    import DeptPopup from '@/views/enterprise/compaint/selectDeptFilter.vue';
+
+    const {useCommon, useMy} = $globalStore;
+    const props = defineProps({
+        isNoScan: {
+          type: Boolean,
+          default: false
+        }
+    })
+    
     const router = useRouter();
     const route = useRoute();
     let queryaddressId = ref("");
@@ -170,7 +187,14 @@
         isSelect: false,
         isCheckedon: false,
         isCheckedoff: true,
-        showTimePicker:false
+        showTimePicker:false,
+        deptChecked: false,
+        deptContent: false, 
+        currentDate: ref(['2024', '08', '01']),
+        depts: [[{text: "", id: ""}]],
+        deptFlag: 0,
+        popupVisible: false,
+        deptContent:"",
     });
     //保存参数
     const submitData = reactive({
@@ -200,15 +224,17 @@
         //vant组件上传照片列表
         fileListObj: [],
         //投诉时间
-        complaintTime:"",
+        enforcementTime:"",
+        complaintDepartments:"",
+        complaintDepartmentIds:"",
     })
 
 
 // 返回
-const goBack = () => {
-	// router.go(-1);
-  router.push({ name: "Home" });
-};
+    const goBack = () => {
+      // router.go(-1);
+      router.push({ name: "Home" });
+    };
 
     const validator = (val) => /^1[34578]\d{9}$/.test(val);
 
@@ -218,7 +244,19 @@ const goBack = () => {
 
     const submit = () => {
         // console.log(submitData);
+        const deptNameArr = [];
+        const deptIdArr = [];
         submitData.enterpriseNumber = useCommon.enterpriseNumber;
+        for (let index = 0; index < data.depts.length; index++) {
+          const element = data.depts[index];
+          console.log(element)
+          deptNameArr.push(element.text);
+          deptIdArr.push(element.id);
+        }
+        submitData.complaintDepartmentIds = deptIdArr.join(",");
+        submitData.complaintDepartments = deptNameArr.join(",");
+        console.log(submitData)
+        // return;
         addEnterpriseComplaint(submitData, success => {
 
             console.log(success)
@@ -255,16 +293,22 @@ const goBack = () => {
         router.replace({name: "addressList"});
     };
 
-    const onConfirm = (value) => {
-        data.showPicker = false;
-        console.log(value)
-        submitData.enforceType = value.selectedValues[0];
-        submitData.enforceTypeText = value.selectedOptions[0].text;
+    const onConfirm = (time) => {
+        console.log(time)
+        if (time != null) {
+            var times = time.selectedValues;
+            submitData.enforcementTime = times[0] + "-" + times[1] + "-" + times[2];
+            // data.tempDate = times[1] + "月" + times[2] + "号";
+        }
+        data.showTimePicker = false;
     }
     const selectType = () => {
         data.showPicker = true;
         // console.log(data)
     }
+    const selectTime = () =>{
+      data.showTimePicker = true;
+    }
 
 
     const selectCh = (val) => {
@@ -300,6 +344,7 @@ const goBack = () => {
         return true;
     }
     onMounted(() => {
+        console.log(props?.isNoScan)
         console.log(route?.query?.id);
         console.log(route?.query?.lawEnforcementIncident);
         submitData.relId = route?.query?.id;
@@ -318,30 +363,33 @@ const goBack = () => {
         submitData.enforceType = 3;
         submitData.enforceTypeText = "入企不扫码";
     });
-
-</script>
-<script>
-    //案件筛选弹窗
-    import Popup from './caseFilter.vue';
-
-    export default {
-        components: {
-            Popup
-        },
-        data() {
-            return {
-                popupVisible: false,
-                popupContent: ''
-            }
-        },
-        methods: {
-            showPopup() {
-                this.popupVisible = true;
-            },
-            closePopup() {
-                this.popupVisible = false;
-            }
-        }
+    const cancelDept = (index) => {
+        data.depts.splice(index, 1);
+    }
+    const addDept = (index) => {
+        data.depts.push({text: "", id: ""});
+    }
+    const showPopup = (flag) => {
+        data.deptFlag = flag;
+        data.popupVisible = true;
+    }
+    const reciveDept = (item) =>{
+      console.log(item)
+     
+      const arr = [];
+      for (let index = 0; index < item.length; index++) {
+        const element = item[index];
+        console.log(element)
+        var obj = {text: element.deptName, id: element.deptId}
+        arr.push(obj);
+      }
+      console.log(arr)
+      data.depts = arr;
+      console.log(data.depts.value)
+
+    }
+    const closePopup = () =>{
+        data.popupVisible = false;
     }
 </script>
 
@@ -660,5 +708,6 @@ const goBack = () => {
     box-sizing: border-box;
     line-height: 1.5;
   }
+  
 
 </style>