diff --git a/config/index.js b/config/index.js
index 67d50d5d..2d9a62d1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -7,7 +7,7 @@ const os = require('os')
 
 const networkInterfaces = os.networkInterfaces()
 
-const ip = networkInterfaces['WLAN'][1].address
+const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
 
 module.exports = {
   dev: {
diff --git a/src/api/MarketingCenter/DeliveryManagement.js b/src/api/MarketingCenter/DeliveryManagement.js
new file mode 100644
index 00000000..9f4f8e5b
--- /dev/null
+++ b/src/api/MarketingCenter/DeliveryManagement.js
@@ -0,0 +1,257 @@
+import request from '@/utils/request'
+
+// 初始化形目名称
+export function searchProjectName() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_总装箱单_查询'
+    }
+  })
+}
+
+// 查询装箱单总单据信息
+export function searchPackingList() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_总装箱单_查询_通过编号',
+      param: '装箱单编号=' + arguments[0]
+    }
+  })
+}
+
+// 查询备件
+export function searchSparePart() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_备件_查询数据',
+      param: '装箱单编号=' + arguments[0]
+    }
+  })
+}
+
+// 查询随机文件
+export function searchFile() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_随机文件_查询数据',
+      param: '装箱单编号=' + arguments[0]
+    }
+  })
+}
+
+// 查询主机
+export function searchHost() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_主机_查询数据',
+      param: '装箱单编号=' + arguments[0]
+    }
+  })
+}
+
+// 查询机床所属部件
+export function searchParts() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_机床所属部件_查询数据',
+      param: '代号=' + arguments[0]
+    }
+  })
+}
+
+// 查询发货单
+export function searchInvoice() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货单_查询数据',
+      param: '装箱单编号=' + arguments[0]
+    }
+  })
+}
+// 收货地址初始化
+export function addressSearch(pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_收货地址查询',
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 省份初始化
+export function provinceSearch() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_省份查询'
+    }
+  })
+}
+export function citySearch(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_市名查询_根据省流水号',
+      param: '省份流水号=' + num1
+    }
+  })
+}
+export function deleteAdress(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_收货地址删除',
+      param: '收货地址流水号=' + num1
+    }
+  })
+}
+export function addAdress(num1, num2, num3, num4, num5) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_收货地址增加',
+      param: '省份流水号=' + num1 + '&市流水号=' + num2 + '&详细地址=' + num3 + '&联系人=' + num4 + '&联系方式=' + num5
+    }
+  })
+}
+export function editAdress(num1, num2, num3, num4, num5, num6) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_收货地址修改',
+      param: '省份流水号=' + num1 + '&市流水号=' + num2 + '&详细地址=' + num3 + '&联系人=' + num4 + '&联系方式=' + num5 + '&收货地址流水号=' + num6
+    }
+  })
+}
+export function addInvoice() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_发货单_增加数据',
+      param: '装箱单编号=' + arguments[0] + '&车辆牌号=' + arguments[1] + '&运输状态=' + arguments[2] + '&收货地址流水号=' + arguments[3] + '&发货日期=' + arguments[4]
+    }
+  })
+}
+export function delInvoice() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_发货单_删除数据',
+      param: '发货单编号=' + arguments[0]
+    }
+  })
+}
+export function editInvoice() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_发货单_修改数据',
+      param: '车辆牌号=' + arguments[0] + '&运输状态=' + arguments[1] + '&收货地址流水号=' + arguments[2] + '&发货日期=' + arguments[3] + '&发货单编号=' + arguments[4]
+    }
+  })
+}
+export function searchCargoBox() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_货箱号_查询数据',
+      param: '发货单编号=' + arguments[0]
+    }
+  })
+}
+export function addCargoBox() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_货箱号_增加数据',
+      param: '发货单编号=' + arguments[0]
+    }
+  })
+}
+export function delCargoBox() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_货箱号_删除数据',
+      param: '货箱号编号=' + arguments[0]
+    }
+  })
+}
+export function submitMoveInto() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_货箱明细_移入',
+      param: '货箱号编号=' + arguments[0] + '&代号=' + arguments[1] + '&名称=' + arguments[2] + '&规格=' + arguments[3] + '&数量=' + arguments[4] + '&备注=' + arguments[5] + '&部件编号=' + arguments[6] + '&@备件编号=' + arguments[7] + '&文件编号=' + arguments[8]
+    }
+  })
+}
+export function searchCargoBoxDetailed() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_货箱明细_查询',
+      param: '货箱号编号=' + arguments[0]
+    }
+  })
+}
+export function submitRremove() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_货箱明细_移除',
+      param: '货箱明细编号=' + arguments[0] + '&数量=' + arguments[1] + '&部件编号=' + arguments[2] + '&备件编号=' + arguments[3] + '&文件编号=' + arguments[4] + '&货箱号编号=' + arguments[5]
+    }
+  })
+}
diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js
index 93ed84ff..5992fc60 100644
--- a/src/api/WorkshopProcurement/ProcurementContractApproval.js
+++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js
@@ -7,7 +7,7 @@ export function initContract() {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购合同_查询_cjn'
+      name: '车间采购管理_采购合同_查询_cjn'
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
index f27db9ed..5034b36b 100644
--- a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
+++ b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
@@ -7,7 +7,7 @@ export function initContract() {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购合同_查询_cjn'
+      name: '车间采购管理_采购合同_查询_cjn'
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/api/WorkshopProcurement/PurchaseContractChange.js
index 05bf1b08..0b7866af 100644
--- a/src/api/WorkshopProcurement/PurchaseContractChange.js
+++ b/src/api/WorkshopProcurement/PurchaseContractChange.js
@@ -11,6 +11,17 @@ export function initContract() {
     }
   })
 }
