From ac440f57d921e304e71abcf5878565de9f4a782b Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sun, 22 Sep 2019 10:49:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  2 +-
 src/views/Inventory/InventoryCheck/index.vue  |  8 ++---
 .../Inventory/InventoryManagement/index.vue   | 18 +++++-----
 src/views/Inventory/MaterialOut/index.vue     | 33 +++++++++----------
 src/views/Inventory/OfflinePartOut/index.vue  | 14 ++++----
 .../Inventory/PurchaseInRecord/index.vue      | 24 +++++++-------
 .../Inventory/PurchaseOutRecord/index.vue     | 12 +++----
 .../BacklogGoodsPrepare/index.vue             |  2 +-
 8 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index ca0340f5..dcdec3af 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://localhost:8005/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.106:8005/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index d612721c..931821e2 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -42,17 +42,17 @@
         </el-row>
       </div>
       <el-table :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" show-summary>
-        <el-table-column label="名称" align="center" min-width="150">
+        <el-table-column label="名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="100">
+        <el-table-column label="图号或型号" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" min-width="150">
+        <el-table-column label="规格" align="center" width="130" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
@@ -72,7 +72,7 @@
             {{ scope.row.货位名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="货位存量" align="center" width="180" prop="货位存量">
+        <el-table-column label="货位存量" align="center" width="150" prop="货位存量">
           <template slot-scope="scope">
             <template v-if="scope.row.changeValue">
               <el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index 85a0cd31..d8918027 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -5,22 +5,22 @@
         <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">新建仓库</el-button>
       </div>
       <el-table :data="tableData" border size="mini" style="width: 100%;max-height: 300px" height="300" @row-click="getWarehouse">
-        <el-table-column label="仓库编号" align="center" width="200">
+        <el-table-column label="仓库编号" align="center" width="90" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.仓库编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库名称" align="center" width="180">
+        <el-table-column label="仓库名称" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.仓库名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库描述" min-width="180" align="center">
+        <el-table-column label="仓库描述" min-width="120" align="center">
           <template slot-scope="scope">
             {{ scope.row.仓库描述 }}
           </template>
         </el-table-column>
-        <el-table-column label="地址" min-width="180" align="center">
+        <el-table-column label="地址" min-width="100" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.地址 }}
           </template>
@@ -30,7 +30,7 @@
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="180" align="center">
+        <el-table-column label="备注" min-width="80" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.备注 }}
           </template>
@@ -40,11 +40,13 @@
             <el-button
               size="mini"
               icon="el-icon-edit"
-              type="primary"
+              plain
+              type="warning"
               @click="handleEdit(scope.$index, scope.row, 'form')">修改</el-button>
             <el-button
               size="mini"
               type="danger"
+              plain
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
             <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
@@ -54,12 +56,12 @@
     </el-card>
     <el-card>
       <el-table v-loading="listLoading" :data="tableData2" border size="mini" style="width: 100%;max-height: 300px" height="300">
-        <el-table-column label="货位名称" align="center" width="200">
+        <el-table-column label="货位名称" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.货位名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="工作中心" align="center" width="180">
+        <el-table-column label="工作中心" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.工作中心 }}
           </template>
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 6eb21187..0864cf7e 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -36,16 +36,13 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-row style="margin: 0;">
-        <el-col style="width: 300px">
-          <h4 style="margin-right: 100px;">领料单明细：{{ pickingListNumberShow }}</h4>
-        </el-col>
-        <el-col style="width: 300px;margin-top:15px">
+      <el-row>
+        <el-col style="float:right;width: 200px;margin-top:15px">
           <el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="prepareConfirm()">备料确认</el-button>
           <el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
         </el-col>
         <el-col style="width:calc(100% - 600px)">
-          <div class="block" style="float:right;margin: 10px 0;">
+          <div class="block" style="margin: 10px 0;">
             <el-pagination
               :current-page="pageCurrent3"
               :page-sizes="[10, 20, 30, 40]"
@@ -57,6 +54,11 @@
           </div>
         </el-col>
       </el-row>
+      <el-row style="margin: 0;">
+        <el-col style="width: 100px">
+          <h4>领料单明细：{{ pickingListNumberShow }}</h4>
+        </el-col>
+      </el-row>
       <el-table :data="pickListTable2" highlight-current-row border style="width: 100%;" size="mini" height="400" @row-click="clickListDetail" @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" width="55"/>
         <el-table-column label="序号" align="center" type="index" width="50"/>
