Merge remote-tracking branch 'origin/master'

src/views/udi/trace/search/index.vue

@@ -732,6 +732,16 @@ export default {
         page: 1,
         limit: 10,
       },
+      manuOrderQuery: {
+        recordCode: null,
+        page: 1,
+        limit: 10,
+      },
+      manuCodeRelQuery: {
+        manuOrderIdFk: null,
+        page: 1,
+        limit: 10,
+      },
       total: 0,
       loading: false,
       manuOrderLoading: false,
@@ -740,6 +750,8 @@ export default {
       listOrder: [],
       listCodeRel: [],
       open: false,
+      openManuOrder: false,
+      openManuCodeRel: false,
       formView: {},
       manuOrderFormView: {},
       manuOrderCodeRelFormView: {},
@@ -755,13 +767,26 @@ export default {
     }
   },
   methods: {
+    handleViewCoderel(row) {
+      this.listCodeRel.forEach(obj => {
+        if (this.listCodeRel[0]) {
+          this.formViewCodeRel = obj
+        }
+      })
+      console.log(this.formViewCodeRel)
+      this.openManuCodeRel = true
+    },
+    handleSelectionChange(val) {
+      this.currentRow = val;
+      this.getManuCodeRel();
+    },
     getManuCodeRel() {
-      if (this.currentRow == null || isBlank(this.currentRow.billNo)) {
+      if (this.currentRow.id == null) {
         this.$message.error("请先选择需要查询的单据！")
         return;
       }
       this.manuCodeRelLoading = true;
-      this.manuCodeRelQuery.manuOrderNo = this.currentRow.billNo;
+      this.manuCodeRelQuery.manuOrderIdFk = this.currentRow.id;
       getManuCodeRelList(this.manuCodeRelQuery).then((res) => {
         this.manuCodeRelLoading = false;
         if (res.code === 20000) {
@@ -784,7 +809,7 @@ export default {
       //清空校验结果表
       this.listCodeRel = null;
       this.loading = true;
-      getTraceManuOrderList(this.filterQuery).then((res) => {
+      getTraceManuOrderList(this.manuOrderQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
           this.listOrder = res.data.list || [];
@@ -970,6 +995,8 @@ export default {
           this.list = res.data || [];
           this.total = res.data.total || 0;
           console.log(res.data)
+          this.manuOrderQuery.recordCode = res.data.recordCode
+          this.getManuOrderList()
         } else {
           this.$message.error(res.message);
           this.list = [];