+// 初始化合同号
+export function initContract1() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_采购合同变更_合同初始化'
+    }
+  })
+}
 // 初始化采购员(考核部门编号：采购部：2)
 export function initBuyer() {
   return request({
@@ -56,7 +67,7 @@ export function searchTable3(pageCurrent, pageSize, check1, start, end, check2,
     data: {
       type: '1',
       name: '车间采购管理_采购合同变更_查询数据_根据条件_cjn',
-      param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier,
+      param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同变更流水号_check=' + check2 + '&采购合同变更流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/icons/svg/DeliveryManagement.svg b/src/icons/svg/DeliveryManagement.svg
new file mode 100644
index 00000000..3e8dc241
--- /dev/null
+++ b/src/icons/svg/DeliveryManagement.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Svg Vector Icons : http://www.sfont.cn -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
+<metadata> Svg Vector Icons : http://www.sfont.cn </metadata>
+<g><g transform="translate(0.000000,511.000000) scale(0.100000,-0.100000)"><path d="M2005.1,2538.4c-82.4-44.1-145.6-122.6-166.7-201.2l-19.2-82.4h-364c-358.3,0-362.1,0-408.1-47.9c-63.2-61.3-65.1-164.8-5.7-220.3c40.2-38.3,61.3-38.3,1212.8-38.3h1172.6l40.2-44.1c59.4-63.2,53.7-137.9-13.4-206.9l-55.6-55.6H1938H480l-46-47.9c-47.9-46-65.1-147.5-32.6-193.5c40.2-63.2,95.8-65.1,1343.1-65.1c1222.4,0,1247.3,0,1285.6-38.3c59.4-59.4,51.7-159-21.1-218.4l-59.4-49.8H1869H786.5l-46-47.9c-67.1-65.1-65.1-164.8,1.9-218.4c49.8-40.2,65.1-40.2,1419.7-40.2c927.3,0,1381.4-5.7,1406.3-21.1c55.6-28.7,76.6-99.6,53.6-170.5c-42.1-118.8,30.7-115-1774.2-115c-1737.8-1.9-1678.4,1.9-1726.3-90.1C89.1,266.1,93,216.3,135.1,164.6l36.4-46l1212.8-9.6l1210.9-9.6l36.4-49.8c53.6-70.9,32.6-160.9-47.9-210.8c-55.6-32.6-101.6-36.4-515.4-36.4c-251,0-456-5.7-456-13.4c0-9.6-23-274-49.8-588.2c-69-793.2-88.1-764.5,473.2-774l356.4-7.7l32.6,137.9c143.7,641.9,860.3,1021.2,1421.7,754.9c160.9-74.7,321.9-235.7,400.4-398.5c63.2-128.4,116.9-362.1,101.5-446.4c-5.7-32.6,51.7-34.5,1544.3-34.5h1550l24.9,124.5c36.4,176.3,126.5,346.8,258.7,488.6c195.4,208.8,429.2,325.7,695.5,346.8c525,46,969.5-360.2,969.5-883.3c0-84.3,1.9-86.2,63.2-86.2c143.7,0,274,76.6,318.1,189.7c30.6,72.8,139.9,1373.7,126.4,1486.8c-21.1,174.4-92,274-578.6,802.8c-400.4,436.8-477.1,513.5-574.8,559.5l-111.1,55.6l-588.2,5.7c-442.6,3.8-590.1,11.5-590.1,28.7c0,13.4,13.4,160.9,28.7,329.6c36.4,388.9,36.4,496.2,0,565.2c-63.2,122.6,118.8,115-2791.6,115C2798.3,2559.5,2031.9,2553.8,2005.1,2538.4z M8613.3,1231.8c47.9-24.9,205-180.1,440.7-436.8c201.2-220.3,367.9-408.1,371.7-417.7c7.7-19.2-1793.3-21.1-1804.8-1.9c-3.8,5.8,9.6,193.5,28.7,413.8c19.2,222.3,36.4,421.5,36.4,446.4v44.1l427.3-5.8C8486.8,1268.2,8548.1,1264.3,8613.3,1231.8z"/><path d="M3250.5-816.4c-321.9-84.3-574.8-348.7-641.9-674.4c-65.1-314.2,90.1-638,371.7-776c385.1-189.7,887.1,1.9,1086.4,415.8c55.6,113,65.1,155.2,70.9,312.3c9.6,235.7-32.6,356.4-180.1,515.4C3781.2-831.8,3505.3-751.3,3250.5-816.4z M3541.7-1215c76.6-28.7,139.9-92,180.1-180.1c47.9-103.5,46-191.6-9.6-308.5c-136-291.2-548-329.5-682.1-65.1c-97.7,191.6-3.8,444.5,201.2,538.4C3317.5-1190,3459.3-1182.4,3541.7-1215z"/><path d="M8281.8-820.2c-419.6-118.8-705.1-538.4-634.2-933.1c88.1-486.7,582.5-726.2,1046.1-505.8c509.7,241.4,661,890.9,295.1,1256.9C8816.3-829.8,8519.4-753.2,8281.8-820.2z M8601.7-1220.7c350.6-183.9,191.6-720.4-214.6-724.2c-111.1-1.9-187.8,30.6-264.4,113c-222.2,233.7-17.2,638,325.7,638C8504-1193.9,8573-1205.4,8601.7-1220.7z"/></g></g>
+</svg>
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 1aed1d9b..543826d2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,6 +10,7 @@ export const name = `OP8888`
 export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
 export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
 const service = axios.create({
+  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index f1babfd4..2c647011 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -582,6 +582,11 @@ export default {
     searchDetailed(row) {
       this.RequisitionList = row.请购单流水号
       searchDetailed(row.请购单流水号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].物料计划到货时间 !== '') {
+            response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+          }
+        }
         this.tableData5 = response.data
       })
     },
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index ca647a37..9ad2f106 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -5,7 +5,7 @@
       <el-radio v-model="radio" label="1">未收回</el-radio>
       <el-radio v-model="radio" label="2">已收回</el-radio>
       <span style="margin-left: 20px">保金类型：</span>
-      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="margin-left: 10px;width: 130px">
+      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="margin-left: 10px;width: 100px">
         <el-option
           v-for="item in TypeOfGoldDeposit"
           :key="item.value"
@@ -120,7 +120,7 @@
               icon="el-icon-edit"
               @click.stop="TakeBack(scope.row);flag1 = 1">收回</el-button>
             <el-button
-              :disabled="disabled"
+              :disabled="scope.row.是否禁用履约"
               size="mini"
               type="info"
               icon="el-icon-edit"
@@ -251,7 +251,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="投标人" prop="投标人">
-              <el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2" @clear="clear()"/>
+              <el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" clearable readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2" @clear="clear()"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -301,8 +301,12 @@
 </template>
 
 <script>
+import elInput from 'element-ui/packages/input'
 import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, ComplianceGold, addBidBond, editBidBond, delBidBond } from '@/api/MarketingCenter/BidBond'
 export default {
+  components: {
+    elInput
+  },
   data() {
     return {
       disabled: false,
@@ -418,10 +422,16 @@ export default {
         const data = response.data.rows
         for (let i = 0; i < data.length; i++) {
           data[i].履约金 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+          data[i].履约金 === '1' ? data[i].是否禁用履约 = true : data[i].是否禁用履约 = false
+          data[i].投标日期 = data[i].投标日期.substring(0, data[i].投标日期.length - 8)
+          data[i].预计收回日期 = data[i].预计收回日期.substring(0, data[i].预计收回日期.length - 8)
         }
         if (this.radio === '2') {
           for (let i = 0; i < data.length; i++) {
             data[i].是否禁用 = true
+            data[i].投标日期 = data[i].投标日期.substring(0, data[i].投标日期.length - 8)
+            data[i].预计收回日期 = data[i].预计收回日期.substring(0, data[i].预计收回日期.length - 8)
+            data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8)
           }
         }
         this.tableData1 = data
@@ -507,6 +517,7 @@ export default {
     },
     callOff() {
       this.dialogFormVisible1 = false
+      this.dialogFormVisible2 = false
     },
     ComplianceGold(row) {
       this.$confirm('此操作会将此投标保证金转为履约保证金, 是否继续?', '提示', {
@@ -517,9 +528,9 @@ export default {
         ComplianceGold(row.招标保证金流水号).then(response => {
           if (response.data[0].result === '1') {
             this.fetchTableData1()
-            this.$message.success('删除成功')
+            this.$message.success('操作成功')
           } else {
-            this.$message.error('删除失败')
+            this.$message.error('操作失败')
           }
         })
       })
@@ -531,13 +542,13 @@ export default {
     },
     addTableData1() {
       addBidBond(this.form2.招标企业, this.form2.联系人, this.form2.联系电话, this.form2.保证金金额, this.peopleid, this.form2.保证金类型, this.form2.投标日期, this.form2.计划收回日期, this.form2.备注, this.form2.提前X天提醒我).then(response => {
-        this.dialogFormVisible2 = false
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')
           this.title = ''
+          this.dialogFormVisible2 = false
           this.fetchTableData1()
         } else {
-          this.$message.error('添加失败')
+          this.$message.error('添加失败,请检查金额于提醒天数是否为数字')
         }
       })
     },
@@ -561,13 +572,13 @@ export default {
     },
     editTableData1() {
       editBidBond(this.form2.招标企业, this.form2.联系人, this.form2.联系电话, this.form2.保证金金额, this.peopleid, this.form2.保证金类型, this.form2.投标日期, this.form2.计划收回日期, this.form2.备注, this.form2.提前X天提醒我, this.BidBondCode).then(response => {
-        this.dialogFormVisible2 = false
         if (response.data[0].result === '1') {
-          this.$message.success('添加成功')
+          this.$message.success('编辑成功')
           this.title = ''
+          this.dialogFormVisible2 = false
           this.fetchTableData1()
         } else {
-          this.$message.error('添加失败')
+          this.$message.error('编辑失败，请检查金额于提醒天数是否为数字')
         }
       })
     },
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 163ab281..c64656bc 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -9,6 +9,18 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
+      <!--<el-input v-model="CustomerName" placeholder="请输入客户名称" size="small"></el-input>-->
+      <!--<span class="move">销售经理：</span>-->
+      <!--<el-input clearable v-model="MarketingManagerValue" @dblclick.native="dialogFormVisiblePeople = true" size="small" style="width:200px" placeholder="请选择营销经理" clearable></el-input>-->
+      <!--<span class="move">信誉等级：</span>-->
+      <!--<el-select v-model="CreditRatingValue" placeholder="请选择信誉等级" size="small">-->
+      <!--<el-option-->
+      <!--v-for="item in CreditRating"-->
+      <!--:key="item.value"-->
+      <!--:label="item.label"-->
+      <!--:value="item.value">-->
+      <!--</el-option>-->
+      <!--</el-select>-->
       <el-button type="success" icon="el-icon-search" class="move" size="small" @click="selectCustomerOfName">查询</el-button>
     </el-card>
     <el-row>
@@ -254,7 +266,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系地址:" prop="联系地址">
-              <el-input v-model="form2.联系地址" clearable size="small" style="width:200px" placeholder="请输入联系地址" readonly/>
+              <el-input v-model="form2.联系地址" clearable size="small" style="width:200px" placeholder="请输入联系地址"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -269,7 +281,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="银行账号:" prop="银行账号">
-              <el-input v-model="form2.银行账号" clearable size="small" style="width:200px" placeholder="请输入银行账号" />
+              <el-input v-model="form2.银行账号" clearable size="small" style="width:200px" placeholder="请输入银行账号"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -299,8 +311,12 @@
 </template>
 
 <script>
+import elInput from 'element-ui/packages/input'
 import { searchValue, selectAdress, selectCustomer, getTree, tree, getTablePeople, selectMarketingManager, selectCustomerOfName, initCustomer, deleteCustomer, deleteMarketingManager, addMarketingManager, editMarketingManager, addCustomer, selectAdressOfID, editCustomer } from '@/api/MarketingCenter/CRM'
 export default {
+  components: {
+    elInput
+  },
   data() {
     return {
       a: '', // 营销经理地区流水号
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 68c312b3..33c7d669 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -10,7 +10,7 @@
           :value="item.value"/>
       </el-select>
       <span style="margin-left: 10px">销售经理</span>
-      <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" readonly @dblclick.native="dialogFormVisiblePeople = true" @clear="clear()"/>
+      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="dialogFormVisiblePeople = true" @clear="clear()"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageSize = 10;PageCurrent = 1;tableData2=[];getTableData()">查询收款计划</el-button>
       <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增收款计划</el-button>
       <el-badge :value="value" :max="99" class="item">
@@ -252,6 +252,7 @@
         <el-table-column label="操作" fixed="right" align="center" width="280">
           <template slot-scope="scope">
             <el-button
+              :disabled="scope.row.是否禁用收款"
               size="mini"
               type="warning"
               icon="el-icon-edit"
@@ -280,7 +281,7 @@
     <el-dialog :visible.sync="dialogFormVisible2" title="新增付款计划" center width="380px">
       <el-form ref="form2" :model="form2" :rules="rules" label-position="left">
         <el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
-          <el-select v-model="form2.entryNameValue" placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" clearable filterable @change="searchProjectName">
+          <el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName">
             <el-option
               v-for="item in entryName"
               :key="item.value"
@@ -304,7 +305,7 @@
     <el-dialog :visible.sync="dialogFormVisible4" title="编辑付款计划" center width="400px">
       <el-form ref="form2" :model="form2" :rules="rules" label-position="left">
         <el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
-          <el-select v-model="form2.entryNameValue" :disabled="true" clearable placeholder="请输入项目名称" style="width: 200px" size="small" filterable @change="searchProjectName">
+          <el-select v-model="form2.entryNameValue" :disabled="true" clearable filterable placeholder="请输入项目名称" style="width: 200px" size="small" @change="searchProjectName">
             <el-option
               v-for="item in entryName"
               :key="item.value"
@@ -418,7 +419,7 @@
           <el-input-number v-model="form4.转移金额" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 200px" placeholder="请输入本次付款金额" @change="changeMoney"/>
         </el-form-item>
         <el-form-item label="计划阶段" prop="计划阶段" label-width="110px">
-          <el-select v-model="form4.计划阶段" clearable placeholder="请选择计划转移到某阶段" style="width: 200px" size="small" filterable>
+          <el-select v-model="form4.计划阶段" clearable filterable placeholder="请选择计划转移到某阶段" style="width: 200px" size="small">
             <el-option
               v-for="item in Planning"
               :key="item.value"
@@ -484,8 +485,12 @@
 </template>
 
 <script>
+import elInput from 'element-ui/packages/input'
 import { SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
 export default {
+  components: {
+    elInput
+  },
   data() {
     const validateValue = (rule, value, callback) => {
       if (value === 0) {
@@ -650,7 +655,9 @@ export default {
         })
         selectBatchFundingDetails(this.id).then(response => {
           for (let i = 0; i < response.data.length; i++) {
-            response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
+            if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
+              response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
+            }
           }
           this.tableData4 = response.data
         })
@@ -658,6 +665,8 @@ export default {
           this.listLoading2 = false
           const data = response.data.rows
           for (let i = 0; i < data.length; i++) {
+            data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
+            data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
             if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
               data[i].状态 = '无计划'
             } else {
@@ -707,6 +716,8 @@ export default {
           searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
             const data = response.data.rows
             for (let i = 0; i < data.length; i++) {
+              data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
+              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                 data[i].状态 = '无计划'
               } else {
@@ -788,7 +799,9 @@ export default {
       this.tableData4 = []
       selectBatchFundingDetails(row.批次资金id).then(response => {
         for (let i = 0; i < response.data.length; i++) {
-          response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
+          if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
+            response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
+          }
         }
         this.tableData4 = response.data
       })
@@ -873,6 +886,7 @@ export default {
         this.listLoading2 = false
         const data = response.data.rows
         for (let i = 0; i < data.length; i++) {
+          data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
           data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
           if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
             data[i].状态 = '无计划'
@@ -941,6 +955,8 @@ export default {
           searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
             const data = response.data.rows
             for (let i = 0; i < data.length; i++) {
+              data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
+              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                 data[i].状态 = '无计划'
               } else {
@@ -1003,6 +1019,8 @@ export default {
             searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
               const data = response.data.rows
               for (let i = 0; i < data.length; i++) {
+                data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
+                data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
                 if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                   data[i].状态 = '无计划'
                 } else {
@@ -1107,6 +1125,8 @@ export default {
                 searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
                   const data = response.data.rows
                   for (let i = 0; i < data.length; i++) {
+                    data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
+                    data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
                     if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                       data[i].状态 = '无计划'
                     } else {
@@ -1146,7 +1166,9 @@ export default {
                 })
                 selectBatchFundingDetails(this.id).then(response => {
                   for (let i = 0; i < response.data.length; i++) {
-                    response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
+                    if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
+                      response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
+                    }
                   }
                   this.tableData4 = response.data
                 })
@@ -1178,6 +1200,8 @@ export default {
                 searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
                   const data = response.data.rows
                   for (let i = 0; i < data.length; i++) {
+                    data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
+                    data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
                     if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                       data[i].状态 = '无计划'
                     } else {
@@ -1203,7 +1227,9 @@ export default {
                 })
                 selectBatchFundingDetails(this.id).then(response => {
                   for (let i = 0; i < response.data.length; i++) {
-                    response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
+                    if (response.data[i].本次收款时间 !== null || response.data[i].本次收款时间 !== '') {
+                      response.data[i].本次收款时间 = response.data[i].本次收款时间.substring(0, response.data[i].本次收款时间.length - 9)
+                    }
                   }
                   this.tableData4 = response.data
                 })
@@ -1237,6 +1263,8 @@ export default {
               searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
                 const data = response.data.rows
                 for (let i = 0; i < data.length; i++) {
+                  data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
+                  data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
                   if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                     data[i].状态 = '无计划'
                   } else {
@@ -1309,6 +1337,8 @@ export default {
           searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
             const data = response.data.rows
             for (let i = 0; i < data.length; i++) {
+              data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
+              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                 data[i].状态 = '无计划'
               } else {
@@ -1365,6 +1395,8 @@ export default {
           searchTable2(this.PageCurrent2, this.PageSize2, this.moneyID).then(response => {
             const data = response.data.rows
             for (let i = 0; i < data.length; i++) {
+              data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
+              data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
               if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
                 data[i].状态 = '无计划'
               } else {
@@ -1434,6 +1466,8 @@ export default {
       searchTable2(this.PageCurrent2, this.PageSize2, row.资金ID).then(response => {
         const data = response.data.rows
         for (let i = 0; i < data.length; i++) {
+          data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
+          data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
           if (data[i].计划付款时间 === '' || data[i].计划付款时间 === null) {
             data[i].状态 = '无计划'
           } else {
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 9f06490d..2fbd0e4f 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -10,7 +10,7 @@
           :value="item.value"/>
       </el-select>
       <span style="margin-left: 10px">销售经理</span>
-      <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" readonly @dblclick.native="openName();param = 1" @clear="clear()"/>
+      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
       <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
     </el-card>
@@ -172,7 +172,7 @@
           <el-button size="small" type="primary">点击上传</el-button>
         </el-upload>
       </div>
-      <div v-for="file in hadFile" :key="file.id">
+      <div v-for="(file, key) in hadFile" :key="key">
         <div class="wrapper">
           <div class="content">
             <div class="action">
@@ -200,7 +200,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="已完成进度" prop="executionProgressID">
-              <el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" clearable size="small" style="width: 200px">
+              <el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 200px">
                 <el-option
                   v-for="item in executionProgress"
                   :key="item.value"
@@ -211,7 +211,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="销售经理" prop="MarketingManagerValue">
-              <el-input v-model="form.MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" readonly @dblclick.native="openName()" @clear="clear()"/>
+              <el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -256,12 +256,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="客户名称" prop="customerName">
-              <el-input v-model="form.customerName" size="small" placeholder="请输入客户名称" style="width:200px" readonly @dblclick.native="CustomerChange()"/>
+              <el-input v-model="form.customerName" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clear1()"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="付款方式" prop="付款方式">
-              <el-select v-model="form.付款方式" :disabled="disabled" placeholder="请选择付款方式" clearable size="small" style="width: 200px">
+              <el-select v-model="form.付款方式" :disabled="disabled" placeholder="请选择付款方式" size="small" style="width: 200px">
                 <el-option
                   v-for="item in money"
                   :key="item.value"
@@ -417,10 +417,13 @@
 </template>
 
 <script>
+import elInput from 'element-ui/packages/input'
 import { initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
 import { upload, download } from '@/utils/request'
 export default {
-
+  components: {
+    elInput
+  },
   data() {
     return {
       a: 1,
@@ -705,6 +708,9 @@ export default {
       this.tableData3 = []
       this.ProvinceValue = ''
     },
+    clear1() {
+      this.CustomerCode = ''
+    },
     CustomerChange() {
       this.dialogCustomerFormVisible = true
     },
diff --git a/src/views/MarketingCenter/DeliveryManagement/UploadExcel/index.vue b/src/views/MarketingCenter/DeliveryManagement/UploadExcel/index.vue
new file mode 100644
index 00000000..41c39e4d
--- /dev/null
+++ b/src/views/MarketingCenter/DeliveryManagement/UploadExcel/index.vue
@@ -0,0 +1,104 @@
+<template>
+  <div style="display: inline-block;width: 100%;height: 100%;margin: 10px 20px 40px 10px">
+    <input id="excel-upload-input" ref="excel-upload-input" type="file" multiple="multiple" accept=".xlsx, .xls" class="c-hide" @change="handkeFileChange">
+    <el-button style="margin-left:16px;" size="small" icon="el-icon-search" type="success" @click="handleUpload">浏览清单</el-button>
+    <!--<div id="drop" @drop="handleDrop" @dragover="handleDragover" @dragenter="handleDragover">-->
+    <!--将Excel文件拖到这或-->
+    <!--<el-button style="margin-left:16px;" size="small" icon="el-icon-search" type="success" @click="handleUpload">浏览</el-button>-->
+    <!--</div>-->
+  </div>
+</template>
+
+<script>
+import XLSX from 'xlsx'
+
+export default {
+  data() {
+    return {
+      loading: false,
+      excelData: {
+        itemFile: [],
+        worksheet: []
+      }
+    }
+  },
+  methods: {
+    generateDate({ itemFile, worksheet }) {
+      this.excelData.itemFile.push(itemFile)
+      this.excelData.worksheet.push(worksheet)
+    },
+    handleDrop(e) {
+      this.excelData.itemFile = []
+      this.excelData.worksheet = [] // 每次拖拽都清空一次
+      e.stopPropagation()
+      e.preventDefault()
+      const files = e.dataTransfer.files
+      for (let i = 0; i < files.length; i++) { // 支持多个文件
+        const itemFile = files[i]
+        this.readerData(itemFile)
+      }
+      this.$emit('on-selected-file', this.excelData)
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    handleDragover(e) {
+      e.stopPropagation()
+      e.preventDefault()
+      e.dataTransfer.dropEffect = 'copy'
+    },
+    handleUpload() {
+      this.excelData.itemFile = []
+      this.excelData.worksheet = [] // 每次点击“浏览”都清空一次
+      document.getElementById('excel-upload-input').click()
+    },
+    handkeFileChange(e) {
+      const files = e.target.files
+      for (let i = 0; i < files.length; i++) { // 支持多个文件
+        const itemFile = files[i]
+        if (!itemFile) return
+        this.readerData(itemFile)
+      }
+      this.$emit('on-selected-file', this.excelData)
+      this.$refs['excel-upload-input'].value = null // fix can't select the same excel
+    },
+    readerData(itemFile) {
+      const reader = new FileReader()
+      reader.onload = e => {
+        const data = e.target.result
+        const fixedData = this.fixdata(data)
+        const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
+        const firstSheetName = workbook.SheetNames[0] // cjnsheetname
+        const worksheet = workbook.Sheets[firstSheetName] // 默认firstsheet
+        this.generateDate({ itemFile, worksheet })
+      }
+      reader.readAsArrayBuffer(itemFile)
+    },
+    fixdata(data) {
+      let o = ''
+      let l = 0
+      const w = 10240
+      for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)))
+      o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)))
+      return o
+    }
+  }
+}
+</script>
+
+<style scoped>
+#excel-upload-input{
+  display: none;
+  z-index: -9999;
+}
+#drop{
+  border: 2px dashed #bbb;
+  width: 600px;
+  line-height: 160px;
+  margin: 0;
+  font-size: 24px;
+  border-radius: 5px;
+  text-align: center;
+  color: #bbb;
+  position: relative;
+}
+</style>
diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
new file mode 100644
index 00000000..1d0e0f3c
--- /dev/null
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -0,0 +1,1085 @@
+<template>
+  <div>
+    <el-card>
+      <el-select v-model="projectNameValue" clearable filterable placeholder="请选择项目名称" size="small" style="margin-left: 10px;width: 200px" @change="searchPackingList();searchPackingListDetails();searchInvoice()">
+        <el-option
+          v-for="item in projectName"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <!--<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchPackingList();searchPackingListDetails();searchInvoice()">查询</el-button>-->
+      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="showAddInvoice();flag1 = 1">增加</el-button>
+      <div style="margin-left: 15px;display: inline-block;color:gray"><span>总装箱单号：</span></div>{{ packingListNumber }}
+      <div style="margin-left: 15px;display: inline-block;color:gray"><span>发货节点：</span></div>{{ consignmentNode }}
+      <div style="margin-left: 15px;display: inline-block;color:gray"><span>设备名称：</span></div>{{ deviceName }}
+      <div style="margin-left: 15px;display: inline-block;color:gray"><span>收货单位：</span></div>{{ receivingUnit }}
+      <div style="margin-left: 15px;display: inline-block;color:gray"><span>联系人：</span></div>{{ contacts }}
+      <div style="margin-left: 15px;display: inline-block;color:gray"><span>联系电话：</span></div>{{ contactNumber }}
+    </el-card>
+    <el-card>
+      <el-row>
+        <el-col :span="16"><div class="grid-content bg-purple">
+          <el-table
+            v-loading="tableData2Loading"
+            id="tb"
+            :row-style="tableRowClassName1"
+            :data="tableData5"
+            highlight-current-row
+            style="width: 100%"
+            height="235"
+            @row-click="searchCargoBox"
+          >
+            <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="230">
+              <template slot-scope="scope">
+                {{ scope.row.省份 + scope.row.市名 + scope.row.详细地址 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="收货人" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.联系人 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="联系电话" width="150">
+              <template slot-scope="scope">
+                {{ scope.row.联系方式 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="车辆牌号" width="150">
+              <template slot-scope="scope">
+                {{ scope.row.车辆牌号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="发货日期" width="150">
+              <template slot-scope="scope">
+                {{ scope.row.发货日期 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="运输状态" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.运输状态 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="追溯码" width="150">
+              <template slot-scope="scope">
+                <canvas :id="canvas[scope.$index]"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="300">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="warning"
+                  icon="el-icon-edit"
+                  @click.stop="editWithdrawing(scope.row);flag1 = 4">导出</el-button>
+                <el-button
+                  size="mini"
+                  type="primary"
+                  icon="el-icon-edit"
+                  @click.stop="showEditInvoice(scope.row);flag1 = 2">编辑</el-button>
+                <el-button
+                  size="mini"
+                  type="danger"
+                  icon="el-icon-delete"
+                  @click.stop="delInvoice(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div></el-col>
+        <el-col :span="8"><div class="grid-content bg-purple-light">
+          <div style="width: 550px;height:236px; border: 2px solid rgb(228, 231, 237);margin-left: 5px">
+            <!--<el-upload-->
+            <!--style="margin-left: 10px"-->
+            <!--action="https://jsonplaceholder.typicode.com/posts/"-->
+            <!--list-type="picture-card"-->
+            <!--:on-preview="handlePictureCardPreview"-->
+            <!--:on-remove="handleRemove">-->
+            <!--<i class="el-icon-plus"></i>-->
+            <!--</el-upload>-->
+            <!--<el-dialog :visible.sync="dialogVisible">-->
+            <!--<img width="100%" :src="dialogImageUrl" alt="">-->
+            <!--</el-dialog>-->
+          </div>
+        </div></el-col>
+      </el-row>
+    </el-card>
+    <el-card>
+      <el-row>
+        <el-col :span="11"><div class="grid-content bg-purple">
+          <el-tabs v-model="activeName">
+            <el-tab-pane label="主机" name="first">
+              <el-table
+                v-loading="tableData1Loading"
+                :row-key="getRowKeys"
+                :expand-row-keys="expands"
+                :data="tableData1"
+                highlight-current-row
+                border
+                style="width: 100%"
+                height="500"
+                @expand-change="selectMachine"
+              >
+                <el-table-column type="expand">
+                  <template slot-scope="scope">
+                    <el-table
+                      :data="tableData4"
+                      border
+                      style="width: 600px; text-align: center"
+                      height="300"
+                      highlight-current-row
+                      @row-click="choiceParts"
+                    >
+                      <el-table-column
+                        align="center"
+                        label="序号"
+                        type="index"
+                        width="100"/>
+                      <el-table-column label="代号" align="center">
+                        <template slot-scope="scope">
+                          {{ scope.row.代号 }}
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="名称" align="center">
+                        <template slot-scope="scope">
+                          {{ scope.row.名称 }}
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="规格" align="center">
+                        <template slot-scope="scope">
+                          {{ scope.row.规格 }}
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="总数量" align="center">
+                        <template slot-scope="scope">
+                          {{ scope.row.数量 }}
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="未发数量" align="center">
+                        <template slot-scope="scope">
+                          <el-tag>{{ scope.row.未发数量 }}</el-tag>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="备注" align="center">
+                        <template slot-scope="scope">
+                          {{ scope.row.备注 }}
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="序号" type="index" width="50"/>
+                <el-table-column align="center" label="代号">
+                  <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="数量">
+                  <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>
+            </el-tab-pane>
+            <el-tab-pane label="随机供应备件" name="second">
+              <el-table
+                v-loading="tableData2Loading"
+                :data="tableData2"
+                highlight-current-row
+                border
+                style="width: 100%"
+                height="500"
+                @row-click="choiceSpare"
+              >
+                <el-table-column align="center" label="序号" type="index" width="50"/>
+                <el-table-column align="center" label="名称">
+                  <template slot-scope="scope">
+                    {{ scope.row.名称 }}
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="规格">
+                  <template slot-scope="scope">
+                    {{ scope.row.规格 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="总数量" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.数量 }}
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="未发数量">
+                  <template slot-scope="scope">
+                    <el-tag>{{ scope.row.未发数量 }}</el-tag>
+                  </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="备注">
+                  <template slot-scope="scope">
+                    {{ scope.row.备注 }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+            <el-tab-pane label="随即技术文件" name="third">
+              <el-table
+                v-loading="tableData3Loading"
+                :data="tableData3"
+                highlight-current-row
+                border
+                style="width: 100%"
+                height="500"
+                @row-click="choiceFile"
+              >
+                <el-table-column align="center" label="序号" type="index" width="50"/>
+                <el-table-column align="center" label="名称">
+                  <template slot-scope="scope">
+                    {{ scope.row.名称 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="总数量" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.数量 }}
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="未发数量">
+                  <template slot-scope="scope">
+                    <el-tag>{{ scope.row.未发数量 }}</el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" label="备注">
+                  <template slot-scope="scope">
+                    {{ scope.row.备注 }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+          </el-tabs>
+        </div></el-col>
+        <el-col :span="2">
+          <div class="grid-content bg-purple">
+            <div style="height:554px">
+              <div>
+                <el-button :disabled="disabledmoveInto" round type="primary" size="small" style="margin-top: 200px;margin-left: 45px" @click="moveInto()">➡</el-button>
+              </div>
+              <div>
+                <el-button round type="danger" size="small" style="margin-top: 50px;margin-left: 45px" @click="remove()">⬅</el-button>
+              </div>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="11"><div class="grid-content bg-purple-light">
+          <span style="margin-left: 20px">
+            货箱号：
+          </span>
+          <el-select v-model="cargoBoxValue" clearable filterable placeholder="请选择货箱号" size="small" style="margin-left: 2px;width: 200px" @change="searchCargoBoxDetailed" @clear="clear">
+            <el-option
+              v-for="item in cargoBox"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="addCargoBox()">增加</el-button>
+          <el-button type="danger" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 50px" @click="delCargoBox()">删除</el-button>
+          <el-popover
+            placement="right"
+            width="80"
+            trigger="hover"
+          >
+            <canvas v-show="show" id="canvas"/>
+            <el-button slot="reference">追溯码</el-button>
+          </el-popover>
+          <hr style="border:none;border-top:2px solid rgb(228, 231, 237)" >
+          <el-table
+            v-loading="tableData6Loading"
+            :data="tableData6"
+            border
+            style="width: 100%;margin-top: 3px"
+            height="500"
+            highlight-current-row
+            @row-click="choiceGoods"
+          >
+            <el-table-column align="center" label="序号" type="index" width="100"/>
+            <el-table-column align="center" label="代号">
+              <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="规格">
+              <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="备注">
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div></el-col>
+      </el-row>
+    </el-card>
+
+    <!--发货单新增或编辑-->
+    <el-dialog :title="title1" :visible.sync="dialogFormVisible1" width="40%" center>
+      <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="收货地址" prop="收货地址" label-width="110px">
+              <el-input v-model="form1.收货地址" clearable size="small" placeholder="请选择收货地址" style="width: 200px" readonly autosize @dblclick.native="dialogFormVisible2 = true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="车辆牌号" prop="车辆牌号" label-width="110px">
+              <el-input v-model="form1.车辆牌号" size="small" placeholder="请输入车辆牌号" style="width: 200px"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系人" prop="联系人" label-width="110px">
+              <el-input v-model="form1.联系人" size="small" placeholder="请输入联系人" style="width: 200px" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="联系方式" label-width="110px">
+              <el-input v-model="form1.联系方式" size="small" placeholder="请输入联系电话" style="width: 200px" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="发货日期" prop="发货日期" label-width="110px">
+              <el-date-picker
+                v-model="form1.发货日期"
+                style="width: 200px"
+                value-format="yyyy-MM-dd"
+                size="small"
+                type="date"
+                placeholder="请选择发货日期"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="运输状态" prop="entryNameValue" label-width="110px">
+              <el-select v-model="form1.运输状态" clearable filterable placeholder="请选择运输状态" style="width: 200px" size="small">
+                <el-option
+                  v-for="item in Transport"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOffInvoice('form1')">取消</el-button>
+        <el-button type="primary" @click="submitInvoice('form1')">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!--地址选择-->
+    <el-dialog :visible.sync="dialogFormVisible2" title="地址选择" center width="50%">
+      <el-card>
+        <el-select v-model="provinceValue" placeholder="请选择省份" size="mini" clearable style="width: 120px" @change="provinceChange">
+          <el-option
+            v-for="item in province"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-select v-model="cityValue" placeholder="请选择市名" size="mini" clearable style="width: 120px">
+          <el-option
+            v-for="item in city"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-input v-model="detailedAddress" clearable size="mini" style="width:200px" placeholder="请输入详细地址"/>
+        <el-input v-model="people" clearable size="mini" style="width:100px" placeholder="联系人"/>
+        <el-input v-model="phoneNumber" clearable size="mini" style="width:150px" placeholder="请输入联系方式"/>
+        <el-button type="primary" size="mini" style="margin-left: 15px" @click="submitAdress">新增</el-button>
+        <el-button type="warning" size="mini" @click="editAdress">编辑</el-button>
+      </el-card>
+      <el-table :data="addressData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleAdressChange">
+        <el-table-column label="省份" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.省份 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="市" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.市名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="详细地址" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.详细地址 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="联系人" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.联系人 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="联系方式" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.联系方式 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200px" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="danger"
+              @click="deleteAdress(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="pageCurrent1"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="pageSize1"
+        :total="total1"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange1"
+        @current-change="handleCurrentChange1"/>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogFormVisible2 = false">取消</el-button>
+        <el-button size="small" type="primary" @click="dialogFormVisible2 = false">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible3" title="移入" width="20%" center>
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left">
+        <el-form-item label="名称" prop="名称" label-width="110px">
+          <el-input v-model="form2.名称" size="small" style="width: 200px" disabled/>
+        </el-form-item>
+        <el-form-item label="数量" prop="数量" label-width="110px">
+          <el-input-number v-model="form2.数量" :min="0" :max="maxNum" :precision="2" :step="1" controls-position="right" size="small" style="width: 200px" placeholder="请输入本次付款金额"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible3 = false">取消</el-button>
+        <el-button type="primary" @click="submitMoveInto('form2')">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible4" title="移出" width="20%" center>
+      <el-form ref="form3" :model="form3" :rules="rules2" label-position="left">
+        <el-form-item label="名称" prop="名称" label-width="110px">
+          <el-input v-model="form3.名称" size="small" style="width: 200px" disabled/>
+        </el-form-item>
+        <el-form-item label="数量" prop="数量" label-width="110px">
+          <el-input-number v-model="form3.数量" :min="0" :max="maxNum" :precision="2" :step="1" controls-position="right" size="small" style="width: 200px" placeholder="请输入本次付款金额" disabled/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible4 = false">取消</el-button>
+        <el-button type="primary" @click="submitRremove('form3')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import elInput from 'element-ui/packages/input'
+import { submitRremove, searchCargoBoxDetailed, submitMoveInto, delCargoBox, addCargoBox, searchCargoBox, editInvoice, delInvoice, addInvoice, editAdress, addAdress, deleteAdress, citySearch, provinceSearch, addressSearch, searchParts, searchHost, searchSparePart, searchProjectName, searchPackingList, searchFile, searchInvoice } from '@/api//MarketingCenter/DeliveryManagement'
+import QRCode from 'qrcode'
+export default {
+  components: {
+    elInput
+  },
+  data() {
+    return {
+      canvas: [],
+      show: false,
+      num: '',
+      a: 1, // 嵌套表格交换变量
+      b: 1, // 嵌套表格交换变量
+      flag1: '', // 发货单旗帜变量
+      flag2: '', // 表格选择旗帜变量
+      title1: '', // 发货单对话框标题
+      projectNameValue: '', // 项目名称
+      activeName: 'first', // 标签页索引
+      packingListNumber: '', // 装箱单号
+      deviceName: '', // 设备名称
+      consignmentNode: '', // 发货节点
+      receivingUnit: '', // 收货单位
+      contacts: '', // 联系人
+      contactNumber: '', // 联系方式
+      provinceValue: '', // 省份
+      adressNum: '', // 收货地址流水号
+      invoiceNum: '', // 发货单编号
+      detailedAddress: '',
+      disabledmoveInto: false,
+      people: '',
+      phoneNumber: '',
+      cityValue: '', // 市名
+      pageCurrent1: 1,
+      code: '',
+      pageSize1: 10,
+      total1: null,
+      cargoBoxValue: '',
+      DetailOfGoodsCode: '',
+      maxNum: 10, // 移入的最大数量
+      goodsCodeName: '', // 货物代号
+      goodsName: '', // 货物名称
+      goodsSpecifications: '', // 货物规格
+      goodsNumber: '', // 货物数量
+      goodsRemark: '', // 货物备注
+      partsCode: '', // 部件编号
+      sparePartCode: '', // 备件编号
+      fileCode: '', // 文件编号
+      File: [],
+      Parts: [],
+      Spare: [],
+      cargoBox: [],
+      addressData: [],
+      tableData1: [], // 主机表格
+      tableData2: [], // 备件表格
+      tableData3: [], // 随机文件表格
+      tableData4: [], // 机床部件表格
+      tableData5: [], // 发货单表格
+      tableData6: [], // 货箱明细表格
+      projectName: [], // 项目名称下拉框数组
+      city: [], // 市名下拉框数组
+      province: [], // 省份下拉框数组
+      expands: [], // 嵌套表格
+      tableData2Loading: false, // 备件加载动画
+      tableData3Loading: false, // 随机文件加载动画
+      tableData1Loading: false, // 主机加载动画
+      tableData4Loading: false, // 机床所属部件加载动画
+      tableData5Loading: false, // 发货单加载动画
+      tableData6Loading: false, // 货箱明细加载动画
+      dialogFormVisible1: false, // 发货单对话框标题显示隐藏
+      dialogFormVisible2: false, // 地址选择对话框显示隐藏
+      dialogFormVisible3: false, // 填充货箱内货物对话框显示隐藏
+      dialogFormVisible4: false, // 移除货箱内货物对话框显示隐藏
+      QueryDetail: '',
+      Transport: [
+        {
+          value: 0,
+          label: '运输中'
+        },
+        {
+          value: 1,
+          label: '已签收'
+        }
+      ],
+      form1: {
+        收货地址: '',
+        车辆牌号: '',
+        发货日期: '',
+        运输状态: 0,
+        联系人: '',
+        联系方式: ''
+      },
+      form2: {
+        名称: '',
+        数量: ''
+      },
+      form3: {
+        名称: '',
+        数量: ''
+      },
+      rules1: {
+        收货地址: [{ required: true, message: '请选择收货地址', trigger: 'change' }],
+        车辆牌号: [{ required: true, message: '请输入车辆牌号', trigger: 'blur' }],
+        联系人: [{ required: true, message: '请选择联系人', trigger: 'blur' }],
+        联系方式: [{ required: true, message: '请选择联系方式', trigger: 'blur' }],
+        发货日期: [{ required: true, message: '请选择发货日期', trigger: 'change' }],
+        运输状态: [{ required: true, message: '请选择运输状态' }]
+      },
+      rules2: {}
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    // 初始化函数
+    init() {
+      this.getSelect(searchProjectName, ['项目名称', '装箱单编号'], 'projectName')
+      this.getSelect(provinceSearch, ['省份', '省份流水号'], 'province')
+      this.getTable(addressSearch, [this.pageCurrent1, this.pageSize1], ['addressData', 'total1'])
+    },
+    // 查询总单据信息
+    searchPackingList() {
+      searchPackingList(this.projectNameValue).then(response => {
+        this.packingListNumber = response.data[0].装箱单号
+        this.deviceName = response.data[0].名称
+        this.consignmentNode = response.data[0].发货节点
+        this.receivingUnit = response.data[0].收货单位
+        this.contacts = response.data[0].联系人
+        this.contactNumber = response.data[0].联系方式
+      })
+    },
+    // 查询总单据明细
+    searchPackingListDetails() {
+      // 备件查询
+      this.tableData2Loading = true
+      searchSparePart(this.projectNameValue).then(response => {
+        this.tableData2Loading = false
+        this.tableData2 = response.data
+      })
+      // 随机文件查询
+      this.tableData3Loading = true
+      searchFile(this.projectNameValue).then(response => {
+        this.tableData3Loading = false
+        this.tableData3 = response.data
+      })
+      this.tableData1Loading = true
+      searchHost(this.projectNameValue).then(response => {
+        this.tableData1Loading = false
+        this.tableData1 = response.data
+      })
+    },
+    getRowKeys(row) {
+      return row.代号
+    },
+    // 查询机床所属部件
+    selectMachine(row) {
+      this.code = row.代号
+      this.tableData4Loading = true
+      this.tableData4 = []
+      searchParts(this.code).then(response => {
+        this.tableData4Loading = false
+        this.tableData4 = response.data
+      })
+      this.id = row.代号
+      if (this.a === 1) {
+        this.expands.push(row.代号)
+        this.b = row.代号
+        this.a = 0
+      } else {
+        if (this.b === row.代号) {
+          this.expands = []
+          this.a = 1
+        } else {
+          this.expands = []
+          this.expands.push(row.代号)
+          this.a = 0
+          this.b = row.代号
+        }
+      }
+    },
+    // 发货单查询
+    searchInvoice() {
+      this.tableData5Loading = true
+      searchInvoice(this.projectNameValue).then(response => {
+        const data = response.data
+        this.tableData5 = data
+        this.canvas = []
+        for (let i = 0; i < data.length; i++) {
+          this.canvas.push(data[i].发货单编号.toString())
+          data[i].发货日期 = data[i].发货日期.substring(0, data[i].发货日期.length - 9)
+          data[i].运输状态 === 0 ? data[i].运输状态 = '运输中' : data[i].运输状态 = '已签收'
+          // QRCode.toCanvas(document.getElementById(this.canvas[i]), data[i].发货单编号.toString(), function(error) {
+          //   if (error) console.error(error)
+          //   console.log('success!')
+          // })
+        }
+        this.tableData5Loading = false
+        this.tableData5 = data
+        return data
+      }).then(res => {
+        for (let i = 0; i < res.length; i++) {
+          QRCode.toCanvas(document.getElementById(this.canvas[i]), 'http://192.168.1.132:8080/#/DeliveryManagement/index?id=' + res[i].发货单编号.toString(), function(error) {
+            if (error) console.error(error)
+            console.log('success!')
+          })
+        }
+        this.tableData5 = res
+      })
+    },
+    // 显示新增发货单对话框
+    showAddInvoice() {
+      if (this.projectNameValue === '') {
+        this.$message.warning('请选择装箱单')
+      } else {
+        this.addForm('form1')
+        this.dialogFormVisible1 = true
+        this.title1 = '新增'
+      }
+    },
+    // 提交发货单
+    submitInvoice(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.flag1 === 1) {
+            addInvoice(this.projectNameValue, this.form1.车辆牌号, this.form1.运输状态, this.adressNum, this.form1.发货日期).then(response => {
+              this.dialogFormVisible1 = false
+              if (response.data[0].result === '1') {
+                this.$message.success('添加成功')
+                this.searchInvoice()
+                this.flag1 = ''
+              } else {
+                this.$message.error('添加失败')
+              }
+            })
+          } else {
+            editInvoice(this.form1.车辆牌号, this.form1.运输状态, this.adressNum, this.form1.发货日期, this.invoiceNum).then(response => {
+              this.dialogFormVisible1 = false
+              if (response.data[0].result === '1') {
+                this.$message.success('信息更新成功')
+                this.searchInvoice()
+                this.flag1 = ''
+              } else {
+                this.$message.error('信息更新失败')
+              }
+            })
+          }
+        }
+      })
+    },
+    // 显示编辑发货单对话框
+    showEditInvoice(row) {
+      console.log(row)
+      this.dialogFormVisible1 = true
+      this.form1.收货地址 = row.省份 + row.市名 + row.详细地址
+      this.form1.车辆牌号 = row.车辆牌号
+      this.form1.发货日期 = row.发货日期
+      row.运输状态 === '运输中' ? this.form1.运输状态 = 0 : this.form1.运输状态 = 1
+      this.form1.联系人 = row.联系人
+      this.form1.联系方式 = row.联系方式
+      this.adressNum = row.收货地址流水号
+      this.invoiceNum = row.发货单编号
+    },
+    // 删除发货单
+    delInvoice(row) {
+      this.deleteRow(delInvoice, row.发货单编号, function() { this.searchInvoice() })
+    },
+    // 收货地址表格分页
+    handleSizeChange1(val) {
+      this.pageCurrent1 = 1
+      this.pageSize1 = val
+      this.getTable(addressSearch, [this.pageCurrent1, this.pageSize1], ['addressData', 'total1'])
+    },
+    // 收货地址表格分页
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.getTable(addressSearch, [this.pageCurrent1, this.pageSize1], ['addressData', 'total1'])
+    },
+    // 根据省分查市名
+    provinceChange() {
+      this.city = []
+      this.cityValue = ''
+      this.getSelect(citySearch, ['市名', '市流水号'], 'city', this.provinceValue)
+    },
+    // 删除地址
+    deleteAdress(row) {
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteAdress(row.收货地址流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.getTable(addressSearch, [this.pageCurrent1, this.pageSize1], ['addressData', 'total1'])
+          } else { this.$message.error('删除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 选中地址
+    handleAdressChange(row) {
+      this.people = row.联系人
+      this.phoneNumber = row.联系方式
+      this.detailedAddress = row.详细地址
+      this.provinceValue = parseInt(row.省份流水号)
+      this.getSelect(citySearch, ['市名', '市流水号'], 'city', this.provinceValue)
+      this.cityValue = parseInt(row.市流水号)
+      this.adressNum = row.收货地址流水号
+      this.form1.收货地址 = row.省份 + row.市名 + row.详细地址
+      this.form1.联系人 = row.联系人
+      this.form1.联系方式 = row.联系方式
+    },
+    submitAdress() {
+      if (this.people === '' || this.phoneNumber === '' || this.detailedAddress === '' || this.provinceValue === '' || this.cityValue === '') {
+        this.$message.warning('请填写全部信息')
+      } else {
+        this.$confirm('此操作将增加新地址，是否继续', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          addAdress(this.provinceValue, this.cityValue, this.detailedAddress, this.people, this.phoneNumber).then(response => {
+            if (response.data[0].result === '1') {
+              this.provinceValue = ''
+              this.cityValue = ''
+              this.detailedAddress = ''
+              this.people = ''
+              this.phoneNumber = ''
+              this.getTable(addressSearch, [this.pageCurrent1, this.pageSize1], ['addressData', 'total1'])
+              this.$message.success('增加成功')
+            } else { this.$message.error('增加失败') }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消增加'
+          })
+        })
+      }
+    },
+    editAdress() {
+      if (this.people === '' || this.phoneNumber === '' || this.detailedAddress === '' || this.provinceValue === '' || this.cityValue === '' || this.adressNum === '') {
+        this.$message.warning('请选择要修改的地址并填全信息')
+      } else {
+        this.$confirm('此操作将修改该地址，是否继续', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          editAdress(this.provinceValue, this.cityValue, this.detailedAddress, this.people, this.phoneNumber, this.adressNum).then(response => {
+            if (response.data[0].result === '1') {
+              this.provinceValue = ''
+              this.cityValue = ''
+              this.detailedAddress = ''
+              this.people = ''
+              this.phoneNumber = ''
+              this.getTable(addressSearch, [this.pageCurrent1, this.pageSize1], ['addressData', 'total1'])
+              this.$message.success('修改成功')
+            } else { this.$message.error('修改失败') }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消增加'
+          })
+        })
+      }
+    },
+    searchCargoBox(row) {
+      this.invoiceNum = row.发货单编号
+      this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
+    },
+    addCargoBox() {
+      this.$confirm('此操作将新增货箱, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        addCargoBox(this.invoiceNum).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.sucess('增加成功')
+            this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
+          } else {
+            this.$message.error('增加失败')
+          }
+        })
+      })
+    },
+    delCargoBox() {
+      this.$confirm('此操作会永久删除改行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        delCargoBox(this.cargoBoxValue).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.sucess('删除成功')
+            this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      })
+    },
+    // 选择备件
+    choiceSpare(row) {
+      if (parseInt(row.未发数量) === 0) {
+        this.disabledmoveInto = true
+      } else {
+        this.disabledmoveInto = false
+      }
+      this.maxNum = row.未发数量
+      this.form2.名称 = row.名称
+      this.form2.数量 = row.数量
+      this.goodsCodeName = ''
+      this.partsCode = ''
+      this.sparePartCode = row.备件编号
+      this.fileCode = ''
+      if (row.名称 === null) { this.goodsName = '' } else { this.goodsName = row.名称 }
+      if (row.规格 === null) { this.goodsSpecifications = '' } else { this.goodsSpecifications = row.规格 }
+      if (row.数量 === null) { this.goodsNumber = '' } else { this.goodsNumber = row.数量 }
+      if (row.备注 === null) { this.goodsRemark = '' } else { this.goodsRemark = row.备注 }
+      console.log(this.Spare, this.goodsCodeName, this.goodsName, this.goodsSpecifications, this.goodsNumber, this.goodsRemark)
+    },
+    // 选择文件
+    choiceFile(row) {
+      if (parseInt(row.未发数量) === 0) {
+        this.disabledmoveInto = true
+      } else {
+        this.disabledmoveInto = false
+      }
+      this.maxNum = row.未发数量
+      this.form2.名称 = row.名称
+      this.form2.数量 = row.数量
+      this.goodsCodeName = ''
+      this.partsCode = ''
+      this.sparePartCode = ''
+      this.fileCode = row.文件编号
+      if (row.名称 === null) { this.goodsName = '' } else { this.goodsName = row.名称 }
+      this.goodsSpecifications = ''
+      if (row.数量 === null) { this.goodsNumber = '' } else { this.goodsNumber = row.数量 }
+      if (row.备注 === null) { this.goodsRemark = '' } else { this.goodsRemark = row.备注 }
+      console.log(this.Spare, this.goodsCodeName, this.goodsName, this.goodsSpecifications, this.goodsNumber, this.goodsRemark)
+    },
+    // 选择部件
+    choiceParts(row) {
+      if (parseInt(row.未发数量) === 0) {
+        this.disabledmoveInto = true
+      } else {
+        this.disabledmoveInto = false
+      }
+      this.maxNum = row.未发数量
+      this.form2.名称 = row.名称
+      this.form2.数量 = row.数量
+      this.partsCode = row.部件编号
+      this.sparePartCode = ''
+      this.fileCode = ''
+      if (row.代号 === null) { this.goodsCodeName = '' } else { this.goodsCodeName = row.代号 }
+      if (row.名称 === null) { this.goodsName = '' } else { this.goodsName = row.名称 }
+      if (row.规格 === null) { this.goodsSpecifications = '' } else { this.goodsSpecifications = row.规格 }
+      if (row.数量 === null) { this.goodsNumber = '' } else { this.goodsNumber = row.数量 }
+      if (row.备注 === null) { this.goodsRemark = '' } else { this.goodsRemark = row.备注 }
+      console.log(this.Spare, this.goodsCodeName, this.goodsName, this.goodsSpecifications, this.goodsNumber, this.goodsRemark)
+    },
+    choiceGoods(row) {
+      this.maxNum = row.数量
+      this.form3.名称 = row.名称
+      this.form3.数量 = row.数量
+      this.DetailOfGoodsCode = row.货箱明细编号
+      this.sparePartCode = row.备件编号
+      this.fileCode = row.文件编号
+      this.partsCode = row.部件编号
+    },
+    moveInto() {
+      if (this.form2.名称 !== '' && this.form2.数量 !== '' && this.cargoBoxValue !== '') {
+        this.dialogFormVisible3 = true
+      } else {
+        this.$message.warning(`请选择货箱及货物`)
+      }
+    },
+    submitMoveInto() {
+      submitMoveInto(this.cargoBoxValue, this.goodsCodeName, this.goodsName, this.goodsSpecifications, this.form2.数量, this.goodsRemark, this.partsCode, this.sparePartCode, this.fileCode).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('添加成功')
+          this.form2.名称 = ''
+          this.form2.数量 = ''
+          this.dialogFormVisible3 = false
+          this.searchCargoBoxDetailed()
+          this.searchPackingListDetails()
+          searchParts(this.code).then(response => {
+            this.tableData4 = response.data
+          })
+        } else { this.$message.error('添加失败') }
+      })
+    },
+    searchCargoBoxDetailed() {
+      this.tableData6Loading = true
+      searchCargoBoxDetailed(this.cargoBoxValue).then(response => {
+        this.tableData6Loading = false
+        this.tableData6 = response.data
+      })
+      this.useqrcode()
+    },
+    remove() {
+      if (this.cargoBoxValue === '' || this.form3.名称 === '' || this.form3.数量 === '') {
+        this.$message.warning('请选择货箱并选择货物')
+      } else {
+        this.dialogFormVisible4 = true
+      }
+    },
+    submitRremove() {
+      submitRremove(this.DetailOfGoodsCode, this.form3.数量, this.partsCode, this.sparePartCode, this.fileCode, this.cargoBoxValue).then(response => {
+        this.dialogFormVisible4 = false
+        this.form3.名称 = ''
+        this.form3.数量 = ''
+        if (response.data[0].result === '1') {
+          this.searchCargoBoxDetailed()
+          searchParts(this.code).then(response => {
+            this.tableData4 = response.data
+          })
+          this.$message.sucess('移除成功')
+        } else {
+          this.$message.error('移除失败')
+        }
+      })
+    },
+    tableRowClassName1({ row }) {
+      if (row.运输状态 === '已签收') {
+        return 'background: #33cc00'
+      } else {
+        return ''
+      }
+    },
+    useqrcode() {
+      this.show = true
+      console.log(this.cargoBoxValue)
+      // 生成的二维码内容，可以添加变量
+      this.QueryDetail = this.cargoBoxValue.toString()
+      var canvas = document.getElementById('canvas')
+      QRCode.toCanvas(canvas, this.QueryDetail, function(error) {
+        if (error) console.error(error)
+        console.log('success!')
+      })
+    },
+    callOffInvoice() {
+      this.dialogFormVisible1 = false
+    },
+    clear() {
+      this.show = false
+    }
+    // clear() {
+    //   this.cargoBox = []
+    //   this.cargoBoxValue = ''
+    // }
+  }
+}
+</script>
+
+<style scoped>
+  canvas{
+    width: 45px !important;
+    height: auto!important;
+  }
+  #canvas{
+    width: 120px !important;
+    height: auto!important;
+  }
+</style>
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index 80e5fee1..81455555 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -365,8 +365,12 @@
 </template>
 
 <script>
+import elInput from 'element-ui/packages/input'
 import { initProject, searchTable1, searchTable2, addSafetyMargin, editSafetyMargin, delSafetyMargin, Withdrawing, delWithdrawing, edtWithdrawing, TakeBack } from '@/api/MarketingCenter/SafetyMargin'
 export default {
+  components: {
+    elInput
+  },
   data() {
     const validateValue = (rule, value, callback) => {
       if (value === 0) {
@@ -581,6 +585,8 @@ export default {
     callOff() {
       this.dialogFormVisible1 = false
       this.dialogFormVisible2 = false
+      this.dialogFormVisible3 = false
+      this.dialogFormVisible4 = false
     },
     delSafetyMargin(row) {
       this.deleteRow(delSafetyMargin, row.安全保证金流水号, function() { this.fetchTableData1() })
@@ -598,7 +604,7 @@ export default {
       this.dialogFormVisible2 = true
       this.code = row.安全保证金流水号
       this.projectName = row.项目名称
-      this.maxMoney = parseFloat(row.保证金金额)
+      this.maxMoney = parseFloat(row.应收回金额)
       this.SurplusAmount = row.应收回金额
       this.addForm('form2')
     },
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index 3eae8017..21455284 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -591,6 +591,7 @@ export default {
       this.getSelect(initPurchaseOrder, ['请购单编号', '请购单流水号'], 'contractNum')
     },
     searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
+      console.log(this.id)
       this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
       this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
       this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
diff --git a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
index 3cc52b00..21828f71 100644
--- a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue
@@ -152,9 +152,9 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"/>
           <span>合同号:</span>
-          <el-select v-model="contractNumValue" placeholder="合同号" size="small" style="width:180px" filterable clearable>
+          <el-select v-model="contractNumValue1" placeholder="合同号" size="small" style="width:180px" filterable clearable>
             <el-option
-              v-for="item in contractNum"
+              v-for="item in contractNum1"
               :key="item.value"
               :label="item.label"
               :value="item.value">
@@ -167,7 +167,7 @@
         </el-row>
         <el-row style="margin-top: 10px">
           <span>供应商:</span>
-          <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
+          <el-input v-model="supplierName1" placeholder="供应商" size="small" clearable/>
           <el-button
             type="success"
             size="small"
@@ -331,7 +331,7 @@
 </template>
 
 <script>
-import { initContract, initBuyer, searchTable1, searchTable2, searchTable3, searchTable4, submitContract } from '@/api/WorkshopProcurement/PurchaseContractChange'
+import { initContract, initContract1, initBuyer, searchTable1, searchTable2, searchTable3, searchTable4, submitContract } from '@/api/WorkshopProcurement/PurchaseContractChange'
 
 export default {
   data() {
@@ -352,6 +352,8 @@ export default {
       freight1: '',
       contractNumValue: '',
       contractNum: [],
+      contractNumValue1: '',
+      contractNum1: [],
       ProcurementContractNum: '',
       buyer: 0,
       Supplier: 0,
@@ -412,6 +414,15 @@ export default {
           })
         }
       })
+      initContract1().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.contractNum1.push({
+            label: response.data[i].采购合同编号,
+            name: response.data[i].采购合同名称,
+            value: response.data[i].采购合同变更流水号
+          })
+        }
+      })
     },
     initBuyer() { // 初始化采购人员
       initBuyer().then(response => {
@@ -449,7 +460,7 @@ export default {
       searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.buyerValue, this.check4, this.supplierName, this.check5, this.approvalValue).then(response => {
         this.loading1 = false
         for (let j = 0; j < response.data.rows.length; j++) {
-          if (response.data.rows[j].规定到货时间 !== null) {
+          if (response.data.rows[j].规定到货时间 !== null || response.data.rows[j].规定到货时间 !== '') {
             response.data.rows[j].规定到货时间 = response.data.rows[j].规定到货时间.substring(0, response.data.rows[j].规定到货时间.indexOf(' '))
           }
         }
@@ -464,10 +475,10 @@ export default {
         this.check1 = 0
         this.startEndDate = ''
       } else { this.check1 = 1 }
-      this.contractNumValue ? this.check2 = 1 : this.check2 = 0
-      this.buyerName ? this.check3 = 1 : this.check3 = 0
-      this.supplierName ? this.check4 = 1 : this.check4 = 0
-      searchTable3(this.pageCurrent2, this.pageSize2, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.buyerValue, this.check4, this.supplierName).then(response => {
+      this.contractNumValue1 ? this.check2 = 1 : this.check2 = 0
+      this.buyerName1 ? this.check3 = 1 : this.check3 = 0
+      this.supplierName1 ? this.check4 = 1 : this.check4 = 0
+      searchTable3(this.pageCurrent2, this.pageSize2, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue1, this.check3, this.buyerValue1, this.check4, this.supplierName1).then(response => {
         this.loading2 = false
         for (let j = 0; j < response.data.rows.length; j++) {
           if (response.data.rows[j].规定到货时间 !== null) {
diff --git a/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue b/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue
index 1e0cbb99..0b9a71e2 100644
--- a/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue
+++ b/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue
@@ -15,8 +15,8 @@
         </el-select>
         <span>供应商:</span>
         <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width: 200px"/>
-        <span>零件号:</span>
-        <el-select v-model="PartNumberValue" placeholder="零件号" size="small" clearable>
+        <span>零件名称:</span>
+        <el-select v-model="PartNumberValue" placeholder="零件名称" size="small" filterable clearable>
           <el-option
             v-for="item in PartNumber"
             :key="item.value"
@@ -161,6 +161,14 @@ export default {
       this.PartNumberValue ? this.check3 = 1 : this.check3 = 0
       searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue, this.check2, this.supplierName, this.check3, this.PartNumberValue).then(response => {
         this.loading = false
+        for (let i = 0; i < response.data.rows.length; i++) {
+          if (response.data.rows[i].交检日期 !== '') {
+            response.data.rows[i].交检日期 = (response.data.rows[i].交检日期).split(' ')[0]
+          }
+          if (response.data.rows[i].检查日期 !== '') {
+            response.data.rows[i].检查日期 = (response.data.rows[i].检查日期).split(' ')[0]
+          }
+        }
         this.tableData = response.data.rows
         this.total = response.data.total
       })
diff --git a/vim.exe.stackdump b/vim.exe.stackdump
new file mode 100644
index 00000000..b8d6a4cc
--- /dev/null
+++ b/vim.exe.stackdump
@@ -0,0 +1,14 @@
+Stack trace:
+Frame        Function    Args
+0060002FB40  0018005E579 (00000000000, 000FFFFCE00, 0060002FD48, 000FFFFDE50)
+00010000002  0018006056A (00000000064, 00600000000, 00000000000, 00000000000)
+0060002FE20  00180125C3B (0018006C74F, 00000000000, 001800F6070, 00000008000)
+00600030100  0018012221E (00000000000, 00000000000, 00000000000, 00000000000)
+FFFFFFFFFFFFFFFF  00180122714 (00000000002, 00000000000, 0018005F905, 0000000000B)
+FFFFFFFFFFFFFFFF  001801228F0 (00600000017, 00000000001, FFFFFFFFFFFFFFFF, 00000000000)
+FFFFFFFFFFFFFFFF  0018011DE4B (00600000017, 00000000001, FFFFFFFFFFFFFFFF, 00000000000)
+FFFFFFFFFFFFFFFF  001004FAE93 (00100000000, 00000000001, 0017FF7E930, 00600034C60)
+FFFFFFFFFFFFFFFF  001005DA5B2 (00000000000, 00000000000, 00000000000, 00000000000)
+00000000000  0018005CAFA (00000000000, 00000000000, 00000000000, 000FFFFCE00)
+00020000000  00180060782 (00000000000, 00000000000, 00000000000, 000FFFFCE00)
+End of stack trace