From 7cfd5d5500c05ab8ad583791ba0f2d31bc76c2dc Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 12 Jun 2019 14:33:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=89=E5=B7=A5=E8=89=BA=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8F=B7=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MachiningSequenceAdjustment.js             | 14 +++++++++++++-
 src/utils/request.js                           |  2 +-
 .../MachiningSequenceAdjustment/index.vue      | 18 +++++++++---------
 .../ProductionCapacityBalance/index.vue        |  4 ++--
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
index ad8dd709..58d19483 100644
--- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -57,7 +57,7 @@ export function JurisdictionControl(num1, num2) {
     }
   })
 }
-// 所有工序
+// 所有工序(原）
 export function getTable2(stepNumber) {
   return request({
     url: '',
@@ -69,6 +69,18 @@ export function getTable2(stepNumber) {
     }
   })
 }
+// 所有工序(新)
+export function getTable3(stepNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_加工进度修改2_查询',
+      param: '工艺计划流水号=' + stepNumber
+    }
+  })
+}
 // 正在加工零件
 export function searchParts(stepNumber) {
   return request({
diff --git a/src/utils/request.js b/src/utils/request.js
index 39e0294c..4646e1be 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -22,7 +22,7 @@ export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
 export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图   发布时改成0.231
 const service = axios.create({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index 9848e49e..100e46d9 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -320,7 +320,7 @@
 </template>
 
 <script>
-import { searchParts, getMachine, getMachine2, searchtable, getTable2, Order, JurisdictionControl, JurisdictionContro2, outParts } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
+import { searchParts, getMachine, getMachine2, searchtable, getTable3, Order, JurisdictionControl, JurisdictionContro2, outParts } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
 import { wsuri, name } from '@/utils/request'
 export default {
   data() {
@@ -379,7 +379,7 @@ export default {
       })
     },
     getRowKeys(row) {
-      return row.零件图号
+      return row.工艺计划流水号
     },
     selectMachine(row) {
       this.process = []
@@ -388,7 +388,7 @@ export default {
       this.colorCode = []
       this.realDate = []
       this.tableData2 = []
-      getTable2(row.零件图号).then(response => {
+      getTable3(row.工艺计划流水号).then(response => {
         for (let k = 0; k < response.data.length; k++) {
           this.process[k] = response.data[k].工艺名称简称
           this.planDate[k] = response.data[k].计划日期_短
@@ -469,18 +469,18 @@ export default {
     },
     searchTable2(row) {
       if (this.a === 1) {
-        this.expands.push(row.零件图号)
-        this.b = row.零件图号
+        this.expands.push(row.工艺计划流水号)
+        this.b = row.工艺计划流水号
         this.a = 0
       } else {
-        if (this.b === row.零件图号) {
+        if (this.b === row.工艺计划流水号) {
           this.expands = []
           this.a = 1
         } else {
           this.expands = []
-          this.expands.push(row.零件图号)
+          this.expands.push(row.工艺计划流水号)
           this.a = 0
-          this.b = row.零件图号
+          this.b = row.工艺计划流水号
         }
       }
       this.process = []
@@ -489,7 +489,7 @@ export default {
       this.colorCode = []
       this.realDate = []
       this.tableData2 = []
-      getTable2(row.零件图号).then(response => {
+      getTable3(row.工艺计划流水号).then(response => {
         for (let k = 0; k < response.data.length; k++) {
           this.process[k] = response.data[k].工艺名称简称
           this.planDate[k] = response.data[k].计划日期_短
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 92899aac..01c04254 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -15,7 +15,7 @@
               <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
             </el-option>
           </el-select>
-
+          <el-button size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="asd()">查询</el-button>
           <span>分组:</span>
           <el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
             <el-option
@@ -727,6 +727,7 @@ export default {
     this.getTable()
   },
   methods: {
+    asd() {},
     // TABLE每行颜色
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex === 1) {
@@ -1442,7 +1443,6 @@ export default {
         this.bianliang1.push(this.tableData1[i].工艺计划流水号)
       }
       discharge(this.bianliang1).then(response => {
-        console.log(response.data)
         this.Selection1()
       })
     },

From 195fc311ab9d540ac7e2d9d7ed6ddca70fbc4949 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 13 Jun 2019 10:53:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=87=E8=B4=AD0613?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Inventory/MaterialOut.js              |   13 +-
 .../CreatePurchaseContract.js                 |   13 +-
 src/utils/tool.js                             |    2 +
 src/views/Inventory/MaterialOut/index.vue     |  436 +++--
 .../CreateInquirySheet/index.vue              | 1700 +++++++++--------
 .../CreatePurchaseContract/index.vue          |  720 +++----
 .../PurchaseTaskAllocate/index.vue            |  748 ++++----
 7 files changed, 1857 insertions(+), 1775 deletions(-)

diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
index e7136f7b..61619cd5 100644
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -103,7 +103,7 @@ export function submitOutStore(...params) {
     data: {
       type: '2',
       name: '库存管理_物料出库_出库记录_增加数据',
-      param: `物料流水号=${params[0]}&货位流水号=${params[1]}&出库数量=${params[2]}&出库人流水号=${params[3]}&基本件流水号=${params[4]}&标准件和外购件流水号=${params[5]}&请购单明细流水号=${params[6]}`
+      param: `物料流水号=${params[0]}&货位流水号=${params[1]}&出库数量=${params[2]}&出库人流水号=${params[3]}&基本件流水号=${params[4]}&标准件和外购件流水号=${params[5]}&请购单明细流水号=${params[6]}&领料单流水号=${params[7]}&领料人流水号=${params[8]}&仓库流水号=${params[9]}&出库类别=${params[10]}`
     }
   })
 }
@@ -119,3 +119,14 @@ export function errorRecord(...params) {
     }
   })
 }
+// 初始化出库类别
+export function initOutType() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'select * from 库存管理_出库类别'
+    }
+  })
+}
diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js
index 9ef1fd87..1d0ed42e 100644
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -45,7 +45,7 @@ export function doneContract(...params) {
     data: {
       type: '2',
       name: '采购管理_采购合同_增加数据',
-      param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}\\&税率=${params[17]}`
+      param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}\\&税率=${params[17]}\\&询价单明细流水号组=${params[18]}`
     }
   })
 }
@@ -61,3 +61,14 @@ export function searchBaseInfo(id) {
     }
   })
 }
+// 实时保存单价
+export function savePrice(price, num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `update 采购管理_询价单明细_视图 set 单价 = ${price} where 物料流水号 = ${num1} and 询价单流水号 = ${num2}`
+    }
+  })
+}
diff --git a/src/utils/tool.js b/src/utils/tool.js
index 75b74f89..b84e353b 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -129,6 +129,8 @@ export function groupBy(datas, keys) {
     group.key.数量 = group.data1 += v.数量
     group.data2 = group.data2 || ''
     group.key.机床图号_组号 = group.data2 += (v.机床图号 || '') + '-' + (v.组号 ? v.组号.split('组')[0] : '') + ';'
+    group.data3 = group.data3 || 0
+    group.key.合计 = group.data3 += v.合计
   })
   groups.map(v => {
     result.push(v.key)
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index e8e68868..47441f4f 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -185,6 +185,15 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
+        <el-form-item label="出库类别" prop="outTypeValue" label-width="100px">
+          <el-select v-model="form1.outTypeValue" size="small" placeholder="出库类别" style="width: 200px;margin-right:10px">
+            <el-option
+              v-for="item in outType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible1=false">取消</el-button>
@@ -210,225 +219,240 @@
 </template>
 
 <script>
-import { initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, errorRecord, searchStockNumber3 } from '@/api/Inventory/MaterialOut'
-import { mapGetters } from 'vuex'
-export default {
-  name: 'MaterialOut',
-  data() {
-    return {
-      pickingListNumber: '',
-      pickingListNumberShow: '',
-      pickListTable1: [],
-      pageCurrent3: 1,
-      pageSize3: 20,
-      total3: 0,
-      pickListTable2: [],
-      StockNumberTable: [],
-      dialogFormVisible1: false,
-      dialogFormVisible2: false,
-      form1: {
-        machineValue: '',
-        groupNumValue: '',
-        outNumber: '',
-        outNumberMax: '', // 出库最大值
-        personValue: ''
-      },
-      form2: {
-        errorNumber: '',
-        reason: '',
-        物料流水号: '',
-        基本件流水号: '',
-        货位流水号: ''
-      },
-      rules1: {
-        machineValue: [{ required: true, message: '请选择' }],
-        groupNumValue: [{ required: true, message: '请选择' }],
-        outNumber: [{ required: true, message: '请输入' }],
-        personValue: [{ required: true, message: '请输入' }]
-      },
-      rules2: {
-        errorNumber: [{ required: true, message: '请输入' }],
-        reason: [{ required: true, message: '请输入' }]
-      },
-      machine: [],
-      group: [],
-      person: [],
-      materialNum: '', // 中间变量物料流水号
-      machineValue: '', // 中间变量机床流水号
-      groupNumValue: '', // 中间变量组件流水号
-      basePartNum: '', // 中间变量基本件流水号
-      purchaseBillNum: '', // 中间变量请购单明细流水号
-      parchasePartNum: '', // 中间变量标准件和外购件流水号
-      locationNum: '', // 中间变量货位流水号
-      outNumber: 0 // 中间变量出库数量
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'id'
-    ])
-  },
-  mounted() {
-    this.fetchData()
-    this.searchList()
-  },
-  methods: {
-    // 初始化数据
-    fetchData() {
-      this.person = []
-      initPickPerson().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.person.push({
-            label: response.data[i].姓名,
-            value: response.data[i].人员编号
-          })
-        }
-      })
-      this.machine = []
-      initMachineProject().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.machine.push({
-            label: response.data[i].机床图号,
-            name: response.data[i].项目名称,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
+  import { initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, errorRecord, searchStockNumber3, initOutType } from '@/api/Inventory/MaterialOut'
+  import { mapGetters } from 'vuex'
+  export default {
+    name: 'MaterialOut',
+    data() {
+      return {
+        pickingListNum: '', // 领料单流水号
+        pickingPersonNum: '', // 领料人流水号
+        pickingListNumber: '',
+        pickingListNumberShow: '',
+        pickListTable1: [],
+        pageCurrent3: 1,
+        pageSize3: 20,
+        total3: 0,
+        pickListTable2: [],
+        StockNumberTable: [],
+        dialogFormVisible1: false,
+        dialogFormVisible2: false,
+        outType: [],
+        form1: {
+          machineValue: '',
+          groupNumValue: '',
+          outNumber: '',
+          outNumberMax: '', // 出库最大值
+          personValue: '',
+          outTypeValue: '' // 出库类别
+        },
+        form2: {
+          errorNumber: '',
+          reason: '',
+          物料流水号: '',
+          基本件流水号: '',
+          货位流水号: ''
+        },
+        rules1: {
+          machineValue: [{ required: true, message: '请选择' }],
+          groupNumValue: [{ required: true, message: '请选择' }],
+          outNumber: [{ required: true, message: '请输入' }],
+          personValue: [{ required: true, message: '请输入' }],
+          outTypeValue: [{ required: true, message: '请选择' }] // 出库类别
+        },
+        rules2: {
+          errorNumber: [{ required: true, message: '请输入' }],
+          reason: [{ required: true, message: '请输入' }]
+        },
+        machine: [],
+        group: [],
+        person: [],
+        materialNum: '', // 中间变量物料流水号
+        machineValue: '', // 中间变量机床流水号
+        groupNumValue: '', // 中间变量组件流水号
+        basePartNum: '', // 中间变量基本件流水号
+        purchaseBillNum: '', // 中间变量请购单明细流水号
+        parchasePartNum: '', // 中间变量标准件和外购件流水号
+        inventoryNum: '', // 中间变量仓库流水号
+        locationNum: '', // 中间变量货位流水号
+        outNumber: 0 // 中间变量出库数量
+      }
     },
-    // 查询组号
-    searchGroup() {
-      this.group = []
-      this.form1.groupNumValue = ''
-      searchgroup(this.form1.machineValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.group.push({
-            label: response.data[i].组号,
-            value: Number(response.data[i].组件流水号)
-          })
-        }
-      })
+    computed: {
+      ...mapGetters([
+        'id'
+      ])
     },
-    // 查询领料单列表
-    searchList() {
-      let check
-      this.pickingListNumber ? check = 1 : check = 0
-      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
-        this.pickListTable1 = response.data.rows
-        this.total3 = response.data.total
-      })
-    },
-    handleSizeChange3(val) {
-      this.pageSize3 = val
-      this.pageCurrent3 = 1
+    mounted() {
+      this.fetchData()
       this.searchList()
     },
-    handleCurrentChange3(val) {
-      this.pageCurrent3 = val
-      this.searchList()
-    },
-    // 查看领料单明细
-    clickList(row) {
-      row && row.领料单流水号 ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
-      row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
-      searchListDetail(this.pickingListNum).then(res => {
-        this.pickListTable2 = res.data
-      })
-    },
-    // 查看领料单明细相关的物料货位数量
-    clickListDetail(row) {
-      console.log(row, 111)
-      row && row.基本件流水号 ? (this.basePartNum = row.基本件流水号, this.materialNum = null, this.parchasePartNum = null, this.purchaseBillNum = null) : this.basePartNum
-      row && row.物料流水号 ? (this.materialNum = row.物料流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.materialNum
-      row && row.标准件和外购件流水号 ? (this.parchasePartNum = row.标准件和外购件流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.parchasePartNum
-      row && row.请购单明细流水号 ? (this.purchaseBillNum = row.请购单明细流水号, this.basePartNum = null, this.materialNum = null, this.parchasePartNum = null) : this.parchasePartNum
-      row && row.机床流水号 ? this.machineValue = row.机床流水号 : this.machineValue
-      row && row.组件流水号 ? this.groupNumValue = row.组件流水号 : this.groupNumValue
-      row && row.总数量 ? this.outNumber = row.总数量 : this.outNumber
-      if (this.materialNum) {
-        searchStockNumber1(this.materialNum).then(res => {
-          this.StockNumberTable = res.data
+    methods: {
+      // 初始化数据
+      fetchData() {
+        this.person = []
+        initPickPerson().then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.person.push({
+              label: response.data[i].姓名,
+              value: response.data[i].人员编号
+            })
+          }
         })
-      } else if (this.basePartNum) {
-        searchStockNumber2(this.basePartNum).then(res => {
-          this.StockNumberTable = res.data
+        this.machine = []
+        initMachineProject().then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.machine.push({
+              label: response.data[i].机床图号,
+              name: response.data[i].项目名称,
+              value: response.data[i].机床流水号
+            })
+          }
         })
-      } else if (this.purchaseBillNum) {
-        searchStockNumber3(this.purchaseBillNum).then(res => {
-          this.StockNumberTable = res.data
+        initOutType().then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.outType.push({
+              label: response.data[i].出库类别名称,
+              value: response.data[i].出库类别流水号
+            })
+          }
         })
-      }
-    },
-    // 出库
-    outStore(row) {
-      if (this.$refs['form1'] !== undefined) {
-        this.$refs['form1'].resetFields()
-      }
-      this.form1.machineValue = this.machineValue
-      this.locationNum = row.货位流水号
-      this.outNumber > row.货位存量 ? (this.form1.outNumber = row.货位存量, this.form1.outNumberMax = row.货位存量) : (this.form1.outNumber = this.outNumber, this.form1.outNumberMax = this.outNumber) // 货位存量和领料数量对比取小
-      this.form1.personValue = Number(this.id)
-      this.group = []
-      this.form1.groupNumValue = ''
-      searchgroup(this.form1.machineValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.group.push({
-            label: response.data[i].组号,
-            value: Number(response.data[i].组件流水号)
+      },
+      // 查询组号
+      searchGroup() {
+        this.group = []
+        this.form1.groupNumValue = ''
+        searchgroup(this.form1.machineValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.group.push({
+              label: response.data[i].组号,
+              value: Number(response.data[i].组件流水号)
+            })
+          }
+        })
+      },
+      // 查询领料单列表
+      searchList() {
+        let check
+        this.pickingListNumber ? check = 1 : check = 0
+        searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
+          this.pickListTable1 = response.data.rows
+          this.total3 = response.data.total
+        })
+      },
+      handleSizeChange3(val) {
+        this.pageSize3 = val
+        this.pageCurrent3 = 1
+        this.searchList()
+      },
+      handleCurrentChange3(val) {
+        this.pageCurrent3 = val
+        this.searchList()
+      },
+      // 查看领料单明细
+      clickList(row) {
+        row && row.领料单流水号 ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
+        row && row.人员编号 ? this.pickingPersonNum = row.人员编号 : this.pickingListNum
+        row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
+        searchListDetail(this.pickingListNum).then(res => {
+          this.pickListTable2 = res.data
+        })
+      },
+      // 查看领料单明细相关的物料货位数量
+      clickListDetail(row) {
+        row && row.基本件流水号 ? (this.basePartNum = row.基本件流水号, this.materialNum = null, this.parchasePartNum = null, this.purchaseBillNum = null) : this.basePartNum
+        row && row.物料流水号 ? (this.materialNum = row.物料流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.materialNum
+        row && row.标准件和外购件流水号 ? (this.parchasePartNum = row.标准件和外购件流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.parchasePartNum
+        row && row.请购单明细流水号 ? (this.purchaseBillNum = row.请购单明细流水号, this.basePartNum = null, this.materialNum = null, this.parchasePartNum = null) : this.parchasePartNum
+        row && row.机床流水号 ? this.machineValue = row.机床流水号 : this.machineValue
+        row && row.组件流水号 ? this.groupNumValue = row.组件流水号 : this.groupNumValue
+        row && row.总数量 ? this.outNumber = row.总数量 : this.outNumber
+        if (this.materialNum) {
+          searchStockNumber1(this.materialNum).then(res => {
+            this.StockNumberTable = res.data
+          })
+        } else if (this.basePartNum) {
+          searchStockNumber2(this.basePartNum).then(res => {
+            this.StockNumberTable = res.data
+          })
+        } else if (this.purchaseBillNum) {
+          searchStockNumber3(this.purchaseBillNum).then(res => {
+            this.StockNumberTable = res.data
           })
         }
-      }).then(() => {
-        this.form1.groupNumValue = this.groupNumValue
-        this.dialogFormVisible1 = true
-      })
-    },
-    // 提交出库
-    submitOutStore() {
-      this.$refs['form1'].validate((valid) => {
-        if (valid) {
-          // 出库数量，出库人，基本件流水号/标准件和外购件流水号 => 记录到一个新表
-          // 物料流水号，货位流水号，出库数量 => 减掉货位物料数
-          submitOutStore(this.materialNum, this.locationNum, this.form1.outNumber, this.form1.personValue, this.basePartNum, this.parchasePartNum, this.purchaseBillNum).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('出库成功')
-              this.dialogFormVisible1 = false
-              this.clickListDetail()
-              this.clickList()
-            } else { this.$message.error('操作失败') }
-          })
-        } else {
-          return false
+      },
+      // 出库
+      outStore(row) {
+        if (this.$refs['form1'] !== undefined) {
+          this.$refs['form1'].resetFields()
         }
-      })
-    },
-    // 异常记录
-    errorRecord(row) {
-      if (this.$refs['form2'] !== undefined) {
-        this.$refs['form2'].resetFields()
+        this.form1.machineValue = this.machineValue
+        this.inventoryNum = row.仓库流水号
+        this.locationNum = row.货位流水号
+        this.outNumber > row.货位存量 ? (this.form1.outNumber = row.货位存量, this.form1.outNumberMax = row.货位存量) : (this.form1.outNumber = this.outNumber, this.form1.outNumberMax = this.outNumber) // 货位存量和领料数量对比取小
+        this.form1.personValue = Number(this.id)
+        this.group = []
+        this.form1.groupNumValue = ''
+        searchgroup(this.form1.machineValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.group.push({
+              label: response.data[i].组号,
+              value: Number(response.data[i].组件流水号)
+            })
+          }
+        }).then(() => {
+          this.form1.groupNumValue = this.groupNumValue
+          this.dialogFormVisible1 = true
+        })
+      },
+      // 提交出库
+      submitOutStore() {
+        this.$refs['form1'].validate((valid) => {
+          if (valid) {
+            // 出库数量，出库人，基本件流水号/标准件和外购件流水号 => 记录到一个新表
+            // 物料流水号，货位流水号，出库数量 => 减掉货位物料数
+            submitOutStore(this.materialNum, this.locationNum, this.form1.outNumber, this.form1.personValue, this.basePartNum, this.parchasePartNum, this.purchaseBillNum, this.pickingListNum, this.pickingPersonNum, this.inventoryNum, this.form1.outTypeValue).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('出库成功')
+                this.dialogFormVisible1 = false
+                this.clickListDetail()
+                this.clickList()
+              } else { this.$message.error('操作失败') }
+            })
+          } else {
+            return false
+          }
+        })
+      },
+      // 异常记录
+      errorRecord(row) {
+        if (this.$refs['form2'] !== undefined) {
+          this.$refs['form2'].resetFields()
+        }
+        this.form2.errorNumber = ''
+        this.form2.reason = ''
+        this.form2.物料流水号 = row.物料流水号
+        this.form2.基本件流水号 = row.基本件流水号
+        this.form2.货位流水号 = row.货位流水号
+        this.dialogFormVisible2 = true
+      },
+      // 提交异常记录
+      submitErrorRecord() {
+        this.$refs['form2'].validate((valid) => {
+          if (valid) {
+            errorRecord(this.form2.errorNumber, this.form2.reason, this.form2.物料流水号, this.form2.基本件流水号, this.form2.货位流水号).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('记录成功')
+                this.dialogFormVisible2 = false
+              } else { this.$message.error('操作失败') }
+            })
+          } else {
+            return false
+          }
+        })
       }
-      this.form2.errorNumber = ''
-      this.form2.reason = ''
-      this.form2.物料流水号 = row.物料流水号
-      this.form2.基本件流水号 = row.基本件流水号
-      this.form2.货位流水号 = row.货位流水号
-      this.dialogFormVisible2 = true
-    },
-    // 提交异常记录
-    submitErrorRecord() {
-      this.$refs['form2'].validate((valid) => {
-        if (valid) {
-          errorRecord(this.form2.errorNumber, this.form2.reason, this.form2.物料流水号, this.form2.基本件流水号, this.form2.货位流水号).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('记录成功')
-              this.dialogFormVisible2 = false
-            } else { this.$message.error('操作失败') }
-          })
-        } else {
-          return false
-        }
-      })
     }
   }
-}
 </script>
 
 <style scoped>
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 8f2e75dc..a4b7abe2 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -162,11 +162,11 @@
                     {{ scope.row.供货商 }}
                   </template>
                 </el-table-column>
-                <el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">
-                  <template slot-scope="scope">
-                    {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
-                  </template>
-                </el-table-column>
+                <!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">-->
+                <!--<template slot-scope="scope">-->
+                <!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
+                <!--</template>-->
+                <!--</el-table-column>-->
               </el-table>
             </el-row>
             <div class="block">
@@ -794,876 +794,880 @@
 </template>
 
 <script>
-import { searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
-  createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
-  submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge } from '@/api/PurchasingCenter/CreateInquirySheet'
-import { mapGetters } from 'vuex'
-import { exportExcelMethod } from './exportExcel'
-import $ from 'jquery'
+  import { searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
+    createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
+    submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge } from '@/api/PurchasingCenter/CreateInquirySheet'
+  import { mapGetters } from 'vuex'
+  import { exportExcelMethod } from './exportExcel'
+  import $ from 'jquery'
 
-export default {
-  name: '', // 创建询价单
-  data() {
-    return {
-      source: [
-        {
-          text: 'BZ',
-          value: 1
+  export default {
+    name: '', // 创建询价单
+    data() {
+      return {
+        source: [
+          {
+            text: 'BZ',
+            value: 1
+          },
+          {
+            text: 'WG',
+            value: 2
+          }
+        ],
+        tabName: '外购件',
+        baseInfoLoading: false,
+        dialogVisible5: false,
+        form3: { // 询价单基础信息表单
+          contact: '',
+          phone: '',
+          fax: '',
+          email: '',
+          companyAddress: '',
+          postCode: '',
+          companyPhone: '',
+          taxNumber: '',
+          shippingAddress: '',
+          account: '',
+          bank: ''
         },
-        {
-          text: 'WG',
-          value: 2
-        }
-      ],
-      tabName: '外购件',
-      baseInfoLoading: false,
-      dialogVisible5: false,
-      form3: { // 询价单基础信息表单
-        contact: '',
-        phone: '',
-        fax: '',
-        email: '',
-        companyAddress: '',
-        postCode: '',
-        companyPhone: '',
-        taxNumber: '',
-        shippingAddress: '',
-        account: '',
-        bank: ''
-      },
-      projectValue: '',
-      project: [],
-      machineValue: '',
-      machine: [],
-      groupValue: '',
-      group: [],
-      partNum: '',
-      partName: '',
-      partSpec: '',
-      check3: 0, // 供应商
-      check4: 0, // 询价单号
-      materialStatusValue: [0], // 物料状态
-      materialStatus: [
-        {
-          value: 0,
-          label: '全部'
-        },
-        {
-          value: 1,
-          label: '未分配'
-        },
-        {
-          value: 2,
-          label: '已分配',
-          children: [{
-            value: 3,
-            label: '未询价'
-          }, {
-            value: 4,
-            label: '已询价',
+        projectValue: '',
+        project: [],
+        machineValue: '',
+        machine: [],
+        groupValue: '',
+        group: [],
+        partNum: '',
+        partName: '',
+        partSpec: '',
+        check3: 0, // 供应商
+        check4: 0, // 询价单号
+        materialStatusValue: [0], // 物料状态
+        materialStatus: [
+          {
+            value: 0,
+            label: '全部'
+          },
+          {
+            value: 1,
+            label: '未分配'
+          },
+          {
+            value: 2,
+            label: '已分配',
             children: [{
-              value: 5,
-              label: '未采购'
+              value: 3,
+              label: '未询价'
             }, {
-              value: 6,
-              label: '已采购'
+              value: 4,
+              label: '已询价',
+              children: [{
+                value: 5,
+                label: '未采购'
+              }, {
+                value: 6,
+                label: '已采购'
+              }]
             }]
-          }]
-        }
-      ], // 物料状态
-      materialName: '',
-      materialSpec: '',
-      materialModel: '',
-      tableData11: [], // 外购件列表
-      total11: 0,
-      pageCurrent11: 1,
-      pageSize11: 150,
-      tableData12: [], // 基本件列表
-      total12: 0,
-      pageCurrent12: 1,
-      pageSize12: 150,
-      remarkFilters: [],
-      supplierFilters: [],
-      tableData2: [], // 询价单列表
-      total2: 0,
-      pageCurrent2: 1,
-      pageSize2: 10,
-      tableData3: [], // 询价单明细
-      dialogVisible1: false,
-      inquirySheetNum: '', // 询价单号
-      inquirySheetFlowNum: '', // 询价单流水号
-      form1: {},
-      supplierCheck1: 0,
-      supplierCheck2: 0,
-      supplierCheck3: 0,
-      supplierCheck4: 0,
-      supplierCheck5: 0,
-      supplierCheck6: 0,
-      supplierCheck7: 0,
-      supplierCheck8: 0,
-      supplierCheck9: 0,
-      supplierCheck10: 0,
-      supplierCheck11: 0,
-      supplierCheck12: 0,
-      supplierValue: '', // 供应商流水号
-      supplierName: '', // 供应商名称
-      goodTime: '', // 货期
-      enterpriseNature: '', // 企业性质
-      createDate: '', // 创立日期
-      registeredCapital: '', // 注册资本
-      taxNum: '', // 税号
-      EMail: '', // 电子邮箱
-      address: '', // 地址
-      account: '', // 账号
-      openingBank: '', // 开户行
-      phone: '', // 电话号码
-      fax: '', // 传真
-      tableData01: [], // 供应商
-      dialogVisible2: false,
-      form2: {
-        inquirySheetNumValue: '', // 询价单流水号
-        inquirySheetNum: '',
-        supplierName: '',
-        supplierValue: ''
+          }
+        ], // 物料状态
+        materialName: '',
+        materialSpec: '',
+        materialModel: '',
+        tableData11: [], // 外购件列表
+        total11: 0,
+        pageCurrent11: 1,
+        pageSize11: 150,
+        tableData12: [], // 基本件列表
+        total12: 0,
+        pageCurrent12: 1,
+        pageSize12: 150,
+        remarkFilters: [],
+        supplierFilters: [],
+        tableData2: [], // 询价单列表
+        total2: 0,
+        pageCurrent2: 1,
+        pageSize2: 10,
+        tableData3: [], // 询价单明细
+        dialogVisible1: false,
+        inquirySheetNum: '', // 询价单号
+        inquirySheetFlowNum: '', // 询价单流水号
+        form1: {},
+        supplierCheck1: 0,
+        supplierCheck2: 0,
+        supplierCheck3: 0,
+        supplierCheck4: 0,
+        supplierCheck5: 0,
+        supplierCheck6: 0,
+        supplierCheck7: 0,
+        supplierCheck8: 0,
+        supplierCheck9: 0,
+        supplierCheck10: 0,
+        supplierCheck11: 0,
+        supplierCheck12: 0,
+        supplierValue: '', // 供应商流水号
+        supplierName: '', // 供应商名称
+        goodTime: '', // 货期
+        enterpriseNature: '', // 企业性质
+        createDate: '', // 创立日期
+        registeredCapital: '', // 注册资本
+        taxNum: '', // 税号
+        EMail: '', // 电子邮箱
+        address: '', // 地址
+        account: '', // 账号
+        openingBank: '', // 开户行
+        phone: '', // 电话号码
+        fax: '', // 传真
+        tableData01: [], // 供应商
+        dialogVisible2: false,
+        form2: {
+          inquirySheetNumValue: '', // 询价单流水号
+          inquirySheetNum: '',
+          supplierName: '',
+          supplierValue: ''
+        },
+        rules2: { // 表单验证规则
+          inquirySheetNum: [{ required: true, message: '请填写询价单号' }],
+          supplierName: [{ required: true, message: '请选择供应商' }]
+        },
+        groupPartNum: [], // 组件零件流水号
+        groupPartBasicNum: [], // 组件零件基本件流水号
+        allNum: [], // 总数量
+        dialogVisible3: false,
+        materialName0: '',
+        materialSpec0: '',
+        materialModel0: '',
+        tableData02: [],
+        total02: 0,
+        pageCurrent02: 1,
+        pageSize02: 10,
+        materialNew: '', // 替换为新物料全称
+        materialOldValue: '',
+        materialNewValue: '',
+        groupPartNumValue: '', // 组件零件流水号
+        standardAndPurchaseValue: '', // 标准件和外购件流水号
+        title2: '',
+        orderExport: '',
+        useNumber: '',
+        maxUseNumber: '',
+        dialogVisible4: false,
+        backlogGroupPartNum: '',
+        backlogMaterialNum: '',
+        cancelNum: 0
+      }
+    },
+    computed: {
+      ...mapGetters([
+        'name',
+        'id' // 人员编号
+      ])
+    },
+    created() {
+      this.fetchData()
+      this.searchTable11() // 查表1
+      this.searchTable2() // 查表2
+    },
+    methods: {
+      filterSource(value, row) {
+        return Number(row['零件类型']) === Number(value)
       },
-      rules2: { // 表单验证规则
-        inquirySheetNum: [{ required: true, message: '请填写询价单号' }],
-        supplierName: [{ required: true, message: '请选择供应商' }]
+      tabClick(tab) {
+        tab.name === '基本件' ? this.searchTable12() : this.searchTable11()
       },
-      groupPartNum: [], // 组件零件流水号
-      groupPartBasicNum: [], // 组件零件基本件流水号
-      allNum: [], // 总数量
-      dialogVisible3: false,
-      materialName0: '',
-      materialSpec0: '',
-      materialModel0: '',
-      tableData02: [],
-      total02: 0,
-      pageCurrent02: 1,
-      pageSize02: 10,
-      materialNew: '', // 替换为新物料全称
-      materialOldValue: '',
-      materialNewValue: '',
-      groupPartNumValue: '', // 组件零件流水号
-      standardAndPurchaseValue: '', // 标准件和外购件流水号
-      title2: '',
-      orderExport: '',
-      useNumber: '',
-      maxUseNumber: '',
-      dialogVisible4: false,
-      backlogGroupPartNum: '',
-      backlogMaterialNum: '',
-      cancelNum: 0
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'name',
-      'id' // 人员编号
-    ])
-  },
-  created() {
-    this.fetchData()
-    this.searchTable11() // 查表1
-    this.searchTable2() // 查表2
-  },
-  methods: {
-    filterSource(value, row) {
-      return Number(row['零件类型']) === Number(value)
-    },
-    tabClick(tab) {
-      tab.name === '基本件' ? this.searchTable12() : this.searchTable11()
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        return v[j]
-      }))
-    },
-    // 导出未询价外购件和标准件/基本件清单
-    exportUninquirySheet() {
-      getExport1(this.id).then(res1 => { // 标准件和外购件
-        getExport2(this.id).then(res2 => { // 基本件
-          res1.data.map(v => {
-            v.任务分配时间 = v.任务分配时间.split(' ')[0]
-            v.供货商 = v.供货商 ? v.供货商 : ''
-            v.备注 = v.备注 ? v.备注 : ''
-          })
-          res2.data.map(v => {
-            v.任务分配时间 = v.任务分配时间.split(' ')[0]
-            v.供货商 = v.供货商 ? v.供货商 : ''
-            v.备注 = v.备注 ? v.备注 : ''
-          })
-          import('./Export2Excel').then(excel => {
-            const dataGroup = []
-            const filterVal1 = ['任务分配时间', '项目名称', '机床图号', '组号', '物料名称', '物料型号', '物料规格', '待询价数量', '备注', '供货商'] // tableData1里的属性名
-            const filterVal2 = ['任务分配时间', '项目名称', '机床图号', '组号', '零件名称', '零件图号', '规格', '材料', '待询价数量', '备注', '供货商'] // tableData2里的属性名
-            const data1 = res1.data.map(v => filterVal1.map(j => v[j]))
-            dataGroup.push(data1)
-            const data2 = res2.data.map(v => filterVal2.map(j => v[j]))
-            dataGroup.push(data2)
-            const headerGroup = [['任务分配时间', '项目名称', '机床图号', '组号', '名称', '图号或型号', '规格', '待询价数量', '备注', '供货商'], ['任务分配时间', '项目名称', '机床图号', '组号', '名称', '图号或型号', '规格', '材料', '待询价数量', '备注', '供货商']]
-            const sheetGroup = ['外购件（未询价）', '基本件（未询价）']
-            excel.export_json_to_excel({
-              headerGroup: headerGroup,
-              dataGroup: dataGroup,
-              sheetGroup: sheetGroup,
-              filename: '未询价采购件明细',
-              autoWidth: true,
-              bookType: 'xlsx'
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => {
+          return v[j]
+        }))
+      },
+      // 导出未询价外购件和标准件/基本件清单
+      exportUninquirySheet() {
+        getExport1(this.id).then(res1 => { // 标准件和外购件
+          getExport2(this.id).then(res2 => { // 基本件
+            res1.data.map(v => {
+              v.任务分配时间 = v.任务分配时间.split(' ')[0]
+              v.供货商 = v.供货商 ? v.供货商 : ''
+              v.备注 = v.备注 ? v.备注 : ''
+            })
+            res2.data.map(v => {
+              v.任务分配时间 = v.任务分配时间.split(' ')[0]
+              v.供货商 = v.供货商 ? v.供货商 : ''
+              v.备注 = v.备注 ? v.备注 : ''
+            })
+            import('./Export2Excel').then(excel => {
+              const dataGroup = []
+              const filterVal1 = ['任务分配时间', '项目名称', '机床图号', '组号', '物料名称', '物料型号', '物料规格', '待询价数量', '备注', '供货商'] // tableData1里的属性名
+              const filterVal2 = ['任务分配时间', '项目名称', '机床图号', '组号', '零件名称', '零件图号', '规格', '材料', '待询价数量', '备注', '供货商'] // tableData2里的属性名
+              const data1 = res1.data.map(v => filterVal1.map(j => v[j]))
+              dataGroup.push(data1)
+              const data2 = res2.data.map(v => filterVal2.map(j => v[j]))
+              dataGroup.push(data2)
+              const headerGroup = [['任务分配时间', '项目名称', '机床图号', '组号', '名称', '图号或型号', '规格', '待询价数量', '备注', '供货商'], ['任务分配时间', '项目名称', '机床图号', '组号', '名称', '图号或型号', '规格', '材料', '待询价数量', '备注', '供货商']]
+              const sheetGroup = ['外购件（未询价）', '基本件（未询价）']
+              excel.export_json_to_excel({
+                headerGroup: headerGroup,
+                dataGroup: dataGroup,
+                sheetGroup: sheetGroup,
+                filename: '未询价采购件明细',
+                autoWidth: true,
+                bookType: 'xlsx'
+              })
             })
           })
         })
-      })
-    },
-    // 询价单基础信息维护
-    inquirySheetBaseInfoMaintain() {
-      this.baseInfoLoading = true
-      searchBaseInfo(this.id).then(res => {
-        this.baseInfoLoading = false
-        this.form3.contact = res.data[0] ? res.data[0].联系人 : ''
-        this.form3.phone = res.data[0] ? res.data[0].手机 : ''
-        this.form3.fax = res.data[0] ? res.data[0].传真 : ''
-        this.form3.email = res.data[0] ? res.data[0].邮箱 : ''
-        this.form3.companyAddress = res.data[0] ? res.data[0].公司地址 : ''
-        this.form3.postCode = res.data[0] ? res.data[0].邮编 : ''
-        this.form3.companyPhone = res.data[0] ? res.data[0].公司电话 : ''
-        this.form3.taxNumber = res.data[0] ? res.data[0].税号 : ''
-        this.form3.shippingAddress = res.data[0] ? res.data[0].送货地址 : ''
-        this.form3.account = res.data[0] ? res.data[0].帐号 : ''
-        this.form3.bank = res.data[0] ? res.data[0].开户行 : ''
-        this.dialogVisible5 = true
-      })
-    },
-    // 提交询价单基础信息维护
-    submitBaseInfo() {
-      editBaseInfo(this.id, this.form3.phone, this.form3.fax, this.form3.email, this.form3.companyAddress, this.form3.postCode, this.form3.companyPhone, this.form3.taxNumber, this.form3.shippingAddress, this.form3.account, this.form3.bank).then(res => {
-        if (res.data[0].result === '1') {
-          this.dialogVisible5 = false
-          this.$message.success('操作成功')
-        } else { this.$message.error('操作失败') }
-      })
-    },
-    fetchData() {
-      searchBaseInfo(this.id).then(res => {
-        this.form3.contact = res.data[0] ? res.data[0].联系人 : ''
-        this.form3.phone = res.data[0] ? res.data[0].手机 : ''
-        this.form3.fax = res.data[0] ? res.data[0].传真 : ''
-        this.form3.email = res.data[0] ? res.data[0].邮箱 : ''
-        this.form3.companyAddress = res.data[0] ? res.data[0].公司地址 : ''
-        this.form3.postCode = res.data[0] ? res.data[0].邮编 : ''
-        this.form3.companyPhone = res.data[0] ? res.data[0].公司电话 : ''
-        this.form3.taxNumber = res.data[0] ? res.data[0].税号 : ''
-        this.form3.shippingAddress = res.data[0] ? res.data[0].送货地址 : ''
-        this.form3.account = res.data[0] ? res.data[0].帐号 : ''
-        this.form3.bank = res.data[0] ? res.data[0].开户行 : ''
-      })
-      initProject().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.project.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
-          })
-        }
-      })
-    },
-    projectChange() {
-      this.machine = []
-      this.machineValue = ''
-      this.group = []
-      this.groupValue = ''
-      searchMachine(this.projectValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.machine.push({
-            value: response.data[i].机床流水号,
-            label: response.data[i].机床图号
-          })
-        }
-      })
-    },
-    machineChange() {
-      this.group = []
-      this.groupValue = ''
-      searchGroup(this.machineValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.group.push({
-            value: response.data[i].组件流水号,
-            label: response.data[i].组号
-          })
-        }
-      })
-    },
-    submitUseInventory() {
-      submitUseInventory(this.backlogMaterialNum, this.useNumber, this.backlogGroupPartNum, this.id).then(response => {
-        console.log(response.data)
-        if (response.data[0].result === '1') {
-          this.searchTable11()
-          this.dialogVisible4 = false
-          this.$message.success('操作成功')
-        } else { this.$message.error('操作失败') }
-      })
-    },
-    useInventory(row) { // 使用滞货
-      console.log(row)
-      this.useNumber = 0
-      row.滞货数量 < row.待询价数量 ? this.maxUseNumber = Number(row.滞货数量) : this.maxUseNumber = Number(row.待询价数量)
-      this.backlogMaterialNum = row.物料流水号
-      this.backlogGroupPartNum = row.组件零件流水号
-      this.dialogVisible4 = true
-    },
-    // cancelUseInventory(row) { // 取消使用滞货
-    //   console.log(row)
-    //   this.backlogMaterialNum = row.物料流水号
-    //   this.backlogGroupPartNum = row.组件零件流水号
-    //   this.cancelNum = row.使用滞货数量
-    //   this.$confirm('确定取消使用滞货?', '提示', {
-    //     confirmButtonText: '确定',
-    //     cancelButtonText: '取消',
-    //     type: 'warning'
-    //   }).then(() => {
-    //     console.log(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum)
-    //     cancelUseInventory(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum).then(response => {
-    //       if (response.data[0].result === '1') {
-    //         this.searchTable11()
-    //         this.$message.success('操作成功')
-    //       } else { this.$message.error('操作失败') }
-    //     })
-    //   }).catch(() => {
-    //     this.$message.info('已取消操作')
-    //   })
-    // },
-    saveOrder() { // 保存询价单
-      const orderNumGroup = []
-      const numGroup = []
-      const remarkGroup = []
-      for (let i = 0; i < this.tableData3.length; i++) {
-        orderNumGroup.push(this.tableData3[i].询价单明细流水号)
-        numGroup.push(this.tableData3[i].数量)
-        remarkGroup.push(this.tableData3[i].备注)
-      }
-      saveOrder(orderNumGroup, numGroup, remarkGroup).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('保存成功')
-        } else { this.$message.error('保存失败') }
-      })
-    },
-    selectable(row, index) { // 控制某行是否可选
-      return (parseInt(row.询价状态编号) === 1 && parseInt(row.采购状态编号) < 3 && parseInt(row.是否确认) === 1) // 未询价&&未采购&&确认物料修改
-    },
-    filterHandler0(value, row) { // 筛选备注
-      return row['备注'] === value
-    },
-    filterHandler(value, row) { // 筛选供货商
-      return row['供货商'] === value
-    },
-    searchTable11() { // 查询外购件列表
-      let check1, check2, check3, check4, check5, check6
-      this.materialName ? check1 = 1 : check1 = 0
-      this.materialSpec ? check2 = 1 : check2 = 0
-      this.materialModel ? check3 = 1 : check3 = 0
-      this.projectValue ? check4 = 1 : check4 = 0
-      this.machineValue ? check5 = 1 : check5 = 0
-      this.groupValue ? check6 = 1 : check6 = 0
-      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2).then(response => {
-        this.tableData11 = response.data.rows
-        this.total11 = response.data.total
-        const remark = []
-        const supplier = []
-        this.remarkFilters = []
-        this.supplierFilters = []
-        response.data.rows.map(v => {
-          if (!remark.includes(v.备注)) {
-            remark.push(v.备注)
-            supplier.push(v.供货商)
-            this.remarkFilters.push({ text: v.备注, value: v.备注 })
-            this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
-          }
+      },
+      // 询价单基础信息维护
+      inquirySheetBaseInfoMaintain() {
+        this.baseInfoLoading = true
+        searchBaseInfo(this.id).then(res => {
+          this.baseInfoLoading = false
+          this.form3.contact = res.data[0] ? res.data[0].联系人 : ''
+          this.form3.phone = res.data[0] ? res.data[0].手机 : ''
+          this.form3.fax = res.data[0] ? res.data[0].传真 : ''
+          this.form3.email = res.data[0] ? res.data[0].邮箱 : ''
+          this.form3.companyAddress = res.data[0] ? res.data[0].公司地址 : ''
+          this.form3.postCode = res.data[0] ? res.data[0].邮编 : ''
+          this.form3.companyPhone = res.data[0] ? res.data[0].公司电话 : ''
+          this.form3.taxNumber = res.data[0] ? res.data[0].税号 : ''
+          this.form3.shippingAddress = res.data[0] ? res.data[0].送货地址 : ''
+          this.form3.account = res.data[0] ? res.data[0].帐号 : ''
+          this.form3.bank = res.data[0] ? res.data[0].开户行 : ''
+          this.dialogVisible5 = true
         })
-      })
-    },
-    handleSizeChange11(val) { // 标准件和外购件列表分页
-      this.pageSize11 = val
-      this.pageCurrent11 = 1
-      this.searchTable11()
-    },
-    handleCurrentChange11(val) { // 标准件和外购件列表分页
-      this.pageCurrent11 = val
-      this.searchTable11()
-    },
-    searchTable12() { // 查询基本件列表
-      let check1, check2, check3, check4, check5, check6
-      this.partNum ? check1 = 1 : check1 = 0
-      this.partName ? check2 = 1 : check2 = 0
-      this.partSpec ? check3 = 1 : check3 = 0
-      this.projectValue ? check4 = 1 : check4 = 0
-      this.machineValue ? check5 = 1 : check5 = 0
-      this.groupValue ? check6 = 1 : check6 = 0
-      searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => {
-        this.tableData12 = response.data.rows
-        this.total12 = response.data.total
-        const remark = []
-        const supplier = []
-        this.remarkFilters = []
-        this.supplierFilters = []
-        response.data.rows.map(v => {
-          if (!remark.includes(v.备注)) {
-            remark.push(v.备注)
-            supplier.push(v.供货商)
-            this.remarkFilters.push({ text: v.备注, value: v.备注 })
-            this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
-          }
+      },
+      // 提交询价单基础信息维护
+      submitBaseInfo() {
+        editBaseInfo(this.id, this.form3.phone, this.form3.fax, this.form3.email, this.form3.companyAddress, this.form3.postCode, this.form3.companyPhone, this.form3.taxNumber, this.form3.shippingAddress, this.form3.account, this.form3.bank).then(res => {
+          if (res.data[0].result === '1') {
+            this.dialogVisible5 = false
+            this.$message.success('操作成功')
+          } else { this.$message.error('操作失败') }
         })
-      })
-    },
-    handleSizeChange12(val) { // 基本件列表分页
-      this.pageSize12 = val
-      this.pageCurrent12 = 1
-      this.searchTable12()
-    },
-    handleCurrentChange12(val) { // 基本件列表分页
-      this.pageCurrent12 = val
-      this.searchTable12()
-    },
-    searchTable2() { // 查询询价单列表
-      this.supplierName ? this.check3 = 1 : this.check3 = 0
-      this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0
-      searchCreateInquirySheet(this.pageCurrent2, this.pageSize2, this.check3, this.supplierName, this.check4, this.inquirySheetNum, this.id).then(response => {
-        this.tableData2 = response.data.rows
-        this.total2 = response.data.total
-      })
-    },
-    handleSizeChange2(val) { // 询价单列表分页
-      this.pageSize2 = val
-      this.searchTable2()
-    },
-    handleCurrentChange2(val) { // 询价单列表分页
-      this.pageCurrent2 = val
-      this.searchTable2()
-    },
-    createInquirySheet() { // 创建空单据--询价单
-      if (this.$refs['form2'] !== undefined) {
-        this.$refs['form2'].resetFields()
-      }
-      this.title2 = '创建询价单'
-      this.form2.inquirySheetNum = ''
-      this.form2.supplierValue = ''
-      this.form2.supplierName = ''
-      this.dialogVisible2 = true
-    },
-    submitCreateInquirySheet() { // 提交创建询价单
-      this.$refs['form2'].validate((valid) => {
-        if (valid) {
-          const numGroup1 = [] // 空数组，放现有的询价单号
-          searchCreateInquirySheet2().then(response => { // 先查询判断是否存在
-            for (let i = 0; i < response.data.length; i++) {
-              numGroup1.push(response.data[i].询价单编号)
-            }
-          }).then(() => {
-            if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1) {
-              this.$message.error('该询价单号已存在')
-            } else {
-              createInquirySheet(this.form2.inquirySheetNum, this.form2.supplierValue, '', this.id).then(response => {
-                if (response.data[0].result === '1') {
-                  this.$message.success('创建成功')
-                  this.inquirySheetNum = ''
-                  this.supplierName = ''
-                  this.supplierValue = ''
-                  this.dialogVisible2 = false
-                  this.searchTable2()
-                } else { this.$message.error('操作失败') }
-              })
-            }
-          })
-        } else {
-          console.log('表单验证未通过')
-          return false
-        }
-      })
-    },
-    deleteInquirySheet(row) { // 删除询价单
-      this.$confirm('确定删除该询价单?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteInquirySheet(row.询价单流水号).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('删除成功')
-            this.inquirySheetNum = ''
-            this.supplierName = ''
-            this.supplierValue = ''
-            this.searchTable2()
-            this.tableData3 = []
-            this.searchTable11()
-            this.searchTable12()
-          } else { this.$message.error('删除失败') }
+      },
+      fetchData() {
+        searchBaseInfo(this.id).then(res => {
+          this.form3.contact = res.data[0] ? res.data[0].联系人 : ''
+          this.form3.phone = res.data[0] ? res.data[0].手机 : ''
+          this.form3.fax = res.data[0] ? res.data[0].传真 : ''
+          this.form3.email = res.data[0] ? res.data[0].邮箱 : ''
+          this.form3.companyAddress = res.data[0] ? res.data[0].公司地址 : ''
+          this.form3.postCode = res.data[0] ? res.data[0].邮编 : ''
+          this.form3.companyPhone = res.data[0] ? res.data[0].公司电话 : ''
+          this.form3.taxNumber = res.data[0] ? res.data[0].税号 : ''
+          this.form3.shippingAddress = res.data[0] ? res.data[0].送货地址 : ''
+          this.form3.account = res.data[0] ? res.data[0].帐号 : ''
+          this.form3.bank = res.data[0] ? res.data[0].开户行 : ''
         })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    editInquirySheet(row) { // 编辑询价单
-      if (this.$refs['form2'] !== undefined) {
-        this.$refs['form2'].resetFields()
-      }
-      this.title2 = '编辑询价单'
-      this.form2.inquirySheetNumValue = row.询价单流水号
-      this.form2.inquirySheetNum = row.询价单编号
-      this.form2.supplierValue = row.供应商流水号
-      this.form2.supplierName = row.供应商名称
-      this.dialogVisible2 = true
-    },
-    submitEditInquirySheet() { // 提交编辑询价单
-      this.$refs['form2'].validate((valid) => {
-        if (valid) {
-          const numGroup1 = [] // 空数组，放现有的询价单号
-          const numGroup2 = [] // 空数组，放现有的询价单流水号
-          searchCreateInquirySheet2().then(response => { // 先查询判断是否存在
-            for (let i = 0; i < response.data.length; i++) {
-              numGroup1.push(response.data[i].询价单编号)
-              numGroup2.push(response.data[i].询价单流水号)
-            }
-          }).then(() => {
-            if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1 && numGroup1.indexOf(this.form2.inquirySheetNum) !== numGroup2.indexOf(parseInt(this.form2.inquirySheetNumValue))) {
-              this.$message.error('该询价单号已存在')
-            } else {
-              editInquirySheet(this.form2.inquirySheetNumValue, this.form2.inquirySheetNum, this.form2.supplierValue).then(response => {
-                if (response.data[0].result === '1') {
-                  this.$message.success('修改成功')
-                  this.inquirySheetNum = ''
-                  this.supplierName = ''
-                  this.supplierValue = ''
-                  this.dialogVisible2 = false
-                  this.searchTable2()
-                } else { this.$message.error('修改失败') }
-              })
-            }
-          })
-        } else {
-          console.log('表单验证未通过')
-          return false
-        }
-      })
-    },
-    printInquirySheet() { // 打印询价单
-      this.$confirm('确定打印该询价单?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        searchMerge(this.inquirySheetFlowNum).then(res => {
-          if (res.data.length === 0) {
-            this.$message.error('请选择正确的询价单导出')
-          } else {
-            const children = document.getElementsByClassName('tableData')
-            const parent = document.getElementsByClassName('inquirySheet')[0]
-            if (children.length !== 0) {
-              for (let i = children.length - 1; i >= 0; i--) {
-                parent.removeChild(children[i])
-              }
-            }
-            const tr = []
-            let length = 0
-            res.data.length < 15 ? length = 15 : length = res.data.length
-            for (let i = 0; i < length; i++) {
-              tr[i] = document.createElement('tr')
-              tr[i].setAttribute('class', 'tableData')
-              tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
-              $('#tablehead').after(tr[i])
-            }
-            for (let j = 0; j < res.data.length; j++) {
-              document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-              document.getElementsByClassName('tableData')[j].children[1].innerHTML = res.data[j].物料型号 || res.data[j].零件图号
-              document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
-              document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
-              document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
-              document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
-              document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
-            }
-            document.getElementById('inquirySheetNum').innerHTML = this.orderExport
-            document.getElementById('supplier').innerHTML = ''
-          }
-        }).then(() => {
-          const htmlNode = $('#inquirySheet').html()
-          const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;')
-          body.children().hide()
-          const printNode = $(htmlNode)
-          body.append(printNode)
-          window.print()
-          body.removeAttr('style')
-          body.children().not('script').show()
-          body.children().not('#app').hide()
-          printNode.remove()
-        })
-      }).catch(res => {
-        console.log(res)
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        })
-      })
-    },
-    exportInquirySheet() { // 导出询价单
-      this.$confirm('确认导出询价单?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // 询价单导出结果
-        searchMerge(this.inquirySheetFlowNum).then(res => {
-          if (res.data.length === 0) {
-            this.$message.error('请选择正确的询价单导出')
-          } else {
-            const children = document.getElementsByClassName('tableData')
-            const parent = document.getElementsByClassName('inquirySheet')[0]
-            if (children.length !== 0) {
-              for (let i = children.length - 1; i >= 0; i--) {
-                parent.removeChild(children[i])
-              }
-            }
-            const tr = []
-            let length = 0
-            res.data.length < 15 ? length = 15 : length = res.data.length
-            for (let i = 0; i < length; i++) {
-              tr[i] = document.createElement('tr')
-              tr[i].setAttribute('class', 'tableData')
-              tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
-              $('#tablehead').after(tr[i])
-            }
-            for (let j = 0; j < res.data.length; j++) {
-              document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-              document.getElementsByClassName('tableData')[j].children[1].innerHTML = res.data[j].物料型号 || res.data[j].零件图号
-              document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
-              document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
-              document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
-              document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
-              document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
-            }
-            document.getElementById('inquirySheetNum').innerHTML = this.orderExport
-            document.getElementById('supplier').innerHTML = ''
-            exportExcelMethod('inquirySheet', '采购询价单', '采购询价单sheet')
-          }
-        })
-      }).catch(res => {
-        console.log(res)
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        })
-      })
-    },
-    handleSelectionChange1(val) { // 标准件和外购件多选
-      this.groupPartNum = []
-      this.allNum = []
-      for (let i = 0; i < val.length; i++) {
-        this.groupPartNum[i] = val[i].组件零件流水号
-        this.allNum[i] = val[i].待询价数量
-      }
-    },
-    handleSelectionChange2(val) { // 基本件多选
-      this.groupPartBasicNum = []
-      this.allNum = []
-      for (let i = 0; i < val.length; i++) {
-        this.groupPartBasicNum[i] = val[i].组件零件基本件流水号
-        this.allNum[i] = val[i].零件数量
-      }
-    },
-    addInquirySheet() { // 追加物料
-      const numGroup1 = [] // 空数组，放该询价单中已有的组件零件流水号
-      const numGroup2 = [] // 空数组，放该询价单中已有的组件零件基本件流水号
-      if (this.inquirySheetFlowNum === '' || this.inquirySheetFlowNum === null) {
-        this.$message.error('请选择一个询价单')
-      } else if (this.groupPartNum.length === 0 && this.groupPartBasicNum.length === 0) {
-        this.$message.error('请选择待询价物料或零件')
-      } else {
-        searchSheetDetail(this.inquirySheetFlowNum).then(response => {
+        initProject().then(response => {
           for (let i = 0; i < response.data.length; i++) {
-            numGroup1.push(response.data[i].组件零件流水号)
-            numGroup2.push(response.data[i].组件零件基本件流水号)
+            this.project.push({
+              label: response.data[i].项目名称,
+              value: response.data[i].项目流水号
+            })
           }
-        }).then(() => {
-          let x = true // 为了只执行一次的中间变量
-          if (this.groupPartBasicNum.length === 0) { // 标准件和外购件
-            for (let i = 0; i < this.groupPartNum.length; i++) {
-              if (numGroup1.indexOf(parseInt(this.groupPartNum[i])) !== -1) {
-                if (x) {
-                  this.$notify({
-                    title: '注意',
-                    message: '无法向该询价单中追加重复物料，已自动跳过',
-                    type: 'warning'
-                  })
-                  x = false
-                }
+        })
+      },
+      projectChange() {
+        this.machine = []
+        this.machineValue = ''
+        this.group = []
+        this.groupValue = ''
+        searchMachine(this.projectValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.machine.push({
+              value: response.data[i].机床流水号,
+              label: response.data[i].机床图号
+            })
+          }
+        })
+      },
+      machineChange() {
+        this.group = []
+        this.groupValue = ''
+        searchGroup(this.machineValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.group.push({
+              value: response.data[i].组件流水号,
+              label: response.data[i].组号
+            })
+          }
+        })
+      },
+      submitUseInventory() {
+        submitUseInventory(this.backlogMaterialNum, this.useNumber, this.backlogGroupPartNum, this.id).then(response => {
+          console.log(response.data)
+          if (response.data[0].result === '1') {
+            this.searchTable11()
+            this.dialogVisible4 = false
+            this.$message.success('操作成功')
+          } else { this.$message.error('操作失败') }
+        })
+      },
+      useInventory(row) { // 使用滞货
+        console.log(row)
+        this.useNumber = 0
+        row.滞货数量 < row.待询价数量 ? this.maxUseNumber = Number(row.滞货数量) : this.maxUseNumber = Number(row.待询价数量)
+        this.backlogMaterialNum = row.物料流水号
+        this.backlogGroupPartNum = row.组件零件流水号
+        this.dialogVisible4 = true
+      },
+      // cancelUseInventory(row) { // 取消使用滞货
+      //   console.log(row)
+      //   this.backlogMaterialNum = row.物料流水号
+      //   this.backlogGroupPartNum = row.组件零件流水号
+      //   this.cancelNum = row.使用滞货数量
+      //   this.$confirm('确定取消使用滞货?', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() => {
+      //     console.log(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum)
+      //     cancelUseInventory(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum).then(response => {
+      //       if (response.data[0].result === '1') {
+      //         this.searchTable11()
+      //         this.$message.success('操作成功')
+      //       } else { this.$message.error('操作失败') }
+      //     })
+      //   }).catch(() => {
+      //     this.$message.info('已取消操作')
+      //   })
+      // },
+      saveOrder() { // 保存询价单
+        const orderNumGroup = []
+        const numGroup = []
+        const remarkGroup = []
+        for (let i = 0; i < this.tableData3.length; i++) {
+          orderNumGroup.push(this.tableData3[i].询价单明细流水号)
+          numGroup.push(this.tableData3[i].数量)
+          remarkGroup.push(this.tableData3[i].备注)
+        }
+        saveOrder(orderNumGroup, numGroup, remarkGroup).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('保存成功')
+          } else { this.$message.error('保存失败') }
+        })
+      },
+      selectable(row, index) { // 控制某行是否可选
+        return (parseInt(row.询价状态编号) === 1 && parseInt(row.采购状态编号) < 3 && parseInt(row.是否确认) === 1) // 未询价&&未采购&&确认物料修改
+      },
+      filterHandler0(value, row) { // 筛选备注
+        return row['备注'].trim() === value
+      },
+      filterHandler(value, row) { // 筛选供货商
+        return row['供货商'].trim() === value
+      },
+      searchTable11() { // 查询外购件列表
+        let check1, check2, check3, check4, check5, check6
+        this.materialName ? check1 = 1 : check1 = 0
+        this.materialSpec ? check2 = 1 : check2 = 0
+        this.materialModel ? check3 = 1 : check3 = 0
+        this.projectValue ? check4 = 1 : check4 = 0
+        this.machineValue ? check5 = 1 : check5 = 0
+        this.groupValue ? check6 = 1 : check6 = 0
+        searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2).then(response => {
+          this.tableData11 = response.data.rows
+          this.total11 = response.data.total
+          const remark = []
+          const supplier = []
+          this.remarkFilters = []
+          this.supplierFilters = []
+          response.data.rows.map(v => {
+            if (v.备注 === null) { v.备注 = '' }
+            if (v.供货商 === null) { v.供货商 = '' }
+            if (!remark.includes(v.备注)) {
+              remark.push(v.备注)
+              this.remarkFilters.push({ text: v.备注, value: v.备注 })
+            }
+            if (!supplier.includes(v.供货商)) {
+              supplier.push(v.供货商)
+              this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
+            }
+          })
+        })
+      },
+      handleSizeChange11(val) { // 标准件和外购件列表分页
+        this.pageSize11 = val
+        this.pageCurrent11 = 1
+        this.searchTable11()
+      },
+      handleCurrentChange11(val) { // 标准件和外购件列表分页
+        this.pageCurrent11 = val
+        this.searchTable11()
+      },
+      searchTable12() { // 查询基本件列表
+        let check1, check2, check3, check4, check5, check6
+        this.partNum ? check1 = 1 : check1 = 0
+        this.partName ? check2 = 1 : check2 = 0
+        this.partSpec ? check3 = 1 : check3 = 0
+        this.projectValue ? check4 = 1 : check4 = 0
+        this.machineValue ? check5 = 1 : check5 = 0
+        this.groupValue ? check6 = 1 : check6 = 0
+        searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => {
+          this.tableData12 = response.data.rows
+          this.total12 = response.data.total
+          const remark = []
+          const supplier = []
+          this.remarkFilters = []
+          this.supplierFilters = []
+          response.data.rows.map(v => {
+            if (!remark.includes(v.备注)) {
+              remark.push(v.备注)
+              supplier.push(v.供货商)
+              this.remarkFilters.push({ text: v.备注, value: v.备注 })
+              this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
+            }
+          })
+        })
+      },
+      handleSizeChange12(val) { // 基本件列表分页
+        this.pageSize12 = val
+        this.pageCurrent12 = 1
+        this.searchTable12()
+      },
+      handleCurrentChange12(val) { // 基本件列表分页
+        this.pageCurrent12 = val
+        this.searchTable12()
+      },
+      searchTable2() { // 查询询价单列表
+        this.supplierName ? this.check3 = 1 : this.check3 = 0
+        this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0
+        searchCreateInquirySheet(this.pageCurrent2, this.pageSize2, this.check3, this.supplierName, this.check4, this.inquirySheetNum, this.id).then(response => {
+          this.tableData2 = response.data.rows
+          this.total2 = response.data.total
+        })
+      },
+      handleSizeChange2(val) { // 询价单列表分页
+        this.pageSize2 = val
+        this.searchTable2()
+      },
+      handleCurrentChange2(val) { // 询价单列表分页
+        this.pageCurrent2 = val
+        this.searchTable2()
+      },
+      createInquirySheet() { // 创建空单据--询价单
+        if (this.$refs['form2'] !== undefined) {
+          this.$refs['form2'].resetFields()
+        }
+        this.title2 = '创建询价单'
+        this.form2.inquirySheetNum = ''
+        this.form2.supplierValue = ''
+        this.form2.supplierName = ''
+        this.dialogVisible2 = true
+      },
+      submitCreateInquirySheet() { // 提交创建询价单
+        this.$refs['form2'].validate((valid) => {
+          if (valid) {
+            const numGroup1 = [] // 空数组，放现有的询价单号
+            searchCreateInquirySheet2().then(response => { // 先查询判断是否存在
+              for (let i = 0; i < response.data.length; i++) {
+                numGroup1.push(response.data[i].询价单编号)
+              }
+            }).then(() => {
+              if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1) {
+                this.$message.error('该询价单号已存在')
               } else {
-                addInquirySheet1(this.inquirySheetFlowNum, this.groupPartNum[i], this.allNum[i]).then(response => {
+                createInquirySheet(this.form2.inquirySheetNum, this.form2.supplierValue, '', this.id).then(response => {
                   if (response.data[0].result === '1') {
-                    this.$message.success('操作成功')
-                    this.searchTable11()
-                    searchSheetDetail(this.inquirySheetFlowNum).then(response => {
-                      this.tableData3 = response.data
-                    })
+                    this.$message.success('创建成功')
+                    this.inquirySheetNum = ''
+                    this.supplierName = ''
+                    this.supplierValue = ''
+                    this.dialogVisible2 = false
+                    this.searchTable2()
                   } else { this.$message.error('操作失败') }
                 })
               }
-            }
-          } else { // 基本件
-            for (let i = 0; i < this.groupPartBasicNum.length; i++) {
-              if (numGroup2.indexOf(parseInt(this.groupPartBasicNum[i])) !== -1) {
-                if (x) {
-                  this.$notify({
-                    title: '注意',
-                    message: '无法向该询价单中追加重复零件，已自动跳过',
-                    type: 'warning'
-                  })
-                  x = false
-                }
-              } else {
-                addInquirySheet2(this.inquirySheetFlowNum, this.groupPartBasicNum[i], this.allNum[i]).then(response => {
-                  if (response.data[0].result === '1') {
-                    this.$message.success('操作成功')
-                    this.searchTable12()
-                    searchSheetDetail(this.inquirySheetFlowNum).then(response => {
-                      this.tableData3 = response.data
-                    })
-                  } else {
-                    this.$message.error('操作失败')
-                  }
-                })
-              }
-            }
+            })
+          } else {
+            console.log('表单验证未通过')
+            return false
           }
         })
-      }
-    },
-    outInquirySheet(row) {
-      outInquirySheet(row.询价单明细流水号, row.组件零件流水号, row.组件零件基本件流水号).then(response => {
-        if (response.data[0].result === '1') {
-          this.searchTable11()
-          this.searchTable12()
-          searchSheetDetail(this.inquirySheetFlowNum).then(response => {
-            this.tableData3 = response.data
+      },
+      deleteInquirySheet(row) { // 删除询价单
+        this.$confirm('确定删除该询价单?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteInquirySheet(row.询价单流水号).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('删除成功')
+              this.inquirySheetNum = ''
+              this.supplierName = ''
+              this.supplierValue = ''
+              this.searchTable2()
+              this.tableData3 = []
+              this.searchTable11()
+              this.searchTable12()
+            } else { this.$message.error('删除失败') }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
           })
-          this.$message.success('操作成功')
-        } else { this.$message.error('操作失败') }
-      })
-    },
-    searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
-      this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
-      this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
-      this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
-      this.registeredCapital ? this.supplierCheck4 = 1 : (this.supplierCheck4 = 0, this.registeredCapital = '')
-      this.taxNum ? this.supplierCheck5 = 1 : (this.supplierCheck5 = 0, this.taxNum = '')
-      this.EMail ? this.supplierCheck6 = 1 : (this.supplierCheck6 = 0, this.EMail = '')
-      this.address ? this.supplierCheck7 = 1 : (this.supplierCheck7 = 0, this.address = '')
-      this.account ? this.supplierCheck8 = 1 : (this.supplierCheck8 = 0, this.account = '')
-      this.openingBank ? this.supplierCheck9 = 1 : (this.supplierCheck9 = 0, this.openingBank = '')
-      this.phone ? this.supplierCheck10 = 1 : (this.supplierCheck10 = 0, this.phone = '')
-      this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
-      this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
-      searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
-        this.tableData01 = response.data
-      })
-    },
-    showSupplierDetail(row) {
-      this.form2.supplierValue = row.供应商流水号
-      this.form2.supplierName = row.供应商名称
-      this.supplierValue = row.供应商流水号
-      this.supplierName = row.供应商名称
-      this.enterpriseNature = row.企业性质
-      this.createDate = row.创立日期
-      this.registeredCapital = row.注册资本
-      this.taxNum = row.税号
-      this.EMail = row.电子信箱
-      this.address = row.地址
-      this.account = row.帐号
-      this.openingBank = row.开户行
-      this.phone = row.电话号码
-      this.fax = row.传真
-      this.goodTime = row.货期
-    },
-    emptySupplierDetail() {
-      this.supplierValue = ''
-      this.supplierName = ''
-      this.enterpriseNature = ''
-      this.createDate = ''
-      this.registeredCapital = ''
-      this.taxNum = ''
-      this.EMail = ''
-      this.address = ''
-      this.account = ''
-      this.openingBank = ''
-      this.phone = ''
-      this.fax = ''
-      this.goodTime = ''
-    },
-    submitSelectSupplier() { // 确定选择供应商
-      this.dialogVisible1 = false
-    },
-    searchTable3(row) { // 查询该询价单中的物料和零件
-      this.tableData3 = []
-      this.inquirySheetFlowNum = row.询价单流水号
-      this.orderExport = row.询价单编号
-      searchSheetDetail(row.询价单流水号).then(response => {
-        console.log(response.data)
-        this.tableData3 = response.data
-      })
-    },
-    materialChange(row) { // 物料变更 标准件和外购件
-      this.dialogVisible3 = true
-      this.groupPartNumValue = row.组件零件流水号
-      this.standardAndPurchaseValue = row.标准件和外购件流水号
-      this.materialOldValue = row.物料流水号
-    },
-    partChange(row) { // 零件变更 基本件
-      this.$message('没有基本件的标准库')
-      console.log(row)
-    },
-    searchMaterial() {
-      if (this.materialName0 || this.materialSpec0 || this.materialModel0) {
-        let check1, check2, check3
-        this.materialName0 ? check1 = 1 : check1 = 0
-        this.materialSpec0 ? check2 = 1 : check2 = 0
-        this.materialModel0 ? check3 = 1 : check3 = 0
-        searchAllMaterial(check1, this.materialName0, check2, this.materialSpec0, check3, this.materialModel0, this.pageCurrent02, this.pageSize02).then(response => {
-          this.tableData02 = response.data.result
-          this.total02 = parseInt(response.data.output[0].ItemCount)
         })
-      } else {
-        this.$message.warning('请至少输入一种搜索条件')
+      },
+      editInquirySheet(row) { // 编辑询价单
+        if (this.$refs['form2'] !== undefined) {
+          this.$refs['form2'].resetFields()
+        }
+        this.title2 = '编辑询价单'
+        this.form2.inquirySheetNumValue = row.询价单流水号
+        this.form2.inquirySheetNum = row.询价单编号
+        this.form2.supplierValue = row.供应商流水号
+        this.form2.supplierName = row.供应商名称
+        this.dialogVisible2 = true
+      },
+      submitEditInquirySheet() { // 提交编辑询价单
+        this.$refs['form2'].validate((valid) => {
+          if (valid) {
+            const numGroup1 = [] // 空数组，放现有的询价单号
+            const numGroup2 = [] // 空数组，放现有的询价单流水号
+            searchCreateInquirySheet2().then(response => { // 先查询判断是否存在
+              for (let i = 0; i < response.data.length; i++) {
+                numGroup1.push(response.data[i].询价单编号)
+                numGroup2.push(response.data[i].询价单流水号)
+              }
+            }).then(() => {
+              if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1 && numGroup1.indexOf(this.form2.inquirySheetNum) !== numGroup2.indexOf(parseInt(this.form2.inquirySheetNumValue))) {
+                this.$message.error('该询价单号已存在')
+              } else {
+                editInquirySheet(this.form2.inquirySheetNumValue, this.form2.inquirySheetNum, this.form2.supplierValue).then(response => {
+                  if (response.data[0].result === '1') {
+                    this.$message.success('修改成功')
+                    this.inquirySheetNum = ''
+                    this.supplierName = ''
+                    this.supplierValue = ''
+                    this.dialogVisible2 = false
+                    this.searchTable2()
+                  } else { this.$message.error('修改失败') }
+                })
+              }
+            })
+          } else {
+            console.log('表单验证未通过')
+            return false
+          }
+        })
+      },
+      printInquirySheet() { // 打印询价单
+        this.$confirm('确定打印该询价单?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          searchMerge(this.inquirySheetFlowNum).then(res => {
+            if (res.data.length === 0) {
+              this.$message.error('请选择正确的询价单导出')
+            } else {
+              const children = document.getElementsByClassName('tableData')
+              const parent = document.getElementsByClassName('inquirySheet')[0]
+              if (children.length !== 0) {
+                for (let i = children.length - 1; i >= 0; i--) {
+                  parent.removeChild(children[i])
+                }
+              }
+              const tr = []
+              let length = 0
+              res.data.length < 15 ? length = 15 : length = res.data.length
+              for (let i = 0; i < length; i++) {
+                tr[i] = document.createElement('tr')
+                tr[i].setAttribute('class', 'tableData')
+                tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
+                $('#tablehead').after(tr[i])
+              }
+              for (let j = 0; j < res.data.length; j++) {
+                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+                document.getElementsByClassName('tableData')[j].children[1].innerHTML = res.data[j].物料型号 || res.data[j].零件图号
+                document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
+                document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
+                document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
+                document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
+                document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
+              }
+              document.getElementById('inquirySheetNum').innerHTML = this.orderExport
+              document.getElementById('supplier').innerHTML = ''
+            }
+          }).then(() => {
+            const htmlNode = $('#inquirySheet').html()
+            const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;')
+            body.children().hide()
+            const printNode = $(htmlNode)
+            body.append(printNode)
+            window.print()
+            body.removeAttr('style')
+            body.children().not('script').show()
+            body.children().not('#app').hide()
+            printNode.remove()
+          })
+        }).catch(res => {
+          console.log(res)
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
+        })
+      },
+      exportInquirySheet() { // 导出询价单
+        this.$confirm('确认导出询价单?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          // 询价单导出结果
+          searchMerge(this.inquirySheetFlowNum).then(res => {
+            if (res.data.length === 0) {
+              this.$message.error('请选择正确的询价单导出')
+            } else {
+              const children = document.getElementsByClassName('tableData')
+              const parent = document.getElementsByClassName('inquirySheet')[0]
+              if (children.length !== 0) {
+                for (let i = children.length - 1; i >= 0; i--) {
+                  parent.removeChild(children[i])
+                }
+              }
+              const tr = []
+              let length = 0
+              res.data.length < 15 ? length = 15 : length = res.data.length
+              for (let i = 0; i < length; i++) {
+                tr[i] = document.createElement('tr')
+                tr[i].setAttribute('class', 'tableData')
+                tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
+                $('#tablehead').after(tr[i])
+              }
+              for (let j = 0; j < res.data.length; j++) {
+                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+                document.getElementsByClassName('tableData')[j].children[1].innerHTML = res.data[j].物料型号 || res.data[j].零件图号
+                document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
+                document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
+                document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
+                document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
+                document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
+              }
+              document.getElementById('inquirySheetNum').innerHTML = this.orderExport
+              document.getElementById('supplier').innerHTML = ''
+              exportExcelMethod('inquirySheet', '采购询价单', '采购询价单sheet')
+            }
+          })
+        }).catch(res => {
+          console.log(res)
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
+        })
+      },
+      handleSelectionChange1(val) { // 标准件和外购件多选
+        this.groupPartNum = []
+        this.allNum = []
+        for (let i = 0; i < val.length; i++) {
+          this.groupPartNum[i] = val[i].组件零件流水号
+          this.allNum[i] = val[i].待询价数量
+        }
+      },
+      handleSelectionChange2(val) { // 基本件多选
+        this.groupPartBasicNum = []
+        this.allNum = []
+        for (let i = 0; i < val.length; i++) {
+          this.groupPartBasicNum[i] = val[i].组件零件基本件流水号
+          this.allNum[i] = val[i].零件数量
+        }
+      },
+      addInquirySheet() { // 追加物料
+        const numGroup1 = [] // 空数组，放该询价单中已有的组件零件流水号
+        const numGroup2 = [] // 空数组，放该询价单中已有的组件零件基本件流水号
+        if (this.inquirySheetFlowNum === '' || this.inquirySheetFlowNum === null) {
+          this.$message.error('请选择一个询价单')
+        } else if (this.groupPartNum.length === 0 && this.groupPartBasicNum.length === 0) {
+          this.$message.error('请选择待询价物料或零件')
+        } else {
+          searchSheetDetail(this.inquirySheetFlowNum).then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              numGroup1.push(response.data[i].组件零件流水号)
+              numGroup2.push(response.data[i].组件零件基本件流水号)
+            }
+          }).then(() => {
+            let x = true // 为了只执行一次的中间变量
+            if (this.groupPartBasicNum.length === 0) { // 标准件和外购件
+              for (let i = 0; i < this.groupPartNum.length; i++) {
+                if (numGroup1.indexOf(parseInt(this.groupPartNum[i])) !== -1) {
+                  if (x) {
+                    this.$notify({
+                      title: '注意',
+                      message: '无法向该询价单中追加重复物料，已自动跳过',
+                      type: 'warning'
+                    })
+                    x = false
+                  }
+                } else {
+                  addInquirySheet1(this.inquirySheetFlowNum, this.groupPartNum[i], this.allNum[i]).then(response => {
+                    if (response.data[0].result === '1') {
+                      this.$message.success('操作成功')
+                      this.searchTable11()
+                      searchSheetDetail(this.inquirySheetFlowNum).then(response => {
+                        this.tableData3 = response.data
+                      })
+                    } else { this.$message.error('操作失败') }
+                  })
+                }
+              }
+            } else { // 基本件
+              for (let i = 0; i < this.groupPartBasicNum.length; i++) {
+                if (numGroup2.indexOf(parseInt(this.groupPartBasicNum[i])) !== -1) {
+                  if (x) {
+                    this.$notify({
+                      title: '注意',
+                      message: '无法向该询价单中追加重复零件，已自动跳过',
+                      type: 'warning'
+                    })
+                    x = false
+                  }
+                } else {
+                  addInquirySheet2(this.inquirySheetFlowNum, this.groupPartBasicNum[i], this.allNum[i]).then(response => {
+                    if (response.data[0].result === '1') {
+                      this.$message.success('操作成功')
+                      this.searchTable12()
+                      searchSheetDetail(this.inquirySheetFlowNum).then(response => {
+                        this.tableData3 = response.data
+                      })
+                    } else {
+                      this.$message.error('操作失败')
+                    }
+                  })
+                }
+              }
+            }
+          })
+        }
+      },
+      outInquirySheet(row) {
+        outInquirySheet(row.询价单明细流水号, row.组件零件流水号, row.组件零件基本件流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.searchTable11()
+            this.searchTable12()
+            searchSheetDetail(this.inquirySheetFlowNum).then(response => {
+              this.tableData3 = response.data
+            })
+            this.$message.success('操作成功')
+          } else { this.$message.error('操作失败') }
+        })
+      },
+      searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
+        this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
+        this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
+        this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
+        this.registeredCapital ? this.supplierCheck4 = 1 : (this.supplierCheck4 = 0, this.registeredCapital = '')
+        this.taxNum ? this.supplierCheck5 = 1 : (this.supplierCheck5 = 0, this.taxNum = '')
+        this.EMail ? this.supplierCheck6 = 1 : (this.supplierCheck6 = 0, this.EMail = '')
+        this.address ? this.supplierCheck7 = 1 : (this.supplierCheck7 = 0, this.address = '')
+        this.account ? this.supplierCheck8 = 1 : (this.supplierCheck8 = 0, this.account = '')
+        this.openingBank ? this.supplierCheck9 = 1 : (this.supplierCheck9 = 0, this.openingBank = '')
+        this.phone ? this.supplierCheck10 = 1 : (this.supplierCheck10 = 0, this.phone = '')
+        this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
+        this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
+        searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
+          this.tableData01 = response.data
+        })
+      },
+      showSupplierDetail(row) {
+        this.form2.supplierValue = row.供应商流水号
+        this.form2.supplierName = row.供应商名称
+        this.supplierValue = row.供应商流水号
+        this.supplierName = row.供应商名称
+        this.enterpriseNature = row.企业性质
+        this.createDate = row.创立日期
+        this.registeredCapital = row.注册资本
+        this.taxNum = row.税号
+        this.EMail = row.电子信箱
+        this.address = row.地址
+        this.account = row.帐号
+        this.openingBank = row.开户行
+        this.phone = row.电话号码
+        this.fax = row.传真
+        this.goodTime = row.货期
+      },
+      emptySupplierDetail() {
+        this.supplierValue = ''
+        this.supplierName = ''
+        this.enterpriseNature = ''
+        this.createDate = ''
+        this.registeredCapital = ''
+        this.taxNum = ''
+        this.EMail = ''
+        this.address = ''
+        this.account = ''
+        this.openingBank = ''
+        this.phone = ''
+        this.fax = ''
+        this.goodTime = ''
+      },
+      submitSelectSupplier() { // 确定选择供应商
+        this.dialogVisible1 = false
+      },
+      searchTable3(row) { // 查询该询价单中的物料和零件
+        this.tableData3 = []
+        this.inquirySheetFlowNum = row.询价单流水号
+        this.orderExport = row.询价单编号
+        searchSheetDetail(row.询价单流水号).then(response => {
+          console.log(response.data)
+          this.tableData3 = response.data
+        })
+      },
+      materialChange(row) { // 物料变更 标准件和外购件
+        this.dialogVisible3 = true
+        this.groupPartNumValue = row.组件零件流水号
+        this.standardAndPurchaseValue = row.标准件和外购件流水号
+        this.materialOldValue = row.物料流水号
+      },
+      partChange(row) { // 零件变更 基本件
+        this.$message('没有基本件的标准库')
+        console.log(row)
+      },
+      searchMaterial() {
+        if (this.materialName0 || this.materialSpec0 || this.materialModel0) {
+          let check1, check2, check3
+          this.materialName0 ? check1 = 1 : check1 = 0
+          this.materialSpec0 ? check2 = 1 : check2 = 0
+          this.materialModel0 ? check3 = 1 : check3 = 0
+          searchAllMaterial(check1, this.materialName0, check2, this.materialSpec0, check3, this.materialModel0, this.pageCurrent02, this.pageSize02).then(response => {
+            this.tableData02 = response.data.result
+            this.total02 = parseInt(response.data.output[0].ItemCount)
+          })
+        } else {
+          this.$message.warning('请至少输入一种搜索条件')
+        }
+      },
+      handleSizeChange02(val) {
+        this.pageSize02 = val
+        this.searchMaterial()
+      },
+      handleCurrentChange02(val) {
+        this.pageCurrent02 = val
+        this.searchMaterial()
+      },
+      selectNewMaterial(row) {
+        this.materialNew = ''
+        this.materialNewValue = row.物料流水号
+        this.materialNew += row.物料名称 + ' ' + row.物料规格 + ' ' + row.物料型号
+      },
+      submitMaterialChange() {
+        materialChange(this.groupPartNumValue, this.standardAndPurchaseValue, this.materialOldValue, this.materialNewValue, this.id).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('提交变更申请成功')
+            this.dialogVisible3 = false
+            this.searchTable11()
+          } else { this.$message.error('操作失败') }
+        })
+      },
+      tableRowClassName({ row, rowIndex }) {
+        if (parseInt(row.是否确认) === 0) {
+          return 'MistyRose'
+        }
+        return ''
       }
