From 953b148da4c8ab7e0cd0957a5c472ccd4952aa0a Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Fri, 30 Aug 2024 15:39:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=BA=94bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/RepairAddressFloorModal.vue       | 40 ++++++++++---------
 .../repair/modules/RepairDeviceTypeModal.vue  |  5 ++-
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/views/admin/repair/modules/RepairAddressFloorModal.vue b/src/views/admin/repair/modules/RepairAddressFloorModal.vue
index 03dc25f..8fffaff 100644
--- a/src/views/admin/repair/modules/RepairAddressFloorModal.vue
+++ b/src/views/admin/repair/modules/RepairAddressFloorModal.vue
@@ -9,40 +9,44 @@
   >
     <a-form :form="form">
       <a-form-item style="display:none">
-        <a-input v-decorator="['id']"/>
+        <a-input v-decorator="['id']" />
       </a-form-item>
       <a-form-item style="display:none">
-        <a-input v-decorator="['version']"/>
+        <a-input v-decorator="['version']" />
       </a-form-item>
       <a-form-item style="display:none">
-        <a-input v-decorator="['addressId']"/>
+        <a-input v-decorator="['addressId']" />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="楼层">
-        <a-input placeholder="楼层" v-decorator="['name']"/>
+        <a-input placeholder="楼层" v-decorator="['name']" />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="网格长">
-        <a-select show-search v-decorator="['adminId', {rules: [{ required: true, message: '网格长' }]}]" optionFilterProp="label"
+        <a-select show-search v-decorator="['adminId', {rules: [{ required: true, message: '网格长' }]}]"
+                  optionFilterProp="label"
         >
-          <a-select-option v-for="item in staffLists" :key="item.id" :label="item.mobile">{{ item.username }}--{{  item.mobile}}</a-select-option>
+          <a-select-option v-for="item in staffLists" :key="item.id" :label="item.mobile">{{ item.username
+            }}--{{ item.mobile }}
+          </a-select-option>
         </a-select>
       </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序号">
+        <a-input placeholder="编码" v-decorator="['bm']" />
+      </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
-        <a-input placeholder="备注" v-decorator="['remark']"/>
+        <a-input placeholder="备注" v-decorator="['remark']" />
       </a-form-item>
 
     </a-form>
   </a-modal>
 </template>
 <script>
-    import {saveRepairRoom,selectDispatcher} from '@/api/admin/repair/repairAddressFloor'
-    import pick from 'lodash.pick'
+import { saveRepairRoom, selectDispatcher } from '@/api/admin/repair/repairAddressFloor'
+import pick from 'lodash.pick'
 
-    export default {
+export default {
   name: 'RepairRoomModal',
-  props: {
-  },
-  components: {
-  },
+  props: {},
+  components: {},
   data () {
     return {
       visible: false,
@@ -67,10 +71,10 @@
     this.staffList()
   },
   methods: {
-    staffList (){
+    staffList () {
       // 获取派单员id
-      selectDispatcher().then(res =>{
-        this.staffLists =res.data
+      selectDispatcher().then(res => {
+        this.staffLists = res.data
       })
     },
     show (addressId) {
@@ -87,7 +91,7 @@
       this.mdl = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'remark', 'adminId', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'tenantId', 'parkId', 'addressId'))
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'remark', 'adminId', 'deleteFlag', 'bm', 'createBy', 'createTime', 'updateBy', 'updateTime', 'tenantId', 'parkId', 'addressId'))
       })
     },
     handleSubmit (e) {
diff --git a/src/views/admin/repair/modules/RepairDeviceTypeModal.vue b/src/views/admin/repair/modules/RepairDeviceTypeModal.vue
index 0f5ab98..5ad2886 100644
--- a/src/views/admin/repair/modules/RepairDeviceTypeModal.vue
+++ b/src/views/admin/repair/modules/RepairDeviceTypeModal.vue
@@ -17,6 +17,9 @@
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类别名称">
         <a-input placeholder="名称" v-decorator="['name']" />
       </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="预计完成时间">
+        <a-input-number placeholder="预计完成时间" v-decorator="['days']" />
+      </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="派单员">
         <a-select show-search v-decorator="['staffId', {rules: [{ required: true, message: '派单员' }]}]" optionFilterProp="label"
                   >
@@ -91,7 +94,7 @@ export default {
       console.log(this.mdl)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'staffId', 'workerId', 'staffLists', 'remark', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'tenantId', 'parkId'))
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'staffId', 'workerId','days', 'staffLists', 'remark', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'tenantId', 'parkId'))
       })
     },
     handleSubmit (e) {