备料

src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue

@@ -60,7 +60,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <div class="block">
+        <div v-show="false" class="block">
           <el-pagination
             :current-page="pageCurrent1"
             :page-size="pageSize1"
@@ -78,7 +78,14 @@
         <span>采购计划单号:</span>
         <el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0" clearable/>
         <span style="margin-left: 10px">供应商:</span>
-        <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
+        <el-select v-model="supplierName0" placeholder="供应商" size="small" filterable clearable>
+          <el-option
+            v-for="item in supplierName0s"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <!--<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>-->
         <el-tooltip :open-delay="1200" effect="dark" content="查询采购计划单" placement="top">
           <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
         </el-tooltip>
@@ -354,6 +361,7 @@ export default {
       purchasingOrder: '', // 采购单号
       purchasingOrderNumber: '', // 采购计划流水号
       supplierName0: '', // 供应商名称（外面的）
+      supplierName0s: [], // 供应商名称（外面的）
       supplierName: '', // 供应商名称
       tableData2: [],
       total2: 0,
@@ -435,6 +443,10 @@ export default {
             label: response.data[i].供应商名称,
             value: response.data[i].供应商流水号
           })
+          this.supplierName0s.push({
+            label: response.data[i].供应商名称,
+            value: response.data[i].供应商流水号
+          })
         }
       })
       searchRawMaterial(this.RawMaterialName, this.pageCurrent, this.pageSize).then(response => {
@@ -509,8 +521,9 @@ export default {
     searchTable1() { // 查询外购备料
       this.loading1 = true
       this.partDrawingNumber ? this.check1 = 1 : this.check1 = 0
-      searchPurchasedMaterials(this.pageCurrent1, this.pageSize1, this.check1, this.partDrawingNumber).then(response => {
-        this.tableData1 = response.data.rows
+      // this.pageCurrent1, this.pageSize1,
+      searchPurchasedMaterials(this.check1, this.partDrawingNumber).then(response => {
+        this.tableData1 = response.data
         this.total1 = response.data.total
         this.loading1 = false
       })
@@ -533,7 +546,7 @@ export default {
     searchTable2() { // 查询采购单列表
       this.purchasingOrder ? this.check3 = 1 : this.check3 = 0
       this.supplierName0 ? this.check4 = 1 : this.check4 = 0
-      searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, this.check4, this.supplierName0).then(response => {
+      searchPurchaseOrder(this.pageCurrent2, this.pageSize2, this.check3, this.purchasingOrder, 0, 0, this.check4, this.supplierName0).then(response => {
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
       })