From 4d36f9769f1107bacee325c8a737bfedfcaf92de Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 7 Nov 2024 11:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9Cloading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/workPlan/custody/index.vue              |  11 ++++-
 pages/workPlan/dayPlan/inf-index.vue          |  10 +++--
 pages/workPlan/dayPlan/pro-index.vue          |  14 ++++--
 pages/workPlan/dayPlan/sub-user/index.vue     |  11 ++++-
 .../dayPlanAuditingDetails/inf-index.vue      |  39 ++++++++++++-----
 .../dayPlanAuditingDetails/pro-index.vue      |  39 ++++++++++++-----
 pages/workPlan/monthPlan/inf-index.vue        |  11 +++++
 pages/workPlan/monthPlan/pro-index.vue        |  13 +++++-
 .../monthPlanAuditingDetails/inf-index.vue    |  35 ++++++++++-----
 .../monthPlanAuditingDetails/pro-index.vue    |  34 ++++++++++-----
 pages/workPlan/networkPlan/inf-index.vue      |   6 +++
 pages/workPlan/networkPlan/pro-index.vue      |   8 +++-
 .../workPlan/networkPlanDetails/inf-index.vue |   5 +++
 .../workPlan/networkPlanDetails/pro-index.vue |   5 +++
 pages/workPlan/selectRisk/index.vue           |  13 +++++-
 pages/workPlan/tempPlan/inf-index.vue         |  12 +++++-
 pages/workPlan/tempPlan/pro-index.vue         |  14 ++++--
 .../tempPlanAuditingDetails/inf-index.vue     |  40 ++++++++++++------
 .../tempPlanAuditingDetails/pro-index.vue     |  11 +++++
 pages/workPlan/weekPlan/inf-index.vue         |  12 ++++++
 pages/workPlan/weekPlan/pro-index.vue         |  12 +++++-
 .../weekPlanAuditingDetails/inf-index.vue     |  30 +++++++++----
 .../weekPlanAuditingDetails/pro-index.vue     |  35 ++++++++++-----
 static/images/workPlan/search.png             | Bin 0 -> 957 bytes
 24 files changed, 327 insertions(+), 93 deletions(-)
 create mode 100644 static/images/workPlan/search.png

diff --git a/pages/workPlan/custody/index.vue b/pages/workPlan/custody/index.vue
index 81938a2..6368ffd 100644
--- a/pages/workPlan/custody/index.vue
+++ b/pages/workPlan/custody/index.vue
@@ -142,7 +142,7 @@
                     <view style="width: 48%">
                       <u--input type="text" placeholder="请填写" v-model="detailsParams.remark" clearable />
                     </view>
-                    <view style="width: 13%" @tap="getMySceneListData">搜索</view>
+                    <view class="search-img" @tap="getMySceneListData"></view>
                   </view>
                 </view>
                 <view class="my-data-container" v-if="detailsList.length > 0">