-    },
-    handleSizeChange02(val) {
-      this.pageSize02 = val
-      this.searchMaterial()
-    },
-    handleCurrentChange02(val) {
-      this.pageCurrent02 = val
-      this.searchMaterial()
-    },
-    selectNewMaterial(row) {
-      this.materialNew = ''
-      this.materialNewValue = row.物料流水号
-      this.materialNew += row.物料名称 + ' ' + row.物料规格 + ' ' + row.物料型号
-    },
-    submitMaterialChange() {
-      materialChange(this.groupPartNumValue, this.standardAndPurchaseValue, this.materialOldValue, this.materialNewValue, this.id).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('提交变更申请成功')
-          this.dialogVisible3 = false
-          this.searchTable11()
-        } else { this.$message.error('操作失败') }
-      })
-    },
-    tableRowClassName({ row, rowIndex }) {
-      if (parseInt(row.是否确认) === 0) {
-        return 'MistyRose'
-      }
-      return ''
     }
   }
-}
 </script>
 
 <style scoped>
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index bf23f102..e9b1c41f 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -129,13 +129,13 @@
         </el-table-column>
         <el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="120">
           <template slot-scope="scope">
-            <el-input v-show="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:100%"/>
+            <el-input-number v-show="hasTax==='未税'" :min="0" v-model="scope.row.未税单价" controls-position="right" size="mini" style="width:100%" @focus="scope.row.未税单价=''" @change="priceChange(scope.row.未税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row)"/>
             <b v-show="hasTax!=='未税'">—</b>
           </template>
         </el-table-column>
         <el-table-column v-show="hasTax==='含税'" label="单价（含税）" align="center" width="120">
           <template slot-scope="scope">
-            <el-input v-show="hasTax==='含税'" v-model="scope.row.含税单价" size="mini" style="width:100%"/>
+            <el-input-number v-show="hasTax==='含税'" :min="0" v-model="scope.row.含税单价" controls-position="right" size="mini" style="width:100%" @focus="scope.row.含税单价=''" @change="priceChange(scope.row.含税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row)"/>
             <b v-show="hasTax!=='含税'">—</b>
           </template>
         </el-table-column>
@@ -184,213 +184,236 @@
 </template>
 
 <script>
-import Tinymce from '@/components/Tinymce'
-import { initSupplier, searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo } from '@/api/PurchasingCenter/CreatePurchaseContract'
-import { convertCurrency } from '@/vendor/int2Chinese'
-import { mapGetters } from 'vuex'
-import { sleep, groupBy } from '@/utils/tool'
-import $ from 'jquery'
+  import Tinymce from '@/components/Tinymce'
+  import { initSupplier, searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo, savePrice } from '@/api/PurchasingCenter/CreatePurchaseContract'
+  import { convertCurrency } from '@/vendor/int2Chinese'
+  import { mapGetters } from 'vuex'
+  import { sleep, groupBy } from '@/utils/tool'
+  import $ from 'jquery'
 
