From 67fefc10b4084a337ce9f09ec0bf1756899e81aa Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 11 Oct 2019 18:54:46 +0800
Subject: [PATCH] a

---
 .../Inventory/OfflinePartsStorage/index.vue   | 26 ++++++++---------
 .../Inventory/PurchasePartsStorage/index.vue  | 29 ++++++++++---------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue
index 9b075e7c..6a503296 100644
--- a/src/views/Inventory/OfflinePartsStorage/index.vue
+++ b/src/views/Inventory/OfflinePartsStorage/index.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card>
       <span>供应商：</span>
-      <el-select v-model="supplierValue" placeholder="请选择供应商" filterable size="small" style="width: 200px" @change="supplierChange();searchContractDetail()">
+      <el-select v-model="supplierValue" placeholder="请选择供应商" filterable size="small" style="width: 180px" @change="supplierChange();searchContractDetail()">
         <el-option
           v-for="item in supplier"
           :key="item.value"
@@ -10,7 +10,7 @@
           :value="item.value"/>
       </el-select>
       <span style="margin-left: 5px">合同：</span>
-      <el-select v-model="contractValue" placeholder="请选择合同" filterable clearable size="small" style="width: 200px" @change="searchContractDetail()">
+      <el-select v-model="contractValue" placeholder="请选择合同" filterable clearable size="small" style="width: 180px" @change="searchContractDetail()">
         <el-option
           v-for="item in contract"
           :key="item.value"
@@ -22,27 +22,27 @@
     <el-card>
       <el-table ref="multipleTable" :data="table1" border size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
