From 807333efe801d91446d153068759cde871b0ca52 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Tue, 11 Dec 2018 19:45:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/MarketingCenter/CRM.js                |   8 +-
 src/api/MarketingCenter/InvoiceRecord.js      |  35 ++
 src/icons/svg/InvoiceRecord.svg               |   7 +
 src/views/MarketingCenter/CRM/index.vue       |  28 +-
 .../ContractCapitalManagement/index.vue       |  26 +-
 .../MarketingCenter/InvoiceRecord/index.vue   | 300 ++++++++++++++++++
 6 files changed, 379 insertions(+), 25 deletions(-)
 create mode 100644 src/api/MarketingCenter/InvoiceRecord.js
 create mode 100644 src/icons/svg/InvoiceRecord.svg
 create mode 100644 src/views/MarketingCenter/InvoiceRecord/index.vue

diff --git a/src/api/MarketingCenter/CRM.js b/src/api/MarketingCenter/CRM.js
index 54dab127..7b667e45 100644
--- a/src/api/MarketingCenter/CRM.js
+++ b/src/api/MarketingCenter/CRM.js
@@ -149,14 +149,14 @@ export function editMarketingManager(MarketingManagerId, AdressID) {
     }
   })
 }
-export function addCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark) {
+export function addCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, OpeningBank) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '客户关系管理系统_客户_增加数据_MESWORK',
-      param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark
+      param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&开户行=' + OpeningBank
     }
   })
 }
@@ -171,14 +171,14 @@ export function selectAdressOfID(AdressID) {
     }
   })
 }
-export function editCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, ID) {
+export function editCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, ID, OpeningBank) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '客户关系管理系统_客户_修改数据_MESWORK',
-      param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&客户流水号=' + ID
+      param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&客户流水号=' + ID + '&开户行=' + OpeningBank
     }
   })
 }
diff --git a/src/api/MarketingCenter/InvoiceRecord.js b/src/api/MarketingCenter/InvoiceRecord.js
new file mode 100644
index 00000000..7d661ed6
--- /dev/null
+++ b/src/api/MarketingCenter/InvoiceRecord.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_项目名称_总_查询'
+    }
+  })
+}
+export function searchTableData1(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&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date',
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function searchTableData2(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_开票记录_查询',
+      param: '项目流水号=' + num1 + '=int'
+    }
+  })
+}
diff --git a/src/icons/svg/InvoiceRecord.svg b/src/icons/svg/InvoiceRecord.svg
new file mode 100644
index 00000000..cd5cb717
--- /dev/null
+++ b/src/icons/svg/InvoiceRecord.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Svg Vector Icons : http://www.sfont.cn -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<metadata> Svg Vector Icons : http://www.sfont.cn </metadata>
+<g><path d="M288.3,732.6l54.7,60.6c-96.1,59-192.8,114.6-290.2,167c-11.3-19.9-25.5-43.1-42.7-69.6C116.7,840.9,209.4,788.2,288.3,732.6z M25.9,649.1H990v61.6H554.7v131.2c0,78.2-38.8,117.6-116.3,118.3c-35.1,0-78.5-0.3-130.2-1c-2.7-21.9-7-48-12.9-78.5c50.4,4.6,90.8,7,121.3,7c41.7,0,62.6-20.5,62.6-61.6V710.7H25.9V649.1z M96.5,193.9h248.5v-92.4H43.8V39.8h926.3v61.6H667v92.4h249.5v276.3h-69.6v-31.8l-680.8,0v31.8H96.5L96.5,193.9L96.5,193.9z M97.5,512.9h821v61.6h-821V512.9z M166,378.7h178.9V253.5H166V378.7z M416.5,193.9h178.9v-92.4H416.5V193.9z M416.5,378.7h178.9V253.5H416.5V378.7z M648.1,799.2l41.7-61.6C783.3,782.6,881.3,832,984,885.6l-46.7,73.5C833.3,898.2,736.9,844.9,648.1,799.2z M846.9,253.5H667v125.2h179.9L846.9,253.5L846.9,253.5z"/></g>
+</svg>
\ No newline at end of file
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 9ad99674..bf9fafa8 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -118,7 +118,7 @@
                 {{ scope.row.电话 }}
               </template>
             </el-table-column>
-            <el-table-column label="传真" align="center" width="140px">
+            <el-table-column label="开票电话" align="center" width="140px">
               <template slot-scope="scope">
                 {{ scope.row.传真 }}
               </template>
@@ -138,6 +138,11 @@
                 {{ scope.row.税号 }}
               </template>
             </el-table-column>
+            <el-table-column label="开户行" align="center" width="200px">
+              <template slot-scope="scope">
+                {{ scope.row.开户行 }}
+              </template>
+            </el-table-column>
             <el-table-column label="银行账号" align="center" width="200px">
               <template slot-scope="scope">
                 {{ scope.row.银行账号 }}
@@ -260,8 +265,8 @@
             </el-form>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="传真:" prop="传真">
-              <el-input v-model="form2.传真" clearable size="small" style="width:200px" placeholder="请输入传真"/>
+            <el-form-item label="开票电话:" prop="传真">
+              <el-input v-model="form2.传真" clearable size="small" style="width:200px" placeholder="请输入开票电话"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -295,9 +300,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="开户行:" prop="开户行">
+              <el-input v-model="form2.开户行" clearable size="small" style="width:200px" placeholder="请输入开户行"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="备注:" prop="备注">
-              <el-input v-model="form2.备注" clearable size="small" style="width:530px" placeholder="请输入备注"/>
+              <el-input v-model="form2.备注" clearable size="small" style="width:200px" placeholder="请输入备注"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -363,7 +373,8 @@ export default {
         税号: '',
         银行账号: '',
         信用等级: 1,
-        备注: ''
+        备注: '',
+        开户行: ''
       },
       rules1: { // 表单验证规则
         营销经理: [{ required: true, message: '请选择营销经理', trigger: 'change' }]
@@ -548,6 +559,7 @@ export default {
       this.form2.信用等级 = parseInt(row.价值评估流水号)
       this.form2.备注 = row.备注
       this.c = row.客户流水号
+      this.form2.开户行 = row.开户行
     },
     submit2() {
       function a() {
@@ -555,9 +567,9 @@ export default {
         this.getTable(selectCustomer, [this.AdressID, this.pageCurrent, this.pageSize], ['tableData2', 'total', 'loading2'])
       }
       if (this.flag1 === 1) {
-        this.addTable(addCustomer, [this.AdressID, this.form2.客户名称, this.form2.联系电话, this.form2.传真, this.form2.联系地址, this.form2.联系人, this.form2.电子邮箱, this.form2.银行账号, this.form2.税号, this.form2.信用等级, this.form2.备注], 'form2', a)
+        this.addTable(addCustomer, [this.AdressID, this.form2.客户名称, this.form2.联系电话, this.form2.传真, this.form2.联系地址, this.form2.联系人, this.form2.电子邮箱, this.form2.银行账号, this.form2.税号, this.form2.信用等级, this.form2.备注, this.form2.开户行], 'form2', a)
       } else {
-        this.editTable(editCustomer, [this.AdressID, this.form2.客户名称, this.form2.联系电话, this.form2.传真, this.form2.联系地址, this.form2.联系人, this.form2.电子邮箱, this.form2.银行账号, this.form2.税号, this.form2.信用等级, this.form2.备注, this.c], 'form2', a)
+        this.editTable(editCustomer, [this.AdressID, this.form2.客户名称, this.form2.联系电话, this.form2.传真, this.form2.联系地址, this.form2.联系人, this.form2.电子邮箱, this.form2.银行账号, this.form2.税号, this.form2.信用等级, this.form2.备注, this.c, this.form2.开户行], 'form2', a)
       }
     }
   }
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 227a4c79..a39d9940 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -53,7 +53,7 @@
         </el-table-column>
         <el-table-column align="center" label="合同编号" width="150">
           <template slot-scope="scope">
-            {{ scope.row.合同编号 }}
+            <el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称" width="200">
@@ -249,7 +249,7 @@
               <div v-show="scope.row.计划付款时间">
                 <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划日期还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>
               </div>
-              <el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" slot="reference" size="small" style="width: 66px">无计划</el-tag>
+              <el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>
               <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>
               <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='未开始'" slot="reference" type="primary" size="small" style="width: 66px">未开始</el-tag>
               <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='即将拖期'" slot="reference" type="warning" size="small" style="width: 66px">即将拖期</el-tag>
@@ -689,7 +689,7 @@ export default {
             }
             if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
               data[i].是否禁用收款 = true
-              data[i].状态 = '无计划'
+              data[i].状态 = '进度未完'
             } else {
               data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
               data[i].是否禁用收款 = false
@@ -746,7 +746,7 @@ export default {
               }
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                 data[i].是否禁用收款 = true
-                data[i].状态 = '无计划'
+                data[i].状态 = '进度未完'
               } else {
                 data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
                 data[i].是否禁用收款 = false
@@ -919,7 +919,7 @@ export default {
           }
           if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
             data[i].是否禁用收款 = true
-            data[i].状态 = '无计划'
+            data[i].状态 = '进度未完'
           } else {
             data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
             data[i].是否禁用收款 = false
@@ -994,7 +994,7 @@ export default {
               }
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                 data[i].是否禁用收款 = true
-                data[i].状态 = '无计划'
+                data[i].状态 = '进度未完'
               } else {
                 data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
                 data[i].是否禁用收款 = false
@@ -1065,7 +1065,7 @@ export default {
                 }
                 if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                   data[i].是否禁用收款 = true
-                  data[i].状态 = '无计划'
+                  data[i].状态 = '进度未完'
                 } else {
                   data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
                   data[i].是否禁用收款 = false
@@ -1179,7 +1179,7 @@ export default {
                     }
                     if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                       data[i].是否禁用收款 = true
-                      data[i].状态 = '无计划'
+                      data[i].状态 = '进度未完'
                     } else {
                       data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
                       data[i].是否禁用收款 = false
@@ -1261,7 +1261,7 @@ export default {
                     }
                     if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                       data[i].是否禁用收款 = true
-                      data[i].状态 = '无计划'
+                      data[i].状态 = '进度未完'
                     } else {
                       data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
                       data[i].是否禁用收款 = false
@@ -1331,7 +1331,7 @@ export default {
                   }
                   if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                     data[i].是否禁用收款 = true
-                    data[i].状态 = '无计划'
+                    data[i].状态 = '进度未完'
                   } else {
                     data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
                     data[i].是否禁用收款 = false
@@ -1412,7 +1412,7 @@ export default {
               }
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                 data[i].是否禁用收款 = true
-                data[i].状态 = '无计划'
+                data[i].状态 = '进度未完'
               } else {
                 data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
                 data[i].是否禁用收款 = false
@@ -1477,7 +1477,7 @@ export default {
               }
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                 data[i].是否禁用收款 = true
-                data[i].状态 = '无计划'
+                data[i].状态 = '进度未完'
               } else {
                 data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
                 data[i].是否禁用收款 = false
@@ -1555,7 +1555,7 @@ export default {
           }
           if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
             data[i].是否禁用收款 = true
-            data[i].状态 = '无计划'
+            data[i].状态 = '进度未完'
           } else {
             data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
             data[i].是否禁用收款 = false
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
new file mode 100644
index 00000000..12247e90
--- /dev/null
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -0,0 +1,300 @@
+<template>
+  <div>
+    <!--查询条件-->
+    <el-card>
+      <span>项目名称：</span>
+      <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 10px" size="small" clearable>
+        <el-option
+          v-for="item in entryName"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span style="margin-left: 10px">销售经理：</span>
+      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="dialogFormVisiblePeople = true" @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-card>
+    <!--项目表格-->
+    <el-card>
+      <el-table
+        v-loading="listLoading1"
+        :data="tableData1"
+        highlight-current-row
+        style="width: 100%"
+        height="300"
+        border
+        size="mini"
+        @row-click="fetchTableData2">
+        <el-table-column align="center" label="合同编号" width="200">
+          <template slot-scope="scope">
+            <el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="项目名称" width="200">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="付款方式" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.付款方式 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="合同签订日期" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.合同签订日期 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="销售经理" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="合同总金额（含税）" width="150">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="small" style="width: 80px" type="warning">无收款计划</el-tag>
+            <el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.合同总金额 }} </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="已到账金额" width="150">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="small" style="width: 80px" type="warning">无收款计划</el-tag>
+            <el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.已支付 }} </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="税率" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.税率 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="合同信息备注">
+          <template slot-scope="scope">
+            {{ scope.row.合同信息备注 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="150px">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-circle-plus-outline"
+              @click.stop="addInvoiceRecord(scope.row)">增加记录</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="PageCurrent"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="PageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+    <!--开票记录-->
+    <el-card>
+      <el-table
+        v-loading="listLoading2"
+        :data="tableData2"
+        :summary-method="getSummaries"
+        show-summary
+        style="width: 100%"
+        height="320"
+        border
+        size="mini">
+        <el-table-column
+          align="center"
+          label="序号"
+          type="index"
+          width="50"/>
+        <el-table-column align="center" label="发票抬头" width="180">
+          <template slot-scope="scope">
+            {{ scope.row.客户名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="纳税人识别号" width="180">
+          <template slot-scope="scope">
+            {{ scope.row.税号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="开票电话" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.传真 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="开票地址" width="200">
+          <template slot-scope="scope">
+            {{ scope.row.地址 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="开户行" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.开户行 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="银行账号" width="160">
+          <template slot-scope="scope">
+            {{ 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.开票时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="备注">
+          <template slot-scope="scope">
+            {{ scope.row.合同信息备注 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="warning"
+              icon="el-icon-plus"
+              @click.stop="addInvoiceRecord(scope.row)">编辑</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-delete"
+              @click.stop="addInvoiceRecord(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import elInput from 'element-ui/packages/input'
+import { initProject, searchTableData1, searchTableData2 } from '@/api/MarketingCenter/InvoiceRecord'
+export default {
+  components: {
+    elInput
+  },
+  data() {
+    return {
+      entryName: [], // 项目名称数组
+      entryNameValue_check: '', // 项目名称check
+      entryNameValue: '', // 项目名称
+      peopleid_check: '', // 销售经理check
+      MarketingManagerValue: '', // 销售经理
+      peopleid: '', // 营销经理中间变量
+      startTime_check: '', // 开始时间check
+      startTime: '', // 开始时间
+      endTime_check: '', // 结束时间check
+      endTime: '', // 结束时间
+      listLoading1: false, // 合同信息表格加载动画
+      tableData1: [], // 合同信息表格数据
+      PageCurrent: 1,
+      PageSize: 10,
+      total: null,
+      tableData2: [], // 开票记录表格数据
+      listLoading2: false, // 开票记录表格加载动画
+      taxRate: '' // 税率
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.getSelect(initProject, ['项目名称', '项目流水号'], 'entryName')
+    },
+    // 查询项目信息表格
+    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.listLoading1 = true
+      this.getTable(searchTableData1, [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', 'listLoading1'])
+    },
+    // 项目信息表格改变每页显示条数
+    handleSizeChange(val) {
+      this.PageCurrent = 1
+      this.PageSize = val
+      this.fetchTableData1()
+    },
+    // 项目信息表格翻页
+    handleCurrentChange(val) {
+      this.PageCurrent = val
+      this.fetchTableData1()
+    },
+    // 查询开票记录表格
+    fetchTableData2(row) {
+      this.taxRate = row.税率
+      searchTableData2(row.项目流水号).then(response => {
+        const data = response.data
+        for (let i = 0; i < data.length; i++) {
+          data[i].开票时间 = data[i].开票时间.substring(0, data[i].开票时间.length - 8)
+        }
+        this.tableData2 = data
+      })
+    },
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 6) {
+          sums[index] = '项目开票合计'
+          return
+        } else if (index === 7) {
+          const values = data.map(item => Number(item['开票金额']))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return Number(prev) + Number(curr)
+              } else {
+                return Number(prev)
+              }
+            }, 0)
+            sums[index] += ' 元(含税)'
+          } else {
+            sums[index] = 'N/A'
+          }
+        } else if (index === 8) {
+          sums[index] = this.taxRate * 100 + '% (税率)'
+          return
+        } else if (index === 9) {
+          sums[index] = parseFloat(sums[7]) * this.taxRate + ' 元(税额)'
+          return
+        } else if (index === 10) {
+          sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 元(未税)'
+          return
+        }
+      })
+      return sums
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

From 62ccf22b083937139737f5b3eb9dea28957adb04 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 12 Dec 2018 13:52:38 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=A3=85=E7=AE=B1=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreatePackingList/index.vue               | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue
index 8d818ce6..d5ed8b9c 100644
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -9,13 +9,12 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button :disabled="disabled" type="success" size="small" icon="el-icon-circle-plus-outline" @click="addReceipt">增加</el-button>
+      <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addReceipt">增加</el-button>
       <el-button type="warning" size="small" icon="el-icon-download">导出</el-button>
       <div class="title">总装箱单</div>
       <el-table
         v-loading="loading"
         :data="receiptData"
-        highlight-current-row
         border
         style="margin-top:20px">
         <el-table-column
@@ -67,13 +66,13 @@
         </el-table-column>
       </el-table>
     </el-card>
+
     <el-card style="margin-top: 10px">
-      <el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-search" @click="addMachine">添加主机</el-button>
+      <el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
       <div class="title">主机</div>
       <el-table
         v-loading="loading"
         :data="machineTableData"
-        highlight-current-row
         border
         style="margin-top:20px">
         <el-table-column type="expand">
@@ -82,17 +81,16 @@
               :data="props.row.groupData"
               border
               style="width: 90%">
-              <el-table-column
-                fixed
-                align="center"
-                prop="类别"
-                label="类别"
-              />
               <el-table-column
                 label="序号"
                 type="index"
                 align="center"
                 width="100px"/>
+              <el-table-column
+                align="center"
+                prop="类别"
+                label="类别"
+              />
               <el-table-column
                 align="center"
                 prop="代号"
@@ -167,12 +165,11 @@
     </el-card>
 
     <el-card style="margin-top: 10px">
-      <el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-search" @click="addSpare">添加备件</el-button>
+      <el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
       <div class="title">随机供应的备件</div>
       <el-table
         v-loading="loading"
         :data="spareData"
-        highlight-current-row
         border
         style="margin-top:20px">
         <el-table-column
@@ -225,12 +222,11 @@
     </el-card>
 
     <el-card style="margin-top: 10px">
-      <el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-search" @click="addFile">添加文件</el-button>
+      <el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
       <div class="title">随机技术文件</div>
       <el-table
         v-loading="fileLoading"
         :data="fileData"
-        highlight-current-row
         border
         style="margin-top:20px">
         <el-table-column

From 9aec9a69afe6ee2174fb16832b28b3b66fec8894 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Wed, 12 Dec 2018 16:03:30 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/MarketingCenter/InvoiceRecord.js      |  77 ++++
 src/views/MarketingCenter/CRM/index.vue       |   2 +-
 .../ContractCapitalManagement/index.vue       |   4 +-
 .../MarketingCenter/InvoiceRecord/index.vue   | 381 +++++++++++++++++-
 4 files changed, 448 insertions(+), 16 deletions(-)

diff --git a/src/api/MarketingCenter/InvoiceRecord.js b/src/api/MarketingCenter/InvoiceRecord.js
index 7d661ed6..a55241aa 100644
--- a/src/api/MarketingCenter/InvoiceRecord.js
+++ b/src/api/MarketingCenter/InvoiceRecord.js
@@ -33,3 +33,80 @@ export function searchTableData2(num1) {
     }
   })
 }
+export function revisionOfTaxRate(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_开票记录_税率修改',
+      param: '项目流水号=' + num1 + '=int&税率=' + num2 + '=float'
+    }
+  })
+}
+export function selectProvince() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_省份查询'
+    }
+  })
+}
+export function SelectMarketingManager(code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '客户关系管理系统_按地区查询_营销经理',
+      param: '省份流水号=' + code
+    }
+  })
+}
+export function fetchCustomerData(PageCurrent, PageSize, name) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: 1,
+      name: '创建合同_客户信息查询',
+      param: '客户名称=' + name + '=string',
+      Pagination: PageCurrent + '&' + PageSize
+    }
+  })
+}
+export function addSubmit(num1, num2, num3, num4, num5) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_开票记录_增加',
+      param: '项目流水号=' + num1 + '=int&客户流水号=' + num2 + '=int&开票金额=' + num3 + '=float&开票时间=' + num4 + '=string&备注=' + num5 + '=string'
+    }
+  })
+}
+export function editSubmit(num2, num3, num4, num5, num6) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_开票记录_修改',
+      param: '客户流水号=' + num2 + '=int&开票金额=' + num3 + '=float&开票时间=' + num4 + '=string&备注=' + num5 + '=string&开票记录流水号=' + num6 + '=string'
+    }
+  })
+}
+export function delSubmit(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_开票记录_删除',
+      param: '开票记录流水号=' + num1 + '=int'
+    }
+  })
+}
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index bf9fafa8..1cb22d7b 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -33,7 +33,7 @@
             stripe
             tooltip-effect="dark"
             style="width: 100%"
-            height="730"
+            height="744"
             border>
             <el-table-column align="center" label="序号" width="80">
               <template slot-scope="scope">
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index a39d9940..a8b20576 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -229,7 +229,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="时间节点" width="180px">
+        <el-table-column align="center" label="截止时间" width="180px">
           <template slot-scope="scope">
             <span>后</span>
             <el-input v-model="scope.row.提前x天提醒" size="small" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
@@ -247,7 +247,7 @@
                 <h4>{{ scope.row.执行进度名 }} 未完成</h4>
               </div>
               <div v-show="scope.row.计划付款时间">
-                <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划日期还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>
+                <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>
               </div>
               <el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>
               <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index 12247e90..bc984c2d 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -11,7 +11,7 @@
           :value="item.value"/>
       </el-select>
       <span style="margin-left: 10px">销售经理：</span>
-      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="dialogFormVisiblePeople = true" @clear="clear()"/>
+      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="dialogFormVisiblePeople = true" @clear="clearPeople()"/>
       <span style="margin-left: 10px">开始日期：</span>
       <el-date-picker
         v-model="startTime"
@@ -80,7 +80,7 @@
         </el-table-column>
         <el-table-column align="center" label="税率" width="100">
           <template slot-scope="scope">
-            {{ scope.row.税率 }}
+            <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column align="center" label="合同信息备注">
@@ -94,7 +94,7 @@
               size="mini"
               type="primary"
               icon="el-icon-circle-plus-outline"
-              @click.stop="addInvoiceRecord(scope.row)">增加记录</el-button>
+              @click.stop="openAddInvoiceRecordingDialog(); flag = 1">增加记录</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -167,7 +167,7 @@
         </el-table-column>
         <el-table-column align="center" label="备注">
           <template slot-scope="scope">
-            {{ scope.row.合同信息备注 }}
+            {{ scope.row.备注 }}
           </template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
@@ -175,35 +175,172 @@
             <el-button
               size="mini"
               type="warning"
-              icon="el-icon-plus"
-              @click.stop="addInvoiceRecord(scope.row)">编辑</el-button>
+              icon="el-icon-edit"
+              @click.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2">编辑</el-button>
             <el-button
               size="mini"
               type="danger"
               icon="el-icon-delete"
-              @click.stop="addInvoiceRecord(scope.row)">删除</el-button>
+              @click.stop="delInvoiceRecordingDialog(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
+
+    <!--营销经理选择-->
+    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%">
+      <span>责权省份</span>
+      <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
+        <el-option
+          v-for="item in Province"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <div style="margin-top: 15px">
+        <el-table :data="dataPeople" border style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
+          <el-table-column label="销售经理" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.姓名 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="性别" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.性别 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="offName">取消</el-button>
+        <el-button type="primary" @click="getName">确认</el-button>
+      </div>
+    </el-dialog>
+    <!--增加开票记录-->
+    <el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="750px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="客户名称" prop="客户名称">
+              <el-input v-model="form.客户名称" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clearCustomer()"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发票抬头" prop="发票抬头">
+              <el-input v-model="form.发票抬头" clearable size="small" style="width:200px" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="税号" prop="税号">
+              <el-input v-model="form.税号" clearable size="small" style="width:200px" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开票电话" prop="开票电话">
+              <el-input v-model="form.开票电话" clearable size="small" style="width:200px" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开票地址" prop="开票地址">
+              <el-input v-model="form.开票地址" clearable size="small" style="width:200px" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开户行" prop="开户行">
+              <el-input v-model="form.开户行" clearable size="small" style="width:200px" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="银行账号" prop="银行账号">
+              <el-input v-model="form.银行账号" clearable size="small" style="width:200px" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开票金额" prop="开票金额">
+              <el-input v-model="form.开票金额" clearable size="small" placeholder="请输入开票金额" style="width:200px"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开票时间" prop="开票时间">
+              <el-date-picker
+                v-model="form.开票时间"
+                style="width: 200px;"
+                value-format="yyyy-MM-dd"
+                size="small"
+                type="date"
+                placeholder="请选择开票时间"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="备注">
+              <el-input v-model="form.备注" clearable size="small" placeholder="请输入备注" style="width:200px"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible1 = false">取消</el-button>
+        <el-button type="primary" @click="submit('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+    <!--客户选择-->
+    <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="600px">
+      <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
+      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageSize1 = 10;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
+      <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange">
+        <el-table-column label="省份" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.省份 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="客户名称" align="center" >
+          <template slot-scope="scope">
+            {{ 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="联系电话" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.电话 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="PageCurrent1"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="PageSize1"
+        :total="total1"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange1"
+        @current-change="handleCurrentChange1"/>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="offCustomerChange">取消</el-button>
+        <el-button type="primary" @click="getCustomerCode">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { initProject, searchTableData1, searchTableData2 } from '@/api/MarketingCenter/InvoiceRecord'
+import { initProject, searchTableData1, searchTableData2, revisionOfTaxRate, selectProvince, SelectMarketingManager, fetchCustomerData, addSubmit, editSubmit, delSubmit } from '@/api/MarketingCenter/InvoiceRecord'
 export default {
   components: {
     elInput
   },
   data() {
     return {
+      projectid: '', // 项目流水号
       entryName: [], // 项目名称数组
       entryNameValue_check: '', // 项目名称check
       entryNameValue: '', // 项目名称
       peopleid_check: '', // 销售经理check
       MarketingManagerValue: '', // 销售经理
-      peopleid: '', // 营销经理中间变量
+      peopleid: '', // 营销经理流水号
       startTime_check: '', // 开始时间check
       startTime: '', // 开始时间
       endTime_check: '', // 结束时间check
@@ -211,19 +348,55 @@ export default {
       listLoading1: false, // 合同信息表格加载动画
       tableData1: [], // 合同信息表格数据
       PageCurrent: 1,
+      PageCurrent1: 1,
+      PageSize1: 10,
       PageSize: 10,
+      total1: null,
       total: null,
       tableData2: [], // 开票记录表格数据
       listLoading2: false, // 开票记录表格加载动画
-      taxRate: '' // 税率
+      taxRate: '', // 税率
+      dialogFormVisiblePeople: false, // 营销经理对话框显示隐藏
+      ProvinceValue: '', // 责权省份
+      Province: [], // 责权省份数组
+      dataPeople: [], // 营销经理数组
+      peoplename: '', // 营销经理姓名
+      title: '', // 开票记录对话框标题
+      dialogFormVisible1: false, // 开票记录对话框显示隐藏
+      dialogCustomerFormVisible: false, // 打开选择客户对话框
+      flag: '', // 开票记录增加编辑旗帜变量
+      Customer: '', // 客户选择
+      CustomerData: [], // 客户信息表格
+      loading1: false, // 客户信息表加载框
+      CustomerCode: '',
+      invoiceRecordingCode: '',
+      form: {
+        客户名称: '',
+        发票抬头: '',
+        税号: '',
+        开票电话: '',
+        开票地址: '',
+        开户行: '',
+        银行账号: '',
+        开票金额: '',
+        开票时间: '',
+        备注: ''
+      },
+      rules: {
+        客户名称: [{ required: true, message: '请双击选择客户名称', trigger: 'change' }],
+        开票金额: [{ required: true, message: '请双击选择客户名称', trigger: 'blur' }],
+        开票时间: [{ required: true, message: '请双击选择客户名称', trigger: 'change' }]
+      }
     }
   },
   created() {
     this.init()
   },
   methods: {
+    // 初始化条件
     init() {
       this.getSelect(initProject, ['项目名称', '项目流水号'], 'entryName')
+      this.getSelect(selectProvince, ['省份', '省份流水号'], 'Province')
     },
     // 查询项目信息表格
     fetchTableData1() {
@@ -232,7 +405,16 @@ export default {
       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.listLoading1 = true
-      this.getTable(searchTableData1, [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', 'listLoading1'])
+      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
+        this.listLoading1 = false
+        const data = response.data
+        for (let i = 0; i < data.rows.length; i++) {
+          data.rows[i].是是否禁用税率编辑 = true
+          data.rows[i].合同签订日期 = data.rows[i].合同签订日期.substring(0, data.rows[i].合同签订日期.length - 8)
+        }
+        this.tableData1 = data.rows
+        this.total = data.total
+      })
     },
     // 项目信息表格改变每页显示条数
     handleSizeChange(val) {
@@ -248,7 +430,8 @@ export default {
     // 查询开票记录表格
     fetchTableData2(row) {
       this.taxRate = row.税率
-      searchTableData2(row.项目流水号).then(response => {
+      this.projectid = row.项目流水号
+      searchTableData2(this.projectid).then(response => {
         const data = response.data
         for (let i = 0; i < data.length; i++) {
           data[i].开票时间 = data[i].开票时间.substring(0, data[i].开票时间.length - 8)
@@ -256,12 +439,13 @@ export default {
         this.tableData2 = data
       })
     },
+    // 开票记录合计
     getSummaries(param) {
       const { columns, data } = param
       const sums = []
       columns.forEach((column, index) => {
         if (index === 6) {
-          sums[index] = '项目开票合计'
+          sums[index] = '项目开票合计：'
           return
         } else if (index === 7) {
           const values = data.map(item => Number(item['开票金额']))
@@ -290,6 +474,177 @@ export default {
         }
       })
       return sums
+    },
+    // 双击解锁选定行的税率编辑
+    unlockEditor(row) {
+      row.是是否禁用税率编辑 = false
+    },
+    // 离开锁定选定行的税率编辑
+    lockEditor(row) {
+      row.是是否禁用税率编辑 = true
+    },
+    // 改变税率
+    revisionOfTaxRate(row) {
+      revisionOfTaxRate(row.项目流水号, row.税率).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('修改成功')
+          this.fetchTableData1()
+          this.fetchTableData2(row)
+        } else {
+          this.$message.error('修改失败')
+        }
+      })
+    },
+    // 点击选择营销经理
+    handleChange(row) {
+      this.peopleid = row.营销经理流水号
+      this.peoplename = row.姓名
+    },
+    // 营销经理对话框确定
+    getName() {
+      this.dialogFormVisiblePeople = false
+      this.MarketingManagerValue = this.peoplename
+    },
+    // 营销经理对话框取消
+    offName() {
+      this.dialogFormVisiblePeople = false
+      this.peopleid = ''
+      this.peoplename = ''
+    },
+    // 通过省份查对应的营销经理
+    changeProvince() {
+      SelectMarketingManager(this.ProvinceValue).then(response => {
+        this.dataPeople = response.data
+      })
+    },
+    // 清空营销经理输入框
+    clearPeople() {
+      this.peopleid = ''
+    },
+    // 打开增加开票记录对话框
+    openAddInvoiceRecordingDialog() {
+      this.addForm('form')
+      this.title = '增加'
+      this.dialogFormVisible1 = true
+    },
+    // 打开选择
+    CustomerChange() {
+      this.dialogCustomerFormVisible = true
+    },
+    offCustomerChange() {
+      this.dialogCustomerFormVisible = false
+    },
+    fetchCustomerData() {
+      this.loading1 = true
+      this.getTable(fetchCustomerData, [this.PageCurrent1, this.PageSize1, this.Customer], ['CustomerData', 'total1', 'loading1'])
+    },
+    handleSizeChange1(val) {
+      this.PageCurrent1 = 1
+      this.PageSize1 = val
+      this.fetchCustomerData()
+    },
+    handleCurrentChange1(val) {
+      this.PageCurrent1 = val
+      this.fetchCustomerData()
+    },
+    handleCustomerChange(row) {
+      this.CustomerCode = row.客户流水号
+      this.form.客户名称 = row.客户名称
+      this.form.发票抬头 = row.客户名称
+      this.form.税号 = row.税号
+      this.form.开票电话 = row.传真
+      this.form.开票地址 = row.地址
+      this.form.开户行 = row.开户行
+      this.form.银行账号 = row.银行账号
+    },
+    getCustomerCode() {
+      this.dialogCustomerFormVisible = false
+    },
+    clearCustomer() {
+      this.CustomerCode = ''
+      this.form.客户名称 = ''
+      this.form.发票抬头 = ''
+      this.form.税号 = ''
+      this.form.开票电话 = ''
+      this.form.开票地址 = ''
+      this.form.开户行 = ''
+      this.form.银行账号 = ''
+    },
+    // 提交增加或编辑
+    submit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.flag === 1) {
+            this.addSubmit()
+          } else if (this.flag === 2) {
+            this.editSubmit()
+          }
+        }
+      })
+    },
+    // 增加开票记录
+    addSubmit() {
+      addSubmit(this.projectid, this.CustomerCode, this.form.开票金额, this.form.开票时间, this.form.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('增加成功')
+          this.dialogFormVisible1 = false
+          searchTableData2(this.projectid).then(response => {
+            const data = response.data
+            for (let i = 0; i < data.length; i++) {
+              data[i].开票时间 = data[i].开票时间.substring(0, data[i].开票时间.length - 8)
+            }
+            this.tableData2 = data
+          })
+        } else {
+          this.$message.error('增加失败')
+        }
+      })
+    },
+    openEditInvoiceRecordingDialog(row) {
+      this.editForm(row, 'form')
+      this.title = '编辑'
+      this.dialogFormVisible1 = true
+      this.CustomerCode = row.客户流水号
+      this.form.客户名称 = row.客户名称
+      this.form.发票抬头 = row.客户名称
+      this.form.税号 = row.税号
+      this.form.开票电话 = row.传真
+      this.form.开票地址 = row.地址
+      this.form.开户行 = row.开户行
+      this.form.银行账号 = row.银行账号
+      this.form.开票金额 = row.开票金额
+      this.form.开票时间 = row.开票时间
+      this.form.备注 = row.备注
+      this.invoiceRecordingCode = row.开票记录流水号
+    },
+    editSubmit() {
+      editSubmit(this.CustomerCode, this.form.开票金额, this.form.开票时间, this.form.备注, this.invoiceRecordingCode).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('修改成功')
+          this.dialogFormVisible1 = false
+          searchTableData2(this.projectid).then(response => {
+            const data = response.data
+            for (let i = 0; i < data.length; i++) {
+              data[i].开票时间 = data[i].开票时间.substring(0, data[i].开票时间.length - 8)
+            }
+            this.tableData2 = data
+          })
+        } else {
+          this.$message.error('修改失败')
+        }
+      })
+    },
+    delInvoiceRecordingDialog(row) {
+      function a() {
+        searchTableData2(this.projectid).then(response => {
+          const data = response.data
+          for (let i = 0; i < data.length; i++) {
+            data[i].开票时间 = data[i].开票时间.substring(0, data[i].开票时间.length - 8)
+          }
+          this.tableData2 = data
+        })
+      }
+      this.deleteRow(delSubmit, row.开票记录流水号, a)
     }
   }
 }

From 6751cde8279e201444b76d86b79d26a4382947d7 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Wed, 12 Dec 2018 18:03:05 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/PurchasingCenter/FundApproval.js      |  12 +-
 .../PurchaseInvoiceDelivery.js                |  98 ++++
 ...nSheet.svg => PurchaseInvoiceDelivery.svg} |   0
 .../PurchasingCenter/FundApproval2/index.vue  |  39 +-
 .../PurchasingCenter/FundApproval3/index.vue  |  40 +-
 .../PurchasingCenter/PayStateSearch/index.vue |  56 ++-
 .../PurchaseContractRequestFund/index.vue     |   1 +
 .../PurchaseInvoiceDelivery/index.vue         | 441 ++++++++++++++++++
 8 files changed, 600 insertions(+), 87 deletions(-)
 create mode 100644 src/api/PurchasingCenter/PurchaseInvoiceDelivery.js
 rename src/icons/svg/{ReceiptConnectionSheet.svg => PurchaseInvoiceDelivery.svg} (100%)
 create mode 100644 src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue

diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js
index 09da01e8..ed809eac 100644
--- a/src/api/PurchasingCenter/FundApproval.js
+++ b/src/api/PurchasingCenter/FundApproval.js
@@ -1,27 +1,27 @@
 import request from '@/utils/request'
 
-// 查询审核/审批/付款
+// 查询审批/付款
 export function initApproval(pageCurrent, pageSize, state) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_请款表_查询数据_审核审批',
-      param: `审核_审批_付款状态=${state}`,
+      name: '采购管理_请款表_查询数据_审批付款',
+      param: `审批_付款状态=${state}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-// 执行审核/审批/付款
+// 执行审批/付款
 export function execApproval(num1, num2, reason, person, state) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '采购管理_请款表_修改数据_审核审批',
-      param: `采购科请款流水号=${num1}&审核_审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审核_审批_付款状态=${state}`
+      name: '采购管理_请款表_修改数据_审批付款',
+      param: `采购请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}`
     }
   })
 }
diff --git a/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js b/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js
new file mode 100644
index 00000000..1030f460
--- /dev/null
+++ b/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js
@@ -0,0 +1,98 @@
+import request from '@/utils/request'
+
+// 初始化项目
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_采购部采购_查询数据'
+    }
+  })
+}
+// 初始化合同号
+export function initContract() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_付款情况_查询数据'
+    }
+  })
+}
+// 发票查询
+export function searchInvoice(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购发票_查询数据',
+      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&采购合同流水号_check=${params[4]}&采购合同流水号=${params[5]}`,
+      Pagination: params[0] + '&' + params[1]
+    }
+  })
+}
+// 发票详情查询
+export function searchInvoiceDetail(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购发票_查询数据',
+      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&采购合同流水号_check=${params[4]}&采购合同流水号=${params[5]}`,
+      Pagination: params[0] + '&' + params[1]
+    }
+  })
+}
+// 发票增加（后台调用）
+export function addInvoice(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_采购发票_增加数据',
+      param: `采购合同流水号=${params[0]}&开票金额=${params[1]}&传送人流水号=${params[2]}`
+    }
+  })
+}
+// 发票编辑
+export function editInvoice(num1, num2, num3, time1, money, send, receive, remark) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_发票_修改数据',
+      param: '发票流水号=' + num1 + '&采购合同流水号=' + num2 + '&发票号=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark
+    }
+  })
+}
+// 发票删除
+export function deleteInvoice(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_发票_删除数据',
+      param: '发票流水号=' + num1
+    }
+  })
+}
+// 传送人初始化 采购科改16
+export function initSender() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=16'
+    }
+  })
+}
diff --git a/src/icons/svg/ReceiptConnectionSheet.svg b/src/icons/svg/PurchaseInvoiceDelivery.svg
similarity index 100%
rename from src/icons/svg/ReceiptConnectionSheet.svg
rename to src/icons/svg/PurchaseInvoiceDelivery.svg
diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue
index 4ac8bcb0..18e45acc 100644
--- a/src/views/PurchasingCenter/FundApproval2/index.vue
+++ b/src/views/PurchasingCenter/FundApproval2/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="采购合同编号" align="center" min-width="150">
+        <el-table-column label="采购合同编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
@@ -12,39 +12,19 @@
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规定到货时间" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.规定到货时间.split(' ')[0] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="250">
+        <el-table-column label="供应商" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" align="center" min-width="100">
+        <el-table-column label="请款人" align="center" min-width="70">
           <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
+            {{ scope.row.请款人 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" align="center" min-width="70">
+        <el-table-column label="合同总额" align="center" min-width="70">
           <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总金额" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.总金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="欠款金额" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.欠款金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="已付金额" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.已付金额 }}
+            {{ scope.row.合同总额 }}
           </template>
         </el-table-column>
         <el-table-column label="请款金额" align="center" min-width="70">
@@ -168,7 +148,8 @@ export default {
       this.searchTable2()
     },
     searchTable1() {
-      initApproval(this.pageCurrent1, this.pageSize1, 2).then(response => {
+      initApproval(this.pageCurrent1, this.pageSize1, 1).then(response => {
+        console.log(response.data)
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
@@ -209,7 +190,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        execApproval(row.采购科请款流水号, 1, '通过', this.id, 2).then(response => {
+        execApproval(row.采购请款流水号, 1, '通过', this.id, 1).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('执行成功')
             this.searchTable1()
@@ -227,7 +208,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       }).then(({ value }) => {
-        execApproval(row.采购科请款流水号, 2, value, this.id, 2).then(response => {
+        execApproval(row.采购请款流水号, 2, value, this.id, 1).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('执行成功')
             this.searchTable1()
diff --git a/src/views/PurchasingCenter/FundApproval3/index.vue b/src/views/PurchasingCenter/FundApproval3/index.vue
index 5263419a..e309a3cf 100644
--- a/src/views/PurchasingCenter/FundApproval3/index.vue
+++ b/src/views/PurchasingCenter/FundApproval3/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="采购合同编号" align="center" min-width="150">
+        <el-table-column label="采购合同编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
@@ -12,39 +12,19 @@
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规定到货时间" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.规定到货时间.split(' ')[0] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="250">
+        <el-table-column label="供应商" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" align="center" min-width="100">
+        <el-table-column label="请款人" align="center" min-width="70">
           <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
+            {{ scope.row.请款人 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" align="center" min-width="70">
+        <el-table-column label="合同总额" align="center" min-width="70">
           <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总金额" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.总金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="欠款金额" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.欠款金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="已付金额" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.已付金额 }}
+            {{ scope.row.合同总额 }}
           </template>
         </el-table-column>
         <el-table-column label="请款金额" align="center" min-width="70">
@@ -94,7 +74,7 @@
             {{ scope.row.请款金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="审核" align="center" width="320">
+        <el-table-column label="付款" align="center" width="320">
           <template slot-scope="scope">
             <el-popover placement="right" width="400" trigger="click">
               <el-table :data="gridData" stripe size="mini" show-summary>
@@ -168,7 +148,7 @@ export default {
       this.searchTable2()
     },
     searchTable1() {
-      initApproval(this.pageCurrent1, this.pageSize1, 3).then(response => {
+      initApproval(this.pageCurrent1, this.pageSize1, 2).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
@@ -209,7 +189,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        execApproval(row.采购科请款流水号, 1, '通过', this.id, 3).then(response => {
+        execApproval(row.采购请款流水号, 1, '通过', this.id, 2).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('执行成功')
             // 记录付款金额及时间
@@ -228,7 +208,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       }).then(({ value }) => {
-        execApproval(row.采购科请款流水号, 2, value, this.id, 3).then(response => {
+        execApproval(row.采购请款流水号, 2, value, this.id, 2).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('执行成功')
             this.searchTable1()
diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue
index 82342d0a..fe61db07 100644
--- a/src/views/PurchasingCenter/PayStateSearch/index.vue
+++ b/src/views/PurchasingCenter/PayStateSearch/index.vue
@@ -24,57 +24,67 @@
 
     <el-card>
       <el-table v-loading="" :data="tableData1" stripe border style="width: 100%;max-height: 500px;" height="500px" size="mini">
-        <el-table-column label="采购合同编号" align="center" min-width="100">
+        <el-table-column label="采购合同号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" align="center" min-width="120">
+        <el-table-column label="采购合同名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规定到货时间" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.规定到货时间.split(' ')[0] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="250">
+        <el-table-column label="供应商" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购员" align="center" min-width="70">
+        <el-table-column label="采购员" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="总金额" align="center" min-width="70">
+        <el-table-column label="交货日期" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ Number(scope.row.总金额).toFixed(2) }}
+            {{ scope.row.交货日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="欠款金额" align="center" min-width="70">
+        <el-table-column label="支付日期" align="center" min-width="150">
           <template slot-scope="scope">
-            {{ Number(scope.row.欠款金额).toFixed(2) }}
+            {{ scope.row.支付日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="已付金额" align="center" min-width="70">
+        <el-table-column label="支付方式" align="center" min-width="150">
           <template slot-scope="scope">
-            {{ Number(scope.row.总金额 - scope.row.欠款金额).toFixed(2) }}
+            {{ scope.row.支付方式 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款情况" align="center" min-width="150">
+        <el-table-column label="其他说明" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.其他说明 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="合同总额" align="center" min-width="70" fixed="right">
+          <template slot-scope="scope">
+            {{ scope.row.合同总额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="欠款金额" align="center" min-width="70" fixed="right">
+          <template slot-scope="scope">
+            {{ (Number(scope.row.合同总额)-Number(scope.row.已付金额)).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="已付金额" align="center" min-width="70" fixed="right">
+          <template slot-scope="scope">
+            {{ Number(scope.row.已付金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="付款进度" align="center" min-width="150" fixed="right">
           <template slot-scope="scope">
             <el-progress
               :text-inside="true"
               :stroke-width="18"
-              :percentage="parseFloat((100*(scope.row.总金额 - scope.row.欠款金额)/scope.row.总金额).toFixed(2))"
+              :percentage="100*(Number(scope.row.已付金额))/scope.row.合同总额"
               status="success"/>
           </template>
         </el-table-column>
@@ -124,6 +134,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchTable1()
   },
   methods: {
     fetchData() {
@@ -142,6 +153,7 @@ export default {
       this.supplierName ? this.check2 = 1 : this.check2 = 0
       searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
         this.tableData1 = response.data.rows
+        console.log(response.data.rows)
         this.total1 = response.data.total
       })
     },
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index e4561580..fed3cf2e 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -153,6 +153,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchTable1()
   },
   methods: {
     fetchData() {
diff --git a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
new file mode 100644
index 00000000..087a7a8e
--- /dev/null
+++ b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
@@ -0,0 +1,441 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <span>项目名称:</span>
+      <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable>
+        <el-option
+          v-for="item in project"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>采购合同号:</span>
+      <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
+        <el-option
+          v-for="item in contractNum"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          <div style="float: left">{{ item.label }}</div>
+          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+        </el-option>
+      </el-select>
+      <el-button
+        type="success"
+        size="small"
+        icon="el-icon-search"
+        style="margin-left: 10px"
+        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        icon="el-icon-circle-plus-outline"
+        style="margin-left: 10px"
+        @click="handleAdd()">增加</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="" :data="tableData1" size="mini" style="max-height: 400px" height="400px" stripe border @row-click="searchPic">
+        <el-table-column align="center" label="采购合同编号" min-width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.采购合同编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="采购合同名称" min-width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.采购合同名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="供应商" min-width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="项目名称" min-width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 ? scope.row.项目名称 : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="开票金额" min-width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.开票金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="传送人" min-width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.传送人 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="传送时间" min-width="135px">
+          <template slot-scope="scope">
+            {{ scope.row.传送时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="交接状态" min-width="80px">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.接收人" type="success" size="small">已接收</el-tag>
+            <el-tag v-else type="warning" size="small">未接收</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="接收人" min-width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.接收人 ? scope.row.接收人 : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="接收时间" min-width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.接收时间 ? scope.row.接收时间 : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" fixed="right" width="200px">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-edit"
+              @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button
+              type="danger"
+              size="mini"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin: 10px 0;">
+        <el-pagination
+          :current-page="pageCurrent1"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize1"
+          :total="total1"
+          style="display:inline-block;width:50%"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+      <el-table v-loading="" :data="tableData2" size="mini" stripe border>
+        <el-table-column align="center" label="发票号" min-width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.发票号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="开户行" min-width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.开户行 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="开票时间" min-width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.开票时间 ? scope.row.开票时间 : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="合同总额" min-width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.合同总额 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <img :src="scanSrc" alt="发票扫描件" width="100%">
+    </el-card>
+
+    <el-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="460px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="90px">
+        <el-row>
+          <el-form-item label="合同编号" prop="contractNumValue">
+            <el-select v-model="form1.contractNumValue" placeholder="合同编号" size="small" filterable clearable>
+              <el-option
+                v-for="item in contractNum"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                <div style="float: left">{{ item.label }}</div>
+                <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="开票金额" prop="money">
+            <el-input v-model="form1.money" size="small" placeholder="开票金额"/>
+          </el-form-item>
+          <el-form-item label="传送人">
+            <el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled>
+              <el-option
+                v-for="item in sender"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发票扫描件">
+            <el-upload
+              id="invoiceScan"
+              ref="upload"
+              :auto-upload="false"
+              :on-success="uploadSuccess"
+              :before-upload="beforeUpload"
+              :on-exceed="warningExceed"
+              :limit="limit"
+              :action="upload+'?contractNumValue='+form1.contractNumValue+'&money='+form1.money+'&sendPersonValue='+form1.sendPersonValue"
+              list-type="picture-card">
+              <i class="el-icon-plus"/>
+            </el-upload>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
+        <el-button v-show="title1==='增加'" size="small" type="primary" @click="submitAdd('form1')">确定</el-button>
+        <el-button v-show="title1==='编辑'" size="small" type="primary" @click="submitEdit('form1')">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { searchInvoice, editInvoice, deleteInvoice, initSender, initProject, initContract } from '@/api/PurchasingCenter/PurchaseInvoiceDelivery'
+import { mapGetters } from 'vuex'
+import { upload } from '@/utils/request'
+import request from '@/utils/request'
+
+export default {
+  name: '', // 采购发票交接
+  data() {
+    return {
+      scanSrc: '',
+      upload: `http://localhost:8411/submit/uploadInvoiceScan.ashx`,
+      limit: 1,
+      sender: [],
+      contractNumValue: '',
+      contractNum: [],
+      projectValue: '',
+      project: [],
+      pageCurrent1: 1,
+      pageSize1: 10,
+      total1: 0,
+      tableData1: [],
+      tableData2: [],
+      dialogVisible1: false,
+      title1: '',
+      form1: {
+        contractNumValue: '',
+        money: '',
+        sendPersonValue: ''
+      },
+      rules1: {
+        contractNumValue: [
+          { required: true, message: '请选择合同号' }
+        ],
+        money: [
+          { required: true, message: '请填写金额' }
+        ]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'avatar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
+  created() {
+    this.fetchData()
+    this.searchTable1()
+  },
+  methods: {
+    fetchData() { // 初始化数据
+      console.log(upload)
+      initContract().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.contractNum.push({
+            label: response.data[i].采购合同编号,
+            name: response.data[i].采购合同名称,
+            value: response.data[i].采购合同流水号
+          })
+        }
+      })
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.project.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
+        }
+      })
+      initSender().then(response => { // 传送人
+        for (let i = 0; i < response.data.length; i++) {
+          this.sender.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+    },
+    searchTable1() { // 查询表1
+      this.projectValue ? this.check1 = 1 : this.check1 = 0
+      this.contractNumValue ? this.check2 = 1 : this.check2 = 0
+      searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.projectValue, this.check2, this.contractNumValue).then(response => {
+        this.tableData1 = response.data.rows
+        this.total1 = response.data.total
+      })
+      this.scanSrc = ''
+    },
+    handleSizeChange1(val) {
+      this.pageCurrent1 = 1
+      this.pageSize1 = val
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable1()
+    },
+    handleAdd() { // 执行新增
+      if (this.$refs['form1'] !== undefined) {
+        this.$refs['form1'].resetFields()
+      }
+      this.title1 = '增加'
+      this.form1.projectValue = ''
+      this.form1.contractNumValue = ''
+      this.form1.money = ''
+      this.form1.sendPersonValue = Number(this.id)
+      this.form1.remark = ''
+      this.dialogVisible1 = true
+    },
+    warningExceed() {
+      this.$message.error('仅可上传一张发票')
+    },
+    submitAdd(formName) { // 提交新增
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$refs.upload.submit() // 上传图片
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    beforeUpload(file) {
+      const isJPG = /^image\/.*/.test(file.type)
+      const isLt4M = file.size / 1024 / 1024 < 4
+      if (!isJPG) {
+        this.$message.error('只能上传图片。。')
+      }
+      if (!isLt4M) {
+        this.$message.error('上传头像图片大小不能超过 4MB!')
+      }
+      return isJPG && isLt4M
+    },
+    uploadSuccess(res) { // 上传成功回调
+      if (res[0].result === '1') {
+        this.$message.success('增加成功')
+        this.dialogVisible1 = false
+        this.searchTable1()
+      } else {
+        this.$message.error('增加失败')
+      }
+    },
+    handleEdit(row) {
+      if (this.$refs['form1'] !== undefined) {
+        this.$refs['form1'].resetFields()
+      }
+      this.title1 = '编辑'
+      this.dialogVisible1 = true
+      this.form1.contractNum = parseInt(row.采购合同流水号)
+      this.form1.invoiceNum = row.发票号
+      this.form1.invoiceNumValue = row.发票流水号
+      this.form1.invoiceTime = row.开票时间
+      this.form1.money = row.开票金额
+      this.form1.sendPersonValue = parseInt(row.传送人)
+      this.form1.receivePersonValue = parseInt(row.接收人)
+      this.form1.remark = row.备注
+      console.log(row.开票时间)
+      if (row.开票时间 === '1900/1/1') {
+        this.form1.invoiceTime = null
+      }
+      if (parseInt(row.传送人) === 0) {
+        this.form1.sendPersonValue = ''
+      }
+      if (parseInt(row.接收人) === 0) {
+        this.form1.receivePersonValue = ''
+      }
+    },
+    submitEdit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          editInvoice(this.form1.invoiceNumValue, this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark).then(response => {
+            console.log(this.form1.invoiceNumValue, this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark)
+            console.log(response.data)
+            if (response.data[0].result === '1') {
+              this.$message.success('编辑成功')
+              this.dialogVisible1 = false
+              this.searchTable1()
+            } else { this.$message.error('编辑失败') }
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    handleDelete(row) {
+      console.log(row)
+      this.$confirm('确认删除吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteInvoice(row.发票流水号).then(response => {
+          console.log(response.data)
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.dialogVisible1 = false
+            this.searchTable1()
+          } else { this.$message.error('删除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
+    async searchPic(row) {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票交接流水号}`
+        }
+      })
+      this.scanSrc = 'http://localhost:8411/webpage/file/' + data[0].文件标识 + '.' + data[0].文件后缀
+      console.log(this.scanSrc)
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-tag{
+    margin: 0
+  }
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-date-editor{
+    width:150px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .searchForm .el-form-item{
+    margin-top: 1px;
+    margin-bottom: 1px;
+  }
+</style>