From a8f41928e312f88782a72433ff1c08b5299379f6 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 5 Nov 2024 09:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=88=99=E7=AD=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/workPlan/networkPlan.js              |  4 ++--
 api/workPlan/weekPlan.js                 |  2 +-
 pages/workPlan/custody/index.vue         |  2 +-
 pages/workPlan/dayPlan/inf-index.vue     | 25 +++++++++++++++++---
 pages/workPlan/dayPlan/pro-index.vue     | 23 +++++++++++++++++--
 pages/workPlan/monthPlan/inf-index.vue   | 29 +++++++++++++++++++++++-
 pages/workPlan/monthPlan/pro-index.vue   | 19 ++++++++++++++++
 pages/workPlan/networkPlan/inf-index.vue | 19 ++++++++++++++++
 pages/workPlan/networkPlan/pro-index.vue | 19 ++++++++++++++++
 pages/workPlan/tempPlan/inf-index.vue    | 17 ++++++++++++++
 pages/workPlan/tempPlan/pro-index.vue    | 17 ++++++++++++++
 pages/workPlan/weekPlan/inf-index.vue    | 23 +++++++++++++++++--
 pages/workPlan/weekPlan/pro-index.vue    | 23 +++++++++++++++++--
 13 files changed, 208 insertions(+), 14 deletions(-)

