From 41269ce38c91c9e81a95f9956a078043482d24f3 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 11 Nov 2019 16:54:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/PurchasingCenter/CreateInquirySheet.js            | 4 ++--
 src/views/PurchasingCenter/CreateInquirySheet/index.vue   | 4 ++--
 src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js
index 0b2693e7..7b2f3d91 100644
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -76,14 +76,14 @@ export function getExport2(num) {
   })
 }
 // 查询分配后的标准件和外购件
-export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) {
+export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_创建询价单',
-      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index f532c373..aad45b46 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -37,7 +37,7 @@
     <el-row id="PurchasingCenter/CreateInquirySheet">
       <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: 10px">
               <!--<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width:100px" filterable clearable @change="projectChange">-->
               <!--<el-option-->
@@ -1715,7 +1715,7 @@ export default {
       this.machineValue ? check5 = 1 : check5 = 0
       this.groupValue ? check6 = 1 : check6 = 0
       this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
-      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, check7, this.startTime[0], this.startTime[1]).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, check7, this.startTime[0], this.startTime[1]).then(response => {
         this.tableData11 = response.data.rows
         this.total11 = response.data.total
         const remark = []
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index af298c88..7949d99f 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -208,9 +208,8 @@
                 <el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
                   <el-button
                     :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
-                    type="primary"
-                    size="mini"
                     plain
+                    size="mini"
                     icon="el-icon-back"
                     @click="retract(scope.row)">撤回</el-button>
                 </el-tooltip>
@@ -390,7 +389,7 @@
               <template slot-scope="scope">
                 <el-button
                   :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
-                  type="primary"
+                  plain
                   size="mini"
                   icon="el-icon-back"
                   @click="retract(scope.row)">撤回</el-button>
@@ -537,7 +536,7 @@
               <template slot-scope="scope">
                 <el-button
                   :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
-                  type="primary"
+                  plain
                   size="mini"
                   icon="el-icon-back"
                   @click="retract(scope.row)">撤回</el-button>