@@ -100,7 +102,7 @@
             {{ scope.row.出库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" min-width="140">
+        <el-table-column label="备注" align="center" width="200">
           <template slot-scope="scope">
             <el-input v-model="scope.row.备注" size="mini" @change="UpdateRemark(scope.row)"/>
           </template>
@@ -117,9 +119,9 @@
             <el-tag v-else type="warning" size="mini">未确认</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100">
+        <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="Number(scope.row.出库数量)<=0" size="mini" icon="el-icon-back" type="primary" @click="sendBack(scope.row)">归还</el-button>
+            <el-button :disabled="Number(scope.row.出库数量)<=0" size="mini" icon="el-icon-back" plain type="primary" @click="sendBack(scope.row)">归还</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -185,7 +187,7 @@
       </el-table>
     </el-card>
 
-    <el-dialog :visible.sync="dialogFormVisible1" title="物料出库" center width="380px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="物料出库" center width="380px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
         <el-form-item label="机床" prop="machineValue" label-width="100px">
           <el-select v-model="form1.machineValue" :disabled="true" filterable size="small" placeholder="机床" style="width: 200px;margin-right:10px" @change="searchGroup()">
@@ -236,7 +238,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormVisible2" title="异常记录" center width="380px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="异常记录" center width="380px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left">
         <el-form-item label="异常数量" prop="errorNumber" label-width="100px" size="small">
           <el-input v-model="form2.errorNumber" size="small" placeholder="异常数量" style="width: 200px"/>
@@ -251,7 +253,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormVisible3" title="领料确认" center width="380px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="领料确认" center width="380px">
       <el-form ref="form3" :model="form3" :rules="rules3" label-position="left">
         <el-form-item label="领料人" prop="personName" label-width="100px" size="small">
           <el-input v-model="form3.personName" readonly size="small" placeholder="领料人" style="width: 200px"/>
@@ -266,7 +268,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormVisible4" title="归还" center width="380px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="归还" center width="380px">
       <el-form ref="form4" :model="form4" :rules="rules4" label-position="left">
         <el-form-item label="仓库" prop="仓库流水号" label-width="100px" size="small">
           <el-select v-model="form4.仓库流水号" placeholder="仓库名称" @change="getLocate">
@@ -823,14 +825,11 @@ export default {
 </script>
 
 <style scoped>
-  .el-card{
-    margin-bottom: 15px;
-  }
   .el-select{
     width:200px
   }
   .el-input{
-    width:200px
+    width:120px
   }
   span{
     margin: 10px 0 10px 10px;
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index fc9dcffe..f3ca4be3 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -13,7 +13,7 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="listLoading" :data="tableDataBasic" size="mini" border style="width: 100%;" height="440">
+      <el-table v-loading="listLoading" :data="tableDataBasic" size="mini" border style="width: 100%;" height="440" @row-click="searchoutRecord">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="物料名称" align="center" min-width="120">
           <template slot-scope="scope">
@@ -45,10 +45,10 @@
             {{ scope.row.货位存量 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="250">
+        <el-table-column label="操作" align="center" width="120">
           <template slot-scope="scope" align="center">
-            <el-button size="mini" type="success" icon="el-icon-search" @click="pageCurrent2=1;pageSize2=10;total2=0;searchoutRecord(scope.row)">查看领用情况</el-button>
-            <el-button :disabled="Number(scope.row.货位存量)===0" size="mini" type="primary" icon="el-icon-sort-up" @click="parOut(scope.row)">出库</el-button>
+            <!--<el-button size="mini" type="success" icon="el-icon-search" @click="pageCurrent2=1;pageSize2=10;total2=0;searchoutRecord(scope.row)">查看领用情况</el-button>-->
+            <el-button :disabled="Number(scope.row.货位存量)===0" size="mini" plain type="primary" icon="el-icon-sort-up" @click="parOut(scope.row)">出库</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -312,6 +312,9 @@ export default {
     },
     // 离线记录查询
     searchoutRecord(row) {
+      this.pageCurrent2 = 1
+      this.pageSize2 = 10
+      this.total2 = 0
       // 物料流水号查
       this.materialNumber = row.物料流水号
       this.listLoading1 = true
@@ -399,9 +402,6 @@ export default {
 </script>
 
 <style scoped>
-  .el-card{
-    margin-bottom: 15px;
-  }
   span{
     margin: 10px 0 10px 10px;
   }
diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue
index a938735b..8c7b7d11 100644
--- a/src/views/Inventory/PurchaseInRecord/index.vue
+++ b/src/views/Inventory/PurchaseInRecord/index.vue
@@ -50,32 +50,32 @@
       </div>
       <h4 style="margin-top: 0">采购合同件</h4>
       <el-table :data="tableData1" border size="mini" style="width: 100%;" height="400">
-        <el-table-column label="名称" align="center" min-width="200">
+        <el-table-column label="名称" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="200">
+        <el-table-column label="图号或型号" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" min-width="200">
+        <el-table-column label="规格" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库数量" align="center" min-width="200">
+        <el-table-column label="入库数量" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.入库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库人" align="center" min-width="200">
+        <el-table-column label="入库人" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.入库人 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库时间" align="center" min-width="200">
+        <el-table-column label="入库时间" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.入库时间 }}
           </template>
@@ -94,32 +94,32 @@
       </div>
       <h4>离线合同件</h4>
       <el-table :data="tableData2" border size="mini" style="width: 100%;" height="400">
-        <el-table-column label="名称" align="center" min-width="200">
+        <el-table-column label="名称" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="200">
+        <el-table-column label="图号或型号" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" min-width="200">
+        <el-table-column label="规格" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库数量" align="center" min-width="200">
+        <el-table-column label="入库数量" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.入库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库人" align="center" min-width="200">
+        <el-table-column label="入库人" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.入库人 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库时间" align="center" min-width="200">
+        <el-table-column label="入库时间" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.入库时间 }}
           </template>
diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index 0cd5290b..a38243fd 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -64,32 +64,32 @@
         </el-row>
       </div>
       <el-table :data="tableData" border size="mini" style="width: 100%;" height="600">
-        <el-table-column label="名称" align="center" min-width="200">
+        <el-table-column label="名称" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="200">
+        <el-table-column label="图号或型号" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" min-width="200">
+        <el-table-column label="规格" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="出库数量" align="center" min-width="200">
+        <el-table-column label="出库数量" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.出库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="领料人" align="center" min-width="200">
+        <el-table-column label="领料人" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.领料人 }}
           </template>
         </el-table-column>
-        <el-table-column label="出库时间" align="center" min-width="200">
+        <el-table-column label="出库时间" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.出库时间 }}
           </template>
diff --git a/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue b/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue
index 64b47dc9..1b3137ba 100644
--- a/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue
+++ b/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue
@@ -57,7 +57,7 @@
             {{ scope.row.操作时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100">
+        <el-table-column label="操作" align="center" width="120" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="Number(scope.row.是否关联)===1" size="mini" type="primary" @click="connectBacklog(scope.row)">关联物料</el-button>
           </template>