From 61f3a53219c10373b332d754b1fa3a09894a9278 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 11 Nov 2019 15:02:23 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9B=9E=E8=BD=A6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/PurchaseContractSearch/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index aa3d4640..8ee54625 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -24,9 +24,9 @@
           <!--</el-option>-->
           <!--</el-select>-->
           <!--<span>供应商:</span>-->
-          <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
+          <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px" @keyup.enter.native="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()"/>
           <!--<span>合同编号:</span>-->
-          <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:200px"/>
+          <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:200px" @keyup.enter.native="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()"/>
           <!--<span>采购员:</span>-->
           <el-select v-model="personValue" placeholder="采购员" size="small" clearable style="width: 100px">
             <el-option

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

---
 .../CreateInquirySheet/index.vue              | 100 +++++++++---------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 2ebc6e61..f532c373 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -129,17 +129,17 @@
                     {{ scope.row.供货商 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="机床图号" align="center" min-width="130" prop="机床图号" show-overflow-tooltip>
+                <el-table-column label="机床图号" align="center" width="130" prop="机床图号" show-overflow-tooltip>
                   <template slot-scope="scope">
                     {{ scope.row.机床图号 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="名称" align="center" width="100" prop="名称">
+                <el-table-column label="名称" align="center" width="180" prop="名称">
                   <template slot-scope="scope">
                     {{ scope.row.物料名称 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="规格" align="center" min-width="100" prop="物料规格" show-overflow-tooltip>
+                <el-table-column label="规格" align="center" width="250" prop="物料规格" show-overflow-tooltip>
                   <template slot-scope="scope">
                     {{ scope.row.物料规格 }}
                   </template>
@@ -583,40 +583,40 @@
     </el-row>
 
     <el-card>
-      <div slot="header">
-        <!--        <span>询价单号:</span>-->
-        <el-input v-model="inquirySheetNum" placeholder="询价单号" size="small" style="margin: 0px 10px" clearable/>
-        <!--        <span>供应商:</span>-->
-        <el-input v-model="supplierName" placeholder="供应商" size="small" style="margin: 0px 10px" clearable/>
-        <el-button
-          type="success"
-          size="small"
-          icon="el-icon-search"
-          style="margin:0px 10px"
-          @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
-        <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
+      <el-card style="width: 1188px">
+        <el-row>
+          <el-input v-model="inquirySheetNum" placeholder="询价单号" size="small" clearable/>
+          <el-input v-model="supplierName" placeholder="供应商" size="small" style="margin: 0px 10px" clearable/>
           <el-button
-            type="warning"
+            type="success"
             size="small"
-            style="margin: 0px 20px"
-            @click="addInquirySheet">选入物料</el-button>
-        </el-tooltip>
-        <el-button
-          type="primary"
-          size="small"
-          style="float: right;margin:0px 10px"
-          @click="createInquirySheet">创建询价单</el-button>
-      </div>
-      <el-card>
-        <h3 style="margin: 0px 30px;display:inline-block; ">询价单</h3>
-        <el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin: 0px 20px" @click="editInquirySheet()">编辑</el-button>
-        <el-button type="danger" size="mini" plain icon="el-icon-delete" style="margin: 0px 60px 0px 20px" @click="deleteInquirySheet()">删除</el-button>
-        <!--<h3 style="margin: 0px 40px;display:inline-block;">询价单明细</h3>-->
-        <el-button :disabled="tableData3.length===0" type="primary" size="small" plain style="float: right" @click="printInquirySheet()">打印</el-button>
-        <el-button :disabled="tableData3.length===0" type="warning" size="small" style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button>
-        <el-tooltip :open-delay="1000" effect="dark" content="保存该询价单" placement="top" style="float: right">
-          <el-button :disabled="tableData3.length===0" type="success" size="small" @click="saveOrder()">保存</el-button>
-        </el-tooltip>
+            icon="el-icon-search"
+            style="margin:0px 10px"
+            @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
+          <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
+            <el-button
+              type="warning"
+              size="small"
+              style="margin: 0px 20px"
+              @click="addInquirySheet">选入物料</el-button>
+          </el-tooltip>
+          <el-button
+            type="primary"
+            size="small"
+            style="float: right;margin:0px 10px"
+            @click="createInquirySheet">创建询价单</el-button>
+        </el-row>
+        <el-row style="margin-top: 5px;">
+          <h3 style="margin: 0px 30px;display:inline-block; ">询价单</h3>
+          <el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin: 0px 20px" @click="editInquirySheet()">编辑</el-button>
+          <el-button type="danger" size="mini" plain icon="el-icon-delete" style="margin: 0px 60px 0px 20px" @click="deleteInquirySheet()">删除</el-button>
+          <!--<h3 style="margin: 0px 40px;display:inline-block;">询价单明细</h3>-->
+          <el-button :disabled="tableData3.length===0" type="primary" size="small" plain style="float: right" @click="printInquirySheet()">打印</el-button>
+          <el-button :disabled="tableData3.length===0" type="warning" size="small" style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button>
+          <el-tooltip :open-delay="1000" effect="dark" content="保存该询价单" placement="top" style="float: right">
+            <el-button :disabled="tableData3.length===0" type="success" size="small" @click="saveOrder()">保存</el-button>
+          </el-tooltip>
+        </el-row>
         <!--<el-button :loading="baseInfoLoading" type="success" size="mini" style="float: right" plain @click="inquirySheetBaseInfoMaintain">信息维护</el-button>-->
       </el-card>
       <el-row>
@@ -682,19 +682,19 @@
             </el-table>
           </el-card>
         </el-col>
-        <!--          <div class="block" style="margin: 10px 0;">-->
-        <!--            <el-pagination-->
-        <!--              :current-page="pageCurrent2"-->
-        <!--              :page-sizes="[10, 20, 30, 40]"-->
-        <!--              :page-size="pageSize2"-->
-        <!--              :total="total2"-->
-        <!--              layout="total"-->
-        <!--              @size-change="handleSizeChange2"-->
-        <!--              @current-change="handleCurrentChange2"/>-->
-        <!--          </div>-->
+        <!--<div class="block" style="margin: 10px 0;">-->
+        <!--<el-pagination-->
+        <!--:current-page="pageCurrent2"-->
+        <!--:page-sizes="[10, 20, 30, 40]"-->
+        <!--:page-size="pageSize2"-->
+        <!--:total="total2"-->
+        <!--layout="total"-->
+        <!--@size-change="handleSizeChange2"-->
+        <!--@current-change="handleCurrentChange2"/>-->
+        <!--</div>-->
         <el-col style="width:880px">
           <el-card>
-            <el-table v-loading="" :data="tableData3" border style="max-height: 500px;width: 850px;float: left" height="500px" size="mini" >
+            <el-table v-loading="" :data="tableData3" border style="max-height: 500px;width: 100%;float: left" height="500px" size="mini" >
               <!--            <el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>-->
               <!--              <template slot-scope="scope">-->
               <!--                {{ scope.row.供应商名称 }}-->
@@ -710,7 +710,7 @@
                   {{ scope.row.组件零件流水号 ? scope.row.物料名称 : scope.row.零件名称 }}
                 </template>
               </el-table-column>
-              <el-table-column label="规格" align="center" width="110" show-overflow-tooltip>
+              <el-table-column label="规格" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.组件零件流水号 ? scope.row.物料规格 : scope.row.规格 }}
                 </template>
@@ -720,9 +720,9 @@
                   {{ scope.row.技术下达数量 }}
                 </template>
               </el-table-column>
-              <el-table-column label="实询数" align="center" width="90">
+              <el-table-column label="实询数" align="center" width="110">
                 <template slot-scope="scope">
-                  <el-input v-direction="{x: 0, y: scope.$index}" v-model="scope.row.数量" size="mini" style="width:100%"/>
+                  <el-input v-direction="{x: 0, y: scope.$index}" v-model="scope.row.数量" size="mini" style="width: 75px"/>
                 </template>
               </el-table-column>
               <el-table-column label="单位" align="center" width="50">
@@ -732,7 +732,7 @@
               </el-table-column>
               <el-table-column label="询价备注" align="center" width="110">
                 <template slot-scope="scope">
-                  <el-input v-direction="{x: 1, y: scope.$index}" v-model="scope.row.备注" size="mini" style="width:100%"/>
+                  <el-input v-direction="{x: 1, y: scope.$index}" v-model="scope.row.备注" size="mini" style="width: 75px"/>
                 </template>
               </el-table-column>
               <!--            <el-table-column label="询价单编号" align="center" min-width="100">-->

From 916ddb04fae5cd537ed6d3127a61c6fb93bfbfc2 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 11 Nov 2019 16:12:38 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E8=AF=B7=E6=AC=BE=E5=88=97=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/PurchaseContractRequestFund/index.vue    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index 9c20756d..eea2073c 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -36,13 +36,11 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额" align="center" width="70" prop="请款金额">
+        <el-table-column label="请款金额" align="center" width="150" prop="请款金额">
           <template slot-scope="scope">
             {{ scope.row.请款金额 }}
           </template>
         </el-table-column>
-        <!--<el-table-column label="请款付款情况" align="center">-->
-        <!--</el-table-column>-->
         <el-table-column label="审核内容" width="80" align="center">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>

From d57f6232d3c50a861fb167fd303eba83ce13c99a Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 11 Nov 2019 16:34:37 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/PurchaseTaskAllocate.js  |   6 +-
 .../PurchaseTaskAllocate/index.vue            | 328 ++++++++----------
 2 files changed, 143 insertions(+), 191 deletions(-)

diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
index f326320b..d5399312 100644
--- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js
+++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
@@ -53,7 +53,7 @@ export function searchMachine(num) {
     data: {
       type: '1',
       name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=1&项目流水号=' + num
+      param: '项目流水号_check=0&项目流水号=' + num
     }
   })
 }
@@ -76,7 +76,7 @@ export function searchTable1(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: 'xqs_采购管理_采购部采购_查询物料_分配后',
+      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]}`,
       Pagination: params[0] + '&' + params[1]
     }
@@ -89,7 +89,7 @@ export function searchTable2(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购部采购_查询物料_基本件_分配后',
+      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]}`,
       Pagination: params[0] + '&' + params[1]
     }
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 8a27de06..7db6d77f 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -22,13 +22,14 @@
     <el-tabs id="PurchasingCenter/PurchaseTaskAllocate" v-model="tabName" type="border-card" @tab-click="searchTable0();searchTable1();searchTable2();">
       <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-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/>
           <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
             <el-option
               v-for="item in machine"
