1.领料申请细节修改; 2.生产工单增加转急单功能

src/api/mes/pro/workorder.js

@@ -151,3 +151,12 @@ export function getWorkOrderSoDirectivePkgRequireTypeEnum(workorderId) {
     method: 'get'
   })
 }
+
+// 转急单
+export function updateRequestDateApi(data) {
+  return request({
+    url: "/mes/pro/workorder/updateRequestDate",
+    method: "post",
+    data: data,
+  });
+}

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

@@ -102,7 +102,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="物料编码" align="center" prop="sapItemCode" width="100" />
+      <!-- <el-table-column label="物料编码" align="center" prop="sapItemCode" width="100" /> -->
       <el-table-column label="工作单元" align="center" prop="workunitName" width="100" />
       <el-table-column label="领料类型" align="center" prop="applyType">
         <template slot-scope="scope">

src/views/mes/pro/workorder/indexApply.vue

@@ -53,8 +53,8 @@
       </el-form-item>
       <el-form-item label="工单类型" prop="workorderType">
         <el-select v-model="queryParams.workorderType" clearable placeholder="请选择状态" >
-          <el-option v-for="dict in dict.type.mes_workorder_type" 
-          :key="dict.value" 
+          <el-option v-for="dict in dict.type.mes_workorder_type"
+          :key="dict.value"
           :label="dict.label"
           :value="dict.value">
           </el-option>
@@ -129,6 +129,11 @@
           v-hasPermi="['pro:combination:add']">订单组合
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="single" @click="handleTurnWorry">
+          转急单
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-edit" size="mini" @click="()=>handleCombination('del')" :disabled="combinationDisable"
           >取消组合
@@ -552,7 +557,7 @@
     </el-dialog>
     <WorkorderRecordSelect ref="WorkorderRecordSelectRef" :data="currentData" />
     <div style="overflow: hidden;width: 0;height: 0;">
-      
+
       <div id="productOrderDetail">
         <div v-for="(item, index) in productionSolutionTable" :key="'productionSolutionTable' + index">
           <productOrderSpecification :productionSolutionTable="item" style="page-break-after:always"></productOrderSpecification>
@@ -560,6 +565,22 @@
         </div>
       </div>
     </div>
+    <el-dialog title="添加转急单" :visible.sync="turnWorryVisible" width="340px" append-to-body>
+      <el-form ref="turnWorryFormRef" :model="turnWorryForm" :rules="turnWorryFormRules" label-width="80px">
+          <el-form-item label="需求时间" prop="requestDate">
+          <el-date-picker
+            v-model="turnWorryForm.requestDate"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleTurnWorrySubmit">确 定</el-button>
+        <el-button @click="handleTurnWorryCancle">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -580,7 +601,8 @@ import {
   doCheckToolNum,
   delComWorkorder,
   closeWorkorder,
-  closeCheck
+  closeCheck,
+  updateRequestDateApi
 } from "@/api/mes/pro/workorder";
 import { addProtaskList } from "@/api/mes/pro/protask";
 import shiftSelectMixin from '@/utils/shiftSelectMixin'
@@ -760,7 +782,17 @@ export default {
       },
       productionSolutionTable: [],
       workOrderTable: [],
-      printloading: false
+      printloading: false,
+      turnWorryVisible: false,
+      turnWorryForm: {
+        workorderId: '',
+        requestDate: ''
+      },
+      turnWorryFormRules: {
+        requestDate: [
+          { required: true, message: "需求时间不能为空", trigger: "blur" },
+        ],
+      },
     };
   },
   activated() {
@@ -774,7 +806,7 @@ export default {
     this.$nextTick(()=>{
       this.tableHeight = window.innerHeight - 358
     })
-    
+
   },
   methods: {
     //筛选日期设置默认值
@@ -870,7 +902,7 @@ export default {
           })
         }
       })
-      
+
 
     },
     showArrangDetail(row, arrangeCode) {
@@ -982,7 +1014,7 @@ export default {
             this.combinationCodes = response
             this.$modal.msgSuccess("新增组合单成功2");
              }
-            
+
           } else{
             this.$modal
         .confirm(
@@ -1203,7 +1235,7 @@ export default {
         }
       } else {
         this.startIndex = lastindex
-        
+
       }
       this.ids = this.selectedRows.map(item => item.workorderId)
       this.single = this.selectedRows.length !== 1
@@ -1448,6 +1480,32 @@ export default {
         this.form.workorderCode = null;
       }
     },
+    handleTurnWorry() {
+      console.log(this.selectedRows);
+      if(["PREPARE", "PUBLISHED"].includes(this.selectedRows[0].status)) {
+        this.turnWorryForm.workorderId = this.selectedRows[0].workorderId;
+        this.turnWorryVisible = true;
+      } else {
+        this.$message({
+          message: '所选工单不处于已发布或者待发布状态不允许更改！',
+          type: 'warning'
+        });
+      }
+    },
+    handleTurnWorrySubmit() {
+      this.$refs["turnWorryFormRef"].validate(valid => {
+        if (valid) {
+            updateRequestDateApi(this.turnWorryForm).then(response => {
+              this.$modal.msgSuccess("操作成功");
+              this.handleTurnWorryCancle();
+              this.getList();
+            });
+          }
+      });
+    },
+    handleTurnWorryCancle() {
+      this.turnWorryVisible = false;
+    },
   },
 };
 </script>