完善

src/views/fill/task/FillGatherTask.vue

@@ -11,24 +11,24 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="巡检人">
-                <a-select v-model="queryParam.checkerName" placeholder="请选择">
+                <a-select v-model="queryParam.checker" placeholder="请选择">
                   <a-select-option
-                    v-for="(label,value) in statusMap"
-                    :key="value"
-                    :label="label"
-                    :value="parseInt(value)">{{ label }}
+                    v-for="{realName,userId} in checkerList"
+                    :key="userId"
+                    :label="realName"
+                    :value="userId">{{ realName }}
                   </a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="巡检主管">
-                <a-select v-model="queryParam.leaderName" placeholder="请选择">
+                <a-select v-model="queryParam.checkLeader" placeholder="请选择">
                   <a-select-option
-                    v-for="(label,value) in statusMap"
-                    :key="value"
-                    :label="label"
-                    :value="parseInt(value)">{{ label }}
+                    v-for="{realName,userId} in checkLeaderList"
+                    :key="userId"
+                    :label="realName"
+                    :value="userId">{{ realName }}
                   </a-select-option>
                 </a-select>
               </a-form-item>
@@ -323,7 +323,9 @@ export default {
           onChange: this.onSelectChange
         }
       },
-      optionAlertShow: false
+      optionAlertShow: false,
+      checkerList: [],
+      checkLeaderList: []
     }
   },
   created () {
@@ -332,9 +334,10 @@ export default {
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.FILL_GATHER_TASK_STATUS)
     getUser({ roleCode: 'FILL_CHECKER' }).then(res => {
       console.log(res)
+      this.checkerList = res.data
     })
     getUser({ roleCode: 'FILL_CHECKER_LEADER' }).then(res => {
-      console.log(res)
+      this.checkLeaderList = res.data
     })
     if (this.$route.query.id) {
       fetchFillGatherTask({ id: this.$route.query.id }).then(res => {

src/views/store/outstoreform/modules/TicketForm.vue

@@ -42,18 +42,18 @@
             </td>
           </tr>
           <tr>
-            <td colspan="1">物料编码</td>
-            <td colspan="1">物料名称</td>
-            <td colspan="1">规格型号</td>
-            <td colspan="1">货架号</td>
-            <td colspan="1">单位</td>
-            <td colspan="1">数量</td>
-            <td colspan="1">备注</td>
+            <td colspan="1" style="min-width:210px;">物料编码</td>
+            <td colspan="1" style="min-width:120px;">物料名称</td>
+            <td colspan="1" style="max-width:480px;">规格型号</td>
+            <td colspan="1" style="min-width:65px;">货架号</td>
+            <td colspan="1" style="min-width:50px;">单位</td>
+            <td colspan="1" style="min-width:50px;">数量</td>
+            <td colspan="1" style="min-width:50px;">备注</td>
           </tr>
           <tr v-for="item in model.detailList" :key="item.id">
             <td colspan="1">{{ item.no }}</td>
             <td colspan="1">{{ item.spareName }}</td>
-            <td colspan="1">{{ item.ggxh }}</td>
+            <td colspan="1" style="">{{ item.ggxh }}</td>
             <td colspan="1">{{ item.storePosition }}</td>
             <td colspan="1">{{ item.unit }}</td>
             <td colspan="1">{{ item.num }}</td>
@@ -62,6 +62,7 @@
           <tr v-show="model.detailList.length<6" v-for="i in ((6-model.detailList.length)>0?(6-model.detailList.length):0)" :key="i">
             <td></td>
             <td></td>
+            <td>dsffffffffdasddddddddddddddddddasdddddddddddddddddddddddddddddddfsdasdsadfffffffffffffffffffffffffffffffffff</td>
             <td></td>
             <td></td>
             <td></td>
@@ -71,6 +72,7 @@
             <td colspan="2">合计</td>
             <td colspan="1"></td>
             <td colspan="1"></td>
+            <td colspan="1"></td>
             <td colspan="1">{{ model.detailList.reduce((num,item)=>num+=item.num,0) }}</td>
             <td colspan="1"></td>
           </tr>
@@ -147,27 +149,26 @@ export default {
   font-size: 14px;
   overflow-x:auto;
   table {
-        min-width:100%;
         margin: 0 auto;
         border: 1px solid #D6D6D6;
         border-radius: 6px;
         border-collapse: collapse;
         font-weight: 400;
-        table-layout:fixed;
     }
     th{
       color: #FFFFFF;
       background: #3762FC;
     }
     tr {
-      height:26px;
+      min-height:26px;
     }
     th,
     td {
         border: 1px solid #D6D6D6;
         text-align: center;
         padding: 2px 10px;
-        white-space: nowrap;
+        word-wrap:break-word;
+        word-break:break-all;
     }
 }
 .check{