Merge remote-tracking branch 'origin/qingban' into qingban

src/views/base/apply/index.vue

@@ -47,6 +47,7 @@
     :title="dialog.title"
     width="80%"
     @close="dialog.visible = false"
+    :destroy-on-close="true"
   >
     <Apply
       :rowData="rowData"

src/views/base/craftManagement/route/index.vue

@@ -149,6 +149,7 @@
           link
           icon="el-icon-copy-document"
           @click="bindProcessPop(row)"
+          v-if="row.flowState != '3'"
           >绑定</el-button
         >
       </template>

src/views/base/craftManagement/routeCommon/index.vue

@@ -83,7 +83,7 @@
         >删除</el-button
         >
 
-        <el-button link icon="el-icon-copy-document" @click="bindProcess(row)"
+        <el-button link icon="el-icon-copy-document" @click="bindProcess(row)" v-if="row.flowState != '3'"
           >绑定</el-button
         >
                 <el-button

src/views/plan/filtersheet/index.vue

@@ -151,7 +151,7 @@
       width="950px"
       @close="dialog1.visible = false"
     >
-      <work-order-page @order-info="materialInfo1" />
+      <work-order-page @order-info="materialInfo1" :queryType="99"/>
     </el-dialog>
     <el-dialog
       v-model="workOderShow"

src/views/pro/traceability/components/materialsCom.vue

@@ -158,8 +158,8 @@ option.value = Object.assign(option.value, {
       display: false,
     },
     {
-      label: "替换批次号",
-      prop: "replaceBatchNo",
+      label: "原批次号",
+      prop: "oldBatchNo",
       display: false,
     },
     {

src/views/quality/reject/index.vue

@@ -21,6 +21,8 @@
         <el-button  link  @click="showSeq(row.seqNoList)">
           查看管号
         </el-button>
+        <el-button type="danger" link v-if="row.state == '0' || row.state == '2' || row.state == '-1'"  @click="deleteRecord(row)"
+        >删除</el-button>
         <el-button
             link
             icon="el-icon-copy-document"
@@ -41,6 +43,7 @@
         <el-button  link @click="toShow(row)">
           查看
         </el-button>
+
       </template>
     </avue-crud>
     <div v-else>
@@ -84,6 +87,11 @@ const toShow = (row) => {
   tableData.value = setJson(row);
   showState.value = true;
 };
+
+const deleteRecord = (row, index, done) => {
+  deleteRow(row, index, done);
+  dataList();
+};
 const showSeqList =ref([]);
 const tableData = ref();
 const proccessKey = ref(false);

src/views/quality/reverseTraceability/index.vue

@@ -56,7 +56,24 @@ option.value = Object.assign(option.value, {
     {
       label: "批次号",
       prop: "batchNo",
-      hide: true,
+      formatter: (val) => {
+        if (val.batchNo == "0") {
+          return '';
+        }else{
+          return val.batchNo;
+        }
+      },
+    },
+    {
+      label: "原批次号",
+      prop: "oldBatchNo",
+      formatter: (val) => {
+        if (val.odlBatchNo == "0") {
+          return '';
+        }else{
+          return val.oldBatchNo;
+        }
+      },
     },
     {
       label: "物料名称",
@@ -74,7 +91,7 @@ option.value = Object.assign(option.value, {
       search: true,
     },
 
-    {
+   /* {
       label: "物料序列号",
       prop: "itemSeq",
     },
@@ -82,7 +99,7 @@ option.value = Object.assign(option.value, {
       label: "旧序列号",
       prop: "oldSeq",
       hide: true,
-    },
+    },*/
     {
       label: "工序id",
       prop: "operationId",
@@ -111,10 +128,10 @@ option.value = Object.assign(option.value, {
       label: "录入数量",
       prop: "num",
     },
-    {
+    /*{
       label: "排序号",
       prop: "sortNum",
-    },
+    },*/
     {
       label: "采集人",
       prop: "trackBy",

src/views/quality/rework/index.vue

@@ -67,14 +67,14 @@
             size="small"
           >返工完成</el-button
         >-->
-        <el-button
+<!--        <el-button
             link
           v-if="row.state === 1"
           @click="handle(row, index, 3)"
           type="primary"
             size="small"
         >返工完成</el-button
-        >
+        >-->
 
         <el-button
           @click="document(row)"