Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!487

src/views/purchase/PurchaseDemandList/add.vue

@@ -427,6 +427,14 @@
     <!-- 批量调整参数 -->
     <el-dialog title="批量调整" :visible.sync="adjust.open" @close="closeEvent" width="38%">
       <el-row style="margin-bottom: 10px;">
+        <el-col :span="6" class="pltzTxt">默认采购组织</el-col>
+        <el-col :span="14">
+        <el-input class="pltzIpt" clearable size="mini" v-model="adjust.purOrgName" @focus="chooseOrg('ORG_PARAM', true, '采购组织')">
+          <el-button size="mini" slot="append" icon="el-icon-more" @click="chooseOrg('ORG_PARAM', true, '采购组织')"></el-button>
+        </el-input>
+        </el-col>
+      </el-row>
+      <el-row style="margin-bottom: 10px;">
         <el-col :span="6" class="pltzTxt">价格类型</el-col>
         <el-col :span="14">
         <el-select class="pltzIpt" clearable size="mini" v-model="adjust.priceType">
@@ -460,6 +468,14 @@
         </el-col>
       </el-row>
       <el-row style="margin-bottom: 10px;">
+        <el-col :span="6" class="pltzTxt">补单供应商</el-col>
+        <el-col :span="14">
+        <el-input class="pltzIpt" clearable :disabled="sonDisable || BDZT" size="mini" v-model="adjust.additionalSupplierName" @focus="chooseOrg('SUPPLIER_PARAM', true, '补单供应商')">
+          <el-button size="mini" :disabled="sonDisable || BDZT" slot="append" icon="el-icon-more" @click="chooseOrg('SUPPLIER_PARAM', true, '补单供应商')"></el-button>
+        </el-input>
+        </el-col>
+      </el-row>
+      <el-row style="margin-bottom: 10px;">
         <el-col :span="6" class="pltzTxt">业务备注</el-col>
         <el-col :span="14">
           <el-input class="pltzIpt" clearable size="mini" v-model="adjust.remark"/>
@@ -602,6 +618,8 @@ export default {
       // 批量调整参数
       adjust: {
         open: false,
+        puOrg: '',
+        purOrgName: '',
         priceType: '',
         purchaseMan: '',
         purchaseManName: '',
@@ -609,6 +627,8 @@ export default {
         warehouseName: '',
         allocation: '',
         allocationName: '',
+        additionalSupplier: '',
+        additionalSupplierName: '',
         remark:'',
         deliveryAddress: '',
         deliveryAddressName: '',
@@ -1284,11 +1304,19 @@ export default {
         this.basicForm.demandPersonal = selection[0].code
         this.basicForm.demandPersonalName = selection[0].name
       }
+      if(this.referCondition.type == 'ORG_PARAM' && this.referCondition.title == '采购组织') {
+        this.adjust.puOrg = selection[0].id
+        this.adjust.purOrgName = selection[0].name
+      }
       if(this.referCondition.type == 'CONTACTS_PARAM' && this.referCondition.title == '采购员') {
         this.purchaseManOptions = selection
         this.adjust.purchaseMan = selection[0].code
         this.adjust.purchaseManName = selection[0].name
       }
+      if(this.referCondition.type == 'SUPPLIER_PARAM' && this.referCondition.title == '补单供应商') {
+        this.adjust.additionalSupplier = selection[0].id
+        this.adjust.additionalSupplierName = selection[0].name
+      }
       if(this.referCondition.type == 'WAREHOUSE_PARAM' && this.referCondition.title == '收货仓库') {
         this.adjust.warehouse = selection[0].id
         this.adjust.warehouseName = selection[0].name
@@ -1760,6 +1788,26 @@ export default {
             if(this.adjust.priceType) {
               item.priceType = this.adjust.priceType
             }
+            if(this.adjust.additionalSupplierName) {
+              item.additionalSupplier = this.adjust.additionalSupplier
+              item.additionalSupplierName = this.adjust.additionalSupplierName
+            }
+            if(this.adjust.purOrgName) {
+              item.purOrgName = this.adjust.purOrgName
+              item.puOrg = this.adjust.puOrg
+              item.deliveryWarehouse = this.adjust.warehouse
+              item.deliveryWarehouseName = this.adjust.warehouseName
+              item.deliveryAllocation = this.adjust.allocation
+              item.deliveryAllocationName = this.adjust.allocationName
+              item.deliveryAddressName = this.adjust.deliveryAddressName
+              item.deliveryAddress = this.adjust.deliveryAddress
+              item.contacts = this.adjust.contacts
+              item.contactsPhone = this.adjust.contactsPhone
+              item.address = this.adjust.address
+              item.lastStockOrgName = null
+              item.lastWarehouseName = null
+              item.lastAllocationName = null
+            }
             if(this.adjust.warehouseName) {
               item.deliveryWarehouse = this.adjust.warehouse
               item.deliveryWarehouseName = this.adjust.warehouseName
@@ -1802,6 +1850,8 @@ export default {
     closeEvent() {
       this.adjust =  {
         open: false,
+        puOrg: '',
+        purOrgName: '',
         priceType: '',
         purchaseMan: '',
         purchaseManName: '',
@@ -1809,6 +1859,8 @@ export default {
         warehouseName: '',
         allocation: '',
         allocationName: '',
+        additionalSupplier: '',
+        additionalSupplierName: '',
         remark: '',
         deliveryAddress: '',
         deliveryAddressName: '',