Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/views/Assembly/SparePartsOutStockRecord/index.vue

@@ -0,0 +1,159 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row>
+        <span>机床编号:</span>
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
+          <el-option
+            v-for="item in machineNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
+        </el-select>
+        <span>组号:</span>
+        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
+          <el-option
+            v-for="item in groupNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>零件图号:</span>
+        <el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 200px" size="small" clearable/>
+        <span class="demonstration">时间区间:</span>
+        <el-date-picker
+          v-model="startTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择日期"/>
+        <span class="demonstration">~</span>
+        <el-date-picker
+          v-model="endTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择日期"/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
+      </el-row>
+    </el-card>
+    <el-card>
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px">
+        <el-table-column label="项目名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.机床名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="质检类型" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.质检类型 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { initProject, searchgroup, selecttable } from '@/api/Assembly/SparePartsOutStockRecord'
+// import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      PartDrawingNumber: '',
+      startTime: '',
+      endTime: '',
+      startTime_check: '',
+      endTime_check: '',
+      machineNumberValue: '',
+      machineNumber: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      tableData1: []
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.initProject()
+  },
+  methods: {
+    initProject() {
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
+    machineChange() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    selecttable() {
+      this.tableData1 = []
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
+      if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
+      if (this.PartDrawingNumber !== '' && this.PartDrawingNumber !== null) { this.check3 = 1 } else { this.check3 = 0 }
+      if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
+      if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime).then(response => {
+        this.tableData1 = response.data
+        console.log(response.data, 1111)
+      })
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>

src/views/Inventory/InventoryCheck/index.vue

@@ -75,7 +75,7 @@
         <el-table-column label="货位存量" align="center" width="180" prop="货位存量">
           <template slot-scope="scope">
             <template v-if="scope.row.changeValue">
-              <el-input-number v-model="scope.row.货位存量" controls-position="right" size="mini" style="width: 90px"/>
+              <el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>
               <el-button class="cancel-btn" size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
             </template>
             <span v-else>{{ scope.row.货位存量 }}</span>
@@ -173,7 +173,7 @@
         </el-col>
         <el-col style="width: 210px">
           <span>货位存量:</span>
-          <el-input-number v-model="localNumber" :min="0" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
+          <el-input-number v-model="localNumber" :min="0" :precision="2" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
         </el-col>
         <el-col style="width: 180px">
           <span>是否为滞货:</span>

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -50,28 +50,28 @@
       <el-table
         v-loading="loading0"
         :data="tableData"
-        style="width: 100%;max-height: 610px"
-        height="610"
+        style="width: 100%;max-height: 600px"
+        height="600"
         size="mini"
         highlight-current-row
         border>
-        <el-table-column align="center" label="序号" type="index" width="50px"/>
-        <el-table-column align="center" label="机床图号" width="100px">
+        <el-table-column align="center" label="序号" type="index" width="60px"/>
+        <el-table-column align="center" label="机床图号" width="170px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="组号" width="60px">
+        <el-table-column align="center" label="组号" width="140px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件图号" width="150px">
+        <el-table-column align="center" label="零件图号" width="200px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件名称" width="100px">
+        <el-table-column align="center" label="零件名称" width="180px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -81,15 +81,14 @@
             {{ scope.row.投产总数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="投产时间" width="100px">
+        <el-table-column align="center" label="投产时间" width="130px">
           <template slot-scope="scope">
-            {{ scope.row.传递时间 ? scope.row.传递时间 : '—' }}
+            {{ scope.row.传递时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件状态" min-width="960px">
+        <el-table-column align="center" label="零件状态" width="750px">
           <template slot-scope="scope">
-            <el-steps id="StatusQuery" :active="scope.row.零件状态码" finish-status="success" simple>
-              <el-step title="分配" />
+            <el-steps :active="scope.row.考核状态" finish-status="success" simple>
               <el-step title="投产" />
               <el-step title="工艺" />
               <el-step title="定额" />
@@ -352,10 +351,12 @@ export default {
       }
       this.loading0 = true
       searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
-        response.data.rows.map(v => {
-          this.$set(v, '零件状态码', v.考核状态 ? parseInt(v.考核状态) - 2 : 0)
-          v.传递时间 = v.传递时间 ? v.传递时间.split(' ')[0] : ''
-        })
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
+          if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
+            response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
+          }
+        }
         this.loading0 = false
         this.tableData = response.data.rows
         this.total = parseInt(response.data.total)
@@ -490,8 +491,3 @@ export default {
     margin: 10px 0 10px 10px;
   }
 </style>
-<style>
-  #StatusQuery {
-    padding: 8px 30px;
-  }
-</style>

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24">
         <el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
-          <el-tab-pane label="标准件和外购件" name="标准件和外购件">
+          <el-tab-pane label="外购件" name="外购件">
             <el-row style="margin-bottom: 5px">
               <span>项目名称:</span>
               <el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
@@ -457,6 +457,11 @@
             <el-input v-model="scope.row.数量" size="mini" style="width:100%"/>
           </template>
         </el-table-column>
+        <el-table-column label="单位" align="center" width="60">
+          <template slot-scope="scope">
+            {{ scope.row.计量单位 }}
+          </template>
+        </el-table-column>
         <el-table-column label="询价备注" align="center" min-width="120">
           <template slot-scope="scope">
             <el-input v-model="scope.row.备注" size="mini" style="width:100%"/>
@@ -503,7 +508,8 @@
           <td width="16.6%" colspan="2">图号</td>
           <td width="16.6%" colspan="2">名称</td>
           <td width="16.6%" colspan="2">规格</td>
-          <td width="16.6%" colspan="2">数量</td>
+          <td width="8.3%">数量</td>
+          <td width="8.3%">单位</td>
           <td width="16.6%" colspan="2">单价</td>
           <td colspan="3">备注</td>
         </tr>
@@ -809,7 +815,7 @@ export default {
           value: 2
         }
       ],
-      tabName: '标准件和外购件',
+      tabName: '外购件',
       baseInfoLoading: false,
       dialogVisible5: false,
       form3: { // 询价单基础信息表单
@@ -868,7 +874,7 @@ export default {
       materialName: '',
       materialSpec: '',
       materialModel: '',
-      tableData11: [], // 标准件和外购件列表
+      tableData11: [], // 外购件列表
       total11: 0,
       pageCurrent11: 1,
       pageSize11: 10,
@@ -996,7 +1002,7 @@ export default {
             const data2 = res2.data.map(v => filterVal2.map(j => v[j]))
             dataGroup.push(data2)
             const headerGroup = [['任务分配时间', '项目名称', '机床图号', '组号', '名称', '图号或型号', '规格', '待询价数量', '备注', '供货商'], ['任务分配时间', '项目名称', '机床图号', '组号', '名称', '图号或型号', '规格', '材料', '待询价数量', '备注', '供货商']]
-            const sheetGroup = ['标准件和外购件（未询价）', '基本件（未询价）']
+            const sheetGroup = ['外购件（未询价）', '基本件（未询价）']
             excel.export_json_to_excel({
               headerGroup: headerGroup,
               dataGroup: dataGroup,
@@ -1149,7 +1155,7 @@ export default {
     filterHandler(value, row) { // 筛选供货商
       return row['供货商'] === value
     },
-    searchTable11() { // 查询标准件和外购件列表
+    searchTable11() { // 查询外购件列表
       let check1, check2, check3, check4, check5, check6
       this.materialName ? check1 = 1 : check1 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
@@ -1157,7 +1163,7 @@ export default {
       this.projectValue ? check4 = 1 : check4 = 0
       this.machineValue ? check5 = 1 : check5 = 0
       this.groupValue ? check6 = 1 : check6 = 0
-      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => {
+      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2).then(response => {
         this.tableData11 = response.data.rows
         this.total11 = response.data.total
         const remark = []
@@ -1364,7 +1370,7 @@ export default {
             for (let i = 0; i < length; i++) {
               tr[i] = document.createElement('tr')
               tr[i].setAttribute('class', 'tableData')
-              tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
+              tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
               $('#tablehead').after(tr[i])
             }
             for (let j = 0; j < res.data.length; j++) {
@@ -1373,7 +1379,8 @@ export default {
               document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
               document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
               document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
-              document.getElementsByClassName('tableData')[j].children[6].innerHTML = res.data[j].备注
+              document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
+              document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
             }
             document.getElementById('inquirySheetNum').innerHTML = this.orderExport
             document.getElementById('supplier').innerHTML = ''
@@ -1422,7 +1429,7 @@ export default {
             for (let i = 0; i < length; i++) {
               tr[i] = document.createElement('tr')
               tr[i].setAttribute('class', 'tableData')
-              tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
+              tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
               $('#tablehead').after(tr[i])
             }
             for (let j = 0; j < res.data.length; j++) {
@@ -1431,7 +1438,8 @@ export default {
               document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
               document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
               document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
-              document.getElementsByClassName('tableData')[j].children[6].innerHTML = res.data[j].备注
+              document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
+              document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
             }
             document.getElementById('inquirySheetNum').innerHTML = this.orderExport
             document.getElementById('supplier').innerHTML = ''

src/views/PurchasingCenter/CreatePurchaseContract/index.vue

@@ -122,6 +122,11 @@
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="单位" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.计量单位 }}
+          </template>
+        </el-table-column>
         <el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="120">
           <template slot-scope="scope">
             <el-input v-show="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:100%"/>
@@ -361,6 +366,7 @@ export default {
             名称: response.data[i].组件零件流水号 ? response.data[i].物料名称 : response.data[i].零件名称,
             规格: response.data[i].组件零件流水号 ? response.data[i].物料规格 : response.data[i].规格,
             数量: response.data[i].数量,
+            计量单位: response.data[i].计量单位,
             未税单价: 0,
             未税总额: 0,
             含税单价: 0,
@@ -518,7 +524,8 @@ export default {
             <td>名称</td>
             <td>规格型号</td>
             <td>数量</td>
-            <td >单价</td>
+            <td>单位</td>
+            <td>单价</td>
             <td>合计</td>
             <td>交货时间</td>
             <td>备注</td>
@@ -569,6 +576,7 @@ export default {
               名称: v.名称,
               规格: v.规格,
               数量: Number(v.数量),
+              计量单位: v.计量单位,
               单价: this.hasTax === '含税' ? v.含税单价 : v.未税单价,
               合计: (Number(v.数量) * (this.hasTax === '含税' ? Number(v.含税单价) : Number(v.未税单价))).toFixed(2),
               交货期: v.交货期 ? v.交货期.split(' ')[0] : '',
@@ -576,7 +584,7 @@ export default {
             })
           })
           let mergeData = []
-          mergeData = groupBy(merge, ['图号', '名称', '规格', '单价', '合计', '交货期', '备注'], (mergeData, v) => {
+          mergeData = groupBy(merge, ['图号', '名称', '规格', '计量单位', '单价', '合计', '交货期', '备注'], (mergeData, v) => {
             mergeData = mergeData || 0
             mergeData += v.数量
             return mergeData
@@ -587,7 +595,7 @@ export default {
           for (let i = 0; i < mergeData.length; i++) {
             tr[i] = document.createElement('tr')
             tr[i].setAttribute('class', 'tableData')
-            tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
+            tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
             const tableHead = $('#tableHead')
             tableHead ? tableHead.after(tr[i]) : ''
           }
@@ -606,10 +614,11 @@ export default {
               document.getElementsByClassName('tableData')[j].children[4].innerHTML = mergeData[j].名称
               document.getElementsByClassName('tableData')[j].children[5].innerHTML = mergeData[j].规格
               document.getElementsByClassName('tableData')[j].children[6].innerHTML = mergeData[j].数量
-              document.getElementsByClassName('tableData')[j].children[7].innerHTML = mergeData[j].单价
-              document.getElementsByClassName('tableData')[j].children[8].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2)
-              document.getElementsByClassName('tableData')[j].children[9].innerHTML = mergeData[j].交货期
-              document.getElementsByClassName('tableData')[j].children[10].innerHTML = mergeData[j].备注
+              document.getElementsByClassName('tableData')[j].children[7].innerHTML = mergeData[j].计量单位
+              document.getElementsByClassName('tableData')[j].children[8].innerHTML = mergeData[j].单价
+              document.getElementsByClassName('tableData')[j].children[9].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2)
+              document.getElementsByClassName('tableData')[j].children[10].innerHTML = mergeData[j].交货期
+              document.getElementsByClassName('tableData')[j].children[11].innerHTML = mergeData[j].备注
             }
           }
           this.actualTotal = this.actualTotal.toFixed(2)

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -371,6 +371,11 @@
             <el-input v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
           </template>
         </el-table-column>
+        <el-table-column label="单位" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.计量单位 }}
+          </template>
+        </el-table-column>
         <el-table-column label="参考价格" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.参考价格 }}
@@ -383,7 +388,7 @@
         </el-table-column>
         <el-table-column label="合计" align="center" min-width="100" prop="合计">
           <template slot-scope="scope">
-            {{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
+            {{ (Number(scope.row.单价||0) * Number(scope.row.数量||0)).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
@@ -1130,7 +1135,7 @@ export default {
         if (index === 0) {
           sums[index] = '总价'
         } else if (index === 7) {
-          const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量'])))
+          const values = data.map(item => Number(Number(item['单价']) * Number(item['数量'])))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)
@@ -1360,7 +1365,7 @@ export default {
       this.materialName ? check1 = 1 : check1 = 0
       this.materialSpec ? check2 = 1 : check2 = 0
       this.materialModel ? check3 = 1 : check3 = 0
-      searchMaterial(this.pageCurrent00, this.pageSize00, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id).then(response => {
+      searchMaterial(this.pageCurrent00, this.pageSize00, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, 1).then(response => {
         this.tableData00 = response.data.rows
         this.total00 = response.data.total
         const remark = []

src/views/PurchasingCenter/PurchaseSituationSearch/index.vue

@@ -24,7 +24,85 @@
     </el-card>
 
     <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
-      <el-tab-pane label="标准件和外购件" name="标准件和外购件">
+      <el-tab-pane label="标准件" name="标准件">
+        <el-table :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe>
+          <el-table-column align="center" label="采购情况" width="80px">
+            <template slot-scope="scope">
+              <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="机床图号" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.机床图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="组号" width="80px">
+            <template slot-scope="scope">
+              {{ scope.row.组号 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="名称" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.物料名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="型号" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.物料型号 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="规格" min-width="200px">
+            <template slot-scope="scope">
+              {{ scope.row.物料规格 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="技术下达数量" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.零件数量 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="合同采购数量" width="100px">
+            <template slot-scope="scope">
+              {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="到货数量" width="100px">
+            <template slot-scope="scope">
+              {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="供应商" min-width="150px">
+            <template slot-scope="scope">
+              {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="合同编号" min-width="100px">
+            <template slot-scope="scope">
+              {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.采购合同编号 || scope.row.离线合同编号 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="采购员" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.姓名 || '—' }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            :current-page="pageCurrent0"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize0"
+            :total="total0"
+            style="margin-top:10px;display:inline-block;width:50%"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange0"
+            @current-change="handleCurrentChange0"/>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="外购件" name="外购件">
         <el-table :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe>
           <el-table-column align="center" label="采购情况" width="80px">
             <template slot-scope="scope">
@@ -200,10 +278,14 @@ export default {
       machineNumber: [],
       groupNumberValue: '',
       groupNumber: [],
-      PartType: '标准件和外购件',
+      PartType: '标准件',
+      tableData0: [],
       tableData1: [],
       tableData2: [],
       tableData3: [],
+      pageCurrent0: 1,
+      pageSize0: 20,
+      total0: 0,
       pageCurrent1: 1,
       pageSize1: 20,
       total1: 0,
@@ -247,18 +329,23 @@ export default {
       })
     },
     searchTable() {
-      if (this.PartType === '标准件和外购件') {
-        this.pageCurrent1 = 1
-        this.pageSize1 = 20
-        this.total1 = 0
+      if (this.PartType === '标准件') {
+        this.searchTable0()
+      } else if (this.PartType === '外购件') {
         this.searchTable1()
       } else if (this.PartType === '基本件') {
-        this.pageCurrent2 = 1
-        this.pageSize2 = 20
-        this.total2 = 0
         this.searchTable2()
       }
     },
+    handleSizeChange0(val) {
+      this.pageSize0 = val
+      this.pageCurrent0 = 1
+      this.searchTable0()
+    },
+    handleCurrentChange0(val) {
+      this.pageCurrent0 = val
+      this.searchTable0()
+    },
     handleSizeChange1(val) {
       this.pageSize1 = val
       this.pageCurrent1 = 1
@@ -277,11 +364,20 @@ export default {
       this.pageCurrent2 = val
       this.searchTable2()
     },
-    searchTable1() { // 查询标准件和外购件
+    searchTable0() { // 查询标准件
       let check1, check2
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
-      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1).then(response => {
+      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1).then(response => {
+        this.tableData0 = response.data.rows
+        this.total0 = response.data.total
+      })
+    },
+    searchTable1() { // 查询外购件
+      let check1, check2
+      this.machineNumberValue ? check1 = 1 : check1 = 0
+      this.groupNumberValue ? check2 = 1 : check2 = 0
+      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -1,7 +1,221 @@
 <template>
   <div class="app-container">
-    <el-tabs v-model="tabName" type="border-card" @tab-click="searchTable1();searchTable2()">
-      <el-tab-pane label="标准件和外购件" name="标准件和外购件">
+    <el-tabs v-model="tabName" type="border-card" @tab-click="searchTable0();searchTable1();searchTable2();">
+      <el-tab-pane label="标准件" name="标准件">
+        <el-row style="margin-bottom: 5px">
+          <span style="margin-left: 0">项目名称:</span>
+          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
+            <el-option
+              v-for="item in project"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span>机床图号:</span>
+          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
+            <el-option
+              v-for="item in machine"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+              <b style="float: left">{{ item.label }}</b>
+              <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
+            </el-option>
+          </el-select>
+          <el-button
+            type="success"
+            size="small"
+            icon="el-icon-search"
+            style="margin-left: 10px"
+            @click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
+          <div style="float:right;">
+            <span style="margin-left: 0">采购员:</span>
+            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
+              <el-option
+                v-for="item in person"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </div>
+        </el-row>
+        <el-row style="margin-bottom: 5px">
+          <span style="margin-left: 0">组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
+          <el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
+            <el-option
+              v-for="item in group"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span style="margin-right: -10px">物料状态:</span>
+          <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
+          <div style="float:right;padding-top:10px;">
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-menu"
+              style="margin-left: 10px"
+              @click="allocateTask1">分配</el-button>
+            <el-button
+              type="danger"
+              size="small"
+              icon="el-icon-back"
+              style="margin-left: 10px"
+              @click="executeReturn1">退回</el-button>
+          </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>
+        </el-row>
+        <el-row style="margin-bottom: 15px">
+          <span style="margin-left: 0">物料名称:</span>
+          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+          <span>物料规格:</span>
+          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
+          <span>物料型号:</span>
+          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
+        </el-row>
+        <el-row style="margin-bottom: 10px">
+          <el-table v-loading="" :data="tableData0" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange1">
+            <el-table-column :selectable="selectable" align="center" type="selection"/>
+            <el-table-column align="center" label="采购情况" min-width="80px">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
+                <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
+                <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
+                <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="项目名称" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.项目名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="机床图号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="组号" min-width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="物料类别" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.物料类别 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="物料品种" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.物料品种 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="图号或型号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="名称" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="规格" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="数量" min-width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="备注" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="供货商" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.供货商 }}
+              </template>
+            </el-table-column>
+            <el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">
+              <template slot-scope="scope">
+                {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="计划到货时间" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.物料计划到货时间.split(' ')[0] }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="生产分配时间" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.操作日期.split(' ')[0] }}
+              </template>
+            </el-table-column>
+            <el-table-column :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 ? scope.row.姓名 : '—' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="采购分配时间" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="撤回分配" min-width="100px" fixed="right">
+              <template slot-scope="scope">
+                <el-button
+                  :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
+                  type="primary"
+                  size="mini"
+                  icon="el-icon-back"
+                  @click="retract(scope.row)">撤回</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-row>
+        <div class="block">
+          <el-pagination
+            :current-page="pageCurrent0"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize0"
+            :total="total0"
+            style="display:inline-block;width:50%"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange0"
+            @current-change="handleCurrentChange0"/>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="外购件" name="外购件">
         <el-row style="margin-bottom: 5px">
           <span style="margin-left: 0">项目名称:</span>
           <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
@@ -419,7 +633,7 @@ export default {
           value: 2
         }
       ],
-      tabName: '标准件和外购件',
+      tabName: '标准件',
       partNum: '',
       partName: '',
       partSpec: '',
@@ -472,12 +686,16 @@ export default {
       check2: 0,
       check3: 0,
       check4: 0,
+      tableData0: [],
       tableData1: [],
       tableData2: [],
       standardAndPurchase: [],
       basic: [],
       groupAndPart: [],
       groupAndPartBasic: [],
+      pageCurrent0: 1,
+      pageSize0: 20,
+      total0: 0,
       pageCurrent1: 1,
       pageSize1: 20,
       total1: 0,
@@ -493,7 +711,7 @@ export default {
     ])
   },
   created() {
-    this.searchTable1() // 查表1
+    this.searchTable0() // 查表1
     this.fetchData() // 初始化数据
   },
   methods: {
@@ -520,6 +738,7 @@ export default {
           retract1(row.标准件和外购件流水号).then(res => {
             if (Number(res.data[0].result) === 1) {
               this.$message.success('撤回成功')
+              this.searchTable0()
               this.searchTable1()
             } else {
               this.$message.error('撤回失败')
@@ -585,7 +804,7 @@ export default {
       this.MaterialVarietyValue = ''
       this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
     },
-    searchTable1() { // 查询标准件和外购件
+    searchTable0() { // 查询标准件
       this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
       this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
       this.projectValue ? this.check3 = 1 : this.check3 = 0
@@ -595,8 +814,22 @@ export default {
       this.materialName ? this.check4 = 1 : this.check4 = 0
       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, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel).then(response => {
-        console.log(response.data.rows)
+      searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1).then(response => {
+        this.tableData0 = response.data.rows
+        this.total0 = response.data.total
+      })
+    },
+    searchTable1() { // 查询外购件
+      this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
+      this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
+      this.projectValue ? this.check3 = 1 : this.check3 = 0
+      let check0, check1, check2, check3
+      this.machineValue ? check0 = 1 : check0 = 0
+      this.groupValue ? check1 = 1 : check1 = 0
+      this.materialName ? this.check4 = 1 : this.check4 = 0
+      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, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
@@ -648,6 +881,7 @@ export default {
           allocateTask1(this.standardAndPurchase, this.personValue).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('操作成功')
+              this.searchTable0()
               this.searchTable1()
             } else { this.$message.error('操作失败') }
           })
@@ -687,6 +921,15 @@ export default {
     filterHandler(value, row) {
       return parseInt(row['人员编号']) === parseInt(value)
     },
+    handleSizeChange0(val) {
+      this.pageSize0 = val
+      this.pageCurrent0 = 1
+      this.searchTable0()
+    },
+    handleCurrentChange0(val) {
+      this.pageCurrent0 = val
+      this.searchTable0()
+    },
     handleSizeChange1(val) {
       this.pageSize1 = val
       this.pageCurrent1 = 1
@@ -717,6 +960,7 @@ export default {
           executeReturn1(this.standardAndPurchase, this.groupAndPart).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('操作成功')
+              this.searchTable0()
               this.searchTable1()
             } else { this.$message.error('操作失败') }
           })