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

src/views/purchase/DemandSummary/add.vue

@@ -133,7 +133,7 @@
         <el-table-column show-overflow-tooltip label="需求单提交人" align="center" prop="createByName" width="150"/>
         <!-- <el-table-column show-overflow-tooltip label="处理需求时间" align="center" prop="processTime"/> -->
         <!-- <el-table-column show-overflow-tooltip label="处理需求人员" align="center" prop="processPersonal"/> -->
-        <el-table-column show-overflow-tooltip label="处理确认人" align="center" prop="affirmer" width="150"/>
+        <el-table-column show-overflow-tooltip label="处理确认人" align="center" prop="affirmerName" width="150"/>
         <el-table-column show-overflow-tooltip label="处理确认时间" align="center" prop="affirmerTime" width="150"/>
         <!-- <el-table-column show-overflow-tooltip label="转请购时间" align="center" prop="code"/>
         <el-table-column show-overflow-tooltip label="转请购人员" align="center" prop="code"/> -->
@@ -233,6 +233,7 @@ export default {
       console.log('数据', this.row)
       let param = JSON.parse(JSON.stringify(this.query))
       param.sumFlag = this.row.sumFlag
+      param.demandItemId = this.row.demandItemId
       this.getDetails(param)
     }
   },

src/views/purchase/MaterialClassDivision/index.vue

@@ -76,7 +76,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-form-item label="物料四级大类编码">
-              <el-input size="mini" style="width: 200px" readonly v-model="queryParams.materialClassifyFour">
+              <el-input size="mini" style="width: 200px" readonly v-model="queryParams.materialClassify">
                 <el-button slot="append" icon="el-icon-more" @click="chooseFourClass"></el-button>
               </el-input>
             </el-form-item>
@@ -309,7 +309,7 @@ export default {
         materialClassifyTwoName: '',
         materialClassifyThree: '',
         materialClassifyThreeName: '',
-        materialClassifyFour: '',
+        materialClassify: '',
         materialClassifyFourName: '',
         materialCode: '',
         materialName: '',
@@ -362,7 +362,7 @@ export default {
         materialClassifyTwoName: '',
         materialClassifyThree: '',
         materialClassifyThreeName: '',
-        materialClassifyFour: '',
+        materialClassify: '',
         materialClassifyFourName: '',
         materialCode: '',
         materialName: '',
@@ -446,7 +446,7 @@ export default {
     // 选择物料分类
     acceptFourClass(selections) {
       console.log('收到的四级分类', selections)
-      this.queryParams.materialClassifyFour = selections.code
+      this.queryParams.materialClassify = selections.code
     },
     // 显示物料编码列表
     test01() {

src/views/purchase/PurchaseDemandList/add.vue

@@ -183,34 +183,10 @@
           <!-- <el-table-column show-overflow-tooltip label="业务部门名称" align="center" width="180px"/> -->
           <!-- <el-table-column show-overflow-tooltip label="业务部门" align="center" width="180px"/> -->
           <el-table-column show-overflow-tooltip label="需求客户" align="center"  prop="demandCustomerName" width="200px"/>
-          <el-table-column show-overflow-tooltip label="一级品类" align="center" prop="materialClassifyOneName" width="180px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input readonly size="mini" v-model="scope.row.materialClassifyOneName"/>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column show-overflow-tooltip label="二级品类" align="center" prop="materialClassifyTwoName" width="180px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input readonly size="mini" v-model="scope.row.materialClassifyTwoName"/>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column show-overflow-tooltip label="三级品类" align="center" prop="materialClassifyThreeName" width="180px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input readonly size="mini" v-model="scope.row.materialClassifyThreeName"/>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column show-overflow-tooltip label="四级品类" align="center" prop="materialClassifyFourName" width="180px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input readonly size="mini" v-model="scope.row.materialClassifyFourName"/>
-              </el-form-item>
-            </template>
-          </el-table-column>
+          <el-table-column show-overflow-tooltip label="一级品类" align="center" prop="materialClassifyOneName" width="180px"/>
+          <el-table-column show-overflow-tooltip label="二级品类" align="center" prop="materialClassifyTwoName" width="180px"/>
+          <el-table-column show-overflow-tooltip label="三级品类" align="center" prop="materialClassifyThreeName" width="180px"/>
+          <el-table-column show-overflow-tooltip label="四级品类" align="center" prop="materialClassifyFourName" width="180px"/>
           <el-table-column show-overflow-tooltip label="采购员名称" align="center" prop="buyerName" width="120px"/>
           <el-table-column show-overflow-tooltip label="采购员" align="center"  prop="buyer"/>
           <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" width="230px">
@@ -1422,6 +1398,8 @@ export default {
       this.basicForm.puDemandItemList[this.tableIndex].materialClassifyFour = null
       this.basicForm.puDemandItemList[this.tableIndex].lastStockOrg = null
       this.basicForm.puDemandItemList[this.tableIndex].lastStockOrgName = null
+      this.basicForm.puDemandItemList[this.tableIndex].buyer = null
+      this.basicForm.puDemandItemList[this.tableIndex].buyerName = null
       // 通过选择物料查询采购员
       queryMan(selection[0].id).then(res => {
         if(res.code === 200 && res.rows.length !== 0) {