diff --git a/src/api/MarketingCenter/BidBond.js b/src/api/MarketingCenter/BidBond.js
index fafb42a2..b924ad2c 100644
--- a/src/api/MarketingCenter/BidBond.js
+++ b/src/api/MarketingCenter/BidBond.js
@@ -127,3 +127,34 @@ export function winningBid() {
     }
   })
 }
+export function executionProgressID() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_执行进度_查询'
+    }
+  })
+}
+export function intProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_投标保证金转履约保证金_项目名称查询'
+    }
+  })
+}
+export function submitPerformanceBond() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_投标保证金转履约保证金',
+      param: '招标保证金流水号=' + arguments[0] + '&项目流水号=' + arguments[1] + '&保证金金额=' + arguments[2] + '&保证金类型流水号=' + arguments[3] + '&收回条件=' + arguments[4] + '&截止时间=' + arguments[5]
+    }
+  })
+}
diff --git a/src/api/MarketingCenter/DeliveryManagement.js b/src/api/MarketingCenter/DeliveryManagement.js
index 9f4f8e5b..c6156076 100644
--- a/src/api/MarketingCenter/DeliveryManagement.js
+++ b/src/api/MarketingCenter/DeliveryManagement.js
@@ -163,7 +163,7 @@ export function addInvoice() {
     data: {
       type: '2',
       name: '发货管理_发货单_增加数据',
-      param: '装箱单编号=' + arguments[0] + '&车辆牌号=' + arguments[1] + '&运输状态=' + arguments[2] + '&收货地址流水号=' + arguments[3] + '&发货日期=' + arguments[4]
+      param: '装箱单编号=' + arguments[0] + '&车辆牌号=' + arguments[1] + '&运输状态=' + arguments[2] + '&收货地址流水号=' + arguments[3] + '&发货日期=' + arguments[4] + '&运费=' + arguments[5]
     }
   })
 }
@@ -185,7 +185,7 @@ export function editInvoice() {
     data: {
       type: '2',
       name: '发货管理_发货单_修改数据',
-      param: '车辆牌号=' + arguments[0] + '&运输状态=' + arguments[1] + '&收货地址流水号=' + arguments[2] + '&发货日期=' + arguments[3] + '&发货单编号=' + arguments[4]
+      param: '车辆牌号=' + arguments[0] + '&运输状态=' + arguments[1] + '&收货地址流水号=' + arguments[2] + '&发货日期=' + arguments[3] + '&发货单编号=' + arguments[4] + '&运费=' + arguments[5]
     }
   })
 }
@@ -255,3 +255,14 @@ export function submitRremove() {
     }
   })
 }
+export function selectDelivery() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货单二维码扫描查询',
+      param: '发货单编号=' + arguments[0]
+    }
+  })
+}
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index afd16c8e..d2a992a2 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -126,12 +126,8 @@
         </el-table-column>
         <el-table-column align="center" label="状态" width="120">
           <template slot-scope="scope">
-            <!--<div v-if="scope.row.状态 === '0'">未到预警时间</div>-->
-            <!--<div v-else-if="scope.row.状态 === '1'">即将拖期</div>-->
-            <!--<div v-else-if="scope.row.状态 === '2'">已拖期</div>-->
-            <!--<div v-else >已收回</div>-->
             <el-tag v-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="small" style="width: 66px">未公布</el-tag>
-            <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.是否收回)===2" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>
+            <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.是否收回)===2" slot="reference" type="success" size="small" style="width: 66px">已收回</el-tag>
             <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===0" slot="reference" type="primary" size="small" style="width: 66px">未开始</el-tag>
             <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===1" slot="reference" type="warning" size="small" style="width: 66px">即将拖期</el-tag>
             <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag>
@@ -349,20 +345,81 @@
         <el-button type="primary" @click="submitTime('Timeform')">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="dialogPerformanceBondVisible" title="转履约保证金" center style="min-height: 300px" width="40%">
+      <el-form ref="PerformanceBondform" :model="PerformanceBondform" :rules="PerformanceBondrules" label-position="left" label-width="120px" class="demo-ruleForm">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="项目名称">
+              <el-select v-model="PerformanceBondform.项目名称" filterable clearable placeholder="请选择项目名称" style="width: 560px" size="small">
+                <el-option
+                  v-for="item in entryName"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="保证金金额" prop="保证金金额">
+              <el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="0.1" style="width: 200px" size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="保证金类型" prop="保证金类型">
+              <el-select v-model="PerformanceBondform.保证金类型" filterable placeholder="请选择保证金类型" style="width: 200px" size="small">
+                <el-option
+                  v-for="item in TypeOfGoldDeposit1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="收回条件" prop="收回条件">
+              <el-select v-model="PerformanceBondform.收回条件" filterable placeholder="请选择收回条件" style="width: 200px" size="small">
+                <el-option
+                  v-for="item in plannedTime"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="截止时间(天)" prop="截止时间">
+              <el-input-number v-model="PerformanceBondform.截止时间" placeholder="请输入截止时间" style="width: 200px" size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOffPerformanceBondform('PerformanceBondform')">取消</el-button>
+        <el-button type="primary" @click="submitPerformanceBondform('PerformanceBondform')">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, ComplianceGold, addBidBond, editBidBond, delBidBond, winningBid } from '@/api/MarketingCenter/BidBond'
+import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, ComplianceGold, addBidBond, editBidBond, delBidBond, winningBid, executionProgressID, intProject, submitPerformanceBond } from '@/api/MarketingCenter/BidBond'
 export default {
   components: {
     elInput
   },
   data() {
     return {
+      entryName: [],
+      plannedTime: [],
       disabled: false,
       tenderResultDisabled: false,
+      dialogPerformanceBondVisible: false, // 转履约保证金对话框
       BidBondCode: '',
       MoneyTypeCode: '',
       TypeOfGoldDeposit1: [],
@@ -404,6 +461,13 @@ export default {
         投标结果公布日期: '',
         中标服务费: ''
       },
+      PerformanceBondform: {
+        项目名称: '',
+        保证金类型: 1,
+        收回条件: 1,
+        截止时间: 15,
+        保证金金额: ''
+      },
       form2: {
         招标企业: '',
         联系人: '',
@@ -419,6 +483,13 @@ export default {
       rules1: { // 表单验证规则
         收回日期: [{ required: true, message: '请输入收回日期', trigger: 'change' }]
       },
+      PerformanceBondrules: { // 表单验证规则
+        项目名称: [{ required: true, message: '请选择项目', trigger: 'change' }],
+        保证金类型: [{ required: true, message: '请选择保证金类型', trigger: 'change' }],
+        收回条件: [{ required: true, message: '请选择收回条件', trigger: 'change' }],
+        截止时间: [{ required: true, message: '请选择截止日期', trigger: 'change' }],
+        保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'change' }]
+      },
       TimeRules: { // 表单验证规则
         投标结果公布日期: [{ required: true, message: '请选择投标结果公布日期', trigger: 'change' }],
         中标服务费: [{ required: true, message: '请输入中标服务费', trigger: 'change' }]
@@ -438,11 +509,14 @@ export default {
   },
   created() {
     this.init()
+    this.fetchTableData1()
   },
   methods: {
     init() {
       this.getSelect(initType, ['保证金类型', '保证金类型流水号'], 'TypeOfGoldDeposit')
       this.getSelect(initType, ['保证金类型', '保证金类型流水号'], 'TypeOfGoldDeposit1')
+      this.getSelect(executionProgressID, ['执行进度名', '执行进度ID'], 'plannedTime')
+      this.getSelect(intProject, ['项目名称', '项目流水号'], 'entryName')
       getTree().then(response => { // 获取人员信息树
         const data = response.data
         this.dataPeople = tree(data, 0)
@@ -474,21 +548,16 @@ export default {
       } else {
         this.endTime_check = 1
       }
-      // if (this.radio === '1') {
-      //   this.disabled = false
-      // } else {
-      //   this.disabled = true
-      // }
       this.tableData1Loading = true
       selectBidBond(this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.PageCurrent, this.PageSize).then(response => {
         console.log(response)
         this.tableData1Loading = false
         const data = response.data.rows
         for (let i = 0; i < data.length; i++) {
-          data[i].履约金 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-          data[i].履约金 === '1' ? data[i].是否禁用履约 = true : data[i].是否禁用履约 = false
-          data[i].是否收回 === '2' ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
-          data[i].是否收回 === '2' ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
+          data[i].公布日期 === '' || data[i].公布日期 === null || parseInt(data[i].履约金) === 1 || parseInt(data[i].投标结果) === 2 || parseInt(data[i].是否收回) === 2 ? data[i].是否禁用履约 = true : data[i].是否禁用履约 = false
+          parseInt(data[i].是否收回) === 2 ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
+          parseInt(data[i].是否收回) === 2 ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
+          data[i].公布日期 === '' || data[i].公布日期 === null || parseInt(data[i].是否收回) === 2 ? data[i].是否禁用 = true : data[i].是否禁用 = false
           if (data[i].投标结果 === '1') {
             data[i].是否禁用已中标 = false
             data[i].是否禁用未中标 = true
@@ -500,14 +569,6 @@ export default {
             data[i].是否禁用未中标 = false
           }
         }
-        // if (this.radio === '2') {
-        //   for (let i = 0; i < data.length; i++) {
-        //     data[i].是否禁用 = true
-        //     data[i].投标日期 = data[i].投标日期.substring(0, data[i].投标日期.length - 8)
-        //     data[i].预计收回日期 = data[i].预计收回日期.substring(0, data[i].预计收回日期.length - 8)
-        //     data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8)
-        //   }
-        // }
         this.tableData1 = data
         this.total = response.data.total
       })
@@ -578,20 +639,24 @@ export default {
       this.dialogFormVisible2 = false
     },
     ComplianceGold(row) {
-      this.$confirm('此操作会将此投标保证金转为履约保证金, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        ComplianceGold(row.招标保证金流水号).then(response => {
-          if (response.data[0].result === '1') {
-            this.fetchTableData1()
-            this.$message.success('操作成功')
-          } else {
-            this.$message.error('操作失败')
-          }
-        })
-      })
+      this.addForm('PerformanceBondform')
+      // this.$confirm('此操作会将此投标保证金转为履约保证金, 是否继续?', '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning'
+      // }).then(() => {
+      //   ComplianceGold(row.招标保证金流水号).then(response => {
+      //     if (response.data[0].result === '1') {
+      //       this.fetchTableData1()
+      //       this.$message.success('操作成功')
+      //     } else {
+      //       this.$message.error('操作失败')
+      //     }
+      //   })
+      // })
+      this.code = row.招标保证金流水号
+      this.dialogPerformanceBondVisible = true
+      this.PerformanceBondform.保证金金额 = row.应收回金额
     },
     addBidBond() {
       this.addForm('form2')
@@ -674,6 +739,24 @@ export default {
           this.$message.error('操作失败')
         }
       })
+    },
+    callOffPerformanceBondform() {
+      this.dialogPerformanceBondVisible = false
+    },
+    submitPerformanceBondform(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          submitPerformanceBond(this.code, this.PerformanceBondform.项目名称, this.PerformanceBondform.保证金金额, this.PerformanceBondform.保证金类型, this.PerformanceBondform.收回条件, this.PerformanceBondform.截止时间).then(response => {
+            if (response.data[0].result === '1') {
+              this.fetchTableData1()
+              this.dialogPerformanceBondVisible = false
+              this.$message.success('操作成功')
+            } else {
+              this.$message.error('操作失败')
+            }
+          })
+        }
+      })
     }
   }
 }
diff --git a/src/views/MarketingCenter/DeliveryManagement/exportExcel.js b/src/views/MarketingCenter/DeliveryManagement/exportExcel.js
new file mode 100644
index 00000000..a8efad67
--- /dev/null
+++ b/src/views/MarketingCenter/DeliveryManagement/exportExcel.js
@@ -0,0 +1,19 @@
+// 导出Excel方法（表格id，不加扩展名的文件名，sheet名）
+export function exportExcelMethod(tableId, fileName, sheetName) {
+  tableToExcel(tableId, fileName, sheetName)
+}
+const tableToExcel = (function() {
+  const uri = 'data:application/vnd.ms-excel;base64,'
+  // 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中，网页显示表格宽度建议1240，tr/td视情况而定
+  const template = `<html xmlns:x="urn:schemas-microsoft-com:office:excel"><head><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><meta charset="UTF-8"><style type="text/css">table td {border: 1px solid #000000;width:100px;text-align: center;color: #000000;} th {border: 1px solid #000000;width:100px;text-align: center;color: #000000;}</style></head><body><table>{table}</table></body></html>`
+  const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) }
+  const format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p] }) }
+  return function(table, filename, sheetname) {
+    if (!table.nodeType) table = document.getElementById(table)
+    const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML }
+    const aTag = document.createElement('a')
+    aTag.href = uri + base64(format(template, ctx))
+    aTag.download = filename
+    aTag.click()
+  }
+})()
diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
index 92e810fa..57db7c49 100644
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-select v-model="projectNameValue" clearable filterable placeholder="请选择项目名称" size="small" style="margin-left: 10px;width: 200px" @change="searchPackingList();searchPackingListDetails();searchInvoice()">
+      <el-select v-model="projectNameValue" clearable filterable placeholder="请选择项目名称" size="small" style="margin-left: 10px;width: 200px" @change="searchPackingList();searchPackingListDetails();searchInvoice()" @clear="clearProject()">
         <el-option
           v-for="item in projectName"
           :key="item.value"
