From fb017413c0dc25f3d21f50dcbf0d99f8f221ba11 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 26 Nov 2018 14:50:39 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutsourcingPaymentPlanManagement/index.vue   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 331a9933..5e895597 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -56,12 +56,18 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="getParts">
+      <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="getParts">
         <el-table-column
           label=" "
           type="index"
           align="center"
           width="50"/>
+        <el-table-column label="外协状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付款</el-tag>
+            <el-tag v-else type="info" size="small">未付款</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="表单号" align="center" width="280px">
           <template slot-scope="scope">
             {{ scope.row.表单号 }}
@@ -425,14 +431,6 @@ export default {
       this.dialogFormVisible2 = false
       this.$refs[formName].resetFields()
     },
-    // 表格颜色
-    tableRowClassName({ row }) {
-      if (row.实际付款时间 !== '') {
-        return 'fukuan'
-      } else {
-        return ''
-      }
-    },
     // 获取表格2数据
     getParts(row) {
       this.loading2 = true

From 626147f9352bb02e112025e7a843b8247105957c Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 26 Nov 2018 15:21:25 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Inventory/InventoryManagement/index.vue             | 4 ++--
 .../Outsourcing/OutsourcingPaymentPlanManagement/index.vue    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index 7f1fa79d..f875f3bf 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -347,7 +347,7 @@ export default {
             不可用量: response.data[i].不可用量,
             仓库名称: response.data[i].仓库名称
           })
-          this.useqrcode ()
+          this.useqrcode()
         }
       })
     },
@@ -547,7 +547,7 @@ export default {
       // 生成的二维码内容，可以添加变量
       this.QueryDetail = this.num
       var canvas = document.getElementById('canvas')
-      QRCode.toCanvas(canvas, this.QueryDetail, function (error) {
+      QRCode.toCanvas(canvas, this.QueryDetail, function(error) {
         if (error) console.error(error)
         console.log('success!')
       })
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 5e895597..7c85ec31 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -62,7 +62,7 @@
           type="index"
           align="center"
           width="50"/>
-        <el-table-column label="外协状态" width="100" align="center">
+        <el-table-column label="付款状态" width="100" align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付款</el-tag>
             <el-tag v-else type="info" size="small">未付款</el-tag>

From 868d6cbe9f33f486bed6fd0c50054d59885d2ad2 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 26 Nov 2018 15:28:05 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Outsourcing/PreorderAssociation/index.vue | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index eb16c1cf..782c0d46 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -16,11 +16,9 @@
           align="center"
           width="50"/>
         <el-table-column label="零件图号" align="center" width="380px">
-
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
-
         </el-table-column>
         <el-table-column label="零件名称" align="center" width="320px">
           <template slot-scope="scope">
@@ -57,19 +55,23 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableRowClassName" height="350" style="width: 100%;" border element-loading-text="拼命加载中">
+      <el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;" border element-loading-text="拼命加载中">
         <el-table-column
           label=" "
           type="index"
           align="center"
           width="50"/>
-
         <el-table-column label="序间外协" width="100" align="center">
           <template slot-scope="scope">
             <el-checkbox v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
           </template>
         </el-table-column>
-
+        <el-table-column label="外协状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">外协</el-tag>
+            <el-tag v-else size="small">自制</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="工艺名称" align="center" width="220px">
           <template slot-scope="scope">
             {{ scope.row.工艺名称 }}
@@ -252,14 +254,6 @@ export default {
     handleCurrentChange1(val) {
       this.pageCurrent1 = val
       this.searchTable()
-    },
-    // 表格颜色
-    tableRowClassName({ row }) {
-      if (row.工序间是否外协 === 2) {
-        return 'waixie'
-      } else {
-        return ''
-      }
     }
   }
 }

From 0e225784a4f150ac736267dfe7cffdebad52cef2 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 26 Nov 2018 15:32:49 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutsourcingTaskExecution/index.vue           | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 620fa278..91ad0e0b 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -19,7 +19,13 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading2" :data="List" :row-class-name="tableRowClassName2" highlight-current-row height="350" border @row-click="searchProcess" >
+      <el-table v-loading="loading2" :data="List" highlight-current-row height="350" border @row-click="searchProcess" >
+        <el-table-column label="单据状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.单据状态==='成交'" type="success" size="small">成交</el-tag>
+            <el-tag v-else type="info" size="small">未成交</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="表单号" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.表单号 }}
@@ -1542,14 +1548,6 @@ export default {
         return ''
       }
     },