-        <el-table-column label="合同编号" width="150px" align="center" show-overflow-tooltip prop="合同编号">
+        <el-table-column label="合同编号" width="120px" align="center" show-overflow-tooltip prop="合同编号">
           <template slot-scope="scope">
             {{ scope.row.离线合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="名称" width="200px" align="center" show-overflow-tooltip prop="物料名称">
+        <el-table-column label="名称" width="150px" align="center" show-overflow-tooltip prop="物料名称">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格型号" width="300px" align="center" show-overflow-tooltip>
+        <el-table-column label="规格型号" width="180px" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料规格 + '&nbsp;' + scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购数量" align="center" width="180" show-overflow-tooltip prop="数量">
+        <el-table-column label="采购数量" align="center" width="100" show-overflow-tooltip prop="数量">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="已到数量" align="center" width="180" show-overflow-tooltip prop="到货数量">
+        <el-table-column label="已到数量" align="center" width="100" show-overflow-tooltip prop="到货数量">
           <template slot-scope="scope">
             {{ scope.row.到货数量 }}
           </template>
@@ -53,8 +53,8 @@
           </template>
         </el-table-column>
       </el-table>
-      <span>仓库名称：</span>
-      <el-select v-model="inventoryNumber" style="width: 200px" filterable size="small" placeholder="仓库名称" @change="getLocate">
+      <span v-show="false">仓库名称：</span>
+      <el-select v-show="false" v-model="inventoryNumber" style="width: 200px" filterable size="small" placeholder="仓库名称" @change="getLocate">
         <el-option
           v-for="item in inventoryName"
           :key="item.value"
@@ -105,7 +105,7 @@ export default {
   },
   mounted() {
     this.initSupplier()
-    this.getHouse()
+    this.getLocate()
     this.getpeopleid()
   },
   methods: {
@@ -130,17 +130,17 @@ export default {
     },
     // 获取货位
     async getLocate() {
+      this.locateNumber = ''
+      this.locateName = []
       const param = {
         url: url,
         method: 'post',
         data: {
           type: '1',
-          name: '库存管理_货位主文件_查询数据',
-          param: `仓库流水号=${this.inventoryNumber}`
+          name: '库存管理_货位主文件_查询数据_查询全部'
         }
       }
       const res = await axios(param)
-      this.locateName = []
       for (let i = 0; i < res.data.length; i++) {
         this.locateName.push({
           label: res.data[i].货位名称,
diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue
index cdbfc0a2..a0524959 100644
--- a/src/views/Inventory/PurchasePartsStorage/index.vue
+++ b/src/views/Inventory/PurchasePartsStorage/index.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card>
       <span>供应商：</span>
-      <el-select v-model="supplierValue" placeholder="请选择供应商" filterable size="small" style="width: 200px" @change="supplierChange();searchContractDetail()">
+      <el-select v-model="supplierValue" placeholder="请选择供应商" filterable size="small" style="width: 180px" @change="supplierChange();searchContractDetail()">
         <el-option
           v-for="item in supplier"
           :key="item.value"
@@ -10,7 +10,7 @@
           :value="item.value"/>
       </el-select>
       <span style="margin-left: 5px">合同：</span>
-      <el-select v-model="contractValue" placeholder="请选择合同" filterable clearable size="small" style="width: 200px" @change="searchContractDetail()">
+      <el-select v-model="contractValue" placeholder="请选择合同" filterable clearable size="small" style="width: 180px" @change="searchContractDetail()">
         <el-option
           v-for="item in contract"
           :key="item.value"
@@ -18,7 +18,7 @@
           :value="item.value"/>
       </el-select>
       <span style="margin-left: 5px">合同类型：</span>
-      <el-select v-model="TypeValue" filterable size="small" placeholder="合同类型" @change="contractTypeChange">
+      <el-select v-model="TypeValue" filterable size="small" placeholder="合同类型" style="width: 180px" @change="contractTypeChange">
         <el-option
           v-for="item in Type"
           :key="item.value"
@@ -30,27 +30,27 @@
     <el-card>
       <el-table ref="multipleTable" :data="table1" border size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
-        <el-table-column label="合同编号" width="150px" align="center" show-overflow-tooltip prop="合同编号">
+        <el-table-column label="合同编号" width="120px" align="center" show-overflow-tooltip prop="合同编号">
           <template slot-scope="scope">
             {{ scope.row.合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="名称" width="200px" align="center" show-overflow-tooltip prop="物料名称">
+        <el-table-column label="名称" width="150px" align="center" show-overflow-tooltip prop="物料名称">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格型号" width="300px" align="center" show-overflow-tooltip>
+        <el-table-column label="规格型号" width="180px" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料规格 + '&nbsp;' + scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购数量" align="center" width="180" show-overflow-tooltip prop="数量">
+        <el-table-column label="采购数量" align="center" width="100" show-overflow-tooltip prop="数量">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="已到数量" align="center" width="180" show-overflow-tooltip prop="到货数量">
+        <el-table-column label="已到数量" align="center" width="100" show-overflow-tooltip prop="到货数量">
           <template slot-scope="scope">
             {{ scope.row.到货数量 }}
           </template>
@@ -61,8 +61,8 @@
           </template>
         </el-table-column>
       </el-table>
-      <span>仓库名称：</span>
-      <el-select v-model="inventoryNumber" style="width: 200px" filterable size="small" placeholder="仓库名称" @change="getLocate">
+      <span v-show="false">仓库名称：</span>
+      <el-select v-show="false" v-model="inventoryNumber" style="width: 200px" filterable size="small" placeholder="仓库名称" @change="getLocate">
         <el-option
           v-for="item in inventoryName"
           :key="item.value"
@@ -116,7 +116,7 @@ export default {
   },
   created() {
     this.initSupplier()
-    this.getHouse()
+    this.getLocate()
     this.getpeopleid()
   },
   methods: {
@@ -145,17 +145,18 @@ export default {
     },
     // 获取货位
     async getLocate() {
+      this.locateNumber = ''
+      this.locateName = []
       const param = {
         url: url,
         method: 'post',
         data: {
           type: '1',
-          name: '库存管理_货位主文件_查询数据',
-          param: `仓库流水号=${this.inventoryNumber}`
+          name: '库存管理_货位主文件_查询数据_查询全部'
+          // param: `仓库流水号=${this.inventoryNumber}`
         }
       }
       const res = await axios(param)
-      this.locateName = []
       for (let i = 0; i < res.data.length; i++) {
         this.locateName.push({
           label: res.data[i].货位名称,