From b73e85447f6370ac935abc85a07be23a53286ea9 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Thu, 6 Dec 2018 19:54:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=90=88=E5=90=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContractInformationManagement.js          |  19 ++-
 .../ContractInformationManagement/index.vue   | 109 +++++++++++++++---
 2 files changed, 107 insertions(+), 21 deletions(-)

diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index 4bc92b69..68abed60 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -20,14 +20,14 @@ export function initMarketingManager() {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同信息管理_合同信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -61,7 +61,7 @@ export function addList() {
     data: {
       type: '2',
       name: '基础表_合同信息表_增加数据',
-      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9]
+      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10]
     }
   })
 }
@@ -92,7 +92,7 @@ export function editchar() {
     data: {
       type: '2',
       name: '合同信息管理_合同信息_编辑',
-      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10]
+      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11]
     }
   })
 }
@@ -243,3 +243,14 @@ export function money() {
     }
   })
 }
+export function changeExecutionProgressID() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '创建合同_改变执行进度',
+      param: '执行进度流水号=' + arguments[0] + '&项目流水号=' + arguments[1]
+    }
+  })
+}
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 053e523d..2d06d70c 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>项目名称</span>
+      <span>项目名称：</span>
       <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right: 10px" size="small">
         <el-option
           v-for="item in entryName"
@@ -9,8 +9,24 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span style="margin-left: 10px">销售经理</span>
+      <span style="margin-left: 10px">销售经理：</span>
       <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
+      <span style="margin-left: 10px">开始日期：</span>
+      <el-date-picker
+        v-model="startTime"
+        style="width: 200px;"
+        value-format="yyyy-MM-dd"
+        size="small"
+        type="date"
+        placeholder="请选择开始日期"/>
+      <span style="margin-left: 10px">结束日期：</span>
+      <el-date-picker
+        v-model="endTime"
+        style="width: 200px;"
+        value-format="yyyy-MM-dd"
+        size="small"
+        type="date"
+        placeholder="请选择结束日期"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
       <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
     </el-card>
@@ -70,6 +86,11 @@
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="合同签订日期" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.合同签订日期 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="图纸会签节点" width="150">
           <template slot-scope="scope">
             {{ scope.row.图纸会签节点 }}
@@ -147,16 +168,31 @@
       </div>
     </el-card>
     <el-card v-show="ExecutionProgressShow">
-      <h4>合同进度</h4>
-      <el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">
-        <el-step title="签订合同" icon="el-icon-edit-outline"/>
-        <el-step title="图纸会签" icon="el-icon-picture-outline"/>
-        <el-step title="加工制造" icon="el-icon-setting"/>
-        <el-step title="预备验收" icon="el-icon-view"/>
-        <el-step title="设备发货" icon="el-icon-sold-out"/>
-        <el-step title="安装调试" icon="el-icon-time"/>
-        <el-step title="项目验收" icon="el-icon-circle-check-outline"/>
-      </el-steps>
+      <div>
+        <h4 style="display: inline-block">合同进度</h4>
+        <div style="display: inline-block; float:right">
+          <span>已完成进度：</span>
+          <el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">
+            <el-option
+              v-for="item in executionProgress"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </div>
+      </div>
+      <div>
+        <el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">
+          <el-step title="签订合同" icon="el-icon-edit-outline"/>
+          <el-step title="图纸会签" icon="el-icon-picture-outline"/>
+          <el-step title="加工制造" icon="el-icon-setting"/>
+          <el-step title="预备验收" icon="el-icon-view"/>
+          <el-step title="设备发货" icon="el-icon-sold-out"/>
+          <el-step title="安装调试" icon="el-icon-time"/>
+          <el-step title="项目验收" icon="el-icon-circle-check-outline"/>
+          <el-step title="质保期" icon="el-icon-service"/>
+        </el-steps>
+      </div>
     </el-card>
     <el-card v-show="uploader" style="min-height: 145px;">
       <h4>纪要文件</h4>
@@ -214,6 +250,16 @@
               <el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同签订日期" prop="contractSigningDate">
+              <el-date-picker
+                v-model="form.contractSigningDate"
+                value-format="yyyy-MM-dd"
+                size="small"
+                type="date"
+                placeholder="请选择图纸会签节点"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="图纸会签节点" prop="drawingJointSignNode">
               <el-date-picker
@@ -418,7 +464,7 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
+import { changeExecutionProgressID, initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
 import { upload, download } from '@/utils/request'
 export default {
   components: {
@@ -429,6 +475,10 @@ export default {
       a: 1,
       b: 1,
       c: 1,
+      startTime: '',
+      startTime_check: null,
+      endTime: '',
+      endTime_check: null,
       money: [],
       expands: [],
       flag: '',
@@ -443,6 +493,7 @@ export default {
       id1: '',
       action: '',
       peoplename: '',
+      peopleid_check: null,
       peopleid: '',
       dataPeople: [],
       ListPeople: [],
@@ -456,6 +507,7 @@ export default {
       listLoading: false,
       showFileList: true,
       entryNameValue: '', // 项目名称下拉框
+      entryNameValue_check: null,
       entryName: [], // 项目名称下拉框数据
       list1: [], // 项目名称临时存储
       MarketingManagerValue: '', // 营销经理下拉框
@@ -479,6 +531,7 @@ export default {
       form: {
         MarketingManagerValue: '',
         EntryName: '', // 项目名称
+        contractSigningDate: '',
         drawingJointSignNode: '', // 图纸会签节点
         EquipmentPreAcceptanceNode: '', // 设备预验收节点
         ConsignmentNode: '', //  发货节点
@@ -488,6 +541,7 @@ export default {
         remark: '',
         付款方式: 1
       },
+      executionProgressID: '',
       form1: {
         设备型号: '',
         设备名称: ''
@@ -502,6 +556,7 @@ export default {
         EntryName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
         MarketingManagerValue: [{ required: true, message: '请选择营销经理', trigger: 'change' }],
         executionProgressID: [{ required: true, message: '请选择已完成进度', trigger: 'change' }],
+        contractSigningDate: [{ required: true, message: '请选择合同签订日期', trigger: 'change' }],
         付款方式: [{ required: true, message: '请选择付款方式', trigger: 'change' }]
       },
       rules1: { // 表单验证规则
@@ -522,6 +577,7 @@ export default {
         this.dataPeople = tree(data, 0)
       })
       this.getSelect(initProject, ['项目名称', '项目流水号'], 'entryName')
+      this.executionProgressID = this.form.executionProgressID
       this.getSelect(executionProgressID, ['执行进度名', '执行进度ID'], 'executionProgress')
       this.getSelect(selectProvince, ['省份', '省份流水号'], 'Province')
       this.getSelect(money, ['付款方式', '付款方式代码'], 'money')
@@ -559,11 +615,15 @@ export default {
       this.peoplename = ''
     },
     fetchTableData1() {
+      if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
+      if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
+      if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
+      if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
       this.ExecutionProgressShow = false
       this.uploader = false
       this.ExecutionProgress = null
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid], ['tableData1', 'total', 'listLoading'])
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime], ['tableData1', 'total', 'listLoading'])
     },
     fetchExecutionProgressdata(row) {
       this.projectNum = row.项目流水号
@@ -573,6 +633,7 @@ export default {
       this.getFileData(this.projectNum)
       fetchExecutionProgress(row.项目流水号).then(response => {
         this.ExecutionProgress = response.data[0].执行进度流水号
+        this.executionProgressID = response.data[0].执行进度流水号
       })
     },
     selectMachine(row) {
@@ -632,7 +693,7 @@ export default {
       this.disabled = false
     },
     addTableData1() {
-      addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式).then(response => {
+      addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')
@@ -665,9 +726,10 @@ export default {
       })
     },
     handleEdit(row) {
-      console.log(row)
+      this.editForm(row, 'form')
       this.title = '编辑'
       this.dialogFormVisible1 = true
+      this.form.contractSigningDate = row.合同签订日期
       this.form.contractNumber = row.合同编号
       this.form.EntryName = row.项目名称
       this.form.drawingJointSignNode = row.图纸会签节点
@@ -675,6 +737,7 @@ export default {
       this.form.ConsignmentNode = row.发货节点
       this.form.installDebugNode = row.安装调试节点
       this.form.MarketingManagerValue = row.营销经理
+      this.id1 = row.营销经理流水号
       this.form.executionProgressID = parseInt(row.执行进度流水号)
       this.form.customerName = row.客户名称
       this.hetongID = row.项目流水号
@@ -686,7 +749,7 @@ export default {
       this.infoDisable = false
     },
     chaEdit() {
-      editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式).then(response => {
+      editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('信息更新成功')
@@ -809,6 +872,18 @@ export default {
         })
       }
       this.deleteRow(delMachine, row.机床流水号, a)
+    },
+    changeExecutionProgressID() {
+      changeExecutionProgressID(this.executionProgressID, this.projectNum).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('信息更新成功')
+          fetchExecutionProgress(this.projectNum).then(response => {
+            this.ExecutionProgress = response.data[0].执行进度流水号
+          })
+        } else {
+          this.$message.error('信息更新失败')
+        }
+      })
     }
   }
 }