diff --git a/api/workPlan/networkPlan.js b/api/workPlan/networkPlan.js
index e000537..6caffef 100644
--- a/api/workPlan/networkPlan.js
+++ b/api/workPlan/networkPlan.js
@@ -131,7 +131,7 @@ export function getReportFormListApi(data) {
 // 月计划-导入计划 --基建
 export function getImportMonthPlanApi(data) {
   return request_yn({
-    url: '/ynPlanApp/infMonth/getPrevPlan',
+    url: '/ynPlanApp/infWeb/getPrevPlan',
     method: 'post',
     data: data
   })
@@ -318,7 +318,7 @@ export function getReportFormListProApi(data) {
 // 月计划-导入计划 --基建
 export function getImportMonthPlanProApi(data) {
   return request_yn({
-    url: '/ynPlanApp/proMonth/getPrevPlan',
+    url: '/ynPlanApp/proWeb/getPrevPlan',
     method: 'post',
     data: data
   })
diff --git a/api/workPlan/weekPlan.js b/api/workPlan/weekPlan.js
index 2c2450e..e50fbf9 100644
--- a/api/workPlan/weekPlan.js
+++ b/api/workPlan/weekPlan.js
@@ -131,7 +131,7 @@ export function getReportFormListApi(data) {
 // 月计划-导入计划 --基建
 export function getImportMonthPlanApi(data) {
   return request_yn({
-    url: '/ynPlanApp/infMonth/getPrevPlan',
+    url: '/ynPlanApp/infWeek/getPrevPlan',
     method: 'post',
     data: data
   })
diff --git a/pages/workPlan/custody/index.vue b/pages/workPlan/custody/index.vue
index fb8449f..514d5fb 100644
--- a/pages/workPlan/custody/index.vue
+++ b/pages/workPlan/custody/index.vue
@@ -448,7 +448,7 @@ export default {
     // 获取定位位置信息
     uni.getLocation({
       type: 'gcj02', // 默认为 gcj02，可以选择 'wgs84'
-      // altitude: true,
+      altitude: true,
       geocode: true,
       success: res => {
         console.log(res, '位置信息--')
diff --git a/pages/workPlan/dayPlan/inf-index.vue b/pages/workPlan/dayPlan/inf-index.vue
index 8b88521..3170e6a 100644
--- a/pages/workPlan/dayPlan/inf-index.vue
+++ b/pages/workPlan/dayPlan/inf-index.vue
@@ -177,6 +177,7 @@
                       :type="f.isType ? f.isType : 'text'"
                       v-model="item[f.name]"
                       placeholder="请填写"
+                      @input="handleInput($event, f.isType, index, f.name)"
                     />
                     <!-- <uni-easyinput
                       v-if="f.items_type === 'ipt' && f.name != 'rys' && f.name != 'zynr'"
@@ -193,7 +194,7 @@
                     ></uni-data-select>
 
                     <view v-if="f.name === 'rys'" @tap="onAddSubUserInfo(f.name)">
-                      <uni-easyinput :autoHeight="true" type="text" v-model="item.rys" placeholder="请选择" />
+                      <u--input :autoHeight="true" type="text" v-model="item.rys" placeholder="请选择" disabled />
 
                       <!-- <uni-easyinput
                         v-else
@@ -1594,14 +1595,16 @@ export default {
       }
       const params = {
         proId: this.projectId,
-        month: this.DateValue
+        planDate: this.DateValue
       }
 
       console.log(params, 'params')
       const res = await getImportMonthPlanApi(params)
       console.log('导入计划的结果', res)
       if (res.res == 0) {
-        uni.showToast({ title: '获取失败，该日期上月无计划', icon: 'none' })
+        uni.showToast({ title: '获取失败，该日期上日无计划', icon: 'none' })
+        this.monthParams = []
+        this.monthParams.push(this.paramsItem)
         return
       } else {
         this.monthParams = res.obj
@@ -1654,6 +1657,22 @@ export default {
         })
         this.$refs.popupWorkContent.close()
       } catch (error) {}
+    },
+    handleInput(e, type, index, name) {
+      if (type == 'number') {
+        const regex = /^[1-9]\d*$/
+        if (!regex.test(e)) {
+          // console.log('不符合要求', typeof e)
+          this.$nextTick(() => {
+            this.monthParams[index][name] = ''
+            e = ''
+          })
+        } else {
+          this.$nextTick(() => {
+            this.monthParams[index][name] = e
+          })
+        }
+      }
     }
   },
 
diff --git a/pages/workPlan/dayPlan/pro-index.vue b/pages/workPlan/dayPlan/pro-index.vue
index caf2c76..f209f04 100644
--- a/pages/workPlan/dayPlan/pro-index.vue
+++ b/pages/workPlan/dayPlan/pro-index.vue
@@ -185,6 +185,7 @@
                       :type="f.isType ? f.isType : 'text'"
                       v-model="item[f.name]"
                       placeholder="请填写"
+                      @input="handleInput($event, f.isType, index, f.name)"
                     />
                     <uni-data-select
                       v-model="item[f.name]"
@@ -1614,14 +1615,16 @@ export default {
       }
       const params = {
         proId: this.projectId,
-        month: this.DateValue
+        planDate: this.DateValue
       }
 
       console.log(params, 'params')
       const res = await getImportMonthPlanProApi(params)
       console.log('导入计划的结果', res)
       if (res.res == 0) {
-        uni.showToast({ title: '获取失败，该日期上月无计划', icon: 'none' })
+        uni.showToast({ title: '获取失败，该日期上日无计划', icon: 'none' })
+        this.monthParams = []
+        this.monthParams.push(this.paramsItem)
         return
       } else {
         this.monthParams = res.obj
@@ -1693,6 +1696,22 @@ export default {
         })
       } catch (error) {}
       // console.log('result_1', result_1, 'result_2', result_2)
+    },
+    handleInput(e, type, index, name) {
+      if (type == 'number') {
+        const regex = /^[1-9]\d*$/
+        if (!regex.test(e)) {
+          // console.log('不符合要求', typeof e)
+          this.$nextTick(() => {
+            this.monthParams[index][name] = ''
+            e = ''
+          })
+        } else {
+          this.$nextTick(() => {
+            this.monthParams[index][name] = e
+          })
+        }
+      }
     }
   },
 
diff --git a/pages/workPlan/monthPlan/inf-index.vue b/pages/workPlan/monthPlan/inf-index.vue
index 1153cfd..3390c4c 100644
--- a/pages/workPlan/monthPlan/inf-index.vue
+++ b/pages/workPlan/monthPlan/inf-index.vue
@@ -176,6 +176,7 @@
                       :type="f.isType ? f.isType : 'text'"
                       v-model="item[f.name]"
                       placeholder="请填写"
+                      @input="handleInput($event, f.isType, index, f.name)"
                     />
                     <uni-data-select
                       v-model="item[f.name]"
@@ -566,6 +567,7 @@ import {
   getReportFormListApi,
   getImportMonthPlanApi
 } from '../../../api/workPlan/monthPlan'
+import editProfileVue from '../../YNEduApp/user/editProfile.vue'
 export default {
   components: {
     TimeSelect
@@ -643,7 +645,14 @@ export default {
           rules: [{ required: true, errorMessage: '请填写单位负责人/联系电话' }]
         },
         planCount: {
-          rules: [{ required: true, errorMessage: '请填写计划数量' }]
+          rules: [
+            { required: true, errorMessage: '请填写计划数量' },
+            {
+              pattern: /^[1-9]\d*$/,
+              message: '请输入正整数',
+              trigger: 'blur'
+            }
+          ]
         }
       },
       infrastructureFormLabel: [
@@ -1512,10 +1521,28 @@ export default {
       console.log('导入计划的结果', res)
       if (res.res == 0) {
         uni.showToast({ title: '获取失败，该日期上月无计划', icon: 'none' })
+        this.monthParams = []
+        this.monthParams.push(this.paramsItem)
         return
       } else {
         this.monthParams = res.obj
       }
+    },
+    handleInput(e, type, index, name) {
+      if (type == 'number') {
+        const regex = /^[1-9]\d*$/
+        if (!regex.test(e)) {
+          // console.log('不符合要求', typeof e)
+          this.$nextTick(() => {
+            this.monthParams[index][name] = ''
+            e = ''
+          })
+        } else {
+          this.$nextTick(() => {
+            this.monthParams[index][name] = e
+          })
+        }
+      }
     }
   },
 
diff --git a/pages/workPlan/monthPlan/pro-index.vue b/pages/workPlan/monthPlan/pro-index.vue
index c77f5e9..71955d1 100644
--- a/pages/workPlan/monthPlan/pro-index.vue
+++ b/pages/workPlan/monthPlan/pro-index.vue
@@ -169,6 +169,7 @@
                       :type="f.isType ? f.isType : 'text'"
                       v-model="item[f.name]"
                       placeholder="请填写"
+                      @input="handleInput($event, f.isType, index, f.name)"
                     />
                     <uni-data-select
                       v-model="item[f.name]"
@@ -1585,10 +1586,28 @@ export default {
       console.log('导入计划的结果', res)
       if (res.res == 0) {
         uni.showToast({ title: '获取失败，该日期上月无计划', icon: 'none' })
+        this.monthParams = []
+        this.monthParams.push(this.paramsItem)
         return
       } else {
         this.monthParams = res.obj
       }
+    },
+    handleInput(e, type, index, name) {
+      if (type == 'number') {
+        const regex = /^[1-9]\d*$/
+        if (!regex.test(e)) {
+          // console.log('不符合要求', typeof e)
+          this.$nextTick(() => {
+            this.monthParams[index][name] = ''
+            e = ''
+          })
+        } else {
+          this.$nextTick(() => {
+            this.monthParams[index][name] = e
+          })
+        }
+      }
     }
   },
 
diff --git a/pages/workPlan/networkPlan/inf-index.vue b/pages/workPlan/networkPlan/inf-index.vue
index 1888e9f..d883870 100644
--- a/pages/workPlan/networkPlan/inf-index.vue
+++ b/pages/workPlan/networkPlan/inf-index.vue
@@ -132,6 +132,7 @@
                       :type="f.isType ? f.isType : 'text'"
                       v-model="item[f.name]"
                       placeholder="请填写"
+                      @input="handleInput($event, f.isType, index, f.name)"
                     />
                     <uni-data-select
                       v-model="item[f.name]"
@@ -1431,6 +1432,8 @@ export default {
       console.log('导入计划的结果', res)
       if (res.res == 0) {
         uni.showToast({ title: '获取失败，该日期上月无计划', icon: 'none' })
+        this.monthParams = []
+        this.monthParams.push(this.paramsItem)
         return
       } else {
         this.monthParams = res.obj
@@ -1440,6 +1443,22 @@ export default {
       console.log(e, index, '******')
 
       this.monthParams[index].tdsj = `${e[0]}~${e[1]}`
+    },
+    handleInput(e, type, index, name) {
+      if (type == 'number') {
+        const regex = /^[1-9]\d*$/
+        if (!regex.test(e)) {
+          // console.log('不符合要求', typeof e)
+          this.$nextTick(() => {
+            this.monthParams[index][name] = ''
+            e = ''
+          })
+        } else {
+          this.$nextTick(() => {
+            this.monthParams[index][name] = e
+          })
+        }
+      }
     }
   },
 
diff --git a/pages/workPlan/networkPlan/pro-index.vue b/pages/workPlan/networkPlan/pro-index.vue
index b3731fc..7f2d7d0 100644
--- a/pages/workPlan/networkPlan/pro-index.vue
+++ b/pages/workPlan/networkPlan/pro-index.vue
@@ -132,6 +132,7 @@
                       :type="f.isType ? f.isType : 'text'"
                       v-model="item[f.name]"
                       placeholder="请填写"
+                      @input="handleInput($event, f.isType, index, f.name)"
                     />
                     <uni-data-select
                       v-model="item[f.name]"
@@ -1439,6 +1440,8 @@ export default {
       console.log('导入计划的结果', res)
       if (res.res == 0) {
         uni.showToast({ title: '获取失败，该日期上月无计划', icon: 'none' })
+        this.monthParams = []
+        this.monthParams.push(this.paramsItem)
         return
       } else {
         this.monthParams = res.obj
@@ -1448,6 +1451,22 @@ export default {
       console.log(e, index, '******')
 
       this.monthParams[index].tdsj = `${e[0]}~${e[1]}`
+    },
+    handleInput(e, type, index, name) {
+      if (type == 'number') {
+        const regex = /^[1-9]\d*$/
+        if (!regex.test(e)) {
+          // console.log('不符合要求', typeof e)
+          this.$nextTick(() => {
+            this.monthParams[index][name] = ''
+            e = ''
+          })
+        } else {
+          this.$nextTick(() => {
+            this.monthParams[index][name] = e
+          })
+        }
+      }
     }
   },
 
diff --git a/pages/workPlan/tempPlan/inf-index.vue b/pages/workPlan/tempPlan/inf-index.vue
index 1d1bb49..8199cbe 100644
--- a/pages/workPlan/tempPlan/inf-index.vue
+++ b/pages/workPlan/tempPlan/inf-index.vue
@@ -196,6 +196,7 @@
                       :type="f.isType ? f.isType : 'text'"
                       v-model="item[f.name]"
                       placeholder="请填写"
+                      @input="handleInput($event, f.isType, index, f.name)"
                     />
                     <uni-data-select
                       v-model="item[f.name]"
@@ -1727,6 +1728,22 @@ export default {
     },
     onChangeTimeDateRange(e) {
       console.log('eeee', e)
+    },
+    handleInput(e, type, index, name) {
+      if (type == 'number') {
+        const regex = /^[1-9]\d*$/
+        if (!regex.test(e)) {
+          // console.log('不符合要求', typeof e)
+          this.$nextTick(() => {
+            this.monthParams[index][name] = ''
+            e = ''
+          })
+        } else {
+          this.$nextTick(() => {
+            this.monthParams[index][name] = e
+          })
+        }
+      }
     }
   },
 
diff --git a/pages/workPlan/tempPlan/pro-index.vue b/pages/workPlan/tempPlan/pro-index.vue
index 621eca3..1afba0b 100644
--- a/pages/workPlan/tempPlan/pro-index.vue
+++ b/pages/workPlan/tempPlan/pro-index.vue
@@ -188,6 +188,7 @@
                       :type="f.isType ? f.isType : 'text'"
                       v-model="item[f.name]"
                       placeholder="请填写"
+                      @input="handleInput($event, f.isType, index, f.name)"
                     />
                     <uni-data-select
                       v-model="item[f.name]"
@@ -1801,6 +1802,22 @@ export default {
     },
     onChangeTimeDateRange(e) {
       console.log('eeee', e)
+    },
+    handleInput(e, type, index, name) {
+      if (type == 'number') {
+        const regex = /^[1-9]\d*$/
+        if (!regex.test(e)) {
+          // console.log('不符合要求', typeof e)
+          this.$nextTick(() => {
+            this.monthParams[index][name] = ''
+            e = ''
+          })
+        } else {
+          this.$nextTick(() => {
+            this.monthParams[index][name] = e
+          })
+        }
+      }
     }
   },
 
diff --git a/pages/workPlan/weekPlan/inf-index.vue b/pages/workPlan/weekPlan/inf-index.vue
index 8d03e82..6dc1f4b 100644
--- a/pages/workPlan/weekPlan/inf-index.vue
+++ b/pages/workPlan/weekPlan/inf-index.vue
@@ -200,6 +200,7 @@
                       :type="f.isType ? f.isType : 'text'"
                       v-model="item[f.name]"
                       placeholder="请填写"
+                      @input="handleInput($event, f.isType, index, f.name)"
                     />
 
                     <uni-data-select
@@ -1703,14 +1704,16 @@ export default {
       }
       const params = {
         proId: this.projectId,
-        month: this.DateValue
+        week: `${this.weekStart}~${this.weekEnd}`
       }
 
       console.log(params, 'params')
       const res = await getImportMonthPlanApi(params)
       console.log('导入计划的结果', res)
       if (res.res == 0) {
-        uni.showToast({ title: '获取失败，该日期上月无计划', icon: 'none' })
+        uni.showToast({ title: '获取失败，该日期上周无计划', icon: 'none' })
+        this.monthParams = []
+        this.monthParams.push(this.paramsItem)
         return
       } else {
         this.monthParams = res.obj
@@ -1806,6 +1809,22 @@ export default {
 
       this.weekStartCurrent = this.$moment().week(this.$moment().week()).startOf('week').format('YYYY-MM-DD')
       this.weekEndCurrent = this.$moment().week(this.$moment().week()).endOf('week').format('YYYY-MM-DD')
+    },
+    handleInput(e, type, index, name) {
+      if (type == 'number') {
+        const regex = /^[1-9]\d*$/
+        if (!regex.test(e)) {
+          // console.log('不符合要求', typeof e)
+          this.$nextTick(() => {
+            this.monthParams[index][name] = ''
+            e = ''
+          })
+        } else {
+          this.$nextTick(() => {
+            this.monthParams[index][name] = e
+          })
+        }
+      }
     }
   },
 
diff --git a/pages/workPlan/weekPlan/pro-index.vue b/pages/workPlan/weekPlan/pro-index.vue
index 9dcc6eb..7bbd412 100644
--- a/pages/workPlan/weekPlan/pro-index.vue
+++ b/pages/workPlan/weekPlan/pro-index.vue
@@ -207,6 +207,7 @@
                       :type="f.isType ? f.isType : 'text'"
                       v-model="item[f.name]"
                       placeholder="请填写"
+                      @input="handleInput($event, f.isType, index, f.name)"
                     />
                     <uni-data-select
                       v-model="item[f.name]"
@@ -1768,14 +1769,16 @@ export default {
       }
       const params = {
         proId: this.projectId,
-        month: this.DateValue
+        week: `${this.weekStart}~${this.weekEnd}`
       }
 
       console.log(params, 'params')
       const res = await getImportMonthPlanProApi(params)
       console.log('导入计划的结果', res)
       if (res.res == 0) {
-        uni.showToast({ title: '获取失败，该日期上月无计划', icon: 'none' })
+        uni.showToast({ title: '获取失败，该日期上周无计划', icon: 'none' })
+        this.monthParams = []
+        this.monthParams.push(this.paramsItem)
         return
       } else {
         this.monthParams = res.obj
@@ -1871,6 +1874,22 @@ export default {
 
       this.weekStartCurrent = this.$moment().week(this.$moment().week()).startOf('week').format('YYYY-MM-DD')
       this.weekEndCurrent = this.$moment().week(this.$moment().week()).endOf('week').format('YYYY-MM-DD')
+    },
+    handleInput(e, type, index, name) {
+      if (type == 'number') {
+        const regex = /^[1-9]\d*$/
+        if (!regex.test(e)) {
+          // console.log('不符合要求', typeof e)
+          this.$nextTick(() => {
+            this.monthParams[index][name] = ''
+            e = ''
+          })
+        } else {
+          this.$nextTick(() => {
+            this.monthParams[index][name] = e
+          })
+        }
+      }
     }
   },