更新

src/views/Inventory/CreatePickingList/index.vue

@@ -177,6 +177,26 @@
                 {{ scope.row.领料单编号 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="操作" min-width="100px">
+              <template slot-scope="scope">
+                <el-popover placement="right" width="400" trigger="click">
+                  <el-table :data="gridData3" highlight-current-row size="mini" show-summary>
+                    <el-table-column width="50" align="center" type="index" label="序号"/>
+                    <el-table-column min-width="150" align="center" label="领料单编号">
+                      <template slot-scope="scope">
+                        {{ scope.row.领料单编号 }}
+                      </template>
+                    </el-table-column>
+                    <el-table-column min-width="100" align="center" label="领用数量" prop="领用数量">
+                      <template slot-scope="scope">
+                        {{ scope.row.领用数量 }}
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <el-button slot="reference" type="text" size="mini" icon="el-icon-search" @click="searchTable03(scope.row)">领料详情</el-button>
+                </el-popover>
+              </template>
+            </el-table-column>
           </el-table>
           <span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
           <div class="block">
@@ -254,6 +274,26 @@
                 {{ scope.row.领料单编号 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="操作" min-width="100px">
+              <template slot-scope="scope">
+                <el-popover placement="right" width="400" trigger="click">
+                  <el-table :data="gridData3" highlight-current-row size="mini" show-summary>
+                    <el-table-column width="50" align="center" type="index" label="序号"/>
+                    <el-table-column min-width="150" align="center" label="领料单编号">
+                      <template slot-scope="scope">
+                        {{ scope.row.领料单编号 }}
+                      </template>
+                    </el-table-column>
+                    <el-table-column min-width="100" align="center" label="领用数量" prop="领用数量">
+                      <template slot-scope="scope">
+                        {{ scope.row.领用数量 }}
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <el-button slot="reference" type="text" size="mini" icon="el-icon-search" @click="searchTable03(scope.row)">领料详情</el-button>
+                </el-popover>
+              </template>
+            </el-table-column>
           </el-table>
           <span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
           <div class="block">

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -91,6 +91,18 @@
           <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>
+                <el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
+                  <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>-->
+                    <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.询价状态编号)===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="机床图号">
                   <template slot-scope="scope">
                     {{ scope.row.机床图号 }}
@@ -156,6 +168,18 @@
             </el-tab-pane>
             <el-tab-pane label="外购件" name="外购件">
               <el-table :data="tableData01" size="mini" height="530px" border stripe>
+                <el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
+                  <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>-->
+                    <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.询价状态编号)===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="机床图号">
                   <template slot-scope="scope">
                     {{ scope.row.机床图号 }}
@@ -226,6 +250,18 @@
             </el-tab-pane>
             <el-tab-pane label="基本件" name="基本件">
               <el-table :data="tableData02" size="mini" height="530px" border stripe>
+                <el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
+                  <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>-->
+                    <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.询价状态编号)===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="机床图号">
                   <template slot-scope="scope">
                     {{ scope.row.机床图号 }}

src/views/Outsourcing/OutsourcingPartsQuery/index.vue

@@ -11,32 +11,32 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button icon="el-icon-search" type="primary" size="small" plain @click="getTableData()">查询</el-button>
+        <el-button icon="el-icon-search" type="primary" size="small" plain @click="pageCurrent=1;pageSize=50;getTableData()">查询</el-button>
         <el-button v-positive="'loading'" :disabled="false" type="success" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" plain @click="exportExcel">导出</el-button>
       </div>
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1480px">
-        <el-table-column label="序号" align="center" type="index" width="50" fixed/>
+        <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="外协状态" align="center" width="80px" fixed>
+        <el-table-column label="外协状态" align="center" width="80px">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.外协状态)==1" type="primary" size="mini">未提交</el-tag>
             <el-tag v-if="Number(scope.row.外协状态)===0" type="success" size="mini">未外协</el-tag>
             <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)!==1" type="warning" size="mini">未到货</el-tag>
-            <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
+            <el-tag v-if="Number(scope.row.外协状态)==3 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" align="center" width="110px" fixed>
+        <el-table-column label="项目名称" align="center" width="115px">
           <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
