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

src/api/ManufacturingCenter/GroupMatching.js

@@ -103,8 +103,8 @@ export function searchTable01(...params) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '采购管理_采购部采购_查询物料_分配后_加供应商',
-      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`,
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&物料名称_check=${params[4]}&物料名称=${params[5]}&零件类型=${params[8]}&排序=${params[9]}`,
-      Pagination: params[4] + '&' + params[5]
+      Pagination: params[6] + '&' + params[7]
     }
   })
 }
@@ -118,8 +118,8 @@ export function searchTable02(...params) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_成组配套',
-      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[4]}&零件名称=${params[5]}&排序=${params[8]}`,
-      Pagination: params[4] + '&' + params[5]
+      Pagination: params[6] + '&' + params[7]
     }
   })
 }

src/api/PurchasingCenter/PurchaseTaskAllocate.js

@@ -93,8 +93,7 @@ export function searchTable1(...params) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: 'xqs_采购管理_采购部采购_查询物料_分配后_采购任务分配',
-      param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}&时间段_check=${params[20]}&开始时间=${params[21]}&结束时间=${params[22]}`,
+      param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}&时间段_check=${params[20]}&开始时间=${params[21]}&结束时间=${params[22]}&PageCurrent=${params[0]}&PageSize=${params[1]}&TotalCount=1111=int=output`
-      Pagination: params[0] + '&' + params[1]
     }
   })
 }
@@ -108,8 +107,7 @@ export function searchTable2(...params) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '采购管理_采购部采购_查询物料_基本件_分配后_采购任务分配',
-      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态编号=${params[8]}&零件图号_check=${params[9]}&零件图号=${params[10]}&零件名称_check=${params[11]}&零件名称=${params[12]}&零件规格_check=${params[13]}&零件规格=${params[14]}&材料_check=${params[15]}&材料=${params[16]}`,
+      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态编号=${params[8]}&零件图号_check=${params[9]}&零件图号=${params[10]}&零件名称_check=${params[11]}&零件名称=${params[12]}&零件规格_check=${params[13]}&零件规格=${params[14]}&材料_check=${params[15]}&材料=${params[16]}&PageCurrent=${params[0]}&PageSize=${params[1]}&TotalCount=1111=int=output`
-      Pagination: params[0] + '&' + params[1]
     }
   })
 }

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -105,13 +105,14 @@
         <el-tab-pane label="采购部采购" name="采购部采购">
           <el-tabs v-model="PartType" type="border-card" style="margin-top: 10px" @tab-click="searchTable()">
             <el-tab-pane label="标准件" name="标准件">
-              <el-table :data="tableData00" size="mini" height="530px" border stripe @sort-change="sortChange3">
+              <el-table v-loading="searchTable0Loading" :data="tableData00" size="mini" height="530px" border stripe @sort-change="sortChange3">
                 <el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
                   <template slot-scope="scope">
-                    <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
+                    {{ scope.row.采购状态 }}
-                    <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+                    <!--<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>-->
-                    <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
+                    <!--<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号" type="warning" size="small">未询价</span>-->
-                    <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>
+                    <!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>-->
+                    <!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>-->
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="机床图号">
@@ -178,13 +179,14 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="外购件" name="外购件">
-              <el-table :data="tableData01" size="mini" height="530px" border stripe @sort-change="sortChange4">
+              <el-table v-loading="searchTable1Loading" :data="tableData01" size="mini" height="530px" border stripe @sort-change="sortChange4">
                 <el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
                   <template slot-scope="scope">
-                    <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
+                    {{ scope.row.采购状态 }}
-                    <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+                    <!--<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>-->
-                    <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
+                    <!--<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>-->
-                    <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>
+                    <!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>-->
+                    <!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>-->
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="机床图号">
@@ -256,13 +258,14 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="基本件" name="基本件">
-              <el-table :data="tableData02" size="mini" height="530px" border stripe @sort-change="sortChange5">
+              <el-table v-loading="searchTable2Loading" :data="tableData02" size="mini" height="530px" border stripe @sort-change="sortChange5">
                 <el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
                   <template slot-scope="scope">
-                    <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
+                    {{ scope.row.采购状态 }}
-                    <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+                    <!--<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>-->
-                    <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
+                    <!--<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号" type="warning" size="small">未询价</span>-->
-                    <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>
+                    <!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>-->
+                    <!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>-->
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="机床图号">
@@ -438,6 +441,9 @@ import { searchTable, searchmachine, searchgroup, searchTable1, processingStatus
 export default {
   data() {
     return {
+      searchTable0Loading: false,
+      searchTable1Loading: false,
+      searchTable2Loading: false,
       order: 0,
       order2: 0,
       order3: 0,
@@ -613,6 +619,16 @@ export default {
       } else {
         this.order3 = 0
       }
+      let check1, check2, check
+      this.Machine ? check1 = 1 : check1 = 0
+      this.Group ? check2 = 1 : check2 = 0
+      this.materialName ? check = 1 : check = 0
+      this.searchTable0Loading = true
+      searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent00, this.pageSize00, 1, this.order3).then(response => {
+        this.tableData00 = response.data.rows
+        this.total00 = response.data.total
+        this.searchTable0Loading = false
+      })
     },
     sortChange4(column, prop, order) {
       if (column.order === 'ascending') {
@@ -622,6 +638,16 @@ export default {
       } else {
         this.order4 = 0
       }
+      let check1, check2, check
+      this.Machine ? check1 = 1 : check1 = 0
+      this.Group ? check2 = 1 : check2 = 0
+      this.materialName ? check = 1 : check = 0
+      this.searchTable1Loading = true
+      searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent01, this.pageSize01, 2, this.order4).then(response => {
+        this.tableData01 = response.data.rows
+        this.total01 = response.data.total
+        this.searchTable1Loading = false
+      })
     },
     sortChange5(column, prop, order) {
       if (column.order === 'ascending') {
@@ -631,6 +657,16 @@ export default {
       } else {
         this.order5 = 0
       }
+      let check1, check2, check
+      this.Machine ? check1 = 1 : check1 = 0
+      this.Group ? check2 = 1 : check2 = 0
+      this.materialName ? check = 1 : check = 0
+      this.searchTable2Loading = true
+      searchTable02(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent02, this.pageSize02, this.order5).then(response => {
+        this.tableData02 = response.data.rows
+        this.total02 = response.data.total
+        this.searchTable2Loading = false
+      })
     },
     turnTo() {
       this.$router.push({
@@ -711,6 +747,7 @@ export default {
       })
     },
     searchTable() {
+      console.log(this.PartType)
       if (this.PartType === '标准件') {
         this.searchTable0()
       } else if (this.PartType === '外购件') {
@@ -721,32 +758,41 @@ export default {
     },
     // 查询标准件
     searchTable0() {
-      let check1, check2
+      let check1, check2, check
       this.Machine ? check1 = 1 : check1 = 0
       this.Group ? check2 = 1 : check2 = 0
-      searchTable01(check1, this.Machine, check2, this.Group, this.pageCurrent00, this.pageSize00, 1).then(response => {
+      this.materialName ? check = 1 : check = 0
+      this.searchTable0Loading = true
+      searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent00, this.pageSize00, 1, this.order3).then(response => {
         this.tableData00 = response.data.rows
         this.total00 = response.data.total
+        this.searchTable0Loading = false
       })
     },
     // 查询外购件
     searchTable1() {
-      let check1, check2
+      let check1, check2, check
       this.Machine ? check1 = 1 : check1 = 0
       this.Group ? check2 = 1 : check2 = 0
-      searchTable01(check1, this.Machine, check2, this.Group, this.pageCurrent01, this.pageSize01, 2).then(response => {
+      this.materialName ? check = 1 : check = 0
+      this.searchTable1Loading = true
+      searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent01, this.pageSize01, 2, this.order3).then(response => {
         this.tableData01 = response.data.rows
         this.total01 = response.data.total
+        this.searchTable1Loading = false
       })
     },
     // 查询基本件
     searchTable2() {
-      let check1, check2
+      let check1, check2, check
       this.Machine ? check1 = 1 : check1 = 0
       this.Group ? check2 = 1 : check2 = 0
-      searchTable02(check1, this.Machine, check2, this.Group, this.pageCurrent02, this.pageSize02).then(response => {
+      this.materialName ? check = 1 : check = 0
+      this.searchTable2Loading = true
+      searchTable02(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent02, this.pageSize02, this.order5).then(response => {
         this.tableData02 = response.data.rows
         this.total02 = response.data.total
+        this.searchTable2Loading = false
       })
     },
     handleSizeChange(val) {

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -22,13 +22,6 @@
     <el-tabs id="PurchasingCenter/PurchaseTaskAllocate" v-model="tabName" type="border-card" @tab-click="selecttabs">
       <el-tab-pane label="标准件" name="标准件">
         <el-row style="margin-bottom: 3px">
-          <!--<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>-->
           <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()"/>
           <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
             <el-option
@@ -40,13 +33,6 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
-          <!--<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable width="100px">-->
-          <!--<el-option-->
-          <!--v-for="item in group"-->
-          <!--:key="item.value"-->
-          <!--:label="item.label"-->
-          <!--:value="item.value"/>-->
-          <!--</el-select>-->
           <el-date-picker
             v-show="false"
             v-model="dateRange"
@@ -60,7 +46,6 @@
             style="width:250px"
             start-placeholder="开始日期"
             end-placeholder="结束日期"/>
-          <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" width="100px"/>-->
           <el-select
             v-model="MaterialCategoryValue"
             placeholder="物料类别"
@@ -88,10 +73,6 @@
           </el-select>
           <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=30;total0=0;searchTable0()">查询</el-button>
           <el-checkbox v-model="checked" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=30;total0=0;searchTable0()">已分配</el-checkbox>
-          <!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">未分配</el-radio>-->
-          <!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>-->
-          <!--<div style="float:right;">-->
-          <!--<span style="margin-left: 0">采购员:</span>-->
           <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 100px">
             <el-option
               v-for="item in person"
@@ -115,7 +96,6 @@
               style="margin-left: 170px"
               @click="executeReturn1">打回</el-button>
           </el-tooltip>
-          <!--</div>-->
         </el-row>
         <el-row style="margin-bottom: 5px">
           <el-table
@@ -132,8 +112,8 @@
             <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
             <el-table-column align="center" label="进程" prop="询价状态编号" width="60px">
               <template slot-scope="scope">
-                <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
+                <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
-                <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号" type="warning" size="small">未询价</span>
                 <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
                 <span v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
               </template>
@@ -158,11 +138,6 @@
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <!--<el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px" width="140px">-->
-            <!--<template slot-scope="scope">-->
-            <!--{{ scope.row.项目名称 }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
             <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -203,31 +178,11 @@
                 {{ 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 align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip>
               <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.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
             <el-table-column v-if="radio===2" align="center" label="撤回分配" min-width="100px" width="120px" fixed="right">
               <template slot-scope="scope">
                 <el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
@@ -258,13 +213,6 @@
       </el-tab-pane>
       <el-tab-pane label="外购件" name="外购件">
         <el-row style="margin-bottom: 5px">
-          <!--<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>-->
           <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()"/>
           <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
             <el-option
@@ -276,14 +224,6 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
-          <!--<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>-->
-          <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>-->
           <el-select
             v-model="MaterialCategoryValue"
             placeholder="物料类别"
@@ -311,8 +251,6 @@
           </el-select>
           <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">查询</el-button>
           <el-checkbox v-model="checked2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-checkbox>
-          <!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">未分配</el-radio>-->
-          <!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-radio>-->
           <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 210px">
             <el-option
               v-for="item in person"
@@ -336,16 +274,14 @@
               style="margin-left: 50px"
               @click="executeReturn1">打回</el-button>
           </el-tooltip>
-          <!--<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>-->
         </el-row>
         <el-row style="margin-bottom: 10px">
           <el-table v-loading="loading" :data="tableData1" size="mini" height="780px" style="width: 1650px" border stripe @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
             <el-table-column align="center" prop="询价状态编号" label="进程" min-width="100px" width="60px">
               <template slot-scope="scope">
-                <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
+                <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
-                <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号" type="warning" size="small">未询价</span>
                 <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
                 <span v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
               </template>
@@ -463,13 +399,6 @@
       </el-tab-pane>
       <el-tab-pane label="基本件" name="基本件">
         <el-row style="margin-bottom: 5px">
-          <!--<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>-->
           <el-input v-model="partNum" placeholder="图号名称规格材料" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()"/>
           <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
             <el-option
@@ -481,18 +410,8 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
-          <!--<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>-->
-          <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>-->
           <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">查询</el-button>
           <el-checkbox v-model="checked3" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-checkbox>
-          <!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">未分配</el-radio>-->
-          <!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-radio>-->
           <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 480px">
             <el-option
               v-for="item in person"
@@ -516,16 +435,14 @@
               style="margin-left: 50px"
               @click="executeReturn2">打回</el-button>
           </el-tooltip>
-          <!--<el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>-->
-          <!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->
         </el-row>
         <el-row style="margin-bottom: 10px">
           <el-table v-loading="loading" :data="tableData2" size="mini" height="774px" style="width: 16505px" border stripe @selection-change="handleSelectionChange2">
             <el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
             <el-table-column align="center" prop="询价状态编号" label="进程" min-width="80px" width="60px">
               <template slot-scope="scope">
-                <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
+                <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
-                <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号" type="warning" size="small">未询价</span>
                 <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
                 <span v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
               </template>
@@ -555,11 +472,6 @@
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <!--<el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px" width="140px">-->
-            <!--<template slot-scope="scope">-->
-            <!--{{ scope.row.项目名称 }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
             <el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -577,7 +489,7 @@
             </el-table-column>
             <el-table-column v-if="radio2===2" align="center" prop="任务分配时间" label="分配日期" width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.任务分配时间.split(' ')[0] }}
+                {{ scope.row.任务分配时间 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="备注" width="120px" show-overflow-tooltip>
@@ -590,26 +502,11 @@
                 {{ scope.row.供货商 }}
               </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 align="center" prop="接收日期" label="接收日期" min-width="100px" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.操作日期.split(' ')[0] }}
+                {{ 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 v-if="radio2===2" align="center" label="撤回分配" width="80px" fixed="right">
               <template slot-scope="scope">
                 <el-button
@@ -953,7 +850,6 @@ export default {
     },
     searchTable0() { // 查询标准件
       this.checked ? this.radio = 2 : this.radio = 1
-      console.log(this.checked, this.radio, 991)
       this.loading = true
       this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
       this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
@@ -965,11 +861,10 @@ export default {
       this.materialSpec ? check2 = 1 : check2 = 0
       this.materialModel ? check3 = 1 : check3 = 0
       this.totalnumber = 0
-      // this.dateRange ? check4 = 0 : (check4 = 0, this.dateRange = '')
       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, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
-        this.tableData0 = response.data.rows
+        this.tableData0 = response.data.result
-        this.totalnumber = response.data.rows.length
+        this.totalnumber = parseInt(response.data.output[0].TotalCount)
-        this.total0 = response.data.total
+        this.total0 = parseInt(response.data.output[0].TotalCount)
         this.loading = false
       })
     },
@@ -987,9 +882,9 @@ export default {
       this.checked2 ? this.radio1 = 2 : this.radio1 = 1
       this.totalnumber = 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, parseInt(this.radio1), check2, this.materialSpec, check3, this.materialModel, 2, 0, '', '').then(response => {
-        this.tableData1 = response.data.rows
+        this.tableData1 = response.data.result
-        this.totalnumber = response.data.rows.length
+        this.totalnumber = parseInt(response.data.output[0].TotalCount)
-        this.total1 = response.data.total
+        this.total1 = parseInt(response.data.output[0].TotalCount)
         this.loading = false
       })
     },
@@ -1006,9 +901,9 @@ export default {
       this.checked3 ? this.radio2 = 2 : this.radio2 = 1
       this.totalnumber = 0
       searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio2), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
-        this.tableData2 = response.data.rows
+        this.tableData2 = response.data.result
-        this.totalnumber = response.data.rows.length
+        this.totalnumber = parseInt(response.data.output[0].TotalCount)
-        this.total2 = response.data.total
+        this.total2 = parseInt(response.data.output[0].TotalCount)
         this.loading = false
       })
     },