diff --git a/src/api/Inventory/OfflinePurchase.js b/src/api/Inventory/OfflinePurchase.js
index b508f812..de237229 100644
--- a/src/api/Inventory/OfflinePurchase.js
+++ b/src/api/Inventory/OfflinePurchase.js
@@ -73,16 +73,51 @@ export function addRequestCardDetail(data1, data2) {
     }
   })
 }
-// 请购单明细增加
-export function alterNumber(data1, data2) {
+// 请购单明细修改
+export function alterNumber(data1, data2, data3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_离线请购单_请购单明细修改',
-      param: '离线请购单明细流水号=' + data1 + '&数量=' + data2
+      param: '离线请购单流水号=' + data1 + '&离线请购单明细流水号组=' + data2 + '&数量组=' + data3
+    }
+  })
+}
+// 请购单删除
+export function deleteRequest(data1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '库存管理_离线请购单_请购单删除',
+      param: '离线请购单流水号=' + data1
+    }
+  })
+}
+// 请购单明细删除
+export function deleteRequestDetail(data1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '库存管理_离线请购单_请购单明细删除',
+      param: '离线请购单明细流水号=' + data1
+    }
+  })
+}
+// 设置安全库存
+export function setSafeValue(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_离线合同_物料安全库存_修改数据',
+      param: `物料流水号=${params[0]}&安全库存量=${params[1]}`
     }
   })
 }
-
diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js
index 1b39134a..771c20de 100644
--- a/src/api/ManufacturingCenter/PartAssignment.js
+++ b/src/api/ManufacturingCenter/PartAssignment.js
@@ -156,6 +156,17 @@ export function purchaseRequisition1(RequisitionList, projectName, projectFloatV
     }
   })
 }
+export function purchaseRequisition2(projectFloatValue, machineFloatValue, groupFloatValue, BasicPartsNumber, NumberOfParts, time) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间管理_采购部采购_基本件_传递数据',
+      param: `组件流水号=${groupFloatValue}&基本件流水号组=${BasicPartsNumber}&项目流水号=${projectFloatValue}&机床流水号=${machineFloatValue}&物料计划到货时间=${time}&零件数量组=${NumberOfParts}`
+    }
+  })
+}
 export function MoveOut(num, num1) {
   return request({
     url: '',
diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js
index 086e2f16..a0563fb7 100644
--- a/src/api/MarketingCenter/ContractCapitalManagement.js
+++ b/src/api/MarketingCenter/ContractCapitalManagement.js
@@ -271,7 +271,7 @@ export function editTime(code, num2) {
     data: {
       type: '2',
       name: '合同资金管理_批次付款表_修改计划时间',
-      param: '批次资金ID=' + code + '=int&计划付款时间=' + num2 + '=string'
+      param: '批次资金ID=' + code + '=int&执行进度ID=' + num2 + '=int'
     }
   })
 }
@@ -352,3 +352,24 @@ export function SelectContractFunds(num1, pageCurrent, pageSize) {
     }
   })
 }
+export function executionProgressID() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_执行进度_查询'
+    }
+  })
+}
+export function never(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同资金管理_催收账款_不再提醒',
+      param: '批次资金ID=' + num1 + '=int'
+    }
+  })
+}
diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js
index 87d185cb..4ac07334 100644
--- a/src/api/TechnologyCenter/ImportParts.js
+++ b/src/api/TechnologyCenter/ImportParts.js
@@ -279,26 +279,26 @@ export function searchGroupNum1(project, name) {
   })
 }
 // 传递零件
-export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, type, transmit, num6, id) {
+export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: 'PDM_零件明细表_基本件_大量导入',
-      param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id
+      param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id
     }
   })
 }
 // 传递零件
-export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, type, transmit, num6, id, oldId) {
+export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, oldId, oldNum) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: 'PDM_零件明细表_整改件_大量导入',
-      param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&前id=' + oldId
+      param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/CreatingProcurementContracts.js b/src/api/WorkshopProcurement/CreatingProcurementContracts.js
index ab3db574..1ac2a3ec 100644
--- a/src/api/WorkshopProcurement/CreatingProcurementContracts.js
+++ b/src/api/WorkshopProcurement/CreatingProcurementContracts.js
@@ -149,14 +149,14 @@ export function searchSheetContract(num1) {
   })
 }
 // 生成采购合同
-export function doneContract(num1, RequisitionNumber, name1, time1, time2, method, num2, text, freight, num3, partsNum, priceGroup, payGroup, planGroup, taxGroup, currency, num4, id) {
+export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, AdvanceCharge) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单和请购单明细_增加数据',
-      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&付款方式=${method}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&付款比例组=${payGroup}&计划付款时间组=${planGroup}&税率组=${taxGroup}&币种流水号组=${currency}`
+      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&预付款=${AdvanceCharge}`
     }
   })
 }
diff --git a/src/icons/svg/ImportChangeParts.svg b/src/icons/svg/ImportChangeParts.svg
new file mode 100644
index 00000000..5d0be802
--- /dev/null
+++ b/src/icons/svg/ImportChangeParts.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1544235859959" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="561" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M953.274192 628.793006l-21.366633-21.325701c-5.910617-5.880941-15.507182-5.880941-21.391193 0l-32.075533 31.949666 42.75885 42.652426 32.075533-31.949666C959.186855 644.23879 959.186855 634.704646 953.274192 628.793006zM728.751602 788.699949l-14.251585 56.841589 56.979736-14.21884L728.751602 788.699949zM739.51576 778.022773l42.72815 42.621726 128.300085-127.927601-42.756803-42.652426L739.51576 778.022773zM839.594083 865.172645c0 38.442544-27.164686 52.501748-65.626673 52.501748L157.075455 917.674393c-16.229636 0.966001-52.501748-33.390481-52.501748-52.501748L104.573707 156.403143c1.426489-19.86135 34.018791-52.501748 52.501748-52.501748l616.891955 0c30.474059-0.665149 65.626673 31.57002 65.626673 52.501748L839.594083 589.540004c0 10.377348 39.375799 10.377348 39.375799 0L878.969882 169.528068c0-53.803393-47.801702-105.002472-101.634772-105.002472L162.815179 64.525596c-53.827953 0-97.617271 43.767829-97.617271 97.571223l0 697.383174c0 53.80237 43.789319 97.570199 97.617271 97.570199l614.519931 0c53.834092 0 101.634772-38.075177 101.634772-91.877547C878.969882 846.096171 839.594083 846.096171 839.594083 865.172645zM252.739235 240.400209c-5.16565-5.158487-12.421914-8.162914-19.723204-8.162914-7.30129 0-14.557554 3.004427-19.718087 8.162914-5.164626 5.16258-8.172123 12.413727-8.172123 19.713994 0 7.297197 3.007497 14.549368 8.172123 19.711947 5.160533 5.15951 12.416797 8.162914 19.718087 8.162914 7.30129 0 14.557554-3.003404 19.723204-8.162914 5.164626-5.16258 8.170077-12.413727 8.170077-19.711947C260.909311 252.813936 257.903861 245.562788 252.739235 240.400209zM629.588115 235.154741 288.328801 235.154741c-15.683191 0-15.244192 38.895869 0.440022 38.895869l340.819293 0.479931C645.457548 274.531564 645.457548 235.154741 629.588115 235.154741zM252.739235 342.627475c-5.16565-5.158487-12.421914-8.162914-19.723204-8.162914-7.30129 0-14.557554 3.004427-19.718087 8.162914-5.164626 5.16258-8.172123 12.413727-8.172123 19.712971 0 7.299243 3.007497 14.550391 8.172123 19.712971 5.160533 5.15951 12.416797 8.163937 19.718087 8.163937 7.30129 0 14.557554-3.004427 19.723204-8.163937 5.164626-5.16258 8.170077-12.413727 8.170077-19.712971C260.909311 355.041202 257.903861 347.789031 252.739235 342.627475zM629.588115 340.158237 288.328801 340.158237c-15.868409 0-15.868409 39.375799 0 39.375799l341.259314 0C645.457548 379.534036 645.457548 340.158237 629.588115 340.158237zM252.739235 444.853717c-5.16565-5.158487-12.421914-8.162914-19.723204-8.162914-7.30129 0-14.557554 3.004427-19.718087 8.162914-5.164626 5.16258-8.172123 12.413727-8.172123 19.712971 0 7.299243 3.007497 14.550391 8.172123 19.713994 5.160533 5.16258 12.416797 8.162914 19.718087 8.162914 7.30129 0 14.557554-3.000334 19.723204-8.162914 5.164626-5.163603 8.170077-12.415774 8.170077-19.713994C260.909311 457.267445 257.903861 450.016297 252.739235 444.853717zM233.016031 538.88737c-7.30129 0-14.557554 3.004427-19.718087 8.167007-5.164626 5.158487-8.172123 12.413727-8.172123 19.712971s3.007497 14.552437 8.172123 19.708877c5.160533 5.163603 12.416797 8.167007 19.718087 8.167007 7.30129 0 14.557554-3.003404 19.723204-8.167007 5.164626-5.15644 8.170077-12.409634 8.170077-19.708877s-3.00545-14.554484-8.170077-19.712971C247.573585 541.891797 240.317321 538.88737 233.016031 538.88737zM629.588115 445.160709 288.328801 445.160709c-15.683191 0-15.244192 38.895869 0.440022 38.895869l340.819293 0.479931C645.457548 484.537532 645.457548 445.160709 629.588115 445.160709zM629.588115 550.164205 288.328801 550.164205c-15.868409 0-15.868409 39.375799 0 39.375799l341.259314 0C645.457548 589.540004 645.457548 550.164205 629.588115 550.164205z" p-id="562"></path></svg>
\ No newline at end of file
diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue
index 46db63a9..d018ba5c 100644
--- a/src/views/Inventory/OfflinePurchase/index.vue
+++ b/src/views/Inventory/OfflinePurchase/index.vue
@@ -62,12 +62,12 @@
             {{ scope.row.供货商 }}
           </template>
         </el-table-column>
