diff --git a/src/api/Inventory/PartsReplacement.js b/src/api/Inventory/PartsReplacement.js
index 11c7aea3..adb6bf3b 100644
--- a/src/api/Inventory/PartsReplacement.js
+++ b/src/api/Inventory/PartsReplacement.js
@@ -10,6 +10,17 @@ export function initProject() {
     }
   })
 }
+// 查询仓库
+export function initWarehouse() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_货位仓库_仓库_查询数据'
+    }
+  })
+}
 // 机床查询
 export function searchmachine(check, num) {
   return request({
@@ -75,14 +86,14 @@ export function searchReplacementCard(pageCurrent, pageSize, card_check, card) {
   })
 }
 // 补投增加
-export function addReplacementCard(Number) {
+export function addReplacementCard(Number, house) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_补投单_补投单增加',
-      param: '人员编号=' + Number
+      param: '人员编号=' + Number + '&仓库流水号=' + house
     }
   })
 }
@@ -99,14 +110,14 @@ export function deleteReplacementCard(Number) {
   })
 }
 // 补投增加
-export function addCardDetail(Number, project, machine, team, mun, reason) {
+export function addCardDetail(Number, project, machine, team, name, mass, locate, parttype, reason) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '库存管理_仓库补投_补投单明细增加',
-      param: '补投单流水号=' + Number + '&项目流水号=' + project + '&机床流水号=' + machine + '&组件流水号=' + team + '&补投数量=' + mun + '&原因=' + reason
+      name: '库存管理_零件补投_批量增加补投单明细',
+      param: '补投单流水号=' + Number + '&项目流水号组=' + project + '&机床流水号组=' + machine + '&组件流水号组=' + team + '&名称组=' + name + '&数量组=' + mass + '&货位流水号组=' + locate + '&零件类型组=' + parttype + '&原因组=' + reason
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
index 6507f13d..2a897c9b 100644
--- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js
+++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
@@ -129,7 +129,7 @@ export function initPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=17'
+      param: '考核部门编号=9'
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
index 1c57210f..470c27a3 100644
--- a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
+++ b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
@@ -56,3 +56,24 @@ export function deleteTable(number) {
     }
   })
 }
+export function setUp(time) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_新排产算法_设备能力_系数有效时间设定',
+      param: '系数有效时间=' + time
+    }
+  })
+}
+export function generate() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_新排产算法_设备加工能力_生成设备能力表'
+    }
+  })
+}
diff --git a/src/api/WorkshopProcurement/CreatingProcurementContracts.js b/src/api/WorkshopProcurement/CreatingProcurementContracts.js
index 1ac2a3ec..f66f7185 100644
--- a/src/api/WorkshopProcurement/CreatingProcurementContracts.js
+++ b/src/api/WorkshopProcurement/CreatingProcurementContracts.js
@@ -1,16 +1,5 @@
 import request from '@/utils/request'
 
-// 初始化付款方式
-export function initPayMethod() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_付款方式_查询数据'
-    }
-  })
-}
 // 查询合同模板
 export function searchContractDemo(num1 = null) {
   return request({
@@ -77,17 +66,6 @@ export function update(num, time, remarks) {
     }
   })
 }
-// 初始化付款时间节点
-export function initPayTimeNode() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_付款时间节点_查询数据'
-    }
-  })
-}
 // 查询供应商
 export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
   return request({
@@ -100,54 +78,6 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
     }
   })
 }
-// 查询询价单列表 表1
-export function searchInquirySheet(check1, value1, check2, value2, check3, id) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_询价单_查询数据',
-      param: `供应商流水号_check=${check1}&供应商流水号=${value1}&询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}`
-    }
-  })
-}
-// 根据询价单流水号查询询价单详情
-export function searchSheetDetail(num2) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_询价单明细_查询数据',
-      param: '询价单流水号_check=1&询价单流水号=' + num2
-    }
-  })
-}
-// 移出询价单1
-export function outInquirySheet(num1, num2) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '采购管理_询价单明细_删除数据',
-      param: '询价单流水号=' + num1 + '&组件零件流水号=' + num2
-    }
-  })
-}
-// 根据询价单流水号查询询价单详情(合同内容)
-export function searchSheetContract(num1) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_询价单明细_查询数据_根据询价单',
-      param: '询价单流水号=' + num1
-    }
-  })
-}
 // 生成采购合同
 export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, AdvanceCharge) {
   return request({
diff --git a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js
index 45b771a6..11c45928 100644
--- a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js
+++ b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js
@@ -14,38 +14,38 @@ export function searchInvoice(pageCurrent, pageSize, check1, num1, check2, time,
   })
 }
 // 发票增加
-export function addInvoice(num1, num2, time1, money, send, receive, remark, time2) {
+export function addInvoice(num1, num2, time1, money, send, receive, remark, time2, money1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '采购管理_发票_增加数据',
-      param: '采购合同流水号=' + num1 + '&发票号=' + num2 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark + '&操作时间=' + time2 + '&identity_receiptLiushuihao=1=int=output'
+      param: '采购合同流水号=' + num1 + '&发票号=' + num2 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark + '&扣除金额=' + money1 + '&操作时间=' + time2 + '&identity_receiptLiushuihao=1=int=output'
     }
   })
 }
 // 发票编辑
-export function editInvoice(num1, num2, num3, time1, money, send, receive, remark) {
+export function editInvoice(num1, num2, num3, time1, money, send, receive, remark, money1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '采购管理_发票_修改数据',
-      param: '发票流水号=' + num1 + '&采购合同流水号=' + num2 + '&发票号=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark
+      param: '发票流水号=' + num1 + '&采购合同流水号=' + num2 + '&发票号=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark + '&扣除金额=' + money1
     }
   })
 }
 // 发票删除
-export function deleteInvoice(num1) {
+export function deleteInvoice(num1, num2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '采购管理_发票_删除数据',
-      param: '发票流水号=' + num1
+      param: '发票流水号=' + num1 + '&采购合同流水号=' + num2
     }
   })
 }
