diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js
index 6f0f26fc..be639a9b 100644
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -209,8 +209,8 @@ export function gongyiCopy(num1, num2) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_零件工序_工艺拷贝_工艺流水号',
-      param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int'
+      name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号',
+      param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int'
     }
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index 183b8f60..1668f767 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,23 +3,23 @@ import axios from 'axios'
 // import store from '../store'
 // import { getToken } from '@/utils/auth'
 
-export const wsuri = `ws://192.168.0.2:61101//WebMoudule//websocket`
+export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket`
 export const name = `OP8888`
 
 // 创建axios实例
-export const readFile = `http://192.168.0.2:8411/webpage/file/` // invoice
-export const readImg = `http://192.168.0.2:8411/webpage/img/` // delivery/MS/performancebond
-export const upload = `http://192.168.0.2:8411/submit/uploadFile.ashx` // ContractInformationManagement
-export const upload2 = `http://192.168.0.2:8411/submit/upload2.ashx` // delivery
-export const upload3 = `http://192.168.0.2:8411/submit/upload3.ashx` // performancebond
-export const uploadInvoiceScan = `http://192.168.0.2:8411/submit/uploadInvoiceScan.ashx` // invoice
-export const download = `http://192.168.0.2:8411/submit/downloadFile.ashx` // ContractInformationManagement
+export const readFile = `http://192.168.1.212:8411/webpage/file/` // invoice
+export const readImg = `http://192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond
+export const upload = `http://192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement
+export const upload2 = `http://192.168.1.212:8411/submit/upload2.ashx` // delivery
+export const upload3 = `http://192.168.1.212:8411/submit/upload3.ashx` // performancebond
+export const uploadInvoiceScan = `http://192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice
+export const download = `http://192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement
 const service = axios.create({
 
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
+  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  // baseURL: `http://192.168.1.199:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 3d29e001..6d16fc7c 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -5,13 +5,13 @@
 
       <el-col :span="12">
         <el-form label-width="270px" label-position="right" class="Time">
-          <el-form-item>
+          <el-form-item v-show="false">
             <el-radio-group v-model="radio" size="small">
               <el-radio :label="0">正常件投产</el-radio>
               <el-radio :label="1">整改件投产</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="项目名称">
+          <el-form-item label="项目名称" style="margin-top:28px">
             <el-select v-model="entryNameValue" filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
               <el-option
                 v-for="item in entryName"
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index 1d2c2221..9112c622 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -4,8 +4,8 @@
       <span>零件号：</span>
       <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px"/>
       <el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
-      <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadCjn('cjn')">导出工艺定额卡</el-button>
-      <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadCjn1('cjn1')">导出加工路线单</el-button>
+      <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoaddek('dek')">导出工艺定额卡</el-button>
+      <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadlxd('lxd')">导出加工路线单</el-button>
 
     </el-card>
     <el-card>
@@ -45,7 +45,7 @@
       </div>
     </el-card>
     <el-card>
-      <table id="cjn" style="width: 975px;" border="2px" cellspacing="0px" align="center">
+      <table id="dek" style="width: 975px;" border="2px" cellspacing="0px" align="center">
         <thead>
           <tr height="25px">
             <td colspan="4" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
@@ -238,7 +238,7 @@
       </table>
     </el-card>
     <el-card>
-      <table id="cjn1" style="width: 800px;" border="2px" cellspacing="0px" align="center">
+      <table id="lxd" style="width: 800px;" border="2px" cellspacing="0px" align="center">
         <thead>
           <tr height="60px">
             <td colspan="6" style="text-align:center;width: 33%">江苏高精机电<br>装备有限公司</td>
@@ -688,12 +688,12 @@ export default {
         })
       }
     },
-    downLoadCjn(tableid) { // 下载工艺定额卡
+    downLoaddek(tableid) { // 下载工艺定额卡
       getExplorer()
       method5(tableid)
       Cleanup()
     },
-    downLoadCjn1(tableid) { // 下载零件加工路线单
+    downLoadlxd(tableid) { // 下载零件加工路线单
       getExplorer()
       method5(tableid)
       Cleanup()
@@ -701,13 +701,7 @@ export default {
   }
 }
 </script>
-<style>
-  td{
-    width: 100px;
-    height: 30px;
-    text-align:center;
-  }
-</style>
+
 <style scoped>
   span{
     margin: 10px 0 10px 10px;
@@ -719,4 +713,9 @@ export default {
     max-height: 250px;
     overflow: auto;
   }
+  td{
+    width: 100px;
+    height: 30px;
+    text-align:center;
+  }
 </style>
diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index 89d9bb97..676e867a 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -43,9 +43,10 @@
       </el-select>
       <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询
       </el-button>
+      <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
       <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
       </el-button>
-      <el-button v-show="!isShow2" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
+      <el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
       </el-button>
       <div v-show="isShow">
         <span>种类:</span>
@@ -57,9 +58,8 @@
           <el-button slot="prepend" icon="el-icon-search" @click="dialogMaterial=true"/>
           <el-button slot="append" icon="el-icon-cjn-09" @click="saveMaterial"/>
         </el-input>
-        <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
         <span>规格:</span>
-        <el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
+        <el-input v-show="false" v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
         <span>投产总数量:</span>
         <el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
       </div>
@@ -81,8 +81,6 @@
         <el-input v-model="tolerance" size="small" style="width:150px" placeholder="公差"/>
         <el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
         <el-button-group v-if="isShow1" style="margin: 10px">
-          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
-          </el-button>
           <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴</el-button>
           <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺
           </el-button>
@@ -90,7 +88,9 @@
           </el-button>
           <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
           </el-button>
-          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-cjn-09" @click="saveApprove">保存
+          <el-button v-if="isShow1" type="primary" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
+          </el-button>
+          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存
           </el-button>
         </el-button-group>
       </el-row>
@@ -353,10 +353,9 @@
           </el-col>
           <el-col :span="10">
             <el-form-item label="零件号">
-              <el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" @change="inputChange"/>
+              <el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" clearable @change="inputChange"/>
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row>
           <el-col :span="10">
@@ -834,6 +833,8 @@ export default {
     },
     WYbtn() { // 完艺按钮
       this.tableData4 = []
+      this.tuhaoValue = ''
+      this.remark1 = ''
       this.dialogFormVisible1 = true
     },
     selectPerson(row) { // 选择工艺员
@@ -1218,20 +1219,15 @@ export default {
   .doing-row4 {
     background: #f0f9eb;
   }
-
   .el-card {
     margin-bottom: 15px;
   }
-
   .el-date-editor {
     width: 150px
   }
-
   span {
     margin: 10px 0 10px 10px;
   }
-</style>
-<style>
   .el-table .change {
     background: oldlace;
   }
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 83b4d02e..ba2098b1 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -47,8 +47,7 @@
       <el-table
         ref="multipleTable"
         :data="tableData"
-        style="width: 100%;max-height: 440px;"
-        height="440"
+        style="width: 100%;height: 550px;"
         highlight-current-row
         border
         @selection-change="handleSelectionChange">
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index 6c5ecb89..8efdbfcb 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -203,8 +203,10 @@
         icon=""
         style="margin-top:10px"
         @click="calculateContractSum">计算合同总额</el-button>
-      <span>合同总额:</span>
+      <span>合同总额(未税):</span>
       <el-input v-model="contractSum" size="small"/>
+      <span>合同总额(含税):</span>
+      <el-input v-model="contractSum2" size="small"/>
     </el-card>
     <el-card>
       <el-input :rows="20" v-model="textArea" type="textarea" style="width:calc(99% - 250px);float:right;margin-bottom: 20px" resize="none"/>
@@ -364,6 +366,7 @@ export default {
       paramRow: '', // 参数row
       contractSum: 0,
       contractSum1: 0,
+      contractSum2: 0,
       deliveryDay: [],
       deliveryDay1: [],
       contractNumValue: '',
@@ -515,6 +518,7 @@ export default {
         this.tableData4.push(this.groupNum2[i])
       }
       this.contractSum = (this.contractSum + this.contractSum1).toFixed(2)
+      this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100
       this.costAccount = this.contractSum
       if (parseInt(this.costAccount) === 0) {
         this.$message.error('成本核算不可为0')
@@ -681,59 +685,6 @@ export default {
         })
       }
     },
-    // payMethodChange() { // 付款方式改变
-    //   for (let i = 0; i < this.payMethod.length; i++) {
-    //     if (this.payMethod[i].value === this.payMethodValue) {
-    //       this.payMethodName = this.payMethod[i].label
-    //     }
-    //   }
-    //   const payTimeNum = this.payMethodName.split(':')
-    //   switch (payTimeNum.length) {
-    //     case 1:
-    //       this.disable2 = true
-    //       this.disable3 = true
-    //       this.disable4 = true
-    //       this.disable5 = true
-    //       this.disable6 = true
-    //       break
-    //     case 2:
-    //       this.disable2 = false
-    //       this.disable3 = true
-    //       this.disable4 = true
-    //       this.disable5 = true
-    //       this.disable6 = true
-    //       break
-    //     case 3:
-    //       this.disable2 = false
-    //       this.disable3 = false
-    //       this.disable4 = true
-    //       this.disable5 = true
-    //       this.disable6 = true
-    //       break
-    //     case 4:
-    //       this.disable2 = false
-    //       this.disable3 = false
-    //       this.disable4 = false
-    //       this.disable5 = true
-    //       this.disable6 = true
-    //       break
-    //     case 5:
-    //       this.disable2 = false
-    //       this.disable3 = false
-    //       this.disable4 = false
-    //       this.disable5 = false
-    //       this.disable6 = true
-    //       break
-    //     case 6:
-    //       this.disable2 = false
-    //       this.disable3 = false
-    //       this.disable4 = false
-    //       this.disable5 = false
-    //       this.disable6 = false
-    //       break
-    //   }
-    //   this.fetchData()
-    // },
     exportExcel() {}
   }
 }
diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
index ea31c8b7..afa3b525 100644
--- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
+++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
@@ -75,7 +75,7 @@
         </el-table-column>
         <el-table-column label="总金额" width="70" align="center">
           <template slot-scope="scope">
-            {{ scope.row.总金额 }}
+            {{ scope.row.含税总金额 }}
           </template>
         </el-table-column>
         <el-table-column label="预付款" width="80" align="center">
@@ -207,7 +207,7 @@
         </el-table-column>
         <el-table-column label="总金额" min-width="80" align="center">
           <template slot-scope="scope">
-            {{ scope.row.总金额 }}
+            {{ scope.row.含税总金额 }}
           </template>
         </el-table-column>
         <el-table-column label="预付款" min-width="80" align="center">
@@ -314,6 +314,8 @@ export default {
               }
             }
           })
+          response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
+          response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
         }
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
@@ -381,6 +383,8 @@ export default {
       }
       searchRequestTable(this.checkRequest, this.startRequestDate, this.endRequestDate).then(response => {
         for (let j = 0; j < response.data.length; j++) {
+          response.data[j].含税总金额 = parseInt(response.data[j].含税总金额 * 100) / 100
+          response.data[j].欠款金额 = parseInt(response.data[j].欠款金额 * 100) / 100
           if (response.data[j].请款时间 !== null) {
             response.data[j].请款时间 = response.data[j].请款时间.substring(0, response.data[j].请款时间.indexOf(' '))
           }
diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue
index e457a357..f18587cd 100644
--- a/src/views/WorkshopProcurement/FundApproval2/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval2/index.vue
@@ -35,7 +35,7 @@
         </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">
@@ -108,6 +108,10 @@ export default {
     },
     searchTable() {
       initApproval1(this.pageCurrent, this.pageSize, 2).then(response => {
+        for (let j = 0; j < response.data.rows.length; j++) {
+          response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
+          response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
+        }
         this.tableData = response.data.rows
         this.total = response.data.total
       })
diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue
index 8fd7d5da..3a68d499 100644
--- a/src/views/WorkshopProcurement/FundApproval3/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval3/index.vue
@@ -35,7 +35,7 @@
         </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">
@@ -108,6 +108,10 @@ export default {
     },
     searchTable() {
       initApproval1(this.pageCurrent, this.pageSize, 3).then(response => {
+        for (let j = 0; j < response.data.rows.length; j++) {
+          response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
+          response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
+        }
         this.tableData = response.data.rows
         this.total = response.data.total
       })
diff --git a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
index 5fda01d6..791d6cb5 100644
--- a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
@@ -182,7 +182,9 @@ export default {
       this.contractNum ? this.check1 = 1 : this.check1 = 0
       this.supplierName ? this.check2 = 1 : this.check2 = 0
       searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => {
-        console.log(response.data.rows)
+        for (let j = 0; j < response.data.rows.length; j++) {
+          response.data.rows[j].合同总金额 = parseInt(response.data.rows[j].合同总金额 * 100) / 100
+        }
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
diff --git a/src/views/WorkshopProcurement/PayStateSearch/index.vue b/src/views/WorkshopProcurement/PayStateSearch/index.vue
index 1cc8fffa..a9038ea0 100644
--- a/src/views/WorkshopProcurement/PayStateSearch/index.vue
+++ b/src/views/WorkshopProcurement/PayStateSearch/index.vue
@@ -56,7 +56,7 @@
         </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">
@@ -66,7 +66,7 @@
         </el-table-column>
         <el-table-column label="已付金额" align="center" min-width="70">
           <template slot-scope="scope">
-            {{ scope.row.总金额 - scope.row.欠款金额 }}
+            {{ scope.row.含税总金额 - scope.row.欠款金额 }}
           </template>
         </el-table-column>
         <el-table-column label="付款情况" align="center" min-width="150">
@@ -74,7 +74,7 @@
             <el-progress
               :text-inside="true"
               :stroke-width="18"
-              :percentage="(parseInt(10000*(scope.row.总金额 - scope.row.欠款金额)/scope.row.总金额)) / 100"
+              :percentage="(parseInt(10000*(scope.row.含税总金额 - scope.row.欠款金额)/scope.row.含税总金额)) / 100"
               status="success"/>
           </template>
         </el-table-column>
@@ -141,6 +141,10 @@ export default {
       this.contractNumValue ? this.check1 = 1 : this.check1 = 0
       this.supplierName ? this.check2 = 1 : this.check2 = 0
       searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
+        for (let j = 0; j < response.data.rows.length; j++) {
+          response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
+          response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
+        }
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index 001b77cf..9f6cdf48 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column label="总金额" align="center">
           <template slot-scope="scope">
-            {{ scope.row.总金额 }}
+            {{ scope.row.含税总金额 }}
           </template>
         </el-table-column>
         <el-table-column label="预付款" align="center">
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 387646eb..fde4c1e2 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -70,7 +70,7 @@
         </el-table-column>
         <el-table-column label="总金额" align="center">
           <template slot-scope="scope">
-            {{ scope.row.总金额 }}
+            {{ scope.row.含税总金额 }}
           </template>
         </el-table-column>
         <el-table-column label="预付款" align="center">
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index 2d62fce3..e271072e 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -17,7 +17,7 @@
         @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
     </el-card>
     <el-card>
-      <el-table v-loading="" :data="tableData2" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
         <el-table-column label="项目名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -56,7 +56,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-table v-loading="" :data="tableData" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData" :summary-method="getSummaries" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
         <el-table-column label="项目名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -144,6 +144,62 @@ export default {
       } else {
         this.$message.error('请选择项目')
       }
+    },
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 4) {
+          sums[index] = '合计'
+          return
+        } else if (index === 5) {
+          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 === 6) {
+          sums[index] = parseInt(parseInt(sums[5]) * 1.16 * 100) / 100 + ' 元(含税)'
+        }
+      })
+      return sums
+    },
+    getSummaries1(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 4) {
+          sums[index] = '合计'
+          return
+        } else if (index === 5) {
+          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 === 6) {
+          sums[index] = parseInt(parseInt(sums[5]) * 1.16 * 100) / 100 + ' 元(含税)'
+        }
+      })
+      return sums
     }
   }
 }
diff --git a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
index 79b9b871..0eaf9879 100644
--- a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
@@ -49,7 +49,7 @@
             </el-table-column>
             <el-table-column label="总金额" align="center">
               <template slot-scope="scope">
-                {{ scope.row.总金额 }}
+                {{ scope.row.含税总金额 }}
               </template>
             </el-table-column>
             <el-table-column label="预付款" align="center">
@@ -257,7 +257,7 @@
             </el-table-column>
             <el-table-column label="总金额" align="center">
               <template slot-scope="scope">
-                {{ scope.row.总金额 }}
+                {{ scope.row.含税总金额 }}
               </template>
             </el-table-column>
             <el-table-column label="预付款" align="center">
diff --git a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue b/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
index 4292a685..8c7cb83f 100644
--- a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
+++ b/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
@@ -80,7 +80,7 @@
         </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">
@@ -284,6 +284,7 @@ export default {
       this.contractNum ? this.check5 = 1 : this.check5 = 0
       searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.invoiceNum, this.check2, this.invoiceTime, this.check3, this.transmitValue, this.check4, this.recipientValue, this.check5, this.contractNum).then(response => {
         for (let j = 0; j < response.data.rows.length; j++) {
+          response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
           if (response.data.rows[j].开票时间 !== null) {
             response.data.rows[j].开票时间 = response.data.rows[j].开票时间.substring(0, response.data.rows[j].开票时间.indexOf(' '))
           }