diff --git a/src/api/Assembly/DeliveryConfirmation.js b/src/api/Assembly/DeliveryConfirmation.js
new file mode 100644
index 00000000..25cb1df2
--- /dev/null
+++ b/src/api/Assembly/DeliveryConfirmation.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+export function InvoiceListSearch() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货确认_发货单_发货单列表_查询',
+      param: '发货单名=' + arguments[0] + '\\&发货单号=' + arguments[1] + '\\&收货单位=' + arguments[2] + '\\&车辆牌号=' + arguments[3] + '\\&司机姓名=' + arguments[4] + '\\&司机电话=' + arguments[5] + '\\&制单人=' + arguments[6] + '\\&核准人=' + arguments[7] + '\\&执行人=' + arguments[8] + '\\&开始制单日期=' + arguments[9] + '\\&结束制单日期=' + arguments[10] + '\\&开始核准日期=' + arguments[11] + '\\&结束核准日期=' + arguments[12] + '\\&开始发货日期=' + arguments[13] + '\\&结束发货日期=' + arguments[14] + '\\&发货单名_check=' + arguments[15] + '\\&发货单号_check=' + arguments[16] + '\\&收货单位_check=' + arguments[17] + '\\&车辆牌号_check=' + arguments[18] + '\\&司机姓名_check=' + arguments[19] + '\\&司机电话_check=' + arguments[20] + '\\&制单人_check=' + arguments[21] + '\\&核准人_check=' + arguments[22] + '\\&执行人_check=' + arguments[23] + '\\&开始制单日期_check=' + arguments[24] + '\\&结束制单日期_check=' + arguments[25] + '\\&开始核准日期_check=' + arguments[26] + '\\&结束核准日期_check=' + arguments[27] + '\\&开始发货日期_check=' + arguments[28] + '\\&结束发货日期_check=' + arguments[29] + '\\&是否发出_check=' + arguments[30] + '\\&是否发出=' + arguments[31],
+      Pagination: arguments[32] + '&' + arguments[33]
+    }
+  })
+}
+export function DetailsFeach() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单明细_查询',
+      param: '发货单流水号=' + arguments[0]
+    }
+  })
+}
+export function confirmation() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_发货确认_发货单_发货确认',
+      param: '发货单流水号=' + arguments[0] + '&司机姓名=' + arguments[1] + '&司机电话=' + arguments[2] + '&车辆牌号=' + arguments[3] + '&执行人=' + arguments[4] + '&备注=' + arguments[5]
+    }
+  })
+}
+export function reconfirmation() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_发货确认_发货单_打回确认',
+      param: '发货单流水号=' + arguments[0]
+    }
+  })
+}
diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
index 61619cd5..c465a406 100644
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -42,7 +42,7 @@ export function searchList(pageCurrent, pageSize, listNumber_check, listNumber)
     data: {
       type: '1',
       name: '车间装配管理_领料单_查询数据',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
+      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否审批=1',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/MarketingCenter/DeliveryApplication.js b/src/api/MarketingCenter/DeliveryApplication.js
new file mode 100644
index 00000000..a13a6315
--- /dev/null
+++ b/src/api/MarketingCenter/DeliveryApplication.js
@@ -0,0 +1,167 @@
+import request from '@/utils/request'
+
+export function InvoiceAdd() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_新增',
+      param: '制单人=' + arguments[0] + '&发货单流水号=0=int=output'
+    }
+  })
+}
+export function InvoiceDelete() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_删除',
+      param: '发货单流水号=' + arguments[0]
+    }
+  })
+}
+export function InvoiceSelectPush() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_下拉框数据_查询',
+      param: '查询条件=' + arguments[0]
+    }
+  })
+}
+export function PickSelectPush() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_货品_查询',
+      param: '查询类别=' + arguments[0] + '\\&查询条件=' + arguments[1]
+    }
+  })
+}
+export function SelectMachine() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_机床_查询',
+      param: '机床图号=' + arguments[0]
+    }
+  })
+}
+export function SelectAssembly() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_组件_查询',
+      param: '组号=' + arguments[0]
+    }
+  })
+}
+export function SelectPart() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_零件_查询',
+      param: '零件图号=' + arguments[0]
+    }
+  })
+}
+export function SelectMateriel() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_物料_查询',
+      param: '物料名称=' + arguments[0]
+    }
+  })
+}
+export function InvoiceFeach() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单数据_查询',
+      param: '发货单流水号=' + arguments[0]
+    }
+  })
+}
+export function InvoiceSave() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_发货申请_发货单_保存',
+      param: '发货单流水号=' + arguments[0] + '\\&收货单位=' + arguments[1] + '\\&收货地址=' + arguments[2] + '\\&收货人员=' + arguments[3] + '\\&联系电话=' + arguments[4] + '\\&注意事项=' + arguments[5] + '\\&发货单名称=' + arguments[6]
+    }
+  })
+}
+export function InvoiceExamine() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '发货管理_发货申请_发货单_审核',
+      param: '发货单流水号=' + arguments[0] + '&审核人=' + arguments[1]
+    }
+  })
+}
+export function InvoiceAbandoningTrial() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_弃审',
+      param: '发货单流水号=' + arguments[0]
+    }
+  })
+}
+export function DetailsFeach() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单明细_查询',
+      param: '发货单流水号=' + arguments[0]
+    }
+  })
+}
+export function InvoiceDetailsSave() {
+  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]
+    }
+  })
+}
+export function InvoiceListSearch() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_发货单列表_查询',
+      param: '发货单名=' + arguments[0] + '\\&发货单号=' + arguments[1] + '\\&收货单位=' + arguments[2] + '\\&车辆牌号=' + arguments[3] + '\\&司机姓名=' + arguments[4] + '\\&司机电话=' + arguments[5] + '\\&制单人=' + arguments[6] + '\\&核准人=' + arguments[7] + '\\&执行人=' + arguments[8] + '\\&开始制单日期=' + arguments[9] + '\\&结束制单日期=' + arguments[10] + '\\&开始核准日期=' + arguments[11] + '\\&结束核准日期=' + arguments[12] + '\\&开始发货日期=' + arguments[13] + '\\&结束发货日期=' + arguments[14] + '\\&发货单名_check=' + arguments[15] + '\\&发货单号_check=' + arguments[16] + '\\&收货单位_check=' + arguments[17] + '\\&车辆牌号_check=' + arguments[18] + '\\&司机姓名_check=' + arguments[19] + '\\&司机电话_check=' + arguments[20] + '\\&制单人_check=' + arguments[21] + '\\&核准人_check=' + arguments[22] + '\\&执行人_check=' + arguments[23] + '\\&开始制单日期_check=' + arguments[24] + '\\&结束制单日期_check=' + arguments[25] + '\\&开始核准日期_check=' + arguments[26] + '\\&结束核准日期_check=' + arguments[27] + '\\&开始发货日期_check=' + arguments[28] + '\\&结束发货日期_check=' + arguments[29]
+    }
+  })
+}
diff --git a/src/api/Outsourcing/OutsourcingQCSearch.js b/src/api/Outsourcing/OutsourcingQCSearch.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js
index b7efa442..06fb7d44 100644
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -45,7 +45,7 @@ export function doneContract(...params) {
     data: {
       type: '2',
       name: '采购管理_采购合同_增加数据',
-      param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}\\&税率=${params[17]}\\&询价单明细流水号组=${params[18]}`
+      param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}\\&税率=${params[17]}\\&询价单明细流水号组=${params[18]}\\&备注组=${params[19]}`
     }
   })
 }
@@ -72,6 +72,17 @@ export function savePrice(price, num1, num2, num3, num4, num5) {
     }
   })
 }