-        <el-table-column label="当前库存量" min-width="200" align="center">
+        <el-table-column label="当前库存量" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.当前库存量 }}
           </template>
         </el-table-column>
-        <el-table-column label="安全库存量" min-width="200" align="center">
+        <el-table-column label="安全库存量" min-width="100" align="center">
           <template slot-scope="scope">
             <template v-if="scope.row.changeSafeValue">
               <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
@@ -131,7 +131,6 @@
         style="margin-left: 10px"
         @click="addMateriel">选入物料</el-button>
     </el-card>
-
     <el-card>
       <el-table v-loading="" :data="tableData2" border style="max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
         <el-table-column label="请购单状态" align="center" width="80" fixed="left">
@@ -145,14 +144,14 @@
             {{ 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.请购人编号 }}
+            {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库流水号" align="center" min-width="250">
+        <el-table-column label="仓库" align="center" min-width="250">
           <template slot-scope="scope">
-            {{ scope.row.仓库流水号 }}
+            {{ scope.row.仓库名称 }}
           </template>
         </el-table-column>
         <el-table-column label="请购时间" align="center" width="100">
@@ -162,8 +161,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="280" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="parseInt(scope.row.离线合同状态)!==1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)">作废</el-button>
-            <el-button type="warning" size="mini" icon="el-icon-download">传递</el-button>
+            <el-button :disabled="parseInt(scope.row.离线合同状态) === 1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)">作废</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -177,8 +175,9 @@
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange2"
           @current-change="handleCurrentChange2"/>
+        <el-button style="margin-left:500px;" type="warning" size="mini" icon="el-icon-download" @click="doneRequestCard()">传递</el-button>
       </div>
-      <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 300px;" height="300px" size="mini" show-summary>
+      <el-table v-loading="" :data="tableData3" border style="max-height: 300px;" height="300px" size="mini">
         <el-table-column label="离线请购单编号" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.请购单编号 }}
@@ -211,121 +210,11 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
-      <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="供应商名称">
-              <el-input v-model="supplierName" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="企业性质">
-              <el-input v-model="enterpriseNature" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="货期">
-              <el-input v-model="goodTime" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="注册资本">
-              <el-input v-model="registeredCapital" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="税号">
-              <el-input v-model="taxNum" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电子邮箱">
-              <el-input v-model="EMail" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="地址">
-              <el-input v-model="address" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="账号">
-              <el-input v-model="account" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="开户行">
-              <el-input v-model="openingBank" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电话号码">
-              <el-input v-model="phone" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="传真">
-              <el-input v-model="fax" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-button
-              type="success"
-              size="small"
-              icon="el-icon-search"
-              @click="searchSupplier">查询</el-button>
-            <el-button
-              type="primary"
-              size="small"
-              icon="el-icon-check"
-              @click="submitSelectSupplier">确定</el-button>
-            <el-button
-              type="danger"
-              size="small"
-              icon="el-icon-delete"
-              @click="emptySupplierDetail">清空</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="tableData01" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="200px" border @row-click="showSupplierDetail">
-          <el-table-column align="center" label="供应商名称" min-width="250">
-            <template slot-scope="scope">
-              {{ scope.row.供应商名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="企业性质" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.企业性质 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="创立日期" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.创立日期 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="注册资本" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.注册资本 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { searchRequestCard, initWarehouse, addRequestCard, searchInventoryNum, SeeDetail, addRequestCardDetail } from '@/api/Inventory/OfflinePurchase'
+import { searchRequestCard, initWarehouse, addRequestCard, searchInventoryNum, SeeDetail, addRequestCardDetail, deleteRequest, deleteRequestDetail, alterNumber, setSafeValue } from '@/api/Inventory/OfflinePurchase'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -395,7 +284,7 @@ export default {
       disable2: true,
       disable3: true,
       disable4: true,
-      disable: true, // 其他的禁用
+      disable: false, // 其他的禁用
       House: [],
       HouseNumber: ''
     }
@@ -427,6 +316,8 @@ export default {
     searchTable2() {
       if (this.purchasecard === '') {
         this.purchasecard_check = 0
+      } else {
+        this.purchasecard_check = 1
       }
       searchRequestCard(this.pageCurrent2, this.pageSize2, this.purchasecard_check, this.purchasecard).then(response => {
         this.tableData2 = response.data.rows
@@ -450,6 +341,11 @@ export default {
       }
       searchInventoryNum(this.pageCurrent1, this.pageSize1, this.materialName_check, this.materialName, this.inventoryStateValue_check, this.inventoryStateValue).then(response => {
         this.tableData1 = response.data.rows
+        this.tableData1.map(v => {
+          this.$set(v, 'changeSafeValue', false)
+          v.原安全库存量 = v.安全库存量
+          return v
+        })
         this.total1 = response.data.total
       })
     },
@@ -465,15 +361,17 @@ export default {
     addTableData() {
       if (this.HouseNumber === '') {
         this.$message.error('请选择仓库')
+      } else {
+        console.log(this.id, this.HouseNumber)
+        addRequestCard(this.id, this.HouseNumber).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('添加成功')
+            this.searchTable2()
+          } else {
+            this.$message.error('添加失败')
+          }
+        })
       }
-      console.log(this.id, this.HouseNumber)
-      addRequestCard(this.id, this.HouseNumber).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.error('添加成功')
-        } else {
-          this.$message.error('添加失败')
-        }
-      })
     },
     handleSelectionChange(val) {
       this.materielGroup = []
@@ -496,6 +394,96 @@ export default {
           }
         })
       }
+    },
+    deleteOfflineContract(row) { // 删除请购单
+      this.$confirm('确定删除该请购单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteRequest(row.离线请购单流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.searchTable2()
+            SeeDetail(this.purchasecardnumber).then(response => {
+              this.tableData3 = response.data
+            })
+          } else { this.$message.error('删除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    deleteMateriel(row) { // 删除请购单明细
+      this.$confirm('确定移除该物料?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteRequestDetail(row.离线请购单明细流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('移除成功')
+            this.searchTable2()
+            SeeDetail(this.purchasecardnumber).then(response => {
+              this.tableData3 = response.data
+            })
+          } else { this.$message.error('移除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消作废'
+        })
+      })
+    },
+    cancelEdit(row) { // 取消设置
+      row.安全库存量 = row.原安全库存量
+      row.changeSafeValue = false
+      this.$message('取消修改')
+    },
+    confirmEdit(row) { // 确认设置
+      Number(row.安全库存量) ? row.安全库存量 = Number(row.安全库存量) : row.安全库存量 = 0
+      setSafeValue(row.物料流水号, parseInt(row.安全库存量)).then(response => {
+        if (response.data[0].result === '1') {
+          row.changeSafeValue = false
+          this.$message.success('设置成功')
+          this.searchTable1()
+        } else {
+          this.$message.error('设置失败')
+        }
+      })
+    },
+    // 传递请购单
+    doneRequestCard() {
+      this.$confirm('确定传递请购单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.partGroup = []
+        this.numGroup = []
+        for (let i = 0; i < this.tableData3.length; i++) {
+          this.partGroup.push(this.tableData3[i].离线请购单明细流水号)
+          this.numGroup.push(this.tableData3[i].数量)
+        }
+        alterNumber(this.purchasecardnumber, this.partGroup, this.numGroup).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('请购单生成成功')
+            this.searchTable2()
+            SeeDetail(this.purchasecardnumber).then(response => {
+              this.tableData3 = response.data
+            })
+          } else { this.$message.error('请购单生成失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
     }
   }
 }
diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue
index 0e7c15a2..512471e7 100644
--- a/src/views/Inventory/PartOut/index.vue
+++ b/src/views/Inventory/PartOut/index.vue
@@ -39,6 +39,7 @@
       <el-table
         v-loading="listLoading1"
         :data="tableDataPicking"
+        size="mini"
         border
         style="width: 100%;"
         height="400">
@@ -47,12 +48,12 @@
           align="center"
           type="index"
           width="50"/>
-        <el-table-column label="项目名称" align="center" min-width="130">
+        <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="130">
+        <el-table-column label="机床图号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -62,17 +63,17 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="领用数量" align="center" min-width="130">
+        <el-table-column label="领用数量" align="center" width="50">
           <template slot-scope="scope">
             {{ scope.row.出库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库" align="center" min-width="130">
+        <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="130">
+        <el-table-column label="货位" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.货位名称 }}
           </template>
@@ -87,13 +88,29 @@
             {{ scope.row.类型名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="80">
+        <el-table-column label="操作" align="center" min-width="200">
           <template slot-scope="scope">
+            <el-button :disabled="scope.row.是否出库" size="small" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
             <el-button :disabled="scope.row.是否出库" size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
+    <!--异常出库对话框-->
+    <el-dialog :visible.sync="dialogFormVisible1" title="编辑直达件" center width="380px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left">
+        <el-form-item label="异常数量" prop="ContractNumberValue" label-width="100px" size="small">
+          <el-input v-model="form.ErrorNumber" size="small" placeholder="到货数量" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="异常原因" prop="TotalContractAmount" label-width="100px">
+          <el-input v-model="form.Reason" size="small" placeholder="请输入备注" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOff('form')">取消</el-button>
+        <el-button type="primary" @click="editDirectPartm()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -131,7 +148,15 @@ export default {
       outNote: '', // 出库备注
       getpicikingPeople: '', // 领料人
       listLoading: '',
-      listLoading1: ''
+      listLoading1: '',
+      rules: { // 表单验证规则
+        ErrorNumber: [{ required: true, message: '请输入直达件数量', trigger: 'blur' }],
+        Reason: [{ required: true, message: '请选择领用人', trigger: 'blur' }]
+      },
+      form: {
+        ErrorNumber: '',
+        Reason: ''
+      }
     }
   },
   computed: {
@@ -209,6 +234,9 @@ export default {
           } else { this.$message.error('增加失败') }
         })
       }
