From d8741a22604352aca1dfe4d6e4c1a495187f0bb9 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Thu, 22 Aug 2024 16:18:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=20=E8=A1=8C=E6=94=BF=E6=A3=80=E6=9F=A5=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=97=B6=E9=97=B4=20=E4=B8=8A=E5=8D=88=E6=88=96?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/administrative/appointment.vue      | 28 +++++++++++++++-
 src/views/administrative/appointmentList.vue  |  5 +++
 .../compaint/compaintDetailIndex.vue          |  4 +--
 .../enterprise/compaint/compaintFlowView.vue  |  3 ++
 src/views/enterprise/complaintDetailView.vue  | 32 ++++++++++++++++++-
 .../enterprise/enterpriseInspectionDetail.vue | 18 +++++------
 .../enterprise/enterpriseInspectionList.vue   | 13 +++++---
 .../enterprise/enterpriseInspectionNotice.vue | 12 +++++--
 8 files changed, 95 insertions(+), 20 deletions(-)
 create mode 100644 src/views/enterprise/compaint/compaintFlowView.vue

diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 9d3ec08..287ca62 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -42,7 +42,22 @@
                         label="检查时间"
                         :rules="[{ required: true, message: '必填项' }]"
                         @click="data.showTimePicker = true"
-                />
+                >
+                <template #div>
+                  <div class="plan-attach">
+                        <div class="plan-time">
+                            <van-field
+                                    v-model="data.fieldValue"
+                                    is-link
+                                    readonly
+                                    placeholder="选择时段"
+                                    @click="data.dateShowPicker = true"
+                            />
+                        </div>
+                    </div>
+                
+              </template>
+              </van-field>
 
                 <van-field
                         v-model="submitData.checkItemText"
@@ -795,5 +810,16 @@
       font-size: 0.35rem;
       color: #1367fe;
     }
+    .plan-attach {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      white-space: nowrap;
+    }
+
+    .plan-time {
+      margin-left: 2.67rem;
+      width: 2.25rem;
+    }
 
 </style>
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index 63ae750..fe9887d 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -150,6 +150,11 @@
         refreshing: false,
         curPage: 1,
         total: 0,
+        dateColumns: [
+            { text: '年度', value: 'year' },
+            { text: '季度', value: 'quarter' },
+            { text: '月度', value: 'month' },
+        ],
     });
 
     // 设置初始值为当前时间
diff --git a/src/views/enterprise/compaint/compaintDetailIndex.vue b/src/views/enterprise/compaint/compaintDetailIndex.vue
index 6788828..bda1238 100644
--- a/src/views/enterprise/compaint/compaintDetailIndex.vue
+++ b/src/views/enterprise/compaint/compaintDetailIndex.vue
@@ -28,7 +28,7 @@
               </div>
               <!-- 处置流程页面 -->
               <div v-if="data.TabId == 1" style="height: calc(100vh - 1.5rem);">
-                  <complaintNoScan isReg="1" :id="data.id" />
+                  <compaintFlowView isReg="1" :id="data.id" />
               </div>
           </van-tab>
       </van-tabs>
@@ -41,7 +41,7 @@
 
 <script setup name="complaintBase">
     import complaintDetailView from '@/views/enterprise/complaintDetailView.vue';
-    import complaintNoScan from '@/views/enterprise/complaintNoScan.vue';
+    import compaintFlowView from '@/views/enterprise/compaint/compaintFlowView.vue';
     
 
     const {useCommon} = $globalStore;
diff --git a/src/views/enterprise/compaint/compaintFlowView.vue b/src/views/enterprise/compaint/compaintFlowView.vue
new file mode 100644
index 0000000..53772cb
--- /dev/null
+++ b/src/views/enterprise/compaint/compaintFlowView.vue
@@ -0,0 +1,3 @@
+<template>
+  <div class="home app_content"></div>
+</template>
\ No newline at end of file
diff --git a/src/views/enterprise/complaintDetailView.vue b/src/views/enterprise/complaintDetailView.vue
index c3c8613..18a56b2 100644
--- a/src/views/enterprise/complaintDetailView.vue
+++ b/src/views/enterprise/complaintDetailView.vue
@@ -13,6 +13,33 @@
                               clickable
                       />
                   </view>
+                  <view v-if="data.isNoScan==false">
+                      <van-field
+                              v-model="submitData.bureauDeptName"
+                              label="执法部门"
+                              placeholder="请选择"
+                              readonly
+                              clickable
+                      />
+                  </view>
+                  <view v-if="data.isNoScan==false">
+                      <van-field
+                              v-model="submitData.lawEnforcementIncidentText"
+                              label="处理状态"
+                              placeholder="请选择"
+                              readonly
+                              clickable
+                      />
+                  </view>
+                  <view v-if="data.isNoScan==false">
+                      <van-field
+                              v-model="submitData.lawEnforcementIncidentText"
+                              label="处理时间"
+                              placeholder="请选择"
+                              readonly
+                              clickable
+                      />
+                  </view>
                   <Popup :visible="popupVisible" :content="popupContent" @close="closePopup" @reciveData="reciveData"/>
                   <van-field
                           v-model="submitData.enforceTypeText"
@@ -164,6 +191,8 @@
       //vant组件上传照片列表
       fileListObj: [],
       comOrOpi: 0,