-export default {
-  components: { Tinymce },
-  inject: ['reload'],
-  data() {
-    return {
-      supplier: [],
-      year: '',
-      month: '',
-      day: '',
-      trustee: '', // 受托人
-      bank1: '',
-      account1: '',
-      taxCode1: '',
-      phone1: '',
-      fax1: '',
-      postCode1: '',
-      bank2: '',
-      account2: '',
-      taxCode2: '',
-      phone2: '',
-      fax2: '',
-      postCode2: '',
-      hasTax: '含税',
-      taxRate: 0.13,
-      preview: false, // 预览
-      demoRadio: '', // 模板radio
-      content: ``, // 合同格式模板
-      contentNew: ``, // tinymce的
-      contractName: '采购合同', // 合同名称
-      contractNum: '', // 合同编号
-      contractNums: [], // 合同编号数组
-      contractNumValue: '', // 合同流水号
-      supplierName: '', // 供应商名称
-      supplierValue: '', // 供应商流水号
-      supplierAddress: '', // 供应商地址
-      legalPerson: '', // 法人
-      untaxTotal: '', // 未税合计
-      tax: '', // 税额
-      taxTotal: '', // 含税合计
-      actualTotal: '', // 实际金额
-      actualTotal_zh: '', // 实际金额大写
-      payDate: '', // 支付日期
-      payMethod: '', // 支付方式
-      deliveryDate: '', // 交货日期
-      invoiceInfo: '', // 开票信息
-      otherInfo: '', // 其他说明
-      tableData1: [],
-      单价是否含税: '',
-      组件零件流水号组: [],
-      组件零件基本件流水号组: [],
-      数量组: [],
-      单价组: [],
-      交货期组: []
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'name',
-      'id'
-    ])
-  },
-  created() {
-    this.fetchData()
-  },
-  methods: {
-    deleteAllDate() {
-      this.tableData1.map(v => {
-        v.交货期 = ''
-      })
-    },
-    fetchData() {
-      initSupplier(this.id).then(res => {
-        this.supplier = []
-        for (let i = 0; i < res.data.length; i++) {
-          this.supplier.push({
-            value: res.data[i].供应商流水号,
-            label: res.data[i].供应商名称
-          })
-        }
-      })
-      searchBaseInfo(this.id).then(res => {
-        this.fax2 = res.data[0] ? res.data[0].传真 : ''
-        this.postCode2 = '224053'
-        this.phone2 = res.data[0] ? res.data[0].手机 + '/' + res.data[0].公司电话 : ''
-        this.taxCode2 = res.data[0] ? res.data[0].税号 : ''
-        this.account2 = res.data[0] ? res.data[0].帐号 : ''
-        this.bank2 = res.data[0] ? res.data[0].开户行 : ''
-      })
-      searchInquirySheet(0, 0, 0, 0, 1, this.id, 0, 0).then(response => { // 初始化询价单号
-        this.contractNums = []
-        for (let i = 0; i < response.data.length; i++) {
-          this.contractNums.push({
-            value: response.data[i].询价单流水号,
-            label: response.data[i].询价单编号,
-            supplierName: response.data[i].供应商名称,
-            supplierValue: response.data[i].供应商流水号,
-            supplierAddress: response.data[i].地址,
-            legalPerson: response.data[i].企业性质, // 法人
-            trustee: response.data[i].注册资本 || '', // 受托人
-            bank1: response.data[i].开户行 || '', // 开户行
-            account1: response.data[i].帐号 || '', // 帐号
-            taxCode1: response.data[i].税号 || '', // 税号
-            phone1: response.data[i].电话号码 || '', // 电话
-            fax1: response.data[i].传真 || '', // 传真
-            postCode1: response.data[i].货期 || '' // 邮编
-          })
-        }
-      })
-    },
-    submitTotal() { // 确定合同总额
-      this.$refs.tinymce.destroyTinymce()
-      document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
-      document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
-      document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
-      this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
-      this.$refs.tinymce.initTinymce()
-    },
-    supplierChange() {
-      let check
-      this.supplierValue ? check = 1 : check = 0
-      searchInquirySheet(0, 0, 0, 0, 1, this.id, check, this.supplierValue).then(response => { // 初始化询价单号
-        this.contractNums = []
-        this.contractNumValue = ''
-        for (let i = 0; i < response.data.length; i++) {
-          this.contractNums.push({
-            value: response.data[i].询价单流水号,
-            label: response.data[i].询价单编号,
-            supplierName: response.data[i].供应商名称,
-            supplierValue: response.data[i].供应商流水号,
-            supplierAddress: response.data[i].地址,
-            legalPerson: response.data[i].企业性质, // 法人
-            trustee: response.data[i].注册资本 || '', // 受托人
-            bank1: response.data[i].开户行 || '', // 开户行
-            account1: response.data[i].帐号 || '', // 帐号
-            taxCode1: response.data[i].税号 || '', // 税号
-            phone1: response.data[i].电话号码 || '', // 电话
-            fax1: response.data[i].传真 || '', // 传真
-            postCode1: response.data[i].货期 || '' // 邮编
-          })
-        }
-      })
-    },
-    contractChange() { // 选择合同select
-      for (let i = 0; i < this.contractNums.length; i++) {
-        if (this.contractNums[i].value === this.contractNumValue) {
-          this.supplierName = this.contractNums[i].supplierName
-          this.supplierValue = this.contractNums[i].supplierValue
-          this.supplierAddress = this.contractNums[i].supplierAddress
-          this.legalPerson = this.contractNums[i].legalPerson
-          this.contractNum = this.contractNums[i].label
-          this.trustee = this.contractNums[i].trustee
-          this.bank1 = this.contractNums[i].bank1
-          this.account1 = this.contractNums[i].account1
-          this.taxCode1 = this.contractNums[i].taxCode1
-          this.phone1 = this.contractNums[i].phone1
-          this.fax1 = this.contractNums[i].fax1
-          this.postCode1 = this.contractNums[i].postCode1
-        }
-      }
-      this.searchContractDetail()
-    },
-    searchContractDetail() { // 查询合同明细
-      this.tableData1 = []
-      searchSheetContract(this.contractNumValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.tableData1.push({
-            机床图号: response.data[i].机床图号,
-            组号: response.data[i].组号,
-            组件零件流水号: response.data[i].组件零件流水号,
-            组件零件基本件流水号: response.data[i].组件零件基本件流水号,
-            交货期: response.data[i].组件零件流水号 ? response.data[i].标准件和外购件交货期 : response.data[i].基本件交货期,
-            图号: response.data[i].组件零件流水号 ? response.data[i].物料型号 : response.data[i].零件图号,
-            名称: response.data[i].组件零件流水号 ? response.data[i].物料名称 : response.data[i].零件名称,
-            规格: response.data[i].组件零件流水号 ? response.data[i].物料规格 : response.data[i].规格,
-            数量: response.data[i].数量,
-            计量单位: response.data[i].计量单位,
-            未税单价: 0,
-            未税总额: 0,
-            含税单价: 0,
-            含税总额: 0,
-            备注: response.data[i].备注
-          })
-        }
-      })
-    },
-    demoChange() { // 模板change
-      switch (this.demoRadio) {
-        case '模板1':
-          this.demo1()
-          break
-        case '模板2':
-          this.demo2()
-          break
-        // case '自定义':
-        //   this.customization()
-        //   break
+  export default {
+    components: { Tinymce },
+    inject: ['reload'],
+    data() {
+      return {
+        supplier: [],
+        year: '',
+        month: '',
+        day: '',
+        trustee: '', // 受托人
+        bank1: '',
+        account1: '',
+        taxCode1: '',
+        phone1: '',
+        fax1: '',
+        postCode1: '',
+        bank2: '',
+        account2: '',
+        taxCode2: '',
+        phone2: '',
+        fax2: '',
+        postCode2: '',
+        hasTax: '含税',
+        taxRate: 0.13,
+        preview: false, // 预览
+        demoRadio: '', // 模板radio
+        content: ``, // 合同格式模板
+        contentNew: ``, // tinymce的
+        contractName: '采购合同', // 合同名称
+        contractNum: '', // 合同编号
+        contractNums: [], // 合同编号数组
+        contractNumValue: '', // 合同流水号
+        supplierName: '', // 供应商名称
+        supplierValue: '', // 供应商流水号
+        supplierAddress: '', // 供应商地址
+        legalPerson: '', // 法人
+        untaxTotal: '', // 未税合计
+        tax: '', // 税额
+        taxTotal: '', // 含税合计
+        actualTotal: '', // 实际金额
+        actualTotal_zh: '', // 实际金额大写
+        payDate: '', // 支付日期
+        payMethod: '', // 支付方式
+        deliveryDate: '', // 交货日期
+        invoiceInfo: '', // 开票信息
+        otherInfo: '', // 其他说明
+        tableData1: [],
+        单价是否含税: '',
+        组件零件流水号组: [],
+        组件零件基本件流水号组: [],
+        数量组: [],
+        单价组: [],
+        交货期组: []
       }
     },
-    demo1() { // 选择合同模板1
-      this.content = `
+    computed: {
+      ...mapGetters([
+        'name',
+        'id'
+      ])
+    },
+    created() {
+      this.fetchData()
+    },
+    methods: {
+      // 价格实时保存
+      priceChange(price, num1, num2, row) {
+        this.tableData1.map(v => {
+          if (Number(v.物料流水号) === Number(row.物料流水号) && Number(v.询价单流水号) === Number(row.询价单流水号)) {
+            v.含税单价 = row.含税单价
+            v.未税单价 = row.未税单价
+          }
+        })
+        const group = this.tableData1
+        this.tableData1 = []
+        this.tableData1 = group
+        price = price || 0
+        savePrice(price, num1, num2).then(res => {
+          if (res.data[0].result === '1') {
+            console.log('单价实时保存成功')
+          } else {
+            console.log('单价实时保存失败')
+          }
+        })
+      },
+      deleteAllDate() {
+        this.tableData1.map(v => {
+          v.交货期 = ''
+        })
+      },
+      fetchData() {
+        initSupplier(this.id).then(res => {
+          this.supplier = []
+          for (let i = 0; i < res.data.length; i++) {
+            this.supplier.push({
+              value: res.data[i].供应商流水号,
+              label: res.data[i].供应商名称
+            })
+          }
+        })
+        searchBaseInfo(this.id).then(res => {
+          this.fax2 = res.data[0] ? res.data[0].传真 : ''
+          this.postCode2 = '224053'
+          this.phone2 = res.data[0] ? res.data[0].手机 + '/' + res.data[0].公司电话 : ''
+          this.taxCode2 = res.data[0] ? res.data[0].税号 : ''
+          this.account2 = res.data[0] ? res.data[0].帐号 : ''
+          this.bank2 = res.data[0] ? res.data[0].开户行 : ''
+        })
+        searchInquirySheet(0, 0, 0, 0, 1, this.id, 0, 0).then(response => { // 初始化询价单号
+          this.contractNums = []
+          for (let i = 0; i < response.data.length; i++) {
+            this.contractNums.push({
+              value: response.data[i].询价单流水号,
+              label: response.data[i].询价单编号,
+              supplierName: response.data[i].供应商名称,
+              supplierValue: response.data[i].供应商流水号,
+              supplierAddress: response.data[i].地址,
+              legalPerson: response.data[i].企业性质, // 法人
+              trustee: response.data[i].注册资本 || '', // 受托人
+              bank1: response.data[i].开户行 || '', // 开户行
+              account1: response.data[i].帐号 || '', // 帐号
+              taxCode1: response.data[i].税号 || '', // 税号
+              phone1: response.data[i].电话号码 || '', // 电话
+              fax1: response.data[i].传真 || '', // 传真
+              postCode1: response.data[i].货期 || '' // 邮编
+            })
+          }
+        })
+      },
+      submitTotal() { // 确定合同总额
+        this.$refs.tinymce.destroyTinymce()
+        document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
+        document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
+        document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
+        this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
+        this.$refs.tinymce.initTinymce()
+      },
+      supplierChange() {
+        let check
+        this.supplierValue ? check = 1 : check = 0
+        searchInquirySheet(0, 0, 0, 0, 1, this.id, check, this.supplierValue).then(response => { // 初始化询价单号
+          this.contractNums = []
+          this.contractNumValue = ''
+          for (let i = 0; i < response.data.length; i++) {
+            this.contractNums.push({
+              value: response.data[i].询价单流水号,
+              label: response.data[i].询价单编号,
+              supplierName: response.data[i].供应商名称,
+              supplierValue: response.data[i].供应商流水号,
+              supplierAddress: response.data[i].地址,
+              legalPerson: response.data[i].企业性质, // 法人
+              trustee: response.data[i].注册资本 || '', // 受托人
+              bank1: response.data[i].开户行 || '', // 开户行
+              account1: response.data[i].帐号 || '', // 帐号
+              taxCode1: response.data[i].税号 || '', // 税号
+              phone1: response.data[i].电话号码 || '', // 电话
+              fax1: response.data[i].传真 || '', // 传真
+              postCode1: response.data[i].货期 || '' // 邮编
+            })
+          }
+        })
+      },
+      contractChange() { // 选择合同select
+        for (let i = 0; i < this.contractNums.length; i++) {
+          if (this.contractNums[i].value === this.contractNumValue) {
+            this.supplierName = this.contractNums[i].supplierName
+            this.supplierValue = this.contractNums[i].supplierValue
+            this.supplierAddress = this.contractNums[i].supplierAddress
+            this.legalPerson = this.contractNums[i].legalPerson
+            this.contractNum = this.contractNums[i].label
+            this.trustee = this.contractNums[i].trustee
+            this.bank1 = this.contractNums[i].bank1
+            this.account1 = this.contractNums[i].account1
+            this.taxCode1 = this.contractNums[i].taxCode1
+            this.phone1 = this.contractNums[i].phone1
+            this.fax1 = this.contractNums[i].fax1
+            this.postCode1 = this.contractNums[i].postCode1
+          }
+        }
+        this.searchContractDetail()
+      },
+      searchContractDetail() { // 查询合同明细
+        this.tableData1 = []
+        searchSheetContract(this.contractNumValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.tableData1.push({
+              询价单流水号: response.data[i].询价单流水号,
+              物料流水号: response.data[i].物料流水号,
+              询价单明细流水号: response.data[i].询价单明细流水号,
+              机床图号: response.data[i].机床图号,
+              组号: response.data[i].组号,
+              组件零件流水号: response.data[i].组件零件流水号,
+              组件零件基本件流水号: response.data[i].组件零件基本件流水号,
+              交货期: response.data[i].组件零件流水号 ? response.data[i].标准件和外购件交货期 : response.data[i].基本件交货期,
+              图号: response.data[i].组件零件流水号 ? response.data[i].物料型号 : response.data[i].零件图号,
+              名称: response.data[i].组件零件流水号 ? response.data[i].物料名称 : response.data[i].零件名称,
+              规格: response.data[i].组件零件流水号 ? response.data[i].物料规格 : response.data[i].规格,
+              数量: response.data[i].数量,
+              计量单位: response.data[i].计量单位,
+              未税单价: response.data[i].单价,
+              未税总额: 0,
+              含税单价: response.data[i].单价,
+              含税总额: 0,
+              备注: response.data[i].备注
+            })
+          }
+        })
+      },
+      demoChange() { // 模板change
+        switch (this.demoRadio) {
+          case '模板1':
+            this.demo1()
+            break
+          case '模板2':
+            this.demo2()
+            break
+          // case '自定义':
+          //   this.customization()
+          //   break
+        }
+      },
+      demo1() { // 选择合同模板1
+        this.content = `
 <h2 style="text-align: center;">
     <strong>采购合同</strong>
 </h2>
@@ -536,154 +559,161 @@ export default {
 <span>含税总价（税率<span id="taxRate"></span>）：</span><span id="taxTotal"></span><span>元</span><br>
 <span>优惠后含税总价：</span><span class="actualTotal"></span><span>元</span>
 `
-    },
-    async editContract() { // 选择一个询价单，整成合同明细
-      const date = new Date()
-      this.year = date.getFullYear()
-      this.month = date.getMonth() + 1
-      this.day = date.getDate()
-      this.demoChange()
-      await sleep(0)
-      if (this.contractNumValue) {
-        if (this.demoRadio) {
-          this.$refs.tinymce.destroyTinymce()
-          document.getElementById('contractName') ? document.getElementById('contractName').innerHTML = this.contractName : ''
-          document.getElementById('contractNum') ? document.getElementById('contractNum').innerHTML = this.contractNum : ''
-          document.getElementById('supplierName') ? document.getElementById('supplierName').innerHTML = this.supplierName : ''
-          document.getElementById('supplierAddress') ? document.getElementById('supplierAddress').innerHTML = this.supplierAddress : ''
-          document.getElementById('legalPerson') ? document.getElementById('legalPerson').innerHTML = this.legalPerson : ''
-          document.getElementById('payDate') ? document.getElementById('payDate').innerHTML = this.payDate : ''
-          document.getElementById('payMethod') ? document.getElementById('payMethod').innerHTML = this.payMethod : ''
-          document.getElementById('invoiceInfo') ? document.getElementById('invoiceInfo').innerHTML = this.invoiceInfo : ''
-          document.getElementById('deliveryDate') ? document.getElementById('deliveryDate').innerHTML = this.deliveryDate : ''
-          document.getElementById('otherInfo') ? document.getElementById('otherInfo').innerHTML = this.otherInfo : ''
-          document.getElementById('hasTax') ? document.getElementById('hasTax').innerHTML = this.hasTax : ''
-          document.getElementById('taxRate') ? document.getElementById('taxRate').innerHTML = this.taxRate * 100 + '%' : ''
-          // 明细表
-          // 移出旧数据
-          const children = document.getElementsByClassName('tableData')
-          const parent = document.getElementById('tbody')
-          if (children.length !== 0) {
-            for (let i = children.length - 1; i >= 0; i--) {
-              parent.removeChild(children[i])
+      },
+      async editContract() { // 选择一个询价单，整成合同明细
+        const date = new Date()
+        this.year = date.getFullYear()
+        this.month = date.getMonth() + 1
+        this.day = date.getDate()
+        this.demoChange()
+        await sleep(0)
+        if (this.contractNumValue) {
+          if (this.demoRadio) {
+            this.$refs.tinymce.destroyTinymce()
+            document.getElementById('contractName') ? document.getElementById('contractName').innerHTML = this.contractName : ''
+            document.getElementById('contractNum') ? document.getElementById('contractNum').innerHTML = this.contractNum : ''
+            document.getElementById('supplierName') ? document.getElementById('supplierName').innerHTML = this.supplierName : ''
+            document.getElementById('supplierAddress') ? document.getElementById('supplierAddress').innerHTML = this.supplierAddress : ''
+            document.getElementById('legalPerson') ? document.getElementById('legalPerson').innerHTML = this.legalPerson : ''
+            document.getElementById('payDate') ? document.getElementById('payDate').innerHTML = this.payDate : ''
+            document.getElementById('payMethod') ? document.getElementById('payMethod').innerHTML = this.payMethod : ''
+            document.getElementById('invoiceInfo') ? document.getElementById('invoiceInfo').innerHTML = this.invoiceInfo : ''
+            document.getElementById('deliveryDate') ? document.getElementById('deliveryDate').innerHTML = this.deliveryDate : ''
+            document.getElementById('otherInfo') ? document.getElementById('otherInfo').innerHTML = this.otherInfo : ''
+            document.getElementById('hasTax') ? document.getElementById('hasTax').innerHTML = this.hasTax : ''
+            document.getElementById('taxRate') ? document.getElementById('taxRate').innerHTML = this.taxRate * 100 + '%' : ''
+            // 明细表
+            // 移出旧数据
+            const children = document.getElementsByClassName('tableData')
+            const parent = document.getElementById('tbody')
+            if (children.length !== 0) {
+              for (let i = children.length - 1; i >= 0; i--) {
+                parent.removeChild(children[i])
+              }
             }
+            const merge = []
+            this.tableData1.map(v => {
+              if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
+                merge.push({
+                  机床图号: v.机床图号,
+                  组号: v.组号,
+                  图号: v.图号,
+                  名称: v.名称,
+                  规格: v.规格,
+                  数量: Number(v.数量),
+                  计量单位: v.计量单位,
+                  单价: this.hasTax === '含税' ? v.含税单价 : v.未税单价,
+                  合计: (Number(v.数量) * (this.hasTax === '含税' ? Number(v.含税单价) : Number(v.未税单价))).toFixed(2),
+                  交货期: v.交货期 ? v.交货期.split(' ')[0] : '',
+                  备注: v.备注
+                })
+              }
+            })
+            let mergeData = []
+            mergeData = groupBy(merge, ['图号', '名称', '规格', '计量单位', '单价', '交货期', '备注'])
+            // 放入新数据
+            const tr = []
+            for (let i = 0; i < mergeData.length; i++) {
+              tr[i] = document.createElement('tr')
+              tr[i].setAttribute('class', 'tableData')
+              tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
+              const tableHead = $('#tableHead')
+              tableHead ? tableHead.after(tr[i]) : ''
+            }
+            this.actualTotal = 0
+            this.untaxTotal = 0
+            this.taxTotal = 0
+            for (let j = 0; j < this.tableData1.length; j++) {
+              this.actualTotal += Number(this.tableData1[j].含税总额)
+              this.untaxTotal += Number(this.tableData1[j].未税总额)
+              this.taxTotal += Number(this.tableData1[j].含税总额)
+            }
+            for (let j = 0; j < mergeData.length; j++) {
+              if (document.getElementsByClassName('tableData')[j]) {
+                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+                document.getElementsByClassName('tableData')[j].children[1].innerHTML = mergeData[j].机床图号_组号
+                document.getElementsByClassName('tableData')[j].children[2].innerHTML = mergeData[j].名称
+                document.getElementsByClassName('tableData')[j].children[3].innerHTML = mergeData[j].图号
+                document.getElementsByClassName('tableData')[j].children[4].innerHTML = mergeData[j].规格
+                document.getElementsByClassName('tableData')[j].children[5].innerHTML = mergeData[j].数量
+                document.getElementsByClassName('tableData')[j].children[6].innerHTML = mergeData[j].计量单位
+                document.getElementsByClassName('tableData')[j].children[7].innerHTML = mergeData[j].单价
+                document.getElementsByClassName('tableData')[j].children[8].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2)
+                document.getElementsByClassName('tableData')[j].children[9].innerHTML = mergeData[j].交货期
+                document.getElementsByClassName('tableData')[j].children[10].innerHTML = mergeData[j].备注
+              }
+            }
+            this.actualTotal = this.actualTotal.toFixed(2)
+            this.untaxTotal = this.untaxTotal.toFixed(2)
+            this.taxTotal = this.taxTotal.toFixed(2)
+            this.tax = (this.taxTotal - this.untaxTotal).toFixed(2)
+            document.getElementById('untaxTotal') ? document.getElementById('untaxTotal').innerHTML = this.untaxTotal : ''
+            document.getElementById('tax') ? document.getElementById('tax').innerHTML = this.tax : ''
+            document.getElementById('taxTotal') ? document.getElementById('taxTotal').innerHTML = this.taxTotal : ''
+            document.getElementsByClassName('actualTotal')[0] ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
+            document.getElementsByClassName('actualTotal')[1] ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : ''
+            document.getElementById('actualTotal_zh') ? document.getElementById('actualTotal_zh').innerHTML = this.actualTotal_zh : ''
+            this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
+            this.$refs.tinymce.initTinymce()
+          } else {
+            this.$message.warning('请先选择合同模板，再预览')
           }
-          const merge = []
-          this.tableData1.map(v => {
-            merge.push({
-              机床图号: v.机床图号,
-              组号: v.组号,
-              图号: v.图号,
-              名称: v.名称,
-              规格: v.规格,
-              数量: Number(v.数量),
-              计量单位: v.计量单位,
-              单价: this.hasTax === '含税' ? v.含税单价 : v.未税单价,
-              合计: (Number(v.数量) * (this.hasTax === '含税' ? Number(v.含税单价) : Number(v.未税单价))).toFixed(2),
-              交货期: v.交货期 ? v.交货期.split(' ')[0] : '',
-              备注: v.备注
+        } else {
+          this.$message.warning('请先选择合同，再预览')
+        }
+      },
+      demo2() {
+        this.content = `demo2`
+      },
+      // customization() { // 自定义
+      //   this.content = `自定义`
+      // },
+      generateContract() { // 生成采购合同
+        this.content = this.contentNew.replace(/&nbsp;/g, '')
+        this.content = this.content.replace(/\n/g, '')
+        this.content = this.content.replace(/==/g, '= =') // 更新tinymce中的东西到html中，后续会用到
+        this.组件零件流水号组 = []
+        this.组件零件基本件流水号组 = []
+        this.数量组 = []
+        this.单价组 = []
+        this.交货期组 = []
+        this.hasTax === '含税' ? this.单价是否含税 = 1 : this.单价是否含税 = 0
+        const inquiryDetailNum_old = [] // 需要转移到新询价单的物料的询价单明细流水号
+        this.tableData1.map(v => {
+          if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
+            this.组件零件流水号组.push(v.组件零件流水号)
+            this.组件零件基本件流水号组.push(v.组件零件基本件流水号)
+            this.数量组.push(v.数量)
+            this.hasTax === '含税' ? this.单价组.push(v.含税单价) : this.单价组.push(v.未税单价)
+            this.交货期组.push(v.交货期)
+          } else { // 获取未询到价格的物料的询价单明细流水号们
+            inquiryDetailNum_old.push(v.询价单明细流水号)
+          }
+        })
+        if (this.contractNumValue) {
+          this.$confirm('此采购合同将递交审批，递交后该合同不可删除，确认完成编辑？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('合同生成成功')
+                this.reload()
+              } else { this.$message.error('生成合同失败') }
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消操作'
             })
           })
-          let mergeData = []
-          mergeData = groupBy(merge, ['图号', '名称', '规格', '计量单位', '单价', '合计', '交货期', '备注'])
-          // 放入新数据
-          const tr = []
-          for (let i = 0; i < mergeData.length; i++) {
-            tr[i] = document.createElement('tr')
-            tr[i].setAttribute('class', 'tableData')
-            tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
-            const tableHead = $('#tableHead')
-            tableHead ? tableHead.after(tr[i]) : ''
-          }
-          this.actualTotal = 0
-          this.untaxTotal = 0
-          this.taxTotal = 0
-          for (let j = 0; j < this.tableData1.length; j++) {
-            this.actualTotal += Number(this.tableData1[j].含税总额)
-            this.untaxTotal += Number(this.tableData1[j].未税总额)
-            this.taxTotal += Number(this.tableData1[j].含税总额)
-          }
-          for (let j = 0; j < mergeData.length; j++) {
-            if (document.getElementsByClassName('tableData')[j]) {
-              document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-              document.getElementsByClassName('tableData')[j].children[1].innerHTML = mergeData[j].机床图号_组号
-              document.getElementsByClassName('tableData')[j].children[2].innerHTML = mergeData[j].名称
-              document.getElementsByClassName('tableData')[j].children[3].innerHTML = mergeData[j].图号
-              document.getElementsByClassName('tableData')[j].children[4].innerHTML = mergeData[j].规格
-              document.getElementsByClassName('tableData')[j].children[5].innerHTML = mergeData[j].数量
-              document.getElementsByClassName('tableData')[j].children[6].innerHTML = mergeData[j].计量单位
-              document.getElementsByClassName('tableData')[j].children[7].innerHTML = mergeData[j].单价
-              document.getElementsByClassName('tableData')[j].children[8].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2)
-              document.getElementsByClassName('tableData')[j].children[9].innerHTML = mergeData[j].交货期
-              document.getElementsByClassName('tableData')[j].children[10].innerHTML = mergeData[j].备注
-            }
-          }
-          this.actualTotal = this.actualTotal.toFixed(2)
-          this.untaxTotal = this.untaxTotal.toFixed(2)
-          this.taxTotal = this.taxTotal.toFixed(2)
-          this.tax = (this.taxTotal - this.untaxTotal).toFixed(2)
-          document.getElementById('untaxTotal') ? document.getElementById('untaxTotal').innerHTML = this.untaxTotal : ''
-          document.getElementById('tax') ? document.getElementById('tax').innerHTML = this.tax : ''
-          document.getElementById('taxTotal') ? document.getElementById('taxTotal').innerHTML = this.taxTotal : ''
-          document.getElementsByClassName('actualTotal')[0] ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
-          document.getElementsByClassName('actualTotal')[1] ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : ''
-          document.getElementById('actualTotal_zh') ? document.getElementById('actualTotal_zh').innerHTML = this.actualTotal_zh : ''
-          this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
-          this.$refs.tinymce.initTinymce()
         } else {
-          this.$message.warning('请先选择合同模板，再预览')
+          this.$message.warning('请先选择合同进行编辑')
         }
-      } else {
-        this.$message.warning('请先选择合同，再预览')
-      }
-    },
-    demo2() {
-      this.content = `demo2`
-    },
-    // customization() { // 自定义
-    //   this.content = `自定义`
-    // },
-    generateContract() { // 生成采购合同
-      this.content = this.contentNew.replace(/&nbsp;/g, '')
-      this.content = this.content.replace(/\n/g, '')
-      this.content = this.content.replace(/==/g, '= =') // 更新tinymce中的东西到html中，后续会用到
-      this.组件零件流水号组 = []
-      this.组件零件基本件流水号组 = []
-      this.数量组 = []
-      this.单价组 = []
-      this.交货期组 = []
-      this.hasTax === '含税' ? this.单价是否含税 = 1 : this.单价是否含税 = 0
-      for (let i = 0; i < this.tableData1.length; i++) {
-        this.组件零件流水号组.push(this.tableData1[i].组件零件流水号)
-        this.组件零件基本件流水号组.push(this.tableData1[i].组件零件基本件流水号)
-        this.数量组.push(this.tableData1[i].数量)
-        this.hasTax === '含税' ? this.单价组.push(this.tableData1[i].含税单价) : this.单价组.push(this.tableData1[i].未税单价)
-        this.交货期组.push(this.tableData1[i].交货期)
-      }
-      if (this.contractNumValue) {
-        this.$confirm('此采购合同将递交审批，递交后该合同不可删除，确认完成编辑？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('合同生成成功')
-              this.reload()
-            } else { this.$message.error('生成合同失败') }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消操作'
-          })
-        })
-      } else {
-        this.$message.warning('请先选择合同进行编辑')
       }
     }
   }
-}
 </script>
 
 <style scoped>
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index b0d220fe..a0bd421c 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -166,11 +166,11 @@
                 {{ scope.row.供货商 }}
               </template>
             </el-table-column>
-            <el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">
-              <template slot-scope="scope">
-                {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
-              </template>
-            </el-table-column>
+            <!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column align="center" label="计划到货时间" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料计划到货时间.split(' ')[0] }}
@@ -380,11 +380,11 @@
                 {{ scope.row.供货商 }}
               </template>
             </el-table-column>
-            <el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">
-              <template slot-scope="scope">
-                {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
-              </template>
-            </el-table-column>
+            <!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column align="center" label="计划到货时间" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料计划到货时间.split(' ')[0] }}
@@ -615,388 +615,388 @@
 </template>
 
 <script>
-import { initMaterialCategory, initMaterialVariety, initProject, initBuyer, searchMachine, searchGroup, searchTable1, searchTable2, allocateTask1,
-  allocateTask2, executeReturn1, executeReturn2, retract1, retract2 } from '@/api/PurchasingCenter/PurchaseTaskAllocate'
-import { mapGetters } from 'vuex'
+  import { initMaterialCategory, initMaterialVariety, initProject, initBuyer, searchMachine, searchGroup, searchTable1, searchTable2, allocateTask1,
+    allocateTask2, executeReturn1, executeReturn2, retract1, retract2 } from '@/api/PurchasingCenter/PurchaseTaskAllocate'
+  import { mapGetters } from 'vuex'
 
-export default {
-  name: '', // 采购任务分配
-  data() {
-    return {
-      source: [
-        {
-          text: 'BZ',
-          value: 1
-        },
-        {
-          text: 'WG',
-          value: 2
-        }
-      ],
-      tabName: '标准件',
-      partNum: '',
-      partName: '',
-      partSpec: '',
-      partMaterial: '',
-      materialSpec: '',
-      materialModel: '',
-      MaterialCategoryValue: '', // 物料类别
-      MaterialCategory: [], // 物料类别数组
-      MaterialVarietyValue: '', // 物料品种
-      MaterialVariety: [], // 物料品种数组
-      projectValue: '',
-      project: [],
-      machineValue: '',
-      machine: [],
-      groupValue: '',
-      group: [],
-      materialName: '',
-      materialStatusValue: [0], // 物料状态
-      materialStatus: [
-        {
-          value: 0,
-          label: '全部'
-        },
-        {
-          value: 1,
-          label: '未分配'
-        },
-        {
-          value: 2,
-          label: '已分配',
-          children: [{
-            value: 3,
-            label: '未询价'
-          }, {
-            value: 4,
-            label: '已询价',
+  export default {
+    name: '', // 采购任务分配
+    data() {
+      return {
+        source: [
+          {
+            text: 'BZ',
+            value: 1
+          },
+          {
+            text: 'WG',
+            value: 2
+          }
+        ],
+        tabName: '标准件',
+        partNum: '',
+        partName: '',
+        partSpec: '',
+        partMaterial: '',
+        materialSpec: '',
+        materialModel: '',
+        MaterialCategoryValue: '', // 物料类别
+        MaterialCategory: [], // 物料类别数组
+        MaterialVarietyValue: '', // 物料品种
+        MaterialVariety: [], // 物料品种数组
+        projectValue: '',
+        project: [],
+        machineValue: '',
+        machine: [],
+        groupValue: '',
+        group: [],
+        materialName: '',
+        materialStatusValue: [0], // 物料状态
+        materialStatus: [
+          {
+            value: 0,
+            label: '全部'
+          },
+          {
+            value: 1,
+            label: '未分配'
+          },
+          {
+            value: 2,
+            label: '已分配',
             children: [{
-              value: 5,
-              label: '未采购'
+              value: 3,
+              label: '未询价'
             }, {
-              value: 6,
-              label: '已采购'
+              value: 4,
+              label: '已询价',
+              children: [{
+                value: 5,
+                label: '未采购'
+              }, {
+                value: 6,
+                label: '已采购'
+              }]
             }]
-          }]
-        }
-      ], // 物料状态
-      personValue: '',
-      person: [],
-      check1: 0,
-      check2: 0,
-      check3: 0,
-      check4: 0,
-      tableData0: [],
-      tableData1: [],
-      tableData2: [],
-      standardAndPurchase: [],
-      basic: [],
-      groupAndPart: [],
-      groupAndPartBasic: [],
-      pageCurrent0: 1,
-      pageSize0: 20,
-      total0: 0,
-      pageCurrent1: 1,
-      pageSize1: 20,
-      total1: 0,
-      pageCurrent2: 1,
-      pageSize2: 20,
-      total2: 0
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'name',
-      'id'
-    ])
-  },
-  created() {
-    this.searchTable0() // 查表1
-    this.fetchData() // 初始化数据
-  },
-  methods: {
-    filterSource(value, row) {
-      return Number(row['零件类型']) === Number(value)
+          }
+        ], // 物料状态
+        personValue: '',
+        person: [],
+        check1: 0,
+        check2: 0,
+        check3: 0,
+        check4: 0,
+        tableData0: [],
+        tableData1: [],
+        tableData2: [],
+        standardAndPurchase: [],
+        basic: [],
+        groupAndPart: [],
+        groupAndPartBasic: [],
+        pageCurrent0: 1,
+        pageSize0: 20,
+        total0: 0,
+        pageCurrent1: 1,
+        pageSize1: 20,
+        total1: 0,
+        pageCurrent2: 1,
+        pageSize2: 20,
+        total2: 0
+      }
     },
-    // 撤回
-    retract(row) {
-      this.$confirm('是否撤回重新分配?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (this.tabName === '基本件') {
-          retract2(row.基本件流水号).then(res => {
-            if (Number(res.data[0].result) === 1) {
-              this.$message.success('撤回成功')
-              this.searchTable2()
-            } else {
-              this.$message.error('撤回失败')
-            }
+    computed: {
+      ...mapGetters([
+        'name',
+        'id'
+      ])
+    },
+    created() {
+      this.searchTable0() // 查表1
+      this.fetchData() // 初始化数据
+    },
+    methods: {
+      filterSource(value, row) {
+        return Number(row['零件类型']) === Number(value)
+      },
+      // 撤回
+      retract(row) {
+        this.$confirm('是否撤回重新分配?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          if (this.tabName === '基本件') {
+            retract2(row.基本件流水号).then(res => {
+              if (Number(res.data[0].result) === 1) {
+                this.$message.success('撤回成功')
+                this.searchTable2()
+              } else {
+                this.$message.error('撤回失败')
+              }
+            })
+          } else {
+            retract1(row.标准件和外购件流水号).then(res => {
+              if (Number(res.data[0].result) === 1) {
+                this.$message.success('撤回成功')
+                this.searchTable0()
+                this.searchTable1()
+              } else {
+                this.$message.error('撤回失败')
+              }
+            })
+          }
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
           })
+        })
+      },
+      fetchData() { // 初始化
+        initProject().then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.project.push({
+              label: response.data[i].项目名称,
+              value: response.data[i].项目流水号
+            })
+          }
+        })
+        initBuyer().then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.person.push({
+              text: response.data[i].姓名,
+              label: response.data[i].姓名,
+              value: response.data[i].人员编号
+            })
+          }
+        })
+        this.getSelect(initMaterialCategory, ['物料类别', '物料类别流水号'], 'MaterialCategory', [0, this.DepartmentValue])
+      },
+      projectChange() {
+        this.machine = []
+        this.machineValue = ''
+        this.group = []
+        this.groupValue = ''
+        searchMachine(this.projectValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.machine.push({
+              value: response.data[i].机床流水号,
+              label: response.data[i].机床图号,
+              name: response.data[i].机床名称
+            })
+          }
+        })
+      },
+      machineChange() {
+        this.group = []
+        this.groupValue = ''
+        searchGroup(this.machineValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.group.push({
+              value: response.data[i].组件流水号,
+              label: response.data[i].组号
+            })
+          }
+        })
+      },
+      searchMaterialVariety() { // 初始化物料品种
+        this.MaterialVariety = []
+        this.MaterialVarietyValue = ''
+        this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
+      },
+      searchTable0() { // 查询标准件
+        this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
+        this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
+        this.projectValue ? this.check3 = 1 : this.check3 = 0
+        let check0, check1, check2, check3
+        this.machineValue ? check0 = 1 : check0 = 0
+        this.groupValue ? check1 = 1 : check1 = 0
+        this.materialName ? this.check4 = 1 : this.check4 = 0
+        this.materialSpec ? check2 = 1 : check2 = 0
+        this.materialModel ? check3 = 1 : check3 = 0
+        searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1).then(response => {
+          this.tableData0 = response.data.rows
+          this.total0 = response.data.total
+        })
+      },
+      searchTable1() { // 查询外购件
+        this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
+        this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
+        this.projectValue ? this.check3 = 1 : this.check3 = 0
+        let check0, check1, check2, check3
+        this.machineValue ? check0 = 1 : check0 = 0
+        this.groupValue ? check1 = 1 : check1 = 0
+        this.materialName ? this.check4 = 1 : this.check4 = 0
+        this.materialSpec ? check2 = 1 : check2 = 0
+        this.materialModel ? check3 = 1 : check3 = 0
+        searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
+          this.tableData1 = response.data.rows
+          this.total1 = response.data.total
+        })
+      },
+      searchTable2() { // 查询基本件
+        this.projectValue ? this.check3 = 1 : this.check3 = 0
+        let check1, check2, check3, check4, check5, check6
+        this.partNum ? check1 = 1 : check1 = 0
+        this.partName ? check2 = 1 : check2 = 0
+        this.partSpec ? check3 = 1 : check3 = 0
+        this.partMaterial ? check4 = 1 : check4 = 0
+        this.machineValue ? check5 = 1 : check5 = 0
+        this.groupValue ? check6 = 1 : check6 = 0
+        searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
+          this.tableData2 = response.data.rows
+          this.total2 = response.data.total
+        })
+      },
+      handleSelectionChange1(val) { // 标准件和外购件多选
+        this.standardAndPurchase = []
+        this.groupAndPart = []
+        for (let i = 0; i < val.length; i++) {
+          this.standardAndPurchase.push(val[i].标准件和外购件流水号)
+          this.groupAndPart.push(val[i].组件零件流水号)
+        }
+      },
+      handleSelectionChange2(val) { // 基本件多选
+        this.basic = []
+        this.groupAndPartBasic = []
+        for (let i = 0; i < val.length; i++) {
+          this.basic.push(val[i].基本件流水号)
+          this.groupAndPartBasic.push(val[i].组件零件基本件流水号)
+        }
+      },
+      selectable(row) { // 多选禁用
+        return row.人员编号 === '' || row.人员编号 === null
+      },
+      allocateTask1() { // 标准件和外购件分配任务
+        if (!this.personValue) {
+          this.$message.error('请选择采购员')
+        } else if (this.standardAndPurchase.length === 0) {
+          this.$message.error('请选择需分配的物料')
         } else {
-          retract1(row.标准件和外购件流水号).then(res => {
-            if (Number(res.data[0].result) === 1) {
-              this.$message.success('撤回成功')
-              this.searchTable0()
-              this.searchTable1()
-            } else {
-              this.$message.error('撤回失败')
-            }
+          this.$confirm('此操作执行后不可修改，是否确定分配?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            allocateTask1(this.standardAndPurchase, this.personValue).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('操作成功')
+                this.searchTable0()
+                this.searchTable1()
+              } else { this.$message.error('操作失败') }
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消操作'
+            })
           })
         }
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        })
-      })
-    },
-    fetchData() { // 初始化
-      initProject().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.project.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+      },
+      allocateTask2() { // 基本件分配任务
+        if (!this.personValue) {
+          this.$message.error('请选择采购员')
+        } else if (this.basic.length === 0) {
+          this.$message.error('请选择需分配的零件')
+        } else {
+          this.$confirm('此操作执行后不可修改，是否确定分配?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            allocateTask2(this.basic, this.personValue).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('操作成功')
+                this.searchTable2()
+              } else { this.$message.error('操作失败') }
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消操作'
+            })
           })
         }
-      })
-      initBuyer().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.person.push({
-            text: response.data[i].姓名,
-            label: response.data[i].姓名,
-            value: response.data[i].人员编号
+      },
+      filterHandler(value, row) {
+        return parseInt(row['人员编号']) === parseInt(value)
+      },
+      handleSizeChange0(val) {
+        this.pageSize0 = val
+        this.pageCurrent0 = 1
+        this.searchTable0()
+      },
+      handleCurrentChange0(val) {
+        this.pageCurrent0 = val
+        this.searchTable0()
+      },
+      handleSizeChange1(val) {
+        this.pageSize1 = val
+        this.pageCurrent1 = 1
+        this.searchTable1()
+      },
+      handleCurrentChange1(val) {
+        this.pageCurrent1 = val
+        this.searchTable1()
+      },
+      handleSizeChange2(val) {
+        this.pageSize2 = val
+        this.pageCurrent2 = 1
+        this.searchTable2()
+      },
+      handleCurrentChange2(val) {
+        this.pageCurrent2 = val
+        this.searchTable2()
+      },
+      executeReturn1() { // 退回标准件和外购件
+        if (this.standardAndPurchase.length === 0) {
+          this.$message.error('请选择需退回的物料')
+        } else {
+          this.$confirm('此操作执行后不可修改，是否确定退回?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            executeReturn1(this.standardAndPurchase, this.groupAndPart).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('操作成功')
+                this.searchTable0()
+                this.searchTable1()
+              } else { this.$message.error('操作失败') }
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消操作'
+            })
           })
         }
-      })
-      this.getSelect(initMaterialCategory, ['物料类别', '物料类别流水号'], 'MaterialCategory', [0, this.DepartmentValue])
-    },
-    projectChange() {
-      this.machine = []
-      this.machineValue = ''
-      this.group = []
-      this.groupValue = ''
-      searchMachine(this.projectValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.machine.push({
-            value: response.data[i].机床流水号,
-            label: response.data[i].机床图号,
-            name: response.data[i].机床名称
+      },
+      executeReturn2() { // 退回基本件
+        if (this.basic.length === 0) {
+          this.$message.error('请选择需退回的零件')
+        } else {
+          this.$confirm('此操作执行后不可修改，是否确定退回?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            executeReturn2(this.basic, this.groupAndPartBasic).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('操作成功')
+                this.searchTable2()
+              } else { this.$message.error('操作失败') }
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消操作'
+            })
           })
         }
-      })
-    },
-    machineChange() {
-      this.group = []
-      this.groupValue = ''
-      searchGroup(this.machineValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.group.push({
-            value: response.data[i].组件流水号,
-            label: response.data[i].组号
-          })
-        }
-      })
-    },
-    searchMaterialVariety() { // 初始化物料品种
-      this.MaterialVariety = []
-      this.MaterialVarietyValue = ''
-      this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
-    },
-    searchTable0() { // 查询标准件
-      this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
-      this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
-      this.projectValue ? this.check3 = 1 : this.check3 = 0
-      let check0, check1, check2, check3
-      this.machineValue ? check0 = 1 : check0 = 0
-      this.groupValue ? check1 = 1 : check1 = 0
-      this.materialName ? this.check4 = 1 : this.check4 = 0
-      this.materialSpec ? check2 = 1 : check2 = 0
-      this.materialModel ? check3 = 1 : check3 = 0
-      searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1).then(response => {
-        this.tableData0 = response.data.rows
-        this.total0 = response.data.total
-      })
-    },
-    searchTable1() { // 查询外购件
-      this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
-      this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
-      this.projectValue ? this.check3 = 1 : this.check3 = 0
-      let check0, check1, check2, check3
-      this.machineValue ? check0 = 1 : check0 = 0
-      this.groupValue ? check1 = 1 : check1 = 0
-      this.materialName ? this.check4 = 1 : this.check4 = 0
-      this.materialSpec ? check2 = 1 : check2 = 0
-      this.materialModel ? check3 = 1 : check3 = 0
-      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
-        this.tableData1 = response.data.rows
-        this.total1 = response.data.total
-      })
-    },
-    searchTable2() { // 查询基本件
-      this.projectValue ? this.check3 = 1 : this.check3 = 0
-      let check1, check2, check3, check4, check5, check6
-      this.partNum ? check1 = 1 : check1 = 0
-      this.partName ? check2 = 1 : check2 = 0
-      this.partSpec ? check3 = 1 : check3 = 0
-      this.partMaterial ? check4 = 1 : check4 = 0
-      this.machineValue ? check5 = 1 : check5 = 0
-      this.groupValue ? check6 = 1 : check6 = 0
-      searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
-        this.tableData2 = response.data.rows
-        this.total2 = response.data.total
-      })
-    },
-    handleSelectionChange1(val) { // 标准件和外购件多选
-      this.standardAndPurchase = []
-      this.groupAndPart = []
-      for (let i = 0; i < val.length; i++) {
-        this.standardAndPurchase.push(val[i].标准件和外购件流水号)
-        this.groupAndPart.push(val[i].组件零件流水号)
-      }
-    },
-    handleSelectionChange2(val) { // 基本件多选
-      this.basic = []
-      this.groupAndPartBasic = []
-      for (let i = 0; i < val.length; i++) {
-        this.basic.push(val[i].基本件流水号)
-        this.groupAndPartBasic.push(val[i].组件零件基本件流水号)
-      }
-    },
-    selectable(row) { // 多选禁用
-      return row.人员编号 === '' || row.人员编号 === null
-    },
-    allocateTask1() { // 标准件和外购件分配任务
-      if (!this.personValue) {
-        this.$message.error('请选择采购员')
-      } else if (this.standardAndPurchase.length === 0) {
-        this.$message.error('请选择需分配的物料')
-      } else {
-        this.$confirm('此操作执行后不可修改，是否确定分配?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          allocateTask1(this.standardAndPurchase, this.personValue).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('操作成功')
-              this.searchTable0()
-              this.searchTable1()
-            } else { this.$message.error('操作失败') }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消操作'
-          })
-        })
-      }
-    },
-    allocateTask2() { // 基本件分配任务
-      if (!this.personValue) {
-        this.$message.error('请选择采购员')
-      } else if (this.basic.length === 0) {
-        this.$message.error('请选择需分配的零件')
-      } else {
-        this.$confirm('此操作执行后不可修改，是否确定分配?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          allocateTask2(this.basic, this.personValue).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('操作成功')
-              this.searchTable2()
-            } else { this.$message.error('操作失败') }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消操作'
-          })
-        })
-      }
-    },
-    filterHandler(value, row) {
-      return parseInt(row['人员编号']) === parseInt(value)
-    },
-    handleSizeChange0(val) {
-      this.pageSize0 = val
-      this.pageCurrent0 = 1
-      this.searchTable0()
-    },
-    handleCurrentChange0(val) {
-      this.pageCurrent0 = val
-      this.searchTable0()
-    },
-    handleSizeChange1(val) {
-      this.pageSize1 = val
-      this.pageCurrent1 = 1
-      this.searchTable1()
-    },
-    handleCurrentChange1(val) {
-      this.pageCurrent1 = val
-      this.searchTable1()
-    },
-    handleSizeChange2(val) {
-      this.pageSize2 = val
-      this.pageCurrent2 = 1
-      this.searchTable2()
-    },
-    handleCurrentChange2(val) {
-      this.pageCurrent2 = val
-      this.searchTable2()
-    },
-    executeReturn1() { // 退回标准件和外购件
-      if (this.standardAndPurchase.length === 0) {
-        this.$message.error('请选择需退回的物料')
-      } else {
-        this.$confirm('此操作执行后不可修改，是否确定退回?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          executeReturn1(this.standardAndPurchase, this.groupAndPart).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('操作成功')
-              this.searchTable0()
-              this.searchTable1()
-            } else { this.$message.error('操作失败') }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消操作'
-          })
-        })
-      }
-    },
-    executeReturn2() { // 退回基本件
-      if (this.basic.length === 0) {
-        this.$message.error('请选择需退回的零件')
-      } else {
-        this.$confirm('此操作执行后不可修改，是否确定退回?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          executeReturn2(this.basic, this.groupAndPartBasic).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('操作成功')
-              this.searchTable2()
-            } else { this.$message.error('操作失败') }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消操作'
-          })
-        })
       }
     }
   }
-}
 </script>
 
 <style scoped>

From 2c4709dcde4e4081fa8d64ddaa093e078166c92b Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 13 Jun 2019 10:54:52 +0800
Subject: [PATCH 3/3] eslint

---
 src/views/Inventory/MaterialOut/index.vue     |  448 ++---
 .../CreateInquirySheet/index.vue              | 1640 ++++++++---------
 .../CreatePurchaseContract/index.vue          |  744 ++++----
 .../PurchaseTaskAllocate/index.vue            |  714 +++----
 4 files changed, 1773 insertions(+), 1773 deletions(-)

diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 47441f4f..14e4e766 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -219,240 +219,240 @@
 </template>
 
 <script>
-  import { initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, errorRecord, searchStockNumber3, initOutType } from '@/api/Inventory/MaterialOut'
-  import { mapGetters } from 'vuex'
-  export default {
-    name: 'MaterialOut',
-    data() {
-      return {
-        pickingListNum: '', // 领料单流水号
-        pickingPersonNum: '', // 领料人流水号
-        pickingListNumber: '',
-        pickingListNumberShow: '',
-        pickListTable1: [],
-        pageCurrent3: 1,
-        pageSize3: 20,
-        total3: 0,
-        pickListTable2: [],
-        StockNumberTable: [],
-        dialogFormVisible1: false,
-        dialogFormVisible2: false,
-        outType: [],
-        form1: {
-          machineValue: '',
-          groupNumValue: '',
-          outNumber: '',
-          outNumberMax: '', // 出库最大值
-          personValue: '',
-          outTypeValue: '' // 出库类别
-        },
-        form2: {
-          errorNumber: '',
-          reason: '',
-          物料流水号: '',
-          基本件流水号: '',
-          货位流水号: ''
-        },
-        rules1: {
-          machineValue: [{ required: true, message: '请选择' }],
-          groupNumValue: [{ required: true, message: '请选择' }],
-          outNumber: [{ required: true, message: '请输入' }],
-          personValue: [{ required: true, message: '请输入' }],
-          outTypeValue: [{ required: true, message: '请选择' }] // 出库类别
-        },
-        rules2: {
-          errorNumber: [{ required: true, message: '请输入' }],
-          reason: [{ required: true, message: '请输入' }]
-        },
-        machine: [],
-        group: [],
-        person: [],
-        materialNum: '', // 中间变量物料流水号
-        machineValue: '', // 中间变量机床流水号
-        groupNumValue: '', // 中间变量组件流水号
-        basePartNum: '', // 中间变量基本件流水号
-        purchaseBillNum: '', // 中间变量请购单明细流水号
-        parchasePartNum: '', // 中间变量标准件和外购件流水号
-        inventoryNum: '', // 中间变量仓库流水号
-        locationNum: '', // 中间变量货位流水号
-        outNumber: 0 // 中间变量出库数量
-      }
+import { initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, errorRecord, searchStockNumber3, initOutType } from '@/api/Inventory/MaterialOut'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'MaterialOut',
+  data() {
+    return {
+      pickingListNum: '', // 领料单流水号
+      pickingPersonNum: '', // 领料人流水号
+      pickingListNumber: '',
+      pickingListNumberShow: '',
+      pickListTable1: [],
+      pageCurrent3: 1,
+      pageSize3: 20,
+      total3: 0,
+      pickListTable2: [],
+      StockNumberTable: [],
+      dialogFormVisible1: false,
+      dialogFormVisible2: false,
+      outType: [],
+      form1: {
+        machineValue: '',
+        groupNumValue: '',
+        outNumber: '',
+        outNumberMax: '', // 出库最大值
+        personValue: '',
+        outTypeValue: '' // 出库类别
+      },
+      form2: {
+        errorNumber: '',
+        reason: '',
+        物料流水号: '',
+        基本件流水号: '',
+        货位流水号: ''
+      },
+      rules1: {
+        machineValue: [{ required: true, message: '请选择' }],
+        groupNumValue: [{ required: true, message: '请选择' }],
+        outNumber: [{ required: true, message: '请输入' }],
+        personValue: [{ required: true, message: '请输入' }],
+        outTypeValue: [{ required: true, message: '请选择' }] // 出库类别
+      },
+      rules2: {
+        errorNumber: [{ required: true, message: '请输入' }],
+        reason: [{ required: true, message: '请输入' }]
+      },
+      machine: [],
+      group: [],
+      person: [],
+      materialNum: '', // 中间变量物料流水号
+      machineValue: '', // 中间变量机床流水号
+      groupNumValue: '', // 中间变量组件流水号
+      basePartNum: '', // 中间变量基本件流水号
+      purchaseBillNum: '', // 中间变量请购单明细流水号
+      parchasePartNum: '', // 中间变量标准件和外购件流水号
+      inventoryNum: '', // 中间变量仓库流水号
+      locationNum: '', // 中间变量货位流水号
+      outNumber: 0 // 中间变量出库数量
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id'
+    ])
+  },
+  mounted() {
+    this.fetchData()
+    this.searchList()
+  },
+  methods: {
+    // 初始化数据
+    fetchData() {
+      this.person = []
+      initPickPerson().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      this.machine = []
+      initMachineProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machine.push({
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+      initOutType().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.outType.push({
+            label: response.data[i].出库类别名称,
+            value: response.data[i].出库类别流水号
+          })
+        }
+      })
     },
-    computed: {
-      ...mapGetters([
-        'id'
-      ])
+    // 查询组号
+    searchGroup() {
+      this.group = []
+      this.form1.groupNumValue = ''
+      searchgroup(this.form1.machineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.group.push({
+            label: response.data[i].组号,
+            value: Number(response.data[i].组件流水号)
+          })
+        }
+      })
     },
-    mounted() {
-      this.fetchData()
+    // 查询领料单列表
+    searchList() {
+      let check
+      this.pickingListNumber ? check = 1 : check = 0
+      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
+        this.pickListTable1 = response.data.rows
+        this.total3 = response.data.total
+      })
+    },
+    handleSizeChange3(val) {
+      this.pageSize3 = val
+      this.pageCurrent3 = 1
       this.searchList()
     },
-    methods: {
-      // 初始化数据
-      fetchData() {
-        this.person = []
-        initPickPerson().then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.person.push({
-              label: response.data[i].姓名,
-              value: response.data[i].人员编号
-            })
-          }
+    handleCurrentChange3(val) {
+      this.pageCurrent3 = val
+      this.searchList()
+    },
+    // 查看领料单明细
+    clickList(row) {
+      row && row.领料单流水号 ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
+      row && row.人员编号 ? this.pickingPersonNum = row.人员编号 : this.pickingListNum
+      row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
+      searchListDetail(this.pickingListNum).then(res => {
+        this.pickListTable2 = res.data
+      })
+    },
+    // 查看领料单明细相关的物料货位数量
+    clickListDetail(row) {
+      row && row.基本件流水号 ? (this.basePartNum = row.基本件流水号, this.materialNum = null, this.parchasePartNum = null, this.purchaseBillNum = null) : this.basePartNum
+      row && row.物料流水号 ? (this.materialNum = row.物料流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.materialNum
+      row && row.标准件和外购件流水号 ? (this.parchasePartNum = row.标准件和外购件流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.parchasePartNum
+      row && row.请购单明细流水号 ? (this.purchaseBillNum = row.请购单明细流水号, this.basePartNum = null, this.materialNum = null, this.parchasePartNum = null) : this.parchasePartNum
+      row && row.机床流水号 ? this.machineValue = row.机床流水号 : this.machineValue
+      row && row.组件流水号 ? this.groupNumValue = row.组件流水号 : this.groupNumValue
+      row && row.总数量 ? this.outNumber = row.总数量 : this.outNumber
+      if (this.materialNum) {
+        searchStockNumber1(this.materialNum).then(res => {
+          this.StockNumberTable = res.data
         })
-        this.machine = []
-        initMachineProject().then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.machine.push({
-              label: response.data[i].机床图号,
-              name: response.data[i].项目名称,
-              value: response.data[i].机床流水号
-            })
-          }
+      } else if (this.basePartNum) {
+        searchStockNumber2(this.basePartNum).then(res => {
+          this.StockNumberTable = res.data
         })
-        initOutType().then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.outType.push({
-              label: response.data[i].出库类别名称,
-              value: response.data[i].出库类别流水号
-            })
-          }
-        })
-      },
-      // 查询组号
-      searchGroup() {
-        this.group = []
-        this.form1.groupNumValue = ''
-        searchgroup(this.form1.machineValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.group.push({
-              label: response.data[i].组号,
-              value: Number(response.data[i].组件流水号)
-            })
-          }
-        })
-      },
-      // 查询领料单列表
-      searchList() {
-        let check
-        this.pickingListNumber ? check = 1 : check = 0
-        searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
-          this.pickListTable1 = response.data.rows
-          this.total3 = response.data.total
-        })
-      },
-      handleSizeChange3(val) {
-        this.pageSize3 = val
-        this.pageCurrent3 = 1
-        this.searchList()
-      },
-      handleCurrentChange3(val) {
-        this.pageCurrent3 = val
-        this.searchList()
-      },
-      // 查看领料单明细
-      clickList(row) {
-        row && row.领料单流水号 ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
-        row && row.人员编号 ? this.pickingPersonNum = row.人员编号 : this.pickingListNum
-        row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
-        searchListDetail(this.pickingListNum).then(res => {
-          this.pickListTable2 = res.data
-        })
-      },
-      // 查看领料单明细相关的物料货位数量
-      clickListDetail(row) {
-        row && row.基本件流水号 ? (this.basePartNum = row.基本件流水号, this.materialNum = null, this.parchasePartNum = null, this.purchaseBillNum = null) : this.basePartNum
-        row && row.物料流水号 ? (this.materialNum = row.物料流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.materialNum
-        row && row.标准件和外购件流水号 ? (this.parchasePartNum = row.标准件和外购件流水号, this.basePartNum = null, this.purchaseBillNum = null) : this.parchasePartNum
-        row && row.请购单明细流水号 ? (this.purchaseBillNum = row.请购单明细流水号, this.basePartNum = null, this.materialNum = null, this.parchasePartNum = null) : this.parchasePartNum
-        row && row.机床流水号 ? this.machineValue = row.机床流水号 : this.machineValue
-        row && row.组件流水号 ? this.groupNumValue = row.组件流水号 : this.groupNumValue
-        row && row.总数量 ? this.outNumber = row.总数量 : this.outNumber
-        if (this.materialNum) {
-          searchStockNumber1(this.materialNum).then(res => {
-            this.StockNumberTable = res.data
-          })
-        } else if (this.basePartNum) {
-          searchStockNumber2(this.basePartNum).then(res => {
-            this.StockNumberTable = res.data
-          })
-        } else if (this.purchaseBillNum) {
-          searchStockNumber3(this.purchaseBillNum).then(res => {
-            this.StockNumberTable = res.data
-          })
-        }
-      },
-      // 出库
-      outStore(row) {
-        if (this.$refs['form1'] !== undefined) {
-          this.$refs['form1'].resetFields()
-        }
-        this.form1.machineValue = this.machineValue
-        this.inventoryNum = row.仓库流水号
-        this.locationNum = row.货位流水号
-        this.outNumber > row.货位存量 ? (this.form1.outNumber = row.货位存量, this.form1.outNumberMax = row.货位存量) : (this.form1.outNumber = this.outNumber, this.form1.outNumberMax = this.outNumber) // 货位存量和领料数量对比取小
-        this.form1.personValue = Number(this.id)
-        this.group = []
-        this.form1.groupNumValue = ''
-        searchgroup(this.form1.machineValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.group.push({
-              label: response.data[i].组号,
-              value: Number(response.data[i].组件流水号)
-            })
-          }
-        }).then(() => {
-          this.form1.groupNumValue = this.groupNumValue
-          this.dialogFormVisible1 = true
-        })
-      },
-      // 提交出库
-      submitOutStore() {
-        this.$refs['form1'].validate((valid) => {
-          if (valid) {
-            // 出库数量，出库人，基本件流水号/标准件和外购件流水号 => 记录到一个新表
-            // 物料流水号，货位流水号，出库数量 => 减掉货位物料数
-            submitOutStore(this.materialNum, this.locationNum, this.form1.outNumber, this.form1.personValue, this.basePartNum, this.parchasePartNum, this.purchaseBillNum, this.pickingListNum, this.pickingPersonNum, this.inventoryNum, this.form1.outTypeValue).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('出库成功')
-                this.dialogFormVisible1 = false
-                this.clickListDetail()
-                this.clickList()
-              } else { this.$message.error('操作失败') }
-            })
-          } else {
-            return false
-          }
-        })
-      },
-      // 异常记录
-      errorRecord(row) {
-        if (this.$refs['form2'] !== undefined) {
-          this.$refs['form2'].resetFields()
-        }
-        this.form2.errorNumber = ''
-        this.form2.reason = ''
-        this.form2.物料流水号 = row.物料流水号
-        this.form2.基本件流水号 = row.基本件流水号
-        this.form2.货位流水号 = row.货位流水号
-        this.dialogFormVisible2 = true
-      },
-      // 提交异常记录
-      submitErrorRecord() {
-        this.$refs['form2'].validate((valid) => {
-          if (valid) {
-            errorRecord(this.form2.errorNumber, this.form2.reason, this.form2.物料流水号, this.form2.基本件流水号, this.form2.货位流水号).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('记录成功')
-                this.dialogFormVisible2 = false
-              } else { this.$message.error('操作失败') }
-            })
-          } else {
-            return false
-          }
+      } else if (this.purchaseBillNum) {
+        searchStockNumber3(this.purchaseBillNum).then(res => {
+          this.StockNumberTable = res.data
         })
       }
+    },
+    // 出库
+    outStore(row) {
+      if (this.$refs['form1'] !== undefined) {
+        this.$refs['form1'].resetFields()
+      }
+      this.form1.machineValue = this.machineValue
+      this.inventoryNum = row.仓库流水号
+      this.locationNum = row.货位流水号
+      this.outNumber > row.货位存量 ? (this.form1.outNumber = row.货位存量, this.form1.outNumberMax = row.货位存量) : (this.form1.outNumber = this.outNumber, this.form1.outNumberMax = this.outNumber) // 货位存量和领料数量对比取小
+      this.form1.personValue = Number(this.id)
+      this.group = []
+      this.form1.groupNumValue = ''
+      searchgroup(this.form1.machineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.group.push({
+            label: response.data[i].组号,
+            value: Number(response.data[i].组件流水号)
+          })
+        }
+      }).then(() => {
+        this.form1.groupNumValue = this.groupNumValue
+        this.dialogFormVisible1 = true
+      })
+    },
+    // 提交出库
+    submitOutStore() {
+      this.$refs['form1'].validate((valid) => {
+        if (valid) {
+          // 出库数量，出库人，基本件流水号/标准件和外购件流水号 => 记录到一个新表
+          // 物料流水号，货位流水号，出库数量 => 减掉货位物料数
+          submitOutStore(this.materialNum, this.locationNum, this.form1.outNumber, this.form1.personValue, this.basePartNum, this.parchasePartNum, this.purchaseBillNum, this.pickingListNum, this.pickingPersonNum, this.inventoryNum, this.form1.outTypeValue).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('出库成功')
+              this.dialogFormVisible1 = false
+              this.clickListDetail()
+              this.clickList()
+            } else { this.$message.error('操作失败') }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 异常记录
+    errorRecord(row) {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      this.form2.errorNumber = ''
+      this.form2.reason = ''
+      this.form2.物料流水号 = row.物料流水号
+      this.form2.基本件流水号 = row.基本件流水号
+      this.form2.货位流水号 = row.货位流水号
+      this.dialogFormVisible2 = true
+    },
+    // 提交异常记录
+    submitErrorRecord() {
+      this.$refs['form2'].validate((valid) => {
+        if (valid) {
+          errorRecord(this.form2.errorNumber, this.form2.reason, this.form2.物料流水号, this.form2.基本件流水号, this.form2.货位流水号).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('记录成功')
+              this.dialogFormVisible2 = false
+            } else { this.$message.error('操作失败') }
+          })
+        } else {
+          return false
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped>
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index a4b7abe2..cac62937 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -794,205 +794,205 @@
 </template>
 
 <script>
-  import { searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
-    createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
-    submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge } from '@/api/PurchasingCenter/CreateInquirySheet'
-  import { mapGetters } from 'vuex'
-  import { exportExcelMethod } from './exportExcel'
-  import $ from 'jquery'
+import { searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
+  createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
+  submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge } from '@/api/PurchasingCenter/CreateInquirySheet'
+import { mapGetters } from 'vuex'
+import { exportExcelMethod } from './exportExcel'
+import $ from 'jquery'
 
-  export default {
-    name: '', // 创建询价单
-    data() {
-      return {
-        source: [
-          {
-            text: 'BZ',
-            value: 1
-          },
-          {
-            text: 'WG',
-            value: 2
-          }
-        ],
-        tabName: '外购件',
-        baseInfoLoading: false,
-        dialogVisible5: false,
-        form3: { // 询价单基础信息表单
-          contact: '',
-          phone: '',
-          fax: '',
-          email: '',
-          companyAddress: '',
-          postCode: '',
-          companyPhone: '',
-          taxNumber: '',
-          shippingAddress: '',
-          account: '',
-          bank: ''
+export default {
+  name: '', // 创建询价单
+  data() {
+    return {
+      source: [
+        {
+          text: 'BZ',
+          value: 1
         },
-        projectValue: '',
-        project: [],
-        machineValue: '',
-        machine: [],
-        groupValue: '',
-        group: [],
-        partNum: '',
-        partName: '',
-        partSpec: '',
-        check3: 0, // 供应商
-        check4: 0, // 询价单号
-        materialStatusValue: [0], // 物料状态
-        materialStatus: [
-          {
-            value: 0,
-            label: '全部'
-          },
-          {
-            value: 1,
-            label: '未分配'
-          },
-          {
-            value: 2,
-            label: '已分配',
+        {
+          text: 'WG',
+          value: 2
+        }
+      ],
+      tabName: '外购件',
+      baseInfoLoading: false,
+      dialogVisible5: false,
+      form3: { // 询价单基础信息表单
+        contact: '',
+        phone: '',
+        fax: '',
+        email: '',
+        companyAddress: '',
+        postCode: '',
+        companyPhone: '',
+        taxNumber: '',
+        shippingAddress: '',
+        account: '',
+        bank: ''
+      },
+      projectValue: '',
+      project: [],
+      machineValue: '',
+      machine: [],
+      groupValue: '',
+      group: [],
+      partNum: '',
+      partName: '',
+      partSpec: '',
+      check3: 0, // 供应商
+      check4: 0, // 询价单号
+      materialStatusValue: [0], // 物料状态
+      materialStatus: [
+        {
+          value: 0,
+          label: '全部'
+        },
+        {
+          value: 1,
+          label: '未分配'
+        },
+        {
+          value: 2,
+          label: '已分配',
+          children: [{
+            value: 3,
+            label: '未询价'
+          }, {
+            value: 4,
+            label: '已询价',
             children: [{
-              value: 3,
-              label: '未询价'
+              value: 5,
+              label: '未采购'
             }, {
-              value: 4,
-              label: '已询价',
-              children: [{
-                value: 5,
-                label: '未采购'
-              }, {
-                value: 6,
-                label: '已采购'
-              }]
+              value: 6,
+              label: '已采购'
             }]
-          }
-        ], // 物料状态
-        materialName: '',
-        materialSpec: '',
-        materialModel: '',
-        tableData11: [], // 外购件列表
-        total11: 0,
-        pageCurrent11: 1,
-        pageSize11: 150,
-        tableData12: [], // 基本件列表
-        total12: 0,
-        pageCurrent12: 1,
-        pageSize12: 150,
-        remarkFilters: [],
-        supplierFilters: [],
-        tableData2: [], // 询价单列表
-        total2: 0,
-        pageCurrent2: 1,
-        pageSize2: 10,
-        tableData3: [], // 询价单明细
-        dialogVisible1: false,
-        inquirySheetNum: '', // 询价单号
-        inquirySheetFlowNum: '', // 询价单流水号
-        form1: {},
-        supplierCheck1: 0,
-        supplierCheck2: 0,
-        supplierCheck3: 0,
-        supplierCheck4: 0,
-        supplierCheck5: 0,
-        supplierCheck6: 0,
-        supplierCheck7: 0,
-        supplierCheck8: 0,
-        supplierCheck9: 0,
-        supplierCheck10: 0,
-        supplierCheck11: 0,
-        supplierCheck12: 0,
-        supplierValue: '', // 供应商流水号
-        supplierName: '', // 供应商名称
-        goodTime: '', // 货期
-        enterpriseNature: '', // 企业性质
-        createDate: '', // 创立日期
-        registeredCapital: '', // 注册资本
-        taxNum: '', // 税号
-        EMail: '', // 电子邮箱
-        address: '', // 地址
-        account: '', // 账号
-        openingBank: '', // 开户行
-        phone: '', // 电话号码
-        fax: '', // 传真
-        tableData01: [], // 供应商
-        dialogVisible2: false,
-        form2: {
-          inquirySheetNumValue: '', // 询价单流水号
-          inquirySheetNum: '',
-          supplierName: '',
-          supplierValue: ''
-        },
-        rules2: { // 表单验证规则
-          inquirySheetNum: [{ required: true, message: '请填写询价单号' }],
-          supplierName: [{ required: true, message: '请选择供应商' }]
-        },
-        groupPartNum: [], // 组件零件流水号
-        groupPartBasicNum: [], // 组件零件基本件流水号
-        allNum: [], // 总数量
-        dialogVisible3: false,
-        materialName0: '',
-        materialSpec0: '',
-        materialModel0: '',
-        tableData02: [],
-        total02: 0,
-        pageCurrent02: 1,
-        pageSize02: 10,
-        materialNew: '', // 替换为新物料全称
-        materialOldValue: '',
-        materialNewValue: '',
-        groupPartNumValue: '', // 组件零件流水号
-        standardAndPurchaseValue: '', // 标准件和外购件流水号
-        title2: '',
-        orderExport: '',
-        useNumber: '',
-        maxUseNumber: '',
-        dialogVisible4: false,
-        backlogGroupPartNum: '',
-        backlogMaterialNum: '',
-        cancelNum: 0
-      }
-    },
-    computed: {
-      ...mapGetters([
-        'name',
-        'id' // 人员编号
-      ])
-    },
-    created() {
-      this.fetchData()
-      this.searchTable11() // 查表1
-      this.searchTable2() // 查表2
-    },
-    methods: {
-      filterSource(value, row) {
-        return Number(row['零件类型']) === Number(value)
+          }]
+        }
+      ], // 物料状态
+      materialName: '',
+      materialSpec: '',
+      materialModel: '',
+      tableData11: [], // 外购件列表
+      total11: 0,
+      pageCurrent11: 1,
+      pageSize11: 150,
+      tableData12: [], // 基本件列表
+      total12: 0,
+      pageCurrent12: 1,
+      pageSize12: 150,
+      remarkFilters: [],
+      supplierFilters: [],
+      tableData2: [], // 询价单列表
+      total2: 0,
+      pageCurrent2: 1,
+      pageSize2: 10,
+      tableData3: [], // 询价单明细
+      dialogVisible1: false,
+      inquirySheetNum: '', // 询价单号
+      inquirySheetFlowNum: '', // 询价单流水号
+      form1: {},
+      supplierCheck1: 0,
+      supplierCheck2: 0,
+      supplierCheck3: 0,
+      supplierCheck4: 0,
+      supplierCheck5: 0,
+      supplierCheck6: 0,
+      supplierCheck7: 0,
+      supplierCheck8: 0,
+      supplierCheck9: 0,
+      supplierCheck10: 0,
+      supplierCheck11: 0,
+      supplierCheck12: 0,
+      supplierValue: '', // 供应商流水号
+      supplierName: '', // 供应商名称
+      goodTime: '', // 货期
+      enterpriseNature: '', // 企业性质
+      createDate: '', // 创立日期
+      registeredCapital: '', // 注册资本
+      taxNum: '', // 税号
+      EMail: '', // 电子邮箱
+      address: '', // 地址
+      account: '', // 账号
+      openingBank: '', // 开户行
+      phone: '', // 电话号码
+      fax: '', // 传真
+      tableData01: [], // 供应商
+      dialogVisible2: false,
+      form2: {
+        inquirySheetNumValue: '', // 询价单流水号
+        inquirySheetNum: '',
+        supplierName: '',
+        supplierValue: ''
       },
-      tabClick(tab) {
-        tab.name === '基本件' ? this.searchTable12() : this.searchTable11()
+      rules2: { // 表单验证规则
+        inquirySheetNum: [{ required: true, message: '请填写询价单号' }],
+        supplierName: [{ required: true, message: '请选择供应商' }]
       },
-      formatJson(filterVal, jsonData) {
-        return jsonData.map(v => filterVal.map(j => {
-          return v[j]
-        }))
-      },
-      // 导出未询价外购件和标准件/基本件清单
-      exportUninquirySheet() {
-        getExport1(this.id).then(res1 => { // 标准件和外购件
-          getExport2(this.id).then(res2 => { // 基本件
-            res1.data.map(v => {
-              v.任务分配时间 = v.任务分配时间.split(' ')[0]
-              v.供货商 = v.供货商 ? v.供货商 : ''
-              v.备注 = v.备注 ? v.备注 : ''
-            })
-            res2.data.map(v => {
-              v.任务分配时间 = v.任务分配时间.split(' ')[0]
-              v.供货商 = v.供货商 ? v.供货商 : ''
-              v.备注 = v.备注 ? v.备注 : ''
-            })
+      groupPartNum: [], // 组件零件流水号
+      groupPartBasicNum: [], // 组件零件基本件流水号
+      allNum: [], // 总数量
+      dialogVisible3: false,
+      materialName0: '',
+      materialSpec0: '',
+      materialModel0: '',
+      tableData02: [],
+      total02: 0,
+      pageCurrent02: 1,
+      pageSize02: 10,
+      materialNew: '', // 替换为新物料全称
+      materialOldValue: '',
+      materialNewValue: '',
+      groupPartNumValue: '', // 组件零件流水号
+      standardAndPurchaseValue: '', // 标准件和外购件流水号
+      title2: '',
+      orderExport: '',
+      useNumber: '',
+      maxUseNumber: '',
+      dialogVisible4: false,
+      backlogGroupPartNum: '',
+      backlogMaterialNum: '',
+      cancelNum: 0
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'id' // 人员编号
+    ])
+  },
+  created() {
+    this.fetchData()
+    this.searchTable11() // 查表1
+    this.searchTable2() // 查表2
+  },
+  methods: {
+    filterSource(value, row) {
+      return Number(row['零件类型']) === Number(value)
+    },
+    tabClick(tab) {
+      tab.name === '基本件' ? this.searchTable12() : this.searchTable11()
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        return v[j]
+      }))
+    },
+    // 导出未询价外购件和标准件/基本件清单
+    exportUninquirySheet() {
+      getExport1(this.id).then(res1 => { // 标准件和外购件
+        getExport2(this.id).then(res2 => { // 基本件
+          res1.data.map(v => {
+            v.任务分配时间 = v.任务分配时间.split(' ')[0]
+            v.供货商 = v.供货商 ? v.供货商 : ''
+            v.备注 = v.备注 ? v.备注 : ''
+          })
+          res2.data.map(v => {
+            v.任务分配时间 = v.任务分配时间.split(' ')[0]
+            v.供货商 = v.供货商 ? v.供货商 : ''
+            v.备注 = v.备注 ? v.备注 : ''
+          })
             import('./Export2Excel').then(excel => {
               const dataGroup = []
               const filterVal1 = ['任务分配时间', '项目名称', '机床图号', '组号', '物料名称', '物料型号', '物料规格', '待询价数量', '备注', '供货商'] // tableData1里的属性名
@@ -1012,662 +1012,662 @@
                 bookType: 'xlsx'
               })
             })
+        })
+      })
+    },
+    // 询价单基础信息维护
+    inquirySheetBaseInfoMaintain() {
+      this.baseInfoLoading = true
+      searchBaseInfo(this.id).then(res => {
+        this.baseInfoLoading = false
+        this.form3.contact = res.data[0] ? res.data[0].联系人 : ''
+        this.form3.phone = res.data[0] ? res.data[0].手机 : ''
+        this.form3.fax = res.data[0] ? res.data[0].传真 : ''
+        this.form3.email = res.data[0] ? res.data[0].邮箱 : ''
+        this.form3.companyAddress = res.data[0] ? res.data[0].公司地址 : ''
+        this.form3.postCode = res.data[0] ? res.data[0].邮编 : ''
+        this.form3.companyPhone = res.data[0] ? res.data[0].公司电话 : ''
+        this.form3.taxNumber = res.data[0] ? res.data[0].税号 : ''
+        this.form3.shippingAddress = res.data[0] ? res.data[0].送货地址 : ''
+        this.form3.account = res.data[0] ? res.data[0].帐号 : ''
+        this.form3.bank = res.data[0] ? res.data[0].开户行 : ''
+        this.dialogVisible5 = true
+      })
+    },
+    // 提交询价单基础信息维护
+    submitBaseInfo() {
+      editBaseInfo(this.id, this.form3.phone, this.form3.fax, this.form3.email, this.form3.companyAddress, this.form3.postCode, this.form3.companyPhone, this.form3.taxNumber, this.form3.shippingAddress, this.form3.account, this.form3.bank).then(res => {
+        if (res.data[0].result === '1') {
+          this.dialogVisible5 = false
+          this.$message.success('操作成功')
+        } else { this.$message.error('操作失败') }
+      })
+    },
+    fetchData() {
+      searchBaseInfo(this.id).then(res => {
+        this.form3.contact = res.data[0] ? res.data[0].联系人 : ''
+        this.form3.phone = res.data[0] ? res.data[0].手机 : ''
+        this.form3.fax = res.data[0] ? res.data[0].传真 : ''
+        this.form3.email = res.data[0] ? res.data[0].邮箱 : ''
+        this.form3.companyAddress = res.data[0] ? res.data[0].公司地址 : ''
+        this.form3.postCode = res.data[0] ? res.data[0].邮编 : ''
+        this.form3.companyPhone = res.data[0] ? res.data[0].公司电话 : ''
+        this.form3.taxNumber = res.data[0] ? res.data[0].税号 : ''
+        this.form3.shippingAddress = res.data[0] ? res.data[0].送货地址 : ''
+        this.form3.account = res.data[0] ? res.data[0].帐号 : ''
+        this.form3.bank = res.data[0] ? res.data[0].开户行 : ''
+      })
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.project.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
           })
-        })
-      },
-      // 询价单基础信息维护
-      inquirySheetBaseInfoMaintain() {
-        this.baseInfoLoading = true
-        searchBaseInfo(this.id).then(res => {
-          this.baseInfoLoading = false
-          this.form3.contact = res.data[0] ? res.data[0].联系人 : ''
-          this.form3.phone = res.data[0] ? res.data[0].手机 : ''
-          this.form3.fax = res.data[0] ? res.data[0].传真 : ''
-          this.form3.email = res.data[0] ? res.data[0].邮箱 : ''
-          this.form3.companyAddress = res.data[0] ? res.data[0].公司地址 : ''
-          this.form3.postCode = res.data[0] ? res.data[0].邮编 : ''
-          this.form3.companyPhone = res.data[0] ? res.data[0].公司电话 : ''
-          this.form3.taxNumber = res.data[0] ? res.data[0].税号 : ''
-          this.form3.shippingAddress = res.data[0] ? res.data[0].送货地址 : ''
-          this.form3.account = res.data[0] ? res.data[0].帐号 : ''
-          this.form3.bank = res.data[0] ? res.data[0].开户行 : ''
-          this.dialogVisible5 = true
-        })
-      },
-      // 提交询价单基础信息维护
-      submitBaseInfo() {
-        editBaseInfo(this.id, this.form3.phone, this.form3.fax, this.form3.email, this.form3.companyAddress, this.form3.postCode, this.form3.companyPhone, this.form3.taxNumber, this.form3.shippingAddress, this.form3.account, this.form3.bank).then(res => {
-          if (res.data[0].result === '1') {
-            this.dialogVisible5 = false
-            this.$message.success('操作成功')
-          } else { this.$message.error('操作失败') }
-        })
-      },
-      fetchData() {
-        searchBaseInfo(this.id).then(res => {
-          this.form3.contact = res.data[0] ? res.data[0].联系人 : ''
-          this.form3.phone = res.data[0] ? res.data[0].手机 : ''
-          this.form3.fax = res.data[0] ? res.data[0].传真 : ''
-          this.form3.email = res.data[0] ? res.data[0].邮箱 : ''
-          this.form3.companyAddress = res.data[0] ? res.data[0].公司地址 : ''
-          this.form3.postCode = res.data[0] ? res.data[0].邮编 : ''
-          this.form3.companyPhone = res.data[0] ? res.data[0].公司电话 : ''
-          this.form3.taxNumber = res.data[0] ? res.data[0].税号 : ''
-          this.form3.shippingAddress = res.data[0] ? res.data[0].送货地址 : ''
-          this.form3.account = res.data[0] ? res.data[0].帐号 : ''
-          this.form3.bank = res.data[0] ? res.data[0].开户行 : ''
-        })
-        initProject().then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.project.push({
-              label: response.data[i].项目名称,
-              value: response.data[i].项目流水号
-            })
+        }
+      })
+    },
+    projectChange() {
+      this.machine = []
+      this.machineValue = ''
+      this.group = []
+      this.groupValue = ''
+      searchMachine(this.projectValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machine.push({
+            value: response.data[i].机床流水号,
+            label: response.data[i].机床图号
+          })
+        }
+      })
+    },
+    machineChange() {
+      this.group = []
+      this.groupValue = ''
+      searchGroup(this.machineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.group.push({
+            value: response.data[i].组件流水号,
+            label: response.data[i].组号
+          })
+        }
+      })
+    },
+    submitUseInventory() {
+      submitUseInventory(this.backlogMaterialNum, this.useNumber, this.backlogGroupPartNum, this.id).then(response => {
+        console.log(response.data)
+        if (response.data[0].result === '1') {
+          this.searchTable11()
+          this.dialogVisible4 = false
+          this.$message.success('操作成功')
+        } else { this.$message.error('操作失败') }
+      })
+    },
+    useInventory(row) { // 使用滞货
+      console.log(row)
+      this.useNumber = 0
+      row.滞货数量 < row.待询价数量 ? this.maxUseNumber = Number(row.滞货数量) : this.maxUseNumber = Number(row.待询价数量)
+      this.backlogMaterialNum = row.物料流水号
+      this.backlogGroupPartNum = row.组件零件流水号
+      this.dialogVisible4 = true
+    },
+    // cancelUseInventory(row) { // 取消使用滞货
+    //   console.log(row)
+    //   this.backlogMaterialNum = row.物料流水号
+    //   this.backlogGroupPartNum = row.组件零件流水号
+    //   this.cancelNum = row.使用滞货数量
+    //   this.$confirm('确定取消使用滞货?', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   }).then(() => {
+    //     console.log(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum)
+    //     cancelUseInventory(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum).then(response => {
+    //       if (response.data[0].result === '1') {
+    //         this.searchTable11()
+    //         this.$message.success('操作成功')
+    //       } else { this.$message.error('操作失败') }
+    //     })
+    //   }).catch(() => {
+    //     this.$message.info('已取消操作')
+    //   })
+    // },
+    saveOrder() { // 保存询价单
+      const orderNumGroup = []
+      const numGroup = []
+      const remarkGroup = []
+      for (let i = 0; i < this.tableData3.length; i++) {
+        orderNumGroup.push(this.tableData3[i].询价单明细流水号)
+        numGroup.push(this.tableData3[i].数量)
+        remarkGroup.push(this.tableData3[i].备注)
+      }
+      saveOrder(orderNumGroup, numGroup, remarkGroup).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('保存成功')
+        } else { this.$message.error('保存失败') }
+      })
+    },
+    selectable(row, index) { // 控制某行是否可选
+      return (parseInt(row.询价状态编号) === 1 && parseInt(row.采购状态编号) < 3 && parseInt(row.是否确认) === 1) // 未询价&&未采购&&确认物料修改
+    },
+    filterHandler0(value, row) { // 筛选备注
+      return row['备注'].trim() === value
+    },
+    filterHandler(value, row) { // 筛选供货商
+      return row['供货商'].trim() === value
+    },
+    searchTable11() { // 查询外购件列表
+      let check1, check2, check3, check4, check5, check6
+      this.materialName ? check1 = 1 : check1 = 0
+      this.materialSpec ? check2 = 1 : check2 = 0
+      this.materialModel ? check3 = 1 : check3 = 0
+      this.projectValue ? check4 = 1 : check4 = 0
+      this.machineValue ? check5 = 1 : check5 = 0
+      this.groupValue ? check6 = 1 : check6 = 0
+      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2).then(response => {
+        this.tableData11 = response.data.rows
+        this.total11 = response.data.total
+        const remark = []
+        const supplier = []
+        this.remarkFilters = []
+        this.supplierFilters = []
+        response.data.rows.map(v => {
+          if (v.备注 === null) { v.备注 = '' }
+          if (v.供货商 === null) { v.供货商 = '' }
+          if (!remark.includes(v.备注)) {
+            remark.push(v.备注)
+            this.remarkFilters.push({ text: v.备注, value: v.备注 })
+          }
+          if (!supplier.includes(v.供货商)) {
+            supplier.push(v.供货商)
+            this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
           }
         })
-      },
-      projectChange() {
-        this.machine = []
-        this.machineValue = ''
-        this.group = []
-        this.groupValue = ''
-        searchMachine(this.projectValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.machine.push({
-              value: response.data[i].机床流水号,
-              label: response.data[i].机床图号
-            })
+      })
+    },
+    handleSizeChange11(val) { // 标准件和外购件列表分页
+      this.pageSize11 = val
+      this.pageCurrent11 = 1
+      this.searchTable11()
+    },
+    handleCurrentChange11(val) { // 标准件和外购件列表分页
+      this.pageCurrent11 = val
+      this.searchTable11()
+    },
+    searchTable12() { // 查询基本件列表
+      let check1, check2, check3, check4, check5, check6
+      this.partNum ? check1 = 1 : check1 = 0
+      this.partName ? check2 = 1 : check2 = 0
+      this.partSpec ? check3 = 1 : check3 = 0
+      this.projectValue ? check4 = 1 : check4 = 0
+      this.machineValue ? check5 = 1 : check5 = 0
+      this.groupValue ? check6 = 1 : check6 = 0
+      searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => {
+        this.tableData12 = response.data.rows
+        this.total12 = response.data.total
+        const remark = []
+        const supplier = []
+        this.remarkFilters = []
+        this.supplierFilters = []
+        response.data.rows.map(v => {
+          if (!remark.includes(v.备注)) {
+            remark.push(v.备注)
+            supplier.push(v.供货商)
+            this.remarkFilters.push({ text: v.备注, value: v.备注 })
+            this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
           }
         })
-      },
-      machineChange() {
-        this.group = []
-        this.groupValue = ''
-        searchGroup(this.machineValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.group.push({
-              value: response.data[i].组件流水号,
-              label: response.data[i].组号
-            })
-          }
-        })
-      },
-      submitUseInventory() {
-        submitUseInventory(this.backlogMaterialNum, this.useNumber, this.backlogGroupPartNum, this.id).then(response => {
-          console.log(response.data)
+      })
+    },
+    handleSizeChange12(val) { // 基本件列表分页
+      this.pageSize12 = val
+      this.pageCurrent12 = 1
+      this.searchTable12()
+    },
+    handleCurrentChange12(val) { // 基本件列表分页
+      this.pageCurrent12 = val
+      this.searchTable12()
+    },
+    searchTable2() { // 查询询价单列表
+      this.supplierName ? this.check3 = 1 : this.check3 = 0
+      this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0
+      searchCreateInquirySheet(this.pageCurrent2, this.pageSize2, this.check3, this.supplierName, this.check4, this.inquirySheetNum, this.id).then(response => {
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+      })
+    },
+    handleSizeChange2(val) { // 询价单列表分页
+      this.pageSize2 = val
+      this.searchTable2()
+    },
+    handleCurrentChange2(val) { // 询价单列表分页
+      this.pageCurrent2 = val
+      this.searchTable2()
+    },
+    createInquirySheet() { // 创建空单据--询价单
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      this.title2 = '创建询价单'
+      this.form2.inquirySheetNum = ''
+      this.form2.supplierValue = ''
+      this.form2.supplierName = ''
+      this.dialogVisible2 = true
+    },
+    submitCreateInquirySheet() { // 提交创建询价单
+      this.$refs['form2'].validate((valid) => {
+        if (valid) {
+          const numGroup1 = [] // 空数组，放现有的询价单号
+          searchCreateInquirySheet2().then(response => { // 先查询判断是否存在
+            for (let i = 0; i < response.data.length; i++) {
+              numGroup1.push(response.data[i].询价单编号)
+            }
+          }).then(() => {
+            if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1) {
+              this.$message.error('该询价单号已存在')
+            } else {
+              createInquirySheet(this.form2.inquirySheetNum, this.form2.supplierValue, '', this.id).then(response => {
+                if (response.data[0].result === '1') {
+                  this.$message.success('创建成功')
+                  this.inquirySheetNum = ''
+                  this.supplierName = ''
+                  this.supplierValue = ''
+                  this.dialogVisible2 = false
+                  this.searchTable2()
+                } else { this.$message.error('操作失败') }
+              })
+            }
+          })
+        } else {
+          console.log('表单验证未通过')
+          return false
+        }
+      })
+    },
+    deleteInquirySheet(row) { // 删除询价单
+      this.$confirm('确定删除该询价单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteInquirySheet(row.询价单流水号).then(response => {
           if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.inquirySheetNum = ''
+            this.supplierName = ''
+            this.supplierValue = ''
+            this.searchTable2()
+            this.tableData3 = []
             this.searchTable11()
-            this.dialogVisible4 = false
-            this.$message.success('操作成功')
-          } else { this.$message.error('操作失败') }
+            this.searchTable12()
+          } else { this.$message.error('删除失败') }
         })
-      },
-      useInventory(row) { // 使用滞货
-        console.log(row)
-        this.useNumber = 0
-        row.滞货数量 < row.待询价数量 ? this.maxUseNumber = Number(row.滞货数量) : this.maxUseNumber = Number(row.待询价数量)
-        this.backlogMaterialNum = row.物料流水号
-        this.backlogGroupPartNum = row.组件零件流水号
-        this.dialogVisible4 = true
-      },
-      // cancelUseInventory(row) { // 取消使用滞货
-      //   console.log(row)
-      //   this.backlogMaterialNum = row.物料流水号
-      //   this.backlogGroupPartNum = row.组件零件流水号
-      //   this.cancelNum = row.使用滞货数量
-      //   this.$confirm('确定取消使用滞货?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     console.log(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum)
-      //     cancelUseInventory(this.backlogMaterialNum, this.cancelNum, this.backlogGroupPartNum).then(response => {
-      //       if (response.data[0].result === '1') {
-      //         this.searchTable11()
-      //         this.$message.success('操作成功')
-      //       } else { this.$message.error('操作失败') }
-      //     })
-      //   }).catch(() => {
-      //     this.$message.info('已取消操作')
-      //   })
-      // },
-      saveOrder() { // 保存询价单
-        const orderNumGroup = []
-        const numGroup = []
-        const remarkGroup = []
-        for (let i = 0; i < this.tableData3.length; i++) {
-          orderNumGroup.push(this.tableData3[i].询价单明细流水号)
-          numGroup.push(this.tableData3[i].数量)
-          remarkGroup.push(this.tableData3[i].备注)
-        }
-        saveOrder(orderNumGroup, numGroup, remarkGroup).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('保存成功')
-          } else { this.$message.error('保存失败') }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
         })
-      },
-      selectable(row, index) { // 控制某行是否可选
-        return (parseInt(row.询价状态编号) === 1 && parseInt(row.采购状态编号) < 3 && parseInt(row.是否确认) === 1) // 未询价&&未采购&&确认物料修改
-      },
-      filterHandler0(value, row) { // 筛选备注
-        return row['备注'].trim() === value
-      },
-      filterHandler(value, row) { // 筛选供货商
-        return row['供货商'].trim() === value
-      },
-      searchTable11() { // 查询外购件列表
-        let check1, check2, check3, check4, check5, check6
-        this.materialName ? check1 = 1 : check1 = 0
-        this.materialSpec ? check2 = 1 : check2 = 0
-        this.materialModel ? check3 = 1 : check3 = 0
-        this.projectValue ? check4 = 1 : check4 = 0
-        this.machineValue ? check5 = 1 : check5 = 0
-        this.groupValue ? check6 = 1 : check6 = 0
-        searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2).then(response => {
-          this.tableData11 = response.data.rows
-          this.total11 = response.data.total
-          const remark = []
-          const supplier = []
-          this.remarkFilters = []
-          this.supplierFilters = []
-          response.data.rows.map(v => {
-            if (v.备注 === null) { v.备注 = '' }
-            if (v.供货商 === null) { v.供货商 = '' }
-            if (!remark.includes(v.备注)) {
-              remark.push(v.备注)
-              this.remarkFilters.push({ text: v.备注, value: v.备注 })
+      })
+    },
+    editInquirySheet(row) { // 编辑询价单
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      this.title2 = '编辑询价单'
+      this.form2.inquirySheetNumValue = row.询价单流水号
+      this.form2.inquirySheetNum = row.询价单编号
+      this.form2.supplierValue = row.供应商流水号
+      this.form2.supplierName = row.供应商名称
+      this.dialogVisible2 = true
+    },
+    submitEditInquirySheet() { // 提交编辑询价单
+      this.$refs['form2'].validate((valid) => {
+        if (valid) {
+          const numGroup1 = [] // 空数组，放现有的询价单号
+          const numGroup2 = [] // 空数组，放现有的询价单流水号
+          searchCreateInquirySheet2().then(response => { // 先查询判断是否存在
+            for (let i = 0; i < response.data.length; i++) {
+              numGroup1.push(response.data[i].询价单编号)
+              numGroup2.push(response.data[i].询价单流水号)
             }
-            if (!supplier.includes(v.供货商)) {
-              supplier.push(v.供货商)
-              this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
+          }).then(() => {
+            if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1 && numGroup1.indexOf(this.form2.inquirySheetNum) !== numGroup2.indexOf(parseInt(this.form2.inquirySheetNumValue))) {
+              this.$message.error('该询价单号已存在')
+            } else {
+              editInquirySheet(this.form2.inquirySheetNumValue, this.form2.inquirySheetNum, this.form2.supplierValue).then(response => {
+                if (response.data[0].result === '1') {
+                  this.$message.success('修改成功')
+                  this.inquirySheetNum = ''
+                  this.supplierName = ''
+                  this.supplierValue = ''
+                  this.dialogVisible2 = false
+                  this.searchTable2()
+                } else { this.$message.error('修改失败') }
+              })
             }
           })
-        })
-      },
-      handleSizeChange11(val) { // 标准件和外购件列表分页
-        this.pageSize11 = val
-        this.pageCurrent11 = 1
-        this.searchTable11()
-      },
-      handleCurrentChange11(val) { // 标准件和外购件列表分页
-        this.pageCurrent11 = val
-        this.searchTable11()
-      },
-      searchTable12() { // 查询基本件列表
-        let check1, check2, check3, check4, check5, check6
-        this.partNum ? check1 = 1 : check1 = 0
-        this.partName ? check2 = 1 : check2 = 0
-        this.partSpec ? check3 = 1 : check3 = 0
-        this.projectValue ? check4 = 1 : check4 = 0
-        this.machineValue ? check5 = 1 : check5 = 0
-        this.groupValue ? check6 = 1 : check6 = 0
-        searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => {
-          this.tableData12 = response.data.rows
-          this.total12 = response.data.total
-          const remark = []
-          const supplier = []
-          this.remarkFilters = []
-          this.supplierFilters = []
-          response.data.rows.map(v => {
-            if (!remark.includes(v.备注)) {
-              remark.push(v.备注)
-              supplier.push(v.供货商)
-              this.remarkFilters.push({ text: v.备注, value: v.备注 })
-              this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
-            }
-          })
-        })
-      },
-      handleSizeChange12(val) { // 基本件列表分页
-        this.pageSize12 = val
-        this.pageCurrent12 = 1
-        this.searchTable12()
-      },
-      handleCurrentChange12(val) { // 基本件列表分页
-        this.pageCurrent12 = val
-        this.searchTable12()
-      },
-      searchTable2() { // 查询询价单列表
-        this.supplierName ? this.check3 = 1 : this.check3 = 0
-        this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0
-        searchCreateInquirySheet(this.pageCurrent2, this.pageSize2, this.check3, this.supplierName, this.check4, this.inquirySheetNum, this.id).then(response => {
-          this.tableData2 = response.data.rows
-          this.total2 = response.data.total
-        })
-      },
-      handleSizeChange2(val) { // 询价单列表分页
-        this.pageSize2 = val
-        this.searchTable2()
-      },
-      handleCurrentChange2(val) { // 询价单列表分页
-        this.pageCurrent2 = val
-        this.searchTable2()
-      },
-      createInquirySheet() { // 创建空单据--询价单
-        if (this.$refs['form2'] !== undefined) {
-          this.$refs['form2'].resetFields()
+        } else {
+          console.log('表单验证未通过')
+          return false
         }
-        this.title2 = '创建询价单'
-        this.form2.inquirySheetNum = ''
-        this.form2.supplierValue = ''
-        this.form2.supplierName = ''
-        this.dialogVisible2 = true
-      },
-      submitCreateInquirySheet() { // 提交创建询价单
-        this.$refs['form2'].validate((valid) => {
-          if (valid) {
-            const numGroup1 = [] // 空数组，放现有的询价单号
-            searchCreateInquirySheet2().then(response => { // 先查询判断是否存在
-              for (let i = 0; i < response.data.length; i++) {
-                numGroup1.push(response.data[i].询价单编号)
+      })
+    },
+    printInquirySheet() { // 打印询价单
+      this.$confirm('确定打印该询价单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        searchMerge(this.inquirySheetFlowNum).then(res => {
+          if (res.data.length === 0) {
+            this.$message.error('请选择正确的询价单导出')
+          } else {
+            const children = document.getElementsByClassName('tableData')
+            const parent = document.getElementsByClassName('inquirySheet')[0]
+            if (children.length !== 0) {
+              for (let i = children.length - 1; i >= 0; i--) {
+                parent.removeChild(children[i])
               }
-            }).then(() => {
-              if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1) {
-                this.$message.error('该询价单号已存在')
+            }
+            const tr = []
+            let length = 0
+            res.data.length < 15 ? length = 15 : length = res.data.length
+            for (let i = 0; i < length; i++) {
+              tr[i] = document.createElement('tr')
+              tr[i].setAttribute('class', 'tableData')
+              tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
+              $('#tablehead').after(tr[i])
+            }
+            for (let j = 0; j < res.data.length; j++) {
+              document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+              document.getElementsByClassName('tableData')[j].children[1].innerHTML = res.data[j].物料型号 || res.data[j].零件图号
+              document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
+              document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
+              document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
+              document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
+              document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
+            }
+            document.getElementById('inquirySheetNum').innerHTML = this.orderExport
+            document.getElementById('supplier').innerHTML = ''
+          }
+        }).then(() => {
+          const htmlNode = $('#inquirySheet').html()
+          const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;')
+          body.children().hide()
+          const printNode = $(htmlNode)
+          body.append(printNode)
+          window.print()
+          body.removeAttr('style')
+          body.children().not('script').show()
+          body.children().not('#app').hide()
+          printNode.remove()
+        })
+      }).catch(res => {
+        console.log(res)
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
+    exportInquirySheet() { // 导出询价单
+      this.$confirm('确认导出询价单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 询价单导出结果
+        searchMerge(this.inquirySheetFlowNum).then(res => {
+          if (res.data.length === 0) {
+            this.$message.error('请选择正确的询价单导出')
+          } else {
+            const children = document.getElementsByClassName('tableData')
+            const parent = document.getElementsByClassName('inquirySheet')[0]
+            if (children.length !== 0) {
+              for (let i = children.length - 1; i >= 0; i--) {
+                parent.removeChild(children[i])
+              }
+            }
+            const tr = []
+            let length = 0
+            res.data.length < 15 ? length = 15 : length = res.data.length
+            for (let i = 0; i < length; i++) {
+              tr[i] = document.createElement('tr')
+              tr[i].setAttribute('class', 'tableData')
+              tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
+              $('#tablehead').after(tr[i])
+            }
+            for (let j = 0; j < res.data.length; j++) {
+              document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+              document.getElementsByClassName('tableData')[j].children[1].innerHTML = res.data[j].物料型号 || res.data[j].零件图号
+              document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
+              document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
+              document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
+              document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
+              document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
+            }
+            document.getElementById('inquirySheetNum').innerHTML = this.orderExport
+            document.getElementById('supplier').innerHTML = ''
+            exportExcelMethod('inquirySheet', '采购询价单', '采购询价单sheet')
+          }
+        })
+      }).catch(res => {
+        console.log(res)
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
+    handleSelectionChange1(val) { // 标准件和外购件多选
+      this.groupPartNum = []
+      this.allNum = []
+      for (let i = 0; i < val.length; i++) {
+        this.groupPartNum[i] = val[i].组件零件流水号
+        this.allNum[i] = val[i].待询价数量
+      }
+    },
+    handleSelectionChange2(val) { // 基本件多选
+      this.groupPartBasicNum = []
+      this.allNum = []
+      for (let i = 0; i < val.length; i++) {
+        this.groupPartBasicNum[i] = val[i].组件零件基本件流水号
+        this.allNum[i] = val[i].零件数量
+      }
+    },
+    addInquirySheet() { // 追加物料
+      const numGroup1 = [] // 空数组，放该询价单中已有的组件零件流水号
+      const numGroup2 = [] // 空数组，放该询价单中已有的组件零件基本件流水号
+      if (this.inquirySheetFlowNum === '' || this.inquirySheetFlowNum === null) {
+        this.$message.error('请选择一个询价单')
+      } else if (this.groupPartNum.length === 0 && this.groupPartBasicNum.length === 0) {
+        this.$message.error('请选择待询价物料或零件')
+      } else {
+        searchSheetDetail(this.inquirySheetFlowNum).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            numGroup1.push(response.data[i].组件零件流水号)
+            numGroup2.push(response.data[i].组件零件基本件流水号)
+          }
+        }).then(() => {
+          let x = true // 为了只执行一次的中间变量
+          if (this.groupPartBasicNum.length === 0) { // 标准件和外购件
+            for (let i = 0; i < this.groupPartNum.length; i++) {
+              if (numGroup1.indexOf(parseInt(this.groupPartNum[i])) !== -1) {
+                if (x) {
+                  this.$notify({
+                    title: '注意',
+                    message: '无法向该询价单中追加重复物料，已自动跳过',
+                    type: 'warning'
+                  })
+                  x = false
+                }
               } else {
-                createInquirySheet(this.form2.inquirySheetNum, this.form2.supplierValue, '', this.id).then(response => {
+                addInquirySheet1(this.inquirySheetFlowNum, this.groupPartNum[i], this.allNum[i]).then(response => {
                   if (response.data[0].result === '1') {
-                    this.$message.success('创建成功')
-                    this.inquirySheetNum = ''
-                    this.supplierName = ''
-                    this.supplierValue = ''
-                    this.dialogVisible2 = false
-                    this.searchTable2()
+                    this.$message.success('操作成功')
+                    this.searchTable11()
+                    searchSheetDetail(this.inquirySheetFlowNum).then(response => {
+                      this.tableData3 = response.data
+                    })
                   } else { this.$message.error('操作失败') }
                 })
               }
-            })
-          } else {
-            console.log('表单验证未通过')
-            return false
-          }
-        })
-      },
-      deleteInquirySheet(row) { // 删除询价单
-        this.$confirm('确定删除该询价单?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          deleteInquirySheet(row.询价单流水号).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('删除成功')
-              this.inquirySheetNum = ''
-              this.supplierName = ''
-              this.supplierValue = ''
-              this.searchTable2()
-              this.tableData3 = []
-              this.searchTable11()
-              this.searchTable12()
-            } else { this.$message.error('删除失败') }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-      },
-      editInquirySheet(row) { // 编辑询价单
-        if (this.$refs['form2'] !== undefined) {
-          this.$refs['form2'].resetFields()
-        }
-        this.title2 = '编辑询价单'
-        this.form2.inquirySheetNumValue = row.询价单流水号
-        this.form2.inquirySheetNum = row.询价单编号
-        this.form2.supplierValue = row.供应商流水号
-        this.form2.supplierName = row.供应商名称
-        this.dialogVisible2 = true
-      },
-      submitEditInquirySheet() { // 提交编辑询价单
-        this.$refs['form2'].validate((valid) => {
-          if (valid) {
-            const numGroup1 = [] // 空数组，放现有的询价单号
-            const numGroup2 = [] // 空数组，放现有的询价单流水号
-            searchCreateInquirySheet2().then(response => { // 先查询判断是否存在
-              for (let i = 0; i < response.data.length; i++) {
-                numGroup1.push(response.data[i].询价单编号)
-                numGroup2.push(response.data[i].询价单流水号)
-              }
-            }).then(() => {
-              if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1 && numGroup1.indexOf(this.form2.inquirySheetNum) !== numGroup2.indexOf(parseInt(this.form2.inquirySheetNumValue))) {
-                this.$message.error('该询价单号已存在')
+            }
+          } else { // 基本件
+            for (let i = 0; i < this.groupPartBasicNum.length; i++) {
+              if (numGroup2.indexOf(parseInt(this.groupPartBasicNum[i])) !== -1) {
+                if (x) {
+                  this.$notify({
+                    title: '注意',
+                    message: '无法向该询价单中追加重复零件，已自动跳过',
+                    type: 'warning'
+                  })
+                  x = false
+                }
               } else {
-                editInquirySheet(this.form2.inquirySheetNumValue, this.form2.inquirySheetNum, this.form2.supplierValue).then(response => {
+                addInquirySheet2(this.inquirySheetFlowNum, this.groupPartBasicNum[i], this.allNum[i]).then(response => {
                   if (response.data[0].result === '1') {
-                    this.$message.success('修改成功')
-                    this.inquirySheetNum = ''
-                    this.supplierName = ''
-                    this.supplierValue = ''
-                    this.dialogVisible2 = false
-                    this.searchTable2()
-                  } else { this.$message.error('修改失败') }
+                    this.$message.success('操作成功')
+                    this.searchTable12()
+                    searchSheetDetail(this.inquirySheetFlowNum).then(response => {
+                      this.tableData3 = response.data
+                    })
+                  } else {
+                    this.$message.error('操作失败')
+                  }
                 })
               }
-            })
-          } else {
-            console.log('表单验证未通过')
-            return false
+            }
           }
         })
-      },
-      printInquirySheet() { // 打印询价单
-        this.$confirm('确定打印该询价单?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          searchMerge(this.inquirySheetFlowNum).then(res => {
-            if (res.data.length === 0) {
-              this.$message.error('请选择正确的询价单导出')
-            } else {
-              const children = document.getElementsByClassName('tableData')
-              const parent = document.getElementsByClassName('inquirySheet')[0]
-              if (children.length !== 0) {
-                for (let i = children.length - 1; i >= 0; i--) {
-                  parent.removeChild(children[i])
-                }
-              }
-              const tr = []
-              let length = 0
-              res.data.length < 15 ? length = 15 : length = res.data.length
-              for (let i = 0; i < length; i++) {
-                tr[i] = document.createElement('tr')
-                tr[i].setAttribute('class', 'tableData')
-                tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
-                $('#tablehead').after(tr[i])
-              }
-              for (let j = 0; j < res.data.length; j++) {
-                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                document.getElementsByClassName('tableData')[j].children[1].innerHTML = res.data[j].物料型号 || res.data[j].零件图号
-                document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
-                document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
-                document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
-                document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
-                document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
-              }
-              document.getElementById('inquirySheetNum').innerHTML = this.orderExport
-              document.getElementById('supplier').innerHTML = ''
-            }
-          }).then(() => {
-            const htmlNode = $('#inquirySheet').html()
-            const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;')
-            body.children().hide()
-            const printNode = $(htmlNode)
-            body.append(printNode)
-            window.print()
-            body.removeAttr('style')
-            body.children().not('script').show()
-            body.children().not('#app').hide()
-            printNode.remove()
-          })
-        }).catch(res => {
-          console.log(res)
-          this.$message({
-            type: 'info',
-            message: '已取消操作'
-          })
-        })
-      },
-      exportInquirySheet() { // 导出询价单
-        this.$confirm('确认导出询价单?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          // 询价单导出结果
-          searchMerge(this.inquirySheetFlowNum).then(res => {
-            if (res.data.length === 0) {
-              this.$message.error('请选择正确的询价单导出')
-            } else {
-              const children = document.getElementsByClassName('tableData')
-              const parent = document.getElementsByClassName('inquirySheet')[0]
-              if (children.length !== 0) {
-                for (let i = children.length - 1; i >= 0; i--) {
-                  parent.removeChild(children[i])
-                }
-              }
-              const tr = []
-              let length = 0
-              res.data.length < 15 ? length = 15 : length = res.data.length
-              for (let i = 0; i < length; i++) {
-                tr[i] = document.createElement('tr')
-                tr[i].setAttribute('class', 'tableData')
-                tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
-                $('#tablehead').after(tr[i])
-              }
-              for (let j = 0; j < res.data.length; j++) {
-                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                document.getElementsByClassName('tableData')[j].children[1].innerHTML = res.data[j].物料型号 || res.data[j].零件图号
-                document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
-                document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
-                document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
-                document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
-                document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
-              }
-              document.getElementById('inquirySheetNum').innerHTML = this.orderExport
-              document.getElementById('supplier').innerHTML = ''
-              exportExcelMethod('inquirySheet', '采购询价单', '采购询价单sheet')
-            }
-          })
-        }).catch(res => {
-          console.log(res)
-          this.$message({
-            type: 'info',
-            message: '已取消操作'
-          })
-        })
-      },
-      handleSelectionChange1(val) { // 标准件和外购件多选
-        this.groupPartNum = []
-        this.allNum = []
-        for (let i = 0; i < val.length; i++) {
-          this.groupPartNum[i] = val[i].组件零件流水号
-          this.allNum[i] = val[i].待询价数量
-        }
-      },
-      handleSelectionChange2(val) { // 基本件多选
-        this.groupPartBasicNum = []
-        this.allNum = []
-        for (let i = 0; i < val.length; i++) {
-          this.groupPartBasicNum[i] = val[i].组件零件基本件流水号
-          this.allNum[i] = val[i].零件数量
-        }
-      },
-      addInquirySheet() { // 追加物料
-        const numGroup1 = [] // 空数组，放该询价单中已有的组件零件流水号
-        const numGroup2 = [] // 空数组，放该询价单中已有的组件零件基本件流水号
-        if (this.inquirySheetFlowNum === '' || this.inquirySheetFlowNum === null) {
-          this.$message.error('请选择一个询价单')
-        } else if (this.groupPartNum.length === 0 && this.groupPartBasicNum.length === 0) {
-          this.$message.error('请选择待询价物料或零件')
-        } else {
-          searchSheetDetail(this.inquirySheetFlowNum).then(response => {
-            for (let i = 0; i < response.data.length; i++) {
-              numGroup1.push(response.data[i].组件零件流水号)
-              numGroup2.push(response.data[i].组件零件基本件流水号)
-            }
-          }).then(() => {
-            let x = true // 为了只执行一次的中间变量
-            if (this.groupPartBasicNum.length === 0) { // 标准件和外购件
-              for (let i = 0; i < this.groupPartNum.length; i++) {
-                if (numGroup1.indexOf(parseInt(this.groupPartNum[i])) !== -1) {
-                  if (x) {
-                    this.$notify({
-                      title: '注意',
-                      message: '无法向该询价单中追加重复物料，已自动跳过',
-                      type: 'warning'
-                    })
-                    x = false
-                  }
-                } else {
-                  addInquirySheet1(this.inquirySheetFlowNum, this.groupPartNum[i], this.allNum[i]).then(response => {
-                    if (response.data[0].result === '1') {
-                      this.$message.success('操作成功')
-                      this.searchTable11()
-                      searchSheetDetail(this.inquirySheetFlowNum).then(response => {
-                        this.tableData3 = response.data
-                      })
-                    } else { this.$message.error('操作失败') }
-                  })
-                }
-              }
-            } else { // 基本件
-              for (let i = 0; i < this.groupPartBasicNum.length; i++) {
-                if (numGroup2.indexOf(parseInt(this.groupPartBasicNum[i])) !== -1) {
-                  if (x) {
-                    this.$notify({
-                      title: '注意',
-                      message: '无法向该询价单中追加重复零件，已自动跳过',
-                      type: 'warning'
-                    })
-                    x = false
-                  }
-                } else {
-                  addInquirySheet2(this.inquirySheetFlowNum, this.groupPartBasicNum[i], this.allNum[i]).then(response => {
-                    if (response.data[0].result === '1') {
-                      this.$message.success('操作成功')
-                      this.searchTable12()
-                      searchSheetDetail(this.inquirySheetFlowNum).then(response => {
-                        this.tableData3 = response.data
-                      })
-                    } else {
-                      this.$message.error('操作失败')
-                    }
-                  })
-                }
-              }
-            }
-          })
-        }
-      },
-      outInquirySheet(row) {
-        outInquirySheet(row.询价单明细流水号, row.组件零件流水号, row.组件零件基本件流水号).then(response => {
-          if (response.data[0].result === '1') {
-            this.searchTable11()
-            this.searchTable12()
-            searchSheetDetail(this.inquirySheetFlowNum).then(response => {
-              this.tableData3 = response.data
-            })
-            this.$message.success('操作成功')
-          } else { this.$message.error('操作失败') }
-        })
-      },
-      searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
-        this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
-        this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
-        this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
-        this.registeredCapital ? this.supplierCheck4 = 1 : (this.supplierCheck4 = 0, this.registeredCapital = '')
-        this.taxNum ? this.supplierCheck5 = 1 : (this.supplierCheck5 = 0, this.taxNum = '')
-        this.EMail ? this.supplierCheck6 = 1 : (this.supplierCheck6 = 0, this.EMail = '')
-        this.address ? this.supplierCheck7 = 1 : (this.supplierCheck7 = 0, this.address = '')
-        this.account ? this.supplierCheck8 = 1 : (this.supplierCheck8 = 0, this.account = '')
-        this.openingBank ? this.supplierCheck9 = 1 : (this.supplierCheck9 = 0, this.openingBank = '')
-        this.phone ? this.supplierCheck10 = 1 : (this.supplierCheck10 = 0, this.phone = '')
-        this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
-        this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
-        searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
-          this.tableData01 = response.data
-        })
-      },
-      showSupplierDetail(row) {
-        this.form2.supplierValue = row.供应商流水号
-        this.form2.supplierName = row.供应商名称
-        this.supplierValue = row.供应商流水号
-        this.supplierName = row.供应商名称
-        this.enterpriseNature = row.企业性质
-        this.createDate = row.创立日期
-        this.registeredCapital = row.注册资本
-        this.taxNum = row.税号
-        this.EMail = row.电子信箱
-        this.address = row.地址
-        this.account = row.帐号
-        this.openingBank = row.开户行
-        this.phone = row.电话号码
-        this.fax = row.传真
-        this.goodTime = row.货期
-      },
-      emptySupplierDetail() {
-        this.supplierValue = ''
-        this.supplierName = ''
-        this.enterpriseNature = ''
-        this.createDate = ''
-        this.registeredCapital = ''
-        this.taxNum = ''
-        this.EMail = ''
-        this.address = ''
-        this.account = ''
-        this.openingBank = ''
-        this.phone = ''
-        this.fax = ''
-        this.goodTime = ''
-      },
-      submitSelectSupplier() { // 确定选择供应商
-        this.dialogVisible1 = false
-      },
-      searchTable3(row) { // 查询该询价单中的物料和零件
-        this.tableData3 = []
-        this.inquirySheetFlowNum = row.询价单流水号
-        this.orderExport = row.询价单编号
-        searchSheetDetail(row.询价单流水号).then(response => {
-          console.log(response.data)
-          this.tableData3 = response.data
-        })
-      },
-      materialChange(row) { // 物料变更 标准件和外购件
-        this.dialogVisible3 = true
-        this.groupPartNumValue = row.组件零件流水号
-        this.standardAndPurchaseValue = row.标准件和外购件流水号
-        this.materialOldValue = row.物料流水号
-      },
-      partChange(row) { // 零件变更 基本件
-        this.$message('没有基本件的标准库')
-        console.log(row)
-      },
-      searchMaterial() {
-        if (this.materialName0 || this.materialSpec0 || this.materialModel0) {
-          let check1, check2, check3
-          this.materialName0 ? check1 = 1 : check1 = 0
-          this.materialSpec0 ? check2 = 1 : check2 = 0
-          this.materialModel0 ? check3 = 1 : check3 = 0
-          searchAllMaterial(check1, this.materialName0, check2, this.materialSpec0, check3, this.materialModel0, this.pageCurrent02, this.pageSize02).then(response => {
-            this.tableData02 = response.data.result
-            this.total02 = parseInt(response.data.output[0].ItemCount)
-          })
-        } else {
-          this.$message.warning('请至少输入一种搜索条件')
-        }
-      },
-      handleSizeChange02(val) {
-        this.pageSize02 = val
-        this.searchMaterial()
-      },
-      handleCurrentChange02(val) {
-        this.pageCurrent02 = val
-        this.searchMaterial()
-      },
-      selectNewMaterial(row) {
-        this.materialNew = ''
-        this.materialNewValue = row.物料流水号
-        this.materialNew += row.物料名称 + ' ' + row.物料规格 + ' ' + row.物料型号
-      },
-      submitMaterialChange() {
-        materialChange(this.groupPartNumValue, this.standardAndPurchaseValue, this.materialOldValue, this.materialNewValue, this.id).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('提交变更申请成功')
-            this.dialogVisible3 = false
-            this.searchTable11()
-          } else { this.$message.error('操作失败') }
-        })
-      },
-      tableRowClassName({ row, rowIndex }) {
-        if (parseInt(row.是否确认) === 0) {
-          return 'MistyRose'
-        }
-        return ''
       }
+    },
+    outInquirySheet(row) {
+      outInquirySheet(row.询价单明细流水号, row.组件零件流水号, row.组件零件基本件流水号).then(response => {
+        if (response.data[0].result === '1') {
+          this.searchTable11()
+          this.searchTable12()
+          searchSheetDetail(this.inquirySheetFlowNum).then(response => {
+            this.tableData3 = response.data
+          })
+          this.$message.success('操作成功')
+        } else { this.$message.error('操作失败') }
+      })
+    },
+    searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
+      this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
+      this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
+      this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
+      this.registeredCapital ? this.supplierCheck4 = 1 : (this.supplierCheck4 = 0, this.registeredCapital = '')
+      this.taxNum ? this.supplierCheck5 = 1 : (this.supplierCheck5 = 0, this.taxNum = '')
+      this.EMail ? this.supplierCheck6 = 1 : (this.supplierCheck6 = 0, this.EMail = '')
+      this.address ? this.supplierCheck7 = 1 : (this.supplierCheck7 = 0, this.address = '')
+      this.account ? this.supplierCheck8 = 1 : (this.supplierCheck8 = 0, this.account = '')
+      this.openingBank ? this.supplierCheck9 = 1 : (this.supplierCheck9 = 0, this.openingBank = '')
+      this.phone ? this.supplierCheck10 = 1 : (this.supplierCheck10 = 0, this.phone = '')
+      this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
+      this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
+      searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
+        this.tableData01 = response.data
+      })
+    },
+    showSupplierDetail(row) {
+      this.form2.supplierValue = row.供应商流水号
+      this.form2.supplierName = row.供应商名称
+      this.supplierValue = row.供应商流水号
+      this.supplierName = row.供应商名称
+      this.enterpriseNature = row.企业性质
+      this.createDate = row.创立日期
+      this.registeredCapital = row.注册资本
+      this.taxNum = row.税号
+      this.EMail = row.电子信箱
+      this.address = row.地址
+      this.account = row.帐号
+      this.openingBank = row.开户行
+      this.phone = row.电话号码
+      this.fax = row.传真
+      this.goodTime = row.货期
+    },
+    emptySupplierDetail() {
+      this.supplierValue = ''
+      this.supplierName = ''
+      this.enterpriseNature = ''
+      this.createDate = ''
+      this.registeredCapital = ''
+      this.taxNum = ''
+      this.EMail = ''
+      this.address = ''
+      this.account = ''
+      this.openingBank = ''
+      this.phone = ''
+      this.fax = ''
+      this.goodTime = ''
+    },
+    submitSelectSupplier() { // 确定选择供应商
+      this.dialogVisible1 = false
+    },
+    searchTable3(row) { // 查询该询价单中的物料和零件
+      this.tableData3 = []
+      this.inquirySheetFlowNum = row.询价单流水号
+      this.orderExport = row.询价单编号
+      searchSheetDetail(row.询价单流水号).then(response => {
+        console.log(response.data)
+        this.tableData3 = response.data
+      })
+    },
+    materialChange(row) { // 物料变更 标准件和外购件
+      this.dialogVisible3 = true
+      this.groupPartNumValue = row.组件零件流水号
+      this.standardAndPurchaseValue = row.标准件和外购件流水号
+      this.materialOldValue = row.物料流水号
+    },
+    partChange(row) { // 零件变更 基本件
+      this.$message('没有基本件的标准库')
+      console.log(row)
+    },
+    searchMaterial() {
+      if (this.materialName0 || this.materialSpec0 || this.materialModel0) {
+        let check1, check2, check3
+        this.materialName0 ? check1 = 1 : check1 = 0
+        this.materialSpec0 ? check2 = 1 : check2 = 0
+        this.materialModel0 ? check3 = 1 : check3 = 0
+        searchAllMaterial(check1, this.materialName0, check2, this.materialSpec0, check3, this.materialModel0, this.pageCurrent02, this.pageSize02).then(response => {
+          this.tableData02 = response.data.result
+          this.total02 = parseInt(response.data.output[0].ItemCount)
+        })
+      } else {
+        this.$message.warning('请至少输入一种搜索条件')
+      }
+    },
+    handleSizeChange02(val) {
+      this.pageSize02 = val
+      this.searchMaterial()
+    },
+    handleCurrentChange02(val) {
+      this.pageCurrent02 = val
+      this.searchMaterial()
+    },
+    selectNewMaterial(row) {
+      this.materialNew = ''
+      this.materialNewValue = row.物料流水号
+      this.materialNew += row.物料名称 + ' ' + row.物料规格 + ' ' + row.物料型号
+    },
+    submitMaterialChange() {
+      materialChange(this.groupPartNumValue, this.standardAndPurchaseValue, this.materialOldValue, this.materialNewValue, this.id).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('提交变更申请成功')
+          this.dialogVisible3 = false
+          this.searchTable11()
+        } else { this.$message.error('操作失败') }
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (parseInt(row.是否确认) === 0) {
+        return 'MistyRose'
+      }
+      return ''
     }
   }
+}
 </script>
 
 <style scoped>
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index e9b1c41f..b8f4ccd8 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -184,236 +184,236 @@
 </template>
 
 <script>
-  import Tinymce from '@/components/Tinymce'
-  import { initSupplier, searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo, savePrice } from '@/api/PurchasingCenter/CreatePurchaseContract'
-  import { convertCurrency } from '@/vendor/int2Chinese'
-  import { mapGetters } from 'vuex'
-  import { sleep, groupBy } from '@/utils/tool'
-  import $ from 'jquery'
+import Tinymce from '@/components/Tinymce'
+import { initSupplier, searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo, savePrice } from '@/api/PurchasingCenter/CreatePurchaseContract'
+import { convertCurrency } from '@/vendor/int2Chinese'
+import { mapGetters } from 'vuex'
+import { sleep, groupBy } from '@/utils/tool'
+import $ from 'jquery'
 
-  export default {
-    components: { Tinymce },
-    inject: ['reload'],
-    data() {
-      return {
-        supplier: [],
-        year: '',
-        month: '',
-        day: '',
-        trustee: '', // 受托人
-        bank1: '',
-        account1: '',
-        taxCode1: '',
-        phone1: '',
-        fax1: '',
-        postCode1: '',
-        bank2: '',
-        account2: '',
-        taxCode2: '',
-        phone2: '',
-        fax2: '',
-        postCode2: '',
-        hasTax: '含税',
-        taxRate: 0.13,
-        preview: false, // 预览
-        demoRadio: '', // 模板radio
-        content: ``, // 合同格式模板
-        contentNew: ``, // tinymce的
-        contractName: '采购合同', // 合同名称
-        contractNum: '', // 合同编号
-        contractNums: [], // 合同编号数组
-        contractNumValue: '', // 合同流水号
-        supplierName: '', // 供应商名称
-        supplierValue: '', // 供应商流水号
-        supplierAddress: '', // 供应商地址
-        legalPerson: '', // 法人
-        untaxTotal: '', // 未税合计
-        tax: '', // 税额
-        taxTotal: '', // 含税合计
-        actualTotal: '', // 实际金额
-        actualTotal_zh: '', // 实际金额大写
-        payDate: '', // 支付日期
-        payMethod: '', // 支付方式
-        deliveryDate: '', // 交货日期
-        invoiceInfo: '', // 开票信息
-        otherInfo: '', // 其他说明
-        tableData1: [],
-        单价是否含税: '',
-        组件零件流水号组: [],
-        组件零件基本件流水号组: [],
-        数量组: [],
-        单价组: [],
-        交货期组: []
-      }
-    },
-    computed: {
-      ...mapGetters([
-        'name',
-        'id'
-      ])
-    },
-    created() {
-      this.fetchData()
-    },
-    methods: {
-      // 价格实时保存
-      priceChange(price, num1, num2, row) {
-        this.tableData1.map(v => {
-          if (Number(v.物料流水号) === Number(row.物料流水号) && Number(v.询价单流水号) === Number(row.询价单流水号)) {
-            v.含税单价 = row.含税单价
-            v.未税单价 = row.未税单价
-          }
-        })
-        const group = this.tableData1
-        this.tableData1 = []
-        this.tableData1 = group
-        price = price || 0
-        savePrice(price, num1, num2).then(res => {
-          if (res.data[0].result === '1') {
-            console.log('单价实时保存成功')
-          } else {
-            console.log('单价实时保存失败')
-          }
-        })
-      },
-      deleteAllDate() {
-        this.tableData1.map(v => {
-          v.交货期 = ''
-        })
-      },
-      fetchData() {
-        initSupplier(this.id).then(res => {
-          this.supplier = []
-          for (let i = 0; i < res.data.length; i++) {
-            this.supplier.push({
-              value: res.data[i].供应商流水号,
-              label: res.data[i].供应商名称
-            })
-          }
-        })
-        searchBaseInfo(this.id).then(res => {
-          this.fax2 = res.data[0] ? res.data[0].传真 : ''
-          this.postCode2 = '224053'
-          this.phone2 = res.data[0] ? res.data[0].手机 + '/' + res.data[0].公司电话 : ''
-          this.taxCode2 = res.data[0] ? res.data[0].税号 : ''
-          this.account2 = res.data[0] ? res.data[0].帐号 : ''
-          this.bank2 = res.data[0] ? res.data[0].开户行 : ''
-        })
-        searchInquirySheet(0, 0, 0, 0, 1, this.id, 0, 0).then(response => { // 初始化询价单号
-          this.contractNums = []
-          for (let i = 0; i < response.data.length; i++) {
-            this.contractNums.push({
-              value: response.data[i].询价单流水号,
-              label: response.data[i].询价单编号,
-              supplierName: response.data[i].供应商名称,
-              supplierValue: response.data[i].供应商流水号,
-              supplierAddress: response.data[i].地址,
-              legalPerson: response.data[i].企业性质, // 法人
-              trustee: response.data[i].注册资本 || '', // 受托人
-              bank1: response.data[i].开户行 || '', // 开户行
-              account1: response.data[i].帐号 || '', // 帐号
-              taxCode1: response.data[i].税号 || '', // 税号
-              phone1: response.data[i].电话号码 || '', // 电话
-              fax1: response.data[i].传真 || '', // 传真
-              postCode1: response.data[i].货期 || '' // 邮编
-            })
-          }
-        })
-      },
-      submitTotal() { // 确定合同总额
-        this.$refs.tinymce.destroyTinymce()
-        document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
-        document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
-        document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
-        this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
-        this.$refs.tinymce.initTinymce()
-      },
-      supplierChange() {
-        let check
-        this.supplierValue ? check = 1 : check = 0
-        searchInquirySheet(0, 0, 0, 0, 1, this.id, check, this.supplierValue).then(response => { // 初始化询价单号
-          this.contractNums = []
-          this.contractNumValue = ''
-          for (let i = 0; i < response.data.length; i++) {
-            this.contractNums.push({
-              value: response.data[i].询价单流水号,
-              label: response.data[i].询价单编号,
-              supplierName: response.data[i].供应商名称,
-              supplierValue: response.data[i].供应商流水号,
-              supplierAddress: response.data[i].地址,
-              legalPerson: response.data[i].企业性质, // 法人
-              trustee: response.data[i].注册资本 || '', // 受托人
-              bank1: response.data[i].开户行 || '', // 开户行
-              account1: response.data[i].帐号 || '', // 帐号
-              taxCode1: response.data[i].税号 || '', // 税号
-              phone1: response.data[i].电话号码 || '', // 电话
-              fax1: response.data[i].传真 || '', // 传真
-              postCode1: response.data[i].货期 || '' // 邮编
-            })
-          }
-        })
-      },
-      contractChange() { // 选择合同select
-        for (let i = 0; i < this.contractNums.length; i++) {
-          if (this.contractNums[i].value === this.contractNumValue) {
-            this.supplierName = this.contractNums[i].supplierName
-            this.supplierValue = this.contractNums[i].supplierValue
-            this.supplierAddress = this.contractNums[i].supplierAddress
-            this.legalPerson = this.contractNums[i].legalPerson
-            this.contractNum = this.contractNums[i].label
-            this.trustee = this.contractNums[i].trustee
-            this.bank1 = this.contractNums[i].bank1
-            this.account1 = this.contractNums[i].account1
-            this.taxCode1 = this.contractNums[i].taxCode1
-            this.phone1 = this.contractNums[i].phone1
-            this.fax1 = this.contractNums[i].fax1
-            this.postCode1 = this.contractNums[i].postCode1
-          }
+export default {
+  components: { Tinymce },
+  inject: ['reload'],
+  data() {
+    return {
+      supplier: [],
+      year: '',
+      month: '',
+      day: '',
+      trustee: '', // 受托人
+      bank1: '',
+      account1: '',
+      taxCode1: '',
+      phone1: '',
+      fax1: '',
+      postCode1: '',
+      bank2: '',
+      account2: '',
+      taxCode2: '',
+      phone2: '',
+      fax2: '',
+      postCode2: '',
+      hasTax: '含税',
+      taxRate: 0.13,
+      preview: false, // 预览
+      demoRadio: '', // 模板radio
+      content: ``, // 合同格式模板
+      contentNew: ``, // tinymce的
+      contractName: '采购合同', // 合同名称
+      contractNum: '', // 合同编号
+      contractNums: [], // 合同编号数组
+      contractNumValue: '', // 合同流水号
+      supplierName: '', // 供应商名称
+      supplierValue: '', // 供应商流水号
+      supplierAddress: '', // 供应商地址
+      legalPerson: '', // 法人
+      untaxTotal: '', // 未税合计
+      tax: '', // 税额
+      taxTotal: '', // 含税合计
+      actualTotal: '', // 实际金额
+      actualTotal_zh: '', // 实际金额大写
+      payDate: '', // 支付日期
+      payMethod: '', // 支付方式
+      deliveryDate: '', // 交货日期
+      invoiceInfo: '', // 开票信息
+      otherInfo: '', // 其他说明
+      tableData1: [],
+      单价是否含税: '',
+      组件零件流水号组: [],
+      组件零件基本件流水号组: [],
+      数量组: [],
+      单价组: [],
+      交货期组: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'id'
+    ])
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    // 价格实时保存
+    priceChange(price, num1, num2, row) {
+      this.tableData1.map(v => {
+        if (Number(v.物料流水号) === Number(row.物料流水号) && Number(v.询价单流水号) === Number(row.询价单流水号)) {
+          v.含税单价 = row.含税单价
+          v.未税单价 = row.未税单价
         }
-        this.searchContractDetail()
-      },
-      searchContractDetail() { // 查询合同明细
-        this.tableData1 = []
-        searchSheetContract(this.contractNumValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.tableData1.push({
-              询价单流水号: response.data[i].询价单流水号,
-              物料流水号: response.data[i].物料流水号,
-              询价单明细流水号: response.data[i].询价单明细流水号,
-              机床图号: response.data[i].机床图号,
-              组号: response.data[i].组号,
-              组件零件流水号: response.data[i].组件零件流水号,
-              组件零件基本件流水号: response.data[i].组件零件基本件流水号,
-              交货期: response.data[i].组件零件流水号 ? response.data[i].标准件和外购件交货期 : response.data[i].基本件交货期,
-              图号: response.data[i].组件零件流水号 ? response.data[i].物料型号 : response.data[i].零件图号,
-              名称: response.data[i].组件零件流水号 ? response.data[i].物料名称 : response.data[i].零件名称,
-              规格: response.data[i].组件零件流水号 ? response.data[i].物料规格 : response.data[i].规格,
-              数量: response.data[i].数量,
-              计量单位: response.data[i].计量单位,
-              未税单价: response.data[i].单价,
-              未税总额: 0,
-              含税单价: response.data[i].单价,
-              含税总额: 0,
-              备注: response.data[i].备注
-            })
-          }
-        })
-      },
-      demoChange() { // 模板change
-        switch (this.demoRadio) {
-          case '模板1':
-            this.demo1()
-            break
-          case '模板2':
-            this.demo2()
-            break
+      })
+      const group = this.tableData1
+      this.tableData1 = []
+      this.tableData1 = group
+      price = price || 0
+      savePrice(price, num1, num2).then(res => {
+        if (res.data[0].result === '1') {
+          console.log('单价实时保存成功')
+        } else {
+          console.log('单价实时保存失败')
+        }
+      })
+    },
+    deleteAllDate() {
+      this.tableData1.map(v => {
+        v.交货期 = ''
+      })
+    },
+    fetchData() {
+      initSupplier(this.id).then(res => {
+        this.supplier = []
+        for (let i = 0; i < res.data.length; i++) {
+          this.supplier.push({
+            value: res.data[i].供应商流水号,
+            label: res.data[i].供应商名称
+          })
+        }
+      })
+      searchBaseInfo(this.id).then(res => {
+        this.fax2 = res.data[0] ? res.data[0].传真 : ''
+        this.postCode2 = '224053'
+        this.phone2 = res.data[0] ? res.data[0].手机 + '/' + res.data[0].公司电话 : ''
+        this.taxCode2 = res.data[0] ? res.data[0].税号 : ''
+        this.account2 = res.data[0] ? res.data[0].帐号 : ''
+        this.bank2 = res.data[0] ? res.data[0].开户行 : ''
+      })
+      searchInquirySheet(0, 0, 0, 0, 1, this.id, 0, 0).then(response => { // 初始化询价单号
+        this.contractNums = []
+        for (let i = 0; i < response.data.length; i++) {
+          this.contractNums.push({
+            value: response.data[i].询价单流水号,
+            label: response.data[i].询价单编号,
+            supplierName: response.data[i].供应商名称,
+            supplierValue: response.data[i].供应商流水号,
+            supplierAddress: response.data[i].地址,
+            legalPerson: response.data[i].企业性质, // 法人
+            trustee: response.data[i].注册资本 || '', // 受托人
+            bank1: response.data[i].开户行 || '', // 开户行
+            account1: response.data[i].帐号 || '', // 帐号
+            taxCode1: response.data[i].税号 || '', // 税号
+            phone1: response.data[i].电话号码 || '', // 电话
+            fax1: response.data[i].传真 || '', // 传真
+            postCode1: response.data[i].货期 || '' // 邮编
+          })
+        }
+      })
+    },
+    submitTotal() { // 确定合同总额
+      this.$refs.tinymce.destroyTinymce()
+      document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
+      document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
+      document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
+      this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
+      this.$refs.tinymce.initTinymce()
+    },
+    supplierChange() {
+      let check
+      this.supplierValue ? check = 1 : check = 0
+      searchInquirySheet(0, 0, 0, 0, 1, this.id, check, this.supplierValue).then(response => { // 初始化询价单号
+        this.contractNums = []
+        this.contractNumValue = ''
+        for (let i = 0; i < response.data.length; i++) {
+          this.contractNums.push({
+            value: response.data[i].询价单流水号,
+            label: response.data[i].询价单编号,
+            supplierName: response.data[i].供应商名称,
+            supplierValue: response.data[i].供应商流水号,
+            supplierAddress: response.data[i].地址,
+            legalPerson: response.data[i].企业性质, // 法人
+            trustee: response.data[i].注册资本 || '', // 受托人
+            bank1: response.data[i].开户行 || '', // 开户行
+            account1: response.data[i].帐号 || '', // 帐号
+            taxCode1: response.data[i].税号 || '', // 税号
+            phone1: response.data[i].电话号码 || '', // 电话
+            fax1: response.data[i].传真 || '', // 传真
+            postCode1: response.data[i].货期 || '' // 邮编
+          })
+        }
+      })
+    },
+    contractChange() { // 选择合同select
+      for (let i = 0; i < this.contractNums.length; i++) {
+        if (this.contractNums[i].value === this.contractNumValue) {
+          this.supplierName = this.contractNums[i].supplierName
+          this.supplierValue = this.contractNums[i].supplierValue
+          this.supplierAddress = this.contractNums[i].supplierAddress
+          this.legalPerson = this.contractNums[i].legalPerson
+          this.contractNum = this.contractNums[i].label
+          this.trustee = this.contractNums[i].trustee
+          this.bank1 = this.contractNums[i].bank1
+          this.account1 = this.contractNums[i].account1
+          this.taxCode1 = this.contractNums[i].taxCode1
+          this.phone1 = this.contractNums[i].phone1
+          this.fax1 = this.contractNums[i].fax1
+          this.postCode1 = this.contractNums[i].postCode1
+        }
+      }
+      this.searchContractDetail()
+    },
+    searchContractDetail() { // 查询合同明细
+      this.tableData1 = []
+      searchSheetContract(this.contractNumValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.tableData1.push({
+            询价单流水号: response.data[i].询价单流水号,
+            物料流水号: response.data[i].物料流水号,
+            询价单明细流水号: response.data[i].询价单明细流水号,
+            机床图号: response.data[i].机床图号,
+            组号: response.data[i].组号,
+            组件零件流水号: response.data[i].组件零件流水号,
+            组件零件基本件流水号: response.data[i].组件零件基本件流水号,
+            交货期: response.data[i].组件零件流水号 ? response.data[i].标准件和外购件交货期 : response.data[i].基本件交货期,
+            图号: response.data[i].组件零件流水号 ? response.data[i].物料型号 : response.data[i].零件图号,
+            名称: response.data[i].组件零件流水号 ? response.data[i].物料名称 : response.data[i].零件名称,
+            规格: response.data[i].组件零件流水号 ? response.data[i].物料规格 : response.data[i].规格,
+            数量: response.data[i].数量,
+            计量单位: response.data[i].计量单位,
+            未税单价: response.data[i].单价,
+            未税总额: 0,
+            含税单价: response.data[i].单价,
+            含税总额: 0,
+            备注: response.data[i].备注
+          })
+        }
+      })
+    },
+    demoChange() { // 模板change
+      switch (this.demoRadio) {
+        case '模板1':
+          this.demo1()
+          break
+        case '模板2':
+          this.demo2()
+          break
           // case '自定义':
           //   this.customization()
           //   break
-        }
-      },
-      demo1() { // 选择合同模板1
-        this.content = `
+      }
+    },
+    demo1() { // 选择合同模板1
+      this.content = `
 <h2 style="text-align: center;">
     <strong>采购合同</strong>
 </h2>
@@ -559,161 +559,161 @@
 <span>含税总价（税率<span id="taxRate"></span>）：</span><span id="taxTotal"></span><span>元</span><br>
 <span>优惠后含税总价：</span><span class="actualTotal"></span><span>元</span>
 `
-      },
-      async editContract() { // 选择一个询价单，整成合同明细
-        const date = new Date()
-        this.year = date.getFullYear()
-        this.month = date.getMonth() + 1
-        this.day = date.getDate()
-        this.demoChange()
-        await sleep(0)
-        if (this.contractNumValue) {
-          if (this.demoRadio) {
-            this.$refs.tinymce.destroyTinymce()
-            document.getElementById('contractName') ? document.getElementById('contractName').innerHTML = this.contractName : ''
-            document.getElementById('contractNum') ? document.getElementById('contractNum').innerHTML = this.contractNum : ''
-            document.getElementById('supplierName') ? document.getElementById('supplierName').innerHTML = this.supplierName : ''
-            document.getElementById('supplierAddress') ? document.getElementById('supplierAddress').innerHTML = this.supplierAddress : ''
-            document.getElementById('legalPerson') ? document.getElementById('legalPerson').innerHTML = this.legalPerson : ''
-            document.getElementById('payDate') ? document.getElementById('payDate').innerHTML = this.payDate : ''
-            document.getElementById('payMethod') ? document.getElementById('payMethod').innerHTML = this.payMethod : ''
-            document.getElementById('invoiceInfo') ? document.getElementById('invoiceInfo').innerHTML = this.invoiceInfo : ''
-            document.getElementById('deliveryDate') ? document.getElementById('deliveryDate').innerHTML = this.deliveryDate : ''
-            document.getElementById('otherInfo') ? document.getElementById('otherInfo').innerHTML = this.otherInfo : ''
-            document.getElementById('hasTax') ? document.getElementById('hasTax').innerHTML = this.hasTax : ''
-            document.getElementById('taxRate') ? document.getElementById('taxRate').innerHTML = this.taxRate * 100 + '%' : ''
-            // 明细表
-            // 移出旧数据
-            const children = document.getElementsByClassName('tableData')
-            const parent = document.getElementById('tbody')
-            if (children.length !== 0) {
-              for (let i = children.length - 1; i >= 0; i--) {
-                parent.removeChild(children[i])
-              }
+    },
+    async editContract() { // 选择一个询价单，整成合同明细
+      const date = new Date()
+      this.year = date.getFullYear()
+      this.month = date.getMonth() + 1
+      this.day = date.getDate()
+      this.demoChange()
+      await sleep(0)
+      if (this.contractNumValue) {
+        if (this.demoRadio) {
+          this.$refs.tinymce.destroyTinymce()
+          document.getElementById('contractName') ? document.getElementById('contractName').innerHTML = this.contractName : ''
+          document.getElementById('contractNum') ? document.getElementById('contractNum').innerHTML = this.contractNum : ''
+          document.getElementById('supplierName') ? document.getElementById('supplierName').innerHTML = this.supplierName : ''
+          document.getElementById('supplierAddress') ? document.getElementById('supplierAddress').innerHTML = this.supplierAddress : ''
+          document.getElementById('legalPerson') ? document.getElementById('legalPerson').innerHTML = this.legalPerson : ''
+          document.getElementById('payDate') ? document.getElementById('payDate').innerHTML = this.payDate : ''
+          document.getElementById('payMethod') ? document.getElementById('payMethod').innerHTML = this.payMethod : ''
+          document.getElementById('invoiceInfo') ? document.getElementById('invoiceInfo').innerHTML = this.invoiceInfo : ''
+          document.getElementById('deliveryDate') ? document.getElementById('deliveryDate').innerHTML = this.deliveryDate : ''
+          document.getElementById('otherInfo') ? document.getElementById('otherInfo').innerHTML = this.otherInfo : ''
+          document.getElementById('hasTax') ? document.getElementById('hasTax').innerHTML = this.hasTax : ''
+          document.getElementById('taxRate') ? document.getElementById('taxRate').innerHTML = this.taxRate * 100 + '%' : ''
+          // 明细表
+          // 移出旧数据
+          const children = document.getElementsByClassName('tableData')
+          const parent = document.getElementById('tbody')
+          if (children.length !== 0) {
+            for (let i = children.length - 1; i >= 0; i--) {
+              parent.removeChild(children[i])
             }
-            const merge = []
-            this.tableData1.map(v => {
-              if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
-                merge.push({
-                  机床图号: v.机床图号,
-                  组号: v.组号,
-                  图号: v.图号,
-                  名称: v.名称,
-                  规格: v.规格,
-                  数量: Number(v.数量),
-                  计量单位: v.计量单位,
-                  单价: this.hasTax === '含税' ? v.含税单价 : v.未税单价,
-                  合计: (Number(v.数量) * (this.hasTax === '含税' ? Number(v.含税单价) : Number(v.未税单价))).toFixed(2),
-                  交货期: v.交货期 ? v.交货期.split(' ')[0] : '',
-                  备注: v.备注
-                })
-              }
-            })
-            let mergeData = []
-            mergeData = groupBy(merge, ['图号', '名称', '规格', '计量单位', '单价', '交货期', '备注'])
-            // 放入新数据
-            const tr = []
-            for (let i = 0; i < mergeData.length; i++) {
-              tr[i] = document.createElement('tr')
-              tr[i].setAttribute('class', 'tableData')
-              tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
-              const tableHead = $('#tableHead')
-              tableHead ? tableHead.after(tr[i]) : ''
-            }
-            this.actualTotal = 0
-            this.untaxTotal = 0
-            this.taxTotal = 0
-            for (let j = 0; j < this.tableData1.length; j++) {
-              this.actualTotal += Number(this.tableData1[j].含税总额)
-              this.untaxTotal += Number(this.tableData1[j].未税总额)
-              this.taxTotal += Number(this.tableData1[j].含税总额)
-            }
-            for (let j = 0; j < mergeData.length; j++) {
-              if (document.getElementsByClassName('tableData')[j]) {
-                document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
-                document.getElementsByClassName('tableData')[j].children[1].innerHTML = mergeData[j].机床图号_组号
-                document.getElementsByClassName('tableData')[j].children[2].innerHTML = mergeData[j].名称
-                document.getElementsByClassName('tableData')[j].children[3].innerHTML = mergeData[j].图号
-                document.getElementsByClassName('tableData')[j].children[4].innerHTML = mergeData[j].规格
-                document.getElementsByClassName('tableData')[j].children[5].innerHTML = mergeData[j].数量
-                document.getElementsByClassName('tableData')[j].children[6].innerHTML = mergeData[j].计量单位
-                document.getElementsByClassName('tableData')[j].children[7].innerHTML = mergeData[j].单价
-                document.getElementsByClassName('tableData')[j].children[8].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2)
-                document.getElementsByClassName('tableData')[j].children[9].innerHTML = mergeData[j].交货期
-                document.getElementsByClassName('tableData')[j].children[10].innerHTML = mergeData[j].备注
-              }
-            }
-            this.actualTotal = this.actualTotal.toFixed(2)
-            this.untaxTotal = this.untaxTotal.toFixed(2)
-            this.taxTotal = this.taxTotal.toFixed(2)
-            this.tax = (this.taxTotal - this.untaxTotal).toFixed(2)
-            document.getElementById('untaxTotal') ? document.getElementById('untaxTotal').innerHTML = this.untaxTotal : ''
-            document.getElementById('tax') ? document.getElementById('tax').innerHTML = this.tax : ''
-            document.getElementById('taxTotal') ? document.getElementById('taxTotal').innerHTML = this.taxTotal : ''
-            document.getElementsByClassName('actualTotal')[0] ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
-            document.getElementsByClassName('actualTotal')[1] ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : ''
-            document.getElementById('actualTotal_zh') ? document.getElementById('actualTotal_zh').innerHTML = this.actualTotal_zh : ''
-            this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
-            this.$refs.tinymce.initTinymce()
-          } else {
-            this.$message.warning('请先选择合同模板，再预览')
           }
-        } else {
-          this.$message.warning('请先选择合同，再预览')
-        }
-      },
-      demo2() {
-        this.content = `demo2`
-      },
-      // customization() { // 自定义
-      //   this.content = `自定义`
-      // },
-      generateContract() { // 生成采购合同
-        this.content = this.contentNew.replace(/&nbsp;/g, '')
-        this.content = this.content.replace(/\n/g, '')
-        this.content = this.content.replace(/==/g, '= =') // 更新tinymce中的东西到html中，后续会用到
-        this.组件零件流水号组 = []
-        this.组件零件基本件流水号组 = []
-        this.数量组 = []
-        this.单价组 = []
-        this.交货期组 = []
-        this.hasTax === '含税' ? this.单价是否含税 = 1 : this.单价是否含税 = 0
-        const inquiryDetailNum_old = [] // 需要转移到新询价单的物料的询价单明细流水号
-        this.tableData1.map(v => {
-          if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
-            this.组件零件流水号组.push(v.组件零件流水号)
-            this.组件零件基本件流水号组.push(v.组件零件基本件流水号)
-            this.数量组.push(v.数量)
-            this.hasTax === '含税' ? this.单价组.push(v.含税单价) : this.单价组.push(v.未税单价)
-            this.交货期组.push(v.交货期)
-          } else { // 获取未询到价格的物料的询价单明细流水号们
-            inquiryDetailNum_old.push(v.询价单明细流水号)
-          }
-        })
-        if (this.contractNumValue) {
-          this.$confirm('此采购合同将递交审批，递交后该合同不可删除，确认完成编辑？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('合同生成成功')
-                this.reload()
-              } else { this.$message.error('生成合同失败') }
-            })
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消操作'
-            })
+          const merge = []
+          this.tableData1.map(v => {
+            if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
+              merge.push({
+                机床图号: v.机床图号,
+                组号: v.组号,
+                图号: v.图号,
+                名称: v.名称,
+                规格: v.规格,
+                数量: Number(v.数量),
+                计量单位: v.计量单位,
+                单价: this.hasTax === '含税' ? v.含税单价 : v.未税单价,
+                合计: (Number(v.数量) * (this.hasTax === '含税' ? Number(v.含税单价) : Number(v.未税单价))).toFixed(2),
+                交货期: v.交货期 ? v.交货期.split(' ')[0] : '',
+                备注: v.备注
+              })
+            }
           })
+          let mergeData = []
+          mergeData = groupBy(merge, ['图号', '名称', '规格', '计量单位', '单价', '交货期', '备注'])
+          // 放入新数据
+          const tr = []
+          for (let i = 0; i < mergeData.length; i++) {
+            tr[i] = document.createElement('tr')
+            tr[i].setAttribute('class', 'tableData')
+            tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
+            const tableHead = $('#tableHead')
+            tableHead ? tableHead.after(tr[i]) : ''
+          }
+          this.actualTotal = 0
+          this.untaxTotal = 0
+          this.taxTotal = 0
+          for (let j = 0; j < this.tableData1.length; j++) {
+            this.actualTotal += Number(this.tableData1[j].含税总额)
+            this.untaxTotal += Number(this.tableData1[j].未税总额)
+            this.taxTotal += Number(this.tableData1[j].含税总额)
+          }
+          for (let j = 0; j < mergeData.length; j++) {
+            if (document.getElementsByClassName('tableData')[j]) {
+              document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+              document.getElementsByClassName('tableData')[j].children[1].innerHTML = mergeData[j].机床图号_组号
+              document.getElementsByClassName('tableData')[j].children[2].innerHTML = mergeData[j].名称
+              document.getElementsByClassName('tableData')[j].children[3].innerHTML = mergeData[j].图号
+              document.getElementsByClassName('tableData')[j].children[4].innerHTML = mergeData[j].规格
+              document.getElementsByClassName('tableData')[j].children[5].innerHTML = mergeData[j].数量
+              document.getElementsByClassName('tableData')[j].children[6].innerHTML = mergeData[j].计量单位
+              document.getElementsByClassName('tableData')[j].children[7].innerHTML = mergeData[j].单价
+              document.getElementsByClassName('tableData')[j].children[8].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2)
+              document.getElementsByClassName('tableData')[j].children[9].innerHTML = mergeData[j].交货期
+              document.getElementsByClassName('tableData')[j].children[10].innerHTML = mergeData[j].备注
+            }
+          }
+          this.actualTotal = this.actualTotal.toFixed(2)
+          this.untaxTotal = this.untaxTotal.toFixed(2)
+          this.taxTotal = this.taxTotal.toFixed(2)
+          this.tax = (this.taxTotal - this.untaxTotal).toFixed(2)
+          document.getElementById('untaxTotal') ? document.getElementById('untaxTotal').innerHTML = this.untaxTotal : ''
+          document.getElementById('tax') ? document.getElementById('tax').innerHTML = this.tax : ''
+          document.getElementById('taxTotal') ? document.getElementById('taxTotal').innerHTML = this.taxTotal : ''
+          document.getElementsByClassName('actualTotal')[0] ? document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal : ''
+          document.getElementsByClassName('actualTotal')[1] ? document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal : ''
+          document.getElementById('actualTotal_zh') ? document.getElementById('actualTotal_zh').innerHTML = this.actualTotal_zh : ''
+          this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
+          this.$refs.tinymce.initTinymce()
         } else {
-          this.$message.warning('请先选择合同进行编辑')
+          this.$message.warning('请先选择合同模板，再预览')
         }
