fix: 对刀模版功能进行优化

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

@@ -35,7 +35,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -69,7 +69,7 @@
           v-hasPermi="['tm:tmToolRequestUse:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -144,6 +144,14 @@
       >
         <template slot-scope="scope">
           <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['tm:tmToolRequestUse:view']"
+            >查看</el-button
+          >
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -158,7 +166,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['tm:tmToolRequestUse:remove']"
             >删除</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
@@ -187,16 +195,18 @@
                 readonly
                 style="width: 220px;"
                 v-model="form.toolRequestUseCode"
+                :disabled="title == '查看刀模版领用单'"
                 placeholder="请输入领用单编码"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="申请单" prop="toolRequestId">
-              <el-input style="width: 220px;" v-model="form.toolRequestCode" readonly>
+              <el-input style="width: 220px;" v-model="form.toolRequestCode" readonly >
                 <el-button
                   slot="append"
                   icon="el-icon-search"
+                  :disabled="title == '查看刀模版领用单'"
                   @click="$refs.ToolRequestSelectRef.showFlag = true"
                 ></el-button>
               </el-input>
@@ -232,7 +242,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="8" v-if="title != '查看刀模版领用单'">
             <el-form-item label="申请时间" prop="requestDate">
               <el-date-picker
                 disabled
@@ -274,7 +284,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="8" v-if="title != '查看刀模版领用单'">
             <el-form-item label="申请数量" prop="requestNum">
               <el-input
                 disabled
@@ -298,7 +308,7 @@
         </el-row>
       </el-form>
 
-      <el-divider content-position="left">申请单刀模版具数据</el-divider>
+      <el-divider content-position="left">{{`${title == '查看刀模版领用单' ? '' : '申请单'}刀模版具数据`}}</el-divider>
       <el-table :data="tmToolRequestList">
         <el-table-column label="物料" prop="itemName" />
         <el-table-column label="数量" prop="quantity" />
@@ -473,6 +483,33 @@ export default {
       this.title = "添加刀模版领用单";
       this.handleAutoGenChange(true);
     },
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.reset();
+      const toolRequestUseId = row.toolRequestUseId || this.ids;
+      getTmToolRequestUse(toolRequestUseId).then((response) => {
+        const tmToolRequestUseItemList = response.data.tmToolRequestUseItemList;
+        this.form = response.data;
+        this.tmToolRequestList = response.data.tmToolRequestUseItemList.map(item=> {
+          return {
+            ...item,
+            allQuantity: item.allQuantity || 1
+          }
+        })
+        // 请求申请单
+        // this.queryToolList(this.form.toolRequestId, () => {
+          this.tmToolRequestList.forEach((item) => {
+            const flag = tmToolRequestUseItemList.find(
+              (v) => v.itemId == item.itemId
+            );
+            flag && (item.isCheck = flag.toolId);
+          });
+          console.log(this.tmToolRequestList, 'this.tmToolRequestList')
+        // });
+        this.open = true;
+        this.title = "查看刀模版领用单";
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

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

@@ -41,7 +41,7 @@
     </el-form> -->
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -50,7 +50,7 @@
           @click="handleAdd"
           v-hasPermi="['tm:toolmachinesrecord:add']"
         >新增</el-button>
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">