From cf92461bc0c0ff98b46757c1ad6420861065af73 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Sun, 15 Sep 2024 04:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/administrative/appointment.vue      |  5 ++
 .../administrative/appointmentDetail.vue      | 87 ++++++++++++++++---
 src/views/administrative/appointmentEdit.vue  |  4 +-
 src/views/administrative/appointmentList.vue  | 26 ++++++
 src/views/administrative/deptFilter.vue       |  2 +-
 src/views/enforce/historyCheck.vue            |  4 +-
 src/views/enforce/lawFilter.vue               | 16 +++-
 src/views/enforce/noScanFilter.vue            |  2 +-
 src/views/enforce/sign.vue                    |  8 +-
 9 files changed, 130 insertions(+), 24 deletions(-)

diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 979578a..1b643e6 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -511,6 +511,7 @@
               deptId: item[i].deptId, 
               deptName: item[i].deptName,
               zzDisplayPath:item[i].zzDisplayPath,
+              lawCertificateNum: item[i].lawCertificateNum
              });
         }
     }
@@ -752,6 +753,10 @@
             });
         }
     }
+    const removeDeptAndUser = (index) =>{
+      console.log(index)
+        submitData.userObjs.splice(index,1);
+    }
 </script>
 <script>
     //案件筛选弹窗
diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue
index abf6641..9022560 100644
--- a/src/views/administrative/appointmentDetail.vue
+++ b/src/views/administrative/appointmentDetail.vue
@@ -21,12 +21,32 @@
                         readonly
                         :rules="[{ validator, message: '请输入正确内容' }]"
                 />
-                <van-field
+                <!-- <van-field
                         v-model="submitData.checkTime"
                         readonly
                         label="检查时间"
                         :rules="[{ required: true, message: '必填项' }]"
-                />
+                /> -->
+                <div class="flex-div">
+                  <van-field
+                          v-model="submitData.checkTime"
+                          required
+                          is-link
+                          label="检查时间"
+                          placeholder="日期"
+                          :rules="[{ required: true, message: '必填项' }]"
+                          @click="data.showTimePicker = true"
+                  />
+                  <van-field
+                      v-model="submitData.checkTimeOrderText"
+                      required
+                      is-link
+                      label=""
+                      placeholder="时段"
+                      :rules="[{ required: true, message: '必填项' }]"
+                      @click="data.checkTimePicker = true"
+                  />
+                </div>
 
 <!--                <van-field
                         v-model="submitData.checkItemText"
@@ -254,6 +274,7 @@
         isReg:1,
         /** 状态 0:正常;1:取消 */
         status:1,
+        checkTimeOrderText:"",  
     })
 
     const onConfirm = (time) => {
@@ -370,7 +391,7 @@
                 })
                 data.checkItemText =success.data['params'].checkItemText;
                 data.checkRequireText =success.data['params'].checkRequireText;
-                submitData.lawEnforcerText =success.data['lawEnforcer'];
+                submitData.lawEnforcerText = success.data['lawEnforcer'] + " " +success.data['lawEnforcerText'];
                 submitData.lawEnforcerTextTwo =success.data['lawEnforcerTwo'];
                 submitData.isSubmit =success.data['isSubmit'];
                 submitData.isReg = success.data['isReg'];
@@ -391,6 +412,11 @@
                 for (var i=0; i<success.data.userObjs.length; i++) {
                     submitData.userObjs.push({ strUserId: success.data.userObjs[i].strUserId, userName: success.data.userObjs[i].userName, deptId: success.data.userObjs[i].deptId, deptName: success.data.userObjs[i].deptName });
                 }
+                if(success.data['checkTimeOrder']  == 1){
+                    submitData.checkTimeOrderText = "9:00 ~ 12:00"
+                }else{
+                    submitData.checkTimeOrderText = "14:00 ~ 17:00"
+                }
                 // 执法人员
                 submitData.lawEnforcerTwoId = success.data['lawEnforcerTwoId'];
                 submitData.lawEnforcerTwo = success.data['lawEnforcerTwo'];
@@ -408,16 +434,16 @@
 
                 //查询当前登录人员信息
                 // if (submitData.isSubmit == 0) {
