Merge branch 'wang' into orderChange

src/views/thrsys/thrOrderNew.vue

@@ -61,13 +61,12 @@
                     </el-col>
 
                     <el-col :span="7">
-                        <el-form-item prop="locStorageCode">
+                        <el-form-item >
-                            <el-select v-model="formData.invWarehouseCode" filterable  @change="subStorageChange" placeholder="当前仓库信息" style="width: 100%;"
+                            <el-select v-model="formData.locStorageCode" filterable  @change="subStorageChange" placeholder="当前仓库信息"  clearable
-                                       clearable>
+                                       style="width: 100%;"  >
                                 <el-option
                                     v-for="item in subInvList"
                                     :key="item.name"
-
                                     :label="item.name"
                                     :value="item.code">
                                     <span style="float: left">{{ item.name }}</span>
@@ -481,7 +480,7 @@ export default {
         },
         subStorageChange(item) {
             // this.formData.fromSubInvCode = null;
-            this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
+            this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode)
             this.formData.corpId=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).code
             this.formData.corpName=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).warehouseName
             this.findSubStorageMethod();