+// 实时保存备注
+export function saveRemark(price, num1, num2, num3, num4, num5) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `update 采购管理_询价单明细_视图 set 备注 = '${price}' where isnull(物料流水号,0) = isnull('${num1}',0) and 询价单流水号 = ${num2} and isnull(零件名称,'') = '${num3}' and isnull(零件图号,'') = '${num4}' and (isnull(规格,'') = '${num5}' or isnull(物料规格,'') = '${num5}')`
+    }
+  })
+}
 // 实时保存合同头
 export function saveContractHeader(...params) {
   return request({
diff --git a/src/icons/svg/DeliveryConfirmation.svg b/src/icons/svg/DeliveryConfirmation.svg
new file mode 100644
index 00000000..d63ab201
--- /dev/null
+++ b/src/icons/svg/DeliveryConfirmation.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1560912753656" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1983" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M239.158 100.98c85.459 0 154.738 69.28 154.738 154.74 0 85.457-69.277 154.737-154.738 154.737-85.46 0-154.74-69.28-154.74-154.737 0-85.46 69.28-154.74 154.74-154.74z m77.147 140.082v-59.263l-99.341 88.577-54.954-49.169v59.263l54.954 49.17 99.341-88.578zM932.298 622.77c-5.654 0.308-12.248 0.47-19.79 0.47H739.172c-4.397 0-8.793-2.2-13.19-6.595-4.397-4.402-6.596-8.166-6.596-11.309v-0.94c-0.622-30.777-0.946-58.721-0.946-83.85v-85.724c0-6.909 2.835-13.35 8.484-19.313 5.651-5.967 12.558-8.943 20.725-8.943 0.628 0 5.338-0.319 14.135-0.948 8.792-0.63 19.623-0.16 32.503 1.41 12.876 1.567 26.534 5.027 40.979 10.363 14.441 5.338 27.945 13.975 40.509 25.91 19.47 20.1 33.286 44.436 41.45 73.01 8.166 28.574 15.707 58.25 22.608 89.024 0 1.257 0.164 2.2 0.473 2.83 0.314 0.624 0.467 1.57 0.467 2.826 0.001 7.543-2.82 11.468-8.474 11.78z m73.951 11.304c-4.711-35.484-13.034-71.758-24.965-108.811-11.94-37.055-29.833-71.918-53.703-104.564-13.185-18.217-29.513-33.917-48.99-47.104a291.086 291.086 0 0 0-62.173-32.04c-21.984-8.165-44.28-13.969-66.891-17.423-22.609-3.454-44.28-4.237-65.005-2.355-6.903 0.624-12.716 5.498-17.427 14.601-4.71 9.103-7.063 17.114-7.063 24.02v454.087c0 11.309 4.08 21.041 12.246 29.204 8.167 8.162 17.892 12.244 29.202 12.244h16.96c0-15.698 2.982-30.62 8.95-44.75 5.97-14.132 14.131-26.526 24.495-37.207 10.366-10.679 22.45-19.163 36.27-25.44 13.815-6.28 28.886-9.423 45.214-9.423 16.334 0 31.874 2.2 46.637 6.597 14.76 4.396 27.64 11.303 38.62 20.723 10.995 9.423 19.789 21.668 26.384 36.742 6.59 15.075 9.886 33.292 9.886 54.642h38.63c3.766 0 6.754-1.886 8.954-5.65 2.19-3.772 4.08-8.325 5.644-13.668a95.304 95.304 0 0 0 3.3-16.012c0.63-5.34 0.942-9.896 0.942-13.662 0-19.469 0.159-44.596 0.47-75.37 0.32-30.764-1.884-63.893-6.595-99.38h0.008z m-168.163 164.39c16.326 0 30.461 5.966 42.394 17.903 11.935 11.935 17.9 26.057 17.9 42.394 0 16.953-5.967 31.399-17.9 43.327-11.933 11.938-26.062 17.904-42.394 17.904-16.952 0-31.246-5.966-42.866-17.904-11.618-11.933-17.427-26.373-17.427-43.327 0-16.335 5.81-30.46 17.427-42.394 11.62-11.937 25.907-17.902 42.866-17.902z m-648.15-0.937c-16.958 0-31.251 5.966-42.866 17.894-11.622 11.934-17.427 26.376-17.427 43.342 0 16.318 5.805 30.453 17.427 42.39 11.617 11.935 25.908 17.901 42.866 17.901s31.245-5.967 42.865-17.9c11.622-11.937 17.424-26.066 17.424-42.391 0-16.958-5.807-31.41-17.424-43.342-11.62-11.928-25.908-17.894-42.865-17.894z m240.683-590.689c4.677 16.642 7.037 33.955 7.037 51.937 0 27.427-5.217 53.075-15.657 76.927-10.435 23.852-24.597 44.722-42.482 62.61-17.89 17.885-38.752 31.905-62.61 42.038-23.856 10.134-49.192 15.202-76.03 15.202-27.43 0-53.07-5.068-76.921-15.202-23.853-10.135-44.72-24.153-62.61-42.038-17.89-17.888-32.05-38.758-42.483-62.61-10.438-23.852-15.657-49.495-15.657-76.927 0-2.997 0.078-5.971 0.201-8.932-8.977 11.017-16.044 23.056-21.165 36.131-5.656 14.442-8.48 29.204-8.48 44.278v489.882c0 11.935 3.454 21.042 10.362 27.32 6.914 6.274 15.704 9.422 26.38 9.422h21.67c0-40.194 10.21-70.186 30.618-89.967 20.405-19.785 49.772-29.682 88.081-29.682 40.2 0 69.722 10.678 88.558 32.037 18.841 21.353 28.266 50.559 28.266 87.612H564.88c10.056 0 18.681-3.454 25.908-10.366 7.221-6.905 10.835-15.695 10.835-26.374l-1.885-613.298H430.619z m0 0" fill="#ffffff" p-id="1984"></path></svg>
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 4646e1be..39e0294c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -22,7 +22,7 @@ export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
 export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图   发布时改成0.231
 const service = axios.create({
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index 951c39cb..1d6d3e95 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -94,8 +94,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.组件是否完成===null || scope.row.组件是否完成===0" type="success" size="small" @click="handlestart_3(scope.row)">开始装配</el-button>
-            <el-button v-else-if="scope.row.组件是否完成===1" type="danger" size="small" @click="handleend_3(scope.row)">结束装配</el-button>
+            <el-button v-if="scope.row.buttonStatus === 1" type="success" size="small" @click="handlestart_3(scope.row)">开始装配</el-button>
+            <el-button v-else-if="scope.row.buttonStatus === 2" type="danger" size="small" @click="handleend_3(scope.row)">结束装配</el-button>
             <el-button v-else type="info" size="small" >装配完成</el-button>
           </template>
         </el-table-column>
@@ -163,6 +163,16 @@ export default {
       searchTable2(this.machineNumberValue, this.check2).then(response => {
         console.log(response.data, 222)
         this.tableData2 = response.data
+        this.tableData2.map(v => {
+          if (v.组件是否完成 === null || v.组件是否完成 === 0) {
+            this.$set(v, 'buttonStatus', 1)
+          } else if (v.组件是否完成 === 1) {
+            this.$set(v, 'buttonStatus', 2)
+          } else {
+            this.$set(v, 'buttonStatus', 3)
+          }
+          return v
+        })
       })
     },
     // 总装开始装配
@@ -207,7 +217,8 @@ export default {
       ComponentStateUpdate(row.组件流水号, 1).then(response => {
         console.log(response.data)
         this.searchTable1()
-        this.searchTable2()
+        row.buttonStatus = 2
+        // this.searchTable2()
       })
     },
     // 部装结束装配
@@ -216,7 +227,8 @@ export default {
       ComponentStateUpdate(row.组件流水号, 2).then(response => {
         console.log(response.data)
         this.searchTable1()
-        this.searchTable2()
+        row.buttonStatus = 3
+        // this.searchTable2()
       })
     }
   }
diff --git a/src/views/Assembly/DeliveryConfirmation/index.vue b/src/views/Assembly/DeliveryConfirmation/index.vue
new file mode 100644
index 00000000..ebb3398b
--- /dev/null
+++ b/src/views/Assembly/DeliveryConfirmation/index.vue
@@ -0,0 +1,673 @@
+<template>
+  <div>
+    <el-card>
+      <div class="text">
+        <el-row style="margin-top: 10px">
+          <span style="width:80px;display:inline-block;">发货单名：</span>
+          <el-input
+            v-model="searchFrom.发货单名"
+            clearable
+            placeholder="请输入"
+            style="width: 150px;margin-right: 10px"
+            size="mini"/>
+          <span style="width:80px;display:inline-block;">发货单号：</span>
+          <el-input
+            v-model="searchFrom.发货单号"
+            placeholder="请输入"
+            clearable
+            style="width: 150px;margin-right: 10px"
+            size="mini"/>
+          <span style="width:80px;display:inline-block;">收货单位：</span>
+          <el-input
+            v-model="searchFrom.收货单位"
+            placeholder="请输入"
+            clearable
+            style="width: 150px;margin-right: 10px"
+            size="mini"/>
+        </el-row>
+        <el-row style="margin-top: 10px">
+          <span style="width:80px;display:inline-block;">车辆牌号：</span>
+          <el-input
+            v-model="searchFrom.车辆牌号"
+            placeholder="请输入"
+            clearable
+            style="width: 150px;margin-right: 10px"
+            size="mini"/>
+          <span style="width:80px;display:inline-block;">司机姓名：</span>
+          <el-input
+            v-model="searchFrom.司机姓名"
+            placeholder="请输入"
+            clearable
+            style="width: 150px;margin-right: 10px"
+            size="mini"/>
+          <span style="width:80px;display:inline-block;">司机电话：</span>
+          <el-input
+            v-model="searchFrom.司机电话"
+            placeholder="请输入"
+            clearable
+            style="width: 150px;margin-right: 10px"
+            size="mini"/>
+        </el-row>
+        <el-row style="margin-top: 10px">
+          <span style="width:80px;display:inline-block;">制单人：</span>
+          <el-input
+            v-model="searchFrom.制单人"
+            placeholder="请输入"
+            clearable
+            style="width: 150px;margin-right: 10px"
+            size="mini"/>
+          <span style="width:80px;display:inline-block;">核准人：</span>
+          <el-input
+            v-model="searchFrom.核准人"
+            placeholder="请输入"
+            clearable
+            style="width: 150px;margin-right: 10px"
+            size="mini"/>
+          <span style="width:80px;display:inline-block;">执行人：</span>
+          <el-input
+            v-model="searchFrom.执行人"
+            placeholder="请输入"
+            clearable
+            style="width: 150px;margin-right: 10px"
+            size="mini"/>
+        </el-row>
+        <el-row style="margin-top: 10px">
+          <span style="width:80px;display:inline-block;">制单日期：</span>
+          <el-date-picker
+            v-model="searchFrom.开始制单日期"
+            style="width: 150px; margin-right: 10px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            size="small"
+            type="datetime"
+            placeholder="开始日期"/>
+          <span style="width:80px;display:inline-block;">制单日期：</span>
+          <el-date-picker
+            v-model="searchFrom.结束制单日期"
+            style="width: 150px; margin-right: 10px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            size="small"
+            type="datetime"
+            placeholder="结束日期"/>
+          <span style="width:80px;display:inline-block;">发货状态：</span>
+          <el-select v-model="DeliveryStatusValue" placeholder="请选择" size="mini" style="width: 150px" clearable>
+            <el-option
+              v-for="item in DeliveryStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-row>
+        <el-row style="margin-top: 10px">
+          <span style="width:80px;display:inline-block;">核准日期：</span>
+          <el-date-picker
+            v-model="searchFrom.开始核准日期"
+            style="width: 150px; margin-right: 10px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            size="small"
+            type="datetime"
+            placeholder="开始日期"/>
+          <span style="width:80px;display:inline-block;">核准日期：</span>
+          <el-date-picker
+            v-model="searchFrom.结束核准日期"
+            style="width: 150px; margin-right: 10px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            size="small"
+            type="datetime"
+            placeholder="结束日期"/>
+        </el-row>
+        <el-row style="margin-top: 10px">
+          <span style="width:80px;display:inline-block;">发货日期：</span>
+          <el-date-picker
+            v-model="searchFrom.开始发货日期"
+            style="width: 150px; margin-right: 10px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            size="small"
+            type="datetime"
+            placeholder="开始日期"/>
+          <span style="width:80px;display:inline-block;">发货日期：</span>
+          <el-date-picker
+            v-model="searchFrom.结束发货日期"
+            style="width: 150px; margin-right: 10px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            size="small"
+            type="datetime"
+            placeholder="结束日期"/>
+          <el-button type="success" icon="el-icon-menu" size="mini" style="margin-left: 74px" @click="search">查询</el-button>
+          <el-button type="warning" icon="el-icon-delete" size="mini" @click="clearSearch">清空</el-button>
+        </el-row>
+      </div>
+      <el-divider/>
+      <div>
+        <el-table
+          :data="tableDataSearchList"
+          highlight-current-row
+          style="width: 100%"
+          height="500"
+          border
+          size="mini"
+          @row-click="openDialogFormVisible">
+          <el-table-column align="center" label="状态" min-width="80">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.是否发出.toString() === '1'" type="success" size="small">已发出</el-tag>
+              <el-tag v-else type="danger" size="small">未发出</el-tag>
+              <!--{{ scope.row.是否发出.toString() === '1' ? '已发出' : '未发出' }}-->
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="发货单号" min-width="120">
+            <template slot-scope="scope">
+              {{ scope.row.发货单编号 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="发货单名" min-width="110">
+            <template slot-scope="scope">
+              {{ scope.row.发货单名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="收货单位" min-width="200">
+            <template slot-scope="scope">
+              {{ scope.row.收货单位 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="收货地址" min-width="250">
+            <template slot-scope="scope">
+              {{ scope.row.收货地址 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="收货人员" min-width="80">
+            <template slot-scope="scope">
+              {{ scope.row.收货人员 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="联系电话" min-width="110">
+            <template slot-scope="scope">
+              {{ scope.row.联系电话 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="车辆牌号" min-width="110">
+            <template slot-scope="scope">
+              {{ scope.row.车辆牌号 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="司机姓名" min-width="80">
+            <template slot-scope="scope">
+              {{ scope.row.司机姓名 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="司机电话" min-width="110">
+            <template slot-scope="scope">
+              {{ scope.row.司机电话 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="制单人" min-width="80">
+            <template slot-scope="scope">
+              {{ scope.row.制单人 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="审核人" min-width="80">
+            <template slot-scope="scope">
+              {{ scope.row.审核人 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="发货人" min-width="80">
+            <template slot-scope="scope">
+              {{ scope.row.发货人 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="制单时间" min-width="85">
+            <template slot-scope="scope">
+              {{ scope.row.操作日期 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="审核时间" min-width="85">
+            <template slot-scope="scope">
+              {{ scope.row.审核日期 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="发货时间" min-width="85">
+            <template slot-scope="scope">
+              {{ scope.row.发出时间 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 50]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+
+    <el-dialog :visible.sync="dialogFormVisible" title="江苏高精机电装备有限公司发货申请单" center style="min-height: 700px" width="60%">
+      <el-form ref="invoiceFrom" :model="invoiceFrom" :rules="invoiceFromRules" label-position="left" label-width="110px">
+        <el-row>
+          <el-form-item label="发货单号" prop="发货单号" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.发货单号"
+              readonly
+              style="width: 200px;margin-right: 10px"
+              size="mini"/>
+          </el-form-item>
+          <el-form-item label="收货地址" prop="收货地址" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.收货地址"
+              readonly
+              clearable
+              size="mini"
+              style="width: 495px;margin-right: 10px"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="发货单名" prop="发货单名" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.发货单名"
+              readonly
+              clearable
+              style="width: 200px;margin-right: 10px"
+              size="mini"/>
+          </el-form-item>
+          <el-form-item label="注意事项" prop="注意事项" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.注意事项"
+              readonly
+              clearable
+              style="width: 495px;margin-right: 10px"
+              size="mini"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="收货单位" prop="收货单位" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.收货单位"
+              readonly
+              clearable
+              style="width: 200px;margin-right: 10px"
+              size="mini"/>
+          </el-form-item>
+          <el-form-item label="收货人员" prop="收货人员" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.收货人员"
+              readonly
+              clearable
+              size="mini"
+              style="width: 200px;margin-right: 10px"/>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="联系电话" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.联系电话"
+              :trigger-on-focus="false"
+              readonly
+              clearable
+              size="mini"
+              style="width: 200px;margin-right: 10px"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="车辆牌号" prop="车辆牌号" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.车辆牌号"
+              :disabled="disabled"
+              size="mini"
+              style="width: 200px;margin-right: 10px"
+              clearable
+              placeholder="请输入内容"/>
+          </el-form-item>
+          <el-form-item label="司机姓名" prop="司机姓名" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.司机姓名"
+              :disabled="disabled"
+              size="mini"
+              style="width: 200px;margin-right: 10px"
+              clearable
+              placeholder="请输入内容"/>
+          </el-form-item>
+          <el-form-item label="司机电话" prop="司机电话" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.司机电话"
+              :disabled="disabled"
+              size="mini"
+              style="width: 200px;margin-right: 10px"
+              clearable
+              placeholder="请输入内容"/>
+          </el-form-item>
+        </el-row>
+        <el-row style="margin-top: 15px">
+          <el-form-item label="备注" prop="备注" style="display: inline-block" label-width="80px">
+            <el-input
+              v-model="invoiceFrom.备注"
+              :disabled="disabled"
+              size="mini"
+              style="width: 788px;margin-right: 10px"
+              clearable
+              placeholder="请输入内容"/>
+          </el-form-item>
+          <el-button :disabled="disabled" type="success" size="mini" style="margin-left: 5px" @click="confirmation('invoiceFrom')">确认发货</el-button>
+          <el-button :disabled="disabledDetailsDelete" type="danger" size="mini" @click="wiverOfConfirmation">打回确认</el-button>
+        </el-row>
+      </el-form>
+      <div/>
+      <el-divider/>
+      <div>
+        <el-table
+          :data="tableDataDelivery"
+          highlight-current-row
+          style="width: 100%"
+          height="300"
+          border
+          size="mini">
+          <el-table-column align="center" label="货品类别" width="80">
+            <template slot-scope="scope">
+              <el-tag effect="dark" size="small" type="success">{{ 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-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="数量" width="80">
+            <template slot-scope="scope">
+              <template>
+                {{ scope.row.数量 }}
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="设计者" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.设计者 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-divider/>
+      <el-row>
+        <div class="text">
+          <span>制单人：</span>
+          <span>{{ isMaker }}</span>
+          <el-divider direction="vertical"/>
+          <span style="margin-left: 10px">核准人：</span>
+          <span>{{ isExamine }}</span>
+          <el-divider direction="vertical"/>
+          <span style="margin-left: 10px">发货执行人：</span>
+          <span>{{ isDelive }}</span>
+          <el-divider direction="vertical"/>
+          <span>制单时间：</span>
+          <span>{{ MakerTime }}</span>
+          <el-divider direction="vertical"/>
+          <span style="margin-left: 10px">核准时间：</span>
+          <span>{{ ExamineTime }}</span>
+          <el-divider direction="vertical"/>
+          <span style="margin-left: 10px">发货时间：</span>
+          <span>{{ DeliveTime }}</span>
+        </div>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<!--<el-button-->
+  <!--:disabled="disabledDetailsDelete"-->
+  <!--size="mini"-->
+  <!--type="text"-->
+  <!--icon="el-icon-delete-solid"-->
+  <!--@click.native.prevent="deleteRow(scope.$index, tableData)"-->
+<!--&gt;删除</el-button>-->
+
+<script>
+import { InvoiceListSearch, DetailsFeach, confirmation, reconfirmation } from '@/api/Assembly/DeliveryConfirmation'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      disabledDetailsDelete: false,
+      disabled: false,
+      isMaker: '',
+      isDelive: '',
+      isExamine: '',
+      MakerTime: '',
+      ExamineTime: '',
+      DeliveTime: '',
+      invoiceNum: '',
+      tableDataDelivery: [],
+      dialogFormVisible: false,
+      pageCurrent: 1,
+      pageSize: 10,
+      total: null,
+      invoiceFrom: {
+        发货单号: '',
+        收货地址: '',
+        发货单名: '',
+        收货单位: '',
+        注意事项: '',
+        车辆牌号: '',
+        司机姓名: '',
+        司机电话: '',
+        收货人员: '',
+        联系电话: '',
+        备注: ''
+      },
+      invoiceFromRules: {
+        司机姓名: [{ required: true, message: '请输入司机姓名', trigger: 'blur' }],
+        司机电话: [{ required: true, message: '请输入司机电话', trigger: 'blur' }],
+        车辆牌号: [{ required: true, message: '请输入车辆牌号', trigger: 'blur' }]
+      },
+      searchFrom: {
+        发货单名: '',
+        发货单号: '',
+        收货单位: '',
+        车辆牌号: '',
+        司机姓名: '',
+        司机电话: '',
+        制单人: '',
+        核准人: '',
+        执行人: '',
+        开始制单日期: '',
+        结束制单日期: '',
+        开始核准日期: '',
+        结束核准日期: '',
+        开始发货日期: '',
+        结束发货日期: '',
+        发货单名_check: null,
+        发货单号_check: null,
+        收货单位_check: null,
+        车辆牌号_check: null,
+        司机姓名_check: null,
+        司机电话_check: null,
+        制单人_check: null,
+        核准人_check: null,
+        执行人_check: null,
+        开始制单日期_check: null,
+        结束制单日期_check: null,
+        开始核准日期_check: null,
+        结束核准日期_check: null,
+        开始发货日期_check: null,
+        结束发货日期_check: null
+      },
+      DeliveryStatusValue_check: null,
+      tableDataSearchList: [],
+      listLoading: false,
+      DeliveryStatusValue: '',
+      DeliveryStatus: [{
+        value: 1,
+        label: '已发货'
+      },
+      {
+        value: 2,
+        label: '未发货'
+      }]
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'id'// 人员编号
+    ])
+  },
+  methods: {
+    clearSearch() {
+      this.DeliveryStatusValue = ''
+      this.searchFrom.发货单名 = ''
+      this.searchFrom.发货单号 = ''
+      this.searchFrom.收货单位 = ''
+      this.searchFrom.车辆牌号 = ''
+      this.searchFrom.司机姓名 = ''
+      this.searchFrom.司机电话 = ''
+      this.searchFrom.制单人 = ''
+      this.searchFrom.核准人 = ''
+      this.searchFrom.执行人 = ''
+      this.searchFrom.开始制单日期 = ''
+      this.searchFrom.结束制单日期 = ''
+      this.searchFrom.开始核准日期 = ''
+      this.searchFrom.结束核准日期 = ''
+      this.searchFrom.开始发货日期 = ''
+      this.searchFrom.结束发货日期 = ''
+    },
+    search() {
+      this.tableDataSearchList = []
+      this.DeliveryStatusValue !== null && this.DeliveryStatusValue !== '' ? this.DeliveryStatusValue_check = 1 : this.DeliveryStatusValue_check = 0
+      this.DeliveryStatusValue === null ? this.DeliveryStatusValue = '' : this.DeliveryStatusValue
+      this.searchFrom.发货单名 !== null && this.searchFrom.发货单名 !== '' ? this.searchFrom.发货单名_check = 1 : this.searchFrom.发货单名_check = 0
+      this.searchFrom.发货单号 !== null && this.searchFrom.发货单号 !== '' ? this.searchFrom.发货单号_check = 1 : this.searchFrom.发货单号_check = 0
+      this.searchFrom.收货单位 !== null && this.searchFrom.收货单位 !== '' ? this.searchFrom.收货单位_check = 1 : this.searchFrom.收货单位_check = 0
+      this.searchFrom.车辆牌号 !== null && this.searchFrom.车辆牌号 !== '' ? this.searchFrom.车辆牌号_check = 1 : this.searchFrom.车辆牌号_check = 0
+      this.searchFrom.司机姓名 !== null && this.searchFrom.司机姓名 !== '' ? this.searchFrom.司机姓名_check = 1 : this.searchFrom.司机姓名_check = 0
+      this.searchFrom.司机电话 !== null && this.searchFrom.司机电话 !== '' ? this.searchFrom.司机电话_check = 1 : this.searchFrom.司机电话_check = 0
+      this.searchFrom.制单人 !== null && this.searchFrom.制单人 !== '' ? this.searchFrom.制单人_check = 1 : this.searchFrom.制单人_check = 0
+      this.searchFrom.核准人 !== null && this.searchFrom.核准人 !== '' ? this.searchFrom.核准人_check = 1 : this.searchFrom.核准人_check = 0
+      this.searchFrom.执行人 !== null && this.searchFrom.执行人 !== '' ? this.searchFrom.执行人_check = 1 : this.searchFrom.执行人_check = 0
+      this.searchFrom.开始制单日期 !== null && this.searchFrom.开始制单日期 !== '' ? this.searchFrom.开始制单日期_check = 1 : this.searchFrom.开始制单日期_check = 0
+      this.searchFrom.结束制单日期 !== null && this.searchFrom.结束制单日期 !== '' ? this.searchFrom.结束制单日期_check = 1 : this.searchFrom.结束制单日期_check = 0
+      this.searchFrom.开始核准日期 !== null && this.searchFrom.开始核准日期 !== '' ? this.searchFrom.开始核准日期_check = 1 : this.searchFrom.开始核准日期_check = 0
+      this.searchFrom.结束核准日期 !== null && this.searchFrom.结束核准日期 !== '' ? this.searchFrom.结束核准日期_check = 1 : this.searchFrom.结束核准日期_check = 0
+      this.searchFrom.开始发货日期 !== null && this.searchFrom.开始发货日期 !== '' ? this.searchFrom.开始发货日期_check = 1 : this.searchFrom.开始发货日期_check = 0
+      this.searchFrom.结束发货日期 !== null && this.searchFrom.结束发货日期 !== '' ? this.searchFrom.结束发货日期_check = 1 : this.searchFrom.结束发货日期_check = 0
+      this.listLoading = true
+      InvoiceListSearch(this.searchFrom.发货单名, this.searchFrom.发货单号, this.searchFrom.收货单位, this.searchFrom.车辆牌号, this.searchFrom.司机姓名, this.searchFrom.司机电话, this.searchFrom.制单人, this.searchFrom.核准人, this.searchFrom.执行人, this.searchFrom.开始制单日期, this.searchFrom.结束制单日期, this.searchFrom.开始核准日期, this.searchFrom.结束核准日期, this.searchFrom.开始发货日期, this.searchFrom.结束发货日期, this.searchFrom.发货单名_check, this.searchFrom.发货单号_check, this.searchFrom.收货单位_check, this.searchFrom.车辆牌号_check, this.searchFrom.司机姓名_check, this.searchFrom.司机电话_check, this.searchFrom.制单人_check, this.searchFrom.核准人_check, this.searchFrom.执行人_check, this.searchFrom.开始制单日期_check, this.searchFrom.结束制单日期_check, this.searchFrom.开始核准日期_check, this.searchFrom.结束核准日期_check, this.searchFrom.开始发货日期_check, this.searchFrom.结束发货日期_check, this.DeliveryStatusValue_check, this.DeliveryStatusValue, this.pageCurrent, this.pageSize).then(response => {
+        if (response.data.rows.length !== 0) {
+          this.listLoading = false
+          this.tableDataSearchList = response.data.rows
+          this.total = response.data.total
+        }
+      })
+    },
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.search()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.search()
+    },
+    openDialogFormVisible(row) {
+      this.addForm('invoiceFrom')
+      row.是否发出.toString() === '1' ? this.disabled = true : this.disabled = false
+      row.是否发出.toString() === '1' ? this.disabledDetailsDelete = false : this.disabledDetailsDelete = true
+      this.invoiceFrom.发货单号 = row.发货单编号
+      this.invoiceFrom.收货地址 = row.收货地址
+      this.invoiceFrom.收货单位 = row.收货单位
+      this.invoiceFrom.发货单名 = row.发货单名称
+      this.invoiceFrom.注意事项 = row.注意事项
+      this.invoiceFrom.车辆牌号 = row.车辆牌号
+      this.invoiceFrom.司机姓名 = row.司机姓名
+      this.invoiceFrom.司机电话 = row.司机电话
+      this.invoiceFrom.收货人员 = row.收货人员
+      this.invoiceFrom.联系电话 = row.联系电话
+      this.invoiceFrom.备注 = row.备注
+      this.isMaker = row.制单人
+      this.isDelive = row.执行人
+      this.isExamine = row.审核人
+      this.MakerTime = row.操作日期
+      this.ExamineTime = row.审核日期
+      this.DeliveTime = row.发出时间
+      this.invoiceNum = row.发货单流水号
+      this.dialogFormVisible = true
+      DetailsFeach(this.invoiceNum).then(response => {
+        this.tableDataDelivery = response.data
+      })
+    },
+    confirmation(formName) {
+      this.invoiceFrom.司机姓名 === null ? this.invoiceFrom.司机姓名 = '' : this.invoiceFrom.司机姓名
+      this.invoiceFrom.司机电话 === null ? this.invoiceFrom.司机电话 = '' : this.invoiceFrom.司机电话
+      this.invoiceFrom.车辆牌号 === null ? this.invoiceFrom.车辆牌号 = '' : this.invoiceFrom.车辆牌号
+      this.invoiceFrom.备注 === null ? this.invoiceFrom.备注 = '' : this.invoiceFrom.备注
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$confirm('请确认货物是否全部发出, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            confirmation(this.invoiceNum, this.invoiceFrom.司机姓名, this.invoiceFrom.司机电话, this.invoiceFrom.车辆牌号, this.name, this.invoiceFrom.备注).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('发货确认成功！')
+                this.disabled = true
+                this.disabledDetailsDelete = false
+                DetailsFeach(this.invoiceNum).then(response => {
+                  this.tableDataDelivery = response.data
+                })
+                this.search()
+              } else {
+                this.$message.error('发货确认失败！')
+              }
+            })
+          })
+        }
+      })
+    },
+    wiverOfConfirmation() {
+      this.$confirm('请确认货物是否全部发出, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        reconfirmation(this.invoiceNum).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('打回成功！')
+            this.disabled = false
+            this.disabledDetailsDelete = true
+            DetailsFeach(this.invoiceNum).then(response => {
+              this.tableDataDelivery = response.data
+            })
+            this.search()
+          } else {
+            this.$message.success('打回失败！')
+          }
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style>
+  .el-form-item{
+    margin-bottom: 2px;
+  }
+</style>
+
+<style scoped>
+.text{
+  font-size: 14px;
+}
+
+</style>
diff --git a/src/views/BasicData/UserRightsManagement/index.vue b/src/views/BasicData/UserRightsManagement/index.vue
index 33d6df25..f2420b59 100644
--- a/src/views/BasicData/UserRightsManagement/index.vue
+++ b/src/views/BasicData/UserRightsManagement/index.vue
@@ -29,7 +29,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-form-item label="选择模块名称" prop="选择模块名称">
-            <el-select v-model="modelName" size="mini" clearable placeholder="请选择模块名称" filterable @change="getModelData">
+            <el-select v-model="modelName" size="mini" clearable placeholder="请选择模块名称" filterable @change="getModelData" @clear="clearModel">
               <el-option
                 v-for="item in modelNames"
                 :key="item.value"
@@ -108,6 +108,9 @@ export default {
     this.getAllModules()
   },
   methods: {
+    clearModel() {
+      this.modelName = ''
+    },
     getRoleName() {
       getRole().then(response => {
         for (let i = 0; i < response.data.length; i++) {
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index 47290aae..aa822434 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -221,13 +221,19 @@
             {{ scope.row.领料单备注 }}
           </template>
         </el-table-column>
+        <el-table-column v-if="Number(token)===21" label="审批" align="center" min-width="90">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.是否审批)===1" type="success">已审批</el-tag>
+            <el-button v-else size="mini" type="primary" plain icon="el-icon-check" @click="approvalPass(scope.row)">审批</el-button>
+          </template>
+        </el-table-column>
         <el-table-column label="领回确认" align="center" min-width="80">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.是否启用)===1" type="warning">未确认</el-tag>
             <el-tag v-else type="success">已确认</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200px">
+        <el-table-column label="操作" align="center" width="220px">
           <template slot-scope="scope" align="center">
             <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="primary" icon="el-icon-check" @click="checkList(scope.row)">确认</el-button>
             <el-button :disabled="Number(scope.row.是否启用)===0" size="mini" type="danger" icon="el-icon-delete" @click="dropList(scope.row)">删除</el-button>
@@ -321,6 +327,7 @@
 <script>
 import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail } from '@/api/Inventory/CreatePickingList'
 import request from '@/utils/request'
+import { mapGetters } from 'vuex'
 export default {
   name: 'CreatePickingList',
   data() {
@@ -362,12 +369,49 @@ export default {
       multipleSelection: []
     }
   },
+  computed: {
+    ...mapGetters([
+      'id',
+      'token'
+    ])
+  },
   mounted() {
     this.fetchData()
     this.searchTable()
     this.searchList()
   },
   methods: {
+    // 审批通过
+    approvalPass(row) {
+      this.$confirm('是否审批通过?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const param = {
+          url: '',
+          method: 'post',
+          data: {
+            type: '4',
+            name: `update 车间装配管理_领料单 set 是否审批 = 1 where 领料单流水号 = ${row.领料单流水号}`
+          }
+        }
+        request(param).then(res => {
+          if (res.data[0].result === '1') {
+            this.$message.success('操作成功')
+            this.pickingListNumber = ''
+            this.searchList()
+          } else {
+            this.$message.error('操作失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
     // 初始化数据
     fetchData() {
       initPickPerson().then(response => {
diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue
index 94c52eb5..a938735b 100644
--- a/src/views/Inventory/PurchaseInRecord/index.vue
+++ b/src/views/Inventory/PurchaseInRecord/index.vue
@@ -2,37 +2,51 @@
   <div class="app-container">
     <el-card>
       <div slot="header" class="clearfix">
-        <span>项目名称:</span>
-        <el-select v-model="projectValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
-          <el-option
-            v-for="item in project"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>机床图号:</span>
-        <el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
-          <el-option
-            v-for="item in machine"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>组号:</span>
-        <el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>
-          <el-option
-            v-for="item in group"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>名称:</span>
-        <el-input v-model="name" clearable size="small" style="width:150px" />
-        <span>规格:</span>
-        <el-input v-model="spec" clearable size="small" style="width:150px" />
-        <span>图号或型号:</span>
-        <el-input v-model="model" clearable size="small" style="width:150px" />
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
+        <el-row style="margin-bottom:10px">
+          <el-col style="width:250px">
+            <span>项目名称:</span>
+            <el-select v-model="projectValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
+              <el-option
+                v-for="item in project"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col style="width:250px">
+            <span>机床图号:</span>
+            <el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
+              <el-option
+                v-for="item in machine"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col style="width:250px">
+            <span>组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
+            <el-select v-model="groupValue" style="width:150px" placeholder="请选择" size="small" clearable filterable>
+              <el-option
+                v-for="item in group"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+        </el-row>
+        <el-row style="margin-bottom:10px">
+          <el-col style="width:250px">
+            <span>名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称:</span>
+            <el-input v-model="name" clearable size="small" style="width:150px" />
+          </el-col>
+          <el-col style="width:250px">
+            <span>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格:</span>
+            <el-input v-model="spec" clearable size="small" style="width:150px" />
+          </el-col>
+          <span>图号或型号:</span>
+          <el-input v-model="model" clearable size="small" style="width:150px" />
+          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
+        </el-row>
       </div>
       <h4 style="margin-top: 0">采购合同件</h4>
       <el-table :data="tableData1" border size="mini" style="width: 100%;" height="400">
diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index 3a1ab531..0cd5290b 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -2,48 +2,66 @@
   <div class="app-container">
     <el-card>
       <div slot="header" class="clearfix">
-        <span>项目名称:</span>
-        <el-select v-model="projectValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
-          <el-option
-            v-for="item in project"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>机床图号:</span>
-        <el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
-          <el-option
-            v-for="item in machine"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>组号:</span>
-        <el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>
-          <el-option
-            v-for="item in group"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>名称:</span>
-        <el-input v-model="name" clearable size="small" style="width:150px" />
-        <span>规格:</span>
-        <el-input v-model="spec" clearable size="small" style="width:150px" />
-        <span>图号或型号:</span>
-        <el-input v-model="model" clearable size="small" style="width:150px" />
-        <span>出库时间:</span>
-        <el-date-picker
-          v-model="outTime"
-          type="daterange"
-          size="small"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          range-separator="~"
-          style="width:250px"
-          start-placeholder=""
-          end-placeholder=""/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;searchRecord()">查询</el-button>
+        <el-row style="margin-bottom:10px">
+          <el-col style="width:250px">
+            <span>项目名称:</span>
+            <el-select v-model="projectValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
+              <el-option
+                v-for="item in project"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col style="width:250px">
+            <span>机床图号:</span>
+            <el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
+              <el-option
+                v-for="item in machine"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col style="width:250px">
+            <span>组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
+            <el-select v-model="groupValue" style="width:150px" placeholder="请选择" size="small" clearable filterable>
+              <el-option
+                v-for="item in group"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+        </el-row>
+        <el-row style="margin-bottom:10px">
+          <el-col style="width:250px">
+            <span>名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称:</span>
+            <el-input v-model="name" clearable size="small" style="width:150px" />
+          </el-col>
+          <el-col style="width:250px">
+            <span>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格:</span>
+            <el-input v-model="spec" clearable size="small" style="width:150px" />
+          </el-col>
+          <el-col style="width:250px">
+            <span>图号或型号:</span>
+            <el-input v-model="model" clearable size="small" style="width:150px" />
+          </el-col>
+        </el-row>
+        <el-row>
+          <span>出库时间:</span>
+          <el-date-picker
+            v-model="outTime"
+            type="daterange"
+            size="small"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            range-separator="~"
+            style="width:250px"
+            start-placeholder=""
+            end-placeholder=""/>
+          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;searchRecord()">查询</el-button>
+        </el-row>
       </div>
       <el-table :data="tableData" border size="mini" style="width: 100%;" height="600">
         <el-table-column label="名称" align="center" min-width="200">
diff --git a/src/views/MarketingCenter/DeliveryApplication/index.vue b/src/views/MarketingCenter/DeliveryApplication/index.vue
new file mode 100644
index 00000000..030bea18
--- /dev/null
+++ b/src/views/MarketingCenter/DeliveryApplication/index.vue
@@ -0,0 +1,1183 @@
+<template>
+  <div>
+    <el-card class="box-card">
+      <div>
+        <el-row>
+          <el-button :disabled="disabledAdd" type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">增加</el-button>
+          <el-button :disabled="disabledEdit" type="warning" icon="el-icon-edit" size="mini" @click="function_InvoiceEdit">编辑</el-button>
+          <el-button :disabled="disabledSave" type="success" icon="el-icon-upload" size="mini" @click="function_InvoiceSave">保存</el-button>
+          <el-button :disabled="disabledExamine" type="success" icon="el-icon-lock" size="mini" @click="function_InvoiceExamine">核准</el-button>
+          <el-button :disabled="disabledAbandoningTrial" type="info" icon="el-icon-unlock" size="mini" @click="function_InvoiceAbandoningTrial">放弃</el-button>
+          <el-button :disabled="disabledDelete" type="danger" icon="el-icon-delete" size="mini" @click="function_InvoiceDelete">删除</el-button>
+          <div style="float: right">
+            <el-autocomplete
+              v-model="searchCriteria"
+              :fetch-suggestions="querySearch"
+              clearable
+              style="width: 200px;margin-left: 10px;"
+              size="small"
+              class="inline-input"
+              placeholder="请输入发货单名称"
+              @clear="clearSelect"
+              @select="handleSelect"
+            />
+          </div>
+        </el-row>
+        <el-divider/>
+        <el-row>
+          <div class="text">
+            <span>制单人：</span>
+            <span>{{ isMaker }}</span>
+            <el-divider direction="vertical"/>
+            <span style="margin-left: 10px">核准人：</span>
+            <span>{{ isExamine }}</span>
+            <el-divider direction="vertical"/>
+            <span style="margin-left: 10px">发货执行人：</span>
+            <span>{{ isDelive }}</span>
+          </div>
+        </el-row>
+
+        <!--<el-button icon="el-icon-refresh" size="mini" @click="function_Refresh">刷新</el-button>-->
+
+      </div>
+      <el-divider content-position="right"><el-button type="text" class="el-icon-caret-bottom" @click="show = !show">  展开</el-button></el-divider>
+      <div v-show="show" style="margin-top: 20px" class="transition-box">
+        <el-collapse-transition>
+          <div class="text item">
+            <el-row>
+              <el-col :span="24">
+                <span style="width:80px;display:inline-block;">发货单名：</span>
+                <el-input
+                  v-model="searchFrom.发货单名"
+                  clearable
+                  placeholder="请输入"
+                  style="width: 150px;margin-right: 10px"
+                  size="mini"/>
+                <span style="width:80px;display:inline-block;">发货单号：</span>
+                <el-input
+                  v-model="searchFrom.发货单号"
+                  placeholder="请输入"
+                  clearable
+                  style="width: 150px;margin-right: 10px"
+                  size="mini"/>
+                <span style="width:80px;display:inline-block;">收货单位：</span>
+                <el-input
+                  v-model="searchFrom.收货单位"
+                  placeholder="请输入"
+                  clearable
+                  style="width: 150px;margin-right: 10px"
+                  size="mini"/>
+              </el-col>
+            </el-row>
+            <el-row style="margin-top: 10px">
+              <el-col :span="24">
+                <span style="width:80px;display:inline-block;">车辆牌号：</span>
+                <el-input
+                  v-model="searchFrom.车辆牌号"
+                  placeholder="请输入"
+                  clearable
+                  style="width: 150px;margin-right: 10px"
+                  size="mini"/>
+                <span style="width:80px;display:inline-block;">司机姓名：</span>
+                <el-input
+                  v-model="searchFrom.司机姓名"
+                  placeholder="请输入"
+                  clearable
+                  style="width: 150px;margin-right: 10px"
+                  size="mini"/>
+                <span style="width:80px;display:inline-block;">司机电话：</span>
+                <el-input
+                  v-model="searchFrom.司机电话"
+                  placeholder="请输入"
+                  clearable
+                  style="width: 150px;margin-right: 10px"
+                  size="mini"/>
+              </el-col>
+            </el-row>
+            <el-row style="margin-top: 10px">
+              <el-col :span="24">
+                <span style="width:80px;display:inline-block;">制单人：</span>
+                <el-input
+                  v-model="searchFrom.制单人"
+                  placeholder="请输入"
+                  clearable
+                  style="width: 150px;margin-right: 10px"
+                  size="mini"/>
+                <span style="width:80px;display:inline-block;">核准人：</span>
+                <el-input
+                  v-model="searchFrom.核准人"
+                  placeholder="请输入"
+                  clearable
+                  style="width: 150px;margin-right: 10px"
+                  size="mini"/>
+                <span style="width:80px;display:inline-block;">执行人：</span>
+                <el-input
+                  v-model="searchFrom.执行人"
+                  placeholder="请输入"
+                  clearable
+                  style="width: 150px;margin-right: 10px"
+                  size="mini"/>
+              </el-col>
+            </el-row>
+            <el-row style="margin-top: 10px">
+              <el-col :span="24">
+                <span style="width:80px;display:inline-block;">制单日期：</span>
+                <el-date-picker
+                  v-model="searchFrom.开始制单日期"
+                  style="width: 150px; margin-right: 10px"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  size="small"
+                  type="datetime"
+                  placeholder="开始日期"/>
+                <span style="width:80px;display:inline-block;">制单日期：</span>
+                <el-date-picker
+                  v-model="searchFrom.结束制单日期"
+                  style="width: 150px; margin-right: 10px"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  size="small"
+                  type="datetime"
+                  placeholder="结束日期"/>
+              </el-col>
+            </el-row>
+            <el-row style="margin-top: 10px">
+              <el-col :span="24">
+                <span style="width:80px;display:inline-block;">核准日期：</span>
+                <el-date-picker
+                  v-model="searchFrom.开始核准日期"
+                  style="width: 150px; margin-right: 10px"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  size="small"
+                  type="datetime"
+                  placeholder="开始日期"/>
+                <span style="width:80px;display:inline-block;">核准日期：</span>
+                <el-date-picker
+                  v-model="searchFrom.结束核准日期"
+                  style="width: 150px; margin-right: 10px"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  size="small"
+                  type="datetime"
+                  placeholder="结束日期"/>
+              </el-col>
+            </el-row>
+            <el-row style="margin-top: 10px">
+              <el-col :span="24">
+                <span style="width:80px;display:inline-block;">发货日期：</span>
+                <el-date-picker
+                  v-model="searchFrom.开始发货日期"
+                  style="width: 150px; margin-right: 10px"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  size="small"
+                  type="datetime"
+                  placeholder="开始日期"/>
+                <span style="width:80px;display:inline-block;">发货日期：</span>
+                <el-date-picker
+                  v-model="searchFrom.结束发货日期"
+                  style="width: 150px; margin-right: 10px"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  size="small"
+                  type="datetime"
+                  placeholder="结束日期"/>
+                <el-button type="success" icon="el-icon-menu" size="mini" style="margin-left: 74px" @click="openSearch">加载</el-button>
+                <el-button type="warning" icon="el-icon-delete" size="mini" @click="clearSearch">清空</el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </el-collapse-transition>
+        <el-divider/>
+      </div>
+      <div class="text item">
+        <span style="width:80px;display:inline-block;">发货单号：</span>
+        <el-input
+          v-model="input_Number"
+          :disabled="disabled"
+          style="width: 200px;margin-right: 10px"
+          size="mini"/>
+        <span style="width:80px;display:inline-block;">收货地址：</span>
+        <el-input
+          :disabled="disabledAdress"
+          v-model="input_Adress"
+          clearable
+          size="mini"
+          style="width: 497px;margin-right: 10px"
+          placeholder="请输入内容"/>
+      </div>
+      <div class="text item">
+        <span style="width:80px;display:inline-block;">发货单名：</span>
+        <el-input
+          :disabled="disabledName"
+          v-model="input_Name"
+          clearable
+          style="width: 200px;margin-right: 10px"
+          size="mini"/>
+        <span style="width:80px;display:inline-block;">注意事项：</span>
+        <el-input
+          :disabled="disabledRemake"
+          v-model="input_Remake"
+          clearable
+          style="width: 497px;margin-right: 10px"
+          size="mini"
+          placeholder="请输入内容"/>
+      </div>
+      <div class="text item">
+        <span style="width:80px;display:inline-block;">收货单位：</span>
+        <el-input
+          :disabled="disabledCompany"
+          v-model="input_Company"
+          clearable
+          style="width: 200px;margin-right: 10px"
+          size="mini"/>
+        <span style="width:80px;display:inline-block;">收货人员：</span>
+        <el-input
+          :disabled="disabledPeople"
+          v-model="input_People"
+          clearable
+          size="mini"
+          style="width: 200px;margin-right: 10px"
+          placeholder="请输入内容"/>
+        <span style="width:80px;display:inline-block;">联系电话：</span>
+        <el-input
+          :disabled="disabledMobile"
+          v-model="input_Mobile"
+          :trigger-on-focus="false"
+          clearable
+          size="mini"
+          style="width: 200px;margin-right: 10px"
+          placeholder="请输入内容"/>
+      </div>
+      <div class="text item">
+        <span style="width:80px;display:inline-block;">车辆牌号：</span>
+        <el-input
+          v-model="input_LicensePlateNumber"
+          :disabled="disabled"
+          size="mini"
+          style="width: 200px;margin-right: 10px"
+          clearable/>
+        <span style="width:80px;display:inline-block;">司机姓名：</span>
+        <el-input
+          v-model="input_Driver"
+          :disabled="disabled"
+          size="mini"
+          style="width: 200px;margin-right: 10px"
+          clearable/>
+        <span style="width:80px;display:inline-block;">司机电话：</span>
+        <el-input
+          v-model="input_Driver_Mobile"
+          :disabled="disabled"
+          size="mini"
+          style="width: 200px;margin-right: 10px"
+          clearable/>
+      </div>
+      <div class="text item">
+        <span style="width:80px;display:inline-block;">备注：</span>
+        <el-input
+          v-model="input_Record"
+          :disabled="disabled"
+          size="mini"
+          style="width: 795px;margin-right: 10px"
+          clearable/>
+      </div>
+      <el-divider content-position="right"><el-button :disabled="disabledPick" type="text" icon="el-icon-edit" @click="function_Pick">选货</el-button></el-divider>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData"
+        highlight-current-row
+        style="width: 100%"
+        height="300"
+        border
+        size="mini">
+        <el-table-column align="center" label="货品类别" width="80">
+          <template slot-scope="scope">
+            <el-tag effect="dark" size="small" type="success">{{ 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-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="数量" width="130">
+          <template slot-scope="scope">
+            <template v-if="disabledPick === false">
+              <el-input-number v-model="scope.row.数量" :min="1" label="描述文字" size="mini" controls-position="right" style="width:100px" @change="handleChange"/>
+            </template>
+            <template v-else>
+              {{ scope.row.数量 }}
+            </template>
+          </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 label="操作" fixed="right" align="center" width="150px">
+          <template slot-scope="scope">
+            <el-button
+              :disabled="disabledDetailsDelete"
+              size="mini"
+              type="text"
+              icon="el-icon-delete-solid"
+              @click.native.prevent="deleteRow(scope.$index, tableData)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-divider/>
+      <div class="tex">
+        <span>制单时间：</span>
+        <span>{{ MakerTime }}</span>
+        <el-divider direction="vertical"/>
+        <span style="margin-left: 10px">核准时间：</span>
+        <span>{{ ExamineTime }}</span>
+        <el-divider direction="vertical"/>
+        <span style="margin-left: 10px">发货时间：</span>
+        <span>{{ DeliveTime }}</span>
+      </div>
+    </el-card>
+
+    <el-dialog :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
+      <div>
+        <el-autocomplete
+          v-model="searchPick"
+          :fetch-suggestions="queryPickSearch"
+          clearable
+          style="width: 300px;margin-left: 10px;"
+          size="small"
+          class="inline-input"
+          placeholder="请输入查询条件"
+          @select="handlePickSelect"
+        />
+        <el-divider/>
+      </div>
+      <div>
+        <el-tabs v-model="category" tab-position="left" style="height: 200px;">
+          <el-tab-pane label="机床">
+            <el-table
+              :data="tableDataMachine"
+              highlight-current-row
+              style="width: 100%"
+              height="200"
+              border
+              size="mini"
+              @selection-change="handleSelectionChangeMachine">
+              <el-table-column
+                type="selection"
+                width="55"/>
+              <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="组件">
+            <el-table
+              :data="tableDataMachine"
+              highlight-current-row
+              style="width: 100%"
+              height="200"
+              border
+              size="mini"
+              @selection-change="handleSelectionChangeMachine">
+              <el-table-column
+                type="selection"
+                width="55"/>
+              <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="零件">
+            <el-table
+              :data="tableDataMachine"
+              highlight-current-row
+              style="width: 100%"
+              height="200"
+              border
+              size="mini"
+              @selection-change="handleSelectionChangeMachine">
+              <el-table-column
+                type="selection"
+                width="55"/>
+              <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="物料">
+            <el-table
+              :data="tableDataMachine"
+              highlight-current-row
+              style="width: 100%"
+              height="200"
+              border
+              size="mini"
+              @selection-change="handleSelectionChangeMachine">
+              <el-table-column
+                type="selection"
+                width="55"/>
+              <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>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="off()">取消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisibleSearch" center style="min-height: 700px" width="95%">
+      <div>
+        <el-table
+          :data="tableDataSearchList"
+          highlight-current-row
+          style="width: 100%"
+          height="500"
+          border
+          size="mini"
+          @row-click="searchListItem">
+          <el-table-column align="center" label="状态" width="60">
+            <template slot-scope="scope">
+              {{ scope.row.是否发出.toString() === '1' ? '已发出' : '未发出' }}
+            </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-column align="center" label="收货人员" width="80">
+            <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="司机姓名" width="80">
+            <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-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>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="offSearch()">取消</el-button>
+        <el-button type="primary" @click="submitSearch()">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { InvoiceAdd, InvoiceDelete, InvoiceSelectPush, InvoiceFeach, InvoiceSave, InvoiceExamine, InvoiceAbandoningTrial, PickSelectPush, SelectMachine, DetailsFeach, SelectAssembly, SelectPart, SelectMateriel, InvoiceDetailsSave, InvoiceListSearch } from '@/api/MarketingCenter/DeliveryApplication'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      input_Record: '',
+      disabled: true,
+      disabledAdd: false, // 增加按钮启用状态
+      disabledEdit: true, // 编辑按钮启用状态
+      disabledSave: true, // 保存按钮启用状态
+      disabledExamine: true, // 审核按钮启用状态
+      disabledAbandoningTrial: true, // 弃审按钮启用状态
+      disabledDelete: true, // 删除按钮启用状态
+      disabledAdress: true, // 收货地址启用状态
+      disabledPeople: true, // 收货人员启用状态
+      disabledMobile: true, // 联系电话启用状态
+      disabledRemake: true, // 注意事项启用状态
+      disabledCompany: true, // 收货单位启用状态
+      disabledPick: true, // 选货按钮启用状态
+      disabledName: true,
+      disabledDetailsDelete: true,
+      input_Company: '', // 收货单位
+      input_Adress: '', // 收货地址
+      input_People: '', // 收货人
+      input_Mobile: '', // 收货人电话
+      input_LicensePlateNumber: '', // 车辆牌号
+      input_Driver: '', // 司机姓名
+      input_Driver_Mobile: '', // 司机电话
+      input_Remake: '', // 注意事项
+      input_Number: '', // 发货单号
+      invoiceNum: '', // 发货单流水号
+      category: '',
+      searchCriteria: '',
+      input_Name: '',
+      restaurants: [],
+      restaurantsPick: [],
+      isExamine: '请查询',
+      isMaker: '请查询',
+      isDelive: '请查询',
+      show: false,
+      tableData: [],
+      array: [],
+      tableDataMachine: [],
+      tableDataSearchList: [],
+      listLoading: false,
+      dialogFormVisible: false,
+      dialogFormVisibleSearch: false,
+      searchPick: '',
+      MakerTime: '请查询',
+      ExamineTime: '请查询',
+      DeliveTime: '请查询',
+      typeA: [],
+      typeB: [],
+      typeC: [],
+      typeD: [],
+      typeE: [],
+      typeF: [],
+      typeG: [],
+      form: {
+        项目: '',
+        项目名称: ''
+      },
+      searchFrom: {
+        发货单名: '',
+        发货单号: '',
+        收货单位: '',
+        车辆牌号: '',
+        司机姓名: '',
+        司机电话: '',
+        制单人: '',
+        核准人: '',
+        执行人: '',
+        开始制单日期: '',
+        结束制单日期: '',
+        开始核准日期: '',
+        结束核准日期: '',
+        开始发货日期: '',
+        结束发货日期: '',
+        发货单名_check: null,
+        发货单号_check: null,
+        收货单位_check: null,
+        车辆牌号_check: null,
+        司机姓名_check: null,
+        司机电话_check: null,
+        制单人_check: null,
+        核准人_check: null,
+        执行人_check: null,
+        开始制单日期_check: null,
+        结束制单日期_check: null,
+        开始核准日期_check: null,
+        结束核准日期_check: null,
+        开始发货日期_check: null,
+        结束发货日期_check: null
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'id'// 人员编号
+    ])
+  },
+  mounted() {
+    // window.onbeforeunload=function(){
+    //   return '';
+    // }
+  },
+  methods: {
+    // function_Refresh() {
+    //   this.$confirm('检测到有未保存的单据', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   }).then(() => {
+    //     location.reload()
+    //   })
+    // },
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+    },
+    function_Pick() {
+      this.dialogFormVisible = true
+      this.tableDataMachine = []
+      this.searchPick = ''
+      this.category = '0'
+    },
+    clearSelect() {
+      this.disabledName = true
+      this.disabledAdd = false // 增加按钮启用状态
+      this.disabledEdit = true // 编辑按钮启用状态
+      this.disabledSave = true // 保存按钮启用状态
+      this.disabledExamine = true // 审核按钮启用状态
+      this.disabledAbandoningTrial = true // 弃审按钮启用状态
+      this.disabledDelete = true // 删除按钮启用状态
+      this.disabledAdress = true // 收货地址启用状态
+      this.disabledPeople = true // 收货人员启用状态
+      this.disabledMobile = true // 联系电话启用状态
+      this.disabledRemake = true // 注意事项启用状态
+      this.disabledCompany = true // 收货单位启用状态
+      this.disabledPick = true
+      this.disabledDetailsDelete = true
+      this.input_Company = '' // 收货单位
+      this.input_Adress = '' // 收货地址
+      this.input_People = '' // 收货人
+      this.input_Mobile = '' // 收货人电话
+      this.input_LicensePlateNumber = '' // 车辆牌号
+      this.input_Driver = '' // 司机姓名
+      this.input_Driver_Mobile = '' // 司机电话
+      this.input_Remake = '' // 注意事项
+      this.input_Number = '' // 发货单号
+      this.input_Name = '' // 发货单名
+      this.invoiceNum = '' // 发货单流水号
+      this.tableData = []
+      this.isExamine = '请查询'
+      this.isMaker = '请查询'
+      this.isDelive = '请查询'
+      this.MakerTime = '请查询'
+      this.ExamineTime = '请查询'
+      this.DeliveTime = '请查询'
+    },
+    clear() {
+      this.input_Adress = ''
+      this.input_People = ''
+      this.input_Mobile = ''
+      this.input_LicensePlateNumber = ''
+      this.input_Driver = ''
+      this.input_Driver_Mobile = ''
+      this.input_Remake = ''
+      this.input_Company = ''
+      this.input_Name = ''
+      this.tableData = []
+      this.isExamine = '请查询'
+      this.isMaker = '请查询'
+      this.isDelive = '请查询'
+      this.MakerTime = '请查询'
+      this.ExamineTime = '请查询'
+      this.DeliveTime = '请查询'
+    },
+    function_InvoiceFeach() {
+      this.disabledAdress = true
+      this.disabledPeople = true
+      this.disabledMobile = true
+      this.disabledRemake = true
+      this.disabledCompany = true
+      this.disabledName = true
+      // this.disabledExamine = false
+      if (this.invoiceNum !== '' && this.invoiceNum !== null) {
+        InvoiceFeach(this.invoiceNum).then(response => {
+          if (response.data.length !== 0) {
+            this.input_Record = response.data[0].备注
+            this.input_Adress = response.data[0].收货地址
+            this.input_People = response.data[0].收货人员
+            this.input_Mobile = response.data[0].联系电话
+            this.input_LicensePlateNumber = response.data[0].车辆牌号
+            this.input_Driver = response.data[0].司机姓名
+            this.input_Driver_Mobile = response.data[0].司机电话
+            this.input_Remake = response.data[0].注意事项
+            this.input_Number = response.data[0].发货单编号
+            this.invoiceNum = response.data[0].发货单流水号
+            this.input_Company = response.data[0].收货单位
+            this.input_Name = response.data[0].发货单名称
+            if (response.data[0].是否审核.toString() === '1') {
+              this.isExamine = response.data[0].审核人
+              this.isMaker = response.data[0].制单人
+              response.data[0].是否发出.toString() === '1' ? this.isDelive = response.data[0].执行人 : this.isDelive = '未发出'
+              this.MakerTime = response.data[0].操作日期
+              this.ExamineTime = response.data[0].审核日期
+              response.data[0].是否发出.toString() === '1' ? this.DeliveTime = response.data[0].发出时间 : this.DeliveTime = '未发出'
+              this.disabledAdd = false
+              this.disabledAbandoningTrial = false
+              this.disabledExamine = true
+              this.disabledDelete = true
+              this.disabledEdit = true
+              this.disabledSave = true
+              this.disabledPick = true
+              this.disabledDetailsDelete = true
+            } else {
+              this.disabledAbandoningTrial = true
+              this.disabledEdit = false
+              this.disabledAdd = false
+              this.disabledExamine = false
+              this.disabledDelete = false
+              this.disabledSave = true
+              this.disabledPick = true
+              this.disabledDetailsDelete = true
+              this.isExamine = '未核准'
+              this.isMaker = response.data[0].制单人
+              this.MakerTime = response.data[0].操作日期
+              this.ExamineTime = '未核准'
+              this.DeliveTime = '未核准'
+            }
+          }
+        })
+        DetailsFeach(this.invoiceNum).then(response => {
+          this.tableData = response.data
+        })
+      }
+    },
+    function_InvoiceAdd() {
+      InvoiceAdd(this.name).then(response => {
+        if (response.data.result.length !== 0) {
+          this.$message.success('新增单据成功')
+          this.clear()
+          this.invoiceNum = response.data.output[0].发货单流水号
+          this.input_Number = response.data.result[0].发货单编号
+          this.disabledCompany = false
+          this.disabledAdd = true
+          this.disabledSave = false
+          this.disabledDelete = false
+          this.disabledEdit = true
+          this.disabledAdress = false
+          this.disabledPeople = false
+          this.disabledMobile = false
+          this.disabledRemake = false
+          this.disabledPick = false
+          this.disabledDetailsDelete = false
+          this.disabledName = false
+          this.tableData = []
+        } else {
+          this.$message.error('新增单据失败')
+        }
+      })
+    },
+    function_InvoiceDelete() {
+      this.$confirm('此操作将删除该单据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        InvoiceDelete(this.invoiceNum).then(response => {
+          if (response.data[0].提示 === 0) {
+            this.$message.success('删除成功！')
+            this.clearSelect()
+          } else {
+            this.$message.error('该单据已经审核！')
+          }
+        })
+      })
+    },
+    function_InvoiceSave() {
+      this.typeA = []
+      this.typeB = []
+      this.typeC = []
+      this.typeD = []
+      this.typeE = []
+      this.typeF = []
+      this.typeG = []
+      InvoiceSave(this.invoiceNum, this.input_Company, this.input_Adress, this.input_People, this.input_Mobile, this.input_Remake, this.input_Name).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('保存成功！')
+          this.function_InvoiceFeach()
+        } else {
+          this.$message.error('保存失败')
+        }
+      })
+      for (let i = 0; i < this.tableData.length; i++) {
+        this.typeA.push(this.tableData[i].货品类别)
+        this.typeB.push(this.tableData[i].货品编号)
+        this.typeC.push(this.tableData[i].货品名称)
+        this.typeD.push(this.tableData[i].货品规格)
+        this.typeE.push(this.tableData[i].货品型号)
+        this.typeF.push(this.tableData[i].设计者)
+        this.typeG.push(this.tableData[i].数量)
+      }
+      InvoiceDetailsSave(this.typeA, this.typeB, this.typeC, this.typeD, this.typeE, this.typeF, this.typeG, this.invoiceNum).then(response => {
+        console.log(response, 9990)
+        if (response.data[0].result === '1') {
+          this.$message.success('保存成功！')
+          this.function_InvoiceFeach()
+        } else {
+          this.$message.error('保存失败')
+        }
+      })
+    },
+    function_InvoiceExamine() {
+      this.$confirm('此操作将核准该单据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        InvoiceExamine(this.invoiceNum, this.name).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('审核成功！')
+            this.function_InvoiceFeach()
+          } else {
+            this.$message.error('审核失败')
+          }
+        })
+      })
+    },
+    function_InvoiceAbandoningTrial() {
+      this.$confirm('此操作将放弃核准该单据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        InvoiceAbandoningTrial(this.invoiceNum).then(response => {
+          if (response.data[0].弃审是否成功 === '成功') {
+            this.$message.success('放弃核准成功！')
+            this.function_InvoiceFeach()
+          } else {
+            this.$message.error('放弃核准失败,可能原因是装配部门已经确认发货,如需调整请联系装配部门打回！')
+          }
+        })
+      })
+      // this.disabledAdd = false
+      // this.disabledSave = true
+      // this.disabledAdress = true
+      // this.disabledPeople = true
+      // this.disabledMobile = true
+      // this.disabledRemake = true
+      // this.disabledExamine = false
+      // this.disabledAbandoningTrial = true
+      // this.disabledEdit = false
+      // this.disabledDelete = false
+    },
+    function_InvoiceEdit() {
+      this.disabledSave = false
+      this.disabledExamine = true
+      this.disabledAbandoningTrial = true
+      this.disabledAdress = false
+      this.disabledName = false
+      this.disabledPeople = false
+      this.disabledMobile = false
+      this.disabledRemake = false
+      this.disabledCompany = false
+      this.disabledPick = false
+      this.disabledDetailsDelete = false
+      this.disabledEdit = true
+    },
+    querySearch(queryString, cb) {
+      this.restaurants = []
+      if (this.searchCriteria !== '' && this.searchCriteria !== null) {
+        InvoiceSelectPush(this.searchCriteria).then(response => {
+          const res = response.data
+          res.forEach(item => {
+            this.restaurants.push({
+              value: item.发货单名称,
+              num: item.发货单流水号
+            })
+          })
+          return this.restaurants
+        }).then(data => {
+          var restaurants = data
+          var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+          return results
+        }).then(data => {
+          cb(data)
+        })
+      }
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)
+      }
+    },
+    handleSelect(item) {
+      this.invoiceNum = item.num
+      this.function_InvoiceFeach()
+    },
+
+    queryPickSearch(queryString, cb) {
+      this.restaurantsPick = []
+      if (this.searchPick !== '' && this.searchPick !== null) {
+        PickSelectPush(this.category, this.searchPick).then(response => {
+          const res = response.data
+          res.forEach(item => {
+            if (this.category === '0') {
+              this.restaurantsPick.push({
+                value: item.机床图号
+              })
+            }
+            if (this.category === '1') {
+              this.restaurantsPick.push({
+                value: item.组号
+              })
+            }
+            if (this.category === '2') {
+              this.restaurantsPick.push({
+                value: item.零件图号
+              })
+            }
+            if (this.category === '3') {
+              this.restaurantsPick.push({
+                value: item.物料名称
+              })
+            }
+          })
+          return this.restaurantsPick
+        }).then(data => {
+          var restaurants = data
+          var results = queryString ? restaurants.filter(this.createFilterPick(queryString)) : restaurants
+          return results
+        }).then(data => {
+          cb(data)
+        })
+      }
+    },
+    createFilterPick(queryString) {
+      return (restaurant) => {
+        return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)
+      }
+    },
+    handlePickSelect(item) {
+      if (this.category === '0') {
+        SelectMachine(item.value).then(response => {
+          if (response.data.length !== 0) {
+            this.tableDataMachine = response.data
+          }
+        })
+      }
+      if (this.category === '1') {
+        SelectAssembly(item.value).then(response => {
+          if (response.data.length !== 0) {
+            this.tableDataMachine = response.data
+          }
+        })
+      }
+      if (this.category === '2') {
+        SelectPart(item.value).then(response => {
+          if (response.data.length !== 0) {
+            this.tableDataMachine = response.data
+          }
+        })
+      }
+      if (this.category === '3') {
+        SelectMateriel(item.value).then(response => {
+          if (response.data.length !== 0) {
+            this.tableDataMachine = response.data
+          }
+        })
+      }
+    },
+    handleSelectionChangeMachine(val) {
+      this.array = val
+    },
+    off() {
+      this.dialogFormVisible = false
+    },
+    submit() {
+      this.dialogFormVisible = false
+      for (let i = 0; i < this.array.length; i++) {
+        this.tableData.push({
+          货品名称: this.array[i].货品名称 ? this.array[i].货品名称 : '—' || '—',
+          货品编号: this.array[i].货品编号 ? this.array[i].货品编号 : '—' || '—',
+          设计者: this.array[i].设计者 ? this.array[i].设计者 : '—' || '—',
+          货品规格: this.array[i].货品规格 ? this.array[i].货品规格 : '—' || '—',
+          货品型号: this.array[i].货品型号 ? this.array[i].货品型号 : '—' || '—',
+          数量: 1,
+          货品类别: this.array[i].类别 ? this.array[i].类别 : '—' || '—'
+        })
+      }
+    },
+    openSearch() {
+      this.tableDataSearchList = []
+      this.searchFrom.发货单名 !== null && this.searchFrom.发货单名 !== '' ? this.searchFrom.发货单名_check = 1 : this.searchFrom.发货单名_check = 0
+      this.searchFrom.发货单号 !== null && this.searchFrom.发货单号 !== '' ? this.searchFrom.发货单号_check = 1 : this.searchFrom.发货单号_check = 0
+      this.searchFrom.收货单位 !== null && this.searchFrom.收货单位 !== '' ? this.searchFrom.收货单位_check = 1 : this.searchFrom.收货单位_check = 0
+      this.searchFrom.车辆牌号 !== null && this.searchFrom.车辆牌号 !== '' ? this.searchFrom.车辆牌号_check = 1 : this.searchFrom.车辆牌号_check = 0
+      this.searchFrom.司机姓名 !== null && this.searchFrom.司机姓名 !== '' ? this.searchFrom.司机姓名_check = 1 : this.searchFrom.司机姓名_check = 0
+      this.searchFrom.司机电话 !== null && this.searchFrom.司机电话 !== '' ? this.searchFrom.司机电话_check = 1 : this.searchFrom.司机电话_check = 0
+      this.searchFrom.制单人 !== null && this.searchFrom.制单人 !== '' ? this.searchFrom.制单人_check = 1 : this.searchFrom.制单人_check = 0
+      this.searchFrom.核准人 !== null && this.searchFrom.核准人 !== '' ? this.searchFrom.核准人_check = 1 : this.searchFrom.核准人_check = 0
+      this.searchFrom.执行人 !== null && this.searchFrom.执行人 !== '' ? this.searchFrom.执行人_check = 1 : this.searchFrom.执行人_check = 0
+      this.searchFrom.开始制单日期 !== null && this.searchFrom.开始制单日期 !== '' ? this.searchFrom.开始制单日期_check = 1 : this.searchFrom.开始制单日期_check = 0
+      this.searchFrom.结束制单日期 !== null && this.searchFrom.结束制单日期 !== '' ? this.searchFrom.结束制单日期_check = 1 : this.searchFrom.结束制单日期_check = 0
+      this.searchFrom.开始核准日期 !== null && this.searchFrom.开始核准日期 !== '' ? this.searchFrom.开始核准日期_check = 1 : this.searchFrom.开始核准日期_check = 0
+      this.searchFrom.结束核准日期 !== null && this.searchFrom.结束核准日期 !== '' ? this.searchFrom.结束核准日期_check = 1 : this.searchFrom.结束核准日期_check = 0
+      this.searchFrom.开始发货日期 !== null && this.searchFrom.开始发货日期 !== '' ? this.searchFrom.开始发货日期_check = 1 : this.searchFrom.开始发货日期_check = 0
+      this.searchFrom.结束发货日期 !== null && this.searchFrom.结束发货日期 !== '' ? this.searchFrom.结束发货日期_check = 1 : this.searchFrom.结束发货日期_check = 0
+      this.dialogFormVisibleSearch = true
+      InvoiceListSearch(this.searchFrom.发货单名, this.searchFrom.发货单号, this.searchFrom.收货单位, this.searchFrom.车辆牌号, this.searchFrom.司机姓名, this.searchFrom.司机电话, this.searchFrom.制单人, this.searchFrom.核准人, this.searchFrom.执行人, this.searchFrom.开始制单日期, this.searchFrom.结束制单日期, this.searchFrom.开始核准日期, this.searchFrom.结束核准日期, this.searchFrom.开始发货日期, this.searchFrom.结束发货日期, this.searchFrom.发货单名_check, this.searchFrom.发货单号_check, this.searchFrom.收货单位_check, this.searchFrom.车辆牌号_check, this.searchFrom.司机姓名_check, this.searchFrom.司机电话_check, this.searchFrom.制单人_check, this.searchFrom.核准人_check, this.searchFrom.执行人_check, this.searchFrom.开始制单日期_check, this.searchFrom.结束制单日期_check, this.searchFrom.开始核准日期_check, this.searchFrom.结束核准日期_check, this.searchFrom.开始发货日期_check, this.searchFrom.结束发货日期_check).then(response => {
+        if (response.data.length !== 0) {
+          this.tableDataSearchList = response.data
+        }
+      })
+    },
+    offSearch() {
+      this.dialogFormVisibleSearch = false
+    },
+    clearSearch() {
+      this.searchFrom.发货单名 = ''
+      this.searchFrom.发货单号 = ''
+      this.searchFrom.收货单位 = ''
+      this.searchFrom.车辆牌号 = ''
+      this.searchFrom.司机姓名 = ''
+      this.searchFrom.司机电话 = ''
+      this.searchFrom.制单人 = ''
+      this.searchFrom.核准人 = ''
+      this.searchFrom.执行人 = ''
+      this.searchFrom.开始制单日期 = ''
+      this.searchFrom.结束制单日期 = ''
+      this.searchFrom.开始核准日期 = ''
+      this.searchFrom.结束核准日期 = ''
+      this.searchFrom.开始发货日期 = ''
+      this.searchFrom.结束发货日期 = ''
+    },
+    searchListItem(row) {
+      this.invoiceNum = row.发货单流水号
+    },
+    submitSearch() {
+      console.log(this.invoiceNum, 99)
+      this.dialogFormVisibleSearch = false
+      this.function_InvoiceFeach()
+    }
+  }
+}
+</script>
+<style>
+  .el-textarea__inner,
+  .el-radio__inner,
+  .el-input__inner{
+    border-bottom: 1px solid #dcdfe6!important;
+  }
+  .el-textarea__inner, .el-radio__inner, .el-input__inner{
+    border: 1px solid #dcdfe6!important;
+  }
+</style>
+
+<style scoped>
+  .text {
+    font-size: 14px;
+  }
+
+  .item {
+    margin-bottom: 18px;
+  }
+
+  .clearfix:before,
+  .clearfix:after {
+    display: table;
+    content: "";
+  }
+  .clearfix:after {
+    clear: both
+  }
+  .el-card{
+    margin-top: 2px;
+  }
+</style>
diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
new file mode 100644
index 00000000..8422f332
--- /dev/null
+++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
@@ -0,0 +1,13 @@
+<template>
+  <div>123</div>
+</template>
+
+<script>
+export default {
+  name: 'OutsourcingQCSearch'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 5e84b952..f760d53a 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -92,9 +92,9 @@
                     {{ scope.row.机床图号 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="机床设计者" align="center" min-width="90">
+                <el-table-column label="设计者" align="center" min-width="80">
                   <template slot-scope="scope">
-                    {{ scope.row.机床设计者 || '—' }}
+                    {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
                   </template>
                 </el-table-column>
                 <el-table-column label="组号" align="center" min-width="80">
@@ -275,9 +275,9 @@
                     {{ scope.row.机床图号 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="机床设计者" align="center" min-width="90">
+                <el-table-column label="设计者" align="center" min-width="80">
                   <template slot-scope="scope">
-                    {{ scope.row.机床设计者 || '—' }}
+                    {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
                   </template>
                 </el-table-column>
                 <el-table-column label="组号" align="center" min-width="80">
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 1253cf6e..cfff54dd 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -72,24 +72,30 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="21">
             <el-form-item label="其他说明:">
               <el-input v-model="otherInfo" :disabled="!contractNumValue" size="small" type="textarea" rows="1" @blur="contractHeaderChange"/>
             </el-form-item>
           </el-col>
+          <el-col :span="1">
+            <el-button v-if="quickChangePrice" size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
+            <el-button v-else size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">还原</el-button>
+          </el-col>
         </el-row>
       </el-form>
-      <el-table :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary>
+      <el-table :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary tooltip-effect="dark">
         <el-table-column label="序号" align="center" width="50" type="index"/>
         <el-table-column label="交货期" align="center" width="150">
           <template slot-scope="scope">
             <el-date-picker
+              v-if="quickChangePrice"
               v-model="scope.row.交货期"
               size="mini"
               type="date"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               style="width:100%"/>
+            <b v-else>{{ scope.row.交货期.split(' ')[0] || '—' }}</b>
           </template>
         </el-table-column>
         <el-table-column label="机床图号" align="center" min-width="100">
@@ -97,7 +103,7 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" align="center" min-width="80">
+        <el-table-column label="组号" align="center" width="70">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
@@ -107,7 +113,7 @@
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="150">
+        <el-table-column label="图号或型号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.图号 ? scope.row.图号 : '—' }}
           </template>
@@ -122,20 +128,20 @@
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="单位" align="center" width="80">
+        <el-table-column label="单位" align="center" width="70">
           <template slot-scope="scope">
             {{ scope.row.计量单位 }}
           </template>
         </el-table-column>
         <el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="120">
           <template slot-scope="scope">
-            <el-input-number v-show="hasTax==='未税'" :min="0" v-model="scope.row.未税单价" controls-position="right" size="mini" style="width:100%" @focus="scope.row.未税单价=''" @change="priceChange(scope.row.未税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
+            <el-input-number v-show="hasTax==='未税'" :min="0" v-model="scope.row.未税单价" controls-position="right" size="mini" style="width:100%" @change="priceChange(scope.row.未税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
             <b v-show="hasTax!=='未税'">—</b>
           </template>
         </el-table-column>
         <el-table-column v-show="hasTax==='含税'" label="单价（含税）" align="center" width="120">
           <template slot-scope="scope">
-            <el-input-number v-show="hasTax==='含税'" :min="0" v-model="scope.row.含税单价" controls-position="right" size="mini" style="width:100%" @focus="scope.row.含税单价=''" @change="priceChange(scope.row.含税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
+            <el-input-number v-show="hasTax==='含税'" :min="0" v-model="scope.row.含税单价" controls-position="right" size="mini" style="width:100%" @change="priceChange(scope.row.含税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
             <b v-show="hasTax!=='含税'">—</b>
           </template>
         </el-table-column>
@@ -149,9 +155,10 @@
             {{ hasTax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.含税单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" width="80">
+        <el-table-column label="备注" align="center" min-width="80" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.备注 }}
+            <el-input v-if="quickChangePrice" v-model="scope.row.备注" size="mini" style="width:100%" @change="remarkChange(scope.row.备注, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
+            <b v-else>{{ scope.row.备注 || '—' }}</b>
           </template>
         </el-table-column>
       </el-table>
@@ -185,7 +192,7 @@
 
 <script>
 import Tinymce from '@/components/Tinymce'
-import { initSupplier, searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo, savePrice, saveContractHeader, searchContractHeader } from '@/api/PurchasingCenter/CreatePurchaseContract'
+import { initSupplier, searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo, savePrice, saveContractHeader, searchContractHeader, saveRemark } from '@/api/PurchasingCenter/CreatePurchaseContract'
 import { convertCurrency } from '@/vendor/int2Chinese'
 import { mapGetters } from 'vuex'
 import { sleep, groupBy } from '@/utils/tool'
@@ -196,6 +203,7 @@ export default {
   inject: ['reload'],
   data() {
     return {
+      quickChangePrice: true,
       supplier: [],
       year: '',
       month: '',
@@ -244,6 +252,7 @@ export default {
       数量组: [],
       单价组: [],
       交货期组: [],
+      备注组: [],
       companyAddress: '',
       sendAddress: ''
     }
@@ -270,6 +279,37 @@ export default {
         })
       }
     },
+    // 备注实时保存
+    remarkChange(remark, num1, num2, row, num3, num4, num5) {
+      this.tableData1.map(v => {
+        v.物料流水号 = v.物料流水号 || ''
+        v.零件名称 = v.零件名称 || ''
+        v.零件图号 = v.零件图号 || ''
+        v.规格 = v.规格 || ''
+        row.物料流水号 = row.物料流水号 || ''
+        row.零件名称 = row.零件名称 || ''
+        row.零件图号 = row.零件图号 || ''
+        row.规格 = row.规格 || ''
+        if (Number(v.物料流水号) === Number(row.物料流水号) && Number(v.询价单流水号) === Number(row.询价单流水号) && v.零件名称 === row.零件名称 && v.零件图号 === row.零件图号 && v.规格 === row.规格) {
+          v.备注 = row.备注
+        }
+      })
+      const group = this.tableData1
+      this.tableData1 = []
+      this.tableData1 = group
+      remark = remark || ''
+      num1 = num1 || ''
+      num3 = num3 || ''
+      num4 = num4 || ''
+      num5 = num5 || ''
+      saveRemark(remark, num1, num2, num3, num4, num5).then(res => {
+        if (res.data[0].result === '1') {
+          console.log('备注实时保存成功')
+        } else {
+          console.log('备注实时保存失败')
+        }
+      })
+    },
     // 价格实时保存
     priceChange(price, num1, num2, row, num3, num4, num5) {
       this.tableData1.map(v => {
@@ -733,6 +773,7 @@ export default {
           this.数量组.push(v.数量)
           this.hasTax === '含税' ? this.单价组.push(v.含税单价) : this.单价组.push(v.未税单价)
           this.交货期组.push(v.交货期)
+          this.备注组.push(v.备注)
         } else { // 获取未询到价格的物料的询价单明细流水号们
           inquiryDetailNum_old.push(v.询价单明细流水号)
         }
@@ -743,7 +784,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old).then(response => {
+          doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old, this.备注组).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('合同生成成功')
               this.reload()
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index f1108e98..41b249fc 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -355,6 +355,8 @@
         </el-tooltip>
         <el-input v-model="taxRate" style="float:right;width:100px" placeholder="税率" size="mini"/>
         <h4 style="float:right;width: 40px;margin: 5px">税率:</h4>
+        <el-button v-if="quickChangePrice" size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
+        <el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>
       </div>
       <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="500px" size="mini" show-summary>
         <el-table-column label="离线合同编号" align="center" min-width="150">
@@ -369,17 +371,18 @@
         </el-table-column>
         <el-table-column label="物料规格" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
+            {{ scope.row.物料规格 || '—' }}
           </template>
         </el-table-column>
         <el-table-column label="物料型号" align="center" min-width="200">
           <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
+            {{ scope.row.物料型号 || '—' }}
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
+            <el-input v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
+            <b v-else>{{ scope.row.数量 }}</b>
           </template>
         </el-table-column>
         <el-table-column label="单位" align="center" min-width="100">
@@ -416,12 +419,14 @@
         </el-table-column>
         <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.交货期要求" :disabled="disable" size="mini" style="width:70px"/>
+            <el-input v-if="quickChangePrice" v-model="scope.row.交货期要求" :disabled="disable" size="mini" style="width:70px"/>
+            <b v-else>{{ scope.row.交货期要求 || '—' }}</b>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" min-width="150" prop="备注">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.备注" :disabled="disable" size="mini" style="width:120px"/>
+            <el-input v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:120px"/>
+            <b v-else>{{ scope.row.备注 || '—' }}</b>
           </template>
         </el-table-column>
         <el-table-column v-if="disable" label="到货数量" align="center" min-width="100">
@@ -431,7 +436,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-button :disabled="disable" type="danger" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+            <el-button v-if="quickChangePrice" :disabled="disable" type="danger" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+            <b v-else>移除</b>
           </template>
         </el-table-column>
       </el-table>
@@ -692,6 +698,7 @@ export default {
   name: '', // 离线合同
   data() {
     return {
+      quickChangePrice: true,
       hasTax: '含税',
       taxRate: 0.13,
       source: [
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index c9e6c520..37eed699 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,23 +1,127 @@
 <template>
-  <div class="dashboard-container">
-    <div class="dashboard-text">name:{{ name }}</div>
-  </div>
+  <el-card>
+    <div class="dashboard-container">
+      <div class="sudoku_row" >
+        <div class="dashboard-text">name:{{ name }}</div>
+        <el-divider content-position="right">消息通知</el-divider>
+        <el-card v-for="(sudoku,index) in sudokus" :class="curSelect==sudoku.id?'opacity':''" :key="index" shadow="hover" class="sudoku_item ">
+          <div>
+            <el-badge :value="sudoku.value">
+              <svg-icon :icon-class="sudoku.icon" style="border: 1px solid black;background-color: #555c66" />
+              <router-link :to="sudoku.router">{{ sudoku.name }}</router-link>
+              <!--<a size="small" type="text" href="/Assembly/DeliveryConfirmation">{{sudoku.name}}</a>-->
+            </el-badge>
+          </div>
+          <div/>
+        </el-card>
+        <el-divider content-position="right"/>
+        <!--<div class="sudoku_item " :class="curSelect==sudoku.id?'opacity':''" v-for="(sudoku,index) in sudokus" :key="index" @touchstart="touchstart(index)" @touchend="touchend">-->
+        <!--&lt;!&ndash;<img :src="sudoku.img_src" width="40" height="40" >&ndash;&gt;-->
+        <!---->
+        <!--</div>-->
+      </div>
+    </div>
+  </el-card>
+
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-
+import request from '@/utils/request'
 export default {
   name: 'Dashboard',
+  data() {
+    return {
+      sudokus: [],
+      curSelect: null,
+      number: '',
+      timer: ''
+    }
+  },
   computed: {
     ...mapGetters([
-      'name'
+      'name',
+      'token'
     ])
+  },
+  mounted() {
+    this.getFileList()
+    this.timer = setInterval(this.getFileList, 60 * 60 * 1000) // 60 分钟一刷新
+  },
+  beforeDestroy() {
+    clearInterval(this.timer)
+  },
+  methods: {
+    async getFileList() {
+      await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '1',
+          name: '菜单系统模块_项目角色模块列表_消息通知',
+          param: '角色编号=' + this.token
+        }
+      }).then(data => {
+        this.sudokus = []
+        for (let i = 0; i < data.data.length; i++) {
+          this.getMessageNum(data.data[i].消息通知来源, data.data[i].通知条件, data, i)
+        }
+      })
+    },
+    async getMessageNum(tableName, condition, rawData, i) {
+      await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: `select count(*) from ${tableName} where ${condition}`
+        }
+      }).then(res => {
+        this.sudokus.push({
+          id: rawData.data[i].主模块编号,
+          name: rawData.data[i].标题,
+          icon: rawData.data[i].图标,
+          router: `${rawData.data[i].父路径}/${rawData.data[i].子路径}`,
+          value: res.data[0].Column1
+        })
+      })
+    }
   }
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .item {
+    margin-top: 10px;
+    margin-right: 40px;
+  }
+  .sudoku_row{
+    display: flex;
+    align-items: center;
+    width:100%;
+    flex-wrap: wrap;
+  }
+  .sudoku_item{
+    margin-bottom: 20px;
+    margin-left: 20px;
+    /*border: 1px solid red;*/
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    width:15%;
+    height: 200px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+  }
+  .opacity{
+    opacity: 0.4;
+    background: #e5e5e5;
+  }
+  .sudoku_item img{
+    margin-bottom: 3px;
+    display: block;
+  }
 .dashboard {
   &-container {
     margin: 30px;