Merge branch 'purchaseDev' into 'dev'

Purchase dev

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

src/views/purchase/DemandSummary/add.vue

@@ -80,8 +80,21 @@
         <el-table-column show-overflow-tooltip label="需求单单号" align="center" prop="code" width="150"/>
         <el-table-column show-overflow-tooltip label="供应仓库" align="center" prop="lastWarehouseName" width="150"/>
         <el-table-column show-overflow-tooltip label="供应货位" align="center" prop="lastAllocationName" width="150"/>
+        <el-table-column show-overflow-tooltip label="默认采购组织" align="center" prop="orgName" width="280px">
+          <template slot-scope="scope">
+              <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
+                <el-button size="mini" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')"></el-button>
+              </el-input>
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="业务类型" align="center" prop="billType" width="150" :formatter="formatterBillType"/>
-        <el-table-column show-overflow-tooltip label="收货仓库" align="center" prop="deliveryWarehouseName" width="150"/>
+        <el-table-column show-overflow-tooltip label="收货仓库" align="center" prop="deliveryWarehouseName" width="200">
+            <template slot-scope="scope">
+              <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.deliveryWarehouseName" @clear="clean(scope.row, '收货仓库')" @focus="chooseMxCK(scope.$index, 'WAREHOUSE_PARAM', true, '收货仓库', scope.row.org)">
+                <el-button size="mini" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxCK(scope.$index, 'WAREHOUSE_PARAM', true, '收货仓库', scope.row.org)"></el-button>
+              </el-input>
+            </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="收货货位" align="center" prop="deliveryAllocationName" width="200">
           <template slot-scope="scope">
             <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.deliveryAllocationName" @clear="clean(scope.row, '收货货位')" @focus="chooseMxHW(scope.$index, 'ALLOCATION_PARAM', true, '收货货位', scope.row.deliveryWarehouse)">
@@ -98,7 +111,7 @@
         <el-table-column show-overflow-tooltip label="集团预测分类" align="center" prop="forecastClassify" width="150"/>
         <el-table-column show-overflow-tooltip label="修改时间" align="center" prop="updateTime" width="150"/>
         <el-table-column show-overflow-tooltip label="采购员编码" align="center" prop="buyer" width="150"/>
-        <el-table-column show-overflow-tooltip label="采购组织" align="center" prop="orgName" width="150"/>
+        <!-- <el-table-column show-overflow-tooltip label="采购组织" align="center" prop="orgName" width="150"/> -->
         <el-table-column show-overflow-tooltip label="有效期单位" align="center" prop="expiryUnit" width="150"/>
         <!-- <el-table-column show-overflow-tooltip label="业务部门" align="center" prop="businessDeptName"/> -->
         <el-table-column show-overflow-tooltip label="需求部门" align="center" prop="demandDeptName" width="150"/>
@@ -306,18 +319,47 @@ export default {
       this.referCondition.stordocId = stordocId
       this.$refs.refer.init(this.referCondition)
     },
+    // 明细行选择仓库
+    chooseMxCK(index, type, isPage, title, orgId) {
+      this.tableIndex = index
+      this.referCondition.type = type
+      this.referCondition.isPage = isPage
+      this.referCondition.title = title
+      this.referCondition.pkOrg = orgId
+      this.$refs.refer.init(this.referCondition)
+    },
     selectionsToInput(selection) {
       if (this.referCondition.title == '收货货位') {
         this.tableList[this.tableIndex].deliveryAllocationName = selection[0].name
         this.tableList[this.tableIndex].deliveryAllocation = selection[0].id
       }
+      if (this.referCondition.title == '收货仓库') {
+        this.tableList[this.tableIndex].deliveryWarehouseName = selection[0].name
+        this.tableList[this.tableIndex].deliveryWarehouse = selection[0].id
+        this.tableList[this.tableIndex].deliveryAllocation = ''
+        this.tableList[this.tableIndex].deliveryAllocationName = ''
+      }
       if (this.referCondition.title == '选择补单供应商') {
         this.tableList[this.tableIndex].additionalSupplierName = selection[0].name
         this.tableList[this.tableIndex].additionalSupplier = selection[0].id
       }
+      if (this.referCondition.title == '默认采购组织') {
+        this.tableList[this.tableIndex].org = selection[0].id
+        this.tableList[this.tableIndex].orgName = selection[0].name
+        this.tableList[this.tableIndex].deliveryWarehouse = ''
+        this.tableList[this.tableIndex].deliveryWarehouseName = ''
+        this.tableList[this.tableIndex].deliveryAllocation = ''
+        this.tableList[this.tableIndex].deliveryAllocationName = ''
+      }
     },
     // 清空选中的货位
     clean(row, title) {
+      if (title == '收货仓库') {
+        row.deliveryWarehouse = ''
+        row.deliveryWarehouseName = ''
+        row.deliveryAllocation = ''
+        row.deliveryAllocationName = ''
+      }
       if (title == '收货货位') {
         row.deliveryAllocation = ''
         row.deliveryAllocationName = ''
@@ -326,6 +368,14 @@ export default {
         row.additionalSupplier = ''
         row.additionalSupplierName = ''
       }
+      if (title == '默认采购组织') {
+        row.org = ''
+        row.orgName = ''
+        row.deliveryWarehouse = ''
+        row.deliveryWarehouseName = ''
+        row.deliveryAllocation = ''
+        row.deliveryAllocationName = ''
+      }
     }
   }
 }

src/views/purchase/DemandSummary/index.vue

@@ -281,11 +281,11 @@
             </template>
           </el-table-column>
           <el-table-column show-overflow-tooltip label="默认采购组织" align="center" prop="purchaseOrgName" width="280px">
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
                 <el-input readonly :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.purchaseOrgName">
                   <el-button size="mini" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseSon(scope.$index, 'ORG_PARAM', true, '明细默认采购组织')"></el-button>
                 </el-input>
-            </template>
+            </template> -->
           </el-table-column>
           <el-table-column show-overflow-tooltip label="有效期" align="center" prop="validityPeriod"/>
           <el-table-column show-overflow-tooltip label="有效期单位" align="center" prop="validityPeriodUnit" width="100px"/>
@@ -738,11 +738,11 @@ export default {
         this.tableList[this.tableIndex].buyer = selection[0].code
         this.tableList[this.tableIndex].buyerName = selection[0].name
       }
-      if (this.referCondition.title == '明细默认采购组织') {
-        console.log('选择进了吗',this.tableList)
-        this.tableList[this.tableIndex].purchaseOrg = selection[0].id
-        this.tableList[this.tableIndex].purchaseOrgName = selection[0].name
-      }
+      // if (this.referCondition.title == '明细默认采购组织') {
+      //   console.log('选择进了吗',this.tableList)
+      //   this.tableList[this.tableIndex].purchaseOrg = selection[0].id
+      //   this.tableList[this.tableIndex].purchaseOrgName = selection[0].name
+      // }
     },
     // 搜索区树形选择
     chooseTreeRefer(type, isPage, title) {