更新

src/api/ManufacturingCenter/GroupMatching.js

@@ -32,14 +32,14 @@ export function searchgroup(num, pageCurrent, pageSize) {
     }
   })
 }
-export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) {
+export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_基本件成组配套_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string',
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
       pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -67,14 +67,14 @@ export function searchPurchaseTable(check, entryNameValue, check1, machine, chec
     }
   })
 }
-export function searchTable1(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) {
+export function searchTable1(check, entryNameValue, check1, machine, check2, groupNum, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '库存管理_车间采购出库_零件查询',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string',
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
       pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -90,3 +90,29 @@ export function processingStatus(num) {
     }
   })
 }
+// 查询表1标准件和外购件
+export function searchTable01(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购部采购_查询物料_分配后_加供应商',
+      param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}`,
+      Pagination: params[6] + '&' + params[7]
+    }
+  })
+}
+// 查询表1基本件
+export function searchTable02(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商',
+      param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}`,
+      Pagination: params[6] + '&' + params[7]
+    }
+  })
+}

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -20,44 +20,20 @@
       <el-input v-model="machineToolNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @change="empty1" @dblclick.native="SearchMachine"/>
       <span>组号:</span>
       <el-input v-model="groupNumber" placeholder="请双击选择" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
-      <span>年:</span>
+      <el-button type="success" icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=10;pageCurrent=1;searchData();searchTable()">查询</el-button>
-      <el-date-picker
-        v-model="year"
-        type="year"
-        size="small"
-        format="yyyy"
-        value-format="yyyy"
-        placeholder="选择年"/>
-      <span>月:</span>
-      <el-select v-model="month" placeholder="选择月" size="small" clearable style="width:180px">
-        <el-option
-          v-for="item in monthes"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>入库时间:</span>
-      <el-date-picker
-        v-model="time"
-        type="date"
-        size="small"
-        style="margin-top: 20px;width: 200px"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        placeholder="选择日期"/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=10;pageCurrent=1;searchData()">查询</el-button>
     </el-card>
     <el-card>
+      <h3 style="text-align: center;">车间生产</h3>
       <el-table
         v-loading="loading"
         :data="tableData"
         :summary-method="getSummaries"
-        style="width: 100%;max-height: 600px"
+        style="width: 100%"
         height="400"
+        size="mini"
         show-summary
-        highlight-current-row
+        border
-        border>
+        stripe>
-        <el-table-column align="center" label="序号" type="index" width="60"/>
         <el-table-column align="center" label="零件图号">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
@@ -111,105 +87,188 @@
       </div>
     </el-card>
     <el-card>
