完善

src/views/idle-assets/modules/BaseForm.vue

@@ -228,7 +228,7 @@ export default {
           name: item.sbName,
           no: item.sbNo,
           sbFileList: item.usedFileList,
-          positionNo: item.positionNo,
+          oldPositionNo: item.oldPositionNo,
           newPositionNo: item.newPositionNo,
           oldPositionName: item.oldPositionName,
           oldPositionId: item.oldPositionId,
@@ -259,7 +259,7 @@ export default {
           id: item.id,
           name: item.name,
           no: item.no,
-          positionNo: item.positionNo,
+          oldPositionNo: item.positionNo,
           newPositionNo: '',
           oldPositionName: item.positionName,
           oldPositionId: item.positionId,

src/views/idle-assets/modules/Detail.vue

@@ -78,14 +78,14 @@ export default {
           width: 150,
           key: 'sbName'
         },
-        // {
-        //   title: '设备位号',
-        //   dataIndex: 'positionNo',
-        //   width: 150,
-        //   key: 'positionNo'
-        // },
         {
-          title: '新位号',
+          title: '原设备位号',
+          dataIndex: 'oldPositionNo',
+          width: 150,
+          key: 'oldPositionNo'
+        },
+        {
+          title: '新设备位号',
           dataIndex: 'newPositionNo',
           width: 150,
           key: 'newPositionNo'

src/views/idle-assets/modules/TicketForm.vue

@@ -8,7 +8,7 @@
       <div class="title">
         <div style="font-size:26px;"><span style="font-size:30px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">设备变动申请单</span></div>
       </div>
-      <div style="display:flex;justify-content:space-between; margin: 10px auto;width: 830px;">
+      <div style="display:flex;justify-content:space-between; margin: 10px auto;width: 1130px;">
         <div>申请人：{{ modal.applyName }}</div>
         <!-- <div>日期：{{ BaseTool.Date.formatter(new Date, BaseTool.Date.PICKER_NORM_DATE_PATTERN) }}</div> -->
         <div>单号：{{ modal.no }}</div>
@@ -32,17 +32,27 @@
             <td colspan="3" style="text-align:left;">
               <table style="width:100%;border:none">
                 <tr>
-                  <td colspan="4">设备集合</td>
+                  <td colspan="9">设备集合</td>
                 </tr>
                 <tr>
                   <td>设备名称</td>
-                  <td>设备位号</td>
+                  <td>原设备位号</td>
+                  <td>新设备位号</td>
+                  <td>原设备位置</td>
+                  <td>新设备位置</td>
+                  <td>是否清洗</td>
+                  <td>设备完好性</td>
                   <td>设备编号</td>
                   <td>所属车间</td>
                 </tr>
                 <tr v-for="item in modal.sbUnusedDetailVOS" :key="item.id">
                   <td>{{ item.sbName }}</td>
-                  <td>{{ item.positionNo }}</td>
+                  <td>{{ item.oldPositionNo }}</td>
+                  <td>{{ item.newPositionNo }}</td>
+                  <td>{{ item.oldPositionName }}</td>
+                  <td>{{ item.newPositionName }}</td>
+                  <td>{{ BaseTool.Object.getField(yesNoMap, item.clean) }}</td>
+                  <td>{{ item.sbIntact }}</td>
                   <td>{{ item.sbNo }}</td>
                   <td>{{ item.positionName }}</td>
                 </tr>
@@ -54,7 +64,7 @@
               处理人意见区： <br />
               <br />
               <div style="padding-left:30px;">
-                <a-steps :current="modal.sbUnusedVerifyRecordVOS.length-1" direction="vertical">
+                <a-steps size="small" :current="modal.sbUnusedVerifyRecordVOS.length-1" direction="vertical">
                   <a-step v-for="item in modal.sbUnusedVerifyRecordVOS" :key="item.id" :title="item.realName" :sub-title="item.createdTime" :description="item.advice" />
                 </a-steps>
               </div>
@@ -107,12 +117,14 @@ export default {
       modal: {
         sbUnusedVerifyRecordVOS: [],
         sbUnusedDetailVOS: []
-      }
+      },
+      yesNoMap: {}
     }
   },
   created () {
     // 下拉框map
     // this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
+    this.yesNoMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
   },
   methods: {
     base (record) {
@@ -138,14 +150,14 @@ export default {
 }
 .tables{
   margin: 10px auto;
-   width: 830px;
+   width: 1130px;
   font-size: 16px;
   overflow-x:auto;
   table {
         margin: 0 auto;
         border: 1px solid #D6D6D6;
         border-radius: 6px;
-   width: 830px;
+   width: 1130px;
         border-collapse: collapse;
         font-weight: 400;
     }