From bce18ed9cdfb933d4f6f80e7ca380802ef6518ad Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Mon, 21 Jan 2019 09:37:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=BA=E5=BA=8A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E3=80=81=E4=BD=BF=E7=94=A8=E6=BB=9E=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Assembly/AssemblyInformationInput.js  |  12 -
 src/api/Assembly/AssemblyPlan.js              |  16 +-
 src/api/Assembly/AssemblyProcessAssignment.js |  16 +-
 .../Assembly/PrintingAssemblyProcessCard.js   |  16 +-
 src/api/ManufacturingCenter/PartAssignment.js |  52 ++--
 .../CreatingProcurementContracts.js           |   4 +-
 src/utils/request.js                          |   2 +-
 .../AssemblyInformationInput/index.vue        |  37 +--
 src/views/Assembly/AssemblyPlan/index.vue     |  30 +--
 .../AssemblyProcessAssignment/index.vue       |  55 ++--
 .../InstallationAndMonitoring/index.vue       |  35 +--
 .../PrintingAssemblyProcessCard/index.vue     |  30 +--
 .../PartAssignment/index.vue                  | 250 +++++++++++++-----
 .../CreatingProcurementContracts/index.vue    | 125 +++------
 .../OutsourcingProcessPlanning/index.vue      | 123 +++------
 .../OutsourcingQuotaSetting/index.vue         |  56 ++--
 .../ProcurementContractApproval/index.vue     |  28 +-
 17 files changed, 373 insertions(+), 514 deletions(-)

diff --git a/src/api/Assembly/AssemblyInformationInput.js b/src/api/Assembly/AssemblyInformationInput.js
index b95b0656..b2fbf253 100644
--- a/src/api/Assembly/AssemblyInformationInput.js
+++ b/src/api/Assembly/AssemblyInformationInput.js
@@ -11,18 +11,6 @@ export function initProject() {
     }
   })
 }
-// 机床查询
-export function searchMachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间装配管理_机床_查询数据',
-      param: '项目流水号=' + num
-    }
-  })
-}
 // 查询组件工艺
 export function searchDetail(num) {
   return request({
diff --git a/src/api/Assembly/AssemblyPlan.js b/src/api/Assembly/AssemblyPlan.js
index d5ea1cdb..2c8ac5b8 100644
--- a/src/api/Assembly/AssemblyPlan.js
+++ b/src/api/Assembly/AssemblyPlan.js
@@ -11,27 +11,15 @@ export function initProject() {
     }
   })
 }
-// 机床查询
-export function searchmachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间装配管理_计划下达_机床_查询数据',
-      param: '项目流水号=' + num
-    }
-  })
-}
 // 主表查询
-export function searchTable(check, projectValue, check1, machineNumberValue, check2, time, time1, pageCurrent, pageSize) {
+export function searchTable(check1, machineNumberValue, check2, time, time1, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_计划信息_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + projectValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue + '&计划完成日期_check=' + check2 + '=int&开始时间=' + time + '&结束时间=' + time1,
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue + '&计划完成日期_check=' + check2 + '=int&开始时间=' + time + '&结束时间=' + time1,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/Assembly/AssemblyProcessAssignment.js b/src/api/Assembly/AssemblyProcessAssignment.js
index 42d429e3..d523b22f 100644
--- a/src/api/Assembly/AssemblyProcessAssignment.js
+++ b/src/api/Assembly/AssemblyProcessAssignment.js
@@ -11,18 +11,6 @@ export function initProject() {
     }
   })
 }
-// 机床查询
-export function searchmachine(num, check) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + num
-    }
-  })
-}
 export function initPerson() {
   return request({
     url: '',
@@ -35,14 +23,14 @@ export function initPerson() {
   })
 }
 // 主表查询
-export function searchTable(check, projectValue, check1, machineNumberValue, pageCurrent, pageSize) {
+export function searchTable(check1, machineNumberValue, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_工艺任务_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + projectValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/Assembly/PrintingAssemblyProcessCard.js b/src/api/Assembly/PrintingAssemblyProcessCard.js
index 4b5ffbbc..244be49e 100644
--- a/src/api/Assembly/PrintingAssemblyProcessCard.js
+++ b/src/api/Assembly/PrintingAssemblyProcessCard.js
@@ -11,18 +11,6 @@ export function initProject() {
     }
   })
 }
-// 机床查询
-export function searchMachine(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间装配管理_机床_查询数据',
-      param: '项目流水号=' + num
-    }
-  })
-}
 // 查询组件工艺
 export function searchDetail(num) {
   return request({
@@ -48,14 +36,14 @@ export function searchProcess(num) {
   })
 }
 // 主表查询
-export function searchTable(check, projectValue, check1, machineNumberValue, pageCurrent, pageSize) {
+export function searchTable(check1, machineNumberValue, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_项目打印_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + projectValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machineNumberValue,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js
index 7ccc4bf5..77beb855 100644
--- a/src/api/ManufacturingCenter/PartAssignment.js
+++ b/src/api/ManufacturingCenter/PartAssignment.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 初始化项目
+// 初始化机床项目
 export function initProject() {
   return request({
     url: '',
@@ -11,18 +11,6 @@ export function initProject() {
     }
   })
 }
-// 机床查询
-export function searchmachine(num, check) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + num
-    }
-  })
-}
 // 组件查询
 export function searchgroup(num) {
   return request({
@@ -35,14 +23,14 @@ export function searchgroup(num) {
     }
   })
 }
-export function searchTable(projectValue, check1, machineNumberValue, check2, groupNumberValue, check3) {
+export function searchTable(machineNumberValue, check2, groupNumberValue, check3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间管理_基本件采购_查询数据',
-      param: '项目流水号_check=' + check1 + '&项目流水号=' + projectValue + '&机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + '&组件流水号_check=' + check3 + '&组件流水号=' + groupNumberValue
+      param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + '&组件流水号_check=' + check3 + '&组件流水号=' + groupNumberValue
     }
   })
 }
@@ -79,25 +67,25 @@ export function searchTable1(PurchaseOrder, check4) {
     }
   })
 }
-export function addData(num, num1, num2, id, time) {
+export function addData(num1, num2, id, time) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单_增加数据',
-      param: '请购单编号=' + num + '&请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time
+      param: '请购车间=' + num1 + '&请购人=' + num2 + '&人员编号=' + id + '&请购时间=' + time
     }
   })
 }
-export function editData(RequisitionList, num, num1, time) {
+export function editData(RequisitionList, num1, time) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单_编辑数据',
-      param: '请购单流水号=' + RequisitionList + '&请购单编号=' + num + '&请购车间=' + num1 + '&请购时间=' + time
+      param: '请购单流水号=' + RequisitionList + '&请购车间=' + num1 + '&请购时间=' + time
     }
   })
 }
@@ -145,14 +133,14 @@ export function purchaseRequisition(RequisitionList, projectName, projectFloatVa
     }
   })
 }
-export function purchaseRequisition1(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, StandardPartsAndOutsourcing, MaterialName, MaterialSpecification, MaterialModel, NumberOfParts, PartType, time, MaterialNum, ReMarks) {
+export function purchaseRequisition1(RequisitionList, projectName, projectFloatValue, MachineToolNumber, machineFloatValue, groupName, groupFloatValue, StandardPartsAndOutsourcing, MaterialName, MaterialCode, MaterialSpecification, MaterialModel, NumberOfParts, PartType, time, MaterialNum, ReMarks) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单明细_请购',
-      param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&标准件和外购件流水号=' + StandardPartsAndOutsourcing + '&物料名称=' + MaterialName + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + '&备注=' + ReMarks
+      param: '请购单流水号=' + RequisitionList + '&项目名称=' + projectName + '&项目流水号=' + projectFloatValue + '&机床图号=' + MachineToolNumber + '&机床流水号=' + machineFloatValue + '&组号=' + groupName + '&组件流水号=' + groupFloatValue + '&标准件和外购件流水号=' + StandardPartsAndOutsourcing + '&物料名称=' + MaterialName + '&物料代码=' + MaterialCode + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&零件数量=' + NumberOfParts + '&零件类型=' + PartType + '&物料计划到货时间=' + time + '&物料流水号=' + MaterialNum + '&备注=' + ReMarks
     }
   })
 }
@@ -275,3 +263,25 @@ export function Delete1(num) {
     }
   })
 }
+export function editStock(num, num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '零件分配_标准件和外购件_使用库存',
+      param: '标准件和外购件流水号=' + num + '&数量=' + num1 + '&零件数量=' + num2
+    }
+  })
+}
+export function editNum(num, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间管理_标准件和外购件_更改数量',
+      param: '请购单明细流水号=' + num + '&数量=' + num1
+    }
+  })
+}
diff --git a/src/api/WorkshopProcurement/CreatingProcurementContracts.js b/src/api/WorkshopProcurement/CreatingProcurementContracts.js
index f66f7185..74307ac2 100644
--- a/src/api/WorkshopProcurement/CreatingProcurementContracts.js
+++ b/src/api/WorkshopProcurement/CreatingProcurementContracts.js
@@ -79,14 +79,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
   })
 }
 // 生成采购合同
