From 267e0c43882145fb6cfdec1858a780472bbc6046 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 20 Dec 2018 14:58:12 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MachiningSequenceAdjustment.js                  | 13 +++++++++++++
 .../MachiningSequenceAdjustment/index.vue           |  0
 2 files changed, 13 insertions(+)
 create mode 100644 src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
 create mode 100644 src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue

diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
new file mode 100644
index 00000000..b6543ae1
--- /dev/null
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+// 初始化 项目名称
+export function getEntryNameValue() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_传递后_项目名称_查询数据',
+      param: '考核状态=5=int'
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
new file mode 100644
index 00000000..e69de29b

From 5cd4d182579455210856731cb11bfd114d6bbf2e Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Thu, 20 Dec 2018 18:22:39 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=92=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/ArrivalStateSearch.js    |   2 +-
 .../ArrivalStateSearch/index.vue              |  57 ++------
 .../exportExcel.js                            |   0
 .../OfflineContract/index.vue                 | 124 +++++++++++++++---
 4 files changed, 123 insertions(+), 60 deletions(-)
 rename src/views/PurchasingCenter/{PurchaseContractSearch => OfflineContract}/exportExcel.js (100%)

diff --git a/src/api/PurchasingCenter/ArrivalStateSearch.js b/src/api/PurchasingCenter/ArrivalStateSearch.js
index 49eb1f35..03a7851e 100644
--- a/src/api/PurchasingCenter/ArrivalStateSearch.js
+++ b/src/api/PurchasingCenter/ArrivalStateSearch.js
@@ -7,7 +7,7 @@ export function initArrivalStateContact() {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_到货情况_查询数据'
+      name: '采购管理_采购请款表_查询数据'
     }
   })
 }
diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
index f31b247a..91030159 100644
--- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
+++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
@@ -14,9 +14,6 @@
       </el-select>
       <span>供应商:</span>
       <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
-      <span>提前</span>
-      <el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
-      <span>天预警</span>
       <el-button
         type="success"
         size="small"
@@ -45,12 +42,12 @@
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规定到货时间" align="center" min-width="100">
+        <el-table-column label="交货日期" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.规定到货时间.split(' ')[0] }}
+            {{ scope.row.交货日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="250">
+        <el-table-column label="供应商" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -60,20 +57,12 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="到货情况" align="center" min-width="70">
-          <template slot-scope="scope">
-            <el-tag v-if="judge[scope.$index]===1" type="success" size="small">全部到货</el-tag>
-            <el-tag v-if="judge[scope.$index]===2" type="warning" size="small">即将拖期</el-tag>
-            <el-tag v-if="judge[scope.$index]===3" type="danger" size="small">已拖期</el-tag>
-            <el-tag v-if="judge[scope.$index]===4" type="primary" size="small">进度正常</el-tag>
-          </template>
-        </el-table-column>
         <el-table-column label="到货进度" align="center" min-width="150">
           <template slot-scope="scope">
             <el-progress
               :text-inside="true"
               :stroke-width="18"
-              :percentage="parseFloat((100*scope.row.合同物料到货总数/scope.row.合同物料采购总数).toFixed(2))"
+              :percentage="parseFloat((100*scope.row.合同到货总数/scope.row.合同采购总数).toFixed(2))"
               status="success"/>
           </template>
         </el-table-column>
@@ -95,29 +84,29 @@
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料名称" align="center" min-width="100">
+        <el-table-column label="图号" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="100">
+        <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
+            {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料型号" align="center" min-width="100">
+        <el-table-column label="规格" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
+            {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
           </template>
         </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="100">
           <template slot-scope="scope">
-            {{ scope.row.总到货数量 ? scope.row.总到货数量 : 0 }}
+            {{ scope.row.已到货数量 }}
           </template>
         </el-table-column>
       </el-table>
@@ -133,7 +122,6 @@ export default {
   name: '', // 项目总价查询
   data() {
     return {
-      warningValue: 3,
       check1: 0,
       check2: 0,
       contractNumValue: '',
@@ -143,10 +131,7 @@ export default {
       pageSize1: 10,
       pageCurrent1: 1,
       total1: 0,
-      tableData2: [],
-      now: '',
-      arrival: [],
-      judge: []
+      tableData2: []
     }
   },
   computed: {
@@ -159,6 +144,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchTable1()
   },
   methods: {
     fetchData() {
@@ -173,24 +159,9 @@ export default {
       })
     },
     searchTable1() {
-      this.warningValue ? this.warningValue : this.warningValue = 1
-      this.arrival = [] // 规定到货时间数组
-      this.now = new Date()
       this.contractNumValue ? this.check1 = 1 : this.check1 = 0
       this.supplierName ? this.check2 = 1 : this.check2 = 0
       searchArrivalState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          this.arrival.push(new Date(response.data.rows[i].规定到货时间))
-          if (parseInt(response.data.rows[i].合同物料到货总数) === parseInt(response.data.rows[i].合同物料采购总数)) {
-            this.judge[i] = 1 // 全部到货
-          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) > 0 && (this.arrival[i] - this.now) < (86400000 * this.warningValue)) {
-            this.judge[i] = 2 // 即将拖期
-          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) < 0) {
-            this.judge[i] = 3 // 已拖期
-          } else if (parseInt(response.data.rows[i].合同物料到货总数) !== parseInt(response.data.rows[i].合同物料采购总数) && (this.arrival[i] - this.now) > (86400000 * this.warningValue)) {
-            this.judge[i] = 4 // 进度正常
-          }
-        }
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/exportExcel.js b/src/views/PurchasingCenter/OfflineContract/exportExcel.js
similarity index 100%
rename from src/views/PurchasingCenter/PurchaseContractSearch/exportExcel.js
rename to src/views/PurchasingCenter/OfflineContract/exportExcel.js
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 466c47fd..2fedfc9a 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -130,11 +130,20 @@
           @click="addMateriel">选入物料</el-button>
       </div>
       <el-table v-loading="" :data="tableData2" border style="max-height: 460px;" height="460px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column label="合同状态" align="center" width="80" fixed="left">
+        <el-table-column type="expand" fixed="left">
+          <template slot-scope="scope">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="离线合同备注">
+                {{ scope.row.离线合同备注 }}
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>
+        <el-table-column label="合同状态" align="center" width="100" fixed="left">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.离线合同状态)===1" type="warning" size="small">编辑中</el-tag>
-            <el-tag v-if="Number(scope.row.离线合同状态)===2" type="success" size="small">已采购</el-tag>
-            <el-tag v-if="Number(scope.row.离线合同状态)===5" type="danger" size="small">已作废</el-tag>
+            <el-tag v-if="Number(scope.row.离线合同状态)===2&&Number(scope.row.总采购数量)!==Number(scope.row.总到货数量)" type="primary" size="small">已采购</el-tag>
+            <el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)" type="success" size="small">全部到货</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="离线合同编号" align="center" min-width="170">
@@ -152,7 +161,7 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购员" align="center" min-width="100">
+        <el-table-column label="采购员" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.采购员 }}
           </template>
@@ -167,16 +176,11 @@
             {{ scope.row.规定到货时间.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="离线合同备注" align="center" min-width="250">
-          <template slot-scope="scope">
-            {{ scope.row.离线合同备注 }}
-          </template>
-        </el-table-column>
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="parseInt(scope.row.离线合同状态)!==1" type="primary" size="mini" icon="el-icon-edit" @click="editOfflineContract(scope.row)"/>
             <el-button :disabled="parseInt(scope.row.离线合同状态)!==1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)"/>
-            <el-button type="warning" size="mini" icon="el-icon-download"/>
+            <el-button type="warning" size="mini" icon="el-icon-download" @click="exportExcel(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -414,12 +418,55 @@
           @click="submitEditOfflineContract">确定</el-button>
       </div>
     </el-dialog>
+
+    <div id="offlineContract" style="width: 800px;margin: 0 auto;display: none">
+      <table class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
+        <tr>
+          <th colspan="8" style="font-size: 30px;font-weight: bold">离线合同</th>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
+          <td>合同名称</td>
+          <td id="contractName"/>
+          <td>供应商</td>
+          <td id="supplier"/>
+          <td colspan="2" rowspan="2" style="width: 40px;height: 100px;">二维码粘贴处</td>
+        </tr>
+        <tr>
+          <td>合同编号</td>
+          <td id="contractNum"/>
+          <td>采购员</td>
+          <td id="buyer"/>
+        </tr>
+        <tr id="tablehead">
+          <td>序号</td>
+          <td>名称</td>
+          <td>规格</td>
+          <td>型号</td>
+          <td>数量</td>
+          <td>单价</td>
+          <td>合计</td>
+          <td>备注</td>
+        </tr>
+        <tr>
+          <td>总计</td>
+          <td/>
+          <td/>
+          <td/>
+          <td/>
+          <td/>
+          <td id="total"/>
+          <td/>
+        </tr>
+      </table>
+    </div>
   </div>
 </template>
 
 <script>
 import { searchInventoryNum, searchOfflineContract, searchOfflineContract2, searchSupplier, addOfflineContract, editOfflineContract, deleteOfflineContract, searchMateriel,
   addMateriel, deleteMateriel, doneOfflineContact, setSafeValue } from '@/api/PurchasingCenter/OfflineContract'
+import { exportExcelMethod } from './exportExcel'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -645,7 +692,6 @@ export default {
       })
     },
     editOfflineContract(row) {
-      console.log(row)
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
       }
@@ -688,25 +734,25 @@ export default {
         }
       })
     },
-    deleteOfflineContract(row) { // 作废离线合同
-      this.$confirm('确定作废该合同?', '提示', {
+    deleteOfflineContract(row) { // 删除离线合同
+      this.$confirm('确定删除该合同?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         deleteOfflineContract(row.离线合同流水号).then(response => {
           if (response.data[0].result === '1') {
-            this.$message.success('作废成功')
+            this.$message.success('删除成功')
             this.searchTable2()
             searchMateriel(this.offlineContractNum).then(response => {
               this.tableData3 = response.data
             })
-          } else { this.$message.error('作废失败') }
+          } else { this.$message.error('数据占用，删除失败') }
         })
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消作废'
+          message: '已取消删除'
         })
       })
     },
@@ -867,6 +913,52 @@ export default {
           message: '已取消操作'
         })
       })
+    },
+    exportExcel(row) {
+      this.$confirm('确定导出该合同?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const children = document.getElementsByClassName('tableData')
+        const parent = document.getElementsByClassName('offlineContract')[0]
+        if (children.length !== 0) {
+          for (let i = children.length - 1; i >= 0; i--) {
+            parent.removeChild(children[i])
+          }
+        }
+        const tr = []
+        for (let i = 0; i < this.tableData3.length; i++) {
+          tr[i] = document.createElement('tr')
+          tr[i].setAttribute('class', 'tableData')
+          tr[i].innerHTML = `<td/><td/><td/><td/><td/><td/><td/><td/>`
+          document.getElementById('tablehead').after(tr[i])
+        }
+        let total = 0
+        for (let j = 0; j < this.tableData3.length; j++) {
+          document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+          document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.tableData3[j].物料名称
+          document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.tableData3[j].物料规格
+          document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.tableData3[j].物料型号
+          document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.tableData3[j].数量
+          document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.tableData3[j].单价
+          document.getElementsByClassName('tableData')[j].children[6].innerHTML = this.tableData3[j].数量 * this.tableData3[j].单价
+          document.getElementsByClassName('tableData')[j].children[7].innerHTML = ''
+          total += this.tableData3[j].数量 * this.tableData3[j].单价
+        }
+        document.getElementById('contractNum').innerHTML = row.离线合同编号
+        document.getElementById('contractName').innerHTML = row.离线合同名称
+        document.getElementById('supplier').innerHTML = row.供应商名称
+        document.getElementById('buyer').innerHTML = row.采购员
+        document.getElementById('total').innerHTML = total
+        exportExcelMethod('offlineContract', '离线合同', '离线合同sheet')
+      }).catch(res => {
+        console.log(res)
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
     }
   }
 }

From d113487c3aeca4f81751e4ee66fd33d4f1857a98 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Thu, 20 Dec 2018 18:43:29 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/MarketingCenter/BidBond.js            |  31 ++++
 src/api/MarketingCenter/DeliveryManagement.js |  15 +-
 src/views/MarketingCenter/BidBond/index.vue   | 157 ++++++++++++----
 .../DeliveryManagement/exportExcel.js         |  19 ++
 .../DeliveryManagement/index.vue              | 169 +++++++++++++++---
 .../MarketingCenter/PerformanceBond/index.vue |  16 ++
 .../MarketingCenter/SafetyMargin/index.vue    |  19 +-
 7 files changed, 356 insertions(+), 70 deletions(-)
 create mode 100644 src/views/MarketingCenter/DeliveryManagement/exportExcel.js

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"

From 330d69ccb0726c53033b6fbd34fcf823714799e0 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Fri, 21 Dec 2018 08:41:19 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A4=96=E8=B4=AD=E4=BB=B6=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA=E5=AE=9A=E9=A2=9D=E5=88=B6=E5=AE=9A=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=89=93=E5=9B=9E=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/PartAssignment.js |   64 +
 .../ManufacturingCenter/ProcessPlanning.js    |   14 +-
 .../OutsourcingProcessPlanning.js             |  277 ++++
 .../OutsourcingQuotaSetting.js                |  111 ++
 .../PartAssignment/index.vue                  |  306 +++-
 .../OfflineContract1/index.vue                |    5 +
 .../OutsourcingProcessPlanning/index.vue      | 1239 ++++++++---------
 .../OutsourcingQuotaSetting/index.vue         |  506 +++++++
 8 files changed, 1869 insertions(+), 653 deletions(-)
 create mode 100644 src/api/WorkshopProcurement/OutsourcingProcessPlanning.js
 create mode 100644 src/api/WorkshopProcurement/OutsourcingQuotaSetting.js
 create mode 100644 src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue

diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js
index 771c20de..7ccc4bf5 100644
--- a/src/api/ManufacturingCenter/PartAssignment.js
+++ b/src/api/ManufacturingCenter/PartAssignment.js
@@ -211,3 +211,67 @@ export function Production(num, MaterialNum, projectFloatValue, machineFloatValu
     }
   })
 }
+export function PartCallbackInformation() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_退回记录_基本件_查询数据'
+    }
+  })
+}
+export function PartCallbackInformation1() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_退回记录_标准件和外购件_查询数据'
+    }
+  })
+}
+export function submit(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_退回记录_确认数据',
+      param: '基本件流水号=' + num
+    }
+  })
+}
+export function submit1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_退回记录_确认数据',
+      param: '标准件和外购件流水号=' + num
+    }
+  })
+}
+export function Delete(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_退回记录_删除数据',
+      param: '基本件流水号=' + num
+    }
+  })
+}
+export function Delete1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_退回记录_删除数据',
+      param: '标准件和外购件流水号=' + num
+    }
+  })
+}
diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js
index 73f70ed3..dfc15e3d 100644
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -8,7 +8,7 @@ export function initCraftmen() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=9'
+      param: '考核部门编号=17'
     }
   })
 }
@@ -209,8 +209,8 @@ export function gongyiCopy(num1, num2) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号',
-      param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int'
+      name: '车间采购管理工艺_零件工序_工艺拷贝_工艺流水号',
+      param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int'
     }
   })
 }
@@ -233,8 +233,8 @@ export function hardEdit(num, hard) {
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_零件工序_修改数据_工艺难度等级',
-      param: '工序流水号=' + num + '=int&工艺难度等级=' + hard
+      name: '车间采购管理工艺_零件工序_修改数据_工艺难度等级',
+      param: '外购件工序流水号=' + num + '=int&工艺难度等级=' + hard
     }
   })
 }
@@ -329,8 +329,8 @@ export function selectRequest(num0, num1, num2, num3, request0) {
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
-      param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
+      name: '车间采购管理工艺_零件工序_修改数据_根据外购件工序流水号和工艺流水号',
+      param: '外购件工序流水号=' + num0 + '&工艺流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js b/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js
new file mode 100644
index 00000000..ab5ae7ec
--- /dev/null
+++ b/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js
@@ -0,0 +1,277 @@
+import request from '@/utils/request'
+
+// 初始化 工艺员A
+export function initCraftmen() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=17'
+    }
+  })
+}
+// 查询 项目
+export function getProject(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工艺计划_项目查询',
+      param: '是否制定计划=' + num
+    }
+  })
+}
+// 查询 机床
+export function getMachine(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工艺计划_机床查询',
+      param: '项目流水号=' + num1 + '&是否制定计划=' + num
+    }
+  })
+}
+// 查询 组号
+export function getGroup(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工艺计划_组号查询',
+      param: '机床流水号=' + num1 + '&是否制定计划=' + num
+    }
+  })
+}
+// 查询 零件号
+export function getPartnames1(num, num1, num2, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工艺计划_零件查询',
+      param: '组件流水号=' + num1 + '&是否制定计划=' + num + '&组件类别=' + num2,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询 零件工序
+export function getProcedure(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工序_查询工序信息',
+      param: '工艺流水号=' + num
+    }
+  })
+}
+// 初始化工艺名称
+export function processNameClick() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_工艺分类名称_查询数据'
+    }
+  })
+}
+// 工艺名称查询
+export function processNameSelect(val) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_工艺名称_查询数据',
+      param: '工艺分类流水号_check=1=bit&工艺分类流水号=' + val + '=int'
+    }
+  })
+}
+// 工艺要求查询
+export function processRequestSelect(val) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理_基础表_工艺要求_查询数据',
+      param: '工艺编号=' + val + '=int'
+    }
+  })
+}
+// 初始化公差A
+export function initTolerance() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_公差对照表_查询数据'
+    }
+  })
+}
+// 公差查询
+export function searchTolerance(val1, val2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_基础表_公差对照表_公差_查询数据',
+      param: '输入数值=' + val1 + '&参数=' + val2
+    }
+  })
+}
+// 工艺定额人员查询
+export function initPerson() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=17'
+    }
+  })
+}
+// 完艺工艺拷贝
+export function gongyiCopy(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工序_工艺拷贝_工艺流水号',
+      param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int'
+    }
+  })
+}
+// 主界面主表难度等级修改
+export function hardEdit(num, hard) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_工艺难度等级',
+      param: '外购件工序流水号=' + num + '=int&工艺难度等级=' + hard
+    }
+  })
+}
+// 主界面主表工艺要求修改
+export function requestEdit(num, request0) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_工艺要求_根据外购件工序流水号',
+      param: '外购件工序流水号=' + num + '=int&工艺要求=' + request0
+    }
+  })
+}
+// 主界面主表插入功能
+export function insertOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_工艺流水号和外购件工序流水号',
+      param: '工艺流水号=' + num0 + '&外购件工序流水号=' + num1
+    }
+  })
+}
+// 主界面主表删除功能
+export function deleteOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_删除数据_外购件工序流水号',
+      param: '工艺流水号=' + num0 + '&外购件工序流水号=' + num1
+    }
+  })
+}
+// 主界面主表上移功能
+export function upOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_上移工序',
+      param: '工艺流水号=' + num0 + '&外购件工序流水号=' + num1
+    }
+  })
+}
+// 主界面主表下移功能
+export function downOne(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_下移工序',
+      param: '工艺流水号=' + num0 + '&外购件工序流水号=' + num1
+    }
+  })
+}
+// 核准保存
+export function saveApprove(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_增加数据_同时修改工艺计划',
+      param: '工艺流水号=' + num0 + '&工艺人员编号=' + num1
+    }
+  })
+}
+// 选择工艺要求
+export function selectRequest(num0, num1, num2, num3, request0) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改数据_根据外购件工序流水号和工艺流水号',
+      param: '外购件工序流水号=' + num0 + '&工艺流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
+    }
+  })
+}
+// 删除
+export function deleteTable(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_删除零件工艺',
+      param: '工艺流水号=' + num
+    }
+  })
+}
+// 零件工艺修改
+export function returnEdit(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_工艺调整_修改工艺',
+      param: '工艺流水号=' + num
+    }
+  })
+}
diff --git a/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js b/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js
new file mode 100644
index 00000000..a4527017
--- /dev/null
+++ b/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js
@@ -0,0 +1,111 @@
+import request from '@/utils/request'
+
+// 人员111
+export function getPerson() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=17'
+    }
+  })
+}
+// 查询 项目
+export function getProject(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件定额计划_项目查询',
+      param: '是否制定定额=' + num
+    }
+  })
+}
+// 查询 机床
+export function getMachine(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件定额计划_机床查询',
+      param: '项目流水号=' + num1 + '&是否制定定额=' + num
+    }
+  })
+}
+// 查询 组号
+export function getGroup(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件定额计划_组号查询',
+      param: '机床流水号=' + num1 + '&是否制定定额=' + num
+    }
+  })
+}
+// 查询 零件号
+export function getPartnames1(num, num1, num2, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件定额计划_零件查询',
+      param: '组件流水号=' + num1 + '&是否制定定额=' + num + '&组件类别=' + num2,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询 零件工序
+export function getProcedure(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理工艺_零件工序_查询工序信息',
+      param: '工艺流水号=' + num
+    }
+  })
+}
+// 定额状态修改
+export function returnEdit(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_工艺调整_修改定额',
+      param: '工艺流水号=' + num
+    }
+  })
+}
+// 零件定额修改
+export function update(num, num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件定额计划_修改定额',
+      param: '外购件工序流水号=' + num + '&单件定额工时=' + num1 + '&准结定额工时=' + num2
+    }
+  })
+}
+// 保存
+export function saveApprove(num0, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理工艺_零件工序_修改定额计划',
+      param: '工艺流水号=' + num0 + '&定额人员编号=' + num1
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index fff04203..edeb0472 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -27,6 +27,12 @@
             :value="item.value"/>
         </el-select>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
+        <el-badge :value="value1" :max="99" class="item">
+          <el-button size="small" type="text" @click="PartCallbackInformation1">外购件和标准件打回信息</el-button>
+        </el-badge>
+        <el-badge :value="value" :max="99" class="item">
+          <el-button size="small" type="text" @click="PartCallbackInformation">基本件打回信息</el-button>
+        </el-badge>
       </el-row>
     </el-card>
     <el-card>
@@ -386,11 +392,147 @@
         <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      :visible.sync="dialogFormVisible1"
+      :row-style="tableRowClassName"
+      title="基本件打回信息"
+      center
+      width="70%"
+      style="min-height: 400px">
+      <el-table
+        :data="tableData9"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="400"
+        highlight-current-row
+        border>
+        <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="70">
+          <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 property="date" label="操作" width="200" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="success"
+              @click="submit(scope.row)">确认</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="Delete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog
+      :visible.sync="dialogFormVisible2"
+      :row-style="tableRowClassName"
+      title="外购件和标准件打回信息"
+      center
+      width="70%"
+      style="min-height: 400px">
+      <el-table
+        :data="tableData10"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="400"
+        highlight-current-row
+        border>
+        <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="70">
+          <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 property="date" label="操作" width="200" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="success"
+              @click="submit1(scope.row)">确认</el-button>
+            <el-button
+              size="mini"
+              type="danger"
+              @click="Delete1(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production } from '@/api/ManufacturingCenter/PartAssignment'
+import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1 } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
 export default {
   inject: ['reload'],
@@ -446,7 +588,13 @@ export default {
       pageSize: '',
       pageCurrent: '',
       total: '',
-      check: ''
+      check: '',
+      value: 0,
+      value1: 0,
+      tableData9: [],
+      tableData10: [],
+      dialogFormVisible1: false,
+      dialogFormVisible2: false
     }
   },
   computed: {
@@ -463,6 +611,125 @@ export default {
   methods: {
     fetchData() {
       this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
+      PartCallbackInformation().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].退回时间 !== '') {
+            response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+          }
+          if (response.data[i].是否确认 === '0') {
+            this.value += 1
+          }
+        }
+        this.tableData9 = response.data
+      })
+      PartCallbackInformation1().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].退回时间 !== '') {
+            response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+          }
+          if (response.data[i].是否确认 === '0') {
+            this.value1 += 1
+          }
+        }
+        this.tableData10 = response.data
+      })
+    },
+    PartCallbackInformation() {
+      this.dialogFormVisible1 = true
+    },
+    PartCallbackInformation1() {
+      this.dialogFormVisible2 = true
+    },
+    submit(row) {
+      submit(row.基本件流水号).then(response => {
+        this.value = 0
+        if (response.data[0].result === '1') {
+          this.$message.success('确认成功')
+          PartCallbackInformation().then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              if (response.data[i].退回时间 !== '') {
+                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+              }
+              if (response.data[i].是否确认 === '0') {
+                this.value += 1
+              }
+            }
+            this.tableData9 = response.data
+          })
+        } else {
+          this.$message.error('确认失败')
+        }
+      })
+    },
+    submit1(row) {
+      submit1(row.标准件和外购件流水号).then(response => {
+        this.value1 = 0
+        if (response.data[0].result === '1') {
+          this.$message.success('确认成功')
+          PartCallbackInformation1().then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              if (response.data[i].退回时间 !== '') {
+                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+              }
+              if (response.data[i].是否确认 === '0') {
+                this.value1 += 1
+              }
+            }
+            this.tableData10 = response.data
+          })
+        } else {
+          this.$message.error('确认失败')
+        }
+      })
+    },
+    Delete(row) {
+      Delete(row.基本件流水号).then(response => {
+        this.value = 0
+        if (response.data[0].result === '1') {
+          this.$message.success('删除成功')
+          PartCallbackInformation().then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              if (response.data[i].退回时间 !== '') {
+                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+              }
+              if (response.data[i].是否确认 === '0') {
+                this.value += 1
+              }
+            }
+            this.tableData9 = response.data
+          })
+        } else {
+          this.$message.error('删除失败')
+        }
+      })
+    },
+    Delete1(row) {
+      Delete1(row.标准件和外购件流水号).then(response => {
+        this.value1 = 0
+        if (response.data[0].result === '1') {
+          this.$message.success('删除成功')
+          PartCallbackInformation1().then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              if (response.data[i].退回时间 !== '') {
+                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+              }
+              if (response.data[i].是否确认 === '0') {
+                this.value1 += 1
+              }
+            }
+            this.tableData10 = response.data
+          })
+        } else {
+          this.$message.error('删除失败')
+        }
+      })
+    },
+    tableRowClassName({ row }) {
+      if (row.是否确认 === '0') {
+        return 'background: #ffff66'
+      } else {
+        return ''
+      }
     },
     projectChange() {
       this.machineNumberValue = ''
@@ -805,14 +1072,6 @@ export default {
                 searchPart(this.groupFloatValue).then(response => {
                   this.tableData1 = response.data
                 })
-                searchDetailed1(this.RequisitionList).then(response => {
-                  for (let i = 0; i < response.data.length; i++) {
-                    if (response.data[i].物料计划到货时间 !== '') {
-                      response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
-                    }
-                  }
-                  this.tableData6 = response.data
-                })
               } else {
                 this.$message.error('请购失败')
               }
@@ -871,8 +1130,13 @@ export default {
               searchPart(this.groupFloatValue).then(response => {
                 this.tableData1 = response.data
               })
-              searchDetailed(this.RequisitionList).then(response => {
-                this.tableData5 = response.data
+              searchDetailed1(this.RequisitionList).then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].物料计划到货时间 !== '') {
+                    response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                  }
+                }
+                this.tableData6 = response.data
               })
             } else { this.$message.error('移出失败') }
           })
