Merge remote-tracking branch 'origin/pet' into pet

pages/eight_assignments/blind_board/apply.vue

@@ -192,12 +192,7 @@ export default {
         CORP_NAME: [{ type: 'string', required: true, message: '请选择作业分公司', trigger: ['blur', 'change'] }],
         WORK_TYPE_NAME: [{ type: 'string', required: true, message: '请选择作业类别', trigger: ['blur', 'change'] }],
         NAME: [{ type: 'string', required: true, message: '请输入设备管道名称', trigger: ['blur', 'change'] }],
-        BOARD_INSTALL_TIME: [{
+        BOARD_INSTALL_TIME: [{type: 'string', required: true, message: '请选择实际作业开始时间', trigger: ['blur', 'change']}],
-          type: 'string',
-          required: true,
-          message: '请选择实际作业开始时间',
-          trigger: ['blur', 'change']
-        }],
         WORK_END_DATE: [{ type: 'string', required: true, message: '请选择作业结束时间', trigger: ['blur', 'change'] }],
         WORK_USER: [{ type: 'string', required: true, message: '请输入作业人', trigger: ['blur', 'change'] }],
         WORK_LONGITUDE: [{ type: 'string', required: true, message: '请输入经度', trigger: ['blur', 'change'] }],
@@ -205,30 +200,10 @@ export default {
         MEDIUM: [{ type: 'string', required: true, message: '请输入介质', trigger: ['blur', 'change'] }],
         TEMPERATURE: [{ type: 'string', required: true, message: '请输入温度', trigger: ['blur', 'change'] }],
         PRESSURE: [{ type: 'string', required: true, message: '请输入压力', trigger: ['blur', 'change'] }],
-        BOARD_PATH: [{
+        BOARD_PATH: [{type: 'array', required: true, message: '请上传盲板抽堵位置图', trigger: ['blur', 'change']}],
-          type: 'array',
+        SPECIAL_WORK: [{type: 'string', required: true, message: '请输入关联的其他特殊作业及安全作业票编号', trigger: ['blur', 'change']}],
-          required: true,
+        RISK_IDENTIFICATION: [{type: 'string', required: true, message: '请输入风险辨识结果', trigger: ['blur', 'change']}],
-          message: '请上传盲板抽堵位置图',
+        SIGN: [{type: 'string', required: true, message: '请签字', trigger: ['blur', 'change']}],
-          trigger: ['blur', 'change']
-        }],
-        SPECIAL_WORK: [{
-          type: 'string',
-          required: true,
-          message: '请输入关联的其他特殊作业及安全作业票编号',
-          trigger: ['blur', 'change']
-        }],
-        RISK_IDENTIFICATION: [{
-          type: 'string',
-          required: true,
-          message: '请输入风险辨识结果',
-          trigger: ['blur', 'change']
-        }],
-        SIGN: [{
-          type: 'string',
-          required: true,
-          message: '请签字',
-          trigger: ['blur', 'change']
-        }],
       },
       picker: {
         show: false,
@@ -295,8 +270,8 @@ export default {
         url: '/pages/map/index',
         events: {
           acceptLocationData: (event) => {
-            this.form.WORK_LONGITUDE = event.data.longitue;
+            this.form.WORK_LONGITUDE = event.data.longitue.toString();
-            this.form.WORK_LATITUDE = event.data.latitude;
+            this.form.WORK_LATITUDE = event.data.latitude.toString();
           }
         },
       })

pages/eight_assignments/break_ground/apply.vue

@@ -214,8 +214,8 @@ export default {
         url: '/pages/map/index',
         events: {
           acceptLocationData: (event) => {
-            this.form.WORK_LONGITUDE = event.data.longitue;
+            this.form.WORK_LONGITUDE = event.data.longitue.toString();
-            this.form.WORK_LATITUDE = event.data.latitude;
+            this.form.WORK_LATITUDE = event.data.latitude.toString();
           }
         },
       })

pages/eight_assignments/confined_space/apply.vue

@@ -220,8 +220,8 @@ export default {
         url: '/pages/map/index',
         events: {
           acceptLocationData: (event) => {
-            this.form.WORK_LONGITUDE = event.data.longitue;
+            this.form.WORK_LONGITUDE = event.data.longitue.toString();
-            this.form.WORK_LATITUDE = event.data.latitude;
+            this.form.WORK_LATITUDE = event.data.latitude.toString();
           }
         },
       })

pages/eight_assignments/cut_road/apply.vue

@@ -214,8 +214,8 @@ export default {
         url: '/pages/map/index',
         events: {
           acceptLocationData: (event) => {
-            this.form.WORK_LONGITUDE = event.data.longitue;
+            this.form.WORK_LONGITUDE = event.data.longitue.toString();
-            this.form.WORK_LATITUDE = event.data.latitude;
+            this.form.WORK_LATITUDE = event.data.latitude.toString();
           }
         },
       })

pages/eight_assignments/electricity/apply.vue

@@ -238,8 +238,8 @@ export default {
         url: '/pages/map/index',
         events: {
           acceptLocationData: (event) => {
-            this.form.WORK_LONGITUDE = event.data.longitue;
+            this.form.WORK_LONGITUDE = event.data.longitue.toString();
-            this.form.WORK_LATITUDE = event.data.latitude;
+            this.form.WORK_LATITUDE = event.data.latitude.toString();
           }
         },
       })

pages/eight_assignments/high_work/apply.vue

@@ -220,8 +220,8 @@ export default {
         url: '/pages/map/index',
         events: {
           acceptLocationData: (event) => {
-            this.form.WORK_LONGITUDE = event.data.longitue;
+            this.form.WORK_LONGITUDE = event.data.longitue.toString();
-            this.form.WORK_LATITUDE = event.data.latitude;
+            this.form.WORK_LATITUDE = event.data.latitude.toString();
           }
         },
       })

pages/eight_assignments/hoisting/apply.vue

@@ -239,8 +239,8 @@ export default {
         url: '/pages/map/index',
         events: {
           acceptLocationData: (event) => {
-            this.form.WORK_LONGITUDE = event.data.longitue;
+            this.form.WORK_LONGITUDE = event.data.longitue.toString();
-            this.form.WORK_LATITUDE = event.data.latitude;
+            this.form.WORK_LATITUDE = event.data.latitude.toString();
           }
         },
       })

pages/eight_assignments/hot_work/select_position.vue

@@ -64,8 +64,8 @@ export default {
         url: '/pages/map/index',
         events: {
           acceptLocationData: (event) => {
-            this.form.WORK_LONGITUDE = event.data.longitue;
+            this.form.WORK_LONGITUDE = event.data.longitue.toString();
-            this.form.WORK_LATITUDE = event.data.latitude;
+            this.form.WORK_LATITUDE = event.data.latitude.toString();
           }
         },
       })