From 6bb56595b204daf9e68416ef2afc857fc04a67c4 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Thu, 23 Apr 2020 12:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/MarketingCenter/BidBond.js                           | 4 ++--
 src/api/WorkshopProcurement/PurchaseContractRequestFund1.js  | 2 +-
 src/views/Inventory/MaterialOut/index.vue                    | 5 +++--
 src/views/Inventory/PickingListApproval/index.vue            | 2 +-
 src/views/ManufacturingCenter/ProcessingStatusNew/index.vue  | 2 +-
 .../PurchaseContractRequestFund1/index.vue                   | 1 +
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/api/MarketingCenter/BidBond.js b/src/api/MarketingCenter/BidBond.js
index c0bb6207..669a6b4f 100644
--- a/src/api/MarketingCenter/BidBond.js
+++ b/src/api/MarketingCenter/BidBond.js
@@ -23,7 +23,7 @@ export function selectBidBond() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '投标保证金管理_投标保证金查询',
+      name: '投标保证金管理_投标保证金查询_新',
       param: '保金类型_check=' + arguments[0] + '&保金类型=' + arguments[1] + '&投标人_check=' + arguments[2] + '&投标人=' + arguments[3] + '&招标企业_check=' + arguments[4] + '&招标企业=' + arguments[5] + '&开始日期_check=' + arguments[6] + '&开始日期=' + arguments[7] + '&结束日期_check=' + arguments[8] + '&结束日期=' + arguments[9],
       Pagination: arguments[10] + '&' + arguments[11]
     }
@@ -37,7 +37,7 @@ export function selectBidBond_excel() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '投标保证金管理_投标保证金查询',
+      name: '投标保证金管理_投标保证金查询_新',
       param: '保金类型_check=' + arguments[0] + '&保金类型=' + arguments[1] + '&投标人_check=' + arguments[2] + '&投标人=' + arguments[3] + '&招标企业_check=' + arguments[4] + '&招标企业=' + arguments[5] + '&开始日期_check=' + arguments[6] + '&开始日期=' + arguments[7] + '&结束日期_check=' + arguments[8] + '&结束日期=' + arguments[9]
     }
   })
diff --git a/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js b/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js
index d992ee5b..7ab579a1 100644
--- a/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js
+++ b/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js
@@ -81,7 +81,7 @@ export function searchPurchaseContract(check, num) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间采购管理_采购合同_查询数据_请款',
-      param: `供应商流水号_check=${check}&供应商流水号=${num}`
+      param: `供应商流水号_check=${check}&供应商流水号=${num}&供应商名称_check=0`
     }
   })
 }
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 603ec5f4..f3880037 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -88,7 +88,7 @@
                 </el-table-column>
                 <el-table-column label="库存" align="center" width="50">
                   <template slot-scope="scope">
-                    {{ scope.row.货位存量1 }}
+                    {{ scope.row.货位存量1 ? scope.row.货位存量1 : 0 }}
                   </template>
                 </el-table-column>
                 <el-table-column label="已领" align="center" width="50">
@@ -735,7 +735,8 @@ export default {
     background: #D8DDE6 !important;
   }
   .el-table .weilingwan-row {
-    background: #E9F0F9 !important;
+    background: #4395D0 !important;
+    color: white;
   }
 </style>
 
diff --git a/src/views/Inventory/PickingListApproval/index.vue b/src/views/Inventory/PickingListApproval/index.vue
index 15349e42..adb64729 100644
--- a/src/views/Inventory/PickingListApproval/index.vue
+++ b/src/views/Inventory/PickingListApproval/index.vue
@@ -87,7 +87,7 @@
         </el-table-column>
         <el-table-column label="已领数量" align="center" min-width="70">
           <template slot-scope="scope">
-            {{ scope.row.出库数量 }}
+            {{ scope.row.出库数量1 }}
           </template>
         </el-table-column>
         <el-table-column v-if="true" label="备料确认" align="center" width="100">
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index e9ddf7e0..a3e3aa05 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -701,6 +701,6 @@ export default {
     background: #9bd7fc !important;
   }
   .disCompleteColor{
-    background: rgb(233,240,250) !important;
+    background: #C6D7B3 !important;
   }
 </style>
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index 1374b0da..a469fd84 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -314,6 +314,7 @@ export default {
       this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '')
       this.supplierValue ? check2 = 1 : check2 = 0
       searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue).then(response => {
+        console.log(response, 111)
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })