From 55d326313c5649dcb05c7030def758db26b37383 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 17 Dec 2018 18:21:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=80=BB=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/ProjectTotalSearch.js    |  2 +-
 .../ProjectTotalSearch/index.vue              | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/api/PurchasingCenter/ProjectTotalSearch.js b/src/api/PurchasingCenter/ProjectTotalSearch.js
index 1e46e7a1..8e4a7c1e 100644
--- a/src/api/PurchasingCenter/ProjectTotalSearch.js
+++ b/src/api/PurchasingCenter/ProjectTotalSearch.js
@@ -18,7 +18,7 @@ export function searchProjectTotal(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_项目总价_明细_查询数据',
+      name: '采购管理_项目采购总价_查询数据',
       param: `项目流水号=${num}`
     }
   })
diff --git a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
index cf7b6e17..369e8a07 100644
--- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
+++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
@@ -25,19 +25,19 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料名称" align="center" min-width="100">
+        <el-table-column label="图号" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料型号" align="center" min-width="100">
+        <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
+            {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="100">
+        <el-table-column label="规格" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
+            {{ scope.row.规格 }}
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
@@ -50,9 +50,14 @@
             {{ scope.row.单价 }}
           </template>
         </el-table-column>
-        <el-table-column label="小计(元)" align="center" min-width="100" prop="金额">
+        <el-table-column label="优惠后单价" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.金额 }}
+            {{ scope.row.优惠后单价 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠后小计(元)" align="center" min-width="100" prop="金额">
+          <template slot-scope="scope">
+            {{ scope.row.金额 = Number(scope.row.优惠后单价) * Number(scope.row.数量) }}
           </template>
         </el-table-column>
       </el-table>

From bccc982ab69f6ac7be7a485b52d3a9d10f21a0c5 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 17 Dec 2018 19:46:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=9D=E6=AC=A1=E6=8A=95=E4=BA=A7?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/InitialProduction/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index c8c94e65..3d29e001 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -86,7 +86,7 @@
             </el-col>
             <el-col :span="1" class="line">～</el-col>
             <el-col :span="11">
-              <el-date-picker :default-time="['12:00:00']" v-model="time_machiningFinish" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
+              <el-date-picker v-model="time_machiningFinish" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
             </el-col>
           </el-form-item>
         </el-form>