-export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, AdvanceCharge) {
+export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, singleQuota, readyQuota, AdvanceCharge) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间管理_基本件采购_请购单和请购单明细_增加数据',
-      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&预付款=${AdvanceCharge}`
+      param: `请购单流水号=${num1}&请购单编号=${RequisitionNumber}&采购合同名称=${name1}&预到货时间=${time1}&规定到货时间=${time2}&采购员=${id}&供应商流水号=${num2}&合同文本=${text}&运费=${freight}&物料流水号组=${num3}&请购单明细流水号组=${num4}&数量组=${partsNum}&单价组=${priceGroup}&税率组=${taxGroup}&币种流水号组=${currency}&单件定额工时组=${singleQuota}&准结定额工时组=${readyQuota}&预付款=${AdvanceCharge}`
     }
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index 3337ad5e..e3cc882a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,7 +20,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/Assembly/AssemblyInformationInput/index.vue b/src/views/Assembly/AssemblyInformationInput/index.vue
index 3d00b82c..f4e15a1f 100644
--- a/src/views/Assembly/AssemblyInformationInput/index.vue
+++ b/src/views/Assembly/AssemblyInformationInput/index.vue
@@ -2,21 +2,16 @@
   <div class="app-container">
     <el-card style="margin-bottom: 20px">
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="searchMachine">
-          <el-option
-            v-for="item in project"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" placeholder="机床编号" size="small" filterable clearable>
+        <el-select v-model="machineNumberValue" filterable clearable placeholder="机床编号" size="small">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
             :label="item.label"
-            :value="item.value"/>
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
         </el-select>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="searchDetail()">查询</el-button>
       </el-row>
@@ -144,13 +139,11 @@
 </template>
 
 <script>
-import { initProject, searchMachine, searchDetail, searchProcess, update, getTree, fn, getTable8 } from '@/api/Assembly/AssemblyInformationInput'
+import { initProject, searchDetail, searchProcess, update, getTree, fn, getTable8 } from '@/api/Assembly/AssemblyInformationInput'
 
 export default {
   data() {
     return {
-      projectValue: '',
-      project: [],
       machineNumberValue: '',
       machineNumber: [],
       floatNum: '',
@@ -177,23 +170,19 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
-      getTree().then(response => { // 获取人员信息树
-        const data = response.data
-        this.data2 = fn(data, 0)
-      })
-    },
-    searchMachine() { // 根据条件查机床编号
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      searchMachine(this.projectValue).then(response => {
+      initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineNumber.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
+      getTree().then(response => { // 获取人员信息树
+        const data = response.data
+        this.data2 = fn(data, 0)
+      })
     },
     async searchDetail() { // 主表查询
       this.dataAll = []
diff --git a/src/views/Assembly/AssemblyPlan/index.vue b/src/views/Assembly/AssemblyPlan/index.vue
index 696552ad..0045fbaf 100644
--- a/src/views/Assembly/AssemblyPlan/index.vue
+++ b/src/views/Assembly/AssemblyPlan/index.vue
@@ -1,21 +1,16 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>项目名称:</span>
-      <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="projectChange">
-        <el-option
-          v-for="item in project"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <span>机床编号:</span>
-      <el-select v-model="machineNumberValue" placeholder="机床编号" size="small" clearable>
+      <el-select v-model="machineNumberValue" filterable clearable placeholder="机床编号" size="small">
         <el-option
           v-for="item in machineNumber"
           :key="item.value"
           :label="item.label"
-          :value="item.value"/>
+          :value="item.value">
+          <div style="float: left">{{ item.label }}</div>
+          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+        </el-option>
       </el-select>
       <span>计划完成日期:</span>
       <el-date-picker
@@ -86,7 +81,7 @@
 </template>
 
 <script>
-import { initProject, searchmachine, searchTable, goDown } from '@/api/Assembly/AssemblyPlan'
+import { initProject, searchTable, goDown } from '@/api/Assembly/AssemblyPlan'
 export default {
   data() {
     return {
@@ -119,16 +114,12 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
-    },
-    projectChange() {
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      searchmachine(this.projectValue).then(response => {
+      initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineNumber.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
@@ -140,9 +131,8 @@ export default {
         this.check2 = 0
         this.startEndDate = ''
       } else { this.check2 = 1 }
-      this.projectValue ? this.check = 1 : this.check = 0
       this.machineNumberValue ? this.check1 = 1 : this.check1 = 0
-      searchTable(this.check, this.projectValue, this.check1, this.machineNumberValue, this.check2, this.startEndDate[0], this.startEndDate[1], this.pageCurrent, this.pageSize).then(response => {
+      searchTable(this.check1, this.machineNumberValue, this.check2, this.startEndDate[0], this.startEndDate[1], this.pageCurrent, this.pageSize).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
           console.log(response.data.rows[i].发货节点)
           if (response.data.rows[i].发货节点 !== '') {
diff --git a/src/views/Assembly/AssemblyProcessAssignment/index.vue b/src/views/Assembly/AssemblyProcessAssignment/index.vue
index 8bd0533e..a84aaee4 100644
--- a/src/views/Assembly/AssemblyProcessAssignment/index.vue
+++ b/src/views/Assembly/AssemblyProcessAssignment/index.vue
@@ -2,21 +2,16 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="projectChange">
-          <el-option
-            v-for="item in project"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" placeholder="机床编号" size="small" clearable>
+        <el-select v-model="machineNumberValue" filterable clearable placeholder="机床编号" size="small">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
             :label="item.label"
-            :value="item.value"/>
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
         </el-select>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total=0;pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
         <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="Preservation()">保存</el-button>
@@ -118,12 +113,10 @@
 </template>
 
 <script>
-import { initProject, searchmachine, initPerson, searchTable, Preservation } from '@/api/Assembly/AssemblyProcessAssignment'
+import { initProject, initPerson, searchTable, Preservation } from '@/api/Assembly/AssemblyProcessAssignment'
 export default {
   data() {
     return {
-      projectValue: '',
-      project: [],
       machineNumberValue: '',
       machineNumber: [],
       tableData: [],
@@ -149,30 +142,21 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
+          })
+        }
+      })
     },
     initPerson() { // 初始化工艺员
       initPerson().then(response => {
         this.tableData2 = response.data
       })
     },
-    projectChange() {
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      if (this.projectValue !== '') {
-        this.check2 = 1
-        searchmachine(this.projectValue, this.check2).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.machineNumber.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      } else {
-        this.check2 = 0
-      }
-    },
     selectPerson(index) { // 点击查询按钮
       this.index = index
       this.dialogFormVisible = true
@@ -186,9 +170,8 @@ export default {
     searchTable() {
       this.tableData = []
       this.loading = true
-      this.projectValue ? this.check = 1 : this.check = 0
       this.machineNumberValue ? this.check1 = 1 : this.check1 = 0
-      searchTable(this.check, this.projectValue, this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
+      searchTable(this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
           this.tableData.push({
             工艺计划流水号: response.data.rows[i].工艺计划流水号,
@@ -209,12 +192,6 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val
       console.log(this.multipleSelection)
-      // this.ProcessSerialNumber = []
-      // this.PersonnelNumber = []
-      // for (let i = 0; i < val.length; i++) {
-      //   this.ProcessSerialNumber[i] = val[i].工艺计划流水号
-      //   this.PersonnelNumber[i] = val[i].人员编号
-      // }
     },
     Preservation() {
       if (this.multipleSelection.length !== 0) {
diff --git a/src/views/Assembly/InstallationAndMonitoring/index.vue b/src/views/Assembly/InstallationAndMonitoring/index.vue
index d8adfad1..fe67d17d 100644
--- a/src/views/Assembly/InstallationAndMonitoring/index.vue
+++ b/src/views/Assembly/InstallationAndMonitoring/index.vue
@@ -2,24 +2,17 @@
   <div class="app-container">
     <el-card style="margin-bottom: 20px">
       <el-row>
-        <span>项目名称:</span>
-        <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="searchMachine">
-          <el-option
-            v-for="item in project"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" placeholder="机床编号" size="small" clearable>
+        <el-select v-model="machineNumberValue" filterable clearable placeholder="机床编号" size="small">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
             :label="item.label"
-            :value="item.value"/>
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
         </el-select>
-        <span>客户名称:</span>
-        <el-input v-model="CustomerName" size="small" placeholder="客户名称" readonly style="width: 200px"/>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="searchTable()">查询</el-button>
       </el-row>
     </el-card>
@@ -188,14 +181,11 @@
 </template>
 
 <script>
-import { initProject, searchMachine, searchTable, searchTable1, addData, editData, deleteData, addData1, editData1, deleteData1 } from '@/api/Assembly/InstallationAndMonitoring'
+import { initProject, searchTable, searchTable1, addData, editData, deleteData, addData1, editData1, deleteData1 } from '@/api/Assembly/InstallationAndMonitoring'
 
 export default {
   data() {
     return {
-      projectValue: '',
-      project: [],
-      CustomerName: '',
       machineNumberValue: '',
       machineNumber: [],
       loading: false,
@@ -245,19 +235,12 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
-    },
-    searchMachine() { // 根据条件查机床编号
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      searchMachine(this.projectValue).then(response => {
-        if (response.data.length !== 0) {
-          this.CustomerName = response.data[0].客户名称
-        }
+      initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineNumber.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
diff --git a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue
index bb9257dd..73632667 100644
--- a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue
+++ b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue
@@ -1,21 +1,16 @@
 <template>
   <div class="app-container">
     <el-card style="margin-bottom: 20px">
-      <span>项目名称:</span>
-      <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="searchMachine">
-        <el-option
-          v-for="item in project"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <span>机床编号:</span>
       <el-select v-model="machineNumberValue" filterable clearable placeholder="机床编号" size="small">
         <el-option
           v-for="item in machineNumber"
           :key="item.value"
           :label="item.label"
-          :value="item.value"/>
+          :value="item.value">
+          <div style="float: left">{{ item.label }}</div>
+          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+        </el-option>
       </el-select>
       <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchTable">查询</el-button>
       <el-button type="primary" icon="el-icon-download" size="small" @click="exportTable()">导出</el-button>
@@ -115,7 +110,7 @@
 </template>
 
 <script>
-import { initProject, searchMachine, searchDetail, searchProcess, searchTable } from '@/api/Assembly/PrintingAssemblyProcessCard'
+import { initProject, searchDetail, searchProcess, searchTable } from '@/api/Assembly/PrintingAssemblyProcessCard'
 import $ from 'jquery'
 import QRCode from 'qrcode'
 
@@ -137,8 +132,6 @@ export default {
       check: 0,
       check1: 0,
       loading: false,
-      projectValue: '',
-      project: [],
       machineNumberValue: '',
       machineNumber: [],
       MachineNum: '',
@@ -154,25 +147,20 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
-    },
-    searchMachine() { // 根据条件查机床编号
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      searchMachine(this.projectValue).then(response => {
+      initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineNumber.push({
             label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
     },
     searchTable() { // 主表查询
       this.loading = true
-      this.projectValue ? this.check = 1 : this.check = 0
       this.machineNumberValue ? this.check1 = 1 : this.check1 = 0
-      searchTable(this.check, this.projectValue, this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
+      searchTable(this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => {
         this.tableData = response.data.rows
         this.total = response.data.total
         this.loading = false
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index a0cc6236..742bc5ff 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -2,21 +2,16 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>项目名称：</span>
-        <el-select v-model="projectValue" filterable clearable size="small" placeholder="项目名称" @change="projectChange">
-          <el-option
-            v-for="item in project"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" placeholder="机床编号" size="small" clearable @change="machineChange">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
             :label="item.label"
-            :value="item.value"/>
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
         </el-select>
         <span>组号:</span>
         <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
@@ -63,17 +58,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <!--<div class="block" style="margin-top: 10px;">-->
-      <!--<el-pagination-->
-      <!--@size-change="handleSizeChange"-->
-      <!--@current-change="handleCurrentChange"-->
-      <!--:current-page="pageCurrent"-->
-      <!--:page-sizes="[10, 20, 30, 40, 50]"-->
-      <!--:page-size="pageSize"-->
-      <!--layout="total, sizes, prev, pager, next, jumper"-->
-      <!--:total="total">-->
-      <!--</el-pagination>-->
-      <!--</div>-->
     </el-card>
     <el-card>
       <el-tabs type="border-card" @tab-click="selectPart">
@@ -90,6 +74,11 @@
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
+            <el-table-column label="前零件图号" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.前零件图号 }}
+              </template>
+            </el-table-column>
             <el-table-column label="材料" align="center">
               <template slot-scope="scope">
                 {{ scope.row.材料 }}
@@ -110,6 +99,16 @@
                 {{ scope.row.库存数量 }}
               </template>
             </el-table-column>
+            <el-table-column label="需求数量" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.需求数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="120px" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">使用</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="外购件">
@@ -147,12 +146,17 @@
             </el-table-column>
             <el-table-column label="库存数量" align="center">
               <template slot-scope="scope">
-                {{ scope.row.库存数量 }}
+                {{ scope.row.安全库存量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="需求数量" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.需求数量 }}
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="120px" fixed="right">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">使用</el-button>
+                <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit2(scope.row)">使用</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -192,12 +196,17 @@
             </el-table-column>
             <el-table-column label="库存数量" align="center">
               <template slot-scope="scope">
-                {{ scope.row.库存数量 }}
+                {{ scope.row.安全库存量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="需求数量" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.需求数量 }}
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="120px" fixed="right">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">使用</el-button>
+                <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit2(scope.row)">使用</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -307,6 +316,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
+            <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)">编辑</el-button>
             <el-button type="danger" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)">移出</el-button>
           </template>
         </el-table-column>
@@ -314,6 +324,11 @@
     </el-card>
     <el-card>
       <el-table :data="tableData5" border size="mini" style="width: 100%" height="300px">
+        <el-table-column label="物料代码" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.物料代码 }}
+          </template>
+        </el-table-column>
         <el-table-column label="物料名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -366,6 +381,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
+            <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)">编辑</el-button>
             <el-button type="danger" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)">移出</el-button>
           </template>
         </el-table-column>
@@ -373,12 +389,6 @@
     </el-card>
     <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
-        <el-form-item label="请购单编号" prop="请购单编号">
-          <el-input
-            v-model="form.请购单编号"
-            size="small"
-            style="width:200px"/>
-        </el-form-item>
 
         <el-form-item label="请购车间" prop="请购车间">
           <el-input
@@ -411,6 +421,31 @@
         <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="dialogFormVisible3" title="更改数量" center style="min-height: 300px" width="400px">
+      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
+        <el-form-item label="数量" prop="数量">
+          <el-input
+            v-model="form3.数量"
+            size="small"
+            style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel('form3')">取消</el-button>
+        <el-button type="primary" @click="submitEdit1('form3')">确定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogFormVisible4" title="使用库存" center style="min-height: 300px" width="400px">
+      <el-form ref="form4" :model="form4" :rules="rules4" label-position="left" label-width="110px" class="demo-ruleForm">
+        <el-form-item label="数量" prop="数量">
+          <el-input-number v-model="form4.数量" :min="0" :max="100" size="small" style="width:200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel('form4')">取消</el-button>
+        <el-button type="primary" @click="submitEdit2('form4')">确定</el-button>
+      </div>
+    </el-dialog>
     <el-dialog
       :visible.sync="dialogFormVisible1"
       title="基本件打回信息"
@@ -551,15 +586,13 @@
 </template>
 
 <script>
-import { initProject, searchmachine, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1 } from '@/api/ManufacturingCenter/PartAssignment'
+import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
 export default {
   inject: ['reload'],
   data() {
     return {
-      projectValue: '',
       projectFloatValue: '',
-      project: [],
       machineNumberValue: '',
       machineFloatValue: '',
       machineNumber: [],
@@ -567,6 +600,9 @@ export default {
       groupNumberValue: '',
       groupFloatValue: '',
       groupNumber: [],
+      StandardAndOutsourcing: '',
+      PartNum: '',
+      DetailedNum: '',
       PurchaseOrder: '',
       PartType: '基本件',
       tableData: [],
@@ -590,9 +626,22 @@ export default {
         请购车间: [{ required: true, message: '请输入请购车间', trigger: 'blur' }],
         请购时间: [{ required: true, message: '请选择请购时间', trigger: 'change' }]
       },
+      form3: {
+        数量: ''
+      },
+      rules3: {
+        数量: [{ required: true, message: '请输入数量', trigger: 'blur' }]
+      },
+      form4: {
+        数量: ''
+      },
+      rules4: {
+        数量: [{ required: true, message: '请输入数量', trigger: 'blur' }]
+      },
       BasicPartsNumber: [],
       StandardPartsAndOutsourcing: [],
       MaterialNum: [],
+      MaterialCode: [],
       MaterialName: [],
       PartToolNumber: [],
       MaterialSpecification: [],
@@ -613,7 +662,9 @@ export default {
       tableData9: [],
       tableData10: [],
       dialogFormVisible1: false,
-      dialogFormVisible2: false
+      dialogFormVisible2: false,
+      dialogFormVisible3: false,
+      dialogFormVisible4: false
     }
   },
   computed: {
@@ -629,7 +680,15 @@ export default {
   },
   methods: {
     fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
+      initProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
       PartCallbackInformation().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].退回时间 !== '') {
@@ -773,25 +832,6 @@ export default {
         return 'adopt'
       }
     },
-    projectChange() {
-      this.machineNumberValue = ''
-      this.machineNumber = []
-      this.groupNumberValue = ''
-      this.groupNumber = []
-      if (this.projectValue !== '') {
-        this.check = 1
-        searchmachine(this.projectValue, this.check).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.machineNumber.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      } else {
-        this.check = 0
-      }
-    },
     machineChange() {
       this.groupNumberValue = ''
       this.groupNumber = []
@@ -806,16 +846,13 @@ export default {
     },
     searchTable() {
       this.loading = true
-      if (this.projectValue !== '') {
-        this.check1 = 1
-      } else { this.check1 = 0 }
       if (this.machineNumberValue !== '') {
         this.check2 = 1
       } else { this.check2 = 0 }
       if (this.groupNumberValue !== '') {
         this.check3 = 1
       } else { this.check3 = 0 }
-      searchTable(this.projectValue, this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3).then(response => {
+      searchTable(this.machineNumberValue, this.check2, this.groupNumberValue, this.check3).then(response => {
         this.tableData = response.data
         this.tableData1 = []
         this.tableData2 = []
@@ -885,7 +922,7 @@ export default {
     submitAdd(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          addData(this.form.请购单编号, this.form.请购车间, this.name, this.id, this.form.请购时间).then(response => {
+          addData(this.form.请购车间, this.name, this.id, this.form.请购时间).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
               this.dialogFormVisible = false
@@ -906,15 +943,13 @@ export default {
       this.title = '编辑'
       this.dialogFormVisible = true
       this.RequisitionList = row.请购单流水号
-      this.form.请购单编号 = row.请购单编号
       this.form.请购车间 = row.请购车间
       this.form.请购时间 = row.请购时间
     },
     submitEdit(formName) { // 提交单据编辑
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          console.log(this.form.请购时间)
-          editData(this.RequisitionList, this.form.请购单编号, this.form.请购车间, this.form.请购时间).then(response => {
+          editData(this.RequisitionList, this.form.请购车间, this.form.请购时间).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('编辑成功')
               this.dialogFormVisible = false
@@ -953,6 +988,81 @@ export default {
       this.dialogFormVisible = false
       this.$refs[formName].resetFields()
     },
+    handleEdit1(row) { // 弹出单据编辑
+      if (this.$refs['form3'] !== undefined) {
+        this.$refs['form3'].resetFields()
+      }
+      this.dialogFormVisible3 = true
+      this.DetailedNum = row.请购单明细流水号
+      this.form3.数量 = row.零件数量
+    },
+    submitEdit1(formName) { // 提交单据编辑
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          editNum(this.DetailedNum, this.form3.数量).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('编辑成功')
+              this.dialogFormVisible3 = false
+              searchDetailed(this.RequisitionList).then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].物料计划到货时间 !== '') {
+                    response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                  }
+                }
+                this.tableData5 = response.data
+              })
+              searchDetailed1(this.RequisitionList).then(response => {
+                for (let i = 0; i < response.data.length; i++) {
+                  if (response.data[i].物料计划到货时间 !== '') {
+                    response.data[i].物料计划到货时间 = (response.data[i].物料计划到货时间).split(' ')[0]
+                  }
+                }
+                this.tableData6 = response.data
+              })
+            } else { this.$message.error('编辑失败') }
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    handleEdit2(row) { // 弹出单据编辑
+      if (this.$refs['form4'] !== undefined) {
+        this.$refs['form4'].resetFields()
+      }
+      this.dialogFormVisible4 = true
+      this.StandardAndOutsourcing = row.标准件和外购件流水号
+      this.PartNum = row.零件数量
+    },
+    submitEdit2(formName) { // 提交使用库存数量
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          editStock(this.RequisitionList, this.form4.数量, this.PartNum).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('编辑成功')
+              this.dialogFormVisible4 = false
+              if (this.PartType === '基本件') {
+                searchPart(this.groupFloatValue).then(response => {
+                  this.tableData1 = response.data
+                })
+              } else if (this.PartType === '外购件') {
+                searchPart1(this.groupFloatValue, 2).then(response => {
+                  this.tableData2 = response.data
+                })
+              } else if (this.PartType === '标准件') {
+                searchPart1(this.groupFloatValue, 1).then(response => {
+                  this.tableData3 = response.data
+                })
+              }
+            } else { this.$message.error('编辑失败') }
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
     searchDetailed(row) {
       this.RequisitionList = row.请购单流水号
       searchDetailed(row.请购单流水号).then(response => {
@@ -987,11 +1097,12 @@ export default {
           this.MaterialName[i] = val[i].零件名称
           this.PartToolNumber[i] = val[i].零件图号
           this.Material[i] = val[i].材料
-          this.NumberOfParts[i] = val[i].零件数量
+          this.NumberOfParts[i] = val[i].需求数量
           this.ReMarks[i] = val[i].零件备注
         }
       } else if (this.PartType === '外购件') {
         this.MaterialNum = []
+        this.MaterialCode = []
         this.StandardPartsAndOutsourcing = []
         this.MaterialName = []
         this.MaterialSpecification = []
@@ -1000,14 +1111,16 @@ export default {
         for (let i = 0; i < val.length; i++) {
           this.StandardPartsAndOutsourcing[i] = val[i].标准件和外购件流水号
           this.MaterialNum[i] = val[i].物料流水号
+          this.MaterialCode[i] = val[i].物料代码
           this.MaterialName[i] = val[i].物料名称
           this.MaterialSpecification[i] = val[i].物料规格
           this.MaterialModel[i] = val[i].物料型号
-          this.NumberOfParts[i] = val[i].零件数量
+          this.NumberOfParts[i] = val[i].需求数量
           this.ReMarks[i] = val[i].备注
         }
       } else if (this.PartType === '标准件') {
         this.MaterialNum = []
+        this.MaterialCode = []
         this.StandardPartsAndOutsourcing = []
         this.MaterialName = []
         this.MaterialSpecification = []
@@ -1016,10 +1129,11 @@ export default {
         for (let i = 0; i < val.length; i++) {
           this.StandardPartsAndOutsourcing[i] = val[i].标准件和外购件流水号
           this.MaterialNum[i] = val[i].物料流水号
+          this.MaterialCode[i] = val[i].物料代码
           this.MaterialName[i] = val[i].物料名称
           this.MaterialSpecification[i] = val[i].物料规格
           this.MaterialModel[i] = val[i].物料型号
-          this.NumberOfParts[i] = val[i].零件数量
+          this.NumberOfParts[i] = val[i].需求数量
           this.ReMarks[i] = val[i].备注
         }
       }
@@ -1054,7 +1168,7 @@ export default {
               }
             } else if (this.PartType === '外购件') {
               for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
-                purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
+                purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialCode[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.StandardPartsAndOutsourcing.length) {
                     this.$message.success('请购成功')
@@ -1074,7 +1188,7 @@ export default {
               }
             } else if (this.PartType === '标准件') {
               for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
-                purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
+                purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialCode[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.StandardPartsAndOutsourcing.length) {
                     this.$message.success('请购成功')
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index 8efdbfcb..0b1c1605 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -27,13 +27,6 @@
           <el-col :span="6">
             <el-form-item label="预付款">
               <el-input v-model="AdvanceCharge" size="small" placeholder="预付款"/>
-              <!--<el-select v-model="payMethodValue" placeholder="预付款" size="small" @change="payMethodChange">-->
-              <!--<el-option-->
-              <!--v-for="item in payMethod"-->
-              <!--:key="item.value"-->
-              <!--:label="item.label"-->
-              <!--:value="item.value"/>-->
-              <!--</el-select>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -53,8 +46,6 @@
             <el-form-item label="规定到货时间">
               <el-date-picker
                 v-model="stipulateArrivalTime"
-                :picker-options="endDateOpt"
-                :disabled="Boolean(!contractNumValue)"
                 size="small"
                 type="date"
                 format="yyyy-MM-dd"
@@ -78,6 +69,16 @@
 
     <el-card>
       <el-table :data="tableData4" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
+        <el-table-column label="单件定额工时" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.单件定额工时 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="准结定额工时" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.准结定额工时 }}
+          </template>
+        </el-table-column>
         <el-table-column label="单价" align="center" width="150">
           <template slot-scope="scope">
             <el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
@@ -127,16 +128,21 @@
         </el-table-column>
       </el-table>
       <el-table :data="tableData3" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
+        <el-table-column label="单件定额工时" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.单件定额工时 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="准结定额工时" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.准结定额工时 }}
+          </template>
+        </el-table-column>
         <el-table-column label="单价" align="center" width="150">
           <template slot-scope="scope">
             <el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
           </template>
         </el-table-column>
-        <!--<el-table-column label="发货天数" align="center" width="150">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-input v-model="deliveryDay[scope.$index]" size="mini" style="width:70px"/>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
         <el-table-column label="物料名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -179,23 +185,6 @@
             <el-input v-model="scope.row.备注" size="small" style="width: 120px" @change="update(scope.row)"/>
           </template>
         </el-table-column>
-      <!--<el-table-column label="计算方式" align="center" width="110">-->
-      <!--<template slot-scope="scope">-->
-      <!--<el-select v-model="calculateWayValue[scope.$index]" style="width:75px" size="mini">-->
-      <!--<el-option-->
-      <!--v-for="item in calculateWay"-->
-      <!--:key="item.value"-->
-      <!--:label="item.label"-->
-      <!--:value="item.value">-->
-      <!--</el-option>-->
-      <!--</el-select>-->
-      <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column label="重量" align="center" width="100">-->
-      <!--<template slot-scope="scope">-->
-      <!--<el-input size="mini" v-model="weight[scope.$index]" style="width:70px"></el-input>-->
-      <!--</template>-->
-      <!--</el-table-column>-->
       </el-table>
       <el-button
         type="primary"
@@ -216,8 +205,6 @@
         icon=""
         style="margin-left: 4.5%"
         @click="doneContract">生成采购合同</el-button>
-    <!--<el-button type="primary" size="small" icon="" style="float:right;margin: 0 10px 15px 0"-->
-        <!--@click="doneContract">生成采购合同</el-button>-->
     </el-card>
 
     <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
@@ -335,21 +322,13 @@
 </template>
 
 <script>
-import { searchSupplier, update, doneContract, initPurchaseOrder, searchData, searchData1, searchData2, searchContractDemo } from '@/api/WorkshopProcurement/CreatingProcurementContracts'
+import { searchSupplier, update, doneContract, initPurchaseOrder, searchData1, searchData2, searchContractDemo } from '@/api/WorkshopProcurement/CreatingProcurementContracts'
 import { mapGetters } from 'vuex'
 export default {
   inject: ['reload'],
   data() {
     return {
       submitDisable: true, // 不点击表格中的行不让确定
-      minDate: null,
-      endDateOpt: { // 禁用大于规定到货日期和小于当前日期
-        disabledDate: (time) => {
-          if (this.minDate) {
-            return time.getTime() > this.minDate || time.getTime() < new Date()
-          }
-        }
-      },
       AdvanceCharge: '',
       loading: false,
       dialogVisible1: false,
@@ -444,7 +423,9 @@ export default {
       group7: '',
       group8: '',
       group9: '',
-      group10: ''
+      group10: '',
+      group11: '',
+      group12: ''
     }
   },
   computed: {
@@ -460,14 +441,6 @@ export default {
   },
   methods: {
     searchData() {
-      const numGroup = [] // 空数组，放物料的计划到货时间
-      searchData(this.contractNumValue).then(response => {
-        console.log(response.data, 111)
-        for (let i = 0; i < response.data.length; i++) {
-          numGroup.push(Date.parse(response.data[i].物料计划到货时间))
-        }
-        this.minDate = new Date(Math.min(...numGroup))
-      })
       searchData1(this.contractNumValue).then(response => {
         console.log(response.data, 222)
         for (let j = 0; j < response.data.length; j++) {
@@ -607,12 +580,12 @@ export default {
         this.group1 = ''
         this.group2 = ''
         this.group3 = ''
-        // this.group5 = ''
-        // this.group6 = ''
         this.group7 = ''
         this.group8 = ''
         this.group9 = ''
         this.group10 = ''
+        this.group11 = ''
+        this.group12 = ''
         for (let i = 0; i < this.tableData3.length; i++) {
           this.group1 += this.tableData3[i].物料流水号 + ','
           this.group2 += this.tableData3[i].零件数量 + ','
@@ -620,6 +593,8 @@ export default {
           this.group7 += this.taxRate + ','
           this.group8 += this.currencyValue + ','
           this.group9 += this.tableData3[i].请购单明细流水号 + ','
+          this.group11 += this.tableData3[i].单件定额工时 + ','
+          this.group12 += this.tableData3[i].准结定额工时 + ','
         }
         for (let i = 0; i < this.tableData4.length; i++) {
           this.group1 += this.tableData4[i].物料流水号 + ','
@@ -628,56 +603,18 @@ export default {
           this.group7 += this.taxRate + ','
           this.group8 += this.currencyValue + ','
           this.group9 += this.tableData4[i].请购单明细流水号 + ','
+          this.group11 += this.tableData4[i].单件定额工时 + ','
+          this.group12 += this.tableData4[i].准结定额工时 + ','
         }
         for (let i = 0; i < this.contractNum.length; i++) {
           if (this.contractNum[i].value === this.contractNumValue) {
             this.RequisitionNumber = this.contractNum[i].label
           }
         }
-        // for (let i = 0; i < this.payMethod.length; i++) {
-        //   if (this.payMethod[i].value === this.payMethodValue) {
-        //     this.payMethodName = this.payMethod[i].label
-        //   }
-        // }
-        // const payTimeNum = this.payMethodName.split(':')
-        // if (payTimeNum.length > 1) {
-        //   for (let i = 0; i < payTimeNum.length; i++) {
-        //     switch (i) {
-        //       case 0:
-        //         this.group6 += this.payTime1Value + ','
-        //         break
-        //       case 1:
-        //         this.group6 += this.payTime2Value + ','
-        //         break
-        //       case 2:
-        //         this.group6 += this.payTime3Value + ','
-        //         break
-        //       case 3:
-        //         this.group6 += this.payTime4Value + ','
-        //         break
-        //       case 4:
-        //         this.group6 += this.payTime5Value + ','
-        //         break
-        //       case 5:
-        //         this.group6 += this.payTime6Value + ','
-        //         break
-        //     }
-        //     this.group5 += payTimeNum[i] + ',' // 付款比例 付款方式 付款计划
-        //   }
-        // } else {
-        //   this.group5 = '10,' // 付款比例 付款方式 付款计划
-        //   this.group6 = this.payTime1Value + ',' // 付款时间
-        // }
         this.group1 = this.group1.substr(0, this.group1.length - 1)
         this.group2 = this.group2.substr(0, this.group2.length - 1)
         this.group3 = this.group3.substr(0, this.group3.length - 1)
-        // this.group5 = this.group5.substr(0, this.group5.length - 1)
-        // this.group6 = this.group6.substr(0, this.group6.length - 1)
-        // this.group7 = this.group7.substr(0, this.group7.length - 1)
-        // this.group8 = this.group8.substr(0, this.group8.length - 1)
-        // this.group9 = this.group9.substr(0, this.group9.length - 1)
-        // this.group10 = this.group10.substr(0, this.group10.length - 1)
-        doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.AdvanceCharge).then(response => {
+        doneContract(this.contractNumValue, this.RequisitionNumber, this.contractName, this.planArrivalTime, this.stipulateArrivalTime, this.supplierValue, this.textArea, this.freight, this.group1, this.group2, this.group3, this.group7, this.group8, this.group9, this.id, this.group11, this.group12, this.AdvanceCharge).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('生成合同成功')
             this.reload()
diff --git a/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue b/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue
index 23e1770f..444ceca8 100644
--- a/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue
@@ -22,20 +22,6 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>项目名称:</span>
-      <el-select
-        v-model="projectNameValue"
-        placeholder="项目名称"
-        size="small"
-        style="width:100px"
-        clearable
-        @change="searchMachine()">
-        <el-option
-          v-for="item in projectName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
       <span>机床编号:</span>
       <el-select
         v-model="machineValue"
@@ -48,7 +34,10 @@
           v-for="item in Machine"
           :key="item.value"
           :label="item.label"
-          :value="item.value"/>
+          :value="item.value">
+          <div style="float: left">{{ item.label }}</div>
+          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+        </el-option>
       </el-select>
       <span>组号:</span>
       <el-select
@@ -230,23 +219,7 @@
     <el-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="140px" class="demo-ruleForm">
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="项目名称">
-              <el-select
-                v-model="projectNameValue1"
-                placeholder="项目名称"
-                size="small"
-                style="width:150px"
-                @change="searchMachine1()">
-                <el-option
-                  v-for="item in projectName1"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="机床名称">
               <el-select
                 v-model="machineValue1"
@@ -258,16 +231,14 @@
                   v-for="item in Machine1"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value"/>
+                  :value="item.value">
+                  <div style="float: left">{{ item.label }}</div>
+                  <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-button size="small" type="success" icon="el-icon-search" @click="searchDetail1()">查询</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="组号">
               <el-select
                 v-model="groupNumberValue1"
@@ -283,7 +254,9 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="图号/名称">
               <el-input
                 v-model="partNum1"
@@ -294,7 +267,8 @@
                 @dblclick.native="searchParts1"/>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="12">
+            <el-button size="small" type="success" icon="el-icon-search" @click="searchDetail1()">查询</el-button>
             <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
           </el-col>
         </el-row>
@@ -524,7 +498,6 @@ import '@/icon/iconfont.css'
 import {
   initCraftmen,
   getProject,
-  getMachine,
   getGroup,
   getPartnames1,
   getProcedure,
@@ -553,16 +526,12 @@ export default {
   },
   data() {
     return {
-      projectNameValue: '',
-      projectName: [],
       machineValue: '',
       Machine: [],
       groupNumberValue: '',
       groupNumber: [],
       groupNum: '',
       groupType: '',
-      projectNameValue1: '',
-      projectName1: [],
       machineValue1: '',
       Machine1: [],
       groupNumberValue1: '',
@@ -644,11 +613,12 @@ export default {
           })
         }
       })
-      getProject(0).then(response => { // 初始化项目
+      getProject(0).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
@@ -675,18 +645,15 @@ export default {
         this.isShow2 = false
       }
       this.checked = false
-      this.projectNameValue = ''
-      this.projectName = []
-      getProject(this.radio).then(response => { // 初始化项目
+      getProject(this.radio).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
-      this.machineValue = ''
-      this.Machine = []
       this.groupNumberValue = ''
       this.groupNumber = []
       this.partNum = ''
@@ -724,21 +691,6 @@ export default {
         })
       }
     },
-    searchMachine() {
-      this.clear()
-      this.machineValue = ''
-      this.Machine = []
-      this.groupNumberValue = ''
-      this.groupNumber = []
-      getMachine(this.radio, this.projectNameValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machine.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
-    },
     searchGroup() {
       this.clear()
       this.groupNumberValue = ''
@@ -824,20 +776,6 @@ export default {
         }
       })
     },
-    searchMachine1() {
-      this.machineValue1 = ''
-      this.Machine1 = []
-      this.groupNumberValue1 = ''
-      this.groupNumber1 = []
-      getMachine(1, this.projectNameValue1).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machine1.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
-    },
     searchGroup1() {
       this.groupNumberValue1 = ''
       this.groupNumber1 = []
@@ -993,18 +931,17 @@ export default {
     WYbtn() { // 完艺按钮
       this.tableData4 = []
       this.dialogFormVisible1 = true
-      this.projectNameValue1 = ''
-      this.projectName1 = []
       this.machineValue1 = ''
       this.Machine1 = []
       this.groupNumberValue1 = ''
       this.groupNumber1 = []
       this.partNum1 = ''
-      getProject(1).then(response => { // 初始化项目
+      getProject(1).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName1.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine1.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
diff --git a/src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue b/src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue
index 81dd2ed8..7e82e6d1 100644
--- a/src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue
@@ -14,20 +14,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>项目名称:</span>
-        <el-select
-          v-model="projectNameValue"
-          placeholder="项目名称"
-          size="small"
-          style="width:100px"
-          clearable
-          @change="searchMachine()">
-          <el-option
-            v-for="item in projectName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
         <span>机床编号:</span>
         <el-select
           v-model="machineValue"
@@ -40,7 +26,10 @@
             v-for="item in Machine"
             :key="item.value"
             :label="item.label"
-            :value="item.value"/>
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
         </el-select>
         <span>组号:</span>
         <el-select
@@ -208,7 +197,7 @@
 </template>
 
 <script>
-import { getPerson, getPartnames1, getProject, getMachine, getGroup, update, getProcedure, returnEdit, saveApprove } from '@/api/WorkshopProcurement/OutsourcingQuotaSetting'
+import { getPerson, getPartnames1, getProject, getGroup, update, getProcedure, returnEdit, saveApprove } from '@/api/WorkshopProcurement/OutsourcingQuotaSetting'
 
 export default {
   data() {
@@ -257,11 +246,12 @@ export default {
           })
         }
       })
-      getProject(0).then(response => { // 初始化项目
+      getProject(0).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
@@ -281,13 +271,12 @@ export default {
         this.isShow2 = false
       }
       this.checked = false
-      this.projectNameValue = ''
-      this.projectName = []
-      getProject(this.radio).then(response => { // 初始化项目
+      getProject(this.radio).then(response => { // 初始化机床项目
         for (let i = 0; i < response.data.length; i++) {
-          this.projectName.push({
-            label: response.data[i].项目名称,
-            value: response.data[i].项目流水号
+          this.Machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            name: response.data[i].项目名称
           })
         }
       })
@@ -348,21 +337,6 @@ export default {
         })
       }
     },
-    searchMachine() {
-      this.clear()
-      this.machineValue = ''
-      this.Machine = []
-      this.groupNumberValue = ''
-      this.groupNumber = []
-      getMachine(this.radio, this.projectNameValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machine.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
-    },
     searchGroup() {
       this.clear()
       this.groupNumberValue = ''
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index 9f6cdf48..5cda1918 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -89,7 +89,7 @@
     </el-card>
 
     <el-card>
-      <div style="width:900px;margin-left: 350px">
+      <div style="width:1000px;margin-left: 300px">
         <el-card>
           <table id="1" cellspacing="0px" align="center" border width="100%" style="">
             <tr style="height: 40px">
@@ -98,7 +98,7 @@
             </tr>
             <tr style="height: 40px">
               <td colspan="1" align="center">需方</td>
-              <td colspan="1" align="center">江苏高精机电装备有限公司</td>
+              <td colspan="1" align="center" width="37%">江苏高精机电装备有限公司</td>
               <td colspan="1" align="center">合同编号</td>
               <td colspan="1" align="center">{{ contract }}</td>
             </tr>
@@ -120,6 +120,8 @@
                 <td colspan="1" align="center">交货期</td>
                 <td colspan="1" align="center">备注</td>
                 <td colspan="1" align="center">数量</td>
+                <td colspan="1" align="center" width="12%">单件定额工时</td>
+                <td colspan="1" align="center" width="12%">准结定额工时</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
               </tr>
@@ -135,17 +137,19 @@
                 <td colspan="1" align="center">交货期</td>
                 <td colspan="1" align="center">备注</td>
                 <td colspan="1" align="center">数量</td>
+                <td colspan="1" align="center" width="12%">单件定额工时</td>
+                <td colspan="1" align="center" width="12%">准结定额工时</td>
                 <td colspan="1" align="center">单价</td>
                 <td colspan="1" align="center">总价</td>
               </tr>
             </tbody>
             <tfoot>
               <tr style="height: 40px">
-                <td colspan="8">总价:  (人民币){{ RMB }}(未税) </td>
+                <td colspan="10">总价:  (人民币){{ RMB }}(未税) </td>
                 <td colspan="1" align="center">{{ TotalAmount }}</td>
               </tr>
               <tr style="height: 40px">
-                <td colspan="8">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
+                <td colspan="10">总价:  (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
                 <td colspan="1" align="center">{{ TotalAmount1 }}</td>
               </tr>
             </tfoot>
@@ -458,7 +462,7 @@ export default {
         for (let i = 0; i < this.returns.length; i++) {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData')
-          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
               '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead').after(tr[i])
         }
@@ -469,8 +473,10 @@ export default {
           document.getElementsByClassName('tableData')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
           document.getElementsByClassName('tableData')[j].children[4].innerHTML = response.data[j].备注
           document.getElementsByClassName('tableData')[j].children[5].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData')[j].children[6].innerHTML = response.data[j].单件定额工时
+          document.getElementsByClassName('tableData')[j].children[7].innerHTML = response.data[j].准结定额工时
+          document.getElementsByClassName('tableData')[j].children[8].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData')[j].children[9].innerHTML = response.data[j].金额
         }
       })
       searchTable3(this.contractValue).then(response => {
@@ -486,7 +492,7 @@ export default {
         for (let i = 0; i < this.returns1.length; i++) {
           tr[i] = document.createElement('tr')
           tr[i].setAttribute('class', 'tableData1')
-          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
+          tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
             '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
           document.getElementById('tableHead1').after(tr[i])
         }
@@ -497,8 +503,10 @@ export default {
           document.getElementsByClassName('tableData1')[j].children[3].innerHTML = response.data[j].物料计划到货时间.split(' ')[0]
           document.getElementsByClassName('tableData1')[j].children[4].innerHTML = response.data[j].备注
           document.getElementsByClassName('tableData1')[j].children[5].innerHTML = response.data[j].数量
-          document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].单价
-          document.getElementsByClassName('tableData1')[j].children[7].innerHTML = response.data[j].金额
+          document.getElementsByClassName('tableData1')[j].children[6].innerHTML = response.data[j].单件定额工时
+          document.getElementsByClassName('tableData1')[j].children[7].innerHTML = response.data[j].准结定额工时
+          document.getElementsByClassName('tableData1')[j].children[8].innerHTML = response.data[j].单价
+          document.getElementsByClassName('tableData1')[j].children[9].innerHTML = response.data[j].金额
         }
       })
     }

From a01226b906cfe821f830a42e85e6a9bdd9c0937e Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Tue, 22 Jan 2019 09:40:37 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkshopProcurement/OfflineContract1.js   |   73 +-
 .../OfflineContractRequestFund1.js            |   63 ++
 src/icons/svg/OfflineContractRequestFund1.svg |    1 +
 .../OfflineContract1/index.vue                | 1008 ++++++++++++-----
 .../OfflineContractRequestFund1/index.vue     |   34 +-
 5 files changed, 873 insertions(+), 306 deletions(-)
 create mode 100644 src/api/WorkshopProcurement/OfflineContractRequestFund1.js
 create mode 100644 src/icons/svg/OfflineContractRequestFund1.svg

diff --git a/src/api/WorkshopProcurement/OfflineContract1.js b/src/api/WorkshopProcurement/OfflineContract1.js
index 2d2f7bc9..8f48e305 100644
--- a/src/api/WorkshopProcurement/OfflineContract1.js
+++ b/src/api/WorkshopProcurement/OfflineContract1.js
@@ -1,72 +1,88 @@
 import request from '@/utils/request'
 
 // 查询库存数
-export function searchInventoryNum(pageCurrent, pageSize, check1, name, check2, state1) {
+export function searchInventoryNum(pageCurrent, pageSize, check1, name, check2, state1, state2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间采购管理_离线合同_物料余量_查询数据',
-      param: `物料名称_check=${check1}&物料名称=${name}&库存状态_check=${check2}&库存状态=${state1}`,
+      name: '采购管理_离线合同_物料余量_查询数据',
+      param: `物料名称_check=${check1}&物料名称=${name}&库存状态_check=${check2}&库存状态=${state1}&采购状态=${state2}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 查询离线合同
-export function searchOfflineContract(pageCurrent, pageSize, check1, num) {
+export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2, name) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间采购管理_离线合同_查询数据',
-      param: `请购单编号_check=${check1}&请购单编号=${num}`,
+      param: `离线合同编号_check=${check1}&离线合同编号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-export function addData(num, num2, time) {
+// 查询离线合同 (不分页)
+export function searchOfflineContract2() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_离线合同_查询数据',
+      param: `离线合同编号_check=0&离线合同编号=0&供应商名称_check=0&供应商名称=0`
+    }
+  })
+}
+// 查询供应商
+export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_供应商_查询数据_根据条件',
+      param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
+    }
+  })
+}
+// 增加离线合同
+export function addOfflineContract(contractNum, contractName, supplier, person, date, remark) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间采购管理_离线合同_增加数据',
-      param: '请购单编号=' + num + '&请购人=' + num2 + '&请购时间=' + time
+      param: `离线合同编号=${contractNum}&离线合同名称=${contractName}&供应商流水号=${supplier}&人员编号=${person}&规定到货时间=${date}&离线合同备注=${remark}`
     }
   })
 }
-export function editData(RequisitionList, num, time) {
+// 编辑离线合同
+export function editOfflineContract(contractNumValue, contractNum, contractName, supplier, person, date, remark) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间采购管理_离线合同_编辑数据',
-      param: '请购单流水号=' + RequisitionList + '&请购单编号=' + num + '&请购时间=' + time
+      param: `离线合同流水号=${contractNumValue}&离线合同编号=${contractNum}&离线合同名称=${contractName}&供应商流水号=${supplier}&人员编号=${person}&规定到货时间=${date}&离线合同备注=${remark}`
     }
   })
 }
-export function deleteData(RequisitionList) {
+// 作废离线合同
+export function deleteOfflineContract(num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间采购管理_离线合同_删除数据',
-      param: '请购单流水号=' + RequisitionList
-    }
-  })
-}
-export function updateStatus(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间采购管理_离线合同_导出更改状态',
-      param: '请购单流水号=' + num
+      param: '离线合同流水号=' + num
     }
   })
 }
@@ -78,7 +94,7 @@ export function searchMateriel(num) {
     data: {
       type: '1',
       name: '车间采购管理_离线合同明细_查询数据',
-      param: `请购单流水号=${num}`
+      param: `离线合同流水号=${num}`
     }
   })
 }
@@ -90,7 +106,7 @@ export function addMateriel(num1, num2) {
     data: {
       type: '2',
       name: '车间采购管理_离线合同明细_增加数据',
-      param: `请购单流水号=${num1}&物料流水号组=${num2}`
+      param: `离线合同流水号=${num1}&物料流水号组=${num2}`
     }
   })
 }
@@ -102,18 +118,19 @@ export function deleteMateriel(num) {
     data: {
       type: '2',
       name: '车间采购管理_离线合同明细_删除数据',
-      param: `请购单明细流水号=${num}`
+      param: `离线合同明细流水号=${num}`
     }
   })
 }
-export function update(num, num1, num2) {
+// 生成离线合同
+export function doneOfflineContact(contractNum, total, partGroup, numGroup, priceGroup) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '车间采购管理_离线合同明细_编辑数据',
-      param: `请购单明细流水号=${num}&数量=${num1}&用途=${num2}`
+      name: '车间采购管理_离线合同_生成合同',
+      param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}`
     }
   })
 }
