From 9141c09686c6371eeca9656ad64fab5e9b7dd23e Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Tue, 27 Aug 2024 21:19:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=A7=E6=B3=95=E6=8A=95?=
 =?UTF-8?q?=E8=AF=89=E8=AF=A6=E6=83=85=20=E6=89=A7=E6=B3=95=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/enterprise.js                         |  3 ++
 src/views/enforce/enterpriseBaseInfo.vue      | 21 +++++++-------
 src/views/enforce/noScanFilter.vue            | 14 ++++-----
 src/views/enforce/sign.vue                    | 29 ++++++++++++-------
 .../compaint/compaintDetailIndex.vue          |  6 ++--
 .../enterprise/compaint/compaintFlowView.vue  |  6 ++--
 6 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/api/enterprise.js b/src/api/enterprise.js
index 670c0ab..fbf2b07 100644
--- a/src/api/enterprise.js
+++ b/src/api/enterprise.js
@@ -18,8 +18,11 @@ export const queryListWithFiveDay = (params, success, error) => _get("/app/code/
 export const addEnterpriseComplaint = (params, success, error) => _post("/app/code/complaint/add",params,success,error)
 // 查询
 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 complaintInfoProcessById = (params, success, error) => _get("/app/code/complaint/queryProcessById",params,success,error)
 //工单办结
 export const mssqQueryEndInfo = (params, success, error) => _get("/app/code/complaint/mssqQueryEndInfo",params,success,error)
 // 诉求工单评价页面
diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue
index b65352a..b6b0d70 100644
--- a/src/views/enforce/enterpriseBaseInfo.vue
+++ b/src/views/enforce/enterpriseBaseInfo.vue
@@ -20,6 +20,11 @@
                         label="统一社会信用代码:"
                         readonly
                 />
+                <van-field
+                        v-model="data.enterpriseInfo.legalPerson"
+                        label="法定代表人"
+                        readonly
+                />
                 <van-field
                     v-model="data.enterpriseInfo.enterpriseType"
                     label="企业类型"
@@ -34,16 +39,6 @@
                   show-word-limit
                />
 -->
-              <div class="fold-div">
-                <label>注册地址</label>
-                <van-text-ellipsis :content="data.enterpriseInfo.enterpriseAddress" rows="2" autosize expand-text="展开" collapse-text="收起" />
-              </div>
-                <van-field
-                        v-model="data.enterpriseInfo.legalPerson"
-                        label="法定代表人"
-                        readonly
-                />
-
                 <van-field
                         v-model="data.enterpriseInfo.registeredCapital"
                         label="注册资本"
@@ -68,6 +63,10 @@
                   label="经营范围"
               />
               <van-text-ellipsis :content="data.enterpriseInfo.businessScope" rows="2" autosize expand-text="展开" collapse-text="收起" />-->
+              <div class="fold-div">
+                <label>注册地址</label>
+                <van-text-ellipsis :content="data.enterpriseInfo.enterpriseAddress" rows="2" autosize expand-text="展开" collapse-text="收起" />
+              </div>
               <div class="fold-div">
                 <label>经营范围</label>
                 <van-text-ellipsis :content="data.enterpriseInfo.businessScope" rows="2" autosize expand-text="展开" collapse-text="收起" />
@@ -301,7 +300,7 @@
                 // data.enterpriseInfo.operatingTerm = success.data.operatingTerm
                 var tmpoperatingTerm = success.data.operatingTerm;
                 if (tmpoperatingTerm.indexOf('null') >= 0) {
-                    tmpoperatingTerm = tmpoperatingTerm.substring(0, tmpoperatingTerm.indexOf('null')) + " 至今";
+                    tmpoperatingTerm = tmpoperatingTerm.substring(0, tmpoperatingTerm.indexOf('null')) + " 无固定期限";
                 }
                 data.enterpriseInfo.operatingTerm = tmpoperatingTerm;
                 data.enterpriseInfo.businessScope = success.data.businessScope
diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue
index 45bb58d..bfa3d5c 100644
--- a/src/views/enforce/noScanFilter.vue
+++ b/src/views/enforce/noScanFilter.vue
@@ -78,7 +78,7 @@ const props = defineProps( {
     pageNum: 1,
     pageSize: 6,
   })
-  const dataList =  [];
+  const dataList =  ref([]);
   const loading = ref(false);
   const finished = ref(false);
   const refreshing = ref(false);
@@ -114,24 +114,24 @@ const props = defineProps( {
       queryEnterpriseInfoList(searchParam, success => {
         curPage.value++;
         loading.value = false;   // 查出结果停止加载
-        if (success.total <= dataList.length) {
+        if (success.total <= dataList.value.length) {
           // 查到最后没数据
           finished.value = true;
           return;
         }
         // this.dataList = success.data
-        dataList.push(...success.rows);
+        dataList.value.push(...success.rows);
       }, error => {
       })
     }
     const search = () =>{
       curPage.value = 1;
-      dataList = [];
+      dataList.value = [];
       onRefresh();
     }
     const cancel = () =>{
-      this.searchParam.enterpriseName = '';
-      this.search()
+      searchParam.enterpriseName = '';
+      search()
     }
     const selectData = (item) =>{
       emits("reciveData", item);
@@ -141,7 +141,7 @@ const props = defineProps( {
     //下拉刷新
     const onRefresh = () =>{
       // 清空列表数据
-      enterpriseList = [];
+      // enterpriseList = [];
       finished.value = false;
 
       // 重新加载数据
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index b9d4cea..6bfa284 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -56,20 +56,22 @@
                     />
                   <div class="add-box">
                     <div v-for="(item, index) in data.lawCer" :key="index">
-                        <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员
-                            {{index+1}}</label> <a>删除</a></div>
+                        <!-- <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员
+                            {{index+1}}</label> <a>删除</a></div> -->
                         <van-field
                                 v-model="item.show"
                                 label="执法人员"
                                 readonly
                                 required
-                                is-link
+                                clickable
+                                :right-icon="(data.lawCer.length - index ) == 1 ? 'add-o' : 'close'"
+                                @click-right-icon="(data.lawCer.length - index ) == 1 ? addLawCer(index) : cancelUser(index)"
                                 :rules="[{ required: true, message: '必填项' }]"
                                 placeholder="请选择"
-                                @click="showPopup(index)"
+                                @click-input="showPopup(index)"
                         />
                     </div>
-                    <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div>
+                    <!-- <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div> -->
                   </div>
                     <van-field
                             v-model="submitData.checkCategoryText"
@@ -94,20 +96,21 @@
                     <van-field v-model="submitData.lawEnforcementItem" v-show="false"/>
                   <div class="add-box">
                     <div v-for="(item, index) in data.lawList" :key="index">
-                        <div class="item-delete" @click.stop="cancelEnforcement(index)"><label>检查依据 {{index+1}}</label>
-                            <a>删除</a></div>
+                        <!-- <div class="item-delete" @click.stop="cancelEnforcement(index)"><label>检查依据 {{index+1}}</label>
+                            <a>删除</a></div> -->
                         <van-field
                                 v-model="item.text"
                                 readonly
                                 label="检查依据"
                                 placeholder="检查依据"
-                                @click="showPopupqz(index)"
+                                @click-input="showPopupqz(index)"
                                 rows="1"
                                 autosize
-                                is-link
+                                :right-icon="(data.lawList.length - index ) == 1 ? 'add-o' : 'close'"
+                                @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 class="addbtn" @click.stop="addField"><van-icon name="add-o" /></div> -->
                   </div>
                     <van-field v-model="submitData.lawEnforcementBasis" v-show="false"/>
                     <view v-if="data.isNoScan == 'true'">
@@ -260,6 +263,8 @@
     const route = useRoute();
     const form = ref(null);
     let queryaddressId = ref("");
+    const showUserAdd = ref(true)
+    const showNextUserAdd = ref(false)
     const data = reactive({
         showLawEnforcerFlag: false,
         currentPage: 1,
@@ -811,8 +816,10 @@
     const cancelUser = (index) => {
         data.lawCer.splice(index, 1);
     }
-    const addLawCer = () => {
+    const addLawCer = (index) => {
         data.lawCer.push({text: "", id: ""});
+        showUserAdd.value = false;
+        showNextUserAdd.value = true;
     }
     const closePopup = () => {
         data.popupVisible = false;
diff --git a/src/views/enterprise/compaint/compaintDetailIndex.vue b/src/views/enterprise/compaint/compaintDetailIndex.vue
index ec0c129..44ae162 100644
--- a/src/views/enterprise/compaint/compaintDetailIndex.vue
+++ b/src/views/enterprise/compaint/compaintDetailIndex.vue
@@ -44,7 +44,7 @@
 <script setup name="complaintBase">
     import compaintFlowView from '@/views/enterprise/compaint/compaintFlowView.vue';
     import complaintDetailView from '@/views/enterprise/complaintDetailView.vue';
-    import {complaintInfoById} from '@/api/enterprise';
+    import {complaintInfoById,complaintInfoProcessById} from '@/api/enterprise';
 
     const {useCommon} = $globalStore;
     //路由参数
@@ -67,7 +67,7 @@
 
         ],
     });
-    const responData = reactive({});
+    const responData = reactive([]);
 
     const check = (index) => {
         console.log("点击切换tab", index);
@@ -86,7 +86,7 @@
       // let id  = route?.query?.id;
       data.id = route?.query?.id;
       console.log(route?.query?.id);
-      complaintInfoById({id:route?.query?.id},success =>{
+      complaintInfoProcessById({id:route?.query?.id},success =>{
         console.log("====> : ", success)
         responData.value = success.data;
         console.log(responData.value);
diff --git a/src/views/enterprise/compaint/compaintFlowView.vue b/src/views/enterprise/compaint/compaintFlowView.vue
index faaa81f..81d0c6e 100644
--- a/src/views/enterprise/compaint/compaintFlowView.vue
+++ b/src/views/enterprise/compaint/compaintFlowView.vue
@@ -49,10 +49,10 @@
     //存储民生诉求处置流程
     const result = ref([]);
     onMounted(() =>{
-      console.log(props?.data?.mssqOrderFlows)
       console.log(props?.data)
-      console.log(props?.data?.value)
-      const arrData = props?.data?.value?.mssqOrderFlows;
+      // console.log(props?.data)
+      // console.log(props?.data)
+      const arrData = props?.data;
       console.log(arrData)
       if(arrData != null && arrData != "undefined"){
         for (let index = 0; index < arrData.length; index++) {