zhangjinxing 3 years ago
parent
commit
55b714e569

+ 13 - 10
src/views/sellOut/returnOrder/components/returnCheck.vue

@@ -9,7 +9,7 @@
         class="demo-tableForm product_go"
       >
         <!-- {{ tableForm.product_go }} -->
-        <p>{{ s_sitem }}</p>
+        <p>{{ sitem }}</p>
         <el-form-item label="入库情况">
           <el-table
             :data="tableForm.product_go"
@@ -154,7 +154,7 @@ import { isnumber } from "@/utils/validate";
 import config from "./columns"; //表格列参数
 export default {
   name: "return-check",
-  props: ["id", "newTime", "s_sitem"],
+  props: ["id", "newTime", "sitem"],
 
   mixins: [resToken],
   computed: {
@@ -191,12 +191,12 @@ export default {
       tableFormThis: config.tableFormThis,
       voList: [
         {
-          check_remark: "", //
-          check_value: "agree",
-          anomalous_numbers: 99,
-          anomalous_reason: "不喜欢",
-          anomalous_reason_code: "", //异常原因code
-          anomalous_remark: "111",
+          // check_remark: "", //
+          // check_value: "agree",
+          // anomalous_numbers: 99,
+          // anomalous_reason: "不喜欢",
+          // anomalous_reason_code: "", //异常原因code
+          // anomalous_remark: "111",
         },
       ],
     };
@@ -208,6 +208,7 @@ export default {
       }
     },
   },
+
   mounted() {
     this.initForm();
   },
@@ -215,7 +216,7 @@ export default {
     async initForm() {
       this.loading = true;
       this.columns = [];
-      console.log(this.s_sitem);
+      console.log(this.sitem);
       // await this.getresultlist();
       // this.thNo = this.sitem.thNo;
       // console.log(this.thNo);
@@ -228,7 +229,9 @@ export default {
         if (this.$refs.tableForm) {
           this.$refs.tableForm.resetFields();
           this.$refs.tableForm.clearValidate();
-          console.log(this.s_sitem);
+          console.log(this.sitem);
+          // console.log(this.sitem);
+
           let list = JSON.parse(JSON.stringify(this.voList));
           list.forEach((v) => {
             v.edit = false;

+ 6 - 1
src/views/sellOut/returnOrder/detail.vue

@@ -15,7 +15,12 @@
 
         <el-collapse-item title="退货验收审核" name="1">
           <!-- <return-check :sitem="sitem"></return-check> -->
-          <return-check :s_sitem="s_sitem" @refresh="searchList"></return-check>
+          <!--  -->
+          <return-check
+            v-if="newTime != ''"
+            :sitem="s_sitem"
+            @refresh="searchList"
+          ></return-check>
         </el-collapse-item>
         <el-collapse-item
           title="业务审核"