+      } else {
+        this.$message.warning('请先选择合同，再预览')
+      }
+    },
+    demo2() {
+      this.content = `demo2`
+    },
+    // customization() { // 自定义
+    //   this.content = `自定义`
+    // },
+    generateContract() { // 生成采购合同
+      this.content = this.contentNew.replace(/&nbsp;/g, '')
+      this.content = this.content.replace(/\n/g, '')
+      this.content = this.content.replace(/==/g, '= =') // 更新tinymce中的东西到html中，后续会用到
+      this.组件零件流水号组 = []
+      this.组件零件基本件流水号组 = []
+      this.数量组 = []
+      this.单价组 = []
+      this.交货期组 = []
+      this.hasTax === '含税' ? this.单价是否含税 = 1 : this.单价是否含税 = 0
+      const inquiryDetailNum_old = [] // 需要转移到新询价单的物料的询价单明细流水号
+      this.tableData1.map(v => {
+        if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
+          this.组件零件流水号组.push(v.组件零件流水号)
+          this.组件零件基本件流水号组.push(v.组件零件基本件流水号)
+          this.数量组.push(v.数量)
+          this.hasTax === '含税' ? this.单价组.push(v.含税单价) : this.单价组.push(v.未税单价)
+          this.交货期组.push(v.交货期)
+        } else { // 获取未询到价格的物料的询价单明细流水号们
+          inquiryDetailNum_old.push(v.询价单明细流水号)
+        }
+      })
+      if (this.contractNumValue) {
+        this.$confirm('此采购合同将递交审批，递交后该合同不可删除，确认完成编辑？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('合同生成成功')
+              this.reload()
+            } else { this.$message.error('生成合同失败') }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
+        })
+      } else {
+        this.$message.warning('请先选择合同进行编辑')
       }
     }
   }
