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

src/views/purchase/transferOrder/add.vue

@@ -95,7 +95,12 @@
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="币种">
-              <el-select clearable size="mini" v-model="basicForm.currency" :disabled="sonDisable" @focus="chooseRefer('CURRENCY_PARAM', true, '币种')" style="width: 200px">
+              <el-select clearable size="mini" 
+                v-model="basicForm.currency" 
+                :disabled="sonDisable" 
+                @focus="chooseRefer('CURRENCY_PARAM', true, '币种')" 
+                style="width: 200px"
+              >
                 <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -149,18 +154,34 @@
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="客户">
-              <el-input
+              <el-select clearable size="mini" 
+                v-model="basicForm.customer" 
+                @clear="clean('客户')" 
+                @focus="chooseRefer('CUSTOMER_PARAM', true, '客户')" 
+                style="width: 200px"
+              >
+              <!-- @change="controlDRHW"  -->
+                <el-option v-for="item in customerOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+              <!-- <el-input
                 v-model="basicForm.customer"
                 size="mini"
                 :disabled="sonDisable"
                 clearable
                 style="width: 200px"
-              />
+              /> -->
             </el-form-item>
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="调入仓库">
-              <el-select clearable size="mini" v-model="basicForm.storageWarehouse" :disabled="sonDisable || isOrg" @clear="clean('调入仓库')" @change="controlDRHW" @focus="chooseRefer('WAREHOUSE_PARAM', true, '调入仓库', basicForm.storageInventoryOrg, 'N', 'N')" style="width: 200px">
+              <el-select clearable size="mini" 
+                v-model="basicForm.storageWarehouse" 
+                :disabled="sonDisable || isOrg" 
+                @clear="clean('调入仓库')"
+                @change="controlDRHW" 
+                @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>
@@ -715,6 +736,7 @@ export default {
       manOptions: [],
       deptOptions: [],
       currencyOptions: [],
+      customerOptions:[],
       ruHouseOptions: [],
       chuHouseOptions: [],
       liacenterOptions: [],
@@ -956,6 +978,9 @@ export default {
         if (type == 'LIACENTER_PARAM') {
           this.liacenterOptions = res.rows
         }
+        if (type == 'CUSTOMER_PARAM') {
+          this.customerOptions = res.rows
+        }
         if (type == 'WAREHOUSE_PARAM' && title == '调入仓库') {
           this.ruHouseOptions = res.rows
         }
@@ -1081,6 +1106,11 @@ export default {
         this.basicForm.currency = selection[0].id
         this.basicForm.currencyName = selection[0].name
       }
+      if (this.referCondition.title == '客户') {
+        this.customerOptions = selection
+        this.basicForm.customer = selection[0].id
+        this.basicForm.customerName = selection[0].name
+      }
       if (this.referCondition.title == '调入仓库') {
         this.ruHouseOptions = selection
         this.basicForm.storageWarehouse = selection[0].id