@@ -39,13 +40,13 @@
               <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-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"
@@ -59,7 +60,7 @@
             style="width:250px"
             start-placeholder="开始日期"
             end-placeholder="结束日期"/>
-          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" width="100px"/>
+          <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" width="100px"/>-->
           <el-select
             v-model="MaterialCategoryValue"
             placeholder="物料类别"
@@ -72,18 +73,6 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <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">
           <el-select
             v-model="MaterialVarietyValue"
             placeholder="物料品种"
@@ -95,11 +84,16 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
           <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">
+          <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>
             <el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
               <el-button
                 type="primary"
@@ -129,6 +123,26 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料规格" label="规格" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">
+              <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="项目名称" prop="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
@@ -154,26 +168,6 @@
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">
-              <template slot-scope="scope">
-                {{ scope.row.物料型号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.物料名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料规格" 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.备注 }}
@@ -238,14 +232,15 @@
       </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-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
+          <!--<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/>
+          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
             <el-option
               v-for="item in machine"
               :key="item.value"
@@ -255,14 +250,14 @@
               <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="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="物料类别"
@@ -275,18 +270,6 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <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">
           <el-select
             v-model="MaterialVarietyValue"
             placeholder="物料品种"
@@ -298,28 +281,18 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-          <el-button
-            type="success"
-            size="small"
-            icon="el-icon-search"
-            style="margin-left: 10px;"
-            @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
-          <div style="float:right">
-            <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-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</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>
+            <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: 10px">
@@ -333,6 +306,26 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="center" prop="物料名称" label="名称" width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料规格" label="规格" width="180px">
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料型号" label="图号或型号" width="180px">
+              <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" prop="项目名称" label="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
@@ -358,26 +351,6 @@
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">
-              <template slot-scope="scope">
-                {{ scope.row.物料型号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.物料名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料规格" 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.备注 }}
@@ -439,14 +412,15 @@
       </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-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
+          <!--<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/>
+          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
             <el-option
               v-for="item in machine"
               :key="item.value"
@@ -456,15 +430,15 @@
               <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-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
+          <!--<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="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
           <div style="float:right">
             <span style="margin-left: 0">采购员:</span>
             <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
@@ -474,31 +448,8 @@
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
-          </div>
-        </el-row>
-        <el-row style="margin-bottom: 5px">
-          <el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
-          <el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
-          <el-input v-model="partMaterial" placeholder="零件材料" size="small" clearable/>
-          <el-button
-            type="success"
-            size="small"
-            icon="el-icon-search"
-            style="margin-left: 10px;"
-            @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
-          <div style="float:right">
-            <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-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>
           </div>
         </el-row>
         <el-row style="margin-bottom: 10px">
@@ -512,6 +463,31 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="center" prop="零件图号" label="图号" min-width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="零件名称" label="名称" width="180px">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="规格" label="规格" width="170px">
+              <template slot-scope="scope">
+                {{ scope.row.规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="材料" width="180">
+              <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" prop="项目名称" label="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
@@ -527,31 +503,6 @@
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="零件图号" label="图号" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.零件图号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="零件名称" label="名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.零件名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="规格" 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.备注 }}
@@ -762,6 +713,7 @@ export default {
   created() {
     this.searchTable0() // 查表1
     this.fetchData() // 初始化数据
+    this.projectChange()
     this.searchUnallocatePartNumber()
     this.timer2 = setInterval(this.searchUnallocatePartNumber, 20 * 60 * 1000) // 20 分钟一刷新
     this.getDefaultTime()

From 5bc47a79292ade00067394f304078a66d87c4a41 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 11 Nov 2019 16:35:53 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E5=9B=9E=E8=BD=A6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 7db6d77f..af298c88 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -29,7 +29,7 @@
           <!--:label="item.label"-->
           <!--:value="item.value"/>-->
           <!--</el-select>-->
-          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable/>
+          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()"/>
           <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
             <el-option
               v-for="item in machine"
@@ -239,7 +239,7 @@
           <!--:label="item.label"-->
           <!--:value="item.value"/>-->
           <!--</el-select>-->
-          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable/>
+          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()"/>
           <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
             <el-option
               v-for="item in machine"
@@ -419,7 +419,7 @@
           <!--:label="item.label"-->
           <!--:value="item.value"/>-->
           <!--</el-select>-->
-          <el-input v-model="partNum" placeholder="图号名称规格材料" size="small" clearable/>
+          <el-input v-model="partNum" placeholder="图号名称规格材料" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()"/>
           <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
             <el-option
               v-for="item in machine"

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 6/6] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7?=
 =?UTF-8?q?=E5=8D=95=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>