Merge remote-tracking branch 'origin/otherChange' into zhairh

# Conflicts:
#	src/views/inventory/InvProducts.vue

src/views/basic/BusTypeChange.vue

@@ -41,7 +41,7 @@
                         <span>{{ enableMap[scope.row.supplementAll] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="备注" prop="intro"></el-table-column>
+                <el-table-column label="备注" prop="remark"></el-table-column>
                 <el-table-column label="操作" width="100" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -167,7 +167,7 @@ export default {
 
         onAddSubmit() {
 
-
+            debugger
             if (this.$isBlank(this.inputQuery.originAction)) {
                 this.$message.error("原单据类型不能为空！");
                 return;

src/views/inventory/InvPreInProductsDetail.vue

@@ -187,14 +187,14 @@ export default {
     getCodeList() {
       this.loading = true;
       this.query.orderIdFk = this.idQuery.orderIdFk;
-      let query = {
-        orderIdFk: this.idQuery.orderIdFk,
-        code:this.query.code
-      }
+      // let query = {
+      //   orderIdFk: this.idQuery.orderIdFk,
+      //   code:this.query.code,
+      // }
       /*  this.query.batchNo = this.idQuery.batchNo;
         this.query.supId = this.idQuery.supId;
         this.query.invStorageCode = this.idQuery.invStorageCode;*/
-      filterDetailProducts(query) //查找该单号下的所有条码
+      filterDetailProducts(this.query) //查找该单号下的所有条码
           .then((response) => {
             this.loading = false;
             this.codeArry = response.data.list || [];

src/views/warehouse/stockOrderNew.vue

@@ -679,8 +679,9 @@ export default {
             }
             if (store.getters.customerId == 110) {
                 this.newSpDistributionVisible = true;
-            } else
+            } else{
                 this.newDistributionVisible = true;
+            }
         },
         closeDialog(type) {
             this.newDistributionVisible = false;

src/views/warehouse/stockOrderNewDistribution.vue

@@ -73,7 +73,7 @@
                     <el-col :span="7">
                         <el-form-item prop="billType">
                             <el-select v-model="formData.billType" placeholder="请选择业务类型"
-                                       :disabled="codeArray.length>0"
+                                       :disabled="codeArray.length>0"  @change="actionChange"
                                        clearable>
                                 <el-option
                                     v-for="item in busTypes"
@@ -275,6 +275,7 @@
             width="85%"
             v-if="selectInvProductVisible"
             :append-to-body='true'
+            :invQueryData="invQueryData"
         >
             <dialogInvProduct
                 :closeDialog="closeDialogC2"
@@ -367,6 +368,7 @@ export default {
             formVisible: false,
             deleteLoading: false,
             orderNo: null,
+            invQueryData:[],
 
             statusMap: {
                 101: "未处理",
@@ -512,6 +514,12 @@ export default {
                 .catch(() => {
                     this.loading = false;
                 })
+        },
+        actionChange(val) {
+
+         this.formData.billType=val
+
+
         },
         submit(formName) {
             if (this.total < 1) {
@@ -543,8 +551,9 @@ export default {
         },
         selectProductFunction(event) {
 
-            if (event != null)
+            if (event != null) {
                 event.target.select();
+            }
             if (this.$isBlank(event)) {
                 if (this.$isBlank(this.formData.billType)) {
                     this.$message.error("单据类型不能为空！")
@@ -569,6 +578,7 @@ export default {
                 if (this.orderEditor) {
                     this.thisData.orderId = this.formData.id
                 }
+
                 this.invQueryData.corpId = this.formData.corpId;
                 this.selectProductVisible = true;
                 return;
@@ -995,6 +1005,7 @@ export default {
             this.formData = {
                 billdate: "",
                 corpName: store.getters.companyName,
+                corpId:store.getters.customerId,
                 customerId: store.getters.customerId,
                 billType: "",
                 type: "2",