Merge remote-tracking branch 'origin/master'

src/views/inout/InvoiceCkeck.vue

@@ -521,7 +521,6 @@ export default {
     uploadHandleError() {
     },
     uploadHandleSuccess(response, file, fileList) {
-      debugger;
       if (response.code === 20000) {
         this.inputQuery.licenseUrl = response.data.name;
         // this.onSubmit();

src/views/inventory/InvOrderPlaceModify.vue

@@ -366,7 +366,6 @@ export default {
         oId: this.currentOrderId,
       };
       getInvProductOrderInfo(params).then((res) => {
-        debugger;
         if (res.code == 20000) {
           this.orderId = res.data;
           getInvPlaceOrderDetailList({ orderId: this.orderId }).then((res) => {

src/views/inventory/InvProducts.vue

@@ -392,6 +392,7 @@ export default {
     detailDialog(row) {
       this.detailDialogVisible = true;
       this.inputQuery = {
+        code: row.code,
         relId: row.relIdFk,
         cpmctymc: row.cpmctymc,
         nameCode: row.nameCode,
@@ -401,7 +402,8 @@ export default {
         expireDate: row.expireDate,
         supId: row.supId,
         deptCode: row.deptCode,
-        invCode: row.invCode
+        invCode: row.invCode,
+        invSpaceCode: row.invSpaceCode
       }
     },
     closeDetailDialog() {

src/views/inventory/InvProductsDetail.vue

@@ -177,9 +177,13 @@ export default {
       this.loading = true;
       this.invProductDetailQuery.relId = this.inputQuery.relId;
       this.invProductDetailQuery.supId = this.inputQuery.supId;
+      this.invProductDetailQuery.invSpaceCode = this.inputQuery.invSpaceCode;
       this.invProductDetailQuery.batchNo = this.inputQuery.batchNo;
       this.invProductDetailQuery.deptCode = this.inputQuery.deptCode;
       this.invProductDetailQuery.invCode = this.inputQuery.invCode;
+      if(!isBlank(this.invProductDetailQuery.invSpaceCode)){
+        this.invProductDetailQuery.code=this.inputQuery.code
+      }
       getInvProductDetail(this.invProductDetailQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {