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

src/api/PurchasingCenter/PurchaseContractSearch.js

@@ -23,14 +23,14 @@ export function initBuyer() {
   })
 }
 // 采购合同查询
-export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier, check5, approval, numberCheck, number) {
+export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier, check5, approval, numberCheck, number, check6, review) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_合同_查询数据_采购部采购',
-      param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number,
+      param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number + '&审核情况流水号_check=' + check6 + '&审核情况流水号=' + review,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/views/Inventory/CreatePickingList/index.vue

@@ -236,7 +236,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="230px">
           <template slot-scope="scope" align="center">
-            <el-button :disabled="Number(scope.row.是否审批)===0 || Number(scope.row.是否启用)===0" size="mini" type="primary" @click="checkList(scope.row)">确认领回</el-button>
+            <el-button v-if="Number(token)===21" :disabled="Number(scope.row.是否审批)===0 || Number(scope.row.是否启用)===0" size="mini" type="primary" @click="checkList(scope.row)">确认领回</el-button>
             <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>
           </template>
         </el-table-column>

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -35,6 +35,8 @@
               <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
               <span>物料名称:</span>
               <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+              <span>物料变更:</span>
+              <el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
             </el-row>
             <el-row style="margin-bottom: 10px">
               <span>物料规格:</span>
@@ -46,7 +48,7 @@
                 size="small"
                 icon="el-icon-search"
                 style="margin-left: 10px"
-                @click="pageCurrent11=1;pageSize11=150;total11=0;searchTable11()">查询</el-button>
+                @click="pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button>
               <el-button
                 type="warning"
                 size="small"
@@ -65,16 +67,16 @@
                 size="mini"
                 @selection-change="handleSelectionChange1">
                 <el-table-column :selectable="selectable" align="center" width="35" type="selection"/>
-                <el-table-column label="操作" align="center" width="100" fixed="left">
+                <el-table-column v-if="switchValue" label="操作" align="center" width="100" fixed="left">
                   <template slot-scope="scope">
                     <el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1" type="primary" size="mini" @click="materialChange(scope.row)">物料变更</el-button>
                   </template>
                 </el-table-column>
                 <el-table-column label="物料状态" align="center" width="80">
                   <template slot-scope="scope">
-                    <el-tag v-if="parseInt(scope.row.询价状态编号)===1" 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.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+                    <el-tag v-if="unInquiry(scope.row)" type="warning" size="small">未询价</el-tag>
+                    <el-tag v-if="inquiry(scope.row)" type="success" size="small">已询价</el-tag>
+                    <el-tag v-if="purchased(scope.row)" type="info" size="small">已采购</el-tag>
                   </template>
                 </el-table-column>
                 <el-table-column label="任务分配时间" align="center" min-width="100">
@@ -122,7 +124,7 @@
                     {{ scope.row.物料型号 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="规格" align="center" min-width="200">
+                <el-table-column label="规格" align="center" min-width="150">
                   <template slot-scope="scope">
                     {{ scope.row.物料规格 }}
                   </template>
@@ -145,7 +147,10 @@
                 <el-table-column label="使用滞货" align="center" min-width="70">
                   <template slot-scope="scope">
                     <!--<el-tooltip class="item" effect="dark" content="使用滞货" placement="top-start">-->
-                    <el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0" icon="el-icon-goods" plain type="primary" size="mini" @click="useInventory(scope.row)"/>
+                    <template v-if="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0">
+                      —
+                    </template>
+                    <el-button v-else :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0" icon="el-icon-goods" plain type="primary" size="mini" @click="useInventory(scope.row)"/>
                     <!--</el-tooltip>-->
                     <!--<el-tooltip class="item" effect="dark" content="取消使用滞货" placement="top-start">-->
                     <!--<el-button :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.使用滞货数量)===0" icon="el-icon-sold-out" plain type="danger" size="mini" @click="cancelUseInventory(scope.row)"/>-->
@@ -229,7 +234,7 @@
                 size="small"
                 icon="el-icon-search"
                 style="margin-left: 10px"
-                @click="pageCurrent12=1;pageSize12=150;total12=0;searchTable12()">查询</el-button>
+                @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
               <el-button
                 type="warning"
                 size="small"
@@ -255,9 +260,9 @@
                 <!--</el-table-column>-->
                 <el-table-column label="零件状态" align="center" width="100">
                   <template slot-scope="scope">
-                    <el-tag v-if="parseInt(scope.row.询价状态编号)===1" 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.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+                    <el-tag v-if="unInquiry(scope.row)" type="warning" size="small">未询价</el-tag>
+                    <el-tag v-if="inquiry(scope.row)" type="success" size="small">已询价</el-tag>
+                    <el-tag v-if="purchased(scope.row)" type="info" size="small">已采购</el-tag>
                   </template>
                 </el-table-column>
                 <el-table-column label="任务分配时间" align="center" min-width="100">
@@ -815,6 +820,7 @@ export default {
   name: '', // 创建询价单
   data() {
     return {
+      switchValue: false, // 物料变更列显示开关
       source: [
         {
           text: 'BZ',
@@ -887,11 +893,11 @@ export default {
       tableData11: [], // 外购件列表
       total11: 0,
       pageCurrent11: 1,
-      pageSize11: 150,
+      pageSize11: 100,
       tableData12: [], // 基本件列表
       total12: 0,
       pageCurrent12: 1,
-      pageSize12: 150,
+      pageSize12: 100,
       remarkFilters: [],
       supplierFilters: [],
       tableData2: [], // 询价单列表
@@ -978,6 +984,15 @@ export default {
     this.searchTable2() // 查表2
   },
   methods: {
+    unInquiry(row) {
+      return parseInt(row.询价状态编号) === 1
+    },
+    inquiry(row) {
+      return parseInt(row.询价状态编号) === 3 && parseInt(row.采购状态编号) !== 3
+    },
+    purchased(row) {
+      return parseInt(row.询价状态编号) !== 1 && parseInt(row.采购状态编号) === 3
+    },
     filterSource(value, row) {
       return Number(row['零件类型']) === Number(value)
     },

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -38,6 +38,14 @@
         </el-row>
 
         <el-row style="margin-top: 15px">
+          <span>审核情况:</span>
+          <el-select v-model="revieweValue" placeholder="审核情况" size="small" style="width: 100px">
+            <el-option
+              v-for="item in reviewe"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
           <span>审批情况:</span>
           <el-select v-model="approvalValue" placeholder="审批情况" size="small" style="width: 100px">
             <el-option
@@ -211,6 +219,20 @@ export default {
         label: '未审批'
       }],
       approvalValue: 0,
+      reviewe: [{
+        value: 0,
+        label: '全部'
+      }, {
+        value: 1,
+        label: '已通过'
+      }, {
+        value: 2,
+        label: '未通过'
+      }, {
+        value: 3,
+        label: '未审核'
+      }],
+      revieweValue: 0,
       RMB: '',
       TotalAmount: '',
       check1: 0,
@@ -337,13 +359,13 @@ export default {
       } else {
         this.check5 = 1
       }
-      let check
+      let check, check2
       this.contractNumber ? check = 1 : check = 0
-      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.personValue, this.check4, this.supplierName, this.check5, this.approvalValue, check, this.contractNumber).then(response => {
+      this.revieweValue ? check2 = 1 : check2 = 0
+      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.personValue, this.check4, this.supplierName, this.check5, this.approvalValue, check, this.contractNumber, check2, this.revieweValue).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
           response.data.rows[i].审批情况内容 === '未审批' ? this.disable.push(false) : this.disable.push(true) // 删除按钮禁用
         }
-        console.log(response.data.rows)
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
         this.loading1 = false

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -26,7 +26,7 @@
             type="success"
             size="small"
             icon="el-icon-search"
-            style="margin-left: 10px;margin-bottom:10px"
+            style="margin-left: 10px;"
             @click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
           <div style="float:right;">
             <span style="margin-left: 0">采购员:</span>
@@ -240,7 +240,7 @@
             type="success"
             size="small"
             icon="el-icon-search"
-            style="margin-left: 10px;margin-bottom:10px"
+            style="margin-left: 10px;"
             @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
           <div style="float:right;">
             <span style="margin-left: 0">采购员:</span>
@@ -454,7 +454,7 @@
             type="success"
             size="small"
             icon="el-icon-search"
-            style="margin-left: 10px;margin-bottom:10px"
+            style="margin-left: 10px;"
             @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
           <div style="float:right">
             <span style="margin-left: 0">采购员:</span>

src/views/PurchasingCenter/ReceiveCheck/index.vue

@@ -70,7 +70,7 @@
         </el-table-column>
         <el-table-column align="center" label="小计(元)" prop="小计">
           <template slot-scope="scope">
-            {{ scope.row.小计.toFixed(2) }}
+            {{ scope.row.小计 ? scope.row.小计.toFixed(2) : 0 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="单价">