@@ -28,6 +28,7 @@
             highlight-current-row
             style="width: 100%"
             height="315"
+            size="mini"
             @row-click="searchCargoBox"
           >
             <el-table-column align="center" label="发货单号" width="150">
@@ -65,9 +66,14 @@
                 {{ scope.row.运输状态 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="运费" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.运费 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="签收人" width="80">
               <template slot-scope="scope">
-                {{ scope.row.签收人 }}
+                {{ scope.row.签收人 === '' || scope.row.签收人 === null ? '未签收' : scope.row.签收人 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="追溯码" width="150">
@@ -81,7 +87,7 @@
                   size="mini"
                   type="warning"
                   icon="el-icon-edit"
-                  @click.stop="editWithdrawing(scope.row);flag1 = 4">导出</el-button>
+                  @click.stop="exportTable()">导出</el-button>
                 <el-button
                   size="mini"
                   type="primary"
@@ -104,6 +110,7 @@
               :file-list="fileList"
               :before-upload="beforeUpload"
               :on-success="onSuccess"
+              :limit="5"
               :action="'http://localhost:8411/submit/upload2.ashx?InvoiceNum='+ invoiceNum"
               list-type="picture-card">
               <i class="el-icon-plus"/>
@@ -128,7 +135,8 @@
                 highlight-current-row
                 border
                 style="width: 100%"
-                height="500"
+                height="300"
+                size="mini"
                 @expand-change="selectMachine"
               >
                 <el-table-column type="expand">
@@ -139,13 +147,14 @@
                       style="width: 600px; text-align: center"
                       height="300"
                       highlight-current-row
+                      size="mini"
                       @row-click="choiceParts"
                     >
                       <el-table-column
                         align="center"
                         label="序号"
                         type="index"
-                        width="100"/>
+                        width="50"/>
                       <el-table-column label="代号" align="center">
                         <template slot-scope="scope">
                           {{ scope.row.代号 }}
@@ -209,7 +218,8 @@
                 highlight-current-row
                 border
                 style="width: 100%"
-                height="500"
+                height="300"
+                size="mini"
                 @row-click="choiceSpare"
               >
                 <el-table-column align="center" label="序号" type="index" width="50"/>
@@ -252,7 +262,8 @@
                 highlight-current-row
                 border
                 style="width: 100%"
-                height="500"
+                height="300"
+                size="mini"
                 @row-click="choiceFile"
               >
                 <el-table-column align="center" label="序号" type="index" width="50"/>
@@ -282,7 +293,7 @@
         </div></el-col>
         <el-col :span="2">
           <div class="grid-content bg-purple">
-            <div style="height:554px">
+            <div style="height:300px">
               <div>
                 <el-button :disabled="disabledmoveInto" round type="primary" size="small" style="margin-top: 200px;margin-left: 45px" @click="moveInto()">➡</el-button>
               </div>
@@ -319,7 +330,7 @@
             :data="tableData6"
             border
             style="width: 100%;margin-top: 3px"
-            height="500"
+            height="300"
             highlight-current-row
             @row-click="choiceGoods"
           >
@@ -405,6 +416,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="运费" prop="运费" label-width="110px">
+              <el-input-number v-model="form1.运费" :precision="2" :step="0.1" style="width: 200px" size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOffInvoice('form1')">取消</el-button>
@@ -513,6 +531,69 @@
         <el-button type="primary" @click="submitRremove('form3')">确 定</el-button>
       </div>
     </el-dialog>
+    <el-card>
+      <div style="width: 100%">
+        <table id="table" class="tg" style="table-layout: fixed; width: 1228px;margin: auto;left: 50%;right: 50%">
+          <colgroup>
+            <col style="width: 100px">
+            <col style="width: 100px">
+            <col style="width: 100px">
+            <col style="width: 100px">
+            <col style="width: 100px">
+            <col style="width: 100px">
+            <col style="width: 100px">
+            <col style="width: 100px">
+            <col style="width: 100px">
+          </colgroup>
+          <tr>
+            <th class="tg-v15n" colspan="8" style="font-size: 38px">江苏高精机电装备有限公司</th>
+            <th class="tg-c3ow" rowspan="2" style="text-align: center; line-height: 114px">二维码</th>
+          </tr>
+          <tr>
+            <td class="tg-uys7" colspan="8" style="text-align: center;font-size: 26px">{{ 装箱单名称 }}发货单</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow">发货单号</td>
+            <td class="tg-c3ow" colspan="2">{{ 发货单号 }}</td>
+            <td class="tg-c3ow">收货人</td>
+            <td class="tg-c3ow" colspan="2">{{ 收货人 }}</td>
+            <td class="tg-c3ow">联系电话</td>
+            <td class="tg-c3ow" colspan="2">{{ 联系电话 }}</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow">收货地址</td>
+            <td class="tg-c3ow" colspan="2">{{ 收货地址 }}</td>
+            <td class="tg-c3ow">委托车辆</td>
+            <td class="tg-c3ow" colspan="2">{{ 委托车辆 }}</td>
+            <td class="tg-c3ow">发货日期</td>
+            <td class="tg-c3ow" colspan="2">{{ 发货日期 }}</td>
+          </tr>
+          <tr>
+            <td class="tg-c3ow">序号</td>
+            <td class="tg-c3ow">代号</td>
+            <td class="tg-c3ow" colspan="2">名称</td>
+            <td class="tg-c3ow">规格</td>
+            <td class="tg-c3ow">数量</td>
+            <td class="tg-c3ow" colspan="2">备注</td>
+            <td class="tg-c3ow">确认</td>
+          </tr>
+          <tr v-for="(list, index) in table" :key="index">
+            <td class="tg-c3ow">{{ index + 1 }}</td>
+            <td class="tg-c3ow">{{ list.代号 }}</td>
+            <td class="tg-c3ow" colspan="2">{{ list.名称 }}</td>
+            <td class="tg-c3ow">{{ list.规格 }}</td>
+            <td class="tg-c3ow">{{ list.数量 }}</td>
+            <td class="tg-c3ow" colspan="2">{{ list.备注 }}</td>
+            <td class="tg-c3ow"/>
+          </tr>
+          <tr>
+            <td class="tg-c3ow" colspan="7">本清单一式两份：一份请收货人清点货物；一份请签收人签收后交还司机带回本公司。请签收人在货物卸车后立即清点！</td>
+            <td class="tg-c3ow">签收人签字：</td>
+            <td class="tg-c3ow"/>
+          </tr>
+        </table>
+      </div>
+    </el-card>
   </div>
 </template>
 
@@ -520,7 +601,8 @@
 import request from '@/utils/request'
 // import { sleep } from '@/utils/tool'
 import elInput from 'element-ui/packages/input'
-import { submitRremove, searchCargoBoxDetailed, submitMoveInto, delCargoBox, addCargoBox, searchCargoBox, editInvoice, delInvoice, addInvoice, editAdress, addAdress, deleteAdress, citySearch, provinceSearch, addressSearch, searchParts, searchHost, searchSparePart, searchProjectName, searchPackingList, searchFile, searchInvoice } from '@/api//MarketingCenter/DeliveryManagement'
+import { exportExcelMethod } from './exportExcel'
+import { selectDelivery, submitRremove, searchCargoBoxDetailed, submitMoveInto, delCargoBox, addCargoBox, searchCargoBox, editInvoice, delInvoice, addInvoice, editAdress, addAdress, deleteAdress, citySearch, provinceSearch, addressSearch, searchParts, searchHost, searchSparePart, searchProjectName, searchPackingList, searchFile, searchInvoice } from '@/api//MarketingCenter/DeliveryManagement'
 import QRCode from 'qrcode'
 export default {
   components: {
@@ -528,10 +610,18 @@ export default {
   },
   data() {
     return {
+      table: [],
       canvas: [],
       show: false,
       num: '',
       fileList: [],
+      发货单号: '',
+      收货人: '',
+      收货地址: '',
+      联系电话: '',
+      委托车辆: '',
+      发货日期: '',
+      装箱单名称: '',
       a: 1, // 嵌套表格交换变量
       b: 1, // 嵌套表格交换变量
       flag1: '', // 发货单旗帜变量
@@ -612,7 +702,8 @@ export default {
         发货日期: '',
         运输状态: 0,
         联系人: '',
-        联系方式: ''
+        联系方式: '',
+        运费: ''
       },
       form2: {
         名称: '',
@@ -628,7 +719,8 @@ export default {
         联系人: [{ required: true, message: '请选择联系人', trigger: 'blur' }],
         联系方式: [{ required: true, message: '请选择联系方式', trigger: 'blur' }],
         发货日期: [{ required: true, message: '请选择发货日期', trigger: 'change' }],
-        运输状态: [{ required: true, message: '请选择运输状态' }]
+        运输状态: [{ required: true, message: '请选择运输状态' }],
+        运费: [{ required: true, message: '请输入运费' }]
       },
       rules2: {}
     }
@@ -705,6 +797,8 @@ export default {
     },
     // 发货单查询
     searchInvoice() {
+      this.cargoBoxValue = ''
+      this.tableData6 = []
       this.tableData5Loading = true
       searchInvoice(this.projectNameValue).then(response => {
         const data = response.data
@@ -724,7 +818,7 @@ export default {
         return data
       }).then(res => {
         for (let i = 0; i < res.length; i++) {
-          QRCode.toCanvas(document.getElementById(this.canvas[i]), 'http://192.168.1.132:8080/#/DeliveryManagement/index?id=' + res[i].发货单编号.toString(), function(error) {
+          QRCode.toCanvas(document.getElementById(this.canvas[i]), 'http://192.168.0.110:8080/#/DeliveryManagement/index?id=' + res[i].发货单编号.toString(), function(error) {
             if (error) console.error(error)
             console.log('success!')
           })
@@ -747,7 +841,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.flag1 === 1) {
-            addInvoice(this.projectNameValue, this.form1.车辆牌号, this.form1.运输状态, this.adressNum, this.form1.发货日期).then(response => {
+            addInvoice(this.projectNameValue, this.form1.车辆牌号, this.form1.运输状态, this.adressNum, this.form1.发货日期, this.form1.运费).then(response => {
               this.dialogFormVisible1 = false
               if (response.data[0].result === '1') {
                 this.$message.success('添加成功')
@@ -758,7 +852,7 @@ export default {
               }
             })
           } else {
-            editInvoice(this.form1.车辆牌号, this.form1.运输状态, this.adressNum, this.form1.发货日期, this.invoiceNum).then(response => {
+            editInvoice(this.form1.车辆牌号, this.form1.运输状态, this.adressNum, this.form1.发货日期, this.invoiceNum, this.form1.运费).then(response => {
               this.dialogFormVisible1 = false
               if (response.data[0].result === '1') {
                 this.$message.success('信息更新成功')
@@ -784,6 +878,8 @@ export default {
       this.form1.联系方式 = row.联系方式
       this.adressNum = row.收货地址流水号
       this.invoiceNum = row.发货单编号
+      this.title1 = '编辑'
+      this.form1.运费 = row.运费
     },
     // 删除发货单
     delInvoice(row) {
@@ -899,6 +995,18 @@ export default {
       this.invoiceNum = row.发货单编号
       this.getFileList()
       this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
+      selectDelivery(this.invoiceNum).then(response => {
+        this.table = response.data
+        this.装箱单名称 = response.data[0].装箱单名称
+        this.发货单号 = response.data[0].发货单号
+        this.收货人 = response.data[0].联系人
+        this.收货地址 = response.data[0].省份 + response.data[0].市名 + response.data[0].详细地址
+        this.委托车辆 = response.data[0].车辆牌号
+        this.联系电话 = response.data[0].联系方式
+        if (response.data[0].发货日期 !== '' || response.data[0].发货日期 !== null) {
+          this.发货日期 = response.data[0].发货日期.substring(0, response.data[0].发货日期.length - 8)
+        }
+      })
     },
     addCargoBox() {
       this.$confirm('此操作将新增货箱, 是否继续?', '提示', {
@@ -907,12 +1015,16 @@ export default {
         type: 'warning'
       }).then(() => {
         addCargoBox(this.invoiceNum).then(response => {
+          console.log(response)
           if (response.data[0].result === '1') {
-            this.$message.sucess('增加成功')
-            this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
+            this.$message.success('增加成功')
+            this.cargoBox = []
+            this.cargoBoxValue = ''
           } else {
             this.$message.error('增加失败')
           }
+        }).then(() => {
+          this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
         })
       })
     },
@@ -924,11 +1036,14 @@ export default {
       }).then(() => {
         delCargoBox(this.cargoBoxValue).then(response => {
           if (response.data[0].result === '1') {
-            this.$message.sucess('删除成功')
-            this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
+            this.$message.success('删除成功')
+            this.cargoBox = []
+            this.cargoBoxValue = ''
           } else {
             this.$message.error('数据占用')
           }
+        }).then(() => {
+          this.getSelect(searchCargoBox, ['货箱号', '货箱号编号'], 'cargoBox', this.invoiceNum)
         })
       })
     },
@@ -1068,7 +1183,7 @@ export default {
       // 生成的二维码内容，可以添加变量
       this.QueryDetail = this.cargoBoxValue.toString()
       var canvas = document.getElementById('canvas')
-      QRCode.toCanvas(canvas, 'http://192.168.1.132:8080/#/searchBoxDetails/index?id=' + this.QueryDetail, function(error) {
+      QRCode.toCanvas(canvas, 'http://192.168.0.110:8080/#/searchBoxDetails/index?id=' + this.QueryDetail, function(error) {
         if (error) console.error(error)
         console.log('success!')
       })
@@ -1138,6 +1253,14 @@ export default {
       } else {
         this.$message.error('上传失败')
       }
+    },
+    exportTable() {
+      exportExcelMethod('table', '发货单', 'sheet1')
+    },
+    clearProject() {
+      this.cargoBox = []
+      this.cargoBoxValue = ''
+      this.tableData6 = []
     }
   }
 }
@@ -1152,4 +1275,10 @@ export default {
     width: 120px !important;
     height: auto!important;
   }
+  .tg  {border-collapse:collapse;border-spacing:0;}
+  .tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg .tg-v15n{font-weight:bold;font-size:24px;border-color:inherit;text-align:center}
+  .tg .tg-c3ow{border-color:inherit;text-align:center;vertical-align:top}
+  .tg .tg-kluc{font-size:24px;border-color:inherit;text-align:center}
 </style>
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 5c3eddfc..1f08961f 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -186,10 +186,12 @@
                     type="success"
                     @click.stop="takeBack(scope.row)">收回</el-button>
                   <el-button
+                    :disabled="scope.row.是否禁用编辑"
                     size="mini"
                     type="warning"
                     @click.stop="openEditPerformanceBondDialog(scope.row); flag = 2">编辑</el-button>
                   <el-button
+                    :disabled="scope.row.是否禁用删除"
                     size="mini"
                     type="danger"
                     @click.stop="delPerformanceBond(scope.row)">删除</el-button >
@@ -426,6 +428,8 @@ export default {
               data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
               data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
               data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+              parseInt(data[i].是否收回) === 1 ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
+              parseInt(data[i].是否收回) === 1 ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
             }
             this.tableData2 = data
           })
@@ -476,6 +480,8 @@ export default {
                       data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
                       data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
                       data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+                      parseInt(data[i].是否收回) === 1 ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
+                      parseInt(data[i].是否收回) === 1 ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
                     }
                     this.tableData2 = data
                   })
@@ -536,6 +542,8 @@ export default {
                         data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
                         data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
                         data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+                        parseInt(data[i].是否收回) === 1 ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
+                        parseInt(data[i].是否收回) === 1 ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
                       }
                       this.tableData2 = data
                     })
@@ -579,6 +587,8 @@ export default {
                         data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
                         data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
                         data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+                        parseInt(data[i].是否收回) === 1 ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
+                        parseInt(data[i].是否收回) === 1 ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
                       }
                       this.tableData2 = data
                     })
@@ -632,6 +642,8 @@ export default {
                 data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
                 data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
                 data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+                parseInt(data[i].是否收回) === 1 ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
+                parseInt(data[i].是否收回) === 1 ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
               }
               this.tableData2 = data
             })
@@ -672,6 +684,8 @@ export default {
                     data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
                     data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
                     data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+                    parseInt(data[i].是否收回) === 1 ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
+                    parseInt(data[i].是否收回) === 1 ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
                   }
                   this.tableData2 = data
                 })
@@ -778,6 +792,8 @@ export default {
                     data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
                     data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
                     data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+                    parseInt(data[i].是否收回) === 1 ? data[i].是否禁用编辑 = true : data[i].是否禁用编辑 = false
+                    parseInt(data[i].是否收回) === 1 ? data[i].是否禁用删除 = true : data[i].是否禁用删除 = false
                   }
                   this.tableData2 = data
                 })
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index f86a529f..c53ce35d 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -2,8 +2,6 @@
   <div class="app-container">
     <!--顶栏结构-->
     <el-card>
-      <!--<el-radio v-model="radio" label="1">未收回</el-radio>-->
-      <!--<el-radio v-model="radio" label="2">已收回</el-radio>-->
       <span>项目名称：</span>
       <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称:" size="small" style="margin-left: 10px">
         <el-option
@@ -29,11 +27,6 @@
         type="date"
         placeholder="请选择结束日期"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSizeProject = 10;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
-      <!--<span>预警颜色说明：</span>-->
-      <!--<el-tag type="info">未到时间</el-tag>-->
-      <!--<el-tag type="warning">即将拖期</el-tag>-->
-      <!--<el-tag type="danger">已拖期</el-tag>-->
-      <!--<el-tag type="success">已收回</el-tag>-->
     </el-card>
 
     <el-card>
@@ -203,6 +196,10 @@
               <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 0" slot="reference" type="primer" size="small" style="width: 66px">无计划</el-tag>
               <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 2" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>
               <el-tag v-else-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>
+              <div v-show="false">{{ scope.row.预计收回日期===''||scope.row.预计收回日期===null || parseInt(scope.row.是否收回) === 2 ? scope.row.是否禁用收回 = true : scope.row.是否禁用收回 = false }}</div>
+              <div v-show="false">{{ parseInt(scope.row.是否收回) === 2 ? scope.row.是否禁用扣款 = true : scope.row.是否禁用扣款 = false }}</div>
+              <div v-show="false">{{ parseInt(scope.row.是否收回) === 2 ? scope.row.是否禁用编辑 = true : scope.row.是否禁用编辑 = false }}</div>
+              <div v-show="false">{{ parseInt(scope.row.是否收回) === 2 ? scope.row.是否禁用删除 = true : scope.row.是否禁用删除 = false }}</div>
             </el-popover>
           </template>
         </el-table-column>
@@ -214,25 +211,25 @@
         <el-table-column label="操作" fixed="right" align="center" width="370">
           <template slot-scope="scope">
             <el-button
-              :disabled="disabled"
+              :disabled="scope.row.是否禁用收回"
               size="mini"
               type="success"
               icon="el-icon-edit"
               @click.stop="TakeBack(scope.row);flag1 = 5">收回</el-button>
             <el-button
-              :disabled="disabled"
+              :disabled="scope.row.是否禁用扣款"
               size="mini"
               type="info"
               icon="el-icon-edit"
               @click.stop="Withdrawing(scope.row);flag1 = 3">扣款</el-button>
             <el-button
-              :disabled="disabled"
+              :disabled="scope.row.是否禁用编辑"
               size="mini"
               type="primary"
               icon="el-icon-edit"
               @click.stop="editSafetyMargin(scope.row);flag1 = 2">编辑</el-button>
             <el-button
-              :disabled="disabled"
+              :disabled="scope.row.是否禁用删除"
               size="mini"
               type="danger"
               icon="el-icon-delete"