完善工装夹具领用单功能

src/views/mes/tm/toolrequestuse/index.vue

@@ -213,7 +213,11 @@
 
           <el-col :span="8">
             <el-form-item label="工序" prop="processId">
-              <el-input v-model="form.processId" placeholder="请输入工序" />
+              <el-input
+                v-model="form.processId"
+                placeholder="请输入工序"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -221,14 +225,18 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="作业单元" prop="workunitId">
-              <el-input v-model="form.workunitId" placeholder="作业单元" />
+              <el-input
+                v-model="form.workunitId"
+                placeholder="作业单元"
+                disabled
+              />
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="申请时间" prop="requestDate">
               <el-date-picker
-                clearable
+                disabled
                 v-model="form.requestDate"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -243,6 +251,7 @@
               <el-date-picker
                 clearable
                 v-model="form.startTime"
+                disabled
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="请选择预计开始时间"
@@ -256,7 +265,7 @@
           <el-col :span="8">
             <el-form-item label="预计结束时间" prop="endTime">
               <el-date-picker
-                clearable
+                disabled
                 v-model="form.endTime"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -269,6 +278,7 @@
           <el-col :span="8">
             <el-form-item label="申请数量" prop="requestNum">
               <el-input
+                disabled
                 v-model="form.requestNum"
                 placeholder="请输入申请数量"
               />
@@ -278,6 +288,7 @@
           <el-col :span="8">
             <el-form-item label="编排单号" prop="arrangeCode">
               <el-input
+                disabled
                 v-model="form.arrangeCode"
                 placeholder="请输入编排单号"
               />
@@ -412,7 +423,7 @@ export default {
         processName: null,
         workunitName: null,
       };
-      this.tmToolRequestList = []
+      this.tmToolRequestList = [];
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -441,8 +452,17 @@ export default {
       this.reset();
       const toolRequestUseId = row.toolRequestUseId || this.ids;
       getTmToolRequestUse(toolRequestUseId).then((response) => {
+        const tmToolRequestUseItemList = response.data.tmToolRequestUseItemList;
         this.form = response.data;
-        this.tmToolRequestList = res.tmToolRequestUseItemList
+        // 请求申请单
+        this.queryToolList(this.form.toolRequestId, () => {
+          this.tmToolRequestList.forEach((item) => {
+            const flag = tmToolRequestUseItemList.find(
+              (v) => v.itemId == item.itemId
+            );
+            flag && (item.isCheck = flag.toolId);
+          });
+        });
         this.open = true;
         this.title = "修改刀模板领用单";
       });
@@ -451,13 +471,6 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (this.form.toolRequestUseId != null) {
-            updateTmToolRequestUse(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
           const params = {
             ...this.form,
             tmToolRequestItemList: this.tmToolRequestList.map((item) => {
@@ -469,6 +482,13 @@ export default {
               };
             }),
           };
+          if (this.form.toolRequestUseId != null) {
+            updateTmToolRequestUse(params).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
             addTmToolRequestUse(params).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -530,9 +550,10 @@ export default {
       }
     },
 
-    queryToolList(toolRequestId) {
+    queryToolList(toolRequestId, cb) {
       getTmToolRequestList(toolRequestId).then((res) => {
         this.tmToolRequestList = res.data;
+        cb && cb();
       });
     },
   },