+            {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" align="center" width="100px" show-overflow-tooltip fixed>
+        <el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" align="center" width="100px" fixed>
+        <el-table-column label="零件名称" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -46,22 +46,22 @@
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协工序" align="center" width="80">
+        <el-table-column label="外协工序" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.外协工序 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协工时(分)" align="center" width="70">
+        <el-table-column label="外协工时(分)" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.外协工时 }}
           </template>
         </el-table-column>
-        <el-table-column label="工时费用(元)" align="center" width="70">
+        <el-table-column label="工时费用(元)" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.加工价格_成交 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协厂家" align="center" width="100px" show-overflow-tooltip>
+        <el-table-column label="外协厂家" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.外协厂家名称 }}
           </template>
@@ -71,22 +71,22 @@
             {{ scope.row.表单号 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协日期" align="center" width="90">
+        <el-table-column label="外协日期" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.任务下达日期 ? scope.row.任务下达日期.split(' ')[0]:scope.row.任务下达日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划到货" align="center" width="90">
+        <el-table-column label="规定到货日期" align="center" width="120">
           <template slot-scope="scope">
             {{ scope.row.到货日期 ? (scope.row.到货日期.split(' ')[0] !== '1900-01-01' ? scope.row.到货日期.split(' ')[0] : '') : scope.row.到货日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="实际到货" align="center" width="90">
+        <el-table-column label="到货日期" align="center" width="120">
           <template slot-scope="scope">
             {{ scope.row.到货时间 ? (scope.row.到货时间.split(' ')[0] !== '1900-01-01' ? scope.row.到货时间.split(' ')[0] : '') : scope.row.到货时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="外协员" align="center" show-overflow-tooltip>
+        <el-table-column label="外协员" align="center" width="70" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.外协计划员 }}
           </template>

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -66,7 +66,7 @@
                 <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)"/>
               </div>
               <div style="display: inline-block">
-                <el-button :disabled="scope.row.单据状态==='成交'" type="text" size="mini" icon="el-icon-delete" style="margin-left:10px" @click="handleDelete(scope.row)"/>
+                <el-button :disabled="scope.row.单据状态==='成交' || scope.row.单据状态 === '到货'" type="text" size="mini" icon="el-icon-delete" style="margin-left:10px" @click="handleDelete(scope.row)"/>
               </div>
             </template>
           </el-table-column>
@@ -375,7 +375,7 @@ export default {
     },
     // 点击表2 查询表3
     searchProcess(row) {
-      row.单据状态 === '成交' ? this.jinyong = true : this.jinyong = false
+      row.单据状态 === '成交' || row.单据状态 === '到货' ? this.jinyong = true : this.jinyong = false
       this.loading = true
       this.List3 = []
       this.Number = row.外协加工任务单流水号

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -75,7 +75,6 @@
               <el-table
                 v-loading="loading"
                 :data="tableData11"
-                :row-class-name="tableRowClassName"
                 border
                 style="width: 100%;max-height: 500px;"
                 height="300px"
@@ -83,7 +82,6 @@
                 highlight-current-row
                 @sort-change="sortChange"
                 @selection-change="handleSelectionChange1"
-                @select="handleSelection"
                 @row-click="rowClick">
                 <el-table-column :selectable="selectable" align="center" width="43" type="selection" fixed="left"/>
                 <!--物料名称排序-->
@@ -272,14 +270,12 @@
               <el-table
                 v-loading="loading2"
                 :data="tableData12"
-                :row-class-name="tableRowClassName2"
                 border
                 style="width: 100%;max-height: 500px;"
                 height="300px"
                 size="mini"
                 @selection-change="handleSelectionChange2"
-                @sort-change="sortChange"
+                @sort-change="sortChange">
-                @select="handleSelection1">
                 <el-table-column :selectable="selectable" align="center" width="50" type="selection" fixed="left"/>
                 <!--<el-table-column label="操作" align="center" width="100" fixed="left">-->
                 <!--<template slot-scope="scope">-->
@@ -1075,8 +1071,6 @@ export default {
       cancelNum: 0,
       machines1: [],
       machines2: [],
-      numbers: [],
-      numbers1: [],
       row1: '',
       ordername: '',
       order: '',
@@ -1163,30 +1157,6 @@ export default {
         }
       })
     },
-    handleSelection(val, row) {
-      this.tableData11.forEach((item, i) => {
-        if (item.组件零件流水号 === row.组件零件流水号) {
-          console.log(this.numbers.indexOf(i), 234)
-          if (this.numbers.indexOf(i) === -1) {
-            this.numbers.push(i)
-          } else {
-            this.numbers.splice(this.numbers.indexOf(i), 1)
-          }
-        }
-      })
-    },
-    handleSelection1(val, row) {
-      this.tableData12.forEach((item, i) => {
-        if (item.组件零件基本件流水号 === row.组件零件基本件流水号) {
-          console.log(this.numbers1.indexOf(i), 234)
-          if (this.numbers1.indexOf(i) === -1) {
-            this.numbers1.push(i)
-          } else {
-            this.numbers1.splice(this.numbers1.indexOf(i), 1)
-          }
-        }
-      })
-    },
     Jump() {
       window.location.hash = '#PurchasingCenter/CreateInquirySheet'
     },
@@ -2098,7 +2068,6 @@ export default {
       }
     },
     addInquirySheet() { // 追加物料
-      this.numbers = []
       const numGroup1 = [] // 空数组，放该询价单中已有的组件零件流水号
       const numGroup2 = [] // 空数组，放该询价单中已有的组件零件基本件流水号
       if (this.inquirySheetFlowNum === '' || this.inquirySheetFlowNum === null) {
@@ -2286,28 +2255,6 @@ export default {
           this.searchTable11()
         } else { this.$message.error('操作失败') }
       })
-    },
-    tableRowClassName({ row, rowIndex }) {
-      let color = ''
-      if (this.numbers.length > 0) {
-        this.numbers.forEach((r, i) => {
-          if (rowIndex === r) {
-            color = 'MistyRose'
-          }
-        })
-      } else {
-        color = ''
-      }
-      return color
-    },
-    tableRowClassName2({ row, rowIndex }) {
-      let color = ''
-      this.numbers1.forEach((r, i) => {
-        if (rowIndex === r) {
-          color = 'MistyRose'
-        }
-      })
-      return color
     }
   }
 }

src/views/PurchasingCenter/PurchaseSituationSearch/index.vue

@@ -57,8 +57,8 @@
               <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
               <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.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" 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.采购状态编号)===3" type="info" 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="机床图号" prop="机床图号" width="94px" show-overflow-tooltip fixed="left">
@@ -176,8 +176,8 @@
             <template slot-scope="scope">
               <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.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" 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.采购状态编号)===3" type="info" 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="机床图号" prop="机床图号" width="94px" show-overflow-tooltip fixed="left">
@@ -301,8 +301,8 @@
             <template slot-scope="scope">
               <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.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" 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.采购状态编号)===3" type="info" 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="机床图号" prop="机床图号" width="94px" show-overflow-tooltip fixed="left">

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -117,13 +117,13 @@
           </el-tooltip>
           <!--</div>-->
         </el-row>
-        <el-row style="margin-bottom: 3px">
+        <el-row style="margin-bottom: 5px">
           <el-table
             v-loading="loading"
             :data="tableData0"
             :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
             size="mini"
-            height="740px"
+            height="782"
             style="width: 1650px"
             border
             stripe
@@ -250,7 +250,7 @@
             :page-sizes="[10, 20, 30, 40, 50]"
             :page-size="pageSize0"
             :total="total0"
-            style="display:inline-block;width:50%"
+            style="display:inline-block;width:50%;margin-top: 5px"
             small
             layout="total, sizes, prev, pager, next, jumper"
             @size-change="handleSizeChange0"
@@ -341,7 +341,7 @@
           <!--<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="800px" style="width: 1650px" border stripe @selection-change="handleSelectionChange1">
+          <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">
@@ -457,7 +457,7 @@
             :page-size="pageSize1"
             :total="total1"
             small
-            style="display:inline-block;width:30%"
+            style="display:inline-block;width:50%"
             layout="total, sizes, prev, pager, next, jumper"
             @size-change="handleSizeChange1"
             @current-change="handleCurrentChange1"/>
@@ -522,7 +522,7 @@
           <!--<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="800px" style="width: 16505px" border stripe @selection-change="handleSelectionChange2">
+          <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">