-                    queryUserInfo(useCommon.userId,success =>{
-                        console.log("queryUserInfo : ", success.data)
-                        submitData.lawEnforcer = success.data.userName;
-                        submitData.lawCertificateNum = success.data.lawCertificateNum
-                        submitData.lawEnforcerText = nameCorrect(submitData.lawEnforcer +" "+ submitData.lawCertificateNum)
-                        // submitData.lawEnforcerText = submitData.lawEnforcer
-                        submitData.lawEnforcerId = success.data.userId;
-                        submitData.lawEnforcement = success.data.dept.deptName;
-                        submitData.lawEnforcementId = success.data.dept.deptId;
-                    },error=>{});
+                    // queryUserInfo(useCommon.userId,success =>{
+                    //     console.log("queryUserInfo : ", success.data)
+                    //     submitData.lawEnforcer = success.data.userName;
+                    //     submitData.lawCertificateNum = success.data.lawCertificateNum
+                    //     submitData.lawEnforcerText = nameCorrect(submitData.lawEnforcer +" "+ submitData.lawCertificateNum)
+                    //     submitData.lawEnforcerText = submitData.lawEnforcer
+                    //     submitData.lawEnforcerId = success.data.userId;
+                    //     submitData.lawEnforcement = success.data.dept.deptName;
+                    //     submitData.lawEnforcementId = success.data.dept.deptId;
+                    // },error=>{});
                 // }
             }
         },error=>{
@@ -847,4 +873,39 @@
       color: #fff;
       border-color: #1367fe;
     }
+    .flex-div {
+      position: relative;
+      display: flex;
+      align-items: flex-start;
+      padding: 0 0.43rem 0 0.23rem;
+      color: #666;
+      font-size: 0.37rem;
+      white-space: nowrap;
+    }
+
+    .flex-div::after {
+      position: absolute;
+      left: 0.43rem;
+      bottom: 0;
+      width: calc(100% - 0.86rem);
+      border-bottom: 1px solid #ebedf0;
+      content: "";
+      transform: scaleY(.5);
+    }
+
+    .flex-div .van-cell::after {
+      border-bottom: 0;
+    }
+
+    .flex-div .van-field {
+      float: right;
+      padding-right: 0;
+      width: 38%;
+    }
+
+    .flex-div .van-field:first-child {
+      float: left;
+      padding-left: 0.2rem;
+      width: 62%;
+    }
 </style>
diff --git a/src/views/administrative/appointmentEdit.vue b/src/views/administrative/appointmentEdit.vue
index 89a2f16..1f36910 100644
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@@ -194,8 +194,8 @@
                 </van-cell-group>
 
                     <van-action-bar>
-                        <van-button round block type="info" native-type="submit" @click="tmpSave">提交</van-button>
-                        <van-button round block type="info" native-type="submit" @click="submit112">发送</van-button>
+                        <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>
+                        <van-button round block type="info" native-type="submit" @click="submit112">提交</van-button>
                     </van-action-bar>
 
             </van-form>
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index 0180748..e2bc28b 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -65,6 +65,10 @@
                                             下午 14:00~17:00
                                           </span>
                                   </p>
+                                  <div class="act-btn" v-if="item.uniteCheck != '' && item.uniteCheck != null">
+<!--                                      <span class="card_box_action"></span>-->
+                                      <span class="joint-mark">联</span>
+                                    </div>
                                 </div>
                                 <div @click="toDetailView(item.id)">
                                     <!--									 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" />-->
@@ -695,5 +699,27 @@
       color: #fff;
       border-color: #1367fe;
     }
+    .act-btn {
+      display: flex;
+      position: absolute;
+      top: 0;
+      right: 0;
+      white-space: nowrap;
+    }
+
+    .joint-mark {
+      display: inline-block;
+      // margin: 0 0.25rem 0 0;
+      width: 0.5rem;
+      height: 0.5rem;
+      background: #2d94fa;
+      border-radius: 50%;
+      color: #fff;
+      font-size: 0.3rem;
+      line-height: 1.75;
+      text-align: center;
+      margin-right: 0.25rem;
+      margin-top: 0.3rem
+    }
 </style>
 
diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue
index d18b058..10c6291 100644
--- a/src/views/administrative/deptFilter.vue
+++ b/src/views/administrative/deptFilter.vue
@@ -63,7 +63,7 @@
                                   <div class="add-staff">
                                     <van-checkbox :name="item.userId+';-;'+item.userName+';-;'+item.deptId+';-;'+item.dept.deptName +';-;'+ item.lawCertificateNum+';-;'+ item.dept.zzDisplayPath" :ref="el => checkboxRefs[item.userId] = el" @click.stop></van-checkbox>
                                     <div class="staff-box">
-                                      <span class="add-name">{{item.userName}}</span>
+                                      <span class="add-name">{{item.userName}} {{ item.lawCertificateNum }} </span>
                                       <span class="add-dept">{{ item.dept.zzDisplayPath}}</span>
                                     </div>
                                     <!-- <van-checkbox :name="item.userId+';-;'+item.userName+';-;'+item.deptId+';-;'+item.dept.deptName" :ref="el => checkboxRefs[item.userId] = el" @click.stop></van-checkbox>
diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue
index 33e46ab..1432e31 100644
--- a/src/views/enforce/historyCheck.vue
+++ b/src/views/enforce/historyCheck.vue
@@ -59,8 +59,8 @@
                                     <div class="card_box_span">
                                         <p>检查时间：{{  formattedTimeYYYYmmdd(item.enforcementTime) }}</p>
                                       <div class="act-btn">
-                                        <span v-if="null != item.enforce" class="remsty">未扫码</span>
-                                        <span v-if="null != item.enforce" class="joint-mark">联</span>
+                                        <span v-if="item.enforceReason != '' && enforceReason != null" class="remsty">未扫码</span>
+                                        <span v-if="item.uniteCheck != '' && item.uniteCheck != null" class="joint-mark">联</span>
                                       </div>
                                     </div>
                                     <!--									 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" />-->
diff --git a/src/views/enforce/lawFilter.vue b/src/views/enforce/lawFilter.vue
index f570f6a..cadbe61 100644
--- a/src/views/enforce/lawFilter.vue
+++ b/src/views/enforce/lawFilter.vue
@@ -20,6 +20,7 @@
                     <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>
+                          <span v-if="item.uniteCheck != '' && item.uniteCheck != null" class="joint-mark">联</span>
                         <div class="case-title">执法事项：{{ item.checkItemText }}</div>
                         <div class="case-time">执法时间：{{ item.checkTime }}</div>
 
@@ -298,7 +299,7 @@
     .selectButton {
       position: absolute;
       width: 20%;
-      height: 34%;
+      // height: 34%;
       top: 30%;
       right: 1%;
       background-color: #1367fe;
@@ -306,6 +307,17 @@
       text-align: center;
       border-radius: 0.1rem;
     }
-
+    .joint-mark {
+      display: inline-block;
+      margin: 0 0.25rem 0 0;
+      width: 0.5rem;
+      height: 0.5rem;
+      background: #2d94fa;
+      border-radius: 50%;
+      color: #fff;
+      font-size: 0.3rem;
+      line-height: 1.75;
+      text-align: center;
+    }
 
 </style>
\ No newline at end of file
diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue
index 3056049..ec57275 100644
--- a/src/views/enforce/noScanFilter.vue
+++ b/src/views/enforce/noScanFilter.vue
@@ -170,7 +170,7 @@ const props = defineProps( {
             query: {
                 reason: reason.value,
                 checkCss: checkCss.value,
-                enterpriseNumber: item.salt,
+                enterpriseNumber: item.enterpriseNumber,
                 isNoScan: true,
             }
         });
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index e6e0fb2..732083b 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -121,7 +121,7 @@
                     <!-- <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">
+                    <view v-if="data.isNoScan == 'true'">
                         <!-- <van-field
                                 v-model="submitData.enforce"
                     <view v-if="data.isNoScan == 'true'">
@@ -131,8 +131,10 @@
                                 readonly
 
                         /> -->
-                        <van-field v-model="submitData.enforceReason"
-                                   label="原&nbsp; &nbsp; &nbsp; &nbsp;因"
+                        <van-field
+                        v-if="submitData.checkCss != 3"
+                          v-model="submitData.enforceReason"
+                                   label="原&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;因"
                         />
                         <van-field v-if="submitData.checkCss == 3"
                                    v-model="submitData.enforceReason"