物料变更规格型号

src/api/PurchasingCenter/CreateInquirySheet.js

@@ -136,14 +136,14 @@ export function outInquirySheet(num1, num2, num3) {
   })
 }
 // 查询物料
-export function searchAllMaterial(MaterialName, pageCurrent, pageSize) {
+export function searchAllMaterial(check1, MaterialName, check2, MaterialSpec, check3, MaterialModel, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '库存管理_物料主文件_基本_查询数据_分页',
-      param: '物料名称_check=1&物料名称=' + MaterialName + '&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
+      param: `物料名称_check=${check1}&物料名称=${MaterialName}&物料规格_check=${check2}&物料规格=${MaterialSpec}&物料型号_check=${check3}&物料型号=${MaterialModel}&PageCurrent=${pageCurrent}=int&PageSize=${pageSize}=int&PageCount=1=int=output&ItemCount=1=int=output`
     }
   })
 }

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -600,9 +600,17 @@
     </el-dialog>
 
     <el-dialog :visible.sync="dialogVisible3" title="物料变更选择" center style="min-height: 300px;" width="780px">
-      <span>物料名称：</span>
-      <el-input v-model="materialName0" placeholder="物料名称" size="small" clearable/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="pageCurrent02=1;pageSize02=10;total02=0;searchMaterial()">查询</el-button>
+      <el-row style="margin-bottom: 10px">
+        <span>物料名称：</span>
+        <el-input v-model="materialName0" placeholder="物料名称" size="small" clearable/>
+        <span>物料规格：</span>
+        <el-input v-model="materialSpec0" placeholder="物料规格" size="small" clearable/>
+      </el-row>
+      <el-row style="margin-bottom: 10px">
+        <span>物料型号：</span>
+        <el-input v-model="materialModel0" placeholder="物料型号" size="small" clearable/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="pageCurrent02=1;pageSize02=10;total02=0;searchMaterial()">查询</el-button>
+      </el-row>
       <el-table :data="tableData02" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="400px" border highlight-current-row @row-click="selectNewMaterial">
         <el-table-column align="center" label="物料名称" min-width="150">
           <template slot-scope="scope">
@@ -758,6 +766,8 @@ export default {
       allNum: [], // 总数量
       dialogVisible3: false,
       materialName0: '',
+      materialSpec0: '',
+      materialModel0: '',
       tableData02: [],
       total02: 0,
       pageCurrent02: 1,
@@ -1319,10 +1329,18 @@ export default {
       console.log(row)
     },
     searchMaterial() {
-      searchAllMaterial(this.materialName0, this.pageCurrent02, this.pageSize02).then(response => {
-        this.tableData02 = response.data.result
-        this.total02 = parseInt(response.data.output[0].ItemCount)
-      })
+      if (this.materialName0 || this.materialSpec0 || this.materialModel0) {
+        let check1, check2, check3
+        this.materialName0 ? check1 = 1 : check1 = 0
+        this.materialSpec0 ? check2 = 1 : check2 = 0
+        this.materialModel0 ? check3 = 1 : check3 = 0
+        searchAllMaterial(check1, this.materialName0, check2, this.materialSpec0, check3, this.materialModel0, this.pageCurrent02, this.pageSize02).then(response => {
+          this.tableData02 = response.data.result
+          this.total02 = parseInt(response.data.output[0].ItemCount)
+        })
+      } else {
+        this.$message.warning('请至少输入一种搜索条件')
+      }
     },
     handleSizeChange02(val) {
       this.pageSize02 = val