新增单据

package.json

@@ -35,6 +35,7 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   "dependencies": {
+    "element-china-area-data": "^5.0.2",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",

src/views/inout/IoCreateOrder.vue

@@ -180,15 +180,16 @@
     </el-card>
     <el-tabs type="border-card" style="margin: 5px">
       <el-tab-pane label="业务详情">
-        <biz-detail-panel :idQuery="orderFormData" v-if="isCodeAlive"></biz-detail-panel>
+        <biz-detail-panel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel" :refreshOrder="refreshOrder"
+                          v-if="isBizDetailAlive"></biz-detail-panel>
       </el-tab-pane>
       <el-tab-pane label="扫码详情">
-        <codeDetailPanel :idQuery="orderFormData" v-if="isCodeAlive"></codeDetailPanel>
+        <codeDetailPanel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel"
+                         v-if="isCodeDetailAlive"></codeDetailPanel>
       </el-tab-pane>
       <el-tab-pane label="扫码明细">
-        <codesPanel :idQuery="orderFormData" v-if="isCodeAlive"></codesPanel>
+        <codesPanel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel" v-if="isCodeAlive"></codesPanel>
       </el-tab-pane>
-
     </el-tabs>
 
 
@@ -331,6 +332,8 @@ export default {
       },
       fromOptions: [],
       isCodeAlive: true,
+      isBizDetailAlive: true,
+      isCodeDetailAlive: true,
 
       editCodeVisible: false,
       actionEnable: false,
@@ -382,7 +385,7 @@ export default {
       findInvByUser()
         .then((response) => {
           this.curInvOptions = response.data || [];
-          if (this.curInvOptions != null && this.curInvOptions.length == 1) {
+          if (this.curInvOptions != null && this.curInvOptions.length > 1) {
             this.orderFormData.invWarehouseCode = this.curInvOptions[0].code;
             this.getBusTypeByInv()
           }
@@ -511,7 +514,7 @@ export default {
     addCodeSubmit(tQuery) {
       addOrderWeb(tQuery).then((response) => {
         if (response.code === 20000) {
-          this.idQuery.billNo = response.data.orderId;
+          this.orderFormData.billNo = response.data.orderId;
           if (response.data.errMsg != null) {
             this.$alert(response.data.errMsg, '提示', {
               confirmButtonText: '确定',
@@ -528,13 +531,13 @@ export default {
         } else {
           if (response.code == 502) {
             this.curRow = response.data;
-            this.idQuery.billNo = this.curRow.orderId;
+            this.orderFormData.billNo = this.curRow.orderId;
             this.refreshCodesPanel();
             this.selectRlTitle = response.message;
             this.bindRl(response.data);
           } else if (response.code == 503) {
             this.curRow = response.data;
-            this.idQuery.billNo = this.curRow.orderId;
+            this.orderFormData.billNo = this.curRow.orderId;
             this.refreshCodesPanel();
             this.selectUnitTitle = response.message;
             this.handleUnitClick(response.data);
@@ -591,15 +594,24 @@ export default {
 
     refreshCodesPanel() {
       this.isCodeAlive = false;
+      this.isBizDetailAlive = false;
+      this.isCodeDetailAlive = false;
       this.$nextTick(() => {  //重新加载组件
         this.isCodeAlive = true
+        this.isBizDetailAlive = true;
+        this.isCodeDetailAlive = true;
       })
     },
 
 
+    refreshOrder(idQuery) {
+      this.orderFormData = idQuery;
+    },
+
+
     submit() {
       let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
-      tQuery.orderId = this.idQuery.billNo;
+      tQuery.orderId = this.orderFormData.billNo;
       submitOrderWeb(tQuery)
         .then((response) => {
           if (response.code === 20000) {
@@ -613,7 +625,7 @@ export default {
     },
     saveOrder() {
       let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
-      tQuery.orderId = this.idQuery.billNo;
+      tQuery.orderId = this.orderFormData.billNo;
       saveOrderWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.closeDialog();
@@ -696,7 +708,7 @@ export default {
 
     repeatAddCode(editData) {
       let tQuery = editData;
-      tQuery.orderId = this.idQuery.id;
+      tQuery.orderId = this.orderFormData.id;
       tQuery.actDate = parseTime(this.orderFormData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
       tQuery.action = this.orderFormData.action;
       this.closeCodeDialog();
@@ -734,7 +746,7 @@ export default {
       updateCodeBindSup(query).then((response) => {
         if (response.code == 20000) {
           this.$message.success("绑定成功");
-          this.idQuery.id = this.curRow.orderId;
+          this.orderFormData.id = this.curRow.orderId;
           this.getCodeList();
         } else {
           this.$message.error(response.message);
@@ -754,12 +766,12 @@ export default {
       updateCodeBindSup(query).then((response) => {
         if (response.code == 20000) {
           this.$message.success("绑定成功");
-          this.idQuery.id = this.curRow.orderId;
+          this.orderFormData.id = this.curRow.orderId;
           this.getCodeList();
         } else {
           if (response.code == 503) {
             this.curRow = response.data;
-            this.idQuery.id = this.curRow.orderId;
+            this.orderFormData.id = this.curRow.orderId;
             this.getCodeList();
             this.selectUnitTitle = response.message;
             this.handleUnitClick(response.data);

src/views/inout/IoCreateOrderBizDetail.vue

@@ -197,6 +197,14 @@ export default {
       type: Object,
       required: true,
     },
+    refreshPanel: {
+      type: Function,
+      required: true,
+    },
+    refreshOrder: {
+      type: Function,
+      required: true,
+    },
   },
   data() {
     return {
@@ -332,6 +340,15 @@ export default {
   ,
   filters: {}
   ,
+
+  watch: {
+    'idQuery.billNo': {
+      handler() {
+        this.refreshOrder(this.idQuery);
+      },
+    }
+  },
+
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();

src/views/inout/IoCreateOrderCodes.vue

@@ -112,6 +112,10 @@ export default {
       type: Object,
       required: true,
     },
+    refreshPanel: {
+      type: Function,
+      required: true,
+    },
   },
   data() {
     return {
@@ -165,7 +169,7 @@ export default {
         deleteCodesTempById(tQuery)
           .then((response) => {
             if (response.code === 20000) {
-              this.getCodeList();
+            this.refreshPanel();
             } else {
               this.$message.error(response.message);
             }

src/views/inout/stockOrderNewSelectProduct.vue

@@ -155,6 +155,7 @@
 
 import {getUdiInfos} from "@/api/basic/product/udiRelevance";
 import {addBizProduct} from "@/api/inout/orderDetailCode";
+import {filterCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -226,7 +227,7 @@ export default {
 
     getList() {
       this.loading = true;
-      getUdiInfos(this.listQuery)
+      filterCompanyProductRelevance(this.listQuery)
         .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
@@ -282,7 +283,7 @@ export default {
 
     combine() {
       let data = {
-        relId: this.currentRow.id,
+        relId: this.currentRow.rlId,
         supId: this.currentRow.customerId,
         zczbhhzbapzbh: this.currentRow.zczbhhzbapzbh,
         orderEntity: this.data,

src/views/purchase/cert/supCertSearch.vue

@@ -665,7 +665,6 @@ export default {
         },
         //生产产品打印
         printSupCertProductionPdf(row) {
-            debugger
 
             let query = {moduleId: 10};
             this.loading = true;

src/views/system/dept/invRelUsers.vue

@@ -221,7 +221,6 @@ export default {
     },
 
     addUser() {         //添加仓库关联用户弹窗
-      debugger
       this.currentCode = this.inputQuery.code;
       this.userFormVisible = true;
       this.selectUserQuery.code = this.inputQuery.code;