-    // 表格颜色
-    tableRowClassName2({ row }) {
-      if (row.单据状态 === '成交') {
-        return 'chengjiao'
-      } else {
-        return ''
-      }
-    },
     // 分页
     handleSizeChange(val) {
       this.pageList = 1

From 4c54c82b4aa35eb8f875a4542c850d4b7d7a8336 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 26 Nov 2018 15:48:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutsourcingDataMaintenance/index.vue      | 37 ++++++-------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
index 674b7b24..bd0a5c6e 100644
--- a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
+++ b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
@@ -22,6 +22,7 @@
         :data="tableData3"
         border
         stripe
+        size="small"
         tooltip-effect="dark"
         style="width: 100%;"
         height="650">
@@ -43,30 +44,31 @@
           <template slot-scope="scope">{{ scope.row.工艺名称简称 }}</template>
         </el-table-column>
 
+        <el-table-column label="计算方式" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="parseInt(scope.row.外协价格计算标准流水号)===1" type="success" size="small">工时</el-tag>
+            <el-tag v-if="parseInt(scope.row.外协价格计算标准流水号)===2" type="success" size="small">重量</el-tag>
+            <el-tag v-if="parseInt(scope.row.外协价格计算标准流水号)===3" type="success" size="small">面积</el-tag>
+          </template>
+        </el-table-column>
+
         <el-table-column align="center" label="工时价格(元/分)">
           <template slot-scope="scope">
-            <div :class="colorCode1[scope.$index]">
-              <h4>{{ scope.row.外协价格1 }}</h4>
-            </div>
+            {{ scope.row.外协价格1 }}
           </template>
         </el-table-column>
 
         <el-table-column align="center" label="重量价格(元/kg)">
           <template slot-scope="scope">
-            <div :class="colorCode2[scope.$index]">
-              <h4>{{ scope.row.重量价格1 }}</h4>
-            </div>
+            {{ scope.row.重量价格1 }}
           </template>
         </el-table-column>
 
         <el-table-column align="center" label="面积价格(元/m2)">
           <template slot-scope="scope">
-            <div :class="colorCode3[scope.$index]">
-              <h4>{{ scope.row.面积价格1 }}</h4>
-            </div>
+            {{ scope.row.面积价格1 }}
           </template>
         </el-table-column>
-
         <el-table-column label="操作" width="130px" align="center">
           <template slot-scope="scope">
             <el-button
@@ -227,21 +229,6 @@ export default {
       getTable(this.Code_Check, this.Code, this.Code_Check1, this.processClassificationValue, this.pageList, this.pageSize).then(response => {
         this.total = parseInt(response.data.total)
         if (response.data.rows.length !== 0) {
-          for (let i = 0; i < response.data.rows.length; i++) {
-            if (response.data.rows[i].外协价格计算标准流水号 === '1') {
-              this.colorCode1.push('mianji')
-              this.colorCode2.push('')
-              this.colorCode3.push('')
-            } else if (response.data.rows[i].外协价格计算标准流水号 === '2') {
-              this.colorCode1.push('')
-              this.colorCode2.push('mianji')
-              this.colorCode3.push('')
-            } else {
-              this.colorCode1.push('')
-              this.colorCode2.push('')
-              this.colorCode3.push('mianji')
-            }
-          }
           this.tableData3 = response.data.rows
         }
       })

From 0113ef27dba73ebfc55212d5c39e3d8d170b33fa Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 26 Nov 2018 15:59:25 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=9D=E6=AC=A1=E6=8A=95=E4=BA=A7=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=83=BD=E5=8A=9B=E5=B9=B3=E8=A1=A1=20?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E4=B8=80=E5=A0=86=E5=A4=96=E5=8D=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InitialProduction/index.vue               | 64 +++++++---------
 .../ProductionCapacityBalance/index.vue       | 76 +++++++++----------
 2 files changed, 67 insertions(+), 73 deletions(-)

diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 16eeca05..8a6617ee 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -143,24 +143,24 @@
               {{ scope.row.零件类型名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="是否外协" align="center" width="90">
-            <template slot-scope="scope">
-              <el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/>
-              外协
-            </template>
-          </el-table-column>
-          <el-table-column label="是否带料" align="center" width="90">
-            <template slot-scope="scope">
-              <el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/>
-              带料
-            </template>
-          </el-table-column>
-          <el-table-column label="是否着急" align="center" width="90">
-            <template slot-scope="scope">
-              <el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/>
-              着急
-            </template>
-          </el-table-column>
+          <!--<el-table-column label="是否外协" align="center" width="90">-->
+          <!--<template slot-scope="scope">-->
+          <!--<el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/>-->
+          <!--外协-->
+          <!--</template>-->
+          <!--</el-table-column>-->
+          <!--<el-table-column label="是否带料" align="center" width="90">-->
+          <!--<template slot-scope="scope">-->
+          <!--<el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/>-->
+          <!--带料-->
+          <!--</template>-->
+          <!--</el-table-column>-->
+          <!--<el-table-column label="是否着急" align="center" width="90">-->
+          <!--<template slot-scope="scope">-->
+          <!--<el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/>-->
+          <!--着急-->
+          <!--</template>-->
+          <!--</el-table-column>-->
           <!--<el-table-column prop="name" label="打回原因" width="170" align="center">-->
           <!--<template slot-scope="scope">-->
           <!--<el-input v-model="tableData[scope.$index].name" type="textarea" :rows="1" style="width:150px" placeholder="原因">-->
@@ -176,7 +176,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                @click="handleDele(scope.$index, scope.row, 'form1')">打回档案</el-button>
+                @click="handleDele(scope.$index, scope.row, 'form1')">打回</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -190,16 +190,10 @@
             layout="total, sizes, prev, pager, next, jumper"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
-          <el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>
-          <el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>
+          <!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
+          <!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
           <el-button type="primary" size="small" style="float:right;margin-top:10px" @click="production">投产</el-button>
         </div>
-
-        <!--<el-row>-->
-        <!--<el-checkbox v-model="checked_baitu" style="margin-top:20px">是否白图</el-checkbox>-->
-        <!--<el-checkbox v-model="checked_gaonandu">是否高难度</el-checkbox>-->
-        <!--<el-button type="primary"  size="small" @click="production" style="float:right;margin-top:10px">投产</el-button>-->
-        <!--</el-row>-->
       </div>
     </el-card>
 
@@ -236,14 +230,14 @@
             label="批次数量">
             <template slot-scope="scope">{{ scope.row.批次数量 }}</template>
           </el-table-column>
-          <el-table-column
-            label="是否外协">
-            <template slot-scope="scope">{{ scope.row.是否外协 }}</template>
-          </el-table-column>
-          <el-table-column
-            label="是否带料">
-            <template slot-scope="scope">{{ scope.row.是否带料 }}</template>
-          </el-table-column>
+          <!--<el-table-column-->
+          <!--label="是否外协">-->
+          <!--<template slot-scope="scope">{{ scope.row.是否外协 }}</template>-->
+          <!--</el-table-column>-->
+          <!--<el-table-column-->
+          <!--label="是否带料">-->
+          <!--<template slot-scope="scope">{{ scope.row.是否带料 }}</template>-->
+          <!--</el-table-column>-->
           <el-table-column
             label="机加工开始时间">
             <template slot-scope="scope">{{ scope.row.机加工开始时间 }}</template>
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index eaac00f1..22451047 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -73,12 +73,12 @@
           type="selection"
           align="center"
           width="35"/>
-        <el-table-column label="零件图号" align="center" width="200">
+        <el-table-column label="零件图号" align="center" width="300">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" align="center" width="130">
+        <el-table-column label="零件名称" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
@@ -103,42 +103,42 @@
             {{ scope.row.工序数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="是否超负荷" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.是否超负荷 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="外协" width="100" align="center">
-          <template slot-scope="scope">
-            <el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox>
-          </template>
-        </el-table-column>
-        <el-table-column label="加工件合格" align="center" width="230">
-          <template slot-scope="scope">
-            <el-date-picker
-              v-model="tableData[scope.$index].加工件合格时间"
-              size="mini"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择加工件合格时间"
-              @change="timeChange(scope.row)"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="板焊结束" width="150" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.板焊 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="200px" align="center" fixed="right">
-          <template slot-scope="scope" align="center">
-            <el-button
-              size="mini"
-              type="primary"
-              class="el-icon-edit"
-              @click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>
-              <!--<el-button size="mini" type="primary" @click="inBatches">分批</el-button>-->
-          </template>
-        </el-table-column>
+        <!--<el-table-column label="是否超负荷" align="center" width="100">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.是否超负荷 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="外协" width="100" align="center">-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox>-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="加工件合格" align="center" width="230">-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-date-picker-->
+        <!--v-model="tableData[scope.$index].加工件合格时间"-->
+        <!--size="mini"-->
+        <!--type="date"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--placeholder="选择加工件合格时间"-->
+        <!--@change="timeChange(scope.row)"/>-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="板焊结束" width="150" align="center">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.板焊 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column label="操作" width="200px" align="center" fixed="right">-->
+        <!--<template slot-scope="scope" align="center">-->
+        <!--<el-button-->
+        <!--size="mini"-->
+        <!--type="primary"-->
+        <!--class="el-icon-edit"-->
+        <!--@click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>-->
+        <!--&lt;!&ndash;<el-button size="mini" type="primary" @click="inBatches">分批</el-button>&ndash;&gt;-->
+        <!--</template>-->
+        <!--</el-table-column>-->
       </el-table>
       <div v-if="是否扫描 === false" class="block" style="margin-top: 10px;">
         <el-pagination