+    },
+    ErrorpartOut() {
+      console.log(21231)
     }
   }
 }
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 6c216be6..045412de 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -285,6 +285,11 @@
             {{ scope.row.待出库数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="备注" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.入库备注 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件类型" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.类型名称 }}
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index ca5358cd..daf11a83 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -101,7 +101,7 @@
             </el-table-column>
             <el-table-column label="备注" align="center">
               <template slot-scope="scope">
-                {{ scope.row.备注 }}
+                {{ scope.row.零件备注 }}
               </template>
             </el-table-column>
           </el-table>
@@ -275,6 +275,11 @@
             {{ 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="250px" fixed="right">
           <template slot-scope="scope">
             <el-button type="danger" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)">移出</el-button>
@@ -329,6 +334,11 @@
             {{ 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="250px" fixed="right">
           <template slot-scope="scope">
             <el-button type="danger" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)">移出</el-button>
@@ -380,7 +390,7 @@
 </template>
 
 <script>
-import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, MoveOut, MoveOut1, PurchasingDepartment, Production } from '@/api/ManufacturingCenter/PartAssignment'
+import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
 export default {
   inject: ['reload'],
@@ -669,7 +679,7 @@ export default {
           this.PartToolNumber[i] = val[i].零件图号
           this.Material[i] = val[i].材料
           this.NumberOfParts[i] = val[i].零件数量
-          this.ReMarks[i] = val[i].备注
+          this.ReMarks[i] = val[i].零件备注
         }
       } else if (this.PartType === '外购件') {
         this.MaterialNum = []
@@ -708,117 +718,141 @@ export default {
     purchaseRequisition() {
       if (this.RequisitionList !== '') {
         if (this.time !== '') {
-          this.result = 0
-          if (this.PartType === '基本件') {
-            for (let i = 0; i < this.BasicPartsNumber.length; i++) {
-              purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.PartToolNumber[i], this.Material[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
-                this.result += parseInt(response.data[0].result)
-                console.log(this.result)
-                if (this.result === this.BasicPartsNumber.length) {
-                  console.log(1111)
-                  this.$message.success('请购成功')
-                  searchPart(this.groupFloatValue).then(response => {
-                    this.tableData1 = response.data
-                  })
-                  searchDetailed1(this.RequisitionList).then(response => {
-                    for (let i = 0; i < response.data.length; i++) {
-                      if (response.data[i].物料计划到货时间 !== '') {
-                        response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+          if (this.BasicPartsNumber.length !== 0 || this.StandardPartsAndOutsourcing.length !== 0) {
+            this.result = 0
+            if (this.PartType === '基本件') {
+              for (let i = 0; i < this.BasicPartsNumber.length; i++) {
+                purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.PartToolNumber[i], this.Material[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
+                  this.result += parseInt(response.data[0].result)
+                  console.log(this.result)
+                  if (this.result === this.BasicPartsNumber.length) {
+                    console.log(1111)
+                    this.$message.success('请购成功')
+                    searchPart(this.groupFloatValue).then(response => {
+                      this.tableData1 = response.data
+                    })
+                    searchDetailed1(this.RequisitionList).then(response => {
+                      for (let i = 0; i < response.data.length; i++) {
+                        if (response.data[i].物料计划到货时间 !== '') {
+                          response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                        }
                       }
-                    }
-                    this.tableData6 = response.data
-                  })
-                }
-              })
-            }
-          } else if (this.PartType === '外购件') {
-            for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
-              purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
-                this.result += parseInt(response.data[0].result)
-                if (this.result === this.StandardPartsAndOutsourcing.length) {
-                  this.$message.success('请购成功')
-                  searchPart1(this.groupFloatValue, 2).then(response => {
-                    this.tableData2 = response.data
-                  })
-                  searchDetailed(this.RequisitionList).then(response => {
-                    for (let i = 0; i < response.data.length; i++) {
-                      if (response.data[i].物料计划到货时间 !== '') {
-                        response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                      this.tableData6 = response.data
+                    })
+                  }
+                })
+              }
+            } else if (this.PartType === '外购件') {
+              for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
+                purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
+                  this.result += parseInt(response.data[0].result)
+                  if (this.result === this.StandardPartsAndOutsourcing.length) {
+                    this.$message.success('请购成功')
+                    searchPart1(this.groupFloatValue, 2).then(response => {
+                      this.tableData2 = response.data
+                    })
+                    searchDetailed(this.RequisitionList).then(response => {
+                      for (let i = 0; i < response.data.length; i++) {
+                        if (response.data[i].物料计划到货时间 !== '') {
+                          response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                        }
                       }
-                    }
-                    this.tableData5 = response.data
-                  })
-                }
-              })
-            }
-          } else if (this.PartType === '标准件') {
-            for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
-              purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
-                this.result += parseInt(response.data[0].result)
-                if (this.result === this.StandardPartsAndOutsourcing.length) {
-                  this.$message.success('请购成功')
-                  searchPart1(this.groupFloatValue, 1).then(response => {
-                    this.tableData3 = response.data
-                  })
-                  searchDetailed(this.RequisitionList).then(response => {
-                    for (let i = 0; i < response.data.length; i++) {
-                      if (response.data[i].物料计划到货时间 !== '') {
-                        response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                      this.tableData5 = response.data
+                    })
+                  }
+                })
+              }
+            } else if (this.PartType === '标准件') {
+              for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
+                purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
+                  this.result += parseInt(response.data[0].result)
+                  if (this.result === this.StandardPartsAndOutsourcing.length) {
+                    this.$message.success('请购成功')
+                    searchPart1(this.groupFloatValue, 1).then(response => {
+                      this.tableData3 = response.data
+                    })
+                    searchDetailed(this.RequisitionList).then(response => {
+                      for (let i = 0; i < response.data.length; i++) {
+                        if (response.data[i].物料计划到货时间 !== '') {
+                          response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                        }
                       }
-                    }
-                    this.tableData5 = response.data
-                  })
-                }
-              })
+                      this.tableData5 = response.data
+                    })
+                  }
+                })
+              }
             }