@@ -730,6 +730,15 @@ export default {
   display: flex;
   justify-content: space-around;
   align-items: center;
+
+  .search-img {
+    width: 68rpx;
+    height: 68rpx;
+    margin-right: 10rpx;
+    // margin-left: 30rpx;
+    background: url('../../../static/images/workPlan/search.png') no-repeat;
+    background-size: 100% 100%;
+  }
 }
 
 .my-data-content {
diff --git a/pages/workPlan/dayPlan/inf-index.vue b/pages/workPlan/dayPlan/inf-index.vue
index 1187c23..ffeb49d 100644
--- a/pages/workPlan/dayPlan/inf-index.vue
+++ b/pages/workPlan/dayPlan/inf-index.vue
@@ -1159,7 +1159,8 @@ export default {
               }
               console.log('saveParams保存参数', saveParams)
               uni.showLoading({
-                title: '正在提交，请勿重复点击'
+                title: '正在提交，请勿重复点击',
+                mask: true
               })
               const result = await setMonthPlanApi(saveParams)
               uni.hideLoading()
@@ -1554,7 +1555,8 @@ export default {
       console.log('saveParams保存参数', saveParams)
 
       uni.showLoading({
-        title: '正在提交，请勿重复点击'
+        title: '正在提交，请勿重复点击',
+        mask: true
       })
       const result = await setMonthPlanApi(saveParams)
       uni.hideLoading()
@@ -1766,6 +1768,7 @@ export default {
       }
     },
     onAddSubUserInfoNew(name, index) {
+      if (this.currentTime != this.$moment().format('YYYY-MM-DD')) return
       new Promise((resolve, reject) => {
         // 创建一个数组用于存储所有的异步请求
         let promises = []
@@ -2018,7 +2021,8 @@ export default {
       console.log('保存参数', params)
 
       uni.showLoading({
-        title: '正在提交，请勿重复点击'
+        title: '正在提交，请勿重复点击',
+        mask: true
       })
       const result = await addContentJobTicketApi({ list: JSON.stringify(params) })
       uni.hideLoading()
diff --git a/pages/workPlan/dayPlan/pro-index.vue b/pages/workPlan/dayPlan/pro-index.vue
index 0e32323..b5b6f47 100644
--- a/pages/workPlan/dayPlan/pro-index.vue
+++ b/pages/workPlan/dayPlan/pro-index.vue
@@ -773,7 +773,7 @@ export default {
       currentSwiper: 0,
       projectQueryParams: {
         planTime: this.$moment().format('YYYY-MM-DD'),
-        type: 6,
+        type: '6',
         state: ''
       },
       projectRange: [
@@ -1072,8 +1072,12 @@ export default {
                 state: ''
               }
               console.log('saveParams保存参数', saveParams)
-
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await setMonthPlanProApi(saveParams)
+              uni.hideLoading()
               if (result.res == 1) {
                 uni.showToast({ icon: 'none', title: '保存成功！' })
                 setTimeout(() => {
@@ -1451,8 +1455,12 @@ export default {
         state: '2'
       }
       console.log('saveParams保存参数', saveParams)
-
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
       const result = await setMonthPlanProApi(saveParams)
+      uni.hideLoading()
       if (result.res == 1) {
         uni.showToast({ icon: 'none', title: '保存成功！' })
         this.$refs.popupAuditing.close()
diff --git a/pages/workPlan/dayPlan/sub-user/index.vue b/pages/workPlan/dayPlan/sub-user/index.vue
index fd9935a..cc1dcc1 100644
--- a/pages/workPlan/dayPlan/sub-user/index.vue
+++ b/pages/workPlan/dayPlan/sub-user/index.vue
@@ -20,7 +20,7 @@
             v-model="subQueryParams.keyWord"
           />
         </view>
-        <view style="width: 15%" @tap="onOpenPopup()">搜索</view>
+        <view @tap="onOpenPopup()" class="search-img"></view>
       </view>
 
       <view class="select-btn">
@@ -530,6 +530,15 @@ export default {
     align-items: center;
   }
 
+  .search-img {
+    width: 48rpx;
+    height: 40rpx;
+    margin-right: 30rpx;
+    // margin-left: 30rpx;
+    background: url('../../../../static/realName/screen.png') no-repeat;
+    background-size: 100% 100%;
+  }
+
   .select-btn {
     margin: 40rpx auto;
   }
diff --git a/pages/workPlan/dayPlanAuditingDetails/inf-index.vue b/pages/workPlan/dayPlanAuditingDetails/inf-index.vue
index 9cf8209..18628e1 100644
--- a/pages/workPlan/dayPlanAuditingDetails/inf-index.vue
+++ b/pages/workPlan/dayPlanAuditingDetails/inf-index.vue
@@ -131,8 +131,9 @@
       </swiper>
     </view>
 
-    <view class="revoke" v-show="!isView || isView == 'false'">
-      <view @tap="onAuditingComplete" class="auditing-complete">审核完成</view>
+    <view class="revoke" v-show="!isView || isView == 'false'" @tap="onAuditingComplete">
+      审核完成
+      <!-- <view @tap="onAuditingComplete" class="auditing-complete">审核完成</view> -->
       <!-- <view
         @tap="showModalFun(item.id)"
         v-for="item in btnList"
@@ -539,7 +540,12 @@ export default {
               this.getAUditingUserInfoData()
               this.$refs.popupAuditing.open('center')
             } else {
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await API(type === 1 ? params : this.params)
+              uni.hideLoading()
               if (result.res == 1) {
                 uni.showToast({ title: `${tipTitle}成功！`, icon: 'none' })
                 setTimeout(() => {
@@ -686,8 +692,13 @@ export default {
       }
 
       console.log('saveParams保存参数', params)
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
 
       const result = await submitPlanApi(params)
+      uni.hideLoading()
 
       console.log(result, 'results上报人提交结果')
       if (result.res == 1) {
@@ -725,7 +736,12 @@ export default {
               user: ''
               // state: '2'
             }
+            uni.showLoading({
+              title: '正在提交，请勿重复点击',
+              mask: true
+            })
             const result = await submitPlanApi(params)
+            uni.hideLoading()
             console.log(result, 'results上报人提交结果')
             if (result.res == 1) {
               uni.showToast({ title: `审核成功`, icon: 'none' })
@@ -842,7 +858,7 @@ export default {
             titleH
               .boundingClientRect(data => {
                 let pH = that._data.pH
-                that._data.navHeight = pH - data.top - bottomHeight - 48
+                that._data.navHeight = pH - data.top - bottomHeight - 16
               })
               .exec()
           })
@@ -867,14 +883,17 @@ export default {
 }
 
 .revoke {
-  width: 100%;
-  padding: 12px 0;
+  width: 94%;
+  // padding: 12px 0;
   position: fixed;
-  bottom: 0;
-  left: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  bottom: 12px;
+  left: 3%;
+  height: 70rpx;
+  border-radius: 16rpx;
+  text-align: center;
+  line-height: 70rpx;
+  color: #fff;
+  background-color: #00337a;
   // background-color: #fff;
 
   .auditing-complete {
diff --git a/pages/workPlan/dayPlanAuditingDetails/pro-index.vue b/pages/workPlan/dayPlanAuditingDetails/pro-index.vue
index 86f8467..9f9e6a9 100644
--- a/pages/workPlan/dayPlanAuditingDetails/pro-index.vue
+++ b/pages/workPlan/dayPlanAuditingDetails/pro-index.vue
@@ -129,8 +129,9 @@
       </swiper>
     </view>
 
-    <view class="revoke" v-show="!isView || isView == 'false'">
-      <view @tap="onAuditingComplete" class="auditing-complete">审核完成</view>
+    <view class="revoke" v-show="!isView || isView == 'false'" @tap="onAuditingComplete">
+      审核完成
+      <!-- <view @tap="onAuditingComplete" class="auditing-complete">审核完成</view> -->
       <!-- <view
         @tap="showModalFun(item.id)"
         v-for="item in btnList"
@@ -542,7 +543,12 @@ export default {
               this.getAUditingUserInfoData()
               this.$refs.popupAuditing.open('center')
             } else {
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await API(type === 1 ? params : this.params)
+              uni.hideLoading()
               if (result.res == 1) {
                 uni.showToast({ title: `${tipTitle}成功！`, icon: 'none' })
                 setTimeout(() => {
@@ -689,8 +695,13 @@ export default {
       }
 
       console.log('saveParams保存参数', params)
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
 
       const result = await submitPlanProApi(params)
+      uni.hideLoading()
 
       console.log(result, 'results上报人提交结果')
       if (result.res == 1) {
@@ -728,7 +739,12 @@ export default {
               user: ''
               // state: '2'
             }
+            uni.showLoading({
+              title: '正在提交，请勿重复点击',
+              mask: true
+            })
             const result = await submitPlanProApi(params)
+            uni.hideLoading()
             console.log(result, 'results上报人提交结果')
             if (result.res == 1) {
               uni.showToast({ title: `审核成功`, icon: 'none' })
@@ -833,7 +849,7 @@ export default {
             titleH
               .boundingClientRect(data => {
                 let pH = that._data.pH
-                that._data.navHeight = pH - data.top - bottomHeight - 48
+                that._data.navHeight = pH - data.top - bottomHeight - 16
               })
               .exec()
           })
@@ -858,14 +874,17 @@ export default {
 }
 
 .revoke {
-  width: 100%;
-  padding: 12px 0;
+  width: 94%;
+  // padding: 12px 0;
   position: fixed;
-  bottom: 0;
-  left: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  bottom: 12px;
+  left: 3%;
+  height: 70rpx;
+  border-radius: 16rpx;
+  text-align: center;
+  line-height: 70rpx;
+  color: #fff;
+  background-color: #00337a;
   // background-color: #fff;
 
   .auditing-complete {
diff --git a/pages/workPlan/monthPlan/inf-index.vue b/pages/workPlan/monthPlan/inf-index.vue
index 77724d5..3a22386 100644
--- a/pages/workPlan/monthPlan/inf-index.vue
+++ b/pages/workPlan/monthPlan/inf-index.vue
@@ -975,7 +975,13 @@ export default {
               }
               console.log('saveParams保存参数', saveParams)
 
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
+
               const result = await setMonthPlanApi(saveParams)
+              uni.hideLoading()
               if (result.res == 1) {
                 uni.showToast({ icon: 'none', title: '保存成功！' })
                 setTimeout(() => {
@@ -1350,8 +1356,13 @@ export default {
         state: '2'
       }
       console.log('saveParams保存参数', saveParams)
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
 
       const result = await setMonthPlanApi(saveParams)
+      uni.hideLoading()
       if (result.res == 1) {
         uni.showToast({ icon: 'none', title: '保存成功！' })
         this.$refs.popupAuditing.close()
diff --git a/pages/workPlan/monthPlan/pro-index.vue b/pages/workPlan/monthPlan/pro-index.vue
index 71955d1..8c87931 100644
--- a/pages/workPlan/monthPlan/pro-index.vue
+++ b/pages/workPlan/monthPlan/pro-index.vue
@@ -750,7 +750,7 @@ export default {
       currentSwiper: 0,
       projectQueryParams: {
         planTime: this.$moment().format('YYYY-MM-DD'),
-        type: 6,
+        type: '6',
         state: ''
       },
       projectRange: [
@@ -1016,8 +1016,13 @@ export default {
                 state: '1'
               }
               console.log('saveParams保存参数', saveParams)
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
 
               const result = await setMonthPlanProApi(saveParams)
+              uni.hideLoading({})
               if (result.res == 1) {
                 uni.showToast({ icon: 'none', title: '保存成功！' })
                 setTimeout(() => {
@@ -1385,8 +1390,12 @@ export default {
         state: '2'
       }
       console.log('saveParams保存参数', saveParams)
-
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
       const result = await setMonthPlanProApi(saveParams)
+      uni.hideLoading()
       if (result.res == 1) {
         uni.showToast({ icon: 'none', title: '保存成功！' })
         this.$refs.popupAuditing.close()
diff --git a/pages/workPlan/monthPlanAuditingDetails/inf-index.vue b/pages/workPlan/monthPlanAuditingDetails/inf-index.vue
index 284aa91..06fc940 100644
--- a/pages/workPlan/monthPlanAuditingDetails/inf-index.vue
+++ b/pages/workPlan/monthPlanAuditingDetails/inf-index.vue
@@ -127,8 +127,9 @@
       </swiper>
     </view>
 
-    <view class="revoke" v-show="!isView || isView == 'false'">
-      <view @tap="onAuditingComplete" class="auditing-complete">审核完成</view>
+    <view class="revoke" v-show="!isView || isView == 'false'" @tap="onAuditingComplete">
+      <!-- <view  class="auditing-complete"></view> -->
+      审核完成
       <!-- <view
         @tap="showModalFun(item.id)"
         v-for="item in btnList"
@@ -545,7 +546,12 @@ export default {
               this.getAUditingUserInfoData()
               this.$refs.popupAuditing.open('center')
             } else {
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await API(type === 1 ? params : this.params)
+              uni.hideLoading({})
               if (result.res == 1) {
                 uni.showToast({ title: `${tipTitle}成功！`, icon: 'none' })
                 setTimeout(() => {
@@ -692,8 +698,12 @@ export default {
       }
 
       console.log('saveParams保存参数', params)
-
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
       const result = await submitPlanApi(params)
+      uni.hideLoading({})
 
       console.log(result, 'results上报人提交结果')
       if (result.res == 1) {
@@ -834,7 +844,7 @@ export default {
             titleH
               .boundingClientRect(data => {
                 let pH = that._data.pH
-                that._data.navHeight = pH - data.top - bottomHeight - 48
+                that._data.navHeight = pH - data.top - bottomHeight - 16
               })
               .exec()
           })
@@ -859,14 +869,17 @@ export default {
 }
 
 .revoke {
-  width: 100%;
-  padding: 12px 0;
+  width: 94%;
+  // padding: 12px 0;
   position: fixed;
-  bottom: 0;
-  left: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  bottom: 12px;
+  left: 3%;
+  height: 70rpx;
+  border-radius: 16rpx;
+  text-align: center;
+  line-height: 70rpx;
+  color: #fff;
+  background-color: #00337a;
   // background-color: #fff;
 
   .auditing-complete {
diff --git a/pages/workPlan/monthPlanAuditingDetails/pro-index.vue b/pages/workPlan/monthPlanAuditingDetails/pro-index.vue
index 34f027d..bdcb8c3 100644
--- a/pages/workPlan/monthPlanAuditingDetails/pro-index.vue
+++ b/pages/workPlan/monthPlanAuditingDetails/pro-index.vue
@@ -133,8 +133,8 @@
       </swiper>
     </view>
 
-    <view class="revoke" v-show="!isView || isView == 'false'">
-      <view @tap="onAuditingComplete" class="auditing-complete">审核完成</view>
+    <view class="revoke" v-show="!isView || isView == 'false'" @tap="onAuditingComplete">
+      审核完成
       <!-- <view
         @tap="showModalFun(item.id)"
         v-for="item in btnList"
@@ -499,7 +499,12 @@ export default {
               this.getAUditingUserInfoData()
               this.$refs.popupAuditing.open('center')
             } else {
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await API(type === 1 ? params : this.params)
+              uni.hideLoading({})
               if (result.res == 1) {
                 uni.showToast({ title: `${tipTitle}成功！`, icon: 'none' })
                 setTimeout(() => {
@@ -643,8 +648,12 @@ export default {
       }
 
       console.log('saveParams保存参数', params)
-
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
       const result = await submitPlanProApi(params)
+      uni.hideLoading()
 
       console.log(result, 'results上报人提交结果')
       if (result.res == 1) {
@@ -780,7 +789,7 @@ export default {
             titleH
               .boundingClientRect(data => {
                 let pH = that._data.pH
-                that._data.navHeight = pH - data.top - bottomHeight - 48
+                that._data.navHeight = pH - data.top - bottomHeight - 16
               })
               .exec()
           })
@@ -805,14 +814,17 @@ export default {
 }
 
 .revoke {
-  width: 100%;
-  padding: 12px 0;
+  width: 94%;
+  // padding: 12px 0;
   position: fixed;
-  bottom: 0;
-  left: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  bottom: 12px;
+  left: 3%;
+  height: 70rpx;
+  border-radius: 16rpx;
+  text-align: center;
+  line-height: 70rpx;
+  color: #fff;
+  background-color: #00337a;
   // background-color: #fff;
 
   .auditing-complete {
diff --git a/pages/workPlan/networkPlan/inf-index.vue b/pages/workPlan/networkPlan/inf-index.vue
index de8b500..a24de06 100644
--- a/pages/workPlan/networkPlan/inf-index.vue
+++ b/pages/workPlan/networkPlan/inf-index.vue
@@ -883,7 +883,13 @@ export default {
             }
             console.log('saveParams保存参数', saveParams)
 
+            uni.showLoading({
+              title: '正在提交，请勿重复点击',
+              mask: true
+            })
+
             const result = await setMonthPlanApi(saveParams)
+            uni.hideLoading({})
             if (result.res == 1) {
               uni.showToast({ icon: 'none', title: '保存成功！' })
               setTimeout(() => {
diff --git a/pages/workPlan/networkPlan/pro-index.vue b/pages/workPlan/networkPlan/pro-index.vue
index a8a1e9a..c7a5b4a 100644
--- a/pages/workPlan/networkPlan/pro-index.vue
+++ b/pages/workPlan/networkPlan/pro-index.vue
@@ -635,7 +635,7 @@ export default {
       currentSwiper: 0,
       projectQueryParams: {
         planTime: this.$moment().format('YYYY-MM-DD'),
-        type: 3,
+        type: '6',
         state: ''
       },
       projectRange: [
@@ -884,7 +884,13 @@ export default {
             }
             console.log('saveParams保存参数', saveParams)
 
+            uni.showLoading({
+              title: '正在提交，请勿重复点击',
+              mask: true
+            })
+
             const result = await setMonthPlanProApi(saveParams)
+            uni.hideLoading({})
             if (result.res == 1) {
               uni.showToast({ icon: 'none', title: '保存成功！' })
               setTimeout(() => {
diff --git a/pages/workPlan/networkPlanDetails/inf-index.vue b/pages/workPlan/networkPlanDetails/inf-index.vue
index af889f8..e4ba979 100644
--- a/pages/workPlan/networkPlanDetails/inf-index.vue
+++ b/pages/workPlan/networkPlanDetails/inf-index.vue
@@ -365,7 +365,12 @@ export default {
             const params = {
               id: JSON.stringify(this.monthDetailsList)
             }
+            uni.showLoading({
+              title: '正在提交，请勿重复点击',
+              mask: true
+            })
             const result = await API(type === 1 ? params : this.params)
+            uni.hideLoading({})
 
             if (result.res == 1) {
               uni.showToast({ title: `${tipTitle}成功！`, icon: 'none' })
diff --git a/pages/workPlan/networkPlanDetails/pro-index.vue b/pages/workPlan/networkPlanDetails/pro-index.vue
index 1424f35..61236d2 100644
--- a/pages/workPlan/networkPlanDetails/pro-index.vue
+++ b/pages/workPlan/networkPlanDetails/pro-index.vue
@@ -356,7 +356,12 @@ export default {
             const params = {
               id: JSON.stringify(this.monthDetailsList)
             }
+            uni.showLoading({
+              title: '正在提交，请勿重复点击',
+              mask: true
+            })
             const result = await API(type === 1 ? params : this.params)
+            uni.hideLoading({})
 
             if (result.res == 1) {
               uni.showToast({ title: `${tipTitle}成功！`, icon: 'none' })
diff --git a/pages/workPlan/selectRisk/index.vue b/pages/workPlan/selectRisk/index.vue
index 3a7398f..23d2a36 100644
--- a/pages/workPlan/selectRisk/index.vue
+++ b/pages/workPlan/selectRisk/index.vue
@@ -12,12 +12,12 @@
 
     <view class="header-search">
       <view style="width: 28%">
-        <uni-data-select :localdata="range" v-model="searchParams.proType"></uni-data-select>
+        <uni-data-select :localdata="range" v-model="searchParams.proType" :clear="false"></uni-data-select>
       </view>
       <view style="width: 49%">
         <uni-easyinput placeholder="搜索" v-model="searchParams.remark"></uni-easyinput>
       </view>
-      <view style="width: 18%" @tap="getDayRiskData">搜索</view>
+      <view class="search-img" @tap="getDayRiskData"></view>
     </view>
 
     <view class="search-radio">
@@ -109,6 +109,15 @@ export default {
   display: flex;
   align-items: center;
 }
+
+.search-img {
+  width: 68rpx;
+  height: 68rpx;
+  margin-right: 10rpx;
+  // margin-left: 30rpx;
+  background: url('../../../static/images/workPlan/search.png') no-repeat;
+  background-size: 100% 100%;
+}
 .header-search {
   margin-bottom: 24rpx;
   margin: 12rpx;
diff --git a/pages/workPlan/tempPlan/inf-index.vue b/pages/workPlan/tempPlan/inf-index.vue
index 403cc4d..36d9511 100644
--- a/pages/workPlan/tempPlan/inf-index.vue
+++ b/pages/workPlan/tempPlan/inf-index.vue
@@ -1140,8 +1140,12 @@ export default {
                 state: ''
               }
               console.log('saveParams保存参数', saveParams)
-
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await setMonthPlanApi(saveParams)
+              uni.hideLoading({})
               if (result.res == 1) {
                 uni.showToast({ icon: 'none', title: '保存成功！' })
                 setTimeout(() => {
@@ -1516,8 +1520,12 @@ export default {
         state: '2'
       }
       console.log('saveParams保存参数', saveParams)
-
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
       const result = await setMonthPlanApi(saveParams)
+      uni.hideLoading({})
       if (result.res == 1) {
         uni.showToast({ icon: 'none', title: '保存成功！' })
         this.$refs.popupAuditing.close()
diff --git a/pages/workPlan/tempPlan/pro-index.vue b/pages/workPlan/tempPlan/pro-index.vue
index 1777ab8..8bcd5ac 100644
--- a/pages/workPlan/tempPlan/pro-index.vue
+++ b/pages/workPlan/tempPlan/pro-index.vue
@@ -868,7 +868,7 @@ export default {
       currentSwiper: 0,
       projectQueryParams: {
         planTime: this.$moment().format('YYYY-MM-DD'),
-        type: 3,
+        type: '6',
         state: ''
       },
       projectRange: [
@@ -1188,8 +1188,12 @@ export default {
                 state: ''
               }
               console.log('saveParams保存参数', saveParams)
-
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await setMonthPlanProApi(saveParams)
+              uni.hideLoading({})
               if (result.res == 1) {
                 uni.showToast({ icon: 'none', title: '保存成功！' })
                 setTimeout(() => {
@@ -1564,8 +1568,12 @@ export default {
         state: '2'
       }
       console.log('saveParams保存参数', saveParams)
-
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
       const result = await setMonthPlanProApi(saveParams)
+      uni.hideLoading()
       if (result.res == 1) {
         uni.showToast({ icon: 'none', title: '保存成功！' })
         this.$refs.popupAuditing.close()
diff --git a/pages/workPlan/tempPlanAuditingDetails/inf-index.vue b/pages/workPlan/tempPlanAuditingDetails/inf-index.vue
index f025c06..46729b8 100644
--- a/pages/workPlan/tempPlanAuditingDetails/inf-index.vue
+++ b/pages/workPlan/tempPlanAuditingDetails/inf-index.vue
@@ -127,8 +127,9 @@
       </swiper>
     </view>
 
-    <view class="revoke" v-show="!isView || isView == 'false'">
-      <view @tap="onAuditingComplete" class="auditing-complete">审核完成</view>
+    <view class="revoke" v-show="!isView || isView == 'false'" @tap="onAuditingComplete">
+      审核完成
+      <!-- <view  class="auditing-complete">/view> -->
       <!-- <view
         @tap="showModalFun(item.id)"
         v-for="item in btnList"
@@ -557,7 +558,12 @@ export default {
               this.getAUditingUserInfoData()
               this.$refs.popupAuditing.open('center')
             } else {
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await API(type === 1 ? params : this.params)
+              uni.hideLoading({})
               if (result.res == 1) {
                 uni.showToast({ title: `${tipTitle}成功！`, icon: 'none' })
                 setTimeout(() => {
@@ -704,8 +710,12 @@ export default {
       }
 
       console.log('saveParams保存参数', params)
-
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
       const result = await submitPlanApi(params)
+      uni.hideLoading()
 
       console.log(result, 'results上报人提交结果')
       if (result.res == 1) {
@@ -846,7 +856,7 @@ export default {
             titleH
               .boundingClientRect(data => {
                 let pH = that._data.pH
-                that._data.navHeight = pH - data.top - bottomHeight - 48
+                that._data.navHeight = pH - data.top - bottomHeight - 16
               })
               .exec()
           })
@@ -871,19 +881,25 @@ export default {
 }
 
 .revoke {
-  width: 100%;
-  padding: 12px 0;
+  width: 94%;
+  // padding: 12px 0;
   position: fixed;
-  bottom: 0;
-  left: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  bottom: 12px;
+  left: 3%;
+  height: 70rpx;
+  border-radius: 16rpx;
+  text-align: center;
+  line-height: 70rpx;
+  color: #fff;
+  background-color: #00337a;
+  // display: flex;
+  // justify-content: center;
+  // align-items: center;
   // background-color: #fff;
 
   .auditing-complete {
     width: 93%;
-    height: 70rpx;
+
     margin: 0 auto;
     border-radius: 16rpx;
     text-align: center;
diff --git a/pages/workPlan/tempPlanAuditingDetails/pro-index.vue b/pages/workPlan/tempPlanAuditingDetails/pro-index.vue
index 5bda9e1..5e3432c 100644
--- a/pages/workPlan/tempPlanAuditingDetails/pro-index.vue
+++ b/pages/workPlan/tempPlanAuditingDetails/pro-index.vue
@@ -587,7 +587,12 @@ export default {
               this.getAUditingUserInfoData()
               this.$refs.popupAuditing.open('center')
             } else {
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await API(type === 1 ? params : this.params)
+              uni.hideLoading({})
               if (result.res == 1) {
                 uni.showToast({ title: `${tipTitle}成功！`, icon: 'none' })
                 setTimeout(() => {
@@ -735,7 +740,13 @@ export default {
 
       console.log('saveParams保存参数', params)
 
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
+
       const result = await submitPlanProApi(params)
+      uni.hideLoading()
 
       console.log(result, 'results上报人提交结果')
       if (result.res == 1) {
diff --git a/pages/workPlan/weekPlan/inf-index.vue b/pages/workPlan/weekPlan/inf-index.vue
index 6dc1f4b..3056f03 100644
--- a/pages/workPlan/weekPlan/inf-index.vue
+++ b/pages/workPlan/weekPlan/inf-index.vue
@@ -1148,7 +1148,13 @@ export default {
 
               // if (true) return
 
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
+
               const result = await setMonthPlanApi(saveParams)
+              uni.hideLoading({})
               if (result.res == 1) {
                 uni.showToast({ icon: 'none', title: '保存成功！' })
                 setTimeout(() => {
@@ -1539,7 +1545,13 @@ export default {
       }
       console.log('saveParams保存参数', saveParams)
 
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
+
       const result = await setMonthPlanApi(saveParams)
+      uni.hideLoading()
       if (result.res == 1) {
         uni.showToast({ icon: 'none', title: '保存成功！' })
         this.$refs.popupAuditing.close()
diff --git a/pages/workPlan/weekPlan/pro-index.vue b/pages/workPlan/weekPlan/pro-index.vue
index 7bbd412..d0d72ef 100644
--- a/pages/workPlan/weekPlan/pro-index.vue
+++ b/pages/workPlan/weekPlan/pro-index.vue
@@ -1212,8 +1212,12 @@ export default {
               console.log('saveParams保存参数', saveParams)
 
               // if (true) return
-
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await setMonthPlanProApi(saveParams)
+              uni.hideLoading({})
               if (result.res == 1) {
                 uni.showToast({ icon: 'none', title: '保存成功！' })
                 setTimeout(() => {
@@ -1603,8 +1607,12 @@ export default {
         state: '2'
       }
       console.log('saveParams保存参数', saveParams)
-
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
       const result = await setMonthPlanProApi(saveParams)
+      uni.hideLoading({})
       if (result.res == 1) {
         uni.showToast({ icon: 'none', title: '保存成功！' })
         this.$refs.popupAuditing.close()
diff --git a/pages/workPlan/weekPlanAuditingDetails/inf-index.vue b/pages/workPlan/weekPlanAuditingDetails/inf-index.vue
index a3fbb38..64b43d5 100644
--- a/pages/workPlan/weekPlanAuditingDetails/inf-index.vue
+++ b/pages/workPlan/weekPlanAuditingDetails/inf-index.vue
@@ -133,8 +133,9 @@
       </swiper>
     </view>
 
-    <view class="revoke" v-show="!isView || isView == 'false'">
-      <view @tap="onAuditingComplete" class="auditing-complete">审核完成</view>
+    <view class="revoke" v-show="!isView || isView == 'false'" @tap="onAuditingComplete">
+      审核完成
+      <!-- <view @tap="onAuditingComplete" class="auditing-complete"></view> -->
       <!-- <view
         @tap="showModalFun(item.id)"
         v-for="item in btnList"
@@ -543,7 +544,12 @@ export default {
               this.getAUditingUserInfoData()
               this.$refs.popupAuditing.open('center')
             } else {
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await API(type === 1 ? params : this.params)
+              uni.hideLoading()
               if (result.res == 1) {
                 uni.showToast({ title: `${tipTitle}成功！`, icon: 'none' })
                 setTimeout(() => {
@@ -693,7 +699,12 @@ export default {
       uni.showLoading({
         title: '正在提交，请稍后...'
       })
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
       const result = await submitPlanApi(params)
+      uni.hideLoading()
 
       console.log(result, 'results上报人提交结果')
       if (result.res == 1) {
@@ -879,7 +890,7 @@ export default {
             titleH
               .boundingClientRect(data => {
                 let pH = that._data.pH
-                that._data.navHeight = pH - data.top - bottomHeight - 48
+                that._data.navHeight = pH - data.top - bottomHeight - 16
               })
               .exec()
           })
@@ -905,13 +916,16 @@ export default {
 
 .revoke {
   width: 94%;
-  padding: 12px 0;
+  // padding: 12px 0;
   position: fixed;
-  bottom: 0;
+  bottom: 12px;
   left: 3%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  height: 70rpx;
+  border-radius: 16rpx;
+  text-align: center;
+  line-height: 70rpx;
+  color: #fff;
+  background-color: #00337a;
   // background-color: #fff;
 
   .auditing-complete {
diff --git a/pages/workPlan/weekPlanAuditingDetails/pro-index.vue b/pages/workPlan/weekPlanAuditingDetails/pro-index.vue
index 6b6c4d2..44f8c84 100644
--- a/pages/workPlan/weekPlanAuditingDetails/pro-index.vue
+++ b/pages/workPlan/weekPlanAuditingDetails/pro-index.vue
@@ -139,8 +139,9 @@
       </swiper>
     </view>
 
-    <view class="revoke" v-show="!isView || isView == 'false'">
-      <view @tap="onAuditingComplete" class="auditing-complete">审核完成</view>
+    <view class="revoke" v-show="!isView || isView == 'false'" @tap="onAuditingComplete">
+      审核完成
+      <!-- <view @tap="onAuditingComplete" class="auditing-complete"></view> -->
       <!-- <view
         @tap="showModalFun(item.id)"
         v-for="item in btnList"
@@ -640,7 +641,12 @@ export default {
               this.getAUditingUserInfoData()
               this.$refs.popupAuditing.open('center')
             } else {
+              uni.showLoading({
+                title: '正在提交，请勿重复点击',
+                mask: true
+              })
               const result = await API(type === 1 ? params : this.params)
+              uni.hideLoading({})
               if (result.res == 1) {
                 uni.showToast({ title: `${tipTitle}成功！`, icon: 'none' })
                 setTimeout(() => {
@@ -787,8 +793,12 @@ export default {
       }
 
       console.log('saveParams保存参数', params)
-
+      uni.showLoading({
+        title: '正在提交，请勿重复点击',
+        mask: true
+      })
       const result = await submitPlanProApi(params)
+      uni.hideLoading({})
 
       console.log(result, 'results上报人提交结果')
       if (result.res == 1) {
@@ -970,7 +980,7 @@ export default {
             titleH
               .boundingClientRect(data => {
                 let pH = that._data.pH
-                that._data.navHeight = pH - data.top - bottomHeight - 48
+                that._data.navHeight = pH - data.top - bottomHeight - 16
               })
               .exec()
           })
@@ -995,14 +1005,17 @@ export default {
 }
 
 .revoke {
-  width: 100%;
-  padding: 12px 0;
+  width: 94%;
+  // padding: 12px 0;
   position: fixed;
-  bottom: 0;
-  left: 0;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  bottom: 12px;
+  left: 3%;
+  height: 70rpx;
+  border-radius: 16rpx;
+  text-align: center;
+  line-height: 70rpx;
+  color: #fff;
+  background-color: #00337a;
   // background-color: #fff;
 
   .auditing-complete {
diff --git a/static/images/workPlan/search.png b/static/images/workPlan/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5433c80260e6befaf9792dd952b24d708b51dea
GIT binary patch
literal 957
zcmV;u148_XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&cS%G+R9HvVmtANbRS?I2vwH~$B1QTji1gzvQmHAnLSJnCDCm=dA{H$TJ}A-T
zo^weBK{Q1WOugLMY@!kbi-HI#A|i?(s0cn7trWkt^^*pDP$Nh{x%ckKDSJz7?|0e+
z4=gNaXXgB8&dh&ig*9HX#^>|@05Cc_x;2jD?ZBX!T`nSnz<M+L3<%FR!0{wWUg<TW
z9V6hJ+YeNLb<2#O1bzjs1PYCP5qUL=qTzD6{9Cs`S_1IiUtnf005=0C%xo6;N<@yT
z>M!AdiHV8A;^N{Euq}$BeP*^3_y^dlsxNf|qA39H{bn=!E;o<@53A~*oeUO>#ivB%
z-dt{2RS$R4X$rtO_cL%AaFeRO-pR=F@8jd+n`*V%_hGMEt*)P$nfbk){#gLL_o<oP
z54@$SdwMy%A?v;0V`gsvhgEgBYXHS!@dgoj6IiNNs~b9@Z)ey!_Z)DSncbHp$&;;Q
z{}Tb{+|$54B2ubUDk1axUf%m1X7(ZQxvE~#Er5Aod#zU6JUu=AL*J+8iq5&f5nHk>
z+b}gX74qt=bvgpx`-{yiB+QShx@o0{2Yu(<i@@!`ZK`^tEr3#~bX}HZZv!u@>MiF8
zzyrYJW_Bn^lJMR-0?xTd0=I-mRS%vc0K0&9f%jB(_nJijP*wG7nFB3Z@ys$jFI4~x
zsp_$|5y-Rl6b}FgRP~9K<iXh3*v=@5J^<!b_3Ey8pj0aD&a&*CARNc>V7XlWx?d2^
zxz~Ujfqkm_d{+SSC_Dx{2z;ulTl)dvoErtEfG<>aOFJ8_y5UE_RY0n$W4(ZI&Xs_2
zuG7~0Ak%Unan1!Q-WZ0FkQb_Y>S|i8aOZIxAIgW4FgvUhk-wLgmM)r|ovn6#1<M7!
z_jjAwGx^>T5t+}j?ENH3LX%-+WaN@Up|DFtt`U(tfeQnZnpx<6`$c3g@W;Twz{bhR
z$-g>QK{Em8+_pfc!1ayqBC=>^KjkxFV>@_#aA9E~otvAh=lS$(00Nwh<9Mjqtk`iV
zZCKCSYnY5fo82KImjXwDPr|GSeB7+o8!aCARz$9?R4NP09qk%GFNt`jtoJ@KvyjZk
z>h=1qX__|X&DHxc@!n6G*?~~r^?Ln|G)=#3TLmlexRtK={!ue~2sqsvR^<wMCZhA<
feP2AV8bJO9pk#S4uXi4X00000NkvXXu0mjfTBgg%

literal 0
HcmV?d00001