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

src/views/basic/business/stockOrder.vue

@@ -408,7 +408,7 @@ export default {
         this.query.startTime = null;
         this.query.endTime = null;
       }
-      this.query.vueType = "supDelivery";
+      this.query.vueType = "stock";
       filterOrder(this.query)
         .then(response => {
           this.loading = false;
@@ -469,7 +469,7 @@ export default {
     getBusType() {
       let query = {
         enabled: true,
-        vueType: "supDelivery",
+        vueType: "stock",
       };
       getLocalJoinByUser(query)
         .then((response) => {

src/views/inout/DialogCreateOrder.vue

@@ -146,7 +146,7 @@
               "
             >
               <el-select
-                v-model="orderFormData.fromCorp"
+                v-model="orderFormData.fromCorpName"
                 filterable
                 remote
                 clearable
@@ -1171,7 +1171,7 @@ export default {
           } else if (response.code == 505) {
             this.$confirm(response.message, "提示", {
               confirmButtonText: "确定",
-              cancelButtonText: "忽略",
+              cancelButtonText: "取消",
               type: "warning",
             })
               .then(() => {

src/views/inventory/inner/innerOrderSelectProduct.vue

@@ -128,6 +128,7 @@ import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
 import {addOrderDetail} from "@/api/inventory/innerOrder";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "stockOrderNewSelectProduct",
@@ -324,7 +325,7 @@ export default {
         }
       }
       let str = this.multipleSelection.zczbhhzbapzbh;
-      if (str.search(",") != -1) {
+      if (!isBlank(str) && str.search(",") != -1) {
         this.currentCert = null;
         this.certList = str.split(',');
         this.dialogFormVisible = true;