From 5e0d4d9c84351278e27ca99cbb63941a05c9c5e0 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Fri, 29 Mar 2019 11:43:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=BA=E5=BA=8A=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContractInformationManagement.js            |  4 ++--
 .../ContractInformationManagement/index.vue     | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index 833d38f6..10f38414 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -207,7 +207,7 @@ export function submitMachine() {
     data: {
       type: '2',
       name: '创建合同_机床名称_增加数据',
-      param: '项目流水号=' + arguments[0] + '&机床图号=' + arguments[1] + '&机床名称=' + arguments[2]
+      param: '项目流水号=' + arguments[0] + '&机床图号=' + arguments[1] + '&机床名称=' + arguments[2] + '&机床数量=' + arguments[3]
     }
   })
 }
@@ -218,7 +218,7 @@ export function editMachine() {
     data: {
       type: '2',
       name: '创建合同_机床名称_修改数据',
-      param: '机床流水号=' + arguments[0] + '&机床图号=' + arguments[1] + '&机床名称=' + arguments[2]
+      param: '机床流水号=' + arguments[0] + '&机床图号=' + arguments[1] + '&机床名称=' + arguments[2] + '&机床数量=' + arguments[3]
     }
   })
 }
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index fe387b51..b61b36a6 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -50,7 +50,7 @@
         @expand-change="selectMachine">
         <el-table-column type="expand">
           <template slot-scope="scope">
-            <el-table :data="tableData2" border style="width: 491px; text-align: center" size="mini">
+            <el-table :data="tableData2" border style="width: 571px; text-align: center" size="mini">
               <el-table-column label="设备型号" align="center" width="130">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
@@ -61,6 +61,11 @@
                   {{ scope.row.机床名称 }}
                 </template>
               </el-table-column>
+              <el-table-column label="机床数量" align="center" width="80">
+                <template slot-scope="scope">
+                  {{ scope.row.机床数量 }}
+                </template>
+              </el-table-column>
               <el-table-column label="操作" width="200" align="center">
                 <template slot-scope="scope">
                   <el-button
@@ -372,6 +377,9 @@
         <el-form-item label="设备名称" prop="设备名称">
           <el-input v-model="form1.设备名称" size="small" placeholder="请输入设备名称" style="width:200px"/>
         </el-form-item>
+        <el-form-item label="机床数量" prop="机床数量">
+          <el-input-number v-model="form1.机床数量" controls-position="right" :min="1" style="width:200px" size="small"></el-input-number>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff2('form1')">取消</el-button>
@@ -632,7 +640,8 @@ export default {
       executionProgressID: '',
       form1: {
         设备型号: '',
-        设备名称: ''
+        设备名称: '',
+        机床数量: 1
       },
       form2: {
         进度完成日期: ''
@@ -1095,9 +1104,9 @@ export default {
         this.dialogFormVisible2 = false
       }
       if (this.flag === 1) {
-        this.addTable(submitMachine, [this.projectNum, this.form1.设备型号, this.form1.设备名称], 'form1', a)
+        this.addTable(submitMachine, [this.projectNum, this.form1.设备型号, this.form1.设备名称, this.form1.机床数量], 'form1', a)
       } else {
-        this.editTable(editMachine, [this.c, this.form1.设备型号, this.form1.设备名称], 'form1', a)
+        this.editTable(editMachine, [this.c, this.form1.设备型号, this.form1.设备名称, this.form1.机床数量], 'form1', a)
       }
     },
     deleteMachine(row) {