From 47681a3e0d5540f223cc930c2a97226ec1638d64 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sun, 5 May 2019 19:29:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AE=9A=E9=A2=9D?=
 =?UTF-8?q?=E7=AD=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/ProcessPlanning.js    |  2 +-
 .../ProcessPlanning/index.vue                 | 22 ++++++++++++-------
 .../QuotaFormulation/index.vue                |  3 +--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js
index de2aa8ef..7cf21080 100644
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -353,7 +353,7 @@ export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num
     method: 'post',
     data: {
       type: '2',
-      name: ' ',
+      name: '车间生产管理工艺_零件工序_增加数据_同时修改工艺计划',
       param: '工艺计划流水号=' + num0 + '&工艺编号=' + num1 + '&工艺要求=' + request0 + '&原材料规格=' + spec + '&工序顺序=' + num2 + '&工序间是否外协=' + outhelp + '&工序流水号=' + num3 + '&材料流水号=' + num4 + '&重量=' + weight + '&面积=' + area + '&工艺人员编号=' + num5 + '&工艺难度等级=' + level
     }
   })
diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index b7e231b7..39bc4068 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -15,7 +15,7 @@
           :value="item.value"/>
       </el-select>
       <span>零件号:</span>
-      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchParts();searchDetail()">
+      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchDetail()">
         <el-option
           v-for="item in partNum"
           :key="item.value"
@@ -175,6 +175,7 @@
       <el-table
         v-loading="loading0"
         :data="tableData"
+        class="processTable"
         border
         style="width: 100%;max-height: 550px;"
         size="mini"
@@ -185,7 +186,6 @@
             <el-input
               v-model="scope.row.工艺名称"
               :disabled="disabled"
-              size="mini"
               readonly
               style="width:200px"
               @dblclick.native="tableSearch(scope.$index)"/>
@@ -196,7 +196,6 @@
             <el-select
               v-model="scope.row.工艺难度等级"
               :disabled="disabled"
-              size="mini"
               @change="hardEdit(scope.row)">
               <el-option v-for="item in hard" :key="item.value" :label="item.label" :value="item.value">
                 <span style="color: #8492a6; font-size: 13px">{{ item.value }}</span>
@@ -210,7 +209,6 @@
               v-model="scope.row.工艺要求"
               :rows="1"
               :disabled="disabled"
-              size="mini"
               type="textarea"
               @dblclick.native="tableSearch(scope.$index)"
               @change="requestEdit(scope.row)"/>
@@ -221,25 +219,21 @@
             <div>
               <el-button
                 :disabled="disabled"
-                size="mini"
                 icon="el-icon-arrow-up"
                 type="primary"
                 @click="upOne(scope.row)"/>
               <el-button
                 :disabled="disabled"
-                size="mini"
                 icon="el-icon-arrow-down"
                 type="primary"
                 @click="downOne(scope.row)"/>
               <el-button
                 :disabled="disabled"
-                size="mini"
                 icon="el-icon-circle-plus-outline"
                 type="primary"
                 @click="insertOne(scope.row)"/>
               <el-button
                 :disabled="disabled"
-                size="mini"
                 icon="el-icon-delete"
                 type="danger"
                 @click="deleteOne(scope.row)"/>
@@ -1451,3 +1445,15 @@ export default {
     background: oldlace;
   }
 </style>
+<style lang="scss">
+    .processTable{
+        .el-input__inner{
+            font-weight: bold;
+            font-size: 20px;
+        }
+        .el-textarea__inner{
+            font-weight: bold;
+            font-size: 20px;
+        }
+    }
+</style>
diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
index 27c2a5ce..87caf7a4 100644
--- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue
+++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
@@ -212,8 +212,8 @@ export default {
         this.partName = ''
         this.batchNum = ''
         this.material = ''
-        this.personValue = ''
         this.tableData = [] // 清主表
+        this.personChange()
       } else { // 未编制
         this.shuliang = ''
         this.isShow = false
@@ -224,7 +224,6 @@ export default {
         this.partName = ''
         this.batchNum = ''
         this.material = ''
-        this.personValue = ''
         this.tableData = [] // 清主表
         getPartnames1().then(response => {
           for (let i = 0; i < response.data.length; i++) {

From da37ac8ceb5390393e71608f12ebe8b516cf8c7e Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 6 May 2019 11:39:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TechnologyCenter/ImportChangeParts/specificationData1.vue   | 2 +-
 src/views/TechnologyCenter/ImportParts/specificationData.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index d5f25c3e..c647e67e 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -683,7 +683,7 @@ export default {
 
 <style>
   .el-table .warning-row {
-    background: oldlace;
+    background: red;
   }
 </style>
 
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index 45964b7c..eacebc97 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -640,7 +640,7 @@ export default {
 
 <style>
   .el-table .warning-row {
-    background: oldlace;
+    background: red;
   }
   .rgb196{
     background: palevioletred;

From bbf009e29e66dd3ae159cb3fc0356ccffd8961ae Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Tue, 7 May 2019 12:08:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MarketingCenter/ComprehensiveInquiryMS/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 397ed59d..d755c8f5 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -187,19 +187,19 @@
                   {{ scope.row.付款方式 }}
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="合同总金额（元）" width="150">
+              <el-table-column align="center" label="合同总金额（万元）" width="150">
                 <template slot-scope="scope">
-                  {{ scope.row.合同总金额 }}
+                  {{ scope.row.合同总金额.toFixed(2) }}
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="已到账金额（元）" width="150">
+              <el-table-column align="center" label="已到账金额（万元）" width="150">
                 <template slot-scope="scope">
-                  {{ scope.row.已支付 }}
+                  {{ scope.row.已支付.toFixed(2) }}
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="未到账金额（元）" width="150">
+              <el-table-column align="center" label="未到账金额（万元）" width="150">
                 <template slot-scope="scope">
-                  <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
+                  <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额.toFixed(2) }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="付款进度" width="150">