+          } else {
+            this.$message.warning('请选择零件或物料')
           }
         } else {
-          this.$message.warning('请选择计划到货时间')
+          this.$message.warning('请选择交货期')
         }
       } else {
         this.$message.warning('请先选择请购单')
       }
     },
     PurchasingDepartment() {
-      this.result = 0
       if (this.time !== '') {
-        for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
-          PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.time, this.MaterialNum[i], this.NumberOfParts[i], this.projectFloatValue, this.machineFloatValue).then(response => {
-            this.result += parseInt(response.data[0].result)
-            if (this.result === this.StandardPartsAndOutsourcing.length) {
-              this.$message.success('请购成功')
-              if (this.PartType === '外购件') {
-                searchPart1(this.groupFloatValue, 2).then(response => {
-                  this.tableData2 = response.data
+        if (this.BasicPartsNumber.length !== 0 || this.StandardPartsAndOutsourcing.length !== 0) {
+          if (this.PartType === '基本件') {
+            purchaseRequisition2(this.projectFloatValue, this.machineFloatValue, this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.time).then(response => {
+              if (response.data[0].result !== '0') {
+                console.log(response.data[0].result)
+                this.$message.success('请购成功')
+                searchPart(this.groupFloatValue).then(response => {
+                  this.tableData1 = response.data
+                })
+                searchDetailed1(this.RequisitionList).then(response => {
+                  for (let i = 0; i < response.data.length; i++) {
+                    if (response.data[i].物料计划到货时间 !== '') {
+                      response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                    }
+                  }
+                  this.tableData6 = response.data
                 })
               } else {
-                searchPart1(this.groupFloatValue, 1).then(response => {
-                  this.tableData3 = response.data
-                })
+                this.$message.success('请购失败')
               }
-            }
-          })
+            })
+          } else {
+            PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing, this.time, this.MaterialNum, this.NumberOfParts, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
+              if (response.data[0].result !== '0') {
+                this.$message.success('请购成功')
+                if (this.PartType === '外购件') {
+                  searchPart1(this.groupFloatValue, 2).then(response => {
+                    this.tableData2 = response.data
+                  })
+                } else {
+                  searchPart1(this.groupFloatValue, 1).then(response => {
+                    this.tableData3 = response.data
+                  })
+                }
+              } else {
+                this.$message.success('请购失败')
+              }
+            })
+          }
+        } else {
+          this.$message.warning('请选择零件或物料')
         }
       } else {
-        this.$message.warning('请选择计划到货时间')
+        this.$message.warning('请选择交货期')
       }
     },
     Production() {
-      this.result = 0
       if (this.PartType === '基本件' && this.BasicPartsNumber.length !== 0) {
-        for (let i = 0; i < this.BasicPartsNumber.length; i++) {
-          Production(this.groupFloatValue, this.BasicPartsNumber[i], this.projectFloatValue, this.machineFloatValue).then(response => {
-            this.result += parseInt(response.data[0].result)
-            if (this.result === this.BasicPartsNumber.length) {
-              this.$message.success('投产成功')
-              searchPart(this.groupFloatValue).then(response => {
-                this.tableData1 = response.data
-              })
-            } else {
-              this.$message.error('投产失败')
-            }
-          })
-        }
+        Production(this.groupFloatValue, this.BasicPartsNumber, this.projectFloatValue, this.machineFloatValue).then(response => {
+          if (response.data[0].result !== '0') {
+            this.$message.success('投产成功')
+            searchPart(this.groupFloatValue).then(response => {
+              this.tableData1 = response.data
+            })
+          } else {
+            this.$message.error('投产失败')
+          }
+        })
       } else {
         this.$message.warning('请选择基本件')
       }
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 44e2d5c2..227a4c79 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -71,14 +71,14 @@
             {{ scope.row.合同总金额 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已支付金额（元）" width="150">
+        <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">
+        <el-table-column align="center" label="未到账金额（元）" width="150">
           <template slot-scope="scope">
-            <el-tag type="warning">{{ scope.row.未支付金额 }}</el-tag>
+            <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="付款进度" width="150">
@@ -197,54 +197,67 @@
           align="center"
           label="付款批次"
           type="index"
-          width="100"/>
-        <el-table-column align="center" label="应收金额（元）">
+          width="150"/>
+        <el-table-column align="center" label="应收金额（元）" width="180px">
           <template slot-scope="scope">
             {{ scope.row.应收金额 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已收金额">
+        <el-table-column align="center" label="已收金额（元）" width="180px">
           <template slot-scope="scope">
             {{ scope.row.已收金额 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="未收金额">
+        <el-table-column align="center" label="未收金额（元）" width="180px">
           <template slot-scope="scope">
-            <el-tag type="warning">{{ scope.row.未收金额 }}</el-tag>
+            <el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="转下阶段收款金额">
+        <el-table-column align="center" label="转下阶段收款金额" width="180px">
           <template slot-scope="scope">
             {{ scope.row.转下阶段金额 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="提前X天提醒">
+        <el-table-column align="center" label="收款阶段" width="180px">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.提前x天提醒" size="small" style="width:80px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
+            <el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="small" @change="changeTime(scope.row)">
+              <el-option
+                v-for="item in plannedTime"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="计划收款时间">
+        <el-table-column align="center" label="时间节点" width="180px">
           <template slot-scope="scope">
-            <el-date-picker
-              v-model="scope.row.计划付款时间"
-              style="width:135px"
-              value-format="yyyy-MM-dd"
-              size="small"
-              type="date"
-              placeholder="请选择本次付款时间"
-              @change="changeTime(scope.row)"/>
+            <span>后</span>
+            <el-input v-model="scope.row.提前x天提醒" size="small" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
+            <span>天</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="状态">
+        <el-table-column align="center" label="状态" width="100px">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" size="small">无计划</el-tag>
-            <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" type="success" size="small">已完成</el-tag>
-            <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='未开始'" type="primary" size="small">未开始</el-tag>
-            <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='即将拖期'" type="warning" size="small">即将拖期</el-tag>
-            <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" type="danger" size="small">已拖期</el-tag>
+            <el-popover
+              placement="top-start"
+              title="收款计划"
+              width="200"
+              trigger="hover">
+              <div v-show="!scope.row.计划付款时间" style="text-align: center">
+                <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>
+              </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>
+              <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>
+              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag>
+            </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="280">
+        <el-table-column label="操作" fixed="right" align="center" width="220">
           <template slot-scope="scope">
             <el-button
               :disabled="scope.row.是否禁用收款"
@@ -429,49 +442,53 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="AccountsReceivableVisible">
-      <el-table :data="gridData" :row-style="tableRowClassName" height="260">
-        <el-table-column property="date" label="项目名称" width="200">
+    <el-dialog :visible.sync="AccountsReceivableVisible" width="60%">
+      <el-table :data="gridData" :row-style="tableRowClassName" height="260" size="mini" border>
+        <el-table-column property="date" label="项目名称" width="200" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column property="name" label="客户名称">
+        <el-table-column property="name" label="客户名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-        <el-table-column property="address" label="联系人">
+        <el-table-column property="address" label="联系人" width="80px" align="center">
           <template slot-scope="scope">
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-        <el-table-column property="date" label="联系电话">
+        <el-table-column property="date" label="联系电话" align="center" width="120px">
           <template slot-scope="scope">
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-        <el-table-column property="name" label="计划收款时间" width="130px">
+        <el-table-column property="name" label="计划收款时间" width="130px" align="center">
           <template slot-scope="scope">
             {{ scope.row.计划付款时间 }}
           </template>
         </el-table-column>
-        <el-table-column property="name" label="计划阶段">
+        <el-table-column property="name" label="阶段" width="60" align="center">
           <template slot-scope="scope">
             {{ scope.row.付款批次 }}
           </template>
         </el-table-column>
-        <el-table-column property="address" label="状态">
+        <el-table-column property="address" label="状态" width="70px" align="center">
           <template slot-scope="scope">
             {{ scope.row.状态 }}
           </template>
         </el-table-column>
-        <el-table-column property="date" label="操作">
+        <el-table-column property="date" label="操作" align="center">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="success"
               @click="Detail(scope.row)">立即收款</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="Never(scope.row)">不再提醒</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -481,7 +498,7 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { searchProjectNumber2, SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
+import { never, executionProgressID, searchProjectNumber2, SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
 
 export default {
   components: {
@@ -496,6 +513,7 @@ export default {
       }
     }
     return {
+      plannedTime: [],
       entryName2: [],
       count1: 0,
       type: '',
@@ -618,6 +636,7 @@ export default {
       this.getSelect(searchProjectNumber, ['项目名称', '项目流水号'], 'entryName')
       this.getSelect(searchProjectNumber2, ['项目名称', '项目流水号'], 'entryName2')
       this.getSelect(PaymentPhase, ['付款阶段', '付款阶段ID'], 'PaymentPhase')
+      this.getSelect(executionProgressID, ['执行进度名', '执行进度ID'], 'plannedTime')
       AccountsReceivable().then(response => {
         const data = response.data
         for (let i = 0; i < data.length; i++) {
@@ -664,9 +683,16 @@ export default {
           for (let i = 0; i < data.length; i++) {
             data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
             data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+            data[i].执行进度id = parseInt(data[i].执行进度id)
+            if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+              data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+            }
             if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+              data[i].是否禁用收款 = true
               data[i].状态 = '无计划'
             } else {
+              data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+              data[i].是否禁用收款 = false
               if (data[i].未收金额 === '0') {
                 data[i].状态 = '已完成'
               } else {
@@ -691,7 +717,7 @@ export default {
     },
     changeTime(row) {
       const timeid = row.批次资金id
-      const time = row.计划付款时间
+      const time = row.执行进度id
       editTime(timeid, time).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('信息更新成功')
@@ -714,9 +740,16 @@ export default {
             for (let i = 0; i < data.length; i++) {
               data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
               data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+              data[i].执行进度id = parseInt(data[i].执行进度id)
+              if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+                data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+              }
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+                data[i].是否禁用收款 = true
                 data[i].状态 = '无计划'
               } else {
+                data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+                data[i].是否禁用收款 = false
                 if (data[i].未收金额 === '0') {
                   data[i].状态 = '已完成'
                 } else {
@@ -880,9 +913,16 @@ export default {
         for (let i = 0; i < data.length; i++) {
           data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
           data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+          data[i].执行进度id = parseInt(data[i].执行进度id)
+          if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+            data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+          }
           if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+            data[i].是否禁用收款 = true
             data[i].状态 = '无计划'
           } else {
+            data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+            data[i].是否禁用收款 = false
             if (data[i].未收金额 === '0') {
               data[i].状态 = '已完成'
             } else {
@@ -948,9 +988,16 @@ export default {
             for (let i = 0; i < data.length; i++) {
               data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
               data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+              data[i].执行进度id = parseInt(data[i].执行进度id)
+              if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+                data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+              }
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+                data[i].是否禁用收款 = true
                 data[i].状态 = '无计划'
               } else {
+                data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+                data[i].是否禁用收款 = false
                 if (data[i].未收金额 === '0') {
                   data[i].状态 = '已完成'
                 } else {
@@ -1012,9 +1059,16 @@ export default {
               for (let i = 0; i < data.length; i++) {
                 data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
                 data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+                data[i].执行进度id = parseInt(data[i].执行进度id)
+                if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+                  data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+                }
                 if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+                  data[i].是否禁用收款 = true
                   data[i].状态 = '无计划'
                 } else {
+                  data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+                  data[i].是否禁用收款 = false
                   if (data[i].未收金额 === '0') {
                     data[i].状态 = '已完成'
                   } else {
@@ -1119,9 +1173,16 @@ export default {
                   for (let i = 0; i < data.length; i++) {
                     data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
                     data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+                    data[i].执行进度id = parseInt(data[i].执行进度id)
+                    if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+                      data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+                    }
                     if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+                      data[i].是否禁用收款 = true
                       data[i].状态 = '无计划'
                     } else {
+                      data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+                      data[i].是否禁用收款 = false
                       if (data[i].未收金额 === '0') {
                         data[i].状态 = '已完成'
                       } else {
@@ -1194,9 +1255,16 @@ export default {
                   for (let i = 0; i < data.length; i++) {
                     data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
                     data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+                    data[i].执行进度id = parseInt(data[i].执行进度id)
+                    if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+                      data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+                    }
                     if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+                      data[i].是否禁用收款 = true
                       data[i].状态 = '无计划'
                     } else {
+                      data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+                      data[i].是否禁用收款 = false
                       if (data[i].未收金额 === '0') {
                         data[i].状态 = '已完成'
                       } else {
@@ -1257,9 +1325,16 @@ export default {
                 for (let i = 0; i < data.length; i++) {
                   data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
                   data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+                  data[i].执行进度id = parseInt(data[i].执行进度id)
+                  if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+                    data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+                  }
                   if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+                    data[i].是否禁用收款 = true
                     data[i].状态 = '无计划'
                   } else {
+                    data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+                    data[i].是否禁用收款 = false
                     if (data[i].未收金额 === '0') {
                       data[i].状态 = '已完成'
                     } else {
@@ -1331,9 +1406,16 @@ export default {
             for (let i = 0; i < data.length; i++) {
               data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
               data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+              data[i].执行进度id = parseInt(data[i].执行进度id)
+              if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+                data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+              }
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+                data[i].是否禁用收款 = true
                 data[i].状态 = '无计划'
               } else {
+                data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+                data[i].是否禁用收款 = false
                 if (data[i].未收金额 === '0') {
                   data[i].状态 = '已完成'
                 } else {
@@ -1389,9 +1471,16 @@ export default {
             for (let i = 0; i < data.length; i++) {
               data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
               data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+              data[i].执行进度id = parseInt(data[i].执行进度id)
+              if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+                data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+              }
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+                data[i].是否禁用收款 = true
                 data[i].状态 = '无计划'
               } else {
+                data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+                data[i].是否禁用收款 = false
                 if (data[i].未收金额 === '0') {
                   data[i].状态 = '已完成'
                 } else {
@@ -1460,9 +1549,16 @@ export default {
         for (let i = 0; i < data.length; i++) {
           data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
           data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+          data[i].执行进度id = parseInt(data[i].执行进度id)
+          if (data[i].节点日期 !== '' && data[i].节点日期 !== null) {
+            data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8)
+          }
           if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
+            data[i].是否禁用收款 = true
             data[i].状态 = '无计划'
           } else {
+            data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
+            data[i].是否禁用收款 = false
             if (data[i].未收金额 === '0') {
               data[i].状态 = '已完成'
             } else {
@@ -1489,6 +1585,29 @@ export default {
       } else {
         return ''
       }
+    },
+    Never(row) {
+      never(row.批次资金ID).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('信息更新成功')
+          AccountsReceivable().then(response => {
+            const data = response.data
+            for (let i = 0; i < data.length; i++) {
+              data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 9)
+              if (data[i].状态 === '1') {
+                data[i].状态 = '即将拖期'
+              }
+              if (data[i].状态 === '2') {
+                data[i].状态 = '已拖期'
+              }
+            }
+            this.gridData = data
+            this.value = response.data.length
+          })
+        } else {
+          this.$message.error('信息更新失败')
+        }
+      })
     }
   }
 }
diff --git a/src/views/TechnologyCenter/ImportChangeParts/index.vue b/src/views/TechnologyCenter/ImportChangeParts/index.vue
index bb1e7089..27d5a90f 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/index.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/index.vue
@@ -161,7 +161,6 @@ export default {
             classificationCode
           console.log(this.worksheet[j].M2.v.substring(0, 1))
           if (this.worksheet[j].M2.v.substring(0, 1) === '9') {
-            console.log('哈哈哈哈哈')
             const response = await isExit(this.projectValue, this.worksheet[j].F2.v)
             const res = response.data
             if (res[0].Column1 === 0) {
@@ -198,9 +197,6 @@ export default {
                 } else {
                   if (machineNum && groupNum) {
                     await sleep(50)
-                    if (classificationCode) {
-                      drawingNum += '-' + classificationCode
-                    }
                     await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
                   } else {
                     this.loading = false
@@ -232,9 +228,13 @@ export default {
         if (groupNum.indexOf('MX') > -1) {
           const response = await importBasics(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
           const res = response.data
+          console.log(res)
           if (res[0].result === '0') {
             this.$notify.error(`${drawingNum}导入失败`)
           }
+          if (res[0].result === '2') {
+            this.$notify.error(`${drawingNum}导入重复`)
+          }
         } else {
           const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
           const res = response.data
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index 40ed0bf3..2d78a2d6 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -544,7 +544,8 @@ export default {
           for (let i = 0; i < this.tableDataAll.length; i++) {
             const data = this.tableDataAll[i]
             const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
-            const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id, data.前id)
+            console.log(data.前id, data.前图号或者型号)
+            const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号)
             await sleep(10)
             if (resp.data[0].result === '0') {
               this.err++
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index b037f57d..bcac8fcd 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -167,54 +167,57 @@ export default {
             this.disabled = false
             return
           } else {
-            console.log(this.worksheet[j], 2222)
-            this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
-            this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''
-            this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = ''
-            this.worksheet[j].P1 ? date = this.worksheet[j].P1.v : date = ''
-            this.worksheet[j].Q1 ? pageNum = parseInt(this.worksheet[j].Q1.v.replace(/[^0-9]/ig, '')) : pageNum = ''
-            this.worksheet[j].C2 ? machineName = this.worksheet[j].C2.v : machineName = ''
-            this.worksheet[j].F2 ? machineNum = this.worksheet[j].F2.v : machineNum = ''
-            this.worksheet[j].J2 ? componentName = this.worksheet[j].J2.v : componentName = ''
-            this.worksheet[j].P2 ? componentNum = this.worksheet[j].P2.v : componentNum = ''
-            this.worksheet[j].Q2 ? totalNum = parseInt(this.worksheet[j].Q2.v.replace(/[^0-9]/ig, '')) : totalNum = ''
-            this.worksheet[j].R2 ? contractNum = this.worksheet[j].R2.v : contractNum = ''
-            this.worksheet[j].M2 ? groupNum = this.worksheet[j].M2.v : groupNum = ''
-            for (let i = 0; i < 999; i++) {
-              const attr = i + 4
-              drawingNum = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
-              name = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
-              type = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : ''
-              material = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : ''
-              spareNum = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : ''
-              useNum = this.worksheet[j][`M${attr}`] ? this.worksheet[j][`M${attr}`].v : ''
-              manufacturer = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : ''
-              remarks = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : ''
-              classificationCode = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : ''
-              console.log(drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode, 2222222222)
-              if (!drawingNum && !name && !type && !material && !spareNum && !useNum && !manufacturer && !remarks && !classificationCode) { // 当图号、名称、规格、材料、备件数量、装机数量、制造商、备注、分类码都为空时，循环终止，防止向数据库中插入多余且无用的数据
-                break
-              } else {
-                if (machineNum && groupNum) {
-                  await sleep(50)
-                  if (classificationCode) {
-                    drawingNum += '-' + classificationCode
-                  }
-                  await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
+            if (this.worksheet[j].M2.v.substring(0, 1) !== '9') {
+              this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
+              this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''
+              this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = ''
+              this.worksheet[j].P1 ? date = this.worksheet[j].P1.v : date = ''
+              this.worksheet[j].Q1 ? pageNum = parseInt(this.worksheet[j].Q1.v.replace(/[^0-9]/ig, '')) : pageNum = ''
+              this.worksheet[j].C2 ? machineName = this.worksheet[j].C2.v : machineName = ''
+              this.worksheet[j].F2 ? machineNum = this.worksheet[j].F2.v : machineNum = ''
+              this.worksheet[j].J2 ? componentName = this.worksheet[j].J2.v : componentName = ''
+              this.worksheet[j].P2 ? componentNum = this.worksheet[j].P2.v : componentNum = ''
+              this.worksheet[j].Q2 ? totalNum = parseInt(this.worksheet[j].Q2.v.replace(/[^0-9]/ig, '')) : totalNum = ''
+              this.worksheet[j].R2 ? contractNum = this.worksheet[j].R2.v : contractNum = ''
+              this.worksheet[j].M2 ? groupNum = this.worksheet[j].M2.v : groupNum = ''
+              for (let i = 0; i < 999; i++) {
+                const attr = i + 4
+                drawingNum = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
+                name = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
+                type = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : ''
+                material = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : ''
+                spareNum = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : ''
+                useNum = this.worksheet[j][`M${attr}`] ? this.worksheet[j][`M${attr}`].v : ''
+                manufacturer = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : ''
+                remarks = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : ''
+                classificationCode = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : ''
+                if (!drawingNum && !name && !type && !material && !spareNum && !useNum && !manufacturer && !remarks && !classificationCode) { // 当图号、名称、规格、材料、备件数量、装机数量、制造商、备注、分类码都为空时，循环终止，防止向数据库中插入多余且无用的数据
+                  break
                 } else {
-                  this.loading = false
-                  this.disabled = false
-                  this.$notify.error(`请确认导入文件是否正确`)
-                  return
+                  if (machineNum && groupNum) {
+                    await sleep(50)
+                    if (classificationCode) {
+                      drawingNum += '-' + classificationCode
+                    }
+                    await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
+                  } else {
+                    this.loading = false
+                    this.disabled = false
+                    this.$notify.error(`请确认导入文件是否正确`)
+                    return
+                  }
                 }
               }
+            } else {
+              this.$notify.error('禁止导入整改组')
+              break
             }
           }
           this.itemFile.splice(j, 1)
           this.worksheet.splice(j, 1)
+          this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败零件个数为${this.err}，请检查文件是否正确`)
         }
         this.loading = false
-        this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败零件个数为${this.err}，请检查文件是否正确`)
         this.projectChange(this.projectName) // 调用查询机床方法，通过watch属性检测变化会自动得到下面表格的值。
       } catch (e) {
         console.log(e)
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index be6c409e..16d5b4ad 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -487,8 +487,9 @@ export default {
           if (this.groupValue.indexOf('MX') > -1) {
             for (let i = 0; i < this.tableDataAll.length; i++) {
               const data = this.tableDataAll[i]
+              console.log(data)
               const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
-              const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id)
+              const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id)
               await sleep(10)
               if (resp.data[0].result === '0') {
                 this.err++
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 4ea18908..4c2bc6f9 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -28,7 +28,7 @@
           :value="item.value"/>
       </el-select>
 
-      <el-button icon="el-icon-search" type="success" size="small" @click="getTableData">查询</el-button>
+      <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
     </el-card>
     <el-card v-if="groupName && groupName.indexOf('MX') > -1">
       <el-table
@@ -158,7 +158,6 @@
               size="mini"
               type="danger"
               icon="el-icon-delete"
-              disabled
               @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -244,6 +243,10 @@ export default {
     },
     groupValue(val) {
       if (val) {
+        this.pageCurrentWB = 1
+        this.pageSizeWB = 10
+        this.pageCurrent = 1
+        this.pageSize = 10
         this.getTableData()
       }
     }
diff --git a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
index d2ccab24..7ad264e5 100644
--- a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
+++ b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
@@ -14,6 +14,9 @@
       </el-select>
       <span>供应商:</span>
       <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
+      <span>提前</span>
+      <el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
+      <span>天预警</span>
       <el-button
         type="success"
         size="small"
@@ -70,7 +73,7 @@
             <el-progress
               :text-inside="true"
               :stroke-width="18"
-              :percentage="100*(parseInt(scope.row.合同物料到货总数)/parseInt(scope.row.合同物料采购总数)).toFixed(4)"
+              :percentage="parseFloat((100*scope.row.合同物料到货总数/scope.row.合同物料采购总数).toFixed(2))"
               status="success"/>
           </template>
         </el-table-column>
@@ -162,6 +165,7 @@ export default {
   name: '', // 项目总价查询
   data() {
     return {
+      warningValue: 3,
       check1: 0,
       check2: 0,
       contractNumValue: '',
@@ -202,6 +206,7 @@ export default {
       })
     },
     searchTable1() {
+      this.warningValue ? this.warningValue : this.warningValue = 1
       this.arrival = [] // 规定到货时间数组
       this.now = new Date()
       this.contractNumValue ? this.check1 = 1 : this.check1 = 0
@@ -210,13 +215,13 @@ export default {
         for (let i = 0; i < response.data.rows.length; i++) {
           this.arrival.push(new Date(response.data.rows[i].规定到货时间))
           if (parseInt(response.data.rows[i].合同物料到货总数) === parseInt(response.data.rows[i].合同物料采购总数)) {
-            this.judge[i] = 1
-          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.now - this.arrival[i]) > 0 && (this.now - this.arrival[i]) < 86400000) {
-            this.judge[i] = 2
-          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.now - this.arrival[i]) > 86400000) {
-            this.judge[i] = 3
-          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.now - this.arrival[i]) < 0) {
-            this.judge[i] = 4
+            this.judge[i] = 1 // 全部到货
+          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) > 0 && (this.arrival[i] - this.now) < (86400000 * this.warningValue)) {
+            this.judge[i] = 2 // 即将拖期
+          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) < 0) {
+            this.judge[i] = 3 // 已拖期
+          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) > (86400000 * this.warningValue)) {
+            this.judge[i] = 4 // 进度正常
           }
         }
         this.tableData1 = response.data.rows
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index a0f75bc3..864835ad 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -26,13 +26,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="预付款">
-              <el-select v-model="payMethodValue" placeholder="预付款" size="small" @change="payMethodChange">
-                <el-option
-                  v-for="item in payMethod"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
+              <el-input v-model="AdvanceCharge" size="small" placeholder="预付款"/>
+              <!--<el-select v-model="payMethodValue" placeholder="预付款" size="small" @change="payMethodChange">-->
+              <!--<el-option-->
+              <!--v-for="item in payMethod"-->
+              <!--:key="item.value"-->
+              <!--:label="item.label"-->
+              <!--:value="item.value"/>-->
+              <!--</el-select>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -355,7 +356,7 @@
 </template>
 
 <script>
-import { searchSupplier, initPayMethod, initPayTimeNode, update, doneContract, initPurchaseOrder, searchData, searchData1, searchData2, searchContractDemo } from '@/api/WorkshopProcurement/CreatingProcurementContracts'
+import { searchSupplier, update, doneContract, initPurchaseOrder, searchData, searchData1, searchData2, searchContractDemo } from '@/api/WorkshopProcurement/CreatingProcurementContracts'
 import { mapGetters } from 'vuex'
 export default {
   inject: ['reload'],
@@ -370,6 +371,7 @@ export default {
           }
         }
       },
+      AdvanceCharge: '',
       loading: false,
       dialogVisible1: false,
       disable2: true,
@@ -545,14 +547,14 @@ export default {
       }
     },
     searchDemo(row = this.paramRow) {
-      for (let i = 0; i < this.payMethod.length; i++) {
-        if (this.payMethod[i].value === this.payMethodValue) {
-          this.payMethodName = this.payMethod[i].label
-        }
-      }
+      // for (let i = 0; i < this.payMethod.length; i++) {
+      //   if (this.payMethod[i].value === this.payMethodValue) {
+      //     this.payMethodName = this.payMethod[i].label
+      //   }
+      // }
       this.paramRow = row
       searchContractDemo(this.paramRow.合同模板流水号).then(response => {
-        this.textArea = response.data[0].合同模板内容.replace('stipulateArrivalTime', this.stipulateArrivalTime).replace('payMethodName', this.payMethodName)
+        this.textArea = response.data[0].合同模板内容.replace('stipulateArrivalTime', this.stipulateArrivalTime).replace('AdvanceCharge', this.AdvanceCharge)
       })
     },
     contractChange() {
@@ -562,49 +564,49 @@ export default {
       searchContractDemo().then(response => { // 初始化合同模板
         this.tableData2 = response.data
       })
-      this.payMethod = []
-      initPayMethod().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.payMethod.push({
-            label: response.data[i].付款方式内容,
-            value: response.data[i].付款方式流水号
-          })
-        }
-      })
-      this.payTime1 = []
-      this.payTime2 = []
-      this.payTime3 = []
-      this.payTime4 = []
-      this.payTime5 = []
-      this.payTime6 = []
-      initPayTimeNode().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.payTime1.push({
-            label: response.data[i].付款时间节点名称,
-            value: response.data[i].付款时间节点流水号
-          })
-          this.payTime2.push({
-            label: response.data[i].付款时间节点名称,
-            value: response.data[i].付款时间节点流水号
-          })
-          this.payTime3.push({
-            label: response.data[i].付款时间节点名称,
-            value: response.data[i].付款时间节点流水号
-          })
-          this.payTime4.push({
-            label: response.data[i].付款时间节点名称,
-            value: response.data[i].付款时间节点流水号
-          })
-          this.payTime5.push({
-            label: response.data[i].付款时间节点名称,
-            value: response.data[i].付款时间节点流水号
-          })
-          this.payTime6.push({
-            label: response.data[i].付款时间节点名称,
-            value: response.data[i].付款时间节点流水号
-          })
-        }
-      })
+      // this.payMethod = []
+      // initPayMethod().then(response => {
+      //   for (let i = 0; i < response.data.length; i++) {
+      //     this.payMethod.push({
+      //       label: response.data[i].付款方式内容,
+      //       value: response.data[i].付款方式流水号
+      //     })
+      //   }
+      // })
+      // this.payTime1 = []
+      // this.payTime2 = []
+      // this.payTime3 = []
+      // this.payTime4 = []
+      // this.payTime5 = []
+      // this.payTime6 = []
+      // initPayTimeNode().then(response => {
+      //   for (let i = 0; i < response.data.length; i++) {
+      //     this.payTime1.push({
+      //       label: response.data[i].付款时间节点名称,
+      //       value: response.data[i].付款时间节点流水号
+      //     })
+      //     this.payTime2.push({
+      //       label: response.data[i].付款时间节点名称,
+      //       value: response.data[i].付款时间节点流水号
+      //     })
+      //     this.payTime3.push({
+      //       label: response.data[i].付款时间节点名称,
+      //       value: response.data[i].付款时间节点流水号
+      //     })
+      //     this.payTime4.push({
+      //       label: response.data[i].付款时间节点名称,
+      //       value: response.data[i].付款时间节点流水号
+      //     })
+      //     this.payTime5.push({
+      //       label: response.data[i].付款时间节点名称,
+      //       value: response.data[i].付款时间节点流水号
+      //     })
+      //     this.payTime6.push({
+      //       label: response.data[i].付款时间节点名称,
+      //       value: response.data[i].付款时间节点流水号
+      //     })
+      //   }
+      // })
       this.getSelect(initPurchaseOrder, ['请购单编号', '请购单流水号'], 'contractNum')
     },
     searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
@@ -676,8 +678,8 @@ export default {
         this.group1 = ''
         this.group2 = ''
         this.group3 = ''
-        this.group5 = ''
-        this.group6 = ''
+        // this.group5 = ''
+        // this.group6 = ''
         this.group7 = ''
         this.group8 = ''
         this.group9 = ''
@@ -703,50 +705,50 @@ export default {
             this.RequisitionNumber = this.contractNum[i].label
           }
         }
-        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(':')
-        if (payTimeNum.length > 1) {
-          for (let i = 0; i < payTimeNum.length; i++) {
-            switch (i) {
-              case 0:
-                this.group6 += this.payTime1Value + ','
-                break
-              case 1:
-                this.group6 += this.payTime2Value + ','
-                break
-              case 2:
-                this.group6 += this.payTime3Value + ','
-                break
-              case 3:
-                this.group6 += this.payTime4Value + ','
-                break
-              case 4:
-                this.group6 += this.payTime5Value + ','
-                break
-              case 5:
-                this.group6 += this.payTime6Value + ','
-                break
-            }
-            this.group5 += payTimeNum[i] + ',' // 付款比例 付款方式 付款计划
-          }
-        } else {
-          this.group5 = '10,' // 付款比例 付款方式 付款计划
-          this.group6 = this.payTime1Value + ',' // 付款时间
-        }
+        // 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(':')
+        // if (payTimeNum.length > 1) {
+        //   for (let i = 0; i < payTimeNum.length; i++) {
+        //     switch (i) {
+        //       case 0:
+        //         this.group6 += this.payTime1Value + ','
+        //         break
+        //       case 1:
+        //         this.group6 += this.payTime2Value + ','
+        //         break
+        //       case 2:
+        //         this.group6 += this.payTime3Value + ','
+        //         break
+        //       case 3:
+        //         this.group6 += this.payTime4Value + ','
+        //         break
+        //       case 4:
+        //         this.group6 += this.payTime5Value + ','
+        //         break
+        //       case 5:
+        //         this.group6 += this.payTime6Value + ','
+        //         break
+        //     }
+        //     this.group5 += payTimeNum[i] + ',' // 付款比例 付款方式 付款计划
+        //   }
+        // } else {
+        //   this.group5 = '10,' // 付款比例 付款方式 付款计划
+        //   this.group6 = this.payTime1Value + ',' // 付款时间
+        // }
         this.group1 = this.group1.substr(0, this.group1.length - 1)
         this.group2 = this.group2.substr(0, this.group2.length - 1)
         this.group3 = this.group3.substr(0, this.group3.length - 1)
-        this.group5 = this.group5.substr(0, this.group5.length - 1)
-        this.group6 = this.group6.substr(0, this.group6.length - 1)
-        this.group7 = this.group7.substr(0, this.group7.length - 1)
-        this.group8 = this.group8.substr(0, this.group8.length - 1)
-        this.group9 = this.group9.substr(0, this.group9.length - 1)
-        this.group10 = this.group10.substr(0, this.group10.length - 1)
-        doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.payMethodName, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group5, this.group6, this.group7, this.group8, this.group9, this.id).then(response => {
+        // this.group5 = this.group5.substr(0, this.group5.length - 1)
+        // this.group6 = this.group6.substr(0, this.group6.length - 1)
+        // this.group7 = this.group7.substr(0, this.group7.length - 1)
+        // this.group8 = this.group8.substr(0, this.group8.length - 1)
+        // this.group9 = this.group9.substr(0, this.group9.length - 1)
+        // this.group10 = this.group10.substr(0, this.group10.length - 1)
+        doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.AdvanceCharge).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('生成合同成功')
             this.reload()
@@ -754,59 +756,59 @@ 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()
-    },
+    // 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 768cc19b..a695567d 100644
--- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
+++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
@@ -78,9 +78,9 @@
             {{ scope.row.总金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" width="80" align="center">
+        <el-table-column label="预付款" width="80" align="center">
           <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
+            {{ scope.row.预付款 }}
           </template>
         </el-table-column>
         <el-table-column label="欠款金额" min-width="70" align="center">
@@ -226,9 +226,9 @@
             {{ scope.row.总金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" min-width="80" align="center">
+        <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">
diff --git a/src/views/WorkshopProcurement/FundApproval1/index.vue b/src/views/WorkshopProcurement/FundApproval1/index.vue
index c206c011..a01cb5a8 100644
--- a/src/views/WorkshopProcurement/FundApproval1/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval1/index.vue
@@ -23,9 +23,9 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" align="center" min-width="100">
+        <el-table-column label="预付款" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
+            {{ scope.row.预付款 }}
           </template>
         </el-table-column>
         <el-table-column label="采购员" align="center" min-width="70">
diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue
index e2c6dcc7..e457a357 100644
--- a/src/views/WorkshopProcurement/FundApproval2/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval2/index.vue
@@ -23,9 +23,9 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" align="center" min-width="100">
+        <el-table-column label="预付款" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
+            {{ scope.row.预付款 }}
           </template>
         </el-table-column>
         <el-table-column label="采购员" align="center" min-width="70">
diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue
index 2f7fd24a..8fd7d5da 100644
--- a/src/views/WorkshopProcurement/FundApproval3/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval3/index.vue
@@ -23,9 +23,9 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" align="center" min-width="100">
+        <el-table-column label="预付款" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
+            {{ scope.row.预付款 }}
           </template>
         </el-table-column>
         <el-table-column label="采购员" align="center" min-width="70">
diff --git a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
index 89692100..a8229a7e 100644
--- a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
@@ -51,7 +51,7 @@
         </el-table-column>
         <el-table-column align="center" label="到票情况" min-width="200px">
           <template slot-scope="scope">
-            <el-progress :text-inside="true" :stroke-width="18" :percentage="100*(scope.row.到票总金额/scope.row.合同总金额).toFixed(4)" status="success"/>
+            <el-progress :text-inside="true" :stroke-width="18" :percentage="100*(scope.row.到票总金额/scope.row.合同总金额).toFixed(2)" status="success"/>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/WorkshopProcurement/PayStateSearch/index.vue b/src/views/WorkshopProcurement/PayStateSearch/index.vue
index de24816a..c5369aba 100644
--- a/src/views/WorkshopProcurement/PayStateSearch/index.vue
+++ b/src/views/WorkshopProcurement/PayStateSearch/index.vue
@@ -44,9 +44,9 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" align="center" min-width="100">
+        <el-table-column label="预付款" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
+            {{ scope.row.预付款 }}
           </template>
         </el-table-column>
         <el-table-column label="采购员" align="center" min-width="70">
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index a4a0f8ea..b8ab7d43 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -64,9 +64,9 @@
             {{ scope.row.总金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" align="center" width="200">
+        <el-table-column label="预付款" align="center" width="200">
           <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
+            {{ scope.row.预付款 }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
@@ -116,6 +116,8 @@
                 <td colspan="2" align="center">零件名称</td>
                 <td colspan="1" align="center">零件图号</td>
                 <td colspan="1" align="center">材料</td>
+                <td colspan="1" align="center">交货期</td>
+                <td colspan="1" align="center">备注</td>
                 <td colspan="1" align="center">数量</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
@@ -129,6 +131,8 @@
                 <td colspan="2" align="center">物料名称</td>
                 <td colspan="1" align="center">物料规格</td>
                 <td colspan="1" align="center">物料型号</td>
+                <td colspan="1" align="center">交货期</td>
+                <td colspan="1" align="center">备注</td>
                 <td colspan="1" align="center">数量</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
@@ -136,13 +140,17 @@
             </tbody>
             <tfoot>
               <tr style="height: 40px">
-                <td colspan="6">运费：</td>
+                <td colspan="8">运费：</td>
                 <td colspan="1" align="center">{{ freight }}</td>
               </tr>
               <tr style="height: 40px">
-                <td colspan="6">总价:  (人民币){{ RMB }}(含0.17增值税) </td>
+                <td colspan="8">总价:  (人民币){{ RMB }}(未税) </td>
                 <td colspan="1" align="center">{{ TotalAmount }}</td>
               </tr>
+              <tr style="height: 40px">
+                <td colspan="8">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
+                <td colspan="1" align="center">{{ TotalAmount1 }}</td>
+              </tr>
             </tfoot>
           </table>
           <div id="23"/>
@@ -235,6 +243,9 @@ export default {
       supplier: '',
       supplierName: '',
       supplierValue: '',
+      taxRate: '',
+      TotalAmount1: '',
+      RMB1: '',
       total1: 0,
       pageCurrent1: 1,
       pageSize1: 10,
@@ -369,9 +380,12 @@ export default {
       this.textarea = row.合同文本
       this.supplier = row.供应商名称
       this.contract = row.采购合同编号
+      this.taxRate = row.税率
       this.freight = parseInt(row.总金额) - parseInt(row.总金额_小计)
       this.RMB = row.总金额_文本
       this.TotalAmount = row.总金额
+      this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100
+      this.RMB1 = row.含税总金额_文本
       document.getElementById('23').innerText = this.textarea
       this.contractValue = parseInt(row.采购合同流水号)
       searchTable2(this.contractValue).then(response => {
@@ -388,16 +402,18 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
           tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead').after(tr[i])
         }
         for (let j = 0; j < this.returns.length; j++) {
           document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料规格
           document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].物料型号
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
+          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
         }
       })
       searchTable3(this.contractValue).then(response => {
@@ -414,16 +430,18 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData1')
           tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead1').after(tr[i])
         }
         for (let j = 0; j < this.returns1.length; j++) {
           document.getElementsByClassName('tableData1')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData1')[j].children[1].innerHTML = response.data[j].零件图号
           document.getElementsByClassName('tableData1')[j].children[2].innerHTML = response.data[j].材料
-          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].备注
+          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData1')[j].children[7].innerHTML = response.data[j].金额
         }
       })
     }
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index fee43a92..1092b7a6 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -73,9 +73,9 @@
             {{ scope.row.总金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="付款方式" align="center" width="200">
+        <el-table-column label="预付款" align="center" width="200">
           <template slot-scope="scope">
-            {{ scope.row.付款方式内容 }}
+            {{ scope.row.预付款 }}
           </template>
         </el-table-column>
         <el-table-column label="审批情况" align="center" width="100">
@@ -135,6 +135,8 @@
                 <td colspan="2" align="center">零件名称</td>
                 <td colspan="1" align="center">零件图号</td>
                 <td colspan="1" align="center">材料</td>
+                <td colspan="1" align="center">交货期</td>
+                <td colspan="1" align="center">备注</td>
                 <td colspan="1" align="center">数量</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
@@ -148,6 +150,8 @@
                 <td colspan="2" align="center">物料名称</td>
                 <td colspan="1" align="center">物料规格</td>
                 <td colspan="1" align="center">物料型号</td>
+                <td colspan="1" align="center">交货期</td>
+                <td colspan="1" align="center">备注</td>
                 <td colspan="1" align="center">数量</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
@@ -155,13 +159,17 @@
             </tbody>
             <tfoot>
               <tr style="height: 40px">
-                <td colspan="6">运费：</td>
+                <td colspan="8">运费：</td>
                 <td colspan="1" align="center">{{ freight }}</td>
               </tr>
               <tr style="height: 40px">
-                <td colspan="6">总价:  (人民币){{ RMB }}(含0.17增值税) </td>
+                <td colspan="8">总价:  (人民币){{ RMB }}(未税) </td>
                 <td colspan="1" align="center">{{ TotalAmount }}</td>
               </tr>
+              <tr style="height: 40px">
+                <td colspan="8">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
+                <td colspan="1" align="center">{{ TotalAmount1 }}</td>
+              </tr>
             </tfoot>
           </table>
           <div id="23"/>
@@ -242,6 +250,9 @@ export default {
       startEndDate: '',
       contract: '',
       freight: '',
+      taxRate: '',
+      TotalAmount1: '',
+      RMB1: '',
       contractNumValue: '',
       contractNum: [],
       ProcurementContractNum: '',
@@ -365,9 +376,12 @@ export default {
       this.textarea = row.合同文本
       this.supplier = row.供应商名称
       this.contract = row.采购合同编号
+      this.taxRate = row.税率
       this.freight = parseInt(row.总金额) - parseInt(row.总金额_小计)
       this.RMB = row.总金额_文本
       this.TotalAmount = row.总金额
+      this.TotalAmount1 = parseInt((row.含税总金额) * 100) / 100
+      this.RMB1 = row.含税总金额_文本
       document.getElementById('23').innerText = this.textarea
       this.contractValue = parseInt(row.采购合同流水号)
       searchTable2(this.contractValue).then(response => {
@@ -384,16 +398,18 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
           tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead').after(tr[i])
         }
         for (let j = 0; j < this.returns.length; j++) {
           document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料规格
           document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].物料型号
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
+          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
         }
       })
       searchTable3(this.contractValue).then(response => {
@@ -410,16 +426,18 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData1')
           tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead1').after(tr[i])
         }
         for (let j = 0; j < this.returns1.length; j++) {
           document.getElementsByClassName('tableData1')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData1')[j].children[1].innerHTML = response.data[j].零件图号
           document.getElementsByClassName('tableData1')[j].children[2].innerHTML = response.data[j].材料
-          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].备注
+          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData1')[j].children[7].innerHTML = response.data[j].金额
         }
       })
     }
diff --git a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
index cf617ec6..3065686d 100644
--- a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
@@ -59,9 +59,9 @@
                 {{ scope.row.总金额 }}
               </template>
             </el-table-column>
-            <el-table-column label="付款方式" align="center">
+            <el-table-column label="预付款" align="center">
               <template slot-scope="scope">
-                {{ scope.row.付款方式内容 }}
+                {{ scope.row.预付款 }}
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="100" fixed="right">
@@ -110,6 +110,8 @@
                     <td colspan="2" align="center">零件名称</td>
                     <td colspan="1" align="center">零件图号</td>
                     <td colspan="1" align="center">材料</td>
+                    <td colspan="1" align="center">交货期</td>
+                    <td colspan="1" align="center">备注</td>
                     <td colspan="1" align="center">数量</td>
                     <td colspan="1" align="center">单价</td>
                     <td colspan="1" align="center">总价</td>
@@ -123,6 +125,8 @@
                     <td colspan="2" align="center">物料名称</td>
                     <td colspan="1" align="center">物料规格</td>
                     <td colspan="1" align="center">物料型号</td>
+                    <td colspan="1" align="center">交货期</td>
+                    <td colspan="1" align="center">备注</td>
                     <td colspan="1" align="center">数量</td>
                     <td colspan="1" align="center">单价</td>
                     <td colspan="1" align="center">总价</td>
@@ -130,16 +134,16 @@
                 </tbody>
                 <tfoot>
                   <tr style="height: 40px">
-                    <td colspan="6">运费：</td>
+                    <td colspan="8">运费：</td>
                     <td colspan="1" align="center">{{ freight }}</td>
                   </tr>
                   <tr style="height: 40px">
-                    <td colspan="6">总价:  (人民币){{ RMB }} </td>
+                    <td colspan="8">总价:  (人民币){{ RMB }} </td>
                     <td colspan="1" align="center">{{ TotalAmount }}</td>
                   </tr>
                   <tr style="height: 40px">
-                    <td colspan="6">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
-                    <td colspan="1" align="center">{{ TotalAmount1 }}</td>
+                    <td colspan="8">总价:  (人民币){{ RMB3 }}(含{{ taxRate }}增值税) </td>
+                    <td colspan="1" align="center">{{ TotalAmount3 }}</td>
                   </tr>
                 </tfoot>
               </table>
@@ -213,9 +217,9 @@
                 {{ scope.row.总金额 }}
               </template>
             </el-table-column>
-            <el-table-column label="付款方式" align="center">
+            <el-table-column label="预付款" align="center">
               <template slot-scope="scope">
-                {{ scope.row.付款方式内容 }}
+                {{ scope.row.预付款 }}
               </template>
             </el-table-column>
             <el-table-column label="变更原因" align="center">
@@ -269,6 +273,8 @@
                     <td colspan="2" align="center">零件名称</td>
                     <td colspan="1" align="center">零件图号</td>
                     <td colspan="1" align="center">材料</td>
+                    <td colspan="1" align="center">交货期</td>
+                    <td colspan="1" align="center">备注</td>
                     <td colspan="1" align="center">数量</td>
                     <td colspan="1" align="center">单价</td>
                     <td colspan="1" align="center">总价</td>
@@ -282,6 +288,8 @@
                     <td colspan="2" align="center">物料名称</td>
                     <td colspan="1" align="center">物料规格</td>
                     <td colspan="1" align="center">物料型号</td>
+                    <td colspan="1" align="center">交货期</td>
+                    <td colspan="1" align="center">备注</td>
                     <td colspan="1" align="center">数量</td>
                     <td colspan="1" align="center">单价</td>
                     <td colspan="1" align="center">总价</td>
@@ -289,13 +297,17 @@
                 </tbody>
                 <tfoot>
                   <tr style="height: 40px">
-                    <td colspan="6">运费：</td>
+                    <td colspan="8">运费：</td>
                     <td colspan="1" align="center">{{ freight1 }}</td>
                   </tr>
                   <tr style="height: 40px">
-                    <td colspan="6">总价:  (人民币){{ RMB1 }}(含0.16增值税) </td>
+                    <td colspan="8">总价:  (人民币){{ RMB1 }} </td>
                     <td colspan="1" align="center">{{ TotalAmount1 }}</td>
                   </tr>
+                  <tr style="height: 40px">
+                    <td colspan="8">总价:  (人民币){{ RMB4 }}(含{{ taxRate1 }}增值税) </td>
+                    <td colspan="1" align="center">{{ TotalAmount4 }}</td>
+                  </tr>
                 </tfoot>
               </table>
               <div id="24"/>
@@ -367,7 +379,11 @@ export default {
       RMB: '',
       TotalAmount: '',
       RMB1: '',
+      RMB3: '',
+      RMB4: '',
       TotalAmount1: '',
+      TotalAmount3: '',
+      TotalAmount4: '',
       check1: 0,
       check2: 0,
       check3: 0,
@@ -380,6 +396,7 @@ export default {
       freight: '',
       freight1: '',
       taxRate: '',
+      taxRate1: '',
       contractNumValue: '',
       contractNum: [],
       contractNumValue1: '',
@@ -567,14 +584,15 @@ export default {
       this.textarea = row.合同文本
       this.supplier = row.供应商名称
       this.contract = row.采购合同编号
+      this.taxRate = row.税率
       this.freight = parseInt(row.总金额) - parseInt(row.总金额_小计)
       this.RMB = row.总金额_文本
       this.TotalAmount = row.总金额
+      this.TotalAmount3 = parseInt((row.含税总金额) * 100) / 100
+      this.RMB3 = row.含税总金额_文本
       document.getElementById('23').innerText = this.textarea
       this.contractValue = parseInt(row.采购合同流水号)
       searchTable2(this.contractValue).then(response => {
-        console.log(response.data)
-        this.taxRate = response.data[0].税率
         this.returns = response.data
         const children = document.getElementsByClassName('tableData')
         const parent = document.getElementById('4')
@@ -588,16 +606,18 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
           tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead').after(tr[i])
         }
         for (let j = 0; j < this.returns.length; j++) {
           document.getElementsByClassName('tableData')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData')[j].children[1].innerHTML = response.data[j].物料规格
           document.getElementsByClassName('tableData')[j].children[2].innerHTML = response.data[j].物料型号
-          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+          document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
+          document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
         }
       })
       searchTable5(this.contractValue).then(response => {
@@ -614,16 +634,18 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData2')
           tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead2').after(tr[i])
         }
         for (let j = 0; j < this.returns2.length; j++) {
           document.getElementsByClassName('tableData2')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData2')[j].children[1].innerHTML = response.data[j].零件图号
           document.getElementsByClassName('tableData2')[j].children[2].innerHTML = response.data[j].材料
-          document.getElementsByClassName('tableData2')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData2')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData2')[j].children[5].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData2')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+          document.getElementsByClassName('tableData2')[j].children[4].innerHTML = response.data[j].备注
+          document.getElementsByClassName('tableData2')[j].children[5].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData2')[j].children[6].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData2')[j].children[7].innerHTML = response.data[j].金额
         }
       })
     },
@@ -632,9 +654,12 @@ export default {
       this.textarea1 = row.合同文本
       this.supplier1 = row.供应商名称
       this.contract1 = row.采购合同编号
+      this.taxRate1 = row.税率
       this.freight1 = parseInt(row.总金额) - parseInt(row.总金额_小计)
       this.RMB1 = row.总金额_文本
       this.TotalAmount1 = row.总金额
+      this.TotalAmount4 = parseInt((row.含税总金额) * 100) / 100
+      this.RMB4 = row.含税总金额_文本
       document.getElementById('24').innerText = this.textarea1
       this.contractValue1 = parseInt(row.采购合同变更流水号)
       searchTable4(this.contractValue1).then(response => {
@@ -651,16 +676,18 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData1')
           tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+              '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead1').after(tr[i])
         }
         for (let j = 0; j < this.returns1.length; j++) {
           document.getElementsByClassName('tableData1')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData1')[j].children[1].innerHTML = response.data[j].物料规格
           document.getElementsByClassName('tableData1')[j].children[2].innerHTML = response.data[j].物料型号
-          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+          document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].备注
+          document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData1')[j].children[7].innerHTML = response.data[j].金额
         }
       })
       searchTable6(this.contractValue1).then(response => {
@@ -677,16 +704,18 @@ export default {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData3')
           tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
-            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
+            '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead3').after(tr[i])
         }
         for (let j = 0; j < this.returns3.length; j++) {
           document.getElementsByClassName('tableData3')[j].children[0].innerHTML = response.data[j].物料名称
           document.getElementsByClassName('tableData3')[j].children[1].innerHTML = response.data[j].零件图号
           document.getElementsByClassName('tableData3')[j].children[2].innerHTML = response.data[j].材料
-          document.getElementsByClassName('tableData3')[j].children[3].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData3')[j].children[4].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData3')[j].children[5].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData3')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
+          document.getElementsByClassName('tableData3')[j].children[4].innerHTML = response.data[j].备注
+          document.getElementsByClassName('tableData3')[j].children[5].innerHTML = response.data[j].数量
+          document.getElementsByClassName('tableData3')[j].children[6].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData3')[j].children[7].innerHTML = response.data[j].金额
         }
       })
     }