@@ -884,6 +1148,11 @@ export default {
                 this.tableData2 = response.data
               })
               searchDetailed(this.RequisitionList).then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].物料计划到货时间 !== '') {
+                    response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                  }
+                }
                 this.tableData5 = response.data
               })
             } else { this.$message.error('移出失败') }
@@ -896,14 +1165,16 @@ export default {
                 this.tableData3 = response.data
               })
               searchDetailed(this.RequisitionList).then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].物料计划到货时间 !== '') {
+                    response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                  }
+                }
                 this.tableData5 = response.data
               })
             } else { this.$message.error('移出失败') }
           })
         }
-        searchDetailed(this.RequisitionList).then(response => {
-          this.tableData5 = response.data
-        })
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -921,4 +1192,9 @@ export default {
   span{
     margin: 10px 0px 10px 10px;
   }
+  .item {
+    float: right;
+    margin-top: 10px;
+    margin-right: 40px;
+  }
 </style>
diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue
index 28c8ee51..df4379eb 100644
--- a/src/views/WorkshopProcurement/OfflineContract1/index.vue
+++ b/src/views/WorkshopProcurement/OfflineContract1/index.vue
@@ -358,6 +358,11 @@ export default {
     searchTable2() { // 查询请购单列表
       this.PurchaseOrder ? this.check3 = 1 : this.check3 = 0
       searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.PurchaseOrder).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          if (response.data.rows[i].请购时间 !== '') {
+            response.data.rows[i].请购时间 = (response.data.rows[i].请购时间).split(' ')[0]
+          }
+        }
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
       })
diff --git a/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue b/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue
index 30830958..839079f7 100644
--- a/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue
@@ -6,20 +6,16 @@
         v-model="radio"
         size="small"
         style="margin: 10px;"
-        @change="CraftmenValue = '';checked = false;
-                 partNumValue = '';typeValue = '';partName = '';
-                 material = '';materialName = '';spec = '';batchNum = '';
-                 searchParts()">
-        <el-radio v-model="radio" :label="1">未编制</el-radio>
-        <el-radio v-model="radio" :label="2">已编制</el-radio>
+        @change="clearDetail">
+        <el-radio v-model="radio" :label="0">未编制</el-radio>
+        <el-radio v-model="radio" :label="1">已编制</el-radio>
       </el-radio-group>
       <span>工艺员:</span>
       <el-select
         v-model="CraftmenValue"
         placeholder="工艺员"
         size="small"
-        style="width:100px"
-        @change="clearDetail();searchParts()">
+        style="width:100px">
         <el-option
           v-for="item in Craftmen"
           :key="item.value"
@@ -28,60 +24,64 @@
       </el-select>
       <span>项目名称:</span>
       <el-select
-        v-model="partsTypeValue"
+        v-model="projectNameValue"
         placeholder="项目名称"
         size="small"
         style="width:100px"
-        @change="clearDetail();searchParts()">
+        clearable
+        @change="searchMachine()">
         <el-option
-          v-for="item in partsType"
+          v-for="item in projectName"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
       <span>机床编号:</span>
       <el-select
-        v-model="partsTypeValue"
+        v-model="machineValue"
         placeholder="机床编号"
         size="small"
         style="width:100px"
-        @change="clearDetail();searchParts()">
+        clearable
+        @change="searchGroup()">
         <el-option
-          v-for="item in partsType"
+          v-for="item in Machine"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
       <span>组号:</span>
       <el-select
-        v-model="partsTypeValue"
+        v-model="groupNumberValue"
         placeholder="组号"
         size="small"
         style="width:100px"
-        @change="clearDetail();searchParts()">
+        clearable
+        @change="changeGroup()">
         <el-option
-          v-for="item in partsType"
+          v-for="item in groupNumber"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>零件图号/物料名称:</span>
+      <span>图号/名称:</span>
       <el-input
-        v-model="partNumValue"
+        v-model="partNum"
         clearable
-        style="width:100px"
-        placeholder="零件图号"
+        style="width:120px"
+        placeholder="请双击选择"
         size="small"
+        @change="clear()"
         @dblclick.native="searchParts"/>
       <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询
       </el-button>
-      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
+      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">工艺调整
       </el-button>
-      <div v-show="isShow">
+      <div>
         <span>种类:</span>
         <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
-        <span>零件名称:</span>
-        <el-input v-model="partName" placeholder="零件名称" size="small" readonly style="width:115px"/>
+        <span>名称/型号:</span>
+        <el-input v-model="partName" placeholder="名称" size="small" readonly style="width:115px"/>
         <span>材质:</span>
         <el-input v-model="materialName" placeholder="材质" size="small" style="width:120px" readonly/>
         <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
@@ -107,10 +107,7 @@
         <span>公差:</span>
         <el-input v-model="tolerance" size="small" style="width:150px" placeholder="公差"/>
         <el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
-        <el-button-group v-if="isShow1" style="margin: 10px">
-          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
-          </el-button>
-          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴</el-button>
+        <el-button-group style="margin: 10px">
           <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺
           </el-button>
           <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
@@ -159,7 +156,6 @@
               :disabled="disabled"
               size="mini"
               type="textarea"
-              @dblclick.native="tableSearch(scope.$index)"
               @change="requestEdit(scope.row)"/>
           </template>
         </el-table-column>
@@ -196,44 +192,6 @@
       </el-table>
     </el-card>
 