diff --git a/src/vendor/exportExcel.js b/src/vendor/exportExcel.js
index cecba6b0..43ec8c71 100644
--- a/src/vendor/exportExcel.js
+++ b/src/vendor/exportExcel.js
@@ -20,7 +20,7 @@ export function Cleanup() {
 }
 const tableToExcel = (function() {
   const uri = 'data:application/vnd.ms-excel;base64,'
-  const template = '<html><head><meta charset="UTF-8"></head><body><table border>{table}</table></body></html>'
+  const template = `<html xmlns:x="urn:schemas-microsoft-com:office:excel"><head><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><meta charset="UTF-8"><style type="text/css">table td {border: 2px solid #000000;width:100px;text-align: center;color: #000000;}</style></head><body><table>{table}</table></body></html>`
   const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) }
   const format = function(s, c) {
     return s.replace(/{(\w+)}/g,
diff --git a/src/views/Inventory/PartsReplacement/index.vue b/src/views/Inventory/PartsReplacement/index.vue
index 818f4ff3..9b06c74c 100644
--- a/src/views/Inventory/PartsReplacement/index.vue
+++ b/src/views/Inventory/PartsReplacement/index.vue
@@ -1,6 +1,14 @@
 <template>
   <div class="app-container">
     <el-card>
+      <el-radio-group
+        v-model="radio"
+        size="small"
+        style="margin: 10px;"
+        @change="BasicShow()">
+        <el-radio v-model="radio" :label="1" >修改记录</el-radio>
+        <el-radio v-model="radio" :label="2" style="margin-left: 2px" >异常记录</el-radio>
+      </el-radio-group>
       <span style="margin-left: 20px">项目名称:</span>
       <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
         <el-option
@@ -25,14 +33,6 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>仓库:</span>
-      <el-select v-model="purchaseStateValue" placeholder="仓库" size="small">
-        <el-option
-          v-for="item in purchaseState"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <el-button
         type="success"
         size="small"
@@ -40,7 +40,7 @@
         style="margin-left: 10px"
         @click="pageCurrent=1;pageSize=10;total=0;getAlterRecord()">查询</el-button>
     </el-card>
-    <el-card>
+    <el-card v-show="altershow">
       <el-table
         v-loading="loading1"
         :data="tableData1"
@@ -50,32 +50,37 @@
         size="mini"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" width="55"/>
-        <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">
             {{ 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">
-            {{ scope.row.供货商 }}
+            {{ scope.row.名称 }}
+          </template>
+        </el-table-column>
+        <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="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.当前库存量 }}
+            {{ scope.row.修改原因 }}
           </template>
         </el-table-column>
-        <el-table-column label="姓名" min-width="100" align="center">
+        <el-table-column label="记录人" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
@@ -85,6 +90,16 @@
             {{ scope.row.修改日期 }}
           </template>
         </el-table-column>
+        <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="100" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.类型名称 }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
@@ -97,6 +112,8 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
       </div>
+    </el-card>
+    <el-card v-show="errorshow">
       <el-table
         v-loading="loading1"
         :data="tableData2"
@@ -106,22 +123,27 @@
         size="mini"
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" width="55"/>
-        <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">
             {{ 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">
+            {{ scope.row.名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="异常数量" min-width="50" align="center">
           <template slot-scope="scope">
             {{ scope.row.异常数量 }}
           </template>
@@ -131,9 +153,19 @@
             {{ scope.row.异常原因 }}
           </template>
         </el-table-column>
-        <el-table-column label="货位流水号" min-width="100" align="center">
+        <el-table-column label="仓库" min-width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.货位流水号 }}
+            {{ scope.row.仓库名称 }}
+          </template>
+        </el-table-column>
+        <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="100" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.类型名称 }}
           </template>
         </el-table-column>
       </el-table>
@@ -202,9 +234,15 @@
             {{ scope.row.补投时间 }}
           </template>
         </el-table-column>
+        <el-table-column label="仓库名称" align="center" min-width="250">
+          <template slot-scope="scope">
+            {{ scope.row.仓库名称 }}
+          </template>
+        </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" @click="doneRequestCard()">传递</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -218,7 +256,6 @@
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange3"
           @current-change="handleCurrentChange3"/>
-        <el-button style="margin-left:500px;" type="warning" size="mini" icon="el-icon-download" @click="doneRequestCard()">传递</el-button>
       </div>
       <el-table v-loading="" :data="tableData4" border style="max-height: 300px;" height="300px" size="mini">
         <el-table-column label="离线请购单编号" align="center" min-width="150">
@@ -257,7 +294,7 @@
 </template>
 
 <script>
-import { initProject, searchmachine, searchTeam, searchAlterRecord, searchErrorRecord, searchReplacementCard, addReplacementCard } from '@/api/Inventory/PartsReplacement'
+import { initProject, searchmachine, searchTeam, searchAlterRecord, searchErrorRecord, searchReplacementCard, addReplacementCard, initWarehouse } from '@/api/Inventory/PartsReplacement'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -290,7 +327,12 @@ export default {
       GroupNumValue_check: '',
       repleacecard: '',
       repleacecard_check: '',
-      people: ''
+      people: '',
+      HouseNumber: '',
+      House: [],
+      radio: '',
+      altershow: true,
+      errorshow: false
     }
   },
   computed: {
@@ -301,12 +343,24 @@ export default {
   created() {
     this.fetchData()
     this.getpeopleid()
+    this.getHouse()
   },
   methods: {
     // 获取人员编号
     getpeopleid() {
       this.people = this.id
     },
+    getHouse() {
+      initWarehouse().then(response => { // 初始化仓库
+        console.log(response)
+        for (let i = 0; i < response.data.length; i++) {
+          this.House.push({
+            label: response.data[i].仓库名称,
+            value: response.data[i].仓库流水号
+          })
+        }
+      })
+    },
     fetchData() {
       this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
     },
@@ -424,7 +478,7 @@ export default {
       })
     },
     addCard() {
-      addReplacementCard(this.people).then(response => {
+      addReplacementCard(this.people, this.HouseNumber).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('增加成功')
           this.getReplacement()
@@ -432,6 +486,15 @@ export default {
           this.$message.error('删除失败')
         }
       })
+    },
+    BasicShow() {
+      if (this.radio === 1) {
+        this.altershow = true
+        this.errorshow = false
+      } else if (this.radio === 2) {
+        this.altershow = false
+        this.errorshow = true
+      }
     }
   }
 }
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index c8c94e65..3d29e001 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -86,7 +86,7 @@
             </el-col>
             <el-col :span="1" class="line">～</el-col>
             <el-col :span="11">
-              <el-date-picker :default-time="['12:00:00']" v-model="time_machiningFinish" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
+              <el-date-picker v-model="time_machiningFinish" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
             </el-col>
           </el-form-item>
         </el-form>
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index daf11a83..fff04203 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -717,7 +717,8 @@ export default {
     },
     purchaseRequisition() {
       if (this.RequisitionList !== '') {
-        if (this.time !== '') {
+        console.log(this.time)
+        if (this.time !== '' && this.time !== null) {
           if (this.BasicPartsNumber.length !== 0 || this.StandardPartsAndOutsourcing.length !== 0) {
             this.result = 0
             if (this.PartType === '基本件') {
@@ -794,7 +795,7 @@ export default {
       }
     },
     PurchasingDepartment() {
-      if (this.time !== '') {
+      if (this.time !== '' && this.time !== null) {
         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 => {
@@ -813,11 +814,11 @@ export default {
                   this.tableData6 = response.data
                 })
               } else {
-                this.$message.success('请购失败')
+                this.$message.error('请购失败')
               }
             })
           } else {
-            PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing, this.time, this.MaterialNum, this.NumberOfParts, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
+            PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing, this.time, this.MaterialNum, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
               if (response.data[0].result !== '0') {
                 this.$message.success('请购成功')
                 if (this.PartType === '外购件') {
@@ -830,7 +831,7 @@ export default {
                   })
                 }
               } else {
-                this.$message.success('请购失败')
+                this.$message.error('请购失败')
               }
             })
           }
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index 80447156..875468b5 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -77,6 +77,17 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
+    <el-card>
+      <span>有效时间：</span>
+      <el-date-picker
+        v-model="time"
+        type="date"
+        size="small"
+        value-format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
+      <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
+    </el-card>
 
     <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
@@ -163,13 +174,14 @@
 </template>
 
 <script>
-import { getData, initProcessing, addTable, editTable, deleteTable } from '@/api/ManufacturingCenter/WorkshopEquipmentManagement'
+import { getData, initProcessing, addTable, editTable, deleteTable, setUp, generate } from '@/api/ManufacturingCenter/WorkshopEquipmentManagement'
 export default {
   data() {
     return {
       equipmentName: '', // 设备名称
       List: [],
       check: 0,
+      time: '',
       pageCurrent: 1,
       pageSize: 10,
       total: null,
@@ -348,6 +360,24 @@ export default {
         })
       })
     },
+    setUp() {
+      if (this.time !== '') {
+        setUp(this.time).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('设定成功')
+          } else { this.$message.error('设定失败') }
+        })
+      } else {
+        this.$message.warning('请选择有效时间')
+      }
+    },
+    generate() {
+      generate().then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('生成成功')
+        } else { this.$message.error('生成失败') }
+      })
+    },
     handleSizeChange(val) {
       this.pageSize = val
       this.pageCurrent = 1
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 7735b5c0..5c3eddfc 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -198,21 +198,23 @@
             </el-table>
           </el-tab-pane>
           <el-tab-pane :disabled="performanceGuaranteeDisabled" label="履约保函" name="second">
-            <el-button type="danger" icon="el-icon-delete" size="small" style="float: right" @click="delPerformanceGuarantee">删除</el-button>
-            <div v-show="performanceGuaranteeShow" style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
-              <el-upload
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                :file-list="fileList"
-                :before-upload="beforeUpload"
-                :on-success="onSuccess"
-                :action="'http://localhost:8411/submit/upload3.ashx?ProjectId='+ projectId"
-                list-type="picture-card">
-                <i class="el-icon-plus"/>
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible">
-                <img :src="dialogImageUrl" width="100%" alt="">
-              </el-dialog>
+            <div v-show="performanceGuaranteeShow">
+              <el-button type="danger" icon="el-icon-delete" size="small" style="float: right;display: inline-block" @click="delPerformanceGuarantee">删除</el-button>
+              <div style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
+                <el-upload
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+                  :file-list="fileList"
+                  :before-upload="beforeUpload"
+                  :on-success="onSuccess"
+                  :action="'http://localhost:8411/submit/upload3.ashx?ProjectId='+ projectId"
+                  list-type="picture-card">
+                  <i class="el-icon-plus"/>
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible">
+                  <img :src="dialogImageUrl" width="100%" alt="">
+                </el-dialog>
+              </div>
             </div>
           </el-tab-pane>
         </el-tabs>
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index a1af70d6..961ce743 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -67,13 +67,6 @@
               <el-input v-model="name" size="small" readonly/>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="运费">
-              <el-input v-model="freight" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
             <el-form-item label="税率">
               <el-input v-model="taxRate" size="small"/>
diff --git a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
index a8229a7e..f675b5e7 100644
--- a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
@@ -49,9 +49,14 @@
             {{ scope.row.到票总金额 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="扣款总金额" min-width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.扣款总金额 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="到票情况" min-width="200px">
           <template slot-scope="scope">
-            <el-progress :text-inside="true" :stroke-width="18" :percentage="100*(scope.row.到票总金额/scope.row.合同总金额).toFixed(2)" 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>
@@ -82,6 +87,11 @@
             {{ scope.row.开票金额 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="扣除金额" min-width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.扣除金额 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="传送人" min-width="80px">
           <template slot-scope="scope">
             {{ scope.row.传送人姓名 }}
@@ -171,6 +181,7 @@ export default {
       this.contractNum ? this.check1 = 1 : this.check1 = 0
       this.supplierName ? this.check2 = 1 : this.check2 = 0
       searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => {
+        console.log(response.data.rows)
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
diff --git a/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue b/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue
new file mode 100644
index 00000000..30830958
--- /dev/null
+++ b/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue
@@ -0,0 +1,1262 @@
+<template>
+  <div class="app-container">
+
+    <el-card>
+      <el-radio-group
+        v-model="radio"
+        size="small"
+        style="margin: 10px;"
+        @change="CraftmenValue = '';checked = false;
+                 partNumValue = '';typeValue = '';partName = '';
+                 material = '';materialName = '';spec = '';batchNum = '';
+                 searchParts()">
+        <el-radio v-model="radio" :label="1">未编制</el-radio>
+        <el-radio v-model="radio" :label="2">已编制</el-radio>
+      </el-radio-group>
+      <span>工艺员:</span>
+      <el-select
+        v-model="CraftmenValue"
+        placeholder="工艺员"
+        size="small"
+        style="width:100px"
+        @change="clearDetail();searchParts()">
+        <el-option
+          v-for="item in Craftmen"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>项目名称:</span>
+      <el-select
+        v-model="partsTypeValue"
+        placeholder="项目名称"
+        size="small"
+        style="width:100px"
+        @change="clearDetail();searchParts()">
+        <el-option
+          v-for="item in partsType"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>机床编号:</span>
+      <el-select
+        v-model="partsTypeValue"
+        placeholder="机床编号"
+        size="small"
+        style="width:100px"
+        @change="clearDetail();searchParts()">
+        <el-option
+          v-for="item in partsType"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>组号:</span>
+      <el-select
+        v-model="partsTypeValue"
+        placeholder="组号"
+        size="small"
+        style="width:100px"
+        @change="clearDetail();searchParts()">
+        <el-option
+          v-for="item in partsType"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>零件图号/物料名称:</span>
+      <el-input
+        v-model="partNumValue"
+        clearable
+        style="width:100px"
+        placeholder="零件图号"
+        size="small"
+        @dblclick.native="searchParts"/>
+      <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询
+      </el-button>
+      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
+      </el-button>
+      <div v-show="isShow">
+        <span>种类:</span>
+        <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
+        <span>零件名称:</span>
+        <el-input v-model="partName" placeholder="零件名称" size="small" readonly style="width:115px"/>
+        <span>材质:</span>
+        <el-input v-model="materialName" placeholder="材质" size="small" style="width:120px" readonly/>
+        <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
+        <span>规格:</span>
+        <el-input v-model="spec" style="width:100px" size="small" placeholder="规格" readonly/>
+        <span>投产总数量:</span>
+        <el-input v-model="batchNum" placeholder="总数量" readonly size="small" style="width:80px;margin-top:10px;"/>
+      </div>
+    </el-card>
+
+    <el-card>
+      <el-row>
+        <span>输入数值:</span>
+        <el-input v-model="numVal" size="small" style="width:100px" placeholder="输入数值"/>
+        <span>选择参数:</span>
+        <el-select v-model="selParaValue" size="small" style="width:100px" placeholder="选择参数">
+          <el-option
+            v-for="item in selPara"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>公差:</span>
+        <el-input v-model="tolerance" size="small" style="width:150px" placeholder="公差"/>
+        <el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
+        <el-button-group v-if="isShow1" style="margin: 10px">
+          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
+          </el-button>
+          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴</el-button>
+          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺
+          </el-button>
+          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
+          </el-button>
+          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-cjn-09" @click="saveApprove">保存
+          </el-button>
+        </el-button-group>
+      </el-row>
+      <el-table
+        v-loading="loading0"
+        :data="tableData"
+        border
+        style="width: 100%;max-height: 550px;"
+        size="mini"
+        height="550px">
+        <el-table-column prop="num" label="序号" width="50" align="center" type="index"/>
+        <el-table-column prop="name" label="工艺名称" width="230" align="center">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.工艺名称"
+              :disabled="disabled"
+              size="mini"
+              readonly
+              style="width:200px"
+              @dblclick.native="tableSearch(scope.$index)"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="hard" label="难度等级" width="110" align="center">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.工艺难度等级"
+              :disabled="disabled"
+              size="mini"
+              @change="hardEdit(scope.row)">
+              <el-option v-for="item in hard" :key="item.value" :label="item.label" :value="item.value">
+                <span style="color: #8492a6; font-size: 13px">{{ item.value }}</span>
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="request" label="工艺要求" align="center" min-width="350">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.工艺要求"
+              :rows="1"
+              :disabled="disabled"
+              size="mini"
+              type="textarea"
+              @dblclick.native="tableSearch(scope.$index)"
+              @change="requestEdit(scope.row)"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="300" align="center" fixed="right">
+          <template slot-scope="scope">
+            <div>
+              <el-button
+                :disabled="disabled"
+                size="mini"
+                icon="el-icon-arrow-up"
+                type="primary"
+                @click="upOne(scope.row)"/>
+              <el-button
+                :disabled="disabled"
+                size="mini"
+                icon="el-icon-arrow-down"
+                type="primary"
+                @click="downOne(scope.row)"/>
+              <el-button
+                :disabled="disabled"
+                size="mini"
+                icon="el-icon-circle-plus-outline"
+                type="primary"
+                @click="insertOne(scope.row)"/>
+              <el-button
+                :disabled="disabled"
+                size="mini"
+                icon="el-icon-delete"
+                type="danger"
+                @click="deleteOne(scope.row)"/>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-dialog :visible.sync="dialogMaterial" title="材质选择" center width="400px">
+      <el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
+      <el-button
+        type="success"
+        size="small"
+        icon="el-icon-search"
+        style="margin: 0 0 10px 10px"
+        @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询
+      </el-button>
+      <el-table
+        :data="tableMaterial"
+        size="mini"
+        highlight-current-row
+        border
+        @row-click="selectMaterial">
+        <el-table-column align="center" label="材质名称">
+          <template slot-scope="scope">
+            {{ scope.row.材料 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="1"
+          :page-sizes="[10, 20]"
+          :page-size="10"
+          :pager-count="5"
+          :total="total"
+          small
+          layout="sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="selectMaterial2()">提交</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible2" title="工艺名称、工艺要求选择" center width="400px">
+      <el-form ref="form2" :model="form2" label-position="left" label-width="125px" class="demo-ruleForm">
+        <el-form-item label="工艺名称分类">
+          <el-select v-model="processNameClassValue" placeholder="分类" size="small" @change="cChange()">
+            <el-option
+              v-for="item in processNameClass"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工艺名称">
+          <el-select v-model="processNameValue" placeholder="名称" size="small" @change="nChange()">
+            <el-option
+              v-for="item in processName"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工艺要求">
+          <el-select v-model="processRequestValue" placeholder="要求" size="small">
+            <el-option
+              v-for="item in processRequest"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="mini" type="primary" @click="confirmSelect()">确定选择</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible" title="典型工艺选择" center width="800px">
+      <el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="典型工艺零件分类">
+              <el-select
+                v-model="typicalClassValue"
+                placeholder="分类"
+                size="small"
+                style="width:150px"
+                @change="classChange()">
+                <el-option
+                  v-for="item in typicalClass"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="零件名称">
+              <el-select
+                id="name"
+                v-model="partNameValue1"
+                placeholder="零件名称"
+                size="small"
+                style="width:150px"
+                @change="nameChange()">
+                <el-option
+                  v-for="item in partName1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="success" size="small" icon="el-icon-search" @click="searchProcess()">查询</el-button>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="典型工艺号">
+              <el-select
+                id="num"
+                v-model="processNumValue"
+                placeholder="工艺号"
+                style="width:150px"
+                size="small"
+                @change="numChange()">
+                <el-option
+                  v-for="item in partName1"
+                  :key="item.value"
+                  :label="item.num"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="备注">
+              <el-input v-model="remark" size="small" readonly style="width: 150px;"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button size="small" @click="processCopy()">工艺拷贝</el-button>
+          </el-col>
+        </el-row>
+        <el-table
+          :data="tableData2"
+          style="width: 97%;max-height: 300px;margin-top:15px"
+          height="300px"
+          border
+          size="mini">
+          <el-table-column align="center" label="工艺序号" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.工艺序号 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="工艺名称" width="180">
+            <template slot-scope="scope">
+              {{ scope.row.工艺名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="工艺要求">
+            <template slot-scope="scope">
+              {{ scope.row.工艺要求 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="难度等级" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.工艺难度等级 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
+      <el-form ref="form1" :model="form1" label-position="left" label-width="140px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="工艺员">
+              <el-input v-model="CraftmanValue" clearable size="small" readonly style="width: 150px;">
+                <el-button slot="append" icon="el-icon-search" @click="dialogFormVisible3=true"/>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="项目名称">
+              <el-input v-model="PN" size="small" placeholder="项目名称" style="width: 150px" @change="inputChange"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button size="small" type="success" icon="el-icon-search" @click="searchProcess1()">查询</el-button>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="机床名称">
+              <el-select
+                v-model="tuhaoValue"
+                placeholder="零件图号"
+                size="small"
+                style="width:150px"
+                @change="numChange1()">
+                <el-option
+                  v-for="item in tuhao"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="组号">
+              <el-select
+                v-model="tuhaoValue"
+                placeholder="零件图号"
+                size="small"
+                style="width:150px"
+                @change="numChange1()">
+                <el-option
+                  v-for="item in tuhao"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
+          </el-col>
+          <el-col>
+            <el-form-item label="零件图号/物料名称">
+              <el-input
+                v-model="partNumValue"
+                clearable
+                style="width:150px"
+                placeholder="零件图号/物料名称"
+                size="small"
+                @dblclick.native="searchParts"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-table
+          :data="tableData4"
+          style="width: 97%;max-height: 250px;margin-top: 15px"
+          size="mini"
+          border
+          height="250px">
+          <el-table-column align="center" label="工艺序号" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.工序顺序 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="工艺名称" width="120">
+            <template slot-scope="scope">
+              {{ scope.row.工艺名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="工艺要求">
+            <template slot-scope="scope">
+              {{ scope.row.工艺要求 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="单件定额工时" width="110">
+            <template slot-scope="scope">
+              {{ scope.row.单件定额工时 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="准结定额工时" width="110">
+            <template slot-scope="scope">
+              {{ scope.row.准结定额工时 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="dialogFormVisible3"
+      title="工艺定额人员"
+      center
+      style="min-height: 300px">
+      <el-table
+        :data="tableData3"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="300"
+        highlight-current-row
+        border
+        @row-click="selectPerson">
+        <el-table-column align="center" label="考勤编号" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.考勤编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="姓名">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="性别" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.性别 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="工作岗位" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.岗位名称 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="tijiao()">提交</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import '@/icon/iconfont.css'
+import {
+  initCraftmen,
+  getPartnames1,
+  getPartnames2,
+  detailInfo,
+  mainTable,
+  getMaterial,
+  searchMaterial,
+  typicalProcess,
+  initTolerance,
+  FcK,
+  searchProcess,
+  searchWYgongyi,
+  gongyiCopy,
+  initPerson,
+  gongyiYQ,
+  hardEdit,
+  requestEdit,
+  processNameClick,
+  processNameSelect,
+  processRequestSelect,
+  searchTolerance,
+  insertOne,
+  deleteOne,
+  upOne,
+  downOne,
+  saveMaterial,
+  saveApprove,
+  selectRequest,
+  pasteTable,
+  deleteTable,
+  returnEdit,
+  searchRecord
+} from '@/api/ManufacturingCenter/ProcessPlanning'
+import elInput from 'element-ui/packages/input'
+
+export default {
+  components: {
+    elInput
+  },
+  data() {
+    return {
+      partsTypeValue: '',
+      partsType: [],
+      total: 0,
+      pageCurrent: 1,
+      pageSize: 10,
+      input: '', // 材质对话框查询1
+      tableMaterial: [],
+      dialogMaterial: false,
+      loading0: false,
+      radio: 1, // 第一组
+      partNumValue: '', // 零件号值
+      partNum: [], // 零件号
+      typeValue: '', // 种类
+      CraftmenValue: '', // 工艺员值
+      Craftmen: [], // 工艺员
+      CraftmanValue: '', // 完艺表单工艺员值
+      CraftmanValue2: '', // 完艺表单工艺员值中间变量
+      Craftman: [], // 完艺表单工艺员
+      partName: '', // 零件名称
+      batchNum: '', // 投产总数量
+      material: '', // 材质流水号
+      materialName: '', // 材质名称
+      materialClass: [], // 材质类
+      typicalClassValue: '', // 典型工艺零件分类值
+      typicalClass: [], // 典型工艺零件分类
+      partNameValue1: '', // 典型工艺零件名称值
+      partName1: [], // 典型工艺零件名称
+      partNameValue1check: false, // 典型工艺零件名称check
+      processNumValue: '', // 典型工艺号值
+      processNum: [], // 典型工艺号
+      processNumValuecheck: false, // 典型工艺号check
+      remark: '', // 备注
+      remark1: '', // 完艺零件名称
+      dialogFormVisible: false, // 典艺对话框可见性
+      dialogFormVisible1: false, // 完艺对话框可见性
+      dialogFormVisible2: false, // 主界面查询工艺名称要求对话框可见性
+      dialogFormVisible3: false, // 完艺对话框中选择工艺员可见性
+      form: null, // 典艺表单
+      form1: null, // 完艺表单
+      form2: null, // 主界面查询表单
+      serialNum1: [], // 典型工艺名称分类流水号
+      serialNumValue1: '1', // 典型工艺名称分类流水号值,初值1否则置空时无参数
+      serialNumValue1check: false, // 典型工艺名称分类流水号check
+      serialNum2: [], // 典型工艺流水号
+      serialNumValue2: '1', // 典型工艺流水号值，初值1否则置空时无参数
+      numVal: '', // 输入数值
+      selPara: [], // 选择参数数组
+      selParaValue: '', // 选择参数值
+      tolerance: '', // 公差
+      tableData: [], // 主表
+      tableData2: [], // 典艺内的表格
+      tableData3: [], // 工艺定额人员
+      tableData4: [], // 完艺表格
+      processSelect: [], // 工艺分类流水号
+      processNameClass: [], // 工艺名称分类
+      processNameClassValue: '',
+      processName: [], // 工艺名称
+      processNameValue: '',
+      processRequest: [], // 工艺要求
+      processRequestValue: '',
+      processN1: '', // 工艺编号
+      str: '', // 拼接字符串用的
+      value: '', // 第一个select的
+      checked: false, // 是否核准
+      checked1: false, // 修改
+      spec: '', // 规格
+      isShow: true, // '编辑模式'可见性
+      isShow1: true, // “复制并保存”“粘贴”按钮的可见性
+      isShow2: false, // 修改的可见性
+      date01: '', // 完艺开始时间
+      date02: '', // 完艺结束时间
+      PN: '', // 零件号
+      num: '', // 工艺计划流水号
+      perNum: '',
+      perNum2: '',
+      tuhao: [],
+      tuhaoValue: '',
+      check1: 0,
+      check2: 0,
+      check3: 0,
+      check4: 0,
+      hard: [{ value: 'A' }, { value: 'B' }, { value: 'C' }],
+      disabled: false,
+      result: 0,
+      oldNum: '',
+      newNum: '',
+      tableRecord: [],
+      materialName2: '',
+      material2: ''
+    }
+  },
+  created() {
+    this.fetchData()
+    this.initPerson()
+    this.getList()
+  },
+  methods: {
+    clearDetail() {
+      this.checked = false
+      this.partNumValue = ''
+      this.typeValue = ''
+      this.partName = ''
+      this.material = ''
+      this.materialName = ''
+      this.spec = ''
+      this.batchNum = ''
+    },
+    returnEdit() { // 在制零件工艺修改
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请选择零件')
+      } else {
+        this.$confirm('此操作会将该零件打回至未编制状态, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          returnEdit(this.partNumValue).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('打回成功')
+              this.partNumValue = ''
+              this.tableData = []
+            } else {
+              this.$message.error('打回失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
+        })
+      }
+    },
+    handleCurrentChange(val) { // 材质分页
+      this.pageCurrent = val
+      if (this.input === '' || this.input === null) {
+        this.getList()
+      } else {
+        this.searchMaterial()
+      }
+    },
+    handleSizeChange(val) { // 材质分页
+      this.pageCurrent = 1
+      this.pageSize = val
+      if (this.input === '' || this.input === null) {
+        this.getList()
+      } else {
+        this.searchMaterial()
+      }
+    },
+    selectMaterial(row) { // 选择材质
+      this.materialName2 = ''
+      this.material2 = ''
+      this.materialName2 = row.材料
+      this.material2 = row.材料流水号
+    },
+    selectMaterial2() {
+      this.materialName = ''
+      this.material = ''
+      this.materialName = this.materialName2
+      this.material = this.material2
+      this.dialogMaterial = false
+    },
+    fetchData() {
+      this.materialClass = []
+      getMaterial().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.materialClass.push({
+            label: response.data[i].材料,
+            value: response.data[i].材料流水号
+          })
+        }
+      })
+      initCraftmen().then(response => { // 初始化工艺员
+        for (let i = 0; i < response.data.length; i++) {
+          this.Craftmen.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      typicalProcess().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.typicalClass.push({
+            value: response.data[i].典型工艺名称分类
+          })
+          this.serialNum1.push({
+            value: response.data[i].典型工艺名称分类流水号
+          })
+        }
+      })
+      initTolerance().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.selPara.push({
+            value: response.data[i].参数
+          })
+        }
+      })
+    },
+    initPerson() { // 初始化工艺员
+      initPerson().then(response => {
+        this.tableData3 = response.data
+      })
+    },
+    getList() { // 往材质对话框中放
+      this.tableMaterial = []
+      getMaterial(this.pageCurrent, this.pageSize).then(response => {
+        this.total = response.data.total
+        this.tableMaterial = response.data.rows
+      })
+    },
+    searchMaterial() { // 材质查询
+      searchMaterial(this.pageCurrent, this.pageSize, this.input).then(response => {
+        this.total = response.data.total
+        this.tableMaterial = response.data.rows
+      })
+    },
+    searchParts() { // 根据条件查零件号
+      this.tableData = []
+      this.partNum = []
+      if (this.radio === 1) { // 未编制
+        this.disabled = false
+        this.isShow1 = true
+        this.isShow2 = false
+        this.checked1 = true
+        getPartnames1(this.CraftmenValue, this.partNumValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.partNum.push({
+              label: response.data[i].零件图号,
+              value: response.data[i].工艺计划流水号
+            })
+          }
+        })
+      } else { // 已编制
+        this.isShow = true
+        this.isShow1 = false
+        this.isShow2 = true
+        this.disabled = true
+        this.checked1 = false
+        getPartnames2(this.CraftmenValue, this.partNumValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.partNum.push({
+              label: response.data[i].零件图号,
+              value: response.data[i].工艺计划流水号
+            })
+          }
+        })
+      }
+    },
+    switchEdit() { // 切换编辑模式
+      if (this.radio === 1) {
+        this.isShow = !this.isShow
+      } else {
+        this.isShow = true
+      }
+    },
+    searchDetail() { // 查主表和上面显示的信息
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请选择零件作为查询对象')
+      } else {
+        this.loading0 = true
+        detailInfo(this.partNumValue).then(response => {
+          if (response.data.length !== 0) {
+            this.typeValue = response.data[0].零件类型名称
+            this.partName = response.data[0].零件名称
+            this.batchNum = response.data[0].批次数量
+            this.material = response.data[0].材料流水号
+            this.materialName = response.data[0].材料
+            this.spec = response.data[0].原材料规格
+          }
+        })
+        this.tableRecord = []
+        searchRecord(this.partNumValue).then(response => {
+          this.tableRecord = response.data
+        })
+        mainTable(this.partNumValue).then(response => {
+          this.tableData = []
+          for (let i = 0; i < response.data.length; i++) {
+            if (response.data[i].工艺编号 === null) {
+              response.data[i].工艺编号 = 0
+            }
+            if (response.data[i].工艺要求 === null) {
+              response.data[i].工艺要求 = ''
+            }
+          }
+          this.tableData = response.data
+          this.newNum = this.partNumValue
+        }).then(() => {
+          this.loading0 = false
+        })
+      }
+    },
+    DYbtn() { // 典艺按钮
+      this.dialogFormVisible = true
+      this.processNumValue = ''
+      this.partNameValue1 = ''
+      this.typicalClassValue = ''
+      this.remark = ''
+      this.serialNumValue1 = '1' // 有默认值
+      this.serialNumValue2 = '1' // 有默认值
+      this.tableData2 = null
+    },
+    WYbtn() { // 完艺按钮
+      this.tableData4 = []
+      this.dialogFormVisible1 = true
+    },
+    selectPerson(row) { // 选择工艺员
+      this.CraftmanValue2 = row.姓名
+      this.perNum2 = row.人员编号
+    },
+    tijiao() { // 提交完艺表单中工艺定额人员的选择
+      this.dialogFormVisible3 = false
+      this.CraftmanValue = this.CraftmanValue2
+      this.perNum = this.perNum2
+      this.remark1 = ''
+      this.tuhaoValue = ''
+    },
+    inputChange() { // 零件号改变
+      this.remark1 = ''
+      this.tuhaoValue = ''
+    },
+    classChange() { // 当分类改变时，获取零件名称和典型工艺流水号
+      this.partNameValue1 = ''
+      this.processNumValue = ''
+      for (let i = 0; i < this.typicalClass.length; i++) {
+        if (this.typicalClassValue === this.typicalClass[i].value) {
+          this.serialNumValue1 = this.serialNum1[i].value
+          FcK(this.serialNumValue1).then(response => {
+            this.partName1 = []
+            this.processNum = []
+            this.remark = response.data[0].备注
+            for (let j = 0; j < response.data.length; j++) {
+              this.partName1.push({
+                label: response.data[j].典型工艺名称,
+                num: response.data[j].典型工艺号,
+                value: response.data[j].典型工艺流水号
+              })
+            }
+          })
+        }
+      }
+    },
+    nameChange() { // 当零件名称改变时，典型工艺号改变
+      for (let i = 0; i < this.partName1.length; i++) {
+        if (this.partNameValue1 === this.partName1[i].value) {
+          this.processNumValue = this.partName1[i].num
+          this.serialNumValue2 = this.partNameValue1
+        }
+      }
+    },
+    numChange() { // 当典型工艺号改变时，零件名称改变
+      for (let i = 0; i < this.partName1.length; i++) {
+        if (this.processNumValue === this.partName1[i].value) {
+          this.partNameValue1 = this.partName1[i].value
+          this.serialNumValue2 = this.partNameValue1
+        }
+      }
+    },
+    searchProcess() { // 典艺工艺查询
+      if (this.typicalClassValue === '') {
+        this.serialNumValue1check = false
+      } else {
+        this.serialNumValue1check = true
+      }
+
+      if (this.partNameValue1 === '') {
+        this.partNameValue1check = false
+      } else {
+        this.partNameValue1check = true
+      }
+
+      if (this.processNumValue === '') {
+        this.processNumValuecheck = false
+      } else {
+        this.processNumValuecheck = true
+      }
+      this.tableData2 = []
+      searchProcess(this.serialNumValue1check, this.serialNumValue1, this.partNameValue1check, this.serialNumValue2, this.processNumValuecheck, this.serialNumValue2).then(response => {
+        this.tableData2 = response.data
+      })
+    },
+    processCopy() { // 典艺工艺拷贝
+      if (this.partNumValue === '') {
+        this.$message.error('请在主界面选择一个零件作为被拷贝对象')
+        this.dialogFormVisible = false
+      } else if (this.partNameValue1 === '') {
+        this.$message.error('请选择零件名称')
+      } else {
+        for (let i = 0; i < this.tableData2.length; i++) {
+          this.tableData[i].工艺名称 = this.tableData2[i].工艺名称
+          this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级
+          this.tableData[i].工艺要求 = this.tableData2[i].工艺要求
+          selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工艺序号, this.tableData2[i].工艺要求).then(response => {
+          })
+          hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级).then(response => {
+          })
+          this.dialogFormVisible = false
+        }
+      }
+    },
+    searchProcess1() { // 完艺工艺查询
+      this.tuhao = []
+      if (this.PN === '') { // 零件号
+        this.check1 = 0
+      } else {
+        this.check1 = 1
+      }
+      if (this.perNum === '') { // 工艺员编号
+        this.check2 = 0
+      } else {
+        this.check2 = 1
+      }
+      if (this.remark1 === '') { // 零件名称
+        this.check4 = 0
+      } else {
+        this.check4 = 1
+      }
+      if (this.date01 === '' || this.date02 === '' || this.date01 === null || this.date02 === null) { // 日期
+        this.check3 = 0
+      } else {
+        this.check3 = 1
+      }
+      searchWYgongyi(this.check1, this.PN, this.check2, this.perNum, this.check3, this.date01, this.date02, this.check4, this.remark1).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.tuhao.push({
+            value: response.data[i].零件图号,
+            name: response.data[i].零件名称,
+            num: response.data[i].工艺计划流水号
+          })
+        }
+      })
+    },
+    processCopy1() { // 完艺工艺拷贝
+      this.dialogFormVisible1 = false
+      if (this.partNumValue === '') {
+        this.$message.error('请在主界面选择一个零件作为被拷贝对象')
+      } else {
+        gongyiCopy(this.num, this.partNumValue).then(() => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺
+          this.searchDetail()
+        })
+      }
+    },
+    numChange1() { // 当完成工艺号改变时，零件名称改变，并获取工艺要求
+      this.remark1 = ''
+      this.tableData4 = null
+      for (let i = 0; i < this.tuhao.length; i++) {
+        if (this.tuhaoValue === this.tuhao[i].value) {
+          this.remark1 = this.tuhao[i].name
+          this.num = this.tuhao[i].num
+        }
+      }
+      gongyiYQ(this.num).then(response => {
+        this.tableData4 = response.data
+      })
+    },
+    hardEdit(row) { // 修改难度等级
+      hardEdit(row.工序流水号, row.工艺难度等级).then(response => {
+      })
+    },
+    requestEdit(row) { // 修改工艺要求
+      requestEdit(row.工序流水号, row.工艺要求).then(response => {
+      })
+    },
+    tableSearch(index) { // 主界面工艺名称分类、工艺名称及工艺要求后续查询
+      if (this.checked1 === false) {
+        this.dialogFormVisible2 = false
+      } else {
+        this.dialogFormVisible2 = true
+        if (index !== this.index) {
+          this.str = '' // 清字符串
+        }
+        this.index = index
+        this.processNameClassValue = ''
+        this.processNameValue = ''
+        this.processRequestValue = ''
+        this.processNameClass = []
+        this.processName = []
+        this.processRequest = []
+        processNameClick().then(response => { // 初始化工艺名称的
+          for (let i = 0; i < response.data.length; i++) {
+            this.processNameClass.push({ // 工艺名称分类
+              value: response.data[i].工艺分类名称
+            })
+            this.processSelect.push({ // 工艺分类流水号
+              value: response.data[i].工艺分类流水号
+            })
+          }
+        })
+      }
+    },
+    cChange() { // 工艺名称分类改变
+      this.processNameValue = ''
+      this.processName = []
+      this.processRequestValue = ''
+      this.processRequest = []
+      for (let i = 0; i < this.processNameClass.length; i++) {
+        if (this.processNameClassValue === this.processNameClass[i].value) {
+          processNameSelect(this.processSelect[i].value).then(response => { // 查询工艺名称
+            for (let j = 0; j < response.data.length; j++) {
+              this.processName.push({
+                value: response.data[j].工艺名称,
+                num: response.data[j].工艺编号
+              })
+            }
+          })
+        }
+      }
+    },
+    nChange() { // 工艺名称改变
+      this.processRequestValue = ''
+      this.processRequest = []
+      for (let i = 0; i < this.processName.length; i++) {
+        if (this.processNameValue === this.processName[i].value) {
+          this.processN1 = this.processName[i].num // 工艺编号
+          processRequestSelect(this.processName[i].num).then(response => { // 查询工艺名称
+            for (let j = 0; j < response.data.length; j++) {
+              this.processRequest.push({
+                value: response.data[j].工艺要求
+              })
+            }
+          })
+        }
+      }
+    },
+    confirmSelect() { // 确定选择主表的工艺名称及要求
+      this.tableData[this.index].工艺编号 = this.processN1
+      this.tableData[this.index].工艺名称 = this.processNameValue
+      this.str = this.str + ' ' + this.processRequestValue
+      this.tableData[this.index].工艺要求 = this.str
+      this.dialogFormVisible2 = false
+      selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => {
+      })
+    },
+    calTol() { // 计算公差
+      this.tolerance = ''
+      for (let i = 0; i < this.selPara.length; i++) {
+        if (this.selParaValue === this.selPara[i].value) {
+          break
+        }
+      }
+      searchTolerance(this.numVal, this.selParaValue).then(response => {
+        if (response.data.length !== 0) { // 防止超出范围报错
+          this.tolerance = response.data[0].公差
+        } else {
+          this.$message.error('输入的数值不对！')
+        }
+      })
+    },
+    copyAndSave() { // 复制并保存
+      if (this.tableData.length !== 0) {
+        this.oldNum = this.tableData[0].工艺计划流水号
+        this.saveApprove()
+      } else {
+        this.$message.error('当前没有可以被复制的工艺')
+      }
+    },
+    saveApprove() { // 核准保存
+      if (this.checked === true) {
+        for (let i = 0; i < 30; i++) {
+          saveApprove(this.tableData[i].工艺计划流水号, this.tableData[i].工艺编号, this.tableData[i].工艺要求, this.spec, this.tableData[i].工序顺序, this.tableData[i].工序间是否外协, this.tableData[i].工序流水号, this.material, '', '', this.CraftmenValue, this.tableData[i].工艺难度等级)
+        }
+        this.checked = false
+        this.partNumValue = ''
+        this.typeValue = ''
+        this.partName = ''
+        this.batchNum = ''
+        this.material = ''
+        this.materialName = ''
+        this.spec = ''
+        this.newNum = ''
+        this.$message.success('保存成功')
+        this.searchParts()
+      } else {
+        this.$message.error('请核准后保存')
+      }
+    },
+    insertOne(row) { // 插入行
+      if (this.partNumValue === '') {
+        this.$message.error('请先选择一个零件')
+      } else {
+        insertOne(this.partNumValue, row.工序流水号).then(response => {
+          this.searchDetail()
+        })
+      }
+    },
+    deleteOne(row) { // 删除行
+      if (this.partNumValue === '') {
+        this.$message.error('请先选择一个零件')
+      } else {
+        this.$confirm('此操作将永久删除该行工艺, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteOne(this.partNumValue, row.工序流水号).then(() => {
+            this.$message.success('删除成功')
+            this.searchDetail()
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      }
+    },
+    upOne(row) { // 上移
+      if (this.partNumValue === '') {
+        this.$message.error('请先选择一个零件')
+      } else {
+        upOne(this.partNumValue, row.工序流水号).then(response => {
+          this.searchDetail()
+        })
+      }
+    },
+    downOne(row) { // 下移
+      if (this.partNumValue === '') {
+        this.$message.error('请先选择一个零件')
+      } else {
+        downOne(this.partNumValue, row.工序流水号).then(response => {
+          this.searchDetail()
+        })
+      }
+    },
+    saveMaterial() { // 保存材质
+      if (this.partNumValue === '' || this.material === '') {
+        this.$message.error('请选择一个零件')
+      } else {
+        saveMaterial(this.partNumValue, this.material).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('保存成功')
+          } else {
+            this.$message.error('保存失败')
+          }
+        })
+      }
+    },
+    pasteTable() { // 粘贴
+      if (this.partNumValue === '' || this.partNumValue === null) {
+        this.$message.error('请选择零件作为被粘贴对象')
+      } else {
+        pasteTable(this.oldNum, this.newNum).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('粘贴成功')
+            this.searchDetail()
+          } else {
+            this.$message.error('粘贴失败')
+          }
+        })
+      }
+    },
+    deleteTable() { // 删除
+      if (this.newNum === '') {
+        this.$message.error('请选择一个零件')
+      } else {
+        this.$confirm('此操作将永久删除该零件的工艺, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < 30; i++) {
+            hardEdit(this.tableData[i].工序流水号, '').then(response => {
+            })
+          }
+          deleteTable(this.newNum).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('删除成功')
+              this.searchDetail()
+            } else {
+              this.$message.error('删除失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .doing-row4 {
+    background: #f0f9eb;
+  }
+
+  .el-card {
+    margin-bottom: 15px;
+  }
+
+  .el-date-editor {
+    width: 150px
+  }
+
+  span {
+    margin: 10px 0 10px 10px;
+  }
+</style>
+<style>
+  .el-table .change {
+    background: oldlace;
+  }
+</style>
diff --git a/src/views/WorkshopProcurement/PayStateSearch/index.vue b/src/views/WorkshopProcurement/PayStateSearch/index.vue
index c5369aba..1cc8fffa 100644
--- a/src/views/WorkshopProcurement/PayStateSearch/index.vue
+++ b/src/views/WorkshopProcurement/PayStateSearch/index.vue
@@ -74,7 +74,7 @@
             <el-progress
               :text-inside="true"
               :stroke-width="18"
-              :percentage="100*((scope.row.总金额 - scope.row.欠款金额)/scope.row.总金额).toFixed(4)"
+              :percentage="(parseInt(10000*(scope.row.总金额 - scope.row.欠款金额)/scope.row.总金额)) / 100"
               status="success"/>
           </template>
         </el-table-column>
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index 6003c704..b0068019 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -34,17 +34,17 @@
         height="300px"
         highlight-current-row
         @row-click="searchTable2">
-        <el-table-column label="采购合同号" align="center" width="250">
+        <el-table-column label="采购合同号" align="center">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" align="center" width="100">
+        <el-table-column label="采购合同名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规定到货时间" align="center" width="100">
+        <el-table-column label="规定到货时间" align="center">
           <template slot-scope="scope">
             {{ scope.row.规定到货时间 }}
           </template>
@@ -54,22 +54,22 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" align="center" width="70">
+        <el-table-column label="采购员" align="center">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="总金额" align="center" width="80">
+        <el-table-column label="总金额" align="center">
           <template slot-scope="scope">
             {{ scope.row.总金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="预付款" align="center" width="200">
+        <el-table-column label="预付款" align="center">
           <template slot-scope="scope">
             {{ scope.row.预付款 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100">
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
           </template>
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 7030453e..8bb276d3 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -43,17 +43,17 @@
         height="300px"
         highlight-current-row
         @row-click="searchTable2">
-        <el-table-column label="采购合同号" align="center" width="250">
+        <el-table-column label="采购合同号" align="center">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" align="center" width="100">
+        <el-table-column label="采购合同名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规定到货时间" align="center" width="100">
+        <el-table-column label="规定到货时间" align="center">
           <template slot-scope="scope">
             {{ scope.row.规定到货时间 }}
           </template>
@@ -63,33 +63,34 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" align="center" width="70">
+        <el-table-column label="采购员" align="center">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="总金额" align="center" width="80">
+        <el-table-column label="总金额" align="center">
           <template slot-scope="scope">
             {{ scope.row.总金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="预付款" align="center" width="200">
+        <el-table-column label="预付款" align="center">
           <template slot-scope="scope">
             {{ scope.row.预付款 }}
           </template>
         </el-table-column>
-        <el-table-column label="审批情况" align="center" width="100">
+        <el-table-column label="审批情况" align="center">
           <template slot-scope="scope">
             {{ scope.row.审批情况内容 }}
           </template>
         </el-table-column>
-        <el-table-column label="未通过原因" align="center" width="100">
+        <el-table-column label="未通过原因" align="center">
           <template slot-scope="scope">
             {{ scope.row.未通过原因 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100">
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
+            <el-button type="warning" size="mini" @click="exportTable('100')">导出</el-button>
             <el-button type="danger" size="mini" @click="Disable(scope.row)">禁用</el-button>
           </template>
         </el-table-column>
@@ -110,131 +111,133 @@
     <el-card>
       <div style="width:900px;margin-left: 350px">
         <el-card>
-          <table id="1" cellspacing="0px" align="center" border width="100%" style="">
-            <tr style="height: 40px">
-              <td colspan="1" align="center" style="font-weight: bold">GAOJING</td>
-              <td colspan="3" align="center" style="font-weight: bold">产品销售合同</td>
-            </tr>
-            <tr style="height: 40px">
-              <td colspan="1" align="center">需方</td>
-              <td colspan="1" align="center">江苏高精机电装备有限公司</td>
-              <td colspan="1" align="center">合同编号</td>
-              <td colspan="1" align="center">{{ contract }}</td>
-            </tr>
-            <tr style="height: 40px">
-              <td colspan="1" align="center">供方</td>
-              <td colspan="1" align="center">{{ supplier }}</td>
-              <td colspan="1" align="center">签订地点</td>
-              <td colspan="1" align="center">江苏盐城</td>
-            </tr>
-          </table>
-          <div style="margin-top: 20px;line-height: 25px">根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。</div>
-          <div style="line-height: 25px">一、 产品名称、规格型号、材质、数量、单价和交货期：</div>
-          <table id="50" cellspacing="0px" align="center" border width="100%" style="">
-            <tbody id="51">
-              <tr id="tableHead1" style="height: 40px">
-                <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>
-              </tr>
-            </tbody>
-          </table>
-          <hr>
-          <table id="2" cellspacing="0px" align="center" border width="100%" style="">
-            <tbody id="4">
-              <tr id="tableHead" style="height: 40px">
-                <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>
-              </tr>
-            </tbody>
-            <tfoot>
+          <div id="100">
+            <table id="1" cellspacing="0px" align="center" border width="100%" style="">
               <tr style="height: 40px">
-                <td colspan="8">总价:  (人民币){{ RMB }}(未税) </td>
-                <td colspan="1" align="center">{{ TotalAmount }}</td>
+                <td colspan="3" align="center" style="font-weight: bold">GAOJING</td>
+                <td colspan="5" align="center" style="font-weight: bold">产品销售合同</td>
               </tr>
               <tr style="height: 40px">
-                <td colspan="8">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
-                <td colspan="1" align="center">{{ TotalAmount1 }}</td>
+                <td colspan="2" align="center">需方</td>
+                <td colspan="2" align="center">江苏高精机电装备有限公司</td>
+                <td colspan="2" align="center">合同编号</td>
+                <td colspan="2" align="center">{{ contract }}</td>
               </tr>
-            </tfoot>
-          </table>
-          <div style="line-height: 25px">以上价格为含税增值税价格，供方开具真实有效的16%增值税发票</div>
-          <div id="23" style="line-height: 25px"/>
-          <table id="66" cellspacing="0px" align="center" border width="100%" style="margin-top: 30px">
-            <tbody id="67">
-              <tr style="height: 35px">
-                <td colspan="4" align="center">供    方</td>
-                <td colspan="4" align="center">需    方</td>
+              <tr style="height: 40px">
+                <td colspan="2" align="center">供方</td>
+                <td colspan="2" align="center">{{ supplier }}</td>
+                <td colspan="2" align="center">签订地点</td>
+                <td colspan="2" align="center">江苏盐城</td>
               </tr>
-              <tr style="height: 35px">
-                <th style="width: 15%">单位名称（章）</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-                <th style="width: 15%">单位名称（章）</th>
-                <td style="width: 35%" colspan="3" align="center">江苏高精</td>
-              </tr>
-              <tr style="height: 35px">
-                <th style="width: 15%">法定代表人</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-                <th style="width: 15%">法定代表人</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-              </tr>
-              <tr style="height: 35px">
-                <th style="width: 15%">委托代理人</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-                <th style="width: 15%">委托代理人</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-              </tr>
-              <tr style="height: 35px">
-                <th style="width: 15%">电话</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-                <th style="width: 15%">电话</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-              </tr>
-              <tr style="height: 35px">
-                <th style="width: 15%">传真</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-                <th style="width: 15%">传真</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-              </tr>
-              <tr style="height: 35px">
-                <th style="width: 15%">开户银行</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-                <th style="width: 15%">开户银行</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-              </tr>
-              <tr style="height: 35px">
-                <th style="width: 15%">账号</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-                <th style="width: 15%">账号</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-              </tr>
-              <tr style="height: 35px">
-                <th style="width: 15%">税号</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-                <th style="width: 15%">税号</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-              </tr>
-              <tr style="height: 35px">
-                <th style="width: 15%">邮政编码</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-                <th style="width: 15%">邮政编码</th>
-                <td style="width: 35%" colspan="3" align="center"/>
-              </tr>
-            </tbody>
-          </table>
-          <div style="line-height: 25px;margin-top: 10px">签订时间：____年__月__日</div>
-          <div style="line-height: 25px">有效期限：____年__月__日至____年__月__日</div>
+            </table>
+            <div style="margin-top: 20px;line-height: 25px">根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。</div>
+            <div style="line-height: 25px">一、 产品名称、规格型号、材质、数量、单价和交货期：</div>
+            <table id="50" cellspacing="0px" align="center" border width="100%" style="">
+              <tbody id="51">
+                <tr id="tableHead1" style="height: 40px">
+                  <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>
+                </tr>
+              </tbody>
+            </table>
+            <hr>
+            <table id="2" cellspacing="0px" align="center" border width="100%" style="">
+              <tbody id="4">
+                <tr id="tableHead" style="height: 40px">
+                  <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>
+                </tr>
+              </tbody>
+              <tfoot>
+                <tr style="height: 40px">
+                  <td colspan="7">总价:  (人民币){{ RMB }}(未税) </td>
+                  <td colspan="1" align="center">{{ TotalAmount }}</td>
+                </tr>
+                <tr style="height: 40px">
+                  <td colspan="7">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
+                  <td colspan="1" align="center">{{ TotalAmount1 }}</td>
+                </tr>
+              </tfoot>
+            </table>
+            <div style="line-height: 25px">以上价格为含税增值税价格，供方开具真实有效的16%增值税发票</div>
+            <div id="23"/>
+            <table id="66" cellspacing="0px" align="center" border width="100%" style="margin-top: 30px">
+              <tbody id="67">
+                <tr style="height: 35px">
+                  <td colspan="4" align="center">供    方</td>
+                  <td colspan="4" align="center">需    方</td>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">单位名称（章）</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">单位名称（章）</th>
+                  <td style="width: 35%" colspan="3" align="center">江苏高精</td>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">法定代表人</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">法定代表人</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">委托代理人</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">委托代理人</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">电话</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">电话</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">传真</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">传真</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">开户银行</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">开户银行</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">账号</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">账号</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">税号</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">税号</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+                <tr style="height: 35px">
+                  <th style="width: 15%">邮政编码</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                  <th style="width: 15%">邮政编码</th>
+                  <td style="width: 35%" colspan="3" align="center"/>
+                </tr>
+              </tbody>
+            </table>
+            <div style="line-height: 25px;margin-top: 10px">签订时间：____年__月__日</div>
+            <div style="line-height: 25px">有效期限：____年__月__日至____年__月__日</div>
+          </div>
         </el-card>
       </div>
     </el-card>
@@ -279,6 +282,7 @@
 
 <script>
 import { initContract, initBuyer, searchTable1, searchTable2, searchTable3, Disable } from '@/api/WorkshopProcurement/ProcurementContractEnquiry'
+import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
 
 export default {
   data() {
@@ -418,6 +422,11 @@ export default {
         })
       })
     },
+    exportTable(tableid) {
+      getExplorer()
+      method5(tableid)
+      Cleanup()
+    },
     handleSizeChange1(val) {
       this.pageCurrent1 = 1
       this.pageSize1 = val
@@ -452,7 +461,7 @@ export default {
         for (let i = 0; i < this.returns.length; i++) {
           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>' +
+          tr[i].innerHTML = '<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])
         }
@@ -480,7 +489,7 @@ export default {
         for (let i = 0; i < this.returns1.length; i++) {
           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>' +
+          tr[i].innerHTML = '<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])
         }
diff --git a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue b/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
index 0dc9c691..cc4b0e36 100644
--- a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
+++ b/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
@@ -88,6 +88,11 @@
             {{ scope.row.总金额 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="扣除金额" min-width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.扣除金额 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="传送人" min-width="80px">
           <template slot-scope="scope">
             {{ scope.row.传送人姓名 }}
@@ -154,6 +159,9 @@
         <el-form-item label="开票金额" prop="money">
           <el-input v-model="form1.money" size="small" placeholder="开票金额"/>
         </el-form-item>
+        <el-form-item label="扣除金额" prop="money">
+          <el-input v-model="form1.money1" size="small" placeholder="扣除金额"/>
+        </el-form-item>
         <el-form-item label="传送人" prop="sendPerson">
           <el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled filterable clearable style="width:100px">
             <el-option
@@ -218,6 +226,7 @@ export default {
         invoiceNumValue: '',
         invoiceTime: '',
         money: '',
+        money1: '',
         sendPersonValue: '',
         receivePersonValue: '',
         remark: ''
@@ -301,6 +310,7 @@ export default {
       this.form1.invoiceNum = ''
       this.form1.invoiceTime = ''
       this.form1.money = ''
+      this.form1.money1 = ''
       this.form1.sendPersonValue = parseInt(this.id)
       this.form1.receivePersonValue = ''
       this.form1.remark = ''
@@ -313,7 +323,7 @@ export default {
           const month = myDate.getMonth() + 1
           const date = myDate.getDate()
           const nowDate = year + '-' + month + '-' + date
-          addInvoice(this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark, nowDate).then(response => {
+          addInvoice(this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark, nowDate, this.form1.money1).then(response => {
             console.log(response.data)
             if (response.data.result[0].result === '1') {
               this.$message.success('增加成功')
@@ -338,6 +348,7 @@ export default {
       this.form1.invoiceNumValue = row.发票流水号
       this.form1.invoiceTime = row.开票时间
       this.form1.money = row.开票金额
+      this.form1.money1 = row.扣除金额
       this.form1.sendPersonValue = parseInt(row.传送人)
       this.form1.receivePersonValue = parseInt(row.接收人)
       this.form1.remark = row.备注
@@ -355,7 +366,7 @@ export default {
     submitEdit1(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          editInvoice(this.form1.invoiceNumValue, this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark).then(response => {
+          editInvoice(this.form1.invoiceNumValue, this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark, this.form1.money1).then(response => {
             console.log(this.form1.invoiceNumValue, this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark)
             console.log(response.data)
             if (response.data[0].result === '1') {
@@ -377,7 +388,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteInvoice(row.发票流水号).then(response => {
+        deleteInvoice(row.发票流水号, row.采购合同流水号).then(response => {
           console.log(response.data)
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')