领料申请和刀模板申请优化

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

@@ -6,8 +6,8 @@
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
             <el-table-column label="物料编码" align="center" prop="sapItemCode" />
             <el-table-column label="物料名称" align="center" prop="itemName" />
-            <el-table-column label="工作中心编码" align="center" prop="workstationCode" />
-            <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
+            <el-table-column label="工作中心名称" align="center" prop="workstationName" />
+            <el-table-column label="工作单元名称" align="center" prop="workunitName" />
             <el-table-column label="申请数量" align="center" prop="applyNum" />
             <el-table-column width="100px" label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="{ $index}">
@@ -39,13 +39,26 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="工作中心编码" prop="workstationCode">
-                            <el-input disabled v-model="form.workstationCode" placeholder="请输入产品名称" />
+                            <el-input disabled v-model="form.workstationCode" placeholder="请输入工作中心编码" />
                         </el-form-item>
                       
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="工作单元" prop="workunitCode">
-                            <el-input disabled v-model="form.workunitCode" placeholder="请输入产品名称" />
+                        <el-form-item label="工作单元编码" prop="workunitCode">
+                            <el-input disabled v-model="form.workunitCode" placeholder="请输入工作单元" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="工作中心名称" prop="workstationName">
+                            <el-input disabled v-model="form.workstationName" placeholder="请输入工作中心名称" />
+                        </el-form-item>
+                      
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="工作单元名称" prop="workunitName">
+                            <el-input disabled v-model="form.workunitName" placeholder="工作单元名称" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -96,6 +109,9 @@ export default {
         },
         workstationNames: {
             default: undefined
+        },
+        workunitNames: {
+            default: undefined
         }
 
     },
@@ -136,6 +152,7 @@ export default {
                 workstationCode: null,
                 workstationId: null,
                 workstationName: null,
+                workunitName: null,
             },
             // 表单参数
             form: { 
@@ -148,6 +165,7 @@ export default {
                 workstationCode: null,
                 workstationId: null,
                 workstationName: null,
+                workunitName: null,
             },
 
             currentRowIdx: undefined,
@@ -166,6 +184,9 @@ export default {
         },
         workstationNames(val) {
             this.form.workstationName = val
+        },
+        workunitNames(val) {
+            this.form.workunitName = val
         }
     },
     created() {

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

@@ -324,7 +324,7 @@
       <el-divider content-position="center">申请单物料</el-divider>
             <el-card shadow="always" class="box-card">
                 <requestIndex v-if="opens" ref="materialRequestRef" :quantity="form.requestNum" :id="form.materialRequestId" 
-                    :optType="optType" :workunitCodes="form.workunitCode" :workstationNames="form.workstationName"  :workstationCodes="form.workstationCode"></requestIndex>
+                    :optType="optType" :workunitCodes="form.workunitCode" :workunitNames="form.workunitName" :workstationNames="form.workstationName"  :workstationCodes="form.workstationCode"></requestIndex>
             </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
@@ -530,6 +530,7 @@ export default {
           this.form.arrangeCode = row.arrangeCode;
           this.form.startTime = row.scheduleStartDate;
           this.$set(this.form,'workstationCode',row.workstationCode)
+          this.$set(this.form,'workunitName',row.workunitName)
           this.form.workunitCode=row.workunitCode;
           this.form.workstationName=row.workstationName;
           this.$set(this.form,'endTime',row.scheduleEndDate)
@@ -537,6 +538,7 @@ export default {
           this.form.arrangeCode = row.arrangeCode;
           }
       }
+     
     },
 
     onWorkorderSelect(row){

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

@@ -118,7 +118,13 @@
       <!-- @selection-change="handleSelectionChange" 勾选框中的属性-->
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <!-- <el-table-column label="主键id" align="center" prop="toolRequestId" /> -->
-      <el-table-column label="申请单编码" align="center" prop="toolRequestCode" />
+      <el-table-column label="申请单号" width="150" align="center" prop="toolRequestCode" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handleView(scope.row)" >{{
+            scope.row.toolRequestCode }}
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="工序" align="center" prop="processName" />
       <el-table-column label="作业单元" align="center" prop="workunitName" />
       <!-- <el-table-column label="申请时间" align="center" prop="requestDate" width="180">