选择工单问题和领料申请打印增加单位

src/views/mes/pro/request/components/printTable.vue

@@ -29,27 +29,27 @@
       <div class="titles text-left">
         <div class="cdbh">领取类型：{{Table[0].applyType}}</div>
         <div class="cdbh">领取日期：{{Table[0].createTime}}</div>
-        <div class="cdbh" style="padding-left: 30px">列印时间：{{Table[0].printTime}}</div>
+        <div class="cdbh" style="padding-left: 10px">列印时间：{{Table[0].printTime}}</div>
       </div>
     </div>
     <table border class="form-header font-size-16" style="table-layout: fixed;width: 100%;border:1px solid #000000;font-size:14px;line-height: 25px;    margin: 8px 10px 5px 10px;">
       <tr height="20" class="color000" style="font-weight: 600">
         <td colspan="3" align="center">项次</td>
-        <td colspan="6" align="center">材料编码</td>
-        <td colspan="11" align="center">材料名称</td>
-        <!-- <td colspan="3" align="center">单位</td> -->
+        <td colspan="5" align="center">材料编码</td>
+        <td colspan="9" align="center">材料名称</td>
+        <td colspan="3" align="center">单位</td>
         <td colspan="4" align="center">申请量</td>
       </tr>
       <tr height="20" v-for="(item,index) in Table" :key="'processes' + index" class="color000">
         <td colspan="3" align="center">{{item.serialNumber}}</td>
-        <td colspan="6" align="center">{{item.sapItemCode ? Number(item.sapItemCode) : ''}}</td>
-        <td colspan="11" align="center">{{item.itemName}}</td>
-        <!-- <td colspan="3" align="center">{{item.serialNumber}}</td> -->
+        <td colspan="5" align="center">{{item.sapItemCode ? Number(item.sapItemCode) : ''}}</td>
+        <td colspan="9" align="center">{{item.itemName}}</td>
+        <td colspan="3" align="center">{{item.unitOfMeasure}}</td>
         <td colspan="4" align="center">{{item.applyNum}}</td>
       </tr>
       <tr height="20" class="color000">
-        <td colspan="9" align="center">生产单号<br/>共计：{{Table[0].countWorkOrder}}份单</td>
-        <td colspan="15" align="center">
+        <td colspan="8" align="center">生产单号<br/>共计：{{Table[0].countWorkOrder}}份单</td>
+        <td colspan="16" align="center">
           {{Table[0].workorderCode}}
         </td>
       </tr>

src/views/mes/pro/scheduleList/index.vue

@@ -480,6 +480,17 @@
           </el-col>
 
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="分派的工单" prop="splitWorkorder">
+              <el-input
+                v-model="form.splitWorkorder"
+                disabled
+                type="textarea"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -532,7 +543,7 @@
               <el-row>
                 <el-col :span="24" style="color: red;">
                   <el-form-item label="可用刀模" prop="quantity" style="color: red;">
-                    {{availableToolCount ? availableToolCount+'套' : '无需刀模'}}
+                    {{availableToolCount != -1 ? availableToolCount+'套' : '无需刀模'}}
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -797,9 +808,9 @@ export default {
       });
     },
     onWorkorderSelect(rows){
-      if (rows && rows.length > 0) {
+      console.log('rows', rows)
+        if(!rows || rows.length === 0) this.Assignform.splitWorkorder = ''
         this.Assignform.splitWorkorder = rows.map(v => v.workorderCode).join(',')
-      }
     },
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.taskId);
@@ -957,7 +968,7 @@ export default {
         workunitId: null
       };
       getavailableToolCount(this.selectedRows[0].taskWorkunitId).then(res => {
-        if(res.data && Number(res.data) > 0) {
+        if(res.data) {
           this.availableToolCount = res.data
         } else {
           this.availableToolCount = 0

src/views/mes/pro/scheduleList/workorderSelect.vue

@@ -101,6 +101,7 @@
             showFlag(){
                 if (this.showFlag) {
                     this.handleQuery()
+                    this.selectedRows = []
                 }
             }
         },