Merge branch 'wang' into orderChange

src/views/business/selectThrOrderDialog.vue

@@ -161,7 +161,7 @@ export default {
                 page: 1,
                 limit: 10,
                 allocateStatus: 0,
-                type: 0,
+                type: null,
                 customerId: null,
             },
             detailList: [],
@@ -384,9 +384,13 @@ export default {
         },
     },
     created() {
+
         this.getBusType();
         this.getStorage();
-        this.getList();
+
+            this.getList();
+
+
     },
     components: {selectInvDialog}
 

src/views/inout/IOAddOrder.vue

@@ -182,11 +182,13 @@
                             placeholder="请选择科室"
                             :remote-method="findDeptMethod"
                             :loading="loading"
+                            :disabled="corpOrderIdDisabled"
+                            @change="ksChange"
                             @focus="findDeptMethod('')"
                         >
                             <el-option
                                 v-for="item in fromDeptOptions"
-                                :key="item.id"
+                                :key="item.code"
                                 :label="item.name"
                                 :value="item.code"
                             >
@@ -823,6 +825,10 @@ export default {
             this.formData.fromCorpId = row.parentId;
             this.formData.fromCorp = row.name;
         },
+        ksChange(code){
+                this.formData.deptCode=code;
+        },
+
 
 
         deleteCode(index, row) {
@@ -1185,10 +1191,10 @@ export default {
 
     },
     created() {
-
         this.formData.code = '';
         this.formData.actDate = new Date();
         this.codeArray = [];
+        this.findDeptMethod();
         this.getStorage(this.formData.action);
         if (this.$isNotBlank(this.idQuery.id)) {
             this.formData.actDate = new Date(this.idQuery.actDate);
@@ -1196,6 +1202,7 @@ export default {
             this.corpOrderIdDisabled = true;
             this.formData.action = this.idQuery.action;
             this.formData.fromCorp = this.idQuery.fromCorp;
+            this.formData.deptCode= this.idQuery.deptCode
             this.formData.fromCorpId = this.idQuery.fromCorpId;
             this.formData.locStorageCode = this.idQuery.locStorageCode;
             this.formData.invWarehouseCode = this.idQuery.invWarehouseCode;

src/views/inout/IONewOrder.vue

@@ -466,7 +466,7 @@ export default {
                 this.idQuery.locStorageCode = row.locStorageCode;
                 this.idQuery.invWarehouseCode = row.invWarehouseCode;
                 this.idQuery.fromSubInvCode = row.fromSubInvCode;
-
+                this.idQuery.deptCode = row.deptCode;
 
                 this.idQuery.preCheck = row.preCheck;
             }