From 998a73603b23712bcc966aff8d35e0e4ac7e3fd6 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 28 Nov 2019 14:48:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AE=9A=E9=A2=9D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PartWorkCraftSelect_rdlc/index.vue        | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index fdef9f3a..7a7fd68d 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -3,7 +3,6 @@
     <el-card>
       <div>
         <el-row>
-          <!--          <span style="margin-left: 10px">机床号：</span>-->
           <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px;width:150px" clearable @change="machineChange">
             <el-option
               v-for="item in machineNumber"
@@ -14,17 +13,14 @@
               <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
             </el-option>
           </el-select>
-          <!--          <span style="margin-left: 10px">组号：</span>-->
-          <el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px;width:150px" size="small" clearable>
+          <el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px;width:100px" size="small" clearable>
             <el-option
               v-for="item in groupNumber"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <!--          <span style="margin-left: 10px">零件号：</span>-->
-          <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px; margin:0px 10px;width:150px"/>
-          <!--          <span style="margin-left: 10px">工艺员：</span>-->
+          <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 250px; margin:0px 10px;width:150px"/>
           <el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 10px;width:150px" clearable >
             <el-option
               v-for="item in person"
@@ -33,6 +29,9 @@
               :value="item.value"/>
           </el-select>
           <el-button type="success" size="small" style="margin: 0px 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
+          <el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
+            <el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
+          </el-tooltip>
         </el-row>
       </div>
     </el-card>
@@ -64,22 +63,22 @@
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="130px">
+            <el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" min-width="140px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="90px">
+            <el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="投产数量" align="center" width="90px">
+            <el-table-column label="数量" align="center" width="50px">
               <template slot-scope="scope">
                 {{ scope.row.批次数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="工艺员" prop="工艺员" align="center" width="90px">
+            <el-table-column label="工艺员" prop="工艺员" align="center" width="75px">
               <template slot-scope="scope">
                 {{ scope.row.工艺员 }}
               </template>
@@ -90,21 +89,13 @@
               :current-page="pageCurrent"
               :page-sizes="[5, 10, 20, 300]"
               :page-size="pageSize"
+              :pager-count="5"
               :total="total"
               layout="total, sizes, prev, pager, next, jumper"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
           </div>
         </el-card>
-        <el-card>
-          <div>
-            <el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
-              <div style="display: inline-block">
-                <el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
-              </div>
-            </el-tooltip>
-          </div>
-        </el-card>
       </el-col>
       <el-col style="width: 1000px">
         <el-card v-if="tableData2.length">