+}
 </script>
 
 <style scoped>
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index a0bd421c..67f090c0 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -615,388 +615,388 @@
 </template>
 
 <script>
-  import { initMaterialCategory, initMaterialVariety, initProject, initBuyer, searchMachine, searchGroup, searchTable1, searchTable2, allocateTask1,
-    allocateTask2, executeReturn1, executeReturn2, retract1, retract2 } from '@/api/PurchasingCenter/PurchaseTaskAllocate'
-  import { mapGetters } from 'vuex'
+import { initMaterialCategory, initMaterialVariety, initProject, initBuyer, searchMachine, searchGroup, searchTable1, searchTable2, allocateTask1,
+  allocateTask2, executeReturn1, executeReturn2, retract1, retract2 } from '@/api/PurchasingCenter/PurchaseTaskAllocate'
+import { mapGetters } from 'vuex'
 
-  export default {
-    name: '', // 采购任务分配
-    data() {
-      return {
-        source: [
-          {
-            text: 'BZ',
-            value: 1
-          },
-          {
-            text: 'WG',
-            value: 2
-          }
-        ],
-        tabName: '标准件',
-        partNum: '',
-        partName: '',
-        partSpec: '',
-        partMaterial: '',
-        materialSpec: '',
-        materialModel: '',
-        MaterialCategoryValue: '', // 物料类别
-        MaterialCategory: [], // 物料类别数组
-        MaterialVarietyValue: '', // 物料品种
-        MaterialVariety: [], // 物料品种数组
-        projectValue: '',
-        project: [],
-        machineValue: '',
-        machine: [],
-        groupValue: '',
-        group: [],
-        materialName: '',
-        materialStatusValue: [0], // 物料状态
-        materialStatus: [
-          {
-            value: 0,
-            label: '全部'
-          },
-          {
-            value: 1,
-            label: '未分配'
-          },
-          {
-            value: 2,
-            label: '已分配',
+export default {
+  name: '', // 采购任务分配
+  data() {
+    return {
+      source: [
+        {
+          text: 'BZ',
+          value: 1
+        },
+        {
+          text: 'WG',
+          value: 2
+        }
+      ],
+      tabName: '标准件',
+      partNum: '',
+      partName: '',
+      partSpec: '',
+      partMaterial: '',
+      materialSpec: '',
+      materialModel: '',
+      MaterialCategoryValue: '', // 物料类别
+      MaterialCategory: [], // 物料类别数组
+      MaterialVarietyValue: '', // 物料品种
+      MaterialVariety: [], // 物料品种数组
+      projectValue: '',
+      project: [],
+      machineValue: '',
+      machine: [],
+      groupValue: '',
+      group: [],
+      materialName: '',
+      materialStatusValue: [0], // 物料状态
+      materialStatus: [
+        {
+          value: 0,
+          label: '全部'
+        },
+        {
+          value: 1,
+          label: '未分配'
+        },
+        {
+          value: 2,
+          label: '已分配',
+          children: [{
+            value: 3,
+            label: '未询价'
+          }, {
+            value: 4,
+            label: '已询价',
             children: [{
-              value: 3,
-              label: '未询价'
+              value: 5,
+              label: '未采购'
             }, {
-              value: 4,
-              label: '已询价',
-              children: [{
-                value: 5,
-                label: '未采购'
-              }, {
-                value: 6,
-                label: '已采购'
-              }]
+              value: 6,
+              label: '已采购'
             }]
-          }
-        ], // 物料状态
-        personValue: '',
-        person: [],
-        check1: 0,
-        check2: 0,
-        check3: 0,
-        check4: 0,
-        tableData0: [],
-        tableData1: [],
-        tableData2: [],
-        standardAndPurchase: [],
-        basic: [],
-        groupAndPart: [],
-        groupAndPartBasic: [],
-        pageCurrent0: 1,
-        pageSize0: 20,
-        total0: 0,
-        pageCurrent1: 1,
-        pageSize1: 20,
-        total1: 0,
-        pageCurrent2: 1,
-        pageSize2: 20,
-        total2: 0
+          }]
+        }
+      ], // 物料状态
+      personValue: '',
+      person: [],
+      check1: 0,
+      check2: 0,
+      check3: 0,
+      check4: 0,
+      tableData0: [],
+      tableData1: [],
+      tableData2: [],
+      standardAndPurchase: [],
+      basic: [],
+      groupAndPart: [],
+      groupAndPartBasic: [],
+      pageCurrent0: 1,
+      pageSize0: 20,
+      total0: 0,
+      pageCurrent1: 1,
+      pageSize1: 20,
+      total1: 0,
+      pageCurrent2: 1,
+      pageSize2: 20,
+      total2: 0
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'id'
+    ])
+  },
+  created() {
+    this.searchTable0() // 查表1
+    this.fetchData() // 初始化数据
+  },
+  methods: {
+    filterSource(value, row) {
+      return Number(row['零件类型']) === Number(value)
+    },
+    // 撤回
+    retract(row) {
+      this.$confirm('是否撤回重新分配?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (this.tabName === '基本件') {
+          retract2(row.基本件流水号).then(res => {
+            if (Number(res.data[0].result) === 1) {
+              this.$message.success('撤回成功')
+              this.searchTable2()
+            } else {
+              this.$message.error('撤回失败')
+            }
+          })
+        } else {
+          retract1(row.标准件和外购件流水号).then(res => {
+            if (Number(res.data[0].result) === 1) {
+              this.$message.success('撤回成功')
+              this.searchTable0()
+              this.searchTable1()
+            } else {
+              this.$message.error('撤回失败')
+            }
+          })
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
+    fetchData() { // 初始化
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.project.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
+        }
+      })
+      initBuyer().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            text: response.data[i].姓名,
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      this.getSelect(initMaterialCategory, ['物料类别', '物料类别流水号'], 'MaterialCategory', [0, this.DepartmentValue])
+    },
+    projectChange() {
+      this.machine = []
+      this.machineValue = ''
+      this.group = []
+      this.groupValue = ''
+      searchMachine(this.projectValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machine.push({
+            value: response.data[i].机床流水号,
+            label: response.data[i].机床图号,
+            name: response.data[i].机床名称
+          })
+        }
+      })
+    },
+    machineChange() {
+      this.group = []
+      this.groupValue = ''
+      searchGroup(this.machineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.group.push({
+            value: response.data[i].组件流水号,
+            label: response.data[i].组号
+          })
+        }
+      })
+    },
+    searchMaterialVariety() { // 初始化物料品种
+      this.MaterialVariety = []
+      this.MaterialVarietyValue = ''
+      this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
+    },
+    searchTable0() { // 查询标准件
+      this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
+      this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
+      this.projectValue ? this.check3 = 1 : this.check3 = 0
+      let check0, check1, check2, check3
+      this.machineValue ? check0 = 1 : check0 = 0
+      this.groupValue ? check1 = 1 : check1 = 0
+      this.materialName ? this.check4 = 1 : this.check4 = 0
+      this.materialSpec ? check2 = 1 : check2 = 0
+      this.materialModel ? check3 = 1 : check3 = 0
+      searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1).then(response => {
+        this.tableData0 = response.data.rows
+        this.total0 = response.data.total
+      })
+    },
+    searchTable1() { // 查询外购件
+      this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
+      this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
+      this.projectValue ? this.check3 = 1 : this.check3 = 0
+      let check0, check1, check2, check3
+      this.machineValue ? check0 = 1 : check0 = 0
+      this.groupValue ? check1 = 1 : check1 = 0
+      this.materialName ? this.check4 = 1 : this.check4 = 0
+      this.materialSpec ? check2 = 1 : check2 = 0
+      this.materialModel ? check3 = 1 : check3 = 0
+      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
+        this.tableData1 = response.data.rows
+        this.total1 = response.data.total
+      })
+    },
+    searchTable2() { // 查询基本件
+      this.projectValue ? this.check3 = 1 : this.check3 = 0
+      let check1, check2, check3, check4, check5, check6
+      this.partNum ? check1 = 1 : check1 = 0
+      this.partName ? check2 = 1 : check2 = 0
+      this.partSpec ? check3 = 1 : check3 = 0
+      this.partMaterial ? check4 = 1 : check4 = 0
+      this.machineValue ? check5 = 1 : check5 = 0
+      this.groupValue ? check6 = 1 : check6 = 0
+      searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+      })
+    },
+    handleSelectionChange1(val) { // 标准件和外购件多选
+      this.standardAndPurchase = []
+      this.groupAndPart = []
+      for (let i = 0; i < val.length; i++) {
+        this.standardAndPurchase.push(val[i].标准件和外购件流水号)
+        this.groupAndPart.push(val[i].组件零件流水号)
       }
     },
-    computed: {
-      ...mapGetters([
-        'name',
-        'id'
-      ])
+    handleSelectionChange2(val) { // 基本件多选
+      this.basic = []
+      this.groupAndPartBasic = []
+      for (let i = 0; i < val.length; i++) {
+        this.basic.push(val[i].基本件流水号)
+        this.groupAndPartBasic.push(val[i].组件零件基本件流水号)
+      }
     },
-    created() {
-      this.searchTable0() // 查表1
-      this.fetchData() // 初始化数据
+    selectable(row) { // 多选禁用
+      return row.人员编号 === '' || row.人员编号 === null
     },
-    methods: {
-      filterSource(value, row) {
-        return Number(row['零件类型']) === Number(value)
-      },
-      // 撤回
-      retract(row) {
-        this.$confirm('是否撤回重新分配?', '提示', {
+    allocateTask1() { // 标准件和外购件分配任务
+      if (!this.personValue) {
+        this.$message.error('请选择采购员')
+      } else if (this.standardAndPurchase.length === 0) {
+        this.$message.error('请选择需分配的物料')
+      } else {
+        this.$confirm('此操作执行后不可修改，是否确定分配?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          if (this.tabName === '基本件') {
-            retract2(row.基本件流水号).then(res => {
-              if (Number(res.data[0].result) === 1) {
-                this.$message.success('撤回成功')
-                this.searchTable2()
-              } else {
-                this.$message.error('撤回失败')
-              }
-            })
-          } else {
-            retract1(row.标准件和外购件流水号).then(res => {
-              if (Number(res.data[0].result) === 1) {
-                this.$message.success('撤回成功')
-                this.searchTable0()
-                this.searchTable1()
-              } else {
-                this.$message.error('撤回失败')
-              }
-            })
-          }
+          allocateTask1(this.standardAndPurchase, this.personValue).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('操作成功')
+              this.searchTable0()
+              this.searchTable1()
+            } else { this.$message.error('操作失败') }
+          })
         }).catch(() => {
           this.$message({
             type: 'info',
             message: '已取消操作'
           })
         })
-      },
-      fetchData() { // 初始化
-        initProject().then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.project.push({
-              label: response.data[i].项目名称,
-              value: response.data[i].项目流水号
-            })
-          }
-        })
-        initBuyer().then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.person.push({
-              text: response.data[i].姓名,
-              label: response.data[i].姓名,
-              value: response.data[i].人员编号
-            })
-          }
-        })
-        this.getSelect(initMaterialCategory, ['物料类别', '物料类别流水号'], 'MaterialCategory', [0, this.DepartmentValue])
-      },
-      projectChange() {
-        this.machine = []
-        this.machineValue = ''
-        this.group = []
-        this.groupValue = ''
-        searchMachine(this.projectValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.machine.push({
-              value: response.data[i].机床流水号,
-              label: response.data[i].机床图号,
-              name: response.data[i].机床名称
-            })
-          }
-        })
-      },
-      machineChange() {
-        this.group = []
-        this.groupValue = ''
-        searchGroup(this.machineValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.group.push({
-              value: response.data[i].组件流水号,
-              label: response.data[i].组号
-            })
-          }
-        })
-      },
-      searchMaterialVariety() { // 初始化物料品种
-        this.MaterialVariety = []
-        this.MaterialVarietyValue = ''
-        this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
-      },
-      searchTable0() { // 查询标准件
-        this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
-        this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
-        this.projectValue ? this.check3 = 1 : this.check3 = 0
-        let check0, check1, check2, check3
-        this.machineValue ? check0 = 1 : check0 = 0
-        this.groupValue ? check1 = 1 : check1 = 0
-        this.materialName ? this.check4 = 1 : this.check4 = 0
-        this.materialSpec ? check2 = 1 : check2 = 0
-        this.materialModel ? check3 = 1 : check3 = 0
-        searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1).then(response => {
-          this.tableData0 = response.data.rows
-          this.total0 = response.data.total
-        })
-      },
-      searchTable1() { // 查询外购件
-        this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
-        this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
-        this.projectValue ? this.check3 = 1 : this.check3 = 0
-        let check0, check1, check2, check3
-        this.machineValue ? check0 = 1 : check0 = 0
-        this.groupValue ? check1 = 1 : check1 = 0
-        this.materialName ? this.check4 = 1 : this.check4 = 0
-        this.materialSpec ? check2 = 1 : check2 = 0
-        this.materialModel ? check3 = 1 : check3 = 0
-        searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
-          this.tableData1 = response.data.rows
-          this.total1 = response.data.total
-        })
-      },
-      searchTable2() { // 查询基本件
-        this.projectValue ? this.check3 = 1 : this.check3 = 0
-        let check1, check2, check3, check4, check5, check6
-        this.partNum ? check1 = 1 : check1 = 0
-        this.partName ? check2 = 1 : check2 = 0
-        this.partSpec ? check3 = 1 : check3 = 0
-        this.partMaterial ? check4 = 1 : check4 = 0
-        this.machineValue ? check5 = 1 : check5 = 0
-        this.groupValue ? check6 = 1 : check6 = 0
-        searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
-          this.tableData2 = response.data.rows
-          this.total2 = response.data.total
-        })
-      },
-      handleSelectionChange1(val) { // 标准件和外购件多选
-        this.standardAndPurchase = []
-        this.groupAndPart = []
-        for (let i = 0; i < val.length; i++) {
-          this.standardAndPurchase.push(val[i].标准件和外购件流水号)
-          this.groupAndPart.push(val[i].组件零件流水号)
-        }
-      },
-      handleSelectionChange2(val) { // 基本件多选
-        this.basic = []
-        this.groupAndPartBasic = []
-        for (let i = 0; i < val.length; i++) {
-          this.basic.push(val[i].基本件流水号)
-          this.groupAndPartBasic.push(val[i].组件零件基本件流水号)
-        }
-      },
-      selectable(row) { // 多选禁用
-        return row.人员编号 === '' || row.人员编号 === null
-      },
-      allocateTask1() { // 标准件和外购件分配任务
-        if (!this.personValue) {
-          this.$message.error('请选择采购员')
-        } else if (this.standardAndPurchase.length === 0) {
-          this.$message.error('请选择需分配的物料')
-        } else {
-          this.$confirm('此操作执行后不可修改，是否确定分配?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            allocateTask1(this.standardAndPurchase, this.personValue).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('操作成功')
-                this.searchTable0()
-                this.searchTable1()
-              } else { this.$message.error('操作失败') }
-            })
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消操作'
-            })
+      }
+    },
+    allocateTask2() { // 基本件分配任务
+      if (!this.personValue) {
+        this.$message.error('请选择采购员')
+      } else if (this.basic.length === 0) {
+        this.$message.error('请选择需分配的零件')
+      } else {
+        this.$confirm('此操作执行后不可修改，是否确定分配?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          allocateTask2(this.basic, this.personValue).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('操作成功')
+              this.searchTable2()
+            } else { this.$message.error('操作失败') }
           })
