From 109868411a8aa761432659ab43e67932b8c30485 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 20 Nov 2018 08:55:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index a6f5bd35..f5f66a2d 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -8,7 +8,7 @@
     </el-card>
 
     <el-card>
-      <el-table :data="List" highlight-current-row border>
+      <el-table :data="List" style="height: 550px" border size="small">
         <el-table-column label="设备名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.设备名称 }}

From ba37d5f03d37797840882dceffa28d242d01db8d Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 22 Nov 2018 15:30:10 +0800
Subject: [PATCH 2/3] =?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

---
 .../WorkshopEquipmentManagement/index.vue                 | 3 +--
 src/views/Outsourcing/OutsourcingTaskExecution/index.vue  | 8 +++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index f5f66a2d..22486e19 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -184,8 +184,7 @@ export default {
         { value: '3', label: 3 },
         { value: '4', label: 4 }],
       form: {
-        设备名称: '',
-        设备编号: '',
+        设备名称: '', 设备编号: '',
         设备型号: '',
         设备性能指标: '',
         设备加工能力: '',
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index c95d71d2..cc77f1c8 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -609,7 +609,7 @@ export default {
       this.List3 = []
       getTable(this.num, this.formNumber, this.num1, this.ManufactorNumber, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize).then(response => {
         this.total = parseInt(response.data.total)
-        for (let i = 0; i < response.data.length; i++) {
+        for (let i = 0; i < response.data.rows.length; i++) {
           if (response.data.rows[i].任务下达日期 !== null) {
             response.data.rows[i].任务下达日期 = response.data.rows[i].任务下达日期.substr(0, 10)
           }
@@ -871,7 +871,7 @@ export default {
       sums[4] = '材料费:'
       sums[6] = '其他费用:'
       sums[8] = '运费:'
-      sums[9] = this.freight
+      sums[9] = parseInt(this.freight)
       sums[10] = '合计:'
       for (let i = 0; i < data.length; i++) {
         sums[24] += Math.round(parseFloat(data[i].外协预算总价格) * 100) / 100
@@ -1046,6 +1046,7 @@ export default {
         })
       }
     },
+    // 确定价格
     confirmPrice() {
       this.code1 = 0
       for (let i = 0; i < this.List3.length; i++) {
@@ -1168,6 +1169,7 @@ export default {
         })
       }
     },
+    // 成交
     Deal() {
       this.documentStatus = 2
       this.sign = 1
@@ -1227,7 +1229,7 @@ export default {
     },
     // 提交编辑
     submitEdit() {
-      editData(this.Number, this.ManufactorNumber1, this.form.运费, this.documentStatus, this.sign, this.Explain).then(response => {
+      editData(this.Number, this.ManufactorNumber1, this.form.运费, this.documentStatus, 1, this.Explain).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('编辑成功')
           this.dialogFormVisible = false

From 393e4b6ffdd32771036a40978c1095979d5f4bde Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 22 Nov 2018 15:45:20 +0800
Subject: [PATCH 3/3] =?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

---
 src/views/Outsourcing/OutsourcingTaskExecution/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index cc77f1c8..620fa278 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -5,7 +5,9 @@
       <span>表单号:</span>
       <el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px"/>
       <span>外协厂家:</span>
-      <el-input v-model="manufacturers" readonly size="small" placeholder="外协厂家" style="width:200px" clearable @dblclick.native="onFocus1();param=0"/>
+      <el-input v-model="manufacturers" readonly size="small" placeholder="外协厂家" style="width:250px" clearable>
+        <el-button slot="append" icon="el-icon-search" @click="onFocus1();param=0"/>
+      </el-input>
       <span>下达任务日期:</span>
       <el-date-picker
         v-model="time"
@@ -446,8 +448,12 @@ import { getTable, getData1, getTable1, getprocedure, searchManufactor, sparePar
 import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
 import { convertCurrency } from '@/vendor/int2Chinese'
 import { mapGetters } from 'vuex'
+import elInput from 'element-ui/packages/input'
 
 export default {
+  components: {
+    elInput
+  },
   data() {
     return {
       bianliang: [],