-      <el-table
+      <h3 style="text-align: center;">采购部采购</h3>
-        :data="tableDataPurchase"
+      <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
-        border
+        <el-tab-pane label="标准件" name="标准件">
-        style="width: 100%;"
+          <el-table :data="tableData00" size="mini" height="400px" border stripe>
-        height="400">
+            <el-table-column align="center" label="机床图号">
-        <el-table-column
+              <template slot-scope="scope">
-          label="序号"
+                {{ scope.row.机床图号 }}
-          align="center"
+              </template>
-          type="index"
+            </el-table-column>
-          width="50"/>
+            <el-table-column align="center" label="组号">
-        <el-table-column label="物料名称" align="center" min-width="80">
+              <template slot-scope="scope">
-          <template slot-scope="scope">
+                {{ scope.row.组号 }}
-            {{ scope.row.物料名称 }}
+              </template>
-          </template>
+            </el-table-column>
-        </el-table-column>
+            <el-table-column align="center" label="名称">
-        <el-table-column label="物料规格" align="center" min-width="80">
+              <template slot-scope="scope">
-          <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
-            {{ scope.row.物料规格 }}
+              </template>
-          </template>
+            </el-table-column>
-        </el-table-column>
+            <el-table-column align="center" label="型号">
-        <el-table-column label="物料型号" align="center" min-width="80">
+              <template slot-scope="scope">
-          <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
-            {{ scope.row.物料型号 }}
+              </template>
-          </template>
+            </el-table-column>
-        </el-table-column>
+            <el-table-column align="center" label="规格">
-        <el-table-column label="项目名称" align="center" min-width="80">
+              <template slot-scope="scope">
-          <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
-            {{ scope.row.项目名称 }}
+              </template>
-          </template>
+            </el-table-column>
-        </el-table-column>
+            <el-table-column align="center" label="技术下达数量">
-        <el-table-column label="机床图号" align="center" min-width="80">
+              <template slot-scope="scope">
-          <template slot-scope="scope">
+                {{ scope.row.零件数量 || '—' }}
-            {{ scope.row.机床图号 }}
+              </template>
-          </template>
+            </el-table-column>
-        </el-table-column>
+            <el-table-column align="center" label="合同采购数量">
-        <el-table-column label="组号" align="center" min-width="80">
+              <template slot-scope="scope">
-          <template slot-scope="scope">
+                {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
-            {{ scope.row.组号 }}
+              </template>
-          </template>
+            </el-table-column>
-        </el-table-column>
+            <el-table-column align="center" label="到货数量">
-        <el-table-column label="零件数量" align="center" min-width="80">
+              <template slot-scope="scope">
-          <template slot-scope="scope">
+                {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
-            {{ scope.row.数量 }}
+              </template>
-          </template>
+            </el-table-column>
-        </el-table-column>
+          </el-table>
-        <el-table-column label="到货数量" align="center" min-width="80">
+          <div class="block">
-          <template slot-scope="scope">
+            <el-pagination
-            {{ scope.row.实际到货数量 }}
+              :current-page="pageCurrent00"
-          </template>
+              :page-sizes="[10, 20, 30, 40]"
-        </el-table-column>
+              :page-size="pageSize00"
-        <el-table-column label="到货时间" align="center" min-width="80">
+              :total="total00"
-          <template slot-scope="scope">
+              style="margin-top:10px;display:inline-block;width:50%"
-            {{ scope.row.到货时间 }}
+              layout="total, sizes, prev, pager, next, jumper"
-          </template>
+              @size-change="handleSizeChange00"
-        </el-table-column>
+              @current-change="handleCurrentChange00"/>
-      </el-table>
+          </div>
-      <div class="block" style="margin-top: 10px;">
+        </el-tab-pane>
-        <el-pagination
+        <el-tab-pane label="外购件" name="外购件">
-          :current-page="pageCurrent4"
+          <el-table :data="tableData01" size="mini" height="400px" border stripe>
-          :page-sizes="[10, 20, 30, 40]"
+            <el-table-column align="center" label="机床图号">
-          :page-size="pageSize4"
+              <template slot-scope="scope">
-          :total="total4"
+                {{ scope.row.机床图号 }}
-          layout="total, sizes, prev, pager, next, jumper"
+              </template>
-          @size-change="handleSizeChange4"
+            </el-table-column>
-          @current-change="handleCurrentChange4"/>
+            <el-table-column align="center" label="组号">
-      </div>
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="名称">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="型号">
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="规格">
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="技术下达数量">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 || '—' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="合同采购数量">
+              <template slot-scope="scope">
+                {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="到货数量">
+              <template slot-scope="scope">
+                {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block">
+            <el-pagination
+              :current-page="pageCurrent01"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize01"
+              :total="total01"
+              style="margin-top:10px;display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange01"
+              @current-change="handleCurrentChange01"/>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="基本件" name="基本件">
+          <el-table :data="tableData02" size="mini" height="400px" border stripe>
+            <el-table-column align="center" label="机床图号">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="组号">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="名称">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="图号">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="规格">
+              <template slot-scope="scope">
+                {{ scope.row.规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="材料">
+              <template slot-scope="scope">
+                {{ scope.row.材料 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="技术下达数量">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 || '—' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="采购数量">
+              <template slot-scope="scope">
+                {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="到货数量">
+              <template slot-scope="scope">
+                {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block">
+            <el-pagination
+              :current-page="pageCurrent02"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize02"
+              :total="total02"
+              style="margin-top:10px;display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange02"
+              @current-change="handleCurrentChange02"/>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
     </el-card>
 
     <el-card>
+      <h3 style="text-align: center;">制造部采购</h3>
       <el-table
         :data="tableData1"
         border
         style="width: 100%;"
         height="400">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column label="物料名称" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="物料型号" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="项目名称" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
         <el-table-column label="机床图号" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -220,19 +279,29 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
+        <el-table-column label="物料名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="图号或型号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="材料或规格" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.规格或材料 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件数量" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.货位存量 }}
+            {{ scope.row.零件数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件类型" align="center" min-width="80">
+        <el-table-column label="已到货数量" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.类型名称 }}
+            {{ scope.row.已到货数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="入库时间" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.入库时间 }}
           </template>
         </el-table-column>
       </el-table>
@@ -400,7 +469,7 @@
 </template>
 
 <script>
-import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTable, searchTable1, processingStatus, searchTable22 } from '@/api/ManufacturingCenter/GroupMatching'
+import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTable, searchTable1, processingStatus, searchTable22, searchTable01, searchTable02 } from '@/api/ManufacturingCenter/GroupMatching'
 export default {
   data() {
     return {
@@ -414,6 +483,13 @@ export default {
       groupNum: null, // 组件流水号
       partNumber: '', // 零件号
       num: null,
+      PartType: '标准件',
+      pageCurrent00: 1,
+      pageSize00: 10,
+      pageCurrent01: 1,
+      pageSize01: 10,
+      pageCurrent02: 1,
+      pageSize02: 10,
       pageCurrent: 1,
       pageSize: 10,
       pageCurrent1: 1,
@@ -429,9 +505,15 @@ export default {
       tableData: [],
       tableData1: [],
       tableData5: [],
+      tableData00: [],
+      tableData01: [],
+      tableData02: [],
       state: null,
       listLoading1: false,
       listLoading2: false,
+      total00: 0,
+      total01: 0,
+      total02: 0,
       total: 0,
       total1: 0,
       total2: 0,
@@ -518,22 +600,7 @@ export default {
         } else {
           this.check2 = 0
         }
-        if (this.year !== null && this.year !== '') {
+        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.pageCurrent, this.pageSize).then(response => {
-          this.check3 = 1
-        } else {
-          this.check3 = 0
-        }
-        if (this.month !== null && this.month !== '') {
-          this.check4 = 1
-        } else {
-          this.check4 = 0
-        }
-        if (this.time !== '' && this.time !== null) {
-          this.check5 = 1
-        } else {
-          this.check5 = 0
-        }
-        searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
           for (let i = 0; i < response.data.rows.length; i++) {
             if (response.data.rows[i].入库时间 !== '') {
               response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
@@ -563,7 +630,7 @@ export default {
           this.tableDataPurchase = response.data.rows
           this.total4 = parseInt(response.data.total)
         })
-        searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
+        searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.pageCurrent, this.pageSize).then(response => {
           this.tableData1 = response.data.rows
           this.total5 = parseInt(response.data.total)
         })
@@ -647,6 +714,44 @@ export default {
       this.groupNumber = this.groupNumber1
       this.dialogFormVisible3 = false
     },
+    searchTable() {
+      if (this.PartType === '标准件') {
+        this.searchTable0()
+      } else if (this.PartType === '外购件') {
+        this.searchTable1()
+      } else if (this.PartType === '基本件') {
+        this.searchTable2()
+      }
+    },
+    searchTable0() { // 查询标准件
+      let check1, check2
+      this.machine ? check1 = 1 : check1 = 0
+      this.groupNum ? check2 = 1 : check2 = 0
+      searchTable01(check1, this.machine, check2, this.groupNum, this.pageCurrent00, this.pageSize00, 1).then(response => {
+        this.tableData00 = response.data.rows
+        this.total00 = response.data.total
+      })
+    },
+    searchTable1() { // 查询外购件
+      let check1, check2, check3
+      this.machine ? check1 = 1 : check1 = 0
+      this.groupNum ? check2 = 1 : check2 = 0
+      this.entryNameValue ? check3 = 1 : check3 = 0
+      searchTable01(check3, this.entryNameValue, check1, this.machine, check2, this.groupNum, this.pageCurrent01, this.pageSize01, 2).then(response => {
+        this.tableData01 = response.data.rows
+        this.total01 = response.data.total
+      })
+    },
+    searchTable2() { // 查询基本件
+      let check1, check2, check3
+      this.machine ? check1 = 1 : check1 = 0
+      this.groupNum ? check2 = 1 : check2 = 0
+      this.entryNameValue ? check3 = 1 : check3 = 0
+      searchTable02(check3, this.entryNameValue, check1, this.machine, check2, this.groupNum, this.pageCurrent02, this.pageSize02).then(response => {
+        this.tableData02 = response.data.rows
+        this.total02 = response.data.total
+      })
+    },
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val
@@ -946,6 +1051,33 @@ export default {
         this.$message.warning('请先选择项目')
       }
     },
+    handleSizeChange00(val) {
+      this.pageCurrent00 = 1
+      this.pageSize00 = val
+      this.searchTable0()
+    },
+    handleCurrentChange00(val) {
+      this.pageCurrent00 = val
+      this.searchTable0()
+    },
+    handleSizeChange01(val) {
+      this.pageCurrent01 = 1
+      this.pageSize01 = val
+      this.searchTable1()
+    },
+    handleCurrentChange01(val) {
+      this.pageCurrent01 = val
+      this.searchTable1()
+    },
+    handleSizeChange02(val) {
+      this.pageCurrent02 = 1
+      this.pageSize02 = val
+      this.searchTable2()
+    },
+    handleCurrentChange02(val) {
+      this.pageCurrent02 = val
+      this.searchTable2()
+    },
     getSummaries(param) {
       const { columns } = param
       const sums = []