diff --git a/src/api/WorkshopProcurement/OfflineContractRequestFund1.js b/src/api/WorkshopProcurement/OfflineContractRequestFund1.js
new file mode 100644
index 00000000..9c14ec59
--- /dev/null
+++ b/src/api/WorkshopProcurement/OfflineContractRequestFund1.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 查询请款表
+export function searchRequestFund(pageCurrent, pageSize, check1, start, end) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_离线合同_请款_查询数据',
+      param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}`,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 查询离线合同待请款信息
+export function searchOfflineContract(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_离线合同_待请款_查询数据',
+      param: `供应商流水号=${num}`
+    }
+  })
+}
+// 查询离线合同待请款信息
+export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理_离线合同_请款_增加数据',
+      param: `离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}`
+    }
+  })
+}
+// 查询离线合同待请款信息
+export function searchRequsetFundDetail(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间采购管理_离线合同_请款明细_查询数据',
+      param: `离线合同请款流水号=${num}`
+    }
+  })
+}
+// 取消请款
+export function cancelRequestFund(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理_离线合同_请款_删除数据',
+      param: `离线合同请款流水号=${num}`
+    }
+  })
+}
diff --git a/src/icons/svg/OfflineContractRequestFund1.svg b/src/icons/svg/OfflineContractRequestFund1.svg
new file mode 100644
index 00000000..7959ba59
--- /dev/null
+++ b/src/icons/svg/OfflineContractRequestFund1.svg
@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style/></defs><path d="M327 564.9c-16.6 0-30 13.4-30 30s13.4 30 30 30h155V697c0 16.6 13.4 30 30 30s30-13.4 30-30v-72.1h155c16.6 0 30-13.4 30-30s-13.4-30-30-30H542v-48.7h155c16.6 0 30-13.4 30-30s-13.4-30-30-30H552.5l108-108c11.7-11.7 11.7-30.7 0-42.4s-30.7-11.7-42.4 0L512 411.9 405.9 305.8c-11.7-11.7-30.7-11.7-42.4 0s-11.7 30.7 0 42.4l108 108H327c-16.6 0-30 13.4-30 30s13.4 30 30 30h155v48.7H327zM102.3 717.6c-21 0-38.3 17.2-38.3 38.3v165.8c0 21 17.2 38.3 38.3 38.3 21 0 38.3-17.2 38.3-38.3V755.9c-.1-21.1-17.3-38.3-38.3-38.3z"/><path d="M581.6 733.4C557.1 794.9 512 844 458.2 857.9H315.7v-38.3h74.7c24.7 0 44.6-20 44.6-44.6 0-24.7-20-44.6-44.6-44.6h-52.5C315.1 711 288.6 700 260.2 700c-28.4 0-54.9 10.9-77.7 30.4h-10v216.7h285.8c93.3-7.9 167.1-106.4 167.1-227 0-5.2-.5-10.1-.8-15.2-18.9 0-36.1 11.1-43 28.5z"/><path d="M959.8 497.7C952.3 258.1 752.9 64.6 513.2 64 265.2 63.4 64 264.2 64 512v1.1c0 13 10.8 23.4 23.8 23.4h12.5c13.3 0 23.7-10.9 23.7-24.2v-.2c0-223.1 189.3-402.9 415.8-387 191.9 13.4 347 169.4 359.4 361.4 11.4 176.5-96 330-249.8 388.4-11.6 4.4-19.2 15.5-19.2 27.9 0 20.9 20.9 35.6 40.5 28.2C844 865.3 965.9 695.3 959.8 497.7z"/></svg>
\ No newline at end of file
diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue
index 8b37e4dc..b953b4a3 100644
--- a/src/views/WorkshopProcurement/OfflineContract1/index.vue
+++ b/src/views/WorkshopProcurement/OfflineContract1/index.vue
@@ -1,143 +1,186 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>物料名称:</span>
-      <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-      <span>库存状态:</span>
-      <el-select v-model="inventoryStateValue" placeholder="库存状态" size="small" clearable>
-        <el-option
-          v-for="item in inventoryState"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-button
-        type="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin-left: 10px"
-        @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
-    </el-card>
-
-    <el-card>
-      <el-table
-        v-loading="loading1"
-        :data="tableData1"
-        border
-        style="width: 100%;max-height: 300px;"
-        height="300px"
-        size="mini"
-        @selection-change="handleSelectionChange">
-        <el-table-column type="selection" align="center" width="55"/>
-        <el-table-column label="库存状态" width="100" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.库存是否不足)===1" type="danger" size="small">不足</el-tag>
-            <el-tag v-else type="success" size="small">充足</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="物料名称" min-width="200" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="物料型号" min-width="200" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="物料规格" min-width="200" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供货商" min-width="200" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.供货商 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="当前库存量" min-width="200" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.当前库存量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="安全库存量" min-width="200" align="center">
-          <template slot-scope="scope">
-            <template v-if="scope.row.changeSafeValue">
-              <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
-              <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
+      <div slot="header">
+        <span>物料名称:</span>
+        <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+        <span>库存状态:</span>
+        <el-select v-model="inventoryStateValue" placeholder="库存状态" size="small" clearable>
+          <el-option
+            v-for="item in inventoryState"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>采购状态:</span>
+        <el-select v-model="purchaseStateValue" placeholder="库存状态" size="small">
+          <el-option
+            v-for="item in purchaseState"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-button
+          type="success"
+          size="small"
+          icon="el-icon-search"
+          style="margin-left: 10px"
+          @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
+        <el-button style="float: right; padding: 10px" type="text" @click="showMaterialTable=!showMaterialTable">{{ showMaterialTable ? '收起' : '展开' }}</el-button>
+      </div>
+      <div v-show="showMaterialTable">
+        <el-table
+          v-loading="loading1"
+          :data="tableData1"
+          border
+          style="width: 100%;max-height: 460px;"
+          height="460"
+          size="mini"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" align="center" width="55"/>
+          <el-table-column label="库存状态" width="100" align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="parseInt(scope.row.库存是否不足)===1" type="danger" size="small">不足</el-tag>
+              <el-tag v-else type="success" size="small">充足</el-tag>
             </template>
-            <span v-else>{{ scope.row.安全库存量 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="设置" min-width="100" align="center">
-          <template slot-scope="scope">
-            <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button
-              v-else
-              type="primary"
-              size="mini"
-              icon="el-icon-edit"
-              @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize1"
-          :total="total1"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
+          </el-table-column>
+          <el-table-column label="物料名称" min-width="150" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.物料名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料型号" min-width="150" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.物料型号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料规格" min-width="150" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.物料规格 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="供货商" min-width="150" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.供货商 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="当前库存量" min-width="90" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.当前库存量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="安全库存量" min-width="200" align="center">
+            <template slot-scope="scope">
+              <template v-if="scope.row.changeSafeValue">
+                <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
+                <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
+              </template>
+              <span v-else>{{ scope.row.安全库存量 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="设置" min-width="100" align="center">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
+              <el-button
+                v-else
+                type="primary"
+                size="mini"
+                icon="el-icon-edit"
+                @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block" style="margin-top: 10px;">
+          <el-pagination
+            :current-page="pageCurrent1"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize1"
+            :total="total1"
+            style="display:inline-block;width:50%"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange1"
+            @current-change="handleCurrentChange1"/>
+        </div>
       </div>
     </el-card>
 
     <el-card>
-      <el-row>
-        <span>请购单号：</span>
-        <el-input v-model="PurchaseOrder" size="small" style="width: 200px" placeholder="请购单号" clearable/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
-        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 15px" @click="handleAdd()">创建</el-button>
+      <div slot="header">
+        <span>离线合同号:</span>
+        <el-input v-model="offlineContract" placeholder="离线合同号" size="small" clearable/>
+        <span>供应商:</span>
+        <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
         <el-button
-          type="warning"
+          type="success"
+          size="small"
+          icon="el-icon-search"
+          style="margin-left: 10px"
+          @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-plus"
+          style="margin-left: 10px"
+          @click="addOfflineContract">创建离线合同</el-button>
+        <el-button
+          type="primary"
           size="small"
           icon="el-icon-download"
           style="margin-left: 10px"
           @click="addMateriel">选入物料</el-button>
-      </el-row>
-    </el-card>
-
-    <el-card>
-      <el-table :data="tableData2" border style="max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column label="请购单状态" align="center" width="150">
+      </div>
+      <el-table v-loading="" :data="tableData2" border style="max-height: 460px;" height="460px" size="mini" highlight-current-row @row-click="searchTable3">
+        <el-table-column type="expand" fixed="left">
           <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.请购单状态)===1" type="warning" size="small">编辑中</el-tag>
-            <el-tag v-if="parseInt(scope.row.请购单状态)===2" type="primary" size="small">已导出</el-tag>
-            <el-tag v-if="parseInt(scope.row.请购单状态)===3" type="primary" size="small">已禁用</el-tag>
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="离线合同备注">
+                {{ scope.row.离线合同备注 }}
+              </el-form-item>
+            </el-form>
           </template>
         </el-table-column>
-        <el-table-column label="请购单号" align="center">
+        <el-table-column label="合同状态" align="center" width="100" fixed="left">
           <template slot-scope="scope">
-            {{ scope.row.请购单编号 }}
+            <el-tag v-if="Number(scope.row.离线合同状态)===1" type="warning" size="small">编辑中</el-tag>
+            <el-tag v-if="Number(scope.row.离线合同状态)===2&&Number(scope.row.总采购数量)!==Number(scope.row.总到货数量)" type="primary" size="small">已采购</el-tag>
+            <el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)&&Number(scope.row.总采购数量)!==0" type="success" size="small">全部到货</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="请购人" align="center">
+        <el-table-column label="离线合同编号" align="center" min-width="170">
           <template slot-scope="scope">
-            {{ scope.row.姓名 }}
+            {{ scope.row.离线合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="请购时间" align="center">
+        <el-table-column label="离线合同名称" align="center" min-width="170">
           <template slot-scope="scope">
-            {{ scope.row.请购时间 }}
+            {{ scope.row.离线合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="350px" fixed="right">
+        <el-table-column label="供应商" align="center" min-width="250">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button type="warning" size="mini" icon="el-icon-download" @click="exportTable('QG', scope.row)">导出</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-delete" style="margin-left: 15px" @click="handleDelete(scope.row)">作废</el-button>
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="采购员" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.采购员 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建日期" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.创建日期.split(' ')[0] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规定到货时间" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.规定到货时间.split(' ')[0] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200" fixed="right">
+          <template slot-scope="scope">
+            <el-button :disabled="parseInt(scope.row.离线合同状态)!==1" type="primary" size="mini" icon="el-icon-edit" @click="editOfflineContract(scope.row)"/>
+            <el-button :disabled="parseInt(scope.row.离线合同状态)!==1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)"/>
+            <el-button type="warning" size="mini" icon="el-icon-download" @click="exportExcel(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -151,11 +194,12 @@
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange2"
           @current-change="handleCurrentChange2"/>
+        <el-button :disabled="disable" type="success" size="mini" style="float:right" icon="el-icon-circle-check-outline" @click="doneOfflineContact">生成离线合同</el-button>
       </div>
-      <el-table :data="tableData3" border style="max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="请购单编号" align="center" min-width="150">
+      <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 300px;" height="300px" size="mini" show-summary>
+        <el-table-column label="离线合同编号" align="center" min-width="150">
           <template slot-scope="scope">
-            {{ scope.row.请购单编号 }}
+            {{ scope.row.离线合同编号 }}
           </template>
         </el-table-column>
         <el-table-column label="物料名称" align="center" min-width="150">
@@ -175,93 +219,272 @@
         </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.数量" size="mini" style="width:70px" @change="update(scope.row)"/>
+            <el-input v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
           </template>
         </el-table-column>
-        <el-table-column label="用途" align="center" min-width="100">
+        <el-table-column label="参考价格" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.用途" size="mini" style="width:150px" @change="update(scope.row)"/>
+            {{ scope.row.参考价格 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="单价" align="center" min-width="100" prop="单价">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.单价" :disabled="disable" size="mini" style="width:70px"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="合计" align="center" min-width="100" prop="合计">
+          <template slot-scope="scope">
+            {{ parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0) }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="disable" label="到货数量" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.到货数量 }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+            <el-button :disabled="disable" type="danger" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
-    <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="400px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
-        <el-form-item label="请购单编号" prop="请购单编号">
-          <el-input
-            v-model="form.请购单编号"
-            size="small"
-            style="width:200px"/>
-        </el-form-item>
 
-        <el-form-item label="请购人">
-          <el-input
-            v-model="name"
-            size="small"
-            readonly
-            style="width:200px"/>
-        </el-form-item>
+    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
+      <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="供应商名称">
+              <el-input v-model="supplierName" size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业性质">
+              <el-input v-model="enterpriseNature" size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="货期">
+              <el-input v-model="goodTime" size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注册资本">
+              <el-input v-model="registeredCapital" size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="税号">
+              <el-input v-model="taxNum" size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电子邮箱">
+              <el-input v-model="EMail" size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="地址">
+              <el-input v-model="address" size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="账号">
+              <el-input v-model="account" size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="开户行">
+              <el-input v-model="openingBank" size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话号码">
+              <el-input v-model="phone" size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="传真">
+              <el-input v-model="fax" size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-button
+              type="success"
+              size="small"
+              icon="el-icon-search"
+              @click="searchSupplier">查询</el-button>
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-check"
+              @click="submitSelectSupplier">确定</el-button>
+            <el-button
+              type="danger"
+              size="small"
+              icon="el-icon-delete"
+              @click="emptySupplierDetail">清空</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="tableData01" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="200px" border @row-click="showSupplierDetail">
+          <el-table-column align="center" label="供应商名称" min-width="250">
+            <template slot-scope="scope">
+              {{ scope.row.供应商名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="企业性质" min-width="100">
+            <template slot-scope="scope">
+              {{ scope.row.企业性质 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="创立日期" min-width="100">
+            <template slot-scope="scope">
+              {{ scope.row.创立日期 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="注册资本" min-width="100">
+            <template slot-scope="scope">
+              {{ scope.row.注册资本 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+    </el-dialog>
 
-        <el-form-item label="请购时间" prop="请购时间">
-          <el-date-picker
-            v-model="form.请购时间"
-            size="small"
-            type="date"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期"/>
-        </el-form-item>
+    <el-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="离线合同编号" prop="离线合同编号">
+              <el-input v-model="form2.离线合同编号" size="small"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="离线合同名称" prop="离线合同名称">
+              <el-input v-model="form2.离线合同名称" size="small"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="供应商名称" prop="供应商名称">
+              <el-input v-model="form2.供应商名称" size="small" readonly>
+                <el-button slot="append" icon="el-icon-search" @click="dialogVisible1=true"/>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="规定到货时间" prop="规定到货时间">
+              <el-date-picker
+                v-model="form2.规定到货时间"
+                size="small"
+                type="date"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="离线合同备注" prop="离线合同备注">
+              <el-input v-model="form2.离线合同备注" size="small" type="textarea" style="width: 550px"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel('form')">取消</el-button>
-        <el-button v-show="title==='增加'" type="primary" @click="submitAdd('form')">确定</el-button>
-        <el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
+        <el-button
+          v-show="title2==='创建离线合同'"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitAddOfflineContract">确定</el-button>
+        <el-button
+          v-show="title2==='编辑离线合同'"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitEditOfflineContract">确定</el-button>
       </div>
     </el-dialog>
-    <table id="QG" cellspacing="0px" border align="center" style="display: none">
-      <thead>
-        <tr id="tableHead">
-          <th>请购单编号</th>
-          <th>物料名称</th>
-          <th>物料规格</th>
-          <th>物料型号</th>
-          <th>数量</th>
-          <th>用途</th>
+
+    <div id="offlineContract" style="width: 800px;margin: 0 auto;display: none">
+      <table class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
+        <tr>
+          <th colspan="14"><h1>离线合同</h1></th>
         </tr>
-      </thead>
-      <tbody>
-        <tr v-for="(list, index) in tableData3" :key="index">
-          <td align="center"> {{ list.请购单编号 }}</td>
-          <td>{{ list.物料名称 }}</td>
-          <td>{{ list.物料规格 }}</td>
-          <td align="center">{{ list.物料型号 }}</td>
-          <td>{{ list.数量 }}</td>
-          <td>{{ list.用途 }}</td>
+        <tr>
+          <td colspan="3" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
+          <td width="80px">合同名称</td>
+          <td id="contractName" colspan="3" style="text-align: left;"/>
+          <td width="80px">供应商</td>
+          <td id="supplier" colspan="4" style="text-align: left;"/>
+          <td id="qrCode" colspan="2" rowspan="2">二维码粘贴处</td>
         </tr>
-      </tbody>
-    </table>
+        <tr>
+          <td width="80px">合同编号</td>
+          <td id="contractNum" colspan="3" style="text-align: left;"/>
+          <td width="80px">采购员</td>
+          <td id="buyer" colspan="4" style="text-align: left;"/>
+        </tr>
+        <tr id="tablehead">
+          <td>序号</td>
+          <td colspan="2">名称</td>
+          <td colspan="2">规格</td>
+          <td colspan="2">型号</td>
+          <td colspan="2">数量</td>
+          <td colspan="2">单价</td>
+          <td colspan="2">合计</td>
+          <td>备注</td>
+        </tr>
+        <tr>
+          <td>总计</td>
+          <td colspan="10"/>
+          <td id="total" colspan="2" style="text-align: left;"/>
+          <td/>
+        </tr>
+      </table>
+    </div>
   </div>
 </template>
 
-<script>
-import { searchInventoryNum, searchOfflineContract, addData, editData, deleteData, searchMateriel, update, updateStatus,
-  addMateriel, deleteMateriel, setSafeValue } from '@/api/WorkshopProcurement/OfflineContract1'
+<script>import { searchInventoryNum, searchOfflineContract, searchOfflineContract2, searchSupplier, addOfflineContract, editOfflineContract, deleteOfflineContract, searchMateriel,
+  addMateriel, deleteMateriel, doneOfflineContact, setSafeValue } from '@/api/PurchasingCenter/OfflineContract'
+import QRCode from 'qrcode'
+import $ from 'jquery'
 import { mapGetters } from 'vuex'
-import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
-
 export default {
+  name: '', // 离线合同
   data() {
     return {
+      showMaterialTable: true,
       loading1: false,
-      title: '',
+      title2: '',
+      purchaseStateValue: 2, // 采购状态 全部
+      purchaseState: [
+        {
+          label: '未采购',
+          value: 1
+        }, {
+          label: '全部',
+          value: 2
+        }
+      ],
       check1: 0,
       check2: 0,
       check3: 0,
+      check4: 0,
       materialName: '',
       inventoryStateValue: '', // 库存状态
       inventoryState: [
@@ -278,25 +501,71 @@ export default {
       pageCurrent1: 1,
       pageSize1: 10,
       total1: 0,
-      PurchaseOrder: '', // 请购单编号
-      PurchaseNumber: '',
+      offlineContractNum: '', // 离线合同流水号
+      offlineContract: '', // 离线合同号
+      supplierName0: '', // 供应商名称（外面的）
+      supplierName: '', // 供应商名称
+      payTime: [], // 付款时间节点
       tableData2: [],
       total2: 0,
       pageCurrent2: 1,
       pageSize2: 10,
-      dialogFormVisible: false,
-      RequisitionList: '',
-      form: {
-        请购单编号: '',
-        请购时间: ''
+      dialogVisible1: false,
+      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: '', // 供应商流水号
+      goodTime: '', // 货期
+      enterpriseNature: '', // 企业性质
+      createDate: '', // 创立日期
+      registeredCapital: '', // 注册资本
+      taxNum: '', // 税号
+      EMail: '', // 电子邮箱
+      address: '', // 地址
+      account: '', // 账号
+      openingBank: '', // 开户行
+      phone: '', // 电话号码
+      fax: '', // 传真
+      tableData01: [],
+      dialogVisible2: false,
+      form2: {
+        离线合同流水号: '',
+        离线合同编号: '',
+        离线合同名称: '',
+        供应商流水号: '',
+        供应商名称: '',
+        规定到货时间: '',
+        离线合同备注: '付款方式：；付款时间：；到货时间：；开票信息：；其他说明：；'
       },
-      rules: {
-        请购单编号: [{ required: true, message: '请输入请购单编号', trigger: 'blur' }],
-        请购时间: [{ required: true, message: '请选择请购时间', trigger: 'change' }]
+      rules2: { // 离线合同表单验证规则
+        离线合同编号: [{ required: true, message: '请填写离线合同编号' }],
+        离线合同名称: [{ required: true, message: '请填写离线合同名称' }],
+        供应商名称: [{ required: true, message: '请选择供应商' }],
+        规定到货时间: [{ required: true, message: '请选择规定到货时间' }],
+        运费: [{ required: true, message: '请填写运费' }],
+        付款方式: [{ required: true, message: '请选择付款方式' }]
       },
       tableData3: [],
       materielGroup: [], // 物料流水号组
-      partGroup: [] // 离线合同明细流水号组
+      partGroup: [], // 离线合同明细流水号组
+      numGroup: [], // 数量组
+      priceGroup: [], // 单价组
+      totalPrice: 0, // 合同总额
+      tableData4: [], // 合同模板
+      stipulateArrivalTime: '', // 规定到货时间
+      离线合同状态: '',
+      paramRow: '', // 参数row
+      disable: true // 其他的禁用
     }
   },
   computed: {
@@ -307,12 +576,32 @@ export default {
       'id' // 人员编号
     ])
   },
+  created() {
+    this.fetchData()
+    this.searchTable1()
+    this.searchTable2()
+  },
   methods: {
+    useqrcode(contractNum) {
+      const opts = {
+        errorCorrectionLevel: 'H',
+        type: 'image/jpeg',
+        rendererOpts: {
+          quality: 0.3
+        }
+      }
+      QRCode.toDataURL(contractNum, opts, function(err, url) {
+        if (err) throw err
+        const img = document.getElementById('img')
+        img.src = url
+      })
+    },
+    fetchData() {},
     searchTable1() { // 查询物料库物料
       this.loading1 = true
       this.materialName ? this.check1 = 1 : this.check1 = 0
       this.inventoryStateValue ? this.check2 = 1 : this.check2 = 0
-      searchInventoryNum(this.pageCurrent1, this.pageSize1, this.check1, this.materialName, this.check2, this.inventoryStateValue).then(response => {
+      searchInventoryNum(this.pageCurrent1, this.pageSize1, this.check1, this.materialName, this.check2, this.inventoryStateValue, this.purchaseStateValue).then(response => {
         this.tableData1 = response.data.rows
         this.tableData1.map(v => {
           this.$set(v, 'changeSafeValue', false)
@@ -355,53 +644,55 @@ export default {
         }
       })
     },
-    searchTable2() { // 查询请购单列表
-      this.PurchaseOrder ? this.check3 = 1 : this.check3 = 0
-      searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.PurchaseOrder).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          if (response.data.rows[i].请购时间 !== '') {
-            response.data.rows[i].请购时间 = (response.data.rows[i].请购时间).split(' ')[0]
-          }
-        }
+    searchTable2() { // 查询离线合同列表
+      this.offlineContract ? this.check3 = 1 : this.check3 = 0
+      this.supplierName0 ? this.check4 = 1 : this.check4 = 0
+      searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0).then(response => {
         this.tableData2 = response.data.rows
         this.total2 = response.data.total
       })
     },
-    handleSizeChange2(val) { // 请购单列表分页
+    handleSizeChange2(val) { // 离线合同列表分页
       this.pageSize2 = val
       this.searchTable2()
     },
-    handleCurrentChange2(val) { // 请购单列表分页
+    handleCurrentChange2(val) { // 离线合同列表分页
       this.pageCurrent2 = val
       this.searchTable2()
     },
-    exportTable(tableid, row) {
-      updateStatus(row.请购单流水号).then(response => {
-        this.searchTable2()
-      })
-      if (this.tableData3.length === 0) {
-        this.$message.warning('暂无数据')
-      } else {
-        getExplorer()
-        method5(tableid)
-        Cleanup()
+    addOfflineContract() { // 创建离线合同
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
       }
+      this.title2 = '创建离线合同'
+      this.form2.离线合同编号 = ''
+      this.form2.离线合同名称 = ''
+      this.form2.供应商流水号 = ''
+      this.form2.供应商名称 = ''
+      this.form2.规定到货时间 = ''
+      this.form2.离线合同备注 = '付款方式：；付款时间：；到货时间：；开票信息：；其他说明：；'
+      this.dialogVisible2 = true
     },
-    update(row) {
-      update(row.请购单明细流水号, row.数量, row.用途).then(response => {})
-    },
-    handleAdd() {
-      this.addForm('form', [this.dialogFormVisible = true, this.title = '增加'])
-    },
-    submitAdd(formName) {
-      this.$refs[formName].validate((valid) => {
+    submitAddOfflineContract() { // 新建离线合同
+      this.$refs['form2'].validate((valid) => {
         if (valid) {
-          addData(this.form.请购单编号, this.id, this.form.请购时间).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('增加成功')
-              this.dialogFormVisible = false
-              this.searchTable2()
-            } else { this.$message.error('增加失败') }
+          const numGroup1 = [] // 空数组，放现有的询价单号
+          searchOfflineContract2().then(response => { // 先查询判断是否存在
+            for (let i = 0; i < response.data.length; i++) {
+              numGroup1.push(response.data[i].离线合同编号)
+            }
+          }).then(() => {
+            if (numGroup1.indexOf(this.form2.离线合同编号) !== -1) {
+              this.$message.error('该离线合同编号已存在')
+            } else {
+              addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
+                if (response.data[0].result === '1') {
+                  this.$message.success('新建离线合同成功')
+                  this.searchTable2()
+                  this.dialogVisible2 = false
+                } else { this.$message.error('新建离线合同失败') }
+              })
+            }
           })
         } else {
           console.log('error submit!!')
@@ -409,25 +700,42 @@ export default {
         }
       })
     },
-    handleEdit(row) { // 弹出单据编辑
-      if (this.$refs['form'] !== undefined) {
-        this.$refs['form'].resetFields()
+    editOfflineContract(row) {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
       }
-      this.title = '编辑'
-      this.dialogFormVisible = true
-      this.RequisitionList = row.请购单流水号
-      this.form.请购单编号 = row.请购单编号
-      this.form.请购时间 = row.请购时间
+      this.title2 = '编辑离线合同'
+      this.form2.离线合同流水号 = row.离线合同流水号
+      this.form2.离线合同编号 = row.离线合同编号
+      this.form2.离线合同名称 = row.离线合同名称
+      this.form2.供应商流水号 = row.供应商流水号
+      this.form2.供应商名称 = row.供应商名称
+      this.form2.规定到货时间 = row.规定到货时间
+      this.form2.离线合同备注 = row.离线合同备注
+      this.dialogVisible2 = true
     },
-    submitEdit(formName) { // 提交单据编辑
-      this.$refs[formName].validate((valid) => {
+    submitEditOfflineContract() {
+      this.$refs['form2'].validate((valid) => {
         if (valid) {
-          editData(this.RequisitionList, this.form.请购单编号, this.form.请购时间).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('编辑成功')
-              this.dialogFormVisible = false
-              this.searchTable2()
-            } else { this.$message.error('编辑失败') }
+          const numGroup1 = [] // 空数组，放现有的离线合同号
+          const numGroup2 = [] // 空数组，放现有的离线合同流水号
+          searchOfflineContract2().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.离线合同编号) !== -1 && numGroup1.indexOf(this.form2.离线合同编号) !== numGroup2.indexOf(parseInt(this.form2.离线合同流水号))) {
+              this.$message.error('该离线合同编号已存在')
+            } else {
+              editOfflineContract(this.form2.离线合同流水号, this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
+                if (response.data[0].result === '1') {
+                  this.$message.success('修改离线合同成功')
+                  this.searchTable2()
+                  this.dialogVisible2 = false
+                } else { this.$message.error('修改离线合同失败') }
+              })
+            }
           })
         } else {
           console.log('error submit!!')
@@ -435,17 +743,21 @@ export default {
         }
       })
     },
-    handleDelete(row) { // 作废单据
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+    deleteOfflineContract(row) { // 删除离线合同
+      this.$confirm('确定删除该合同?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteData(row.请购单流水号).then(response => {
+        deleteOfflineContract(row.离线合同流水号).then(response => {
           if (response.data[0].result === '1') {
-            this.$message.success('作废成功')
+            this.$message.success('删除成功')
             this.searchTable2()
-          } else { this.$message.error('作废失败') }
+            this.disable = true
+            searchMateriel(this.offlineContractNum).then(response => {
+              this.tableData3 = response.data
+            })
+          } else { this.$message.error('数据占用，删除失败') }
         })
       }).catch(() => {
         this.$message({
@@ -454,26 +766,109 @@ export default {
         })
       })
     },
-    cancel(formName) {
-      this.form = {}
-      this.dialogFormVisible = false
-      this.$refs[formName].resetFields()
+    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
+      })
     },
-    searchTable3(row) { // 查询请购单明细
-      this.PurchaseNumber = row.请购单流水号
-      searchMateriel(this.PurchaseNumber).then(response => {
+    showSupplierDetail(row) {
+      this.form2.供应商流水号 = row.供应商流水号
+      this.form2.供应商名称 = 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.stipulateArrivalTime = row.规定到货时间.split(' ')[0]
+      this.offlineContractNum = row.离线合同流水号
+      this.离线合同状态 = row.离线合同状态
+      searchMateriel(this.offlineContractNum).then(response => {
         this.tableData3 = response.data
       })
+      Number(row.离线合同状态) !== 1 ? this.disable = true : this.disable = false // 是否为编辑模式
     },
-    addMateriel() { // 将物料选入请购单
-      addMateriel(this.PurchaseNumber, this.materielGroup).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('选入成功')
-          searchMateriel(this.PurchaseNumber).then(response => {
-            this.tableData3 = response.data
-          })
-        } else { this.$message.error('选入失败') }
+    getSummaries(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总价'
+        } else if (index === 7) {
+          const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量'])))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
       })
+      return sums
+    },
+    addMateriel() { // 将物料选入离线合同
+      if (!this.offlineContractNum) {
+        this.$message.warning('请选择离线合同')
+      } else if (Number(this.离线合同状态) !== 1) {
+        this.$message.warning('请选择可编辑的离线合同')
+      } else if (this.materielGroup.length === 0) {
+        this.$message.warning('请勾选物料')
+      } else {
+        addMateriel(this.offlineContractNum, this.materielGroup).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('选入成功')
+            searchMateriel(this.offlineContractNum).then(response => {
+              this.tableData3 = response.data
+            })
+          } else { this.$message.error('选入失败') }
+        })
+      }
     },
     deleteMateriel(row) { // 移除物料
       this.$confirm('确定移除该物料?', '提示', {
@@ -481,10 +876,10 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteMateriel(row.请购单明细流水号).then(response => {
+        deleteMateriel(row.离线合同明细流水号).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('移除成功')
-            searchMateriel(this.PurchaseNumber).then(response => {
+            searchMateriel(this.offlineContractNum).then(response => {
               this.tableData3 = response.data
             })
           } else { this.$message.error('移除失败') }
@@ -495,12 +890,109 @@ export default {
           message: '已取消移除'
         })
       })
+    },
+    doneOfflineContact() { // 生成离线合同
+      this.$confirm('确定生成合同?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.totalPrice = 0
+        this.partGroup = []
+        this.numGroup = []
+        this.priceGroup = []
+        for (let i = 0; i < this.tableData3.length; i++) {
+          this.totalPrice += this.tableData3[i].数量 * this.tableData3[i].单价
+          this.partGroup.push(this.tableData3[i].离线合同明细流水号)
+          this.numGroup.push(this.tableData3[i].数量)
+          this.priceGroup.push(this.tableData3[i].单价)
+        }
+        doneOfflineContact(this.offlineContractNum, this.totalPrice, this.partGroup, this.numGroup, this.priceGroup).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('离线合同生成成功')
+            this.searchTable2()
+            searchMateriel(this.offlineContractNum).then(response => {
+              this.tableData3 = response.data
+              this.disable = true // 是否为编辑模式
+            })
+          } else { this.$message.error('离线合同生成失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
+    exportExcel(row) {
+      this.$confirm('确定导出该合同?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const children = document.getElementsByClassName('tableData')
+        const parent = document.getElementsByClassName('offlineContract')[0]
+        if (children.length !== 0) {
+          for (let i = children.length - 1; i >= 0; i--) {
+            parent.removeChild(children[i])
+          }
+        }
+        const tr = []
+        let length = 0
+        this.tableData3.length < 15 ? length = 15 : length = this.tableData3.length
+        for (let i = 0; i < length; i++) {
+          tr[i] = document.createElement('tr')
+          tr[i].setAttribute('class', 'tableData')
+          tr[i].innerHTML = `<td style="height: 40px"/><td colspan="2" style="height: 40px"/><td colspan="2" style="height: 40px"/><td colspan="2" style="height: 40px"/><td colspan="2" style="height: 40px"/><td colspan="2" style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/>`
+          document.getElementById('tablehead').after(tr[i])
+        }
+        let total = 0
+        for (let j = 0; j < this.tableData3.length; j++) {
+          document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+          document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.tableData3[j].物料名称
+          document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.tableData3[j].物料规格
+          document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.tableData3[j].物料型号
+          document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.tableData3[j].数量
+          document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.tableData3[j].单价
+          document.getElementsByClassName('tableData')[j].children[6].innerHTML = this.tableData3[j].数量 * this.tableData3[j].单价
+          document.getElementsByClassName('tableData')[j].children[7].innerHTML = ''
+          total += this.tableData3[j].数量 * this.tableData3[j].单价
+        }
+        document.getElementById('contractNum').innerHTML = row.离线合同编号
+        document.getElementById('contractName').innerHTML = row.离线合同名称
+        document.getElementById('supplier').innerHTML = row.供应商名称
+        document.getElementById('buyer').innerHTML = row.采购员
+        document.getElementById('total').innerHTML = total
+        $('#qrCode').html(`<img id="img" style="display: block;margin: 0 auto">`)
+        this.useqrcode(row.离线合同流水号) // 显示二维码
+      }).then(() => {
+        const htmlNode = $('#offlineContract').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: '已取消操作'
+        })
+      })
     }
   }
 }
 </script>
 
 <style scoped>
+  .offlineContract td{
+    height: 40px;
+    text-align: center;
+  }
   .el-card{
     margin-bottom: 15px;
   }
diff --git a/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue b/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue
index 75d13874..b2052f4d 100644
--- a/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue
@@ -35,45 +35,39 @@
             {{ scope.row.请款时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款人" align="center" min-width="100">
+        <el-table-column label="请款人" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
+        <el-table-column label="请款金额" align="center" min-width="90" prop="请款金额">
           <template slot-scope="scope">
             {{ scope.row.请款金额 }}
           </template>
         </el-table-column>
         <el-table-column label="请款付款情况" align="center">
-          <el-table-column label="审核情况内容" width="100" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.审核情况内容 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="未通过审核原因" width="110" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.未通过审核原因 }}
-            </template>
-          </el-table-column>
           <el-table-column label="审批情况内容" width="100" align="center">
             <template slot-scope="scope">
-              {{ scope.row.审批情况内容 }}
+              <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
+              <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
+              <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="未通过审批原因" width="110" align="center">
             <template slot-scope="scope">
-              {{ scope.row.未通过审批原因 }}
+              {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
             </template>
           </el-table-column>
           <el-table-column label="付款情况" width="100" align="center">
             <template slot-scope="scope">
-              {{ scope.row.付款情况内容 }}
+              <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
+              <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
+              <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="未付款原因" width="100" align="center">
             <template slot-scope="scope">
-              {{ scope.row.未付款原因 }}
+              {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
             </template>
           </el-table-column>
         </el-table-column>
@@ -93,9 +87,9 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-left: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
+              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button :disabled="parseInt(scope.row.审核情况流水号)===1" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
+            <el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -166,8 +160,7 @@
   </div>
 </template>
 
-<script>
-import { searchRequestFund, searchOfflineContract, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/PurchasingCenter/OfflineContractRequestFund'
+<script>import { searchRequestFund, searchOfflineContract, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/WorkshopProcurement/OfflineContractRequestFund1'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -233,6 +226,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchTable1()
   },
   methods: {
     fetchData() {

From 9393884e971292cdf96d9370cde2309a38bcc657 Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Tue, 22 Jan 2019 09:45:57 +0800
Subject: [PATCH 3/3] lx

---
 src/utils/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 3337ad5e..e3cc882a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,7 +20,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间