完善履历

src/views/sb/info/modules/BaseFormMeasure.vue

@@ -94,10 +94,11 @@
                   style="width: 150px"
                   :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
                   v-model="item.lastDate" />
+                <a-button type="primary" @click="handlePace(item.lastDate,'lastDate')">同步</a-button>
               </td>
               <td>{{ validity(item.lastDate,item.checkPeriod) }}</td>
-              <td><a-input style="width: 150px" v-model="item.no" /></td>
-              <td><a-input style="width: 150px" v-model="item.requirement" /></td>
+              <td><a-input style="width: 150px" v-model="item.no" /><a-button type="primary" @click="handlePace(item.no,'no')">同步</a-button></td>
+              <td><a-input style="width: 150px" v-model="item.requirement" /><a-button type="primary" @click="handlePace(item.requirement,'requirement')">同步</a-button></td>
               <td><a-input style="width: 150px" v-model="item.remark" /></td>
               <td>
                 <a-button type="link" @click="uploadImg(item,i)">上传图片</a-button>
@@ -260,6 +261,15 @@ export default {
       this.sbParentOPt = i
       this.$refs.sbInfoSelectModal.base({}, { isChild: this.DictCache.VALUE.SB_IS_CHILD.IS_PARENT, positionId })
     },
+    handlePace (val, key) {
+      if (key === 'lastDate') {
+        val = this.BaseTool.Date.formatter(val, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+      }
+      console.log(this.ListForm, val, key)
+      this.ListForm.forEach(item => {
+        item[key] = val
+      })
+    },
     handleSbNoSelect (sbId, i) {
       if (sbId === '' || sbId === null) {
         this.$message.warning('请选择父设备!')

src/views/sb/resume/SbResume.vue

@@ -62,8 +62,7 @@
       :bordered="this.MyGlobalConstant.BORDERED"
       :columns="columns"
       :data="loadData"
-      :alert="options.alert"
-      :rowSelection="options.rowSelection"
+      :scroll="{x: 1500, y: BaseTool.Constant.scrollY}"
       showPagination="auto"
     >
       <span slot="action" slot-scope="record">
@@ -111,21 +110,6 @@ export default {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
-        {
-          title: '设备名称',
-          checked: true,
-          width: 200,
-          dataIndex: 'sbName'
-        },
-        {
-          title: '操作类型',
-          checked: true,
-          width: 200,
-          dataIndex: 'otherType',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.otherTypeMap, text)
-          }
-        },
         {
           title: '设备位号',
           checked: true,
@@ -139,11 +123,27 @@ export default {
           dataIndex: 'positionName'
         },
         {
-          title: '规格型号',
+          title: '设备名称',
           checked: true,
           width: 200,
-          dataIndex: 'sbModel'
+          dataIndex: 'sbName'
         },
+        {
+          title: '操作类型',
+          checked: true,
+          width: 200,
+          dataIndex: 'otherType',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.otherTypeMap, text)
+          }
+        },
+
+        // {
+        //   title: '规格型号',
+        //   checked: true,
+        //   width: 200,
+        //   dataIndex: 'sbModel'
+        // },
         {
           title: '操作时间',
           checked: true,