Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/purchase/DemandSummary/index.vue

@@ -416,11 +416,11 @@ export default {
           case '0':
             return '需补货'
           case '1':
-            return '待采购确认'
+            return '待计划确认'
           case '2':
-            return '采购已确认'
+            return '计划已确认'
           case '3':
-            return '采购已审核'
+            return '计划已审核'
           case '4':
             return '行关闭'
           case '5':

src/views/purchase/PurchaseDemandList/add.vue

@@ -587,11 +587,11 @@ export default {
         case '0':
           return '需补货'
         case '1':
-          return '待采购确认'
+          return '待计划确认'
         case '2':
-          return '采购已确认'
+          return '计划已确认'
         case '3':
-          return '采购已审核'
+          return '计划已审核'
         case '4':
           return '行关闭'
         case '5':
@@ -851,12 +851,12 @@ export default {
       this.$refs.refer.init(this.referCondition)
     },
     selectionsToInput(selection) {
-      if(this.referCondition.type == 'ORG_PARAM') {
+      if(this.referCondition.type == 'ORG_PARAM' && this.referCondition.title == '选择组织') {
         this.orgOptions = selection
         this.basicForm.org = selection[0].id
         this.basicForm.orgName = selection[0].name
       }
-      if(this.referCondition.type == 'CUSTOMER_PARAM') {
+      if(this.referCondition.type == 'CUSTOMER_PARAM' && this.referCondition.title == '选择客户') {
         this.customerOptions = selection
         this.basicForm.customer = selection[0].id
         this.basicForm.customerName = selection[0].name

src/views/purchase/transferOrder/add.vue

@@ -158,7 +158,7 @@
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="调入仓库">
-              <el-select clearable size="small" v-model="basicForm.storageWarehouse" :disabled="sonDisable" @focus="chooseRefer('WAREHOUSE_PARAM', true, '调入仓库', basicForm.storageInventory, 'N', 'N')" style="width: 200px">
+              <el-select clearable size="small" v-model="basicForm.storageWarehouse" :disabled="sonDisable" @focus="chooseRefer('WAREHOUSE_PARAM', true, '调入仓库', basicForm.storageInventoryOrg, 'N', 'N')" style="width: 200px">
                 <el-option v-for="item in ruHouseOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -279,7 +279,7 @@
           <el-table-column show-overflow-tooltip label="调入部门" align="center" prop="storageDeptName" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
-                <el-input clearable :disabled="sonDisable" size="small" v-model="scope.row.storageDeptName" @focus="chooseMxBM(scope.$index, 'DEPT_PARAM', true, '调入部门', basicForm.storageInventoryOrg)"">
+                <el-input clearable :disabled="sonDisable" size="small" v-model="scope.row.storageDeptName" @focus="chooseMxBM(scope.$index, 'DEPT_PARAM', true, '调入部门', basicForm.storageInventoryOrg)">
                   <el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseMxBM(scope.$index, 'DEPT_PARAM', true, '调入部门', basicForm.storageInventoryOrg)"></el-button>
                 </el-input>
               </el-form-item>