+      //执法部门-局级
+      bureauDeptName:"",
   })
   //接收组件传参
   const props = defineProps({
@@ -254,13 +283,14 @@
       data.isSelect = route?.query?.isSelect;
       submitData.comOrOpi = route?.query?.comOrOpi;
       complaintInfoById({id:route?.query?.id},success =>{
-          console.log("====> : ", success)
+        console.log("====> : ", success)
         submitData.enforceTypeText = success.data.enforceTypeText;
         submitData.problemDescription = success.data.problemDescription;
         submitData.lawEnforcementIncidentText = success.data.lawEnforcementIncident;
         submitData.enterpriseAddress = success.data.enterpriseAddress;
         submitData.linkman = success.data.linkman;
         submitData.linkmanTel = success.data.linkmanTel;
+        submitData.bureauDeptName = success.data.bureauDeptName;
         // 判断是否入企不扫码
           if (null == success.data.enforceType || null == success.data.relId) {
               data.isNoScan = true;
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index 0fe22be..e5f0fbd 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -13,19 +13,12 @@
                     readonly
                     label="检查时间"
             />
-            <van-field
-                    v-model="submitData.bureauDeptName"
-                    readonly
-                    label="执法部门"
-            />
             <van-field
                     v-model="submitData.checkItem"
                     label="检查事项"
                     rows="2"
-                    autosize
                     readonly
                     type="textarea"
-                    maxlength="100"
                     placeholder="请输入检查事项"
                     show-word-limit
             />
@@ -33,13 +26,16 @@
                     v-model="submitData.checkRequire"
                     label="检查要求"
                     rows="2"
-                    autosize
                     readonly
                     type="textarea"
-                    maxlength="100"
                     placeholder="请输入检查要求"
                     show-word-limit
             />
+            <van-field
+                    v-model="submitData.bureauDeptName"
+                    readonly
+                    label="执法部门"
+            />
 <!--            <van-field-->
 <!--              v-model="submitData.enterpriseName"-->
 <!--              label="企业名称"-->
@@ -63,7 +59,9 @@
                 readonly
                 label="执法人员"
             />
-            <van-field v-for="(item, index) in data.lawCer" :key="index"
+            <van-field 
+            v-if="!data.isEnterprise"
+            v-for="(item, index) in data.lawCer" :key="index"
                        v-model="item.show"
                        label="执法人员"
                        readonly
diff --git a/src/views/enterprise/enterpriseInspectionList.vue b/src/views/enterprise/enterpriseInspectionList.vue
index b4df20e..1f93a14 100644
--- a/src/views/enterprise/enterpriseInspectionList.vue
+++ b/src/views/enterprise/enterpriseInspectionList.vue
@@ -71,10 +71,14 @@
                             <van-swipe-cell class="swipe_cell">
                                 <div class="card_box">
                                     <div class="card_box_span">
-                                        <p>执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }} <span
-                                                class="card_box_action">
-                      <!-- <van-button @click="toComplaintView(item.id,item.lawEnforcementIncident)" type="primary" size="mini">投诉</van-button> -->
-                    </span></p>
+                                        <p>执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}  
+                                          <span v-if="item.checkTimeOrder == 1" >
+                                            上午 9:00~12:00
+                                          </span>
+                                          <span v-if="item.checkTimeOrder == 2">
+                                            下午 14:00~17:00
+                                          </span>
+                                        </p>
                                     </div>
                                     <!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> -->
                                     <div @click="toDetailView(item.id)">
@@ -201,6 +205,7 @@
     const queryList = () => {
         // 区分即时查询还是历史查询
         searchParam.isReg = props?.isReg;
+        console.log(props?.isReg);
         //TODO 临时注释
         if (searchParam.enterpriseNumber == '' || searchParam.enterpriseNumber == null) {
             console.log("该用户没有关联企业！");
diff --git a/src/views/enterprise/enterpriseInspectionNotice.vue b/src/views/enterprise/enterpriseInspectionNotice.vue
index eaa2317..409a37b 100644
--- a/src/views/enterprise/enterpriseInspectionNotice.vue
+++ b/src/views/enterprise/enterpriseInspectionNotice.vue
@@ -21,7 +21,7 @@
         <!--            </div>-->
         <!--        </div>-->
 
-        <van-tabs v-model:active="active" sticky @click="onClickTab">
+        <van-tabs v-model:active="active" sticky @click-tab="onClickTab">
             <van-tab v-for="(item, index) in data.list" :title="item.title">
                 <div v-if="data.TabId == 0" style="height: calc(100vh - 1.5rem);">
                     <enterpriseInspectionList isReg="0"></enterpriseInspectionList>
@@ -44,6 +44,8 @@
     import {Tab, Tabs} from 'vant';
 
     const {useCommon} = $globalStore;
+    //tab切换参数
+    const active = ref(0);
     //路由参数
     const router = useRouter();
     const route = useRoute();
@@ -66,7 +68,13 @@
         console.log("点击切换tab",e);
         data.TabId = index;
     };
-    const onClickTab = ({ title }) => console.log(title);
+    const onClickTab = ({ title }) => {
+      if(title == "检查通知"){
+        data.TabId = 0;
+      }else{
+        data.TabId = 1;
+      }
+    }
 
 
     onMounted(() => {