退料申请新增字段

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

@@ -120,19 +120,28 @@
     </el-row>
 
     <el-table v-loading="loading" :data="materialReturnList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="产品编码" align="center" prop="itemCode" />
-      <el-table-column label="产品名称" align="center" prop="itemName" />
-      <el-table-column label="申请单编码" align="center" prop="applyNo" />
-      <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
-      <el-table-column label="工作单元名称" align="center" prop="workunitName" />
-      <el-table-column label="生产工单号" align="center" prop="workorderCode" />
-      <el-table-column label="批次号" align="center" prop="batchNo" />
-      <el-table-column label="卷号" align="center" prop="packNo" />
-      <el-table-column label="退料数量" align="center" prop="backNum" />
-       <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column type="selection" width="100" align="center" />
+      <el-table-column label="产品编码" align="center" prop="itemCode" width="150"/>
+      <el-table-column label="产品名称" align="center" prop="itemName" width="150"/>
+      <el-table-column label="申请单编码" align="center" prop="applyNo" width="150"/>
+      <el-table-column label="工作单元编码" align="center" prop="workunitCode" width="150"/>
+      <el-table-column label="工作单元名称" align="center" prop="workunitName" width="150"/>
+      <el-table-column label="生产工单号" align="center" prop="workorderCode" width="150"/>
+      <el-table-column label="批次号" align="center" prop="batchNo" width="100"/>
+      <el-table-column label="卷号" align="center" prop="packNo" width="100"/>
+      <el-table-column label="退料数量" align="center" prop="backNum" width="100"/>
+      <el-table-column label="已退料数量" align="center" prop="returnNum" width="100"/>
+      <el-table-column label="是否结案" align="center" prop="windCase" width="100">
+      <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_yes_no"
+            :value="scope.row.windCase"
+          />
+        </template>
+      </el-table-column>
+       <el-table-column label="创建人" align="center" prop="createBy" width="100"/>
        <el-table-column label="创建时间" width="170" align="center" prop="createTime" />
-       <el-table-column label="是否合格" align="center" prop="isQualified">
+       <el-table-column label="是否合格" align="center" prop="isQualified" width="100">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.sys_yes_non"
@@ -140,7 +149,7 @@
           />
         </template>
       </el-table-column>
-       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
            <el-button
             size="mini"
@@ -241,7 +250,7 @@ import { listMaterialReturn, getMaterialReturn, delMaterialReturn, addMaterialRe
 
 export default {
   name: "MaterialReturn",
-  dicts: ['sys_yes_non'],
+  dicts: ['sys_yes_non','sys_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -279,6 +288,8 @@ export default {
         workOrderId: null,
         workorderCode: null,
         isQualified: null,
+        returnNum: null,
+        windCase: null,
         backNum: null,
         batchNo: null,
         packNo: null,
@@ -342,7 +353,9 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+        returnNum: null,
+        windCase: null
         };
       this.resetForm("form");
     },