-        }
-      },
-      allocateTask2() { // 基本件分配任务
-        if (!this.personValue) {
-          this.$message.error('请选择采购员')
-        } else if (this.basic.length === 0) {
-          this.$message.error('请选择需分配的零件')
-        } else {
-          this.$confirm('此操作执行后不可修改，是否确定分配?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            allocateTask2(this.basic, this.personValue).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('操作成功')
-                this.searchTable2()
-              } else { this.$message.error('操作失败') }
-            })
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消操作'
-            })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
           })
-        }
-      },
-      filterHandler(value, row) {
-        return parseInt(row['人员编号']) === parseInt(value)
-      },
-      handleSizeChange0(val) {
-        this.pageSize0 = val
-        this.pageCurrent0 = 1
-        this.searchTable0()
-      },
-      handleCurrentChange0(val) {
-        this.pageCurrent0 = val
-        this.searchTable0()
-      },
-      handleSizeChange1(val) {
-        this.pageSize1 = val
-        this.pageCurrent1 = 1
-        this.searchTable1()
-      },
-      handleCurrentChange1(val) {
-        this.pageCurrent1 = val
-        this.searchTable1()
-      },
-      handleSizeChange2(val) {
-        this.pageSize2 = val
-        this.pageCurrent2 = 1
-        this.searchTable2()
-      },
-      handleCurrentChange2(val) {
-        this.pageCurrent2 = val
-        this.searchTable2()
-      },
-      executeReturn1() { // 退回标准件和外购件
-        if (this.standardAndPurchase.length === 0) {
-          this.$message.error('请选择需退回的物料')
-        } else {
-          this.$confirm('此操作执行后不可修改，是否确定退回?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            executeReturn1(this.standardAndPurchase, this.groupAndPart).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('操作成功')
-                this.searchTable0()
-                this.searchTable1()
-              } else { this.$message.error('操作失败') }
-            })
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消操作'
-            })
+        })
+      }
+    },
+    filterHandler(value, row) {
+      return parseInt(row['人员编号']) === parseInt(value)
+    },
+    handleSizeChange0(val) {
+      this.pageSize0 = val
+      this.pageCurrent0 = 1
+      this.searchTable0()
+    },
+    handleCurrentChange0(val) {
+      this.pageCurrent0 = val
+      this.searchTable0()
+    },
+    handleSizeChange1(val) {
+      this.pageSize1 = val
+      this.pageCurrent1 = 1
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable1()
+    },
+    handleSizeChange2(val) {
+      this.pageSize2 = val
+      this.pageCurrent2 = 1
+      this.searchTable2()
+    },
+    handleCurrentChange2(val) {
+      this.pageCurrent2 = val
+      this.searchTable2()
+    },
+    executeReturn1() { // 退回标准件和外购件
+      if (this.standardAndPurchase.length === 0) {
+        this.$message.error('请选择需退回的物料')
+      } else {
+        this.$confirm('此操作执行后不可修改，是否确定退回?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          executeReturn1(this.standardAndPurchase, this.groupAndPart).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('操作成功')
+              this.searchTable0()
+              this.searchTable1()
+            } else { this.$message.error('操作失败') }
           })
-        }
-      },
-      executeReturn2() { // 退回基本件
-        if (this.basic.length === 0) {
-          this.$message.error('请选择需退回的零件')
-        } else {
-          this.$confirm('此操作执行后不可修改，是否确定退回?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            executeReturn2(this.basic, this.groupAndPartBasic).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('操作成功')
-                this.searchTable2()
-              } else { this.$message.error('操作失败') }
-            })
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消操作'
-            })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
           })
-        }
+        })
+      }
+    },
+    executeReturn2() { // 退回基本件
+      if (this.basic.length === 0) {
+        this.$message.error('请选择需退回的零件')
+      } else {
+        this.$confirm('此操作执行后不可修改，是否确定退回?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          executeReturn2(this.basic, this.groupAndPartBasic).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('操作成功')
+              this.searchTable2()
+            } else { this.$message.error('操作失败') }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
+        })
       }
     }
   }
+}
 </script>
 
 <style scoped>