任务分配：规格型号名称材料

src/api/PurchasingCenter/PurchaseTaskAllocate.js

@@ -53,7 +53,7 @@ export function searchTable1(...params) {
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料',
-      param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&物料状态=${params[10]}`,
+      param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&物料状态=${params[10]}&物料规格_check=${params[11]}&物料规格=${params[12]}&物料型号_check=${params[13]}&物料型号=${params[14]}`,
       Pagination: params[0] + '&' + params[1]
     }
   })
@@ -66,7 +66,7 @@ export function searchTable2(...params) {
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_基本件',
-      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&物料状态=${params[4]}`,
+      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&物料状态=${params[4]}&零件图号_check=${params[5]}&零件图号=${params[6]}&零件名称_check=${params[7]}&零件名称=${params[8]}&规格_check=${params[9]}&规格=${params[10]}&材料_check=${params[11]}&材料=${params[12]}`,
       Pagination: params[0] + '&' + params[1]
     }
   })

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -2,16 +2,16 @@
   <div class="app-container">
     <el-tabs type="border-card" @tab-click="searchTable1();searchTable2()">
       <el-tab-pane label="标准件和外购件">
-        <el-row style="margin-bottom: 10px">
+        <el-row style="margin-bottom: 5px">
           <span style="margin-left: 0">项目名称:</span>
-          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable style="width: 170px">
+          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable>
             <el-option
               v-for="item in project"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <span>物料状态:</span>
+          <span style="margin-right: -10px">物料状态:</span>
           <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
           <el-button
             type="success"
@@ -19,7 +19,7 @@
             icon="el-icon-search"
             style="margin-left: 10px"
             @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
-          <div style="float:right">
+          <div style="float:right;padding-top:10px;">
             <span style="margin-left: 0">采购员:</span>
             <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
               <el-option
@@ -28,6 +28,35 @@
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
+          </div>
+        </el-row>
+        <el-row style="margin-bottom: 15px">
+          <span style="margin-left: 0">物料类别:</span>
+          <el-select
+            v-model="MaterialCategoryValue"
+            placeholder="请选择"
+            size="small"
+            clearable
+            @change="searchMaterialVariety">
+            <el-option
+              v-for="item in MaterialCategory"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span>物料品种:</span>
+          <el-select
+            v-model="MaterialVarietyValue"
+            placeholder="请选择"
+            size="small"
+            clearable>
+            <el-option
+              v-for="item in MaterialVariety"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <div style="float:right;">
             <el-button
               type="primary"
               size="small"
@@ -42,36 +71,13 @@
               @click="executeReturn1">退回</el-button>
           </div>
         </el-row>
-        <el-row style="margin-bottom: 10px">
+        <el-row style="margin-bottom: 15px">
-          <span style="margin-left: 0">物料类别:</span>
+          <span style="margin-left: 0">物料名称:</span>
-          <el-select
+          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-            v-model="MaterialCategoryValue"
+          <span>物料规格:</span>
-            style="width:150px"
+          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-            placeholder="请选择"
+          <span>物料型号:</span>
-            size="small"
+          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-            clearable
-            @change="searchMaterialVariety">
-            <el-option
-              v-for="item in MaterialCategory"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <span>物料品种:</span>
-          <el-select
-            v-model="MaterialVarietyValue"
-            style="width:150px"
-            placeholder="请选择"
-            size="small"
-            clearable>
-            <el-option
-              v-for="item in MaterialVariety"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <span>物料名称:</span>
-          <el-input v-model="materialName" placeholder="物料名称" style="width:170px" size="small" clearable/>
         </el-row>
         <el-row style="margin-bottom: 10px">
           <el-table v-loading="" :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange1">
@@ -109,7 +115,7 @@
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="图号" min-width="100px">
+            <el-table-column align="center" label="图号或型号" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料型号 }}
               </template>
@@ -169,16 +175,16 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="基本件">
-        <el-row style="margin-bottom: 10px">
+        <el-row style="margin-bottom: 5px">
           <span style="margin-left: 0">项目名称:</span>
-          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable style="width: 170px">
+          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable>
             <el-option
               v-for="item in project"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <span>物料状态:</span>
+          <span style="margin-right: -10px">物料状态:</span>
           <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
           <el-button
             type="success"
@@ -186,7 +192,7 @@
             icon="el-icon-search"
             style="margin-left: 10px"
             @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
-          <div style="float:right">
+          <div style="float:right;padding-top: 10px">
             <span style="margin-left: 0">采购员:</span>
             <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
               <el-option
@@ -195,6 +201,14 @@
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
+          </div>
+        </el-row>
+        <el-row style="margin-bottom: 15px">
+          <span style="margin-left: 0">零件图号:</span>
+          <el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
+          <span>零件名称:</span>
+          <el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
+          <div style="float:right;">
             <el-button
               type="primary"
               size="small"
@@ -209,6 +223,12 @@
               @click="executeReturn2">退回</el-button>
           </div>
         </el-row>
+        <el-row style="margin-bottom: 15px">
+          <span style="margin-left: 0">零件规格:</span>
+          <el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
+          <span>零件材料:</span>
+          <el-input v-model="partMaterial" placeholder="零件材料" size="small" clearable/>
+        </el-row>
         <el-row style="margin-bottom: 10px">
           <el-table v-loading="" :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange2">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
@@ -311,6 +331,12 @@ export default {
   name: '', // 采购任务分配
   data() {
     return {
+      partNum: '',
+      partName: '',
+      partSpec: '',
+      partMaterial: '',
+      materialSpec: '',
+      materialModel: '',
       MaterialCategoryValue: '', // 物料类别
       MaterialCategory: [], // 物料类别数组
       MaterialVarietyValue: '', // 物料品种
@@ -408,16 +434,24 @@ export default {
       this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
       this.projectValue ? this.check3 = 1 : this.check3 = 0
       this.materialName ? this.check4 = 1 : this.check4 = 0
-      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1]).then(response => {
+      let check2, check3
+      this.materialSpec ? check2 = 1 : check2 = 0
+      this.materialModel ? check3 = 1 : check3 = 0
+      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel).then(response => {
         this.tableData1 = response.data.rows
-        console.log(response.data.rows)
         this.total1 = response.data.total
       })
     },
     searchTable2() { // 查询基本件
       this.projectValue ? this.check3 = 1 : this.check3 = 0
-      searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, this.materialStatusValue[this.materialStatusValue.length - 1]).then(response => {
+      let check1, check2, check3, check4
+      this.partNum ? check1 = 1 : check1 = 0
+      this.partName ? check2 = 1 : check2 = 0
+      this.partSpec ? check3 = 1 : check3 = 0
+      this.partMaterial ? check4 = 1 : check4 = 0
+      searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
         this.tableData2 = response.data.rows
+        console.log(response.data.rows)
         this.total2 = response.data.total
       })
     },