From 6456a3ab27edc87d9a63c2f001f9307b09884cb4 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 23 Sep 2019 16:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A2=86=E6=96=99=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Inventory/CreatePickingList.js         |  2 +-
 .../Inventory/CreatePickingList/index.vue      | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js
index d22ce193..4f509941 100644
--- a/src/api/Inventory/CreatePickingList.js
+++ b/src/api/Inventory/CreatePickingList.js
@@ -7,7 +7,7 @@ export function initPickPerson() {
     method: 'post',
     data: {
       type: '3',
-      name: 'select 姓名,人员编号 from 人事档案管理_人员名单 where 是否离职 = 0'
+      name: 'select 姓名,人员编号 from 人事档案管理_人员名单 where 是否离职 = 0 order by 姓名 '
     }
   })
 }
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index af1c7b22..17652ba9 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -196,9 +196,11 @@
         <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
         <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
         <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="createList()">创建</el-button>
-        <el-button size="small" type="primary" icon="el-icon-bottom" style="margin: 0 0 0 10px" @click="selectInto()">选入</el-button>
       </div>
-      <h4 style="margin-top:0">领料单</h4>
+      <span style="margin:0;width: 100px;font-size: 20px">领料单</span>
+      <el-tooltip effect="dark" content="为所选领料单增加物料明细" placement="top" open-delay="1200">
+        <el-button size="small" type="primary" icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入</el-button>
+      </el-tooltip>
       <el-table :data="pickListTable1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="clickList">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="领料单编号" align="center" min-width="200">
@@ -236,7 +238,7 @@
         <el-table-column label="操作" align="center" width="230px">
           <template slot-scope="scope" align="center">
             <!--<el-button v-if="Number(token)===21 || Number(token)===36" :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>
+            <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" plain type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -295,19 +297,19 @@
         </el-table-column>
         <el-table-column v-if="true" label="备料确认" align="center" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否备料确认)===1" type="success" size="mini">已确认</el-tag>
-            <el-tag v-else type="warning" size="mini">未确认</el-tag>
+            <el-tag v-if="Number(scope.row.是否备料确认)===1" type="success" size="mini">已备料</el-tag>
+            <el-tag v-else type="warning" size="mini">未备料</el-tag>
           </template>
         </el-table-column>
         <el-table-column v-if="true" label="领料确认" align="center" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否领料确认)===1" type="success" size="mini">已确认</el-tag>
-            <el-tag v-else type="warning" size="mini">未确认</el-tag>
+            <el-tag v-if="Number(scope.row.是否领料确认)===1" type="success" size="mini">已领料</el-tag>
+            <el-tag v-else type="warning" size="mini">未领料</el-tag>
           </template>
         </el-table-column>
         <el-table-column v-if="true" label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" type="danger" icon="el-icon-delete" @click="dropListDetail(scope.row)">删除</el-button>
+            <el-button :disabled="!!scope.row.是否出库 || Number(scope.row.是否领料确认)===1" size="mini" plain type="danger" icon="el-icon-delete" @click="dropListDetail(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>