-    <el-dialog :visible.sync="dialogMaterial" title="材质选择" center width="400px">
-      <el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
-      <el-button
-        type="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin: 0 0 10px 10px"
-        @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询
-      </el-button>
-      <el-table
-        :data="tableMaterial"
-        size="mini"
-        highlight-current-row
-        border
-        @row-click="selectMaterial">
-        <el-table-column align="center" label="材质名称">
-          <template slot-scope="scope">
-            {{ scope.row.材料 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="1"
-          :page-sizes="[10, 20]"
-          :page-size="10"
-          :pager-count="5"
-          :total="total"
-          small
-          layout="sizes, prev, pager, next"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" @click="selectMaterial2()">提交</el-button>
-      </div>
-    </el-dialog>
-
     <el-dialog :visible.sync="dialogFormVisible2" title="工艺名称、工艺要求选择" center width="400px">
       <el-form ref="form2" :model="form2" label-position="left" label-width="125px" class="demo-ruleForm">
         <el-form-item label="工艺名称分类">
@@ -269,133 +227,56 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogFormVisible" title="典型工艺选择" center width="800px">
-      <el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="典型工艺零件分类">
-              <el-select
-                v-model="typicalClassValue"
-                placeholder="分类"
-                size="small"
-                style="width:150px"
-                @change="classChange()">
-                <el-option
-                  v-for="item in typicalClass"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="零件名称">
-              <el-select
-                id="name"
-                v-model="partNameValue1"
-                placeholder="零件名称"
-                size="small"
-                style="width:150px"
-                @change="nameChange()">
-                <el-option
-                  v-for="item in partName1"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-button type="success" size="small" icon="el-icon-search" @click="searchProcess()">查询</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="典型工艺号">
-              <el-select
-                id="num"
-                v-model="processNumValue"
-                placeholder="工艺号"
-                style="width:150px"
-                size="small"
-                @change="numChange()">
-                <el-option
-                  v-for="item in partName1"
-                  :key="item.value"
-                  :label="item.num"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="备注">
-              <el-input v-model="remark" size="small" readonly style="width: 150px;"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-button size="small" @click="processCopy()">工艺拷贝</el-button>
-          </el-col>
-        </el-row>
-        <el-table
-          :data="tableData2"
-          style="width: 97%;max-height: 300px;margin-top:15px"
-          height="300px"
-          border
-          size="mini">
-          <el-table-column align="center" label="工艺序号" width="80">
-            <template slot-scope="scope">
-              {{ scope.row.工艺序号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="工艺名称" width="180">
-            <template slot-scope="scope">
-              {{ scope.row.工艺名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="工艺要求">
-            <template slot-scope="scope">
-              {{ scope.row.工艺要求 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="难度等级" width="80">
-            <template slot-scope="scope">
-              {{ scope.row.工艺难度等级 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-    </el-dialog>
-
     <el-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="140px" class="demo-ruleForm">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="工艺员">
-              <el-input v-model="CraftmanValue" clearable size="small" readonly style="width: 150px;">
-                <el-button slot="append" icon="el-icon-search" @click="dialogFormVisible3=true"/>
-              </el-input>
+            <el-form-item label="项目名称">
+              <el-select
+                v-model="projectNameValue1"
+                placeholder="项目名称"
+                size="small"
+                style="width:150px"
+                @change="searchMachine1()">
+                <el-option
+                  v-for="item in projectName1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="项目名称">
-              <el-input v-model="PN" size="small" placeholder="项目名称" style="width: 150px" @change="inputChange"/>
+            <el-form-item label="机床名称">
+              <el-select
+                v-model="machineValue1"
+                placeholder="机床编号"
+                size="small"
+                style="width:150px"
+                @change="searchGroup1()">
+                <el-option
+                  v-for="item in Machine1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-button size="small" type="success" icon="el-icon-search" @click="searchProcess1()">查询</el-button>
+            <el-button size="small" type="success" icon="el-icon-search" @click="searchDetail1()">查询</el-button>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="机床名称">
+            <el-form-item label="组号">
               <el-select
-                v-model="tuhaoValue"
-                placeholder="零件图号"
+                v-model="groupNumberValue1"
+                placeholder="组号"
                 size="small"
                 style="width:150px"
-                @change="numChange1()">
+                @change="changeGroup1()">
                 <el-option
-                  v-for="item in tuhao"
+                  v-for="item in groupNumber1"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
@@ -403,35 +284,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="组号">
-              <el-select
-                v-model="tuhaoValue"
-                placeholder="零件图号"
-                size="small"
+            <el-form-item label="图号/名称">
+              <el-input
+                v-model="partNum1"
+                clearable
                 style="width:150px"
-                @change="numChange1()">
-                <el-option
-                  v-for="item in tuhao"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
+                placeholder="请双击选择"
+                size="small"
+                @dblclick.native="searchParts1"/>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
           </el-col>
-          <el-col>
-            <el-form-item label="零件图号/物料名称">
-              <el-input
-                v-model="partNumValue"
-                clearable
-                style="width:150px"
-                placeholder="零件图号/物料名称"
-                size="small"
-                @dblclick.native="searchParts"/>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-table
           :data="tableData4"
@@ -469,44 +334,188 @@
     </el-dialog>
 
     <el-dialog
-      :visible.sync="dialogFormVisible3"
-      title="工艺定额人员"
+      :visible.sync="dialogFormVisible4"
+      title="图号"
       center
       style="min-height: 300px">
       <el-table
-        :data="tableData3"
+        :data="tableData8"
         size="mini"
         style="width: 97%;max-height: 300px"
         height="300"
         highlight-current-row
         border
-        @row-click="selectPerson">
-        <el-table-column align="center" label="考勤编号" width="150">
+        @row-click="selectParts">
+        <el-table-column align="center" label="物料名称">
           <template slot-scope="scope">
-            {{ scope.row.考勤编号 }}
+            {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="姓名">
+        <el-table-column align="center" label="物料规格">
           <template slot-scope="scope">
-            {{ scope.row.姓名 }}
+            {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="性别" width="150">
+        <el-table-column align="center" label="物料型号">
           <template slot-scope="scope">
-            {{ scope.row.性别 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="工作岗位" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.岗位名称 }}
+            {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
       </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="1"
+          :page-sizes="[10, 20]"
+          :page-size="10"
+          :pager-count="5"
+          :total="total"
+          small
+          layout="sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="tijiao()">提交</el-button>
+        <el-button type="primary" @click="submit()">确认</el-button>
       </div>
     </el-dialog>
 
+    <el-dialog
+      :visible.sync="dialogFormVisible5"
+      title="图号"
+      center
+      style="min-height: 300px">
+      <el-table
+        :data="tableData9"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="300"
+        highlight-current-row
+        border
+        @row-click="selectParts1">
+        <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 class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="1"
+          :page-sizes="[10, 20]"
+          :page-size="10"
+          :pager-count="5"
+          :total="total"
+          small
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit()">确认</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="dialogFormVisible6"
+      title="图号"
+      center
+      style="min-height: 300px">
+      <el-table
+        :data="tableData10"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="300"
+        highlight-current-row
+        border
+        @row-click="selectParts2">
+        <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 class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page1="1"
+          :page-sizes="[10, 20]"
+          :page-size1="10"
+          :pager-count1="5"
+          :total="total1"
+          small
+          layout="sizes, prev, pager, next"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit1()">确认</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="dialogFormVisible7"
+      title="图号"
+      center
+      style="min-height: 300px">
+      <el-table
+        :data="tableData11"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="300"
+        highlight-current-row
+        border
+        @row-click="selectParts3">
+        <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 class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page1="1"
+          :page-sizes="[10, 20]"
+          :page-size1="10"
+          :pager-count1="5"
+          :total="total1"
+          small
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit1()">确认</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -514,20 +523,13 @@
 import '@/icon/iconfont.css'
 import {
   initCraftmen,
+  getProject,
+  getMachine,
+  getGroup,
   getPartnames1,
-  getPartnames2,
-  detailInfo,
-  mainTable,
-  getMaterial,
-  searchMaterial,
-  typicalProcess,
+  getProcedure,
   initTolerance,
-  FcK,
-  searchProcess,
-  searchWYgongyi,
   gongyiCopy,
-  initPerson,
-  gongyiYQ,
   hardEdit,
   requestEdit,
   processNameClick,
@@ -538,14 +540,11 @@ import {
   deleteOne,
   upOne,
   downOne,
-  saveMaterial,
   saveApprove,
   selectRequest,
-  pasteTable,
   deleteTable,
-  returnEdit,
-  searchRecord
-} from '@/api/ManufacturingCenter/ProcessPlanning'
+  returnEdit
+} from '@/api/WorkshopProcurement/OutsourcingProcessPlanning'
 import elInput from 'element-ui/packages/input'
 
 export default {
@@ -554,58 +553,65 @@ export default {
   },
   data() {
     return {
+      projectNameValue: '',
+      projectName: [],
+      machineValue: '',
+      Machine: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      groupNum: '',
+      groupType: '',
+      projectNameValue1: '',
+      projectName1: [],
+      machineValue1: '',
+      Machine1: [],
+      groupNumberValue1: '',
+      groupNumber1: [],
+      groupNum1: '',
+      groupType1: '',
+      tableData8: [],
+      tableData9: [],
+      tableData10: [],
+      tableData11: [],
+      ProcessFlowNumber: '',
+      ProcessFlowNumber1: '',
       partsTypeValue: '',
       partsType: [],
       total: 0,
       pageCurrent: 1,
       pageSize: 10,
+      total1: 0,
+      pageCurrent1: 1,
+      pageSize1: 10,
       input: '', // 材质对话框查询1
       tableMaterial: [],
       dialogMaterial: false,
       loading0: false,
-      radio: 1, // 第一组
-      partNumValue: '', // 零件号值
-      partNum: [], // 零件号
+      radio: 0, // 第一组
+      partNum: '', // 零件号
+      partNum1: '', // 零件号
       typeValue: '', // 种类
       CraftmenValue: '', // 工艺员值
       Craftmen: [], // 工艺员
-      CraftmanValue: '', // 完艺表单工艺员值
-      CraftmanValue2: '', // 完艺表单工艺员值中间变量
-      Craftman: [], // 完艺表单工艺员
       partName: '', // 零件名称
+      partNumValue: '',
       batchNum: '', // 投产总数量
-      material: '', // 材质流水号
       materialName: '', // 材质名称
-      materialClass: [], // 材质类
-      typicalClassValue: '', // 典型工艺零件分类值
-      typicalClass: [], // 典型工艺零件分类
-      partNameValue1: '', // 典型工艺零件名称值
-      partName1: [], // 典型工艺零件名称
-      partNameValue1check: false, // 典型工艺零件名称check
-      processNumValue: '', // 典型工艺号值
-      processNum: [], // 典型工艺号
-      processNumValuecheck: false, // 典型工艺号check
       remark: '', // 备注
       remark1: '', // 完艺零件名称
-      dialogFormVisible: false, // 典艺对话框可见性
       dialogFormVisible1: false, // 完艺对话框可见性
       dialogFormVisible2: false, // 主界面查询工艺名称要求对话框可见性
-      dialogFormVisible3: false, // 完艺对话框中选择工艺员可见性
-      form: null, // 典艺表单
+      dialogFormVisible4: false, // 图号外购件和标准件
+      dialogFormVisible5: false, // 图号基本件
+      dialogFormVisible6: false, // 图号外购件和标准件(完艺)
+      dialogFormVisible7: false, // 图号基本件（完艺）
       form1: null, // 完艺表单
-      form2: null, // 主界面查询表单
-      serialNum1: [], // 典型工艺名称分类流水号
-      serialNumValue1: '1', // 典型工艺名称分类流水号值,初值1否则置空时无参数
-      serialNumValue1check: false, // 典型工艺名称分类流水号check
-      serialNum2: [], // 典型工艺流水号
-      serialNumValue2: '1', // 典型工艺流水号值，初值1否则置空时无参数
+      form2: null,
       numVal: '', // 输入数值
       selPara: [], // 选择参数数组
       selParaValue: '', // 选择参数值
       tolerance: '', // 公差
       tableData: [], // 主表
-      tableData2: [], // 典艺内的表格
-      tableData3: [], // 工艺定额人员
       tableData4: [], // 完艺表格
       processSelect: [], // 工艺分类流水号
       processNameClass: [], // 工艺名称分类
@@ -620,49 +626,80 @@ export default {
       checked: false, // 是否核准
       checked1: false, // 修改
       spec: '', // 规格
-      isShow: true, // '编辑模式'可见性
-      isShow1: true, // “复制并保存”“粘贴”按钮的可见性
       isShow2: false, // 修改的可见性
-      date01: '', // 完艺开始时间
-      date02: '', // 完艺结束时间
-      PN: '', // 零件号
-      num: '', // 工艺计划流水号
-      perNum: '',
-      perNum2: '',
-      tuhao: [],
-      tuhaoValue: '',
-      check1: 0,
-      check2: 0,
-      check3: 0,
-      check4: 0,
       hard: [{ value: 'A' }, { value: 'B' }, { value: 'C' }],
-      disabled: false,
-      result: 0,
-      oldNum: '',
-      newNum: '',
-      tableRecord: [],
-      materialName2: '',
-      material2: ''
+      disabled: false
     }
   },
   created() {
     this.fetchData()
     this.initPerson()
-    this.getList()
   },
   methods: {
-    clearDetail() {
-      this.checked = false
-      this.partNumValue = ''
+    fetchData() {
+      initCraftmen().then(response => { // 初始化工艺员
+        for (let i = 0; i < response.data.length; i++) {
+          this.Craftmen.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      getProject(0).then(response => { // 初始化项目
+        for (let i = 0; i < response.data.length; i++) {
+          this.projectName.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
+        }
+      })
+      initTolerance().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.selPara.push({
+            value: response.data[i].参数
+          })
+        }
+      })
+    },
+    clear() {
       this.typeValue = ''
       this.partName = ''
-      this.material = ''
+      this.partNum = ''
       this.materialName = ''
       this.spec = ''
       this.batchNum = ''
     },
-    returnEdit() { // 在制零件工艺修改
-      if (this.partNumValue === '' || this.partNumValue === null) {
+    clearDetail() {
+      if (this.radio === 1) {
+        this.isShow2 = true
+      } else {
+        this.isShow2 = false
+      }
+      this.checked = false
+      this.projectNameValue = ''
+      this.projectName = []
+      getProject(this.radio).then(response => { // 初始化项目
+        for (let i = 0; i < response.data.length; i++) {
+          this.projectName.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
+        }
+      })
+      this.machineValue = ''
+      this.Machine = []
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      this.partNum = ''
+      this.typeValue = ''
+      this.partName = ''
+      this.materialName = ''
+      this.spec = ''
+      this.batchNum = ''
+      this.tableData = []
+    },
+    returnEdit() { // 工艺修改
+      if (this.partNum === '' || this.partNum === null) {
         this.$message.error('请选择零件')
       } else {
         this.$confirm('此操作会将该零件打回至未编制状态, 是否继续?', '提示', {
@@ -670,10 +707,11 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          returnEdit(this.partNumValue).then(response => {
+          returnEdit(this.ProcessFlowNumber).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('打回成功')
-              this.partNumValue = ''
+              this.ProcessFlowNumber = ''
+              this.partNum = ''
               this.tableData = []
             } else {
               this.$message.error('打回失败')
@@ -687,149 +725,239 @@ export default {
         })
       }
     },
-    handleCurrentChange(val) { // 材质分页
-      this.pageCurrent = val
-      if (this.input === '' || this.input === null) {
-        this.getList()
-      } else {
-        this.searchMaterial()
+    searchMachine() {
+      this.clear()
+      this.machineValue = ''
+      this.Machine = []
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      getMachine(this.radio, this.projectNameValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
+    searchGroup() {
+      this.clear()
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      getGroup(this.radio, this.machineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    changeGroup() {
+      this.clear()
+      for (let i = 0; i < this.groupNumber.length; i++) {
+        if (this.groupNumber[i].value === this.groupNumberValue) {
+          this.groupNum = this.groupNumber[i].label
+        }
       }
-    },
-    handleSizeChange(val) { // 材质分页
-      this.pageCurrent = 1
-      this.pageSize = val
-      if (this.input === '' || this.input === null) {
-        this.getList()
+      if (this.groupNum.indexOf('MX') !== -1) {
+        this.groupType = 0
       } else {
-        this.searchMaterial()
+        this.groupType = 1
       }
     },
-    selectMaterial(row) { // 选择材质
-      this.materialName2 = ''
-      this.material2 = ''
-      this.materialName2 = row.材料
-      this.material2 = row.材料流水号
-    },
-    selectMaterial2() {
-      this.materialName = ''
-      this.material = ''
-      this.materialName = this.materialName2
-      this.material = this.material2
-      this.dialogMaterial = false
-    },
-    fetchData() {
-      this.materialClass = []
-      getMaterial().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.materialClass.push({
-            label: response.data[i].材料,
-            value: response.data[i].材料流水号
-          })
-        }
-      })
-      initCraftmen().then(response => { // 初始化工艺员
-        for (let i = 0; i < response.data.length; i++) {
-          this.Craftmen.push({
-            label: response.data[i].姓名,
-            value: response.data[i].人员编号
-          })
-        }
-      })
-      typicalProcess().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.typicalClass.push({
-            value: response.data[i].典型工艺名称分类
-          })
-          this.serialNum1.push({
-            value: response.data[i].典型工艺名称分类流水号
-          })
-        }
-      })
-      initTolerance().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.selPara.push({
-            value: response.data[i].参数
-          })
-        }
-      })
-    },
-    initPerson() { // 初始化工艺员
-      initPerson().then(response => {
-        this.tableData3 = response.data
-      })
-    },
-    getList() { // 往材质对话框中放
-      this.tableMaterial = []
-      getMaterial(this.pageCurrent, this.pageSize).then(response => {
-        this.total = response.data.total
-        this.tableMaterial = response.data.rows
-      })
-    },
-    searchMaterial() { // 材质查询
-      searchMaterial(this.pageCurrent, this.pageSize, this.input).then(response => {
-        this.total = response.data.total
-        this.tableMaterial = response.data.rows
-      })
-    },
     searchParts() { // 根据条件查零件号
-      this.tableData = []
-      this.partNum = []
-      if (this.radio === 1) { // 未编制
-        this.disabled = false
-        this.isShow1 = true
-        this.isShow2 = false
-        this.checked1 = true
-        getPartnames1(this.CraftmenValue, this.partNumValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.partNum.push({
-              label: response.data[i].零件图号,
-              value: response.data[i].工艺计划流水号
-            })
+      if (this.groupNumberValue !== '') {
+        if (this.radio === 0) { // 未编制
+          this.disabled = false
+          this.isShow2 = false
+          this.checked1 = true
+        } else { // 已编制
+          this.isShow = true
+          this.isShow2 = true
+          this.disabled = true
+          this.checked1 = false
+        }
+        this.pageCurrent = 1
+        this.pageSize = 10
+        getPartnames1(this.radio, this.groupNumberValue, this.groupType, this.pageCurrent, this.pageSize).then(response => {
+          if (this.groupType === 0) {
+            this.dialogFormVisible5 = true
+            this.tableData9 = response.data.rows
+            console.log(response.data)
+            this.total = response.data.total
+          } else {
+            this.dialogFormVisible4 = true
+            this.tableData8 = response.data.rows
+            this.total = response.data.total
           }
         })
-      } else { // 已编制
-        this.isShow = true
-        this.isShow1 = false
-        this.isShow2 = true
-        this.disabled = true
-        this.checked1 = false
-        getPartnames2(this.CraftmenValue, this.partNumValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.partNum.push({
-              label: response.data[i].零件图号,
-              value: response.data[i].工艺计划流水号
-            })
-          }
-        })
-      }
-    },
-    switchEdit() { // 切换编辑模式
-      if (this.radio === 1) {
-        this.isShow = !this.isShow
       } else {
-        this.isShow = true
+        this.$message.warning('请先选择组号')
       }
     },
-    searchDetail() { // 查主表和上面显示的信息
-      if (this.partNumValue === '' || this.partNumValue === null) {
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.pageCurrent = 1
+      getPartnames1(this.radio, this.groupNumberValue, this.groupType, this.pageCurrent, this.pageSize).then(response => {
+        if (this.groupType === 0) {
+          this.dialogFormVisible5 = true
+          this.tableData9 = response.data.rows
+          this.total = response.data.total
+        } else {
+          this.dialogFormVisible4 = true
+          this.tableData8 = response.data.rows
+          this.total = response.data.total
+        }
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      getPartnames1(this.radio, this.groupNumberValue, this.groupType, this.pageCurrent, this.pageSize).then(response => {
+        if (this.groupType === 0) {
+          this.dialogFormVisible5 = true
+          this.tableData9 = response.data.rows
+          this.total = response.data.total
+        } else {
+          this.dialogFormVisible4 = true
+          this.tableData8 = response.data.rows
+          this.total = response.data.total
+        }
+      })
+    },
+    searchMachine1() {
+      this.machineValue1 = ''
+      this.Machine1 = []
+      this.groupNumberValue1 = ''
+      this.groupNumber1 = []
+      getMachine(1, this.projectNameValue1).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machine1.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
+    searchGroup1() {
+      this.groupNumberValue1 = ''
+      this.groupNumber1 = []
+      getGroup(1, this.machineValue1).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber1.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    changeGroup1() {
+      for (let i = 0; i < this.groupNumber1.length; i++) {
+        if (this.groupNumber1[i].value === this.groupNumberValue1) {
+          this.groupNum1 = this.groupNumber1[i].label
+        }
+      }
+      if (this.groupNum1.indexOf('MX') !== -1) {
+        this.groupType1 = 0
+      } else {
+        this.groupType1 = 1
+      }
+    },
+    searchParts1() { // 根据条件查零件号
+      if (this.groupNumberValue1 !== '') {
+        this.pageCurrent1 = 1
+        this.pageSize1 = 10
+        getPartnames1(1, this.groupNumberValue1, this.groupType1, this.pageCurrent1, this.pageSize1).then(response => {
+          if (this.groupType1 === 0) {
+            this.dialogFormVisible7 = true
+            this.tableData11 = response.data.rows
+            console.log(response.data)
+            this.total1 = response.data.total
+          } else {
+            this.dialogFormVisible6 = true
+            this.tableData10 = response.data.rows
+            this.total1 = response.data.total
+          }
+        })
+      } else {
+        this.$message.warning('请先选择组号')
+      }
+    },
+    handleSizeChange1(val) {
+      this.pageSize1 = val
+      this.pageCurrent1 = 1
+      getPartnames1(1, this.groupNumberValue1, this.groupType1, this.pageCurrent1, this.pageSize1).then(response => {
+        if (this.groupType1 === 0) {
+          this.dialogFormVisible7 = true
+          this.tableData11 = response.data.rows
+          console.log(response.data)
+          this.total1 = response.data.total
+        } else {
+          this.dialogFormVisible6 = true
+          this.tableData10 = response.data.rows
+          this.total1 = response.data.total
+        }
+      })
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      getPartnames1(1, this.groupNumberValue1, this.groupType1, this.pageCurrent1, this.pageSize1).then(response => {
+        if (this.groupType1 === 0) {
+          this.dialogFormVisible7 = true
+          this.tableData11 = response.data.rows
+          console.log(response.data)
+          this.total1 = response.data.total
+        } else {
+          this.dialogFormVisible6 = true
+          this.tableData10 = response.data.rows
+          this.total1 = response.data.total
+        }
+      })
+    },
+    selectParts(row) {
+      this.ProcessFlowNumber = row.工艺流水号
+      if (row.零件类型 === '1') {
+        this.typeValue = '标准件'
+      } else if (row.零件类型 === '2') {
+        this.typeValue = '外购件'
+      }
+      this.partName = row.物料型号
+      this.spec = row.物料规格
+      this.batchNum = row.批次数量
+      this.partNum = row.物料名称
+    },
+    selectParts1(row) {
+      this.ProcessFlowNumber = row.工艺流水号
+      if (row.零件类型 === '3') {
+        this.typeValue = '基本件'
+      }
+      this.partName = row.物料名称
+      this.materialName = row.材料
+      this.batchNum = row.批次数量
+      this.partNum = row.零件图号
+    },
+    selectParts2(row) {
+      this.ProcessFlowNumber1 = row.工艺流水号
+      this.partNum1 = row.物料名称
+    },
+    selectParts3(row) {
+      this.ProcessFlowNumber1 = row.工艺流水号
+      this.partNum1 = row.零件图号
+    },
+    submit() {
+      this.dialogFormVisible4 = false
+      this.dialogFormVisible5 = false
+    },
+    submit1() {
+      this.dialogFormVisible6 = false
+      this.dialogFormVisible7 = false
+    },
+    searchDetail() { // 查主表的信息
+      if (this.partNum === '' || this.partNum === null) {
         this.$message.error('请选择零件作为查询对象')
       } else {
         this.loading0 = true
-        detailInfo(this.partNumValue).then(response => {
-          if (response.data.length !== 0) {
-            this.typeValue = response.data[0].零件类型名称
-            this.partName = response.data[0].零件名称
-            this.batchNum = response.data[0].批次数量
-            this.material = response.data[0].材料流水号
-            this.materialName = response.data[0].材料
-            this.spec = response.data[0].原材料规格
-          }
-        })
-        this.tableRecord = []
-        searchRecord(this.partNumValue).then(response => {
-          this.tableRecord = response.data
-        })
-        mainTable(this.partNumValue).then(response => {
+        getProcedure(this.ProcessFlowNumber).then(response => {
           this.tableData = []
           for (let i = 0; i < response.data.length; i++) {
             if (response.data[i].工艺编号 === null) {
@@ -840,181 +968,64 @@ export default {
             }
           }
           this.tableData = response.data
-          this.newNum = this.partNumValue
         }).then(() => {
           this.loading0 = false
         })
       }
     },
-    DYbtn() { // 典艺按钮
-      this.dialogFormVisible = true
-      this.processNumValue = ''
-      this.partNameValue1 = ''
-      this.typicalClassValue = ''
-      this.remark = ''
-      this.serialNumValue1 = '1' // 有默认值
-      this.serialNumValue2 = '1' // 有默认值
-      this.tableData2 = null
+    searchDetail1() { // 查主表的信息
+      if (this.partNum1 === '' || this.partNum1 === null) {
+        this.$message.error('请选择零件作为查询对象')
+      } else {
+        getProcedure(this.ProcessFlowNumber1).then(response => {
+          this.tableData4 = []
+          for (let i = 0; i < response.data.length; i++) {
+            if (response.data[i].工艺编号 === null) {
+              response.data[i].工艺编号 = 0
+            }
+            if (response.data[i].工艺要求 === null) {
+              response.data[i].工艺要求 = ''
+            }
+          }
+          this.tableData4 = response.data
+        })
+      }
     },
     WYbtn() { // 完艺按钮
       this.tableData4 = []
       this.dialogFormVisible1 = true
-    },
-    selectPerson(row) { // 选择工艺员
-      this.CraftmanValue2 = row.姓名
-      this.perNum2 = row.人员编号
-    },
-    tijiao() { // 提交完艺表单中工艺定额人员的选择
-      this.dialogFormVisible3 = false
-      this.CraftmanValue = this.CraftmanValue2
-      this.perNum = this.perNum2
-      this.remark1 = ''
-      this.tuhaoValue = ''
-    },
-    inputChange() { // 零件号改变
-      this.remark1 = ''
-      this.tuhaoValue = ''
-    },
-    classChange() { // 当分类改变时，获取零件名称和典型工艺流水号
-      this.partNameValue1 = ''
-      this.processNumValue = ''
-      for (let i = 0; i < this.typicalClass.length; i++) {
-        if (this.typicalClassValue === this.typicalClass[i].value) {
-          this.serialNumValue1 = this.serialNum1[i].value
-          FcK(this.serialNumValue1).then(response => {
-            this.partName1 = []
-            this.processNum = []
-            this.remark = response.data[0].备注
-            for (let j = 0; j < response.data.length; j++) {
-              this.partName1.push({
-                label: response.data[j].典型工艺名称,
-                num: response.data[j].典型工艺号,
-                value: response.data[j].典型工艺流水号
-              })
-            }
-          })
-        }
-      }
-    },
-    nameChange() { // 当零件名称改变时，典型工艺号改变
-      for (let i = 0; i < this.partName1.length; i++) {
-        if (this.partNameValue1 === this.partName1[i].value) {
-          this.processNumValue = this.partName1[i].num
-          this.serialNumValue2 = this.partNameValue1
-        }
-      }
-    },
-    numChange() { // 当典型工艺号改变时，零件名称改变
-      for (let i = 0; i < this.partName1.length; i++) {
-        if (this.processNumValue === this.partName1[i].value) {
-          this.partNameValue1 = this.partName1[i].value
-          this.serialNumValue2 = this.partNameValue1
-        }
-      }
-    },
-    searchProcess() { // 典艺工艺查询
-      if (this.typicalClassValue === '') {
-        this.serialNumValue1check = false
-      } else {
-        this.serialNumValue1check = true
-      }
-
-      if (this.partNameValue1 === '') {
-        this.partNameValue1check = false
-      } else {
-        this.partNameValue1check = true
-      }
-
-      if (this.processNumValue === '') {
-        this.processNumValuecheck = false
-      } else {
-        this.processNumValuecheck = true
-      }
-      this.tableData2 = []
-      searchProcess(this.serialNumValue1check, this.serialNumValue1, this.partNameValue1check, this.serialNumValue2, this.processNumValuecheck, this.serialNumValue2).then(response => {
-        this.tableData2 = response.data
-      })
-    },
-    processCopy() { // 典艺工艺拷贝
-      if (this.partNumValue === '') {
-        this.$message.error('请在主界面选择一个零件作为被拷贝对象')
-        this.dialogFormVisible = false
-      } else if (this.partNameValue1 === '') {
-        this.$message.error('请选择零件名称')
-      } else {
-        for (let i = 0; i < this.tableData2.length; i++) {
-          this.tableData[i].工艺名称 = this.tableData2[i].工艺名称
-          this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级
-          this.tableData[i].工艺要求 = this.tableData2[i].工艺要求
-          selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工艺序号, this.tableData2[i].工艺要求).then(response => {
-          })
-          hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级).then(response => {
-          })
-          this.dialogFormVisible = false
-        }
-      }
-    },
-    searchProcess1() { // 完艺工艺查询
-      this.tuhao = []
-      if (this.PN === '') { // 零件号
-        this.check1 = 0
-      } else {
-        this.check1 = 1
-      }
-      if (this.perNum === '') { // 工艺员编号
-        this.check2 = 0
-      } else {
-        this.check2 = 1
-      }
-      if (this.remark1 === '') { // 零件名称
-        this.check4 = 0
-      } else {
-        this.check4 = 1
-      }
-      if (this.date01 === '' || this.date02 === '' || this.date01 === null || this.date02 === null) { // 日期
-        this.check3 = 0
-      } else {
-        this.check3 = 1
-      }
-      searchWYgongyi(this.check1, this.PN, this.check2, this.perNum, this.check3, this.date01, this.date02, this.check4, this.remark1).then(response => {
+      this.projectNameValue1 = ''
+      this.projectName1 = []
+      this.machineValue1 = ''
+      this.Machine1 = []
+      this.groupNumberValue1 = ''
+      this.groupNumber1 = []
+      this.partNum1 = ''
+      getProject(1).then(response => { // 初始化项目
         for (let i = 0; i < response.data.length; i++) {
-          this.tuhao.push({
-            value: response.data[i].零件图号,
-            name: response.data[i].零件名称,
-            num: response.data[i].工艺计划流水号
+          this.projectName1.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
           })
         }
       })
     },
     processCopy1() { // 完艺工艺拷贝
       this.dialogFormVisible1 = false
-      if (this.partNumValue === '') {
+      if (this.partNum === '') {
         this.$message.error('请在主界面选择一个零件作为被拷贝对象')
       } else {
-        gongyiCopy(this.num, this.partNumValue).then(() => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺
+        gongyiCopy(this.ProcessFlowNumber1, this.ProcessFlowNumber).then(() => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺
           this.searchDetail()
         })
       }
     },
-    numChange1() { // 当完成工艺号改变时，零件名称改变，并获取工艺要求
-      this.remark1 = ''
-      this.tableData4 = null
-      for (let i = 0; i < this.tuhao.length; i++) {
-        if (this.tuhaoValue === this.tuhao[i].value) {
-          this.remark1 = this.tuhao[i].name
-          this.num = this.tuhao[i].num
-        }
-      }
-      gongyiYQ(this.num).then(response => {
-        this.tableData4 = response.data
-      })
-    },
     hardEdit(row) { // 修改难度等级
-      hardEdit(row.工序流水号, row.工艺难度等级).then(response => {
+      hardEdit(row.外购件工序流水号, row.工艺难度等级).then(response => {
       })
     },
     requestEdit(row) { // 修改工艺要求
-      requestEdit(row.工序流水号, row.工艺要求).then(response => {
+      requestEdit(row.外购件工序流水号, row.工艺要求).then(response => {
       })
     },
     tableSearch(index) { // 主界面工艺名称分类、工艺名称及工艺要求后续查询
@@ -1068,7 +1079,7 @@ export default {
       for (let i = 0; i < this.processName.length; i++) {
         if (this.processNameValue === this.processName[i].value) {
           this.processN1 = this.processName[i].num // 工艺编号
-          processRequestSelect(this.processName[i].num).then(response => { // 查询工艺名称
+          processRequestSelect(this.processName[i].num).then(response => { // 查询工艺要求
             for (let j = 0; j < response.data.length; j++) {
               this.processRequest.push({
                 value: response.data[j].工艺要求
@@ -1084,7 +1095,7 @@ export default {
       this.str = this.str + ' ' + this.processRequestValue
       this.tableData[this.index].工艺要求 = this.str
       this.dialogFormVisible2 = false
-      selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => {
+      selectRequest(this.tableData[this.index].外购件工序流水号, this.tableData[this.index].工艺流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => {
       })
     },
     calTol() { // 计算公差
@@ -1102,45 +1113,38 @@ export default {
         }
       })
     },
-    copyAndSave() { // 复制并保存
-      if (this.tableData.length !== 0) {
-        this.oldNum = this.tableData[0].工艺计划流水号
-        this.saveApprove()
-      } else {
-        this.$message.error('当前没有可以被复制的工艺')
-      }
-    },
     saveApprove() { // 核准保存
       if (this.checked === true) {
-        for (let i = 0; i < 30; i++) {
-          saveApprove(this.tableData[i].工艺计划流水号, this.tableData[i].工艺编号, this.tableData[i].工艺要求, this.spec, this.tableData[i].工序顺序, this.tableData[i].工序间是否外协, this.tableData[i].工序流水号, this.material, '', '', this.CraftmenValue, this.tableData[i].工艺难度等级)
-        }
-        this.checked = false
-        this.partNumValue = ''
-        this.typeValue = ''
-        this.partName = ''
-        this.batchNum = ''
-        this.material = ''
-        this.materialName = ''
-        this.spec = ''
-        this.newNum = ''
-        this.$message.success('保存成功')
-        this.searchParts()
+        saveApprove(this.ProcessFlowNumber, this.CraftmenValue).then(response => {
+          if (response.data.length === 1) {
+            this.checked = false
+            this.partNum = ''
+            this.typeValue = ''
+            this.partName = ''
+            this.batchNum = ''
+            this.materialName = ''
+            this.spec = ''
+            this.tableData = []
+            this.$message.success('保存成功')
+          } else {
+            this.$message.error('保存失败')
+          }
+        })
       } else {
         this.$message.error('请核准后保存')
       }
     },
     insertOne(row) { // 插入行
-      if (this.partNumValue === '') {
+      if (this.partNum === '') {
         this.$message.error('请先选择一个零件')
       } else {
-        insertOne(this.partNumValue, row.工序流水号).then(response => {
+        insertOne(this.ProcessFlowNumber, row.外购件工序流水号).then(response => {
           this.searchDetail()
         })
       }
     },
     deleteOne(row) { // 删除行
-      if (this.partNumValue === '') {
+      if (this.partNum === '') {
         this.$message.error('请先选择一个零件')
       } else {
         this.$confirm('此操作将永久删除该行工艺, 是否继续?', '提示', {
@@ -1148,7 +1152,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          deleteOne(this.partNumValue, row.工序流水号).then(() => {
+          deleteOne(this.ProcessFlowNumber, row.外购件工序流水号).then(() => {
             this.$message.success('删除成功')
             this.searchDetail()
           })
@@ -1161,52 +1165,25 @@ export default {
       }
     },
     upOne(row) { // 上移
-      if (this.partNumValue === '') {
+      if (this.partNum === '') {
         this.$message.error('请先选择一个零件')
       } else {
-        upOne(this.partNumValue, row.工序流水号).then(response => {
+        upOne(this.ProcessFlowNumber, row.外购件工序流水号).then(response => {
           this.searchDetail()
         })
       }
     },
     downOne(row) { // 下移
-      if (this.partNumValue === '') {
+      if (this.partNum === '') {
         this.$message.error('请先选择一个零件')
       } else {
-        downOne(this.partNumValue, row.工序流水号).then(response => {
+        downOne(this.ProcessFlowNumber, row.外购件工序流水号).then(response => {
           this.searchDetail()
         })
       }
     },
-    saveMaterial() { // 保存材质
-      if (this.partNumValue === '' || this.material === '') {
-        this.$message.error('请选择一个零件')
-      } else {
-        saveMaterial(this.partNumValue, this.material).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('保存成功')
-          } else {
-            this.$message.error('保存失败')
-          }
-        })
-      }
-    },
-    pasteTable() { // 粘贴
-      if (this.partNumValue === '' || this.partNumValue === null) {
-        this.$message.error('请选择零件作为被粘贴对象')
-      } else {
-        pasteTable(this.oldNum, this.newNum).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('粘贴成功')
-            this.searchDetail()
-          } else {
-            this.$message.error('粘贴失败')
-          }
-        })
-      }
-    },
     deleteTable() { // 删除
-      if (this.newNum === '') {
+      if (this.partNum === '') {
         this.$message.error('请选择一个零件')
       } else {
         this.$confirm('此操作将永久删除该零件的工艺, 是否继续?', '提示', {
@@ -1214,11 +1191,11 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          for (let i = 0; i < 30; i++) {
-            hardEdit(this.tableData[i].工序流水号, '').then(response => {
+          for (let i = 0; i < 20; i++) {
+            hardEdit(this.tableData[i].外购件工序流水号, '').then(response => {
             })
           }
-          deleteTable(this.newNum).then(response => {
+          deleteTable(this.ProcessFlowNumber).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('删除成功')
               this.searchDetail()
diff --git a/src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue b/src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue
new file mode 100644
index 00000000..81dd2ed8
--- /dev/null
+++ b/src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue
@@ -0,0 +1,506 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div style="margin-top: -10px;">
+        <el-radio-group v-model="radio" style="margin: 10px;" @change="clearDetail">
+          <el-radio :label="0">未编制</el-radio>
+          <el-radio :label="1">已编制</el-radio>
+        </el-radio-group>
+        <span style="margin: 10px">定额员:</span>
+        <el-select v-model="personValue" size="small" style="width: 100px" placeholder="定额员">
+          <el-option
+            v-for="item in person"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>项目名称:</span>
+        <el-select
+          v-model="projectNameValue"
+          placeholder="项目名称"
+          size="small"
+          style="width:100px"
+          clearable
+          @change="searchMachine()">
+          <el-option
+            v-for="item in projectName"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>机床编号:</span>
+        <el-select
+          v-model="machineValue"
+          placeholder="机床编号"
+          size="small"
+          style="width:100px"
+          clearable
+          @change="searchGroup()">
+          <el-option
+            v-for="item in Machine"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>组号:</span>
+        <el-select
+          v-model="groupNumberValue"
+          placeholder="组号"
+          size="small"
+          style="width:100px"
+          clearable
+          @change="changeGroup()">
+          <el-option
+            v-for="item in groupNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>图号/名称:</span>
+        <el-input
+          v-model="partNum"
+          clearable
+          style="width:120px"
+          placeholder="请双击选择"
+          size="small"
+          @change="clear()"
+          @dblclick.native="searchParts"/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin: 10px" @click="searchDetail()">查询</el-button>
+        <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">工艺调整
+        </el-button>
+      </div>
+
+      <div>
+        <span>种类:</span>
+        <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
+        <span>名称/型号:</span>
+        <el-input v-model="partName" placeholder="名称" size="small" readonly style="width:115px"/>
+        <span>材质:</span>
+        <el-input v-model="materialName" placeholder="材质" size="small" style="width:120px" readonly/>
+        <span>规格:</span>
+        <el-input v-model="spec" style="width:100px" size="small" placeholder="规格" readonly/>
+        <span>投产总数量:</span>
+        <el-input v-model="batchNum" placeholder="总数量" readonly size="small" style="width:80px;margin-top:10px;"/>
+      </div>
+    </el-card>
+    <el-card>
+      <div>
+        <el-table v-loading="listLoading" :data="tableData" border style="width: 100%;" height="550px">
+          <el-table-column type="index" label="序号" width="50" align="center"/>
+          <el-table-column prop="name" label="工艺名称" width="180" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.工艺名称" style="width:150px" placeholder="工艺名称" readonly/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="request" label="工艺要求" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.工艺要求" :rows="1" placeholder="工艺要求" type="textarea" readonly/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="singleton" label="单件" width="180" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.单件定额工时" :disabled="disabled" style="width:150px" placeholder="单件" @change="update(scope.row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="Settlement" label="准结" width="180" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.准结定额工时" :disabled="disabled" style="width:150px" placeholder="准结" @change="update(scope.row)"/>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-button v-if="radio === 0" type="primary" icon="el-icon-cjn-09" size="small" style="float:right;margin: 10px" @click="saveApprove">保存</el-button>
+
+      </div>
+    </el-card>
+    <el-dialog
+      :visible.sync="dialogFormVisible4"
+      title="图号"
+      center
+      style="min-height: 300px">
+      <el-table
+        :data="tableData8"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="300"
+        highlight-current-row
+        border
+        @row-click="selectParts">
+        <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 class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="1"
+          :page-sizes="[10, 20]"
+          :page-size="10"
+          :pager-count="5"
+          :total="total"
+          small
+          layout="sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit()">确认</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="dialogFormVisible5"
+      title="图号"
+      center
+      style="min-height: 300px">
+      <el-table
+        :data="tableData9"
+        size="mini"
+        style="width: 97%;max-height: 300px"
+        height="300"
+        highlight-current-row
+        border
+        @row-click="selectParts1">
+        <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 class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="1"
+          :page-sizes="[10, 20]"
+          :page-size="10"
+          :pager-count="5"
+          :total="total"
+          small
+          layout="total, sizes, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submit()">确认</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { getPerson, getPartnames1, getProject, getMachine, getGroup, update, getProcedure, returnEdit, saveApprove } from '@/api/WorkshopProcurement/OutsourcingQuotaSetting'
+
+export default {
+  data() {
+    return {
+      projectNameValue: '',
+      projectName: [],
+      machineValue: '',
+      Machine: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      groupNum: '',
+      groupType: '',
+      tableData8: [],
+      tableData9: [],
+      ProcessFlowNumber: '',
+      spec: '', // 规格
+      total: 0,
+      pageCurrent: 1,
+      pageSize: 10,
+      isShow2: false,
+      dialogFormVisible4: false,
+      dialogFormVisible5: false,
+      listLoading: false,
+      personValue: '',
+      person: [],
+      radio: 0, // 第一组
+      partNum: '', // 零件号
+      typeValue: '', // 种类
+      partName: '', // 零件名称
+      batchNum: '', // 投产总数量
+      materialName: '', // 材质
+      tableData: [],
+      isShow: false // 2的可见性
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() { // 初始化未编制零件号
+      getPerson().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      getProject(0).then(response => { // 初始化项目
+        for (let i = 0; i < response.data.length; i++) {
+          this.projectName.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
+        }
+      })
+    },
+    clear() {
+      this.typeValue = ''
+      this.partName = ''
+      this.partNum = ''
+      this.materialName = ''
+      this.spec = ''
+      this.batchNum = ''
+    },
+    clearDetail() {
+      if (this.radio === 1) {
+        this.isShow2 = true
+      } else {
+        this.isShow2 = false
+      }
+      this.checked = false
+      this.projectNameValue = ''
+      this.projectName = []
+      getProject(this.radio).then(response => { // 初始化项目
+        for (let i = 0; i < response.data.length; i++) {
+          this.projectName.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
+        }
+      })
+      this.machineValue = ''
+      this.Machine = []
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      this.partNum = ''
+      this.typeValue = ''
+      this.partName = ''
+      this.materialName = ''
+      this.spec = ''
+      this.batchNum = ''
+      this.tableData = []
+    },
+    searchDetail() { // 查主表的信息
+      if (this.partNum === '' || this.partNum === null) {
+        this.$message.error('请选择零件作为查询对象')
+      } else {
+        getProcedure(this.ProcessFlowNumber).then(response => {
+          this.tableData = []
+          for (let i = 0; i < response.data.length; i++) {
+            if (response.data[i].工艺编号 === null) {
+              response.data[i].工艺编号 = 0
+            }
+            if (response.data[i].工艺要求 === null) {
+              response.data[i].工艺要求 = ''
+            }
+          }
+          this.tableData = response.data
+        })
+      }
+    },
+    returnEdit() { // 定额修改
+      if (this.partNum === '' || this.partNum === null) {
+        this.$message.error('请选择零件')
+      } else {
+        this.$confirm('此操作会将该零件打回至未编制状态, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          returnEdit(this.ProcessFlowNumber).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('打回成功')
+              this.ProcessFlowNumber = ''
+              this.partNum = ''
+              this.tableData = []
+            } else {
+              this.$message.error('打回失败')
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
+        })
+      }
+    },
+    searchMachine() {
+      this.clear()
+      this.machineValue = ''
+      this.Machine = []
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      getMachine(this.radio, this.projectNameValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
+    searchGroup() {
+      this.clear()
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      getGroup(this.radio, this.machineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    changeGroup() {
+      this.clear()
+      for (let i = 0; i < this.groupNumber.length; i++) {
+        if (this.groupNumber[i].value === this.groupNumberValue) {
+          this.groupNum = this.groupNumber[i].label
+        }
+      }
+      if (this.groupNum.indexOf('MX') !== -1) {
+        this.groupType = 0
+      } else {
+        this.groupType = 1
+      }
+    },
+    selectParts(row) {
+      this.ProcessFlowNumber = row.工艺流水号
+      if (row.零件类型 === '1') {
+        this.typeValue = '标准件'
+      } else if (row.零件类型 === '2') {
+        this.typeValue = '外购件'
+      }
+      this.partName = row.物料型号
+      this.spec = row.物料规格
+      this.batchNum = row.批次数量
+      this.partNum = row.物料名称
+    },
+    selectParts1(row) {
+      this.ProcessFlowNumber = row.工艺流水号
+      if (row.零件类型 === '3') {
+        this.typeValue = '基本件'
+      }
+      this.partName = row.物料名称
+      this.materialName = row.材料
+      this.batchNum = row.批次数量
+      this.partNum = row.零件图号
+    },
+    searchParts() { // 根据条件查零件号
+      if (this.groupNumberValue !== '') {
+        if (this.radio === 0) { // 未编制
+          this.disabled = false
+          this.isShow2 = false
+        } else { // 已编制
+          this.isShow = true
+          this.isShow2 = true
+          this.disabled = true
+        }
+        this.pageCurrent = 1
+        this.pageSize = 10
+        getPartnames1(this.radio, this.groupNumberValue, this.groupType, this.pageCurrent, this.pageSize).then(response => {
+          if (this.groupType === 0) {
+            this.dialogFormVisible5 = true
+            this.tableData9 = response.data.rows
+            console.log(response.data)
+            this.total = response.data.total
+          } else {
+            this.dialogFormVisible4 = true
+            this.tableData8 = response.data.rows
+            this.total = response.data.total
+          }
+        })
+      } else {
+        this.$message.warning('请先选择组号')
+      }
+    },
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.pageCurrent = 1
+      getPartnames1(this.radio, this.groupNumberValue, this.groupType, this.pageCurrent, this.pageSize).then(response => {
+        if (this.groupType === 0) {
+          this.dialogFormVisible5 = true
+          this.tableData9 = response.data.rows
+          this.total = response.data.total
+        } else {
+          this.dialogFormVisible4 = true
+          this.tableData8 = response.data.rows
+          this.total = response.data.total
+        }
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      getPartnames1(this.radio, this.groupNumberValue, this.groupType, this.pageCurrent, this.pageSize).then(response => {
+        if (this.groupType === 0) {
+          this.dialogFormVisible5 = true
+          this.tableData9 = response.data.rows
+          this.total = response.data.total
+        } else {
+          this.dialogFormVisible4 = true
+          this.tableData8 = response.data.rows
+          this.total = response.data.total
+        }
+      })
+    },
+    update(row) {
+      update(row.外购件工序流水号, row.单件定额工时, row.准结定额工时).then(response => {
+      })
+    },
+    submit() {
+      this.dialogFormVisible4 = false
+      this.dialogFormVisible5 = false
+    },
+    saveApprove() { // 保存
+      saveApprove(this.ProcessFlowNumber, this.personValue).then(response => {
+        if (response.data.length === 1) {
+          this.partNum = ''
+          this.typeValue = ''
+          this.partName = ''
+          this.batchNum = ''
+          this.materialName = ''
+          this.spec = ''
+          this.tableData = []
+          this.$message.success('保存成功')
+        } else {
+          this.$message.error('保存失败')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .doing-row4{
+    background: #f0f9eb;
+  }
+  .el-card{
+    margin-bottom: 15px;
+  }
+</style>

From b277466d74458867d892388c6ab279374fbe6529 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 21 Dec 2018 08:54:10 +0800
Subject: [PATCH 5/5] table style

---
 .../PurchasingCenter/PayStateSearch/index.vue | 54 +++++++++-----
 .../PurchaseContractApproval/index.vue        | 60 ++++++++-------
 .../PurchaseContractSearch/index.vue          | 70 +++++++++---------
 .../PurchaseInvoiceDelivery/index.vue         | 74 +++++++++++--------
 4 files changed, 144 insertions(+), 114 deletions(-)

diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue
index fe61db07..c778248f 100644
--- a/src/views/PurchasingCenter/PayStateSearch/index.vue
+++ b/src/views/PurchasingCenter/PayStateSearch/index.vue
@@ -24,6 +24,37 @@
 
     <el-card>
       <el-table v-loading="" :data="tableData1" stripe border style="width: 100%;max-height: 500px;" height="500px" size="mini">
+        <el-table-column type="expand">
+          <template slot-scope="scope">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-row>
+                <el-form-item label="交货日期">
+                  {{ scope.row.交货日期 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="支付日期">
+                  {{ scope.row.支付日期 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="支付方式">
+                  {{ scope.row.支付方式 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="开票信息">
+                  {{ scope.row.开票信息 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="其他说明">
+                  {{ scope.row.其他说明 }}
+                </el-form-item>
+              </el-row>
+            </el-form>
+          </template>
+        </el-table-column>
         <el-table-column label="采购合同号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
@@ -44,26 +75,6 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="交货日期" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.交货日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="支付日期" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.支付日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="支付方式" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.支付方式 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="其他说明" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.其他说明 }}
-          </template>
-        </el-table-column>
         <el-table-column label="合同总额" align="center" min-width="70" fixed="right">
           <template slot-scope="scope">
             {{ scope.row.合同总额 }}
@@ -189,4 +200,7 @@ export default {
   .el-tag{
     margin: 0
   }
+  .el-form-item {
+    margin: 0;
+  }
 </style>
diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
index dc00616f..944bf4ed 100644
--- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
@@ -40,6 +40,37 @@
         height="300px"
         highlight-current-row
         @row-click="searchTable2">
+        <el-table-column type="expand">
+          <template slot-scope="scope">
+            <el-form id="table" label-position="left" inline class="demo-table-expand">
+              <el-row>
+                <el-form-item label="交货日期">
+                  {{ scope.row.交货日期 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="支付日期">
+                  {{ scope.row.支付日期 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="支付方式">
+                  {{ scope.row.支付方式 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="开票信息">
+                  {{ scope.row.开票信息 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="其他说明">
+                  {{ scope.row.其他说明 }}
+                </el-form-item>
+              </el-row>
+            </el-form>
+          </template>
+        </el-table-column>
         <el-table-column label="采购合同号" align="center" min-width="130">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
@@ -65,31 +96,6 @@
             {{ scope.row.合同总额 }}
           </template>
         </el-table-column>
-        <el-table-column label="交货日期" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.交货日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="支付日期" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.支付日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="支付方式" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.支付方式 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="开票信息" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.开票信息 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="其他说明" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.其他说明 }}
-          </template>
-        </el-table-column>
         <el-table-column label="操作" align="center" min-width="100" fixed="right">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
@@ -286,7 +292,7 @@ export default {
   }
 </style>
 <style>
-  .tableData{
-    height: 30px;
+  #table .el-form-item {
+    margin: 0;
   }
 </style>
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 76caa6b0..777c44f8 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -59,10 +59,41 @@
         :data="tableData1"
         size="mini"
         border
-        style="width: 100%;max-height: 300px;"
-        height="300px"
+        style="width: 100%;max-height: 350px;"
+        height="350px"
         highlight-current-row
         @row-click="searchTable2">
+        <el-table-column type="expand">
+          <template slot-scope="scope">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-row>
+                <el-form-item label="交货日期">
+                  {{ scope.row.交货日期 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="支付日期">
+                  {{ scope.row.支付日期 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="支付方式">
+                  {{ scope.row.支付方式 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="开票信息">
+                  {{ scope.row.开票信息 }}
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label="其他说明">
+                  {{ scope.row.其他说明 }}
+                </el-form-item>
+              </el-row>
+            </el-form>
+          </template>
+        </el-table-column>
         <el-table-column label="审批情况" align="center" min-width="100">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.审批情况内容==='未审批'" type="warning" size="small">未审批</el-tag>
@@ -95,31 +126,6 @@
             {{ scope.row.合同总额 }}
           </template>
         </el-table-column>
-        <el-table-column label="交货日期" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.交货日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="支付日期" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.支付日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="支付方式" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.支付方式 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="开票信息" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.开票信息 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="其他说明" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.其他说明 }}
-          </template>
-        </el-table-column>
         <el-table-column label="未通过原因" align="center" min-width="200">
           <template slot-scope="scope">
             {{ scope.row.未通过原因 }}
@@ -341,13 +347,7 @@ export default {
   }
 </style>
 <style>
-  .tableData{
-    height: 30px;
-  }
-  .el-table .adopt{
-    background: limegreen;
-  }
-  .el-table .NotThrough{
-    background: palevioletred;
+  .el-form-item {
+    margin: 0;
   }
 </style>
diff --git a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
index f286f9d9..86a33d93 100644
--- a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
+++ b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
@@ -37,7 +37,48 @@
 
     <el-card>
       <el-table v-loading="" :data="tableData1" show-summary size="mini" style="max-height: 400px" height="400px" stripe border highlight-current-row @row-click="searchPic">
-        <el-table-column align="center" label="供应商" min-width="150px">
+        <el-table-column type="expand">
+          <template slot-scope="scope">
+            <el-form id="table" label-position="left" inline class="demo-table-expand">
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="接收人">
+                    {{ scope.row.接收人 ? scope.row.接收人 : '—' }}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="接收时间">
+                    {{ scope.row.接收时间 ? scope.row.接收时间 : '—' }}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="发票号">
+                    {{ scope.row.发票号 ? scope.row.发票号 : '—' }}
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="开户行">
+                    {{ scope.row.开户行 ? scope.row.开户行 : '—' }}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="开票时间">
+                    {{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '—' }}
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="交接状态" min-width="80px">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.接收人" type="success" size="small">已接收</el-tag>
+            <el-tag v-else type="warning" size="small">未接收</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="供应商" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -87,37 +128,6 @@
             {{ scope.row.传送时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="交接状态" min-width="80px">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.接收人" type="success" size="small">已接收</el-tag>
-            <el-tag v-else type="warning" size="small">未接收</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="接收人" min-width="80px">
-          <template slot-scope="scope">
-            {{ scope.row.接收人 ? scope.row.接收人 : '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="接收时间" min-width="135px">
-          <template slot-scope="scope">
-            {{ scope.row.接收时间 ? scope.row.接收时间 : '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="发票号" min-width="120px">
-          <template slot-scope="scope">
-            {{ scope.row.发票号 ? scope.row.发票号 : '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="开户行" min-width="120px">
-          <template slot-scope="scope">
-            {{ scope.row.开户行 ? scope.row.开户行 : '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="开票时间" min-width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '—' }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="操作" fixed="right" width="200px">
           <template slot-scope="scope">
             <el-button