更新

src/api/MarketingCenter/ComprehensiveInquiryMS.js

@@ -31,14 +31,14 @@ export function SelectMarketingManager(code) {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同信息管理_合同信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/MarketingCenter/ContractCapitalManagement.js

@@ -20,14 +20,14 @@ export function initMarketingManager() {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '合同资金管理_资金信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int',
+      name: '合同资金管理_资金信息_查询1',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&客户名称=' + num3 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -237,7 +237,7 @@ export function fukuan(code, num1, num2) {
     method: 'post',
     data: {
       type: '2',
-      name: '合同资金管理_批次付款明细表_增加数据',
+      name: '合同资金管理_批次付款明细表_增加数据_新',
       param: '批次资金ID=' + code + '=int&本次收款金额=' + num1 + '=string&本次收款时间=' + num2 + '=string'
     }
   })
@@ -368,8 +368,18 @@ export function never(num1) {
     method: 'post',
     data: {
       type: '2',
-      name: '合同资金管理_催收账款_不再提醒',
+      name: '合同资金管理_资金信息_查询',
       param: '批次资金ID=' + num1 + '=int'
     }
   })
 }
+export function getcustomername() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同资金管理_资金信息_查询_新'
+    }
+  })
+}

src/api/MarketingCenter/ContractInformationManagement.js

@@ -20,14 +20,14 @@ export function initMarketingManager() {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
+export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同信息管理_合同信息_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -49,7 +49,7 @@ export function delList(num) {
     method: 'post',
     data: {
       type: '2',
-      name: '合同信息管理_合同信息_删除',
+      name: '合同信息管理_合同信息_删除_合同收款计划',
       param: '合同ID=' + num + '=int'
     }
   })
@@ -60,8 +60,8 @@ export function addList() {
     method: 'post',
     data: {
       type: '2',
-      name: '基础表_合同信息表_增加数据',
-      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11]
+      name: '基础表_合同信息表_增加数据_新',
+      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11] + '&合同总额=' + arguments[12]
     }
   })
 }

src/api/MarketingCenter/CreateProject.js

@@ -10,14 +10,14 @@ export function initProject() {
     }
   })
 }
-export function searchTable1(pageCurrent, pageSize, num1, num3, num5, num6, num7, num8, num9, num10) {
+export function searchTable1(pageCurrent, pageSize, num1, num3, num5, num6, num7, num8, num9, num10, num11, num12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '合同信息管理_合同信息_制造部_查询',
-      param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string',
+      name: '合同信息管理_合同信息_制造部_查询_新',
+      param: '合同ID=' + num1 + '=int&项目流水号_check=' + num3 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&合同编号_check=' + num11 + '=int&合同编号=' + num12 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/MarketingCenter/InvoiceRecord.js

@@ -10,14 +10,14 @@ export function initProject() {
     }
   })
 }
-export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
+export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '合同资金管理_开票记录_合同信息统计_查询',
-      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date',
+      param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&客户名称=' + num9 + '=string&客户名称_check=' + num10 + '=int',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/MarketingCenter/PerformanceBond.js

@@ -10,14 +10,14 @@ export function initProject() {
     }
   })
 }
-export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6) {
+export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '合同信息管理_履约保证金_合同信息统计_查询',
-      param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date',
+      name: '合同信息管理_履约保证金_合同信息统计_查询_新',
+      param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date&客户名称_check=' + num7 + '=int&客户名称=' + num8 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/MarketingCenter/SafetyMargin.js

@@ -112,14 +112,14 @@ export function TakeBack() {
     }
   })
 }
-export function searchTableDataProject(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6) {
+export function searchTableDataProject(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '合同信息管理_安全保证金_合同信息统计_查询',
-      param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date',
+      name: '合同信息管理_安全保证金_合同信息统计_查询_新',
+      param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date&客户名称_check=' + num7 + '=int&客户名称=' + num8 + '=string',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/MarketingCenter/ShippingInquiries.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+export function InvoiceListSearch() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单_发货单列表_查询',
+      param: '发货单号=' + arguments[0] + '\\&收货单位=' + arguments[1] + '\\&发货单名_check=0\\&发货单号_check=' + arguments[2] + '\\&收货单位_check=' + arguments[3] + '\\&车辆牌号_check=0\\&司机姓名_check=0\\&司机电话_check=0\\&制单人_check=0\\&核准人_check=0\\&执行人_check=0\\&开始制单日期_check=0\\&结束制单日期_check=0\\&开始核准日期_check=0\\&结束核准日期_check=0\\&开始发货日期_check=0\\&结束发货日期_check=0'
+    }
+  })
+}
+
+export function DetailsFeach() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '发货管理_发货申请_发货单明细_查询',
+      param: '发货单流水号=' + arguments[0]
+    }
+  })
+}

src/api/PurchasingCenter/CreateInquirySheet.js

@@ -76,14 +76,14 @@ export function getExport2(num) {
   })
 }
 // 查询分配后的标准件和外购件
-export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) {
+export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存',
-      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_创建询价单',
+      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -95,7 +95,7 @@ export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, va
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购部采购_查询物料_基本件_分配后',
+      name: '采购管理_采购部采购_查询物料_基本件_分配后_创建询价单',
       param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
       Pagination: pageCurrent + '&' + pageSize
     }
@@ -301,7 +301,7 @@ export function searchMachine(num) {
     data: {
       type: '1',
       name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=1&项目流水号=' + num
+      param: '项目流水号_check=0&项目流水号=' + num
     }
   })
 }

src/api/PurchasingCenter/FundApproval.js

@@ -75,14 +75,14 @@ export function execApprovalOffline(num1, num2, reason, person, state) {
   })
 }
 // 采购合同内容查询
-export function searchContactDetail(num) {
+export function searchContactDetail(check, num1, num2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购合同内容_查询数据',
-      param: '采购合同流水号=' + num
+      name: '采购管理_采购合同内容_查询数据_合并后',
+      param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}`
     }
   })
 }

src/api/PurchasingCenter/InvoiceSettlementApplication.js

@@ -30,8 +30,8 @@ export function searchTable1(...group) {
     data: {
       type: '1',
       name: '采购管理_发票结算申请单_查询数据',
-      param: `发票号_check=${group[0]}&发票号=${group[1]}`,
-      Pagination: group[2] + '&' + group[3]
+      param: `发票号_check=${group[0]}&发票号=${group[1]}&供应商名称_check=${group[2]}&供应商名称=${group[3]}`,
+      Pagination: group[4] + '&' + group[5]
     }
   })
 }

src/api/PurchasingCenter/OfflineContract.js

@@ -208,14 +208,14 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2
   })
 }
 // 查询分配后的标准件和外购件
-export function searchMaterial1(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) {
+export function searchMaterial1(pageCurrent, pageSize, check1, val1, person, check5, val5, val8, val9, val10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存',
-      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_New20191109',
+      param: `名称规格型号_check=${check1}&名称规格型号=${val1}&人员编号=${person}&机床流水号_check=${check5}&机床流水号=${val5}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -233,15 +233,16 @@ export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, va
     }
   })
 }
-// 查询分配后的仓库采购件
-export function searchMaterial22(num1, check1, val1, check2, val2, check3, val3, person, val8, val9, val10) {
+// 查询物料
+export function searchMaterial22(check1, val1, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_仓库采购_离线合同_查询',
-      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`
+      name: '采购管理_离线采购_物料主文件_基本_查询数据',
+      param: `名称规格型号_check=${check1}&名称规格型号=${val1}`,
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
@@ -264,7 +265,7 @@ export function searchMachine(num) {
     data: {
       type: '1',
       name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=1&项目流水号=' + num
+      param: '项目流水号_check=0&项目流水号=' + num
     }
   })
 }

src/api/PurchasingCenter/PurchaseContractRequestFund.js

@@ -12,14 +12,14 @@ export function searchTable0(check, date1, date2) {
   })
 }
 // 采购合同内容查询
-export function searchContract(num) {
+export function searchContract(check, num1, num2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购合同内容_查询数据',
-      param: '采购合同流水号=' + num
+      name: '采购管理_采购合同内容_查询数据_合并后',
+      param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}`
     }
   })
 }
@@ -48,14 +48,14 @@ export function searchSupplier() {
   })
 }
 // 采购合同请款
-export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) {
+export function submitRequestFund(contractGroup, offGroup, sumGroup, supplier, money, person) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '采购管理_采购合同_请款_增加数据',
-      param: `采购合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}`
+      name: '采购管理_采购合同_请款_增加数据_合并后',
+      param: `采购合同流水号组=${contractGroup}&离线合同流水号组=${offGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}`
     }
   })
 }
@@ -84,14 +84,14 @@ export function cancelRequestFund(num) {
   })
 }
 // 查询离线合同待请款信息
-export function searchPurchaseContract(check, num) {
+export function searchPurchaseContract(check1, check, num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购合同_查询数据',
-      param: `供应商流水号_check=${check}&供应商流水号=${num}`
+      name: '采购管理_采购合同_查询数据_合并后',
+      param: `check=${check1}&供应商流水号_check=${check}&供应商流水号=${num}`
     }
   })
 }

src/api/PurchasingCenter/PurchaseContractSearch.js

@@ -29,7 +29,7 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2,
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_合同_查询数据_采购部采购',
+      name: '采购管理_合同_查询数据_采购部采购_新',
       param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number + '&审核情况流水号_check=' + check6 + '&审核情况流水号=' + review,
       Pagination: pageCurrent + '&' + pageSize
     }

src/api/PurchasingCenter/PurchaseTaskAllocate.js

@@ -53,7 +53,7 @@ export function searchMachine(num) {
     data: {
       type: '1',
       name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=1&项目流水号=' + num
+      param: '项目流水号_check=0&项目流水号=' + num
     }
   })
 }
@@ -76,7 +76,7 @@ export function searchTable1(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: 'xqs_采购管理_采购部采购_查询物料_分配后',
+      name: 'xqs_采购管理_采购部采购_查询物料_分配后_采购任务分配',
       param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}&时间段_check=${params[20]}&开始时间=${params[21]}&结束时间=${params[22]}`,
       Pagination: params[0] + '&' + params[1]
     }
@@ -89,7 +89,7 @@ export function searchTable2(...params) {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购部采购_查询物料_基本件_分配后',
+      name: '采购管理_采购部采购_查询物料_基本件_分配后_采购任务分配',
       param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&机床流水号_check=${params[4]}&机床流水号=${params[5]}&组件流水号_check=${params[6]}&组件流水号=${params[7]}&物料状态编号=${params[8]}&零件图号_check=${params[9]}&零件图号=${params[10]}&零件名称_check=${params[11]}&零件名称=${params[12]}&零件规格_check=${params[13]}&零件规格=${params[14]}&材料_check=${params[15]}&材料=${params[16]}`,
       Pagination: params[0] + '&' + params[1]
     }

src/api/PurchasingCenter/ReceiveCheck.js

@@ -47,3 +47,15 @@ export function searchReceiveCheck(check1, num1, check2, num2, check3, num3) {
     }
   })
 }
+// 机床名称
+export function getMachines() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
+    }
+  })
+}

src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue

@@ -7,7 +7,7 @@
           v-model="entryNameValue"
           :remote-method="remoteMethod"
           placeholder="项目名称"
-          style="margin-right: 10px"
+          style="margin-right: 10px; width: 150px"
           size="small"
           clearable
           filterable
@@ -21,14 +21,14 @@
             :value="item.value"/>
         </el-select>
         <span>机床图号:</span>
-        <el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px" size="small" clearable @change="machineChange">
+        <el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px; width: 150px" size="small" clearable @change="machineChange">
           <el-option
             v-for="item in machineName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total1=0;pageSize1 = 10;pageCurrent1 = 1;searchData1()">查询</el-button>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total1=0;pageSize1 = 10000;pageCurrent1 = 1;searchData1()">查询</el-button>
       </el-row>
     </el-card>
     <el-card style="margin-top: 15px">
@@ -38,7 +38,6 @@
         style="width: 100%;max-height: 400px;"
         stripe
         size="mini"
-        height="300"
         highlight-current-row
         border
         @row-click="searchSpareParts">
@@ -68,137 +67,143 @@
           </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"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
-      </div>
-    </el-card>
-    <el-card style="margin-top: 15px">
-      <el-row>
-        <span>组号:</span>
-        <el-select v-model="GroupNumValue" placeholder="组号" style="margin-right: 10px" size="small" clearable>
-          <el-option
-            v-for="item in GroupNum"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>零件图号:</span>
-        <el-input v-model="PartDrawingNumber" placeholder="零件图号" size="small" clearable style="width:200px"/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total=0;pageSize = 10;pageCurrent = 1;searchData()">查询</el-button>
-      </el-row>
-    </el-card>
-    <el-card style="margin-top: 15px">
-      <el-table
-        v-loading="listLoading"
-        :data="tableData"
-        style="width: 100%;max-height: 400px;"
-        stripe
-        size="mini"
-        height="300"
-        highlight-current-row
-        border
-        @row-click="searchProcedure">
-        <el-table-column align="center" label="组号">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="零件图号">
-          <template slot-scope="scope">
-            {{ scope.row.零件图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="零件名称">
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="零件数量">
-          <template slot-scope="scope">
-            {{ scope.row.投产数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="停产时间">
-          <template slot-scope="scope">
-            {{ scope.row.停产时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="停产原因">
-          <template slot-scope="scope">
-            {{ scope.row.停产原因 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="加工工时">
-          <template slot-scope="scope">
-            {{ scope.row.加工工时 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
-    <el-card style="margin-top: 15px">
-      <el-table
-        v-loading="listLoading1"
-        :data="tableData1"
-        style="width: 100%;max-height: 400px;"
-        stripe
-        size="mini"
-        height="300"
-        highlight-current-row
-        border>
-        <el-table-column align="center" label="工序顺序" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.工序顺序 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="工艺名称" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.工艺名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="工艺要求">
-          <template slot-scope="scope">
-            {{ scope.row.工艺要求 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="单件定额工时" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.单件定额工时 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="准结定额工时" width="130">
-          <template slot-scope="scope">
-            {{ scope.row.准结定额工时 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="工艺是否完成" width="130">
-          <template slot-scope="scope">
-            {{ scope.row.工序状态 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="工时" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.工序工时 }}
-          </template>
-        </el-table-column>
-      </el-table>
+      <!--      <div class="block" style="margin-top: 10px">-->
+      <!--        <el-pagination-->
+      <!--          :current-page="pageCurrent1"-->
+      <!--          :page-sizes="[10, 20, 30, 40]"-->
+      <!--          :page-size="pageSize1"-->
+      <!--          :total="total1"-->
+      <!--          layout="total, sizes, prev, pager, next, jumper"-->
+      <!--          @size-change="handleSizeChange1"-->
+      <!--          @current-change="handleCurrentChange1"/>-->
+      <!--      </div>-->
     </el-card>
+    <!--    <el-card style="margin-top: 15px">-->
+    <!--      <el-row>-->
+    <!--        <span>组号:</span>-->
+    <!--        <el-select v-model="GroupNumValue" placeholder="组号" style="margin-right: 10px;width: 150px" size="small" clearable>-->
+    <!--          <el-option-->
+    <!--            v-for="item in GroupNum"-->
+    <!--            :key="item.value"-->
+    <!--            :label="item.label"-->
+    <!--            :value="item.value"/>-->
+    <!--        </el-select>-->
+    <!--        <span>零件图号:</span>-->
+    <!--        <el-input v-model="PartDrawingNumber" placeholder="零件图号" size="small" clearable style="width:150px"/>-->
+    <!--        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total=0;pageSize = 10;pageCurrent = 1;searchData()">查询</el-button>-->
+    <!--      </el-row>-->
+    <!--    </el-card>-->
+    <el-row>
+      <el-col style="width: 60%">
+        <el-card style="margin-top: 15px">
+          <el-table
+            v-loading="listLoading"
+            :data="tableData"
+            style="width: 100%"
+            stripe
+            size="mini"
+            height="460"
+            highlight-current-row
+            border
+            @row-click="searchProcedure">
+            <el-table-column align="center" label="组号" width="50px">
+              <template slot-scope="scope">
+                {{ scope.row.组号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="零件图号" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="零件名称" min-width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="零件数量">
+              <template slot-scope="scope">
+                {{ scope.row.投产数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="停产时间">
+              <template slot-scope="scope">
+                {{ scope.row.停产时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="停产原因">
+              <template slot-scope="scope">
+                {{ scope.row.停产原因 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="已完成工时">
+              <template slot-scope="scope">
+                {{ scope.row.加工工时 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px">
+            <el-pagination
+              :current-page="pageCurrent"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize"
+              :total="total"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col style="width: 40%">
+        <el-card style="margin-top: 15px">
+          <el-table
+            v-loading="listLoading1"
+            :data="tableData1"
+            style="width: 100%;"
+            stripe
+            size="mini"
+            height="500px"
+            highlight-current-row
+            border>
+            <el-table-column align="center" label="工序" width="50">
+              <template slot-scope="scope">
+                {{ scope.row.工序顺序 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="工艺名称" min-width="70">
+              <template slot-scope="scope">
+                {{ scope.row.工艺名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="工艺要求" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.工艺要求 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="单件定额" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.单件定额工时 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="准结定额" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.准结定额工时 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="工序进度" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.工序状态 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="完成工时" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.工序工时 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -211,7 +216,7 @@ export default {
       pageSize: 10,
       total: 0,
       pageCurrent1: 1,
-      pageSize1: 10,
+      pageSize1: 1000000,
       total1: 0,
       list: [],
       check3: '',

src/views/ManufacturingCenter/InventoryQuery/index.vue

@@ -3,9 +3,9 @@
     <el-card>
       <div slot="header">
         <el-row style="margin-bottom:-10px!important;">
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px; width: 120px;"/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>
+          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
+          <!--          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
+          <!--          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
           <el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">
             <el-option
               v-for="item in inventoryName"
@@ -20,17 +20,17 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchMaterial()">查询</el-button>
+          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
           <!--          <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
         </el-row>
       </div>
-      <el-table :data="tableData1" stripe highlight-current-row border height="550px" style="width: 710px" size="mini">
+      <el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 790px" size="mini">
         <el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" prop="物料型号" align="center" width="180" show-overflow-tooltip>
+        <el-table-column label="图号或型号" prop="物料型号" align="center" width="240" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
@@ -55,7 +55,7 @@
             {{ scope.row.货位名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="货位存量" align="center" width="80" prop="货位存量">
+        <el-table-column label="货位存量" align="center" width="100" prop="货位存量">
           <template slot-scope="scope">
             <template v-if="scope.row.changeValue">
               <el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>
@@ -186,7 +186,7 @@ export default {
       locateName: [],
       tableData1: [],
       pageCurrent: 1,
-      pageSize: 20,
+      pageSize: 30,
       total: 0,
       dialogVisible: false,
       tableData01: [],

src/views/ManufacturingCenter/ProcessPlanningNew/index.vue

@@ -1653,9 +1653,16 @@ export default {
     }
   }
   .gongyizhiding {
+    .el-tree-node{
+      overflow: hidden;
+      font-weight:  bolder;
+      color: black;
+    }
     .el-tree-node>.el-tree-node__children {
       overflow: hidden;
       background-color: #d8e5f6;
+      font-weight:  bolder;
+      color: black;
     }
   }
 </style>

src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue

@@ -3,8 +3,7 @@
     <el-card>
       <div style="margin-top: -10px;">
         <el-row>
-          <span>机床号:</span>
-          <el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
+          <el-select v-model="toolNumValue" filterable clearable size="small" style="margin: 0px 10px;width: 150px" placeholder="机床号" @change="typeChange1()">
             <el-option
               v-for="item in toolNum"
               :key="item.value"
@@ -14,43 +13,39 @@
               <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
             </el-option>
           </el-select>
-          <span>分组:</span>
-          <el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
+          <el-select v-model="NumValue" size="small" style="margin: 0px 10px;width: 90px" filterable clearable placeholder="组号">
             <el-option
               v-for="item in Num"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <span>零件图号:</span>
-          <el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 200px;"/>
+          <el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 150px;margin: 0px 10px;"/>
           <el-button v-if="是否扫描 === false" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total = 0;pageList = 1;getTable()">查询</el-button>
           <el-button v-if="是否扫描 === true" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total5 = 0;pageList5 = 1;getTable5()">查询</el-button>
           <el-checkbox v-if="false" v-model="是否扫描">是否扫描查询</el-checkbox>
+          <el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" style="margin-left:200px" placement="top">
+            <el-button size="small" type="primary" @click="PartPlan()">零件计划变更</el-button>
+          </el-tooltip>
+          <el-date-picker
+            v-model="startTime"
+            size="small"
+            type="date"
+            value-format="yyyy-MM-dd"
+            style="width: 140px;margin: 0px 10px"
+            placeholder="开始日期"/>
+          <el-date-picker
+            v-model="endTime"
+            size="small"
+            type="date"
+            value-format="yyyy-MM-dd"
+            style="width: 140px;margin: 0px 10px"
+            placeholder="结束日期"/>
+          <el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
         </el-row>
       </div>
     </el-card>
     <el-card>
-      <span class="demonstration">开始日期: </span>
-      <el-date-picker
-        v-model="startTime"
-        size="small"
-        type="date"
-        value-format="yyyy-MM-dd"
-        style="top: 1px;"
-        placeholder="选择开始日期"/>
-      <span class="demonstration">结束日期: </span>
-      <el-date-picker
-        v-model="endTime"
-        size="small"
-        type="date"
-        value-format="yyyy-MM-dd"
-        style="top: 1px;"
-        placeholder="选择开始日期"/>
-      <el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" placement="top">
-        <el-button size="small" type="primary" @click="PartPlan()">零件计划变更</el-button>
-      </el-tooltip>
-      <el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
       <el-table
         v-loading="listLoading"
         :data="tableData"
@@ -1512,10 +1507,10 @@ export default {
             }
           }
         } else {
-          this.$message.error('请输入结束时间')
+          this.$message.error('请输入结束日期')
         }
       } else {
-        this.$message.error('请输入开始时间')
+        this.$message.error('请输入开始日期')
       }
     },
     // 导出

src/views/MarketingCenter/BidBond/index.vue

@@ -3,28 +3,28 @@
     <!--顶栏结构-->
     <el-card>
       <el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入招标企业"/>
-      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">
-        <el-option
-          v-for="item in TypeOfGoldDeposit"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择投标人" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
-      <el-date-picker
-        v-model="startTime"
-        style="width: 150px;margin: 3px 0"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择开始日期"/>
-      <el-date-picker
-        v-model="endTime"
-        style="width: 150px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择结束日期"/>
+      <!--      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">-->
+      <!--        <el-option-->
+      <!--          v-for="item in TypeOfGoldDeposit"-->
+      <!--          :key="item.value"-->
+      <!--          :label="item.label"-->
+      <!--          :value="item.value"/>-->
+      <!--      </el-select>-->
+      <!--      <el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择投标人" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>-->
+      <!--      <el-date-picker-->
+      <!--        v-model="startTime"-->
+      <!--        style="width: 150px;margin: 3px 0"-->
+      <!--        value-format="yyyy-MM-dd"-->
+      <!--        size="small"-->
+      <!--        type="date"-->
+      <!--        placeholder="请选择开始日期"/>-->
+      <!--      <el-date-picker-->
+      <!--        v-model="endTime"-->
+      <!--        style="width: 150px;"-->
+      <!--        value-format="yyyy-MM-dd"-->
+      <!--        size="small"-->
+      <!--        type="date"-->
+      <!--        placeholder="请选择结束日期"/>-->
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
       <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
     </el-card>
@@ -70,22 +70,22 @@
         </el-table-column>
         <el-table-column align="center" label="保证金金额" width="100">
           <template slot-scope="scope">
-            <el-tag style="width: 80px" size="mini">{{ scope.row.保证金金额 }}</el-tag>
+            <el-tag style="width: 80px" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="中标服务费" width="100">
           <template slot-scope="scope">
-            {{ scope.row.中标服务费 }}
+            {{ Number(scope.row.中标服务费).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="转履约保证金金额" width="140">
           <template slot-scope="scope">
-            {{ scope.row.转履约保证金金额 }}
+            {{ Number(scope.row.转履约保证金金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="应收回金额" width="100">
           <template slot-scope="scope">
-            {{ scope.row.应收回金额 }}
+            {{ Number(scope.row.应收回金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="实收回金额" width="100">
@@ -254,7 +254,7 @@
     </el-dialog>
 
     <!--投标保证金对话框-->
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="80%">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="750px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">

src/views/MarketingCenter/ContractCapitalManagement/index.vue

@@ -9,10 +9,18 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span style="margin-left: 10px">营销经理：</span>
-      <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>
+      <!--      <span style="margin-left: 10px">营销经理：</span>-->
+      <!--      <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>-->
+      <span>客户名称：</span>
+      <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px " size="small" clearable>
+        <el-option
+          v-for="item in customerNames"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>
+      <!--      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>-->
       <el-badge :value="value" :max="99" class="item">
         <el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>
       </el-badge>
@@ -62,9 +70,9 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已完成进度" width="90">
+        <el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.执行进度名 }}
+            {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="付款方式" width="80">
@@ -72,59 +80,59 @@
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同总金额（万元）" width="130">
+        <el-table-column align="center" label="合同总额（万元）" width="130">
           <template slot-scope="scope">
-            {{ scope.row.合同总金额 }}
+            {{ Number(scope.row.合同总金额).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已到账金额（万元）" width="130">
-          <template slot-scope="scope">
-            {{ scope.row.已支付 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="未到账金额（万元）" width="130">
-          <template slot-scope="scope">
-            <el-tag size="mini" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="付款进度" width="150">
-          <template slot-scope="scope">
-            <div style="width: 130px">
-              <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="营销经理" prop="姓名" width="100">
+        <el-table-column align="center" label="销售经理" prop="姓名" width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.客户名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="联系人" width="60">
-          <template slot-scope="scope">
-            {{ scope.row.联系人 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.电话 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.银行账号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="税号" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.税号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="110">
+        <!--        <el-table-column align="center" label="已完成进度" width="90">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.执行进度名 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="已到账金额（万元）" width="130">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ Number(scope.row.已支付).toFixed(2) }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="未到账金额（万元）" width="130">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag size="mini" style="width: 100px" type="warning">{{ Number(scope.row.未支付金额).toFixed(2) }}</el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="付款进度" width="150">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <div style="width: 130px">-->
+        <!--              <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />-->
+        <!--            </div>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系人" width="60">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.联系人 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.电话 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.银行账号 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="税号" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.税号 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="操作" align="center" width="60">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
@@ -136,16 +144,16 @@
                   @click.stop="EditTableData(scope.row)"/>
               </div>
             </el-tooltip>
-            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
-              <div style="display: inline-block">
-                <el-button
-                  style="margin-left: 20px"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click.stop="dellist(scope.row)"/>
-              </div>
-            </el-tooltip>
+            <!--            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">-->
+            <!--              <div style="display: inline-block">-->
+            <!--                <el-button-->
+            <!--                  style="margin-left: 20px"-->
+            <!--                  size="mini"-->
+            <!--                  type="text"-->
+            <!--                  icon="el-icon-delete"-->
+            <!--                  @click.stop="dellist(scope.row)"/>-->
+            <!--              </div>-->
+            <!--            </el-tooltip>-->
           </template>
         </el-table-column>
       </el-table>
@@ -233,16 +241,6 @@
             {{ scope.row.已收金额 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="未收金额（万元）" width="118px">
-          <template slot-scope="scope">
-            <el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="转下阶段收款金额" width="120px">
-          <template slot-scope="scope">
-            {{ scope.row.转下阶段金额 }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="收款阶段" width="169px">
           <template slot-scope="scope">
             <el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)">
@@ -254,38 +252,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="截止时间" width="156px">
-          <template slot-scope="scope">
-            <span>后</span>
-            <el-input v-model="scope.row.提前x天提醒" size="mini" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
-            <span>天内完成</span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="状态" >
-          <template slot-scope="scope">
-            <el-popover
-              placement="top-start"
-              title="收款计划"
-              width="200"
-              trigger="hover">
-              <div v-show="(scope.row.计划付款时间 === '' || scope.row.计划付款时间 === null) && parseInt(scope.row.未收金额)!==0 " style="text-align: center">
-                <h4>{{ scope.row.执行进度名 }} 未完成</h4>
-              </div>
-              <div v-show="scope.row.计划付款时间 !== '' && scope.row.计划付款时间 !== null && parseInt(scope.row.未收金额)!==0">
-                <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>
-              </div>
-              <div v-show="parseInt(scope.row.未收金额)=== 0 " style="text-align: center">
-                <h4>{{ scope.row.执行进度名 }}阶段收款已完成</h4>
-              </div>
-              <el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>
-              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>
-              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='未开始'" slot="reference" type="primary" size="small" style="width: 66px">未开始</el-tag>
-              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='即将拖期'" slot="reference" type="warning" size="small" style="width: 66px">即将拖期</el-tag>
-              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag>
-            </el-popover>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="110">
+        <el-table-column label="操作" align="center" width="110">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="收款" placement="top">
               <div style="display: inline-block">
@@ -310,6 +277,47 @@
             </el-tooltip>
           </template>
         </el-table-column>
+        <!--        <el-table-column align="center" label="未收金额（万元）" width="118px">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="转下阶段收款金额" width="120px">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.转下阶段金额 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="截止时间" width="156px">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>后</span>-->
+        <!--            <el-input v-model="scope.row.提前x天提醒" size="mini" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>-->
+        <!--            <span>天内完成</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="状态" >-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-popover-->
+        <!--              placement="top-start"-->
+        <!--              title="收款计划"-->
+        <!--              width="200"-->
+        <!--              trigger="hover">-->
+        <!--              <div v-show="(scope.row.计划付款时间 === '' || scope.row.计划付款时间 === null) && parseInt(scope.row.未收金额)!==0 " style="text-align: center">-->
+        <!--                <h4>{{ scope.row.执行进度名 }} 未完成</h4>-->
+        <!--              </div>-->
+        <!--              <div v-show="scope.row.计划付款时间 !== '' && scope.row.计划付款时间 !== null && parseInt(scope.row.未收金额)!==0">-->
+        <!--                <h4>{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划截止还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天</h4>-->
+        <!--              </div>-->
+        <!--              <div v-show="parseInt(scope.row.未收金额)=== 0 " style="text-align: center">-->
+        <!--                <h4>{{ scope.row.执行进度名 }}阶段收款已完成</h4>-->
+        <!--              </div>-->
+        <!--              <el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>-->
+        <!--              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag>-->
+        <!--              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='未开始'" slot="reference" type="primary" size="small" style="width: 66px">未开始</el-tag>-->
+        <!--              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='即将拖期'" slot="reference" type="warning" size="small" style="width: 66px">即将拖期</el-tag>-->
+        <!--              <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag>-->
+        <!--            </el-popover>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
     </el-card>
     <!--新增合同资金对话框-->
@@ -540,7 +548,7 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { never, executionProgressID, searchProjectNumber2, SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
+import { getcustomername, never, executionProgressID, searchProjectNumber2, SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
 
 export default {
   components: {
@@ -555,6 +563,8 @@ export default {
       }
     }
     return {
+      customerNames: [],
+      customerName: '',
       pickerOptions: {},
       timetime: '',
       name: '',
@@ -674,6 +684,7 @@ export default {
   created() {
     this.getTableData()
     this.init()
+    this.getCustomerName()
   },
   methods: {
     searchName() { // 模糊查询姓名
@@ -941,9 +952,22 @@ export default {
       this.form.AlreadyPaid = row.未支付金额
       this.maxMoney = parseFloat(row.未支付金额)
     },
+    getCustomerName() {
+      this.customerName = ''
+      this.customerNames = []
+      getcustomername().then(response => {
+        console.log(response, 121212)
+        for (let i = 0; i < response.data.length; i++) {
+          this.customerNames.push({
+            value: response.data[i].客户名称,
+            label: response.data[i].客户名称
+          })
+        }
+      })
+    },
     getTableData() {
       this.listLoading = true
-      searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid).then(response => {
+      searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.customerName).then(response => {
         this.listLoading = false
         const data = response.data.rows
         for (let i = 0; i < data.length; i++) {

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -1,30 +1,32 @@
 <template>
   <div class="app-container">
-    <el-card style="background: rgb(233,240,250)">
+    <el-card>
+      <!--      style="background: rgb(233,240,250)"-->
       <div>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px;">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin: 3px 10px;">
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
-        <el-date-picker
-          v-model="startTime"
-          style="width: 150px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择开始日期"/>
-        <el-date-picker
-          v-model="endTime"
-          style="width: 150px;margin-bottom: 3px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择结束日期"/>
+        <!--        <el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>-->
+        <el-input v-model="customerName1" clearable size="small" style="width:150px;margin: 0px 10px" placeholder="请输入客户名称"/>
+        <!--        <el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="startTime"-->
+        <!--          style="width: 150px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择开始日期"/>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="endTime"-->
+        <!--          style="width: 150px;margin-bottom: 3px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择结束日期"/>-->
         <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
         <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
       </div>
@@ -117,63 +119,68 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="付款方式" width="70">
+        <el-table-column align="center" label="合同总额" prop="合同总额" width="140" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ Number(scope.row.合同总金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="付款方式" width="80">
           <template slot-scope="scope">
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同签订日期" width="100">
+        <el-table-column align="center" label="签订日期" width="100">
           <template slot-scope="scope">
             {{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="图纸会签节点" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.图纸会签节点&&scope.row.图纸会签节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="设备预验收节点" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.设备预验收节点&&scope.row.设备预验收节点!=='1900/1/1' ? scope.row.设备预验收节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="发货节点" width="85">
-          <template slot-scope="scope">
-            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="安装调试节点" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="销售经理" width="85">
           <template slot-scope="scope">
             {{ scope.row.营销经理 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>
+        <!--        <el-table-column align="center" label="会签节点" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.图纸会签节点&&scope.row.图纸会签节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="预验收节点" width="110">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.设备预验收节点&&scope.row.设备预验收节点!=='1900/1/1' ? scope.row.设备预验收节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column align="center" label="发货节点" width="85">
           <template slot-scope="scope">
-            {{ scope.row.联系人 }}
+            {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.电话 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同信息备注" >
+        <!--        <el-table-column align="center" label="安装调试节点" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.联系人 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.电话 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column align="center" label="合同备注" width="120">
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="150">
+        <el-table-column label="操作" align="center" width="170">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
               icon="el-icon-circle-plus-outline"
-              @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
+              @click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
@@ -209,37 +216,37 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-    <el-card v-show="ExecutionProgressShow">
-      <div>
-        <h4 style="display: inline-block;margin: 3px;">项目进度</h4>
-        <div style="display: inline-block; float:right">
-          <span>已完成进度：</span>
-          <el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">
-            <el-option
-              v-for="item in executionProgress"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-              :disabled ="item.disabled"/>
-          </el-select>
-        </div>
-      </div>
-      <div>
-        <el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">
-          <el-step :description="time1" title="签订合同" icon="el-icon-edit-outline"/>
-          <el-step :description="time2" title="图纸会签" icon="el-icon-picture-outline"/>
-          <el-step :description="time3" title="加工制造" icon="el-icon-setting"/>
-          <el-step :description="time4" title="预备验收" icon="el-icon-view"/>
-          <el-step :description="time5" title="设备发货" icon="el-icon-sold-out"/>
-          <el-step :description="time6" title="安装调试" icon="el-icon-time"/>
-          <el-step :description="time7" title="项目终验收" icon="el-icon-circle-check-outline"/>
-          <el-step :description="time8" title="质保阶段" icon="el-icon-service"/>
-        </el-steps>
-      </div>
-    </el-card>
+    <!--    <el-card v-show="ExecutionProgressShow">-->
+    <!--      <div>-->
+    <!--        <h4 style="display: inline-block;margin: 3px;">项目进度</h4>-->
+    <!--        <div style="display: inline-block; float:right">-->
+    <!--          <span>已完成进度：</span>-->
+    <!--          <el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">-->
+    <!--            <el-option-->
+    <!--              v-for="item in executionProgress"-->
+    <!--              :key="item.value"-->
+    <!--              :label="item.label"-->
+    <!--              :value="item.value"-->
+    <!--              :disabled ="item.disabled"/>-->
+    <!--          </el-select>-->
+    <!--        </div>-->
+    <!--      </div>-->
+    <!--      <div>-->
+    <!--        <el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">-->
+    <!--          <el-step :description="time1" title="签订合同" icon="el-icon-edit-outline"/>-->
+    <!--          <el-step :description="time2" title="图纸会签" icon="el-icon-picture-outline"/>-->
+    <!--          <el-step :description="time3" title="加工制造" icon="el-icon-setting"/>-->
+    <!--          <el-step :description="time4" title="预备验收" icon="el-icon-view"/>-->
+    <!--          <el-step :description="time5" title="设备发货" icon="el-icon-sold-out"/>-->
+    <!--          <el-step :description="time6" title="安装调试" icon="el-icon-time"/>-->
+    <!--          <el-step :description="time7" title="项目终验收" icon="el-icon-circle-check-outline"/>-->
+    <!--          <el-step :description="time8" title="质保阶段" icon="el-icon-service"/>-->
+    <!--        </el-steps>-->
+    <!--      </div>-->
+    <!--    </el-card>-->
     <el-card v-show="uploader" style="min-height: 145px;">
       <h4 style="margin: 3px;">纪要文件</h4>
-      <div style="float: right;">
+      <div style="float: left;">
         <el-upload
           :action="action"
           :on-success="uploadSuccess"
@@ -282,7 +289,12 @@
               <el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col v-show="isTrue" :span="12">
+            <el-form-item label="合同总额" prop="contractAmount">
+              <el-input v-model="form.contractAmount" clearable size="small" style="width:200px" placeholder="请输入合同金额"/>
+            </el-form-item>
+          </el-col>
+          <el-col v-show="false" :span="12" >
             <el-form-item label="已完成进度" prop="executionProgressID">
               <el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 200px">
                 <el-option
@@ -569,6 +581,9 @@ export default {
   },
   data() {
     return {
+      isTrue: true,
+      customerName1: '',
+      customerName1_check: '',
       machineDATA: '',
       name: '',
       a: 1,
@@ -656,7 +671,8 @@ export default {
         customerName: '', // 客户名称
         remark: '',
         付款方式: 1,
-        bidding: ''
+        bidding: '',
+        contractAmount: '' // 合同总额
       },
       tableDataBidding: [],
       executionProgressID: '',
@@ -679,7 +695,8 @@ export default {
         MarketingManagerValue: [{ required: true, message: '请选择营销经理', trigger: 'change' }],
         executionProgressID: [{ required: true, message: '请选择已完成进度', trigger: 'change' }],
         contractSigningDate: [{ required: true, message: '请选择合同签订日期', trigger: 'change' }],
-        付款方式: [{ required: true, message: '请选择付款方式', trigger: 'change' }]
+        付款方式: [{ required: true, message: '请选择付款方式', trigger: 'change' }],
+        contractAmount: [{ required: true, message: '请输入合同总额', trigger: 'blur' }]
       },
       rules1: { // 表单验证规则
         设备型号: [{ required: true, message: '请输入设备型号', trigger: 'blur' }],
@@ -748,6 +765,7 @@ export default {
       this.peoplename = ''
     },
     fetchTableData1() {
+      if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }
       if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
@@ -757,7 +775,7 @@ export default {
       this.uploader = false
       this.ExecutionProgress = null
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading'])
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
     },
     fetchExecutionProgressdata(row) {
       this.projectNum = row.项目流水号
@@ -918,9 +936,10 @@ export default {
       this.disabled = false
       this.biddingNumber = ''
       this.tableDataBidding = []
+      this.isTrue = true
     },
     addTableData1() {
-      addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {
+      addList(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber, this.form.contractAmount).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')
@@ -975,6 +994,7 @@ export default {
       this.form.bidding = row.招标企业
       this.disabled = true
       this.temp = 2
+      this.isTrue = false
     },
     chaEdit() {
       editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {

src/views/MarketingCenter/CreateProject/index.vue

@@ -2,145 +2,147 @@
   <div>
     <el-card>
       <div>
-        <span>项目名称：</span>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin-top: 3px">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin: 3px 10px">
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span style="margin-left: 10px">机床型号：</span>
-        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
-      </div>
-      <div style="margin-top: 10px">
-        <span style="margin-left: 0px">开始日期：</span>
-        <el-date-picker
-          v-model="startTime"
-          style="width: 200px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择开始日期"/>
-        <span style="margin-left: 10px">结束日期：</span>
-        <el-date-picker
-          v-model="endTime"
-          style="width: 200px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择结束日期"/>
+        <el-input v-model="contractNumber" clearable size="small" style="width:200px;margin: 3px 10px" placeholder="请输入合同编号"/>
+        <!--        <span style="margin-left: 10px">机床型号：</span>-->
+        <!--        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>-->
+        <!--      </div>-->
+        <!--      <div style="margin-top: 10px">-->
+        <!--        <span style="margin-left: 0px">开始日期：</span>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="startTime"-->
+        <!--          style="width: 200px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择开始日期"/>-->
+        <!--        <span style="margin-left: 10px">结束日期：</span>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="endTime"-->
+        <!--          style="width: 200px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择结束日期"/>-->
         <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
           <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
         </el-tooltip>
       </div>
     </el-card>
-    <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData1"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        style="width: 100%"
-        height="500"
-        border
-        stripe
-        size="mini"
-        @expand-change="selectMachine">
-        <el-table-column type="expand" label="详情">
-          <template slot-scope="scope">
-            <el-table :data="tableData2" class="subTableHeader" border stripe style="width: 612px; text-align: center" size="mini">
-              <el-table-column label="设备型号" align="center" width="150">
-                <template slot-scope="scope">
-                  {{ scope.row.机床图号 }}
+    <el-row>
+      <el-col style="width: 56%">
+        <el-card>
+          <el-table
+            v-loading="listLoading"
+            :data="tableData1"
+            :row-key="getRowKeys"
+            :expand-row-keys="expands"
+            style="width: 100%"
+            height="500"
+            border
+            stripe
+            size="mini"
+            @row-click="selectMachine">
+            <el-table-column align="center" label="合同编号" prop="合同编号" width="120">
+              <template slot-scope="scope">
+                <template>
+                  {{ scope.row.合同编号 }}
                 </template>
-              </el-table-column>
-              <el-table-column label="设备名称" align="center" width="160">
-                <template slot-scope="scope">
-                  {{ scope.row.机床名称 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="机床数量" align="center" width="100">
-                <template slot-scope="scope">
-                  {{ scope.row.机床数量 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" width="200" align="center">
-                <template slot-scope="scope">
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="项目名称" prop="项目名称" width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.项目名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.合同签订日期 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="合同信息备注" min-width="150">
+              <template slot-scope="scope">
+                {{ scope.row.合同信息备注 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="160">
+              <template slot-scope="scope">
+                <el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">
                   <el-button
                     size="mini"
-                    type="text"
-                    icon="el-icon-edit"
-                    @click="editMachine(scope.row);flag = 2">编辑</el-button>
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-delete"
-                    @click="deleteMachine(scope.row)">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同编号" prop="合同编号" width="150">
-          <template slot-scope="scope">
-            <template>
-              <el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
-            </template>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="项目名称" prop="项目名称" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.合同签订日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同信息备注" min-width="200">
-          <template slot-scope="scope">
-            {{ scope.row.合同信息备注 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="350">
-          <template slot-scope="scope">
-            <el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">
-              <el-button
-                size="mini"
-                type="warning"
-                plain
-                icon="el-icon-plus"
-                @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
-            </el-tooltip>
-            <el-button
-              size="mini"
-              plain
-              type="primary"
-              icon="el-icon-edit"
-              @click.stop="handleEdit(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              @click.stop="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="PageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="PageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
+                    type="warning"
+                    plain
+                    icon="el-icon-plus"
+                    @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
+                </el-tooltip>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click.stop="handleEdit(scope.row)"/>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click.stop="handleDelete(scope.row)"/>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="PageCurrent"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="PageSize"
+              :total="total"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col style="width: 43%">
+        <el-card>
+          <el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">
+            <el-table-column label="设备型号" align="center" width="120">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="设备名称" align="center" min-width="160">
+              <template slot-scope="scope">
+                {{ scope.row.机床名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="机床数量" align="center" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.机床数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="140" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="editMachine(scope.row);flag = 2">编辑</el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="deleteMachine(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
     <!--新增合同信息对话框-->
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
@@ -212,6 +214,8 @@ export default {
   },
   data() {
     return {
+      contractNumber_check: '',
+      contractNumber: '', // 合同编号
       entryName: [],
       entryNameValue: '',
       machine: '',
@@ -278,12 +282,13 @@ export default {
       this.fetchTableData1()
     },
     fetchTableData1() {
+      if (this.contractNumber === '' || this.contractNumber === null) { this.contractNumber_check = 0 } else { this.contractNumber_check = 1 }
       if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
       if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
       this.listLoading = true
-      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading'])
+      this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.contractNumber_check, this.contractNumber], ['tableData1', 'total', 'listLoading'])
     },
     selectMachine(row) {
       this.projectNum = row.项目流水号

src/views/MarketingCenter/DeliveryApplication/index.vue

@@ -1122,7 +1122,6 @@ export default {
       this.dialogFormVisible = false
     },
     submit() {
-      this.dialogFormVisible = false
       for (let i = 0; i < this.array.length; i++) {
         this.tableData.push({
           货品名称: this.array[i].货品名称 ? this.array[i].货品名称 : '—' || '—',

src/views/MarketingCenter/InvoiceRecord/index.vue

@@ -10,22 +10,28 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
-        <el-date-picker
-          v-model="startTime"
-          style="margin-right: 5px;width: 150px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择开始日期"/>
-        <el-date-picker
-          v-model="endTime"
-          style="width: 150px;"
-          value-format="yyyy-MM-dd"
-          size="small"
-          type="date"
-          placeholder="请选择结束日期"/>
+        <el-input v-model="customerName" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请输入客户名称" @dblclick.native="openName" @clear="clearPeople()"/>
+        <!--        <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="startTime"-->
+        <!--          style="margin-right: 5px;width: 150px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择开始日期"/>-->
+        <!--        <el-date-picker-->
+        <!--          v-model="endTime"-->
+        <!--          style="width: 150px;"-->
+        <!--          value-format="yyyy-MM-dd"-->
+        <!--          size="small"-->
+        <!--          type="date"-->
+        <!--          placeholder="请选择结束日期"/>-->
         <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
+        <el-button
+          size="mini"
+          type="primary"
+          icon="el-icon-circle-plus-outline"
+          @click.stop="openAddInvoiceRecordingDialog(); flag = 1">新增记录</el-button>
       </el-row>
     </el-card>
     <!--项目表格-->
@@ -55,45 +61,50 @@
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同签订日期" width="100">
+        <el-table-column align="center" label="客户名称" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.合同签订日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="销售经理" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
+            {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="合同总金额（含税）" width="130">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag>
-            <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ scope.row.合同总金额 }} </el-tag>
+            <el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</el-tag>
+            <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.合同总金额).toFixed(2) }} </el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="已到账金额" width="120">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag>
-            <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ scope.row.已支付 }} </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="税率" width="100">
-          <template slot-scope="scope">
-            <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
+            <el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</el-tag>
+            <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.已支付).toFixed(2) }} </el-tag>
           </template>
         </el-table-column>
+        <!--        <el-table-column align="center" label="税率" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="130px">
+        <el-table-column align="center" label="合同签订日期" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.合同签订日期 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="销售经理" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="开票详情" fixed="right" align="center" width="130px">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
               icon="el-icon-circle-plus-outline"
-              @click.stop="openAddInvoiceRecordingDialog(scope.row); flag = 1">新增记录</el-button>
+              @click.stop="opendialogFormVisibleRecordDialog(scope.row)">开票详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -110,7 +121,96 @@
       </div>
     </el-card>
     <!--开票记录-->
-    <el-card>
+    <!--    <el-card>-->
+    <!--      <el-table-->
+    <!--        v-loading="listLoading2"-->
+    <!--        :data="tableData2"-->
+    <!--        :summary-method="getSummaries"-->
+    <!--        show-summary-->
+    <!--        style="width: 40%;margin-top: 3px"-->
+    <!--        height="300"-->
+    <!--        highlight-current-row-->
+    <!--        border-->
+    <!--        stripe-->
+    <!--        size="mini">-->
+    <!--        <el-table-column-->
+    <!--          align="center"-->
+    <!--          label="序号"-->
+    <!--          type="index"-->
+    <!--          width="50"/>-->
+    <!--        <el-table-column align="center" label="发票抬头" width="200" show-overflow-tooltip>-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.客户名称 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="纳税人识别号" width="180">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.税号 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="开票电话" width="120">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.传真 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="开票地址" width="200">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.地址 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="开户行" width="120">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.开户行 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="银行账号" width="160">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.银行账号 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="开票金额（含税）" width="120">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ Number(scope.row.开票金额).toFixed(2) }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="开票时间" width="100">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.开票时间 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column align="center" label="备注">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            {{ scope.row.备注 }}-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--        <el-table-column label="操作" align="center" width="130">-->
+    <!--          <template slot-scope="scope">-->
+    <!--            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">-->
+    <!--              <div style="display: inline-block">-->
+    <!--                <el-button-->
+    <!--                  size="mini"-->
+    <!--                  type="text"-->
+    <!--                  icon="el-icon-edit-outline"-->
+    <!--                  @click.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2"/>-->
+    <!--              </div>-->
+    <!--            </el-tooltip>-->
+    <!--            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">-->
+    <!--              <div style="display: inline-block">-->
+    <!--                <el-button-->
+    <!--                  size="mini"-->
+    <!--                  type="text"-->
+    <!--                  style="margin-left: 20px"-->
+    <!--                  icon="el-icon-delete"-->
+    <!--                  @click.stop="delInvoiceRecordingDialog(scope.row)"/>-->
+    <!--              </div>-->
+    <!--            </el-tooltip>-->
+    <!--          </template>-->
+    <!--        </el-table-column>-->
+    <!--      </el-table>-->
+    <!--    </el-card>-->
+
+    <!--    开票详情-->
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleRecord" title="开票详情" center width="800px">
       <el-table
         v-loading="listLoading2"
         :data="tableData2"
@@ -132,34 +232,34 @@
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="纳税人识别号" width="180">
-          <template slot-scope="scope">
-            {{ scope.row.税号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="开票电话" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.传真 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="开票地址" width="200">
-          <template slot-scope="scope">
-            {{ scope.row.地址 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="开户行" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.开户行 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="银行账号" width="160">
-          <template slot-scope="scope">
-            {{ scope.row.银行账号 }}
-          </template>
-        </el-table-column>
+        <!--        <el-table-column align="center" label="纳税人识别号" width="180">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.税号 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="开票电话" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.传真 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="开票地址" width="200">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.地址 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="开户行" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.开户行 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="银行账号" width="160">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.银行账号 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column align="center" label="开票金额（含税）" width="120">
           <template slot-scope="scope">
-            {{ scope.row.开票金额 }}
+            {{ Number(scope.row.开票金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="开票时间" width="100">
@@ -172,7 +272,7 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="130">
+        <el-table-column label="操作" align="center" width="130">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
@@ -196,8 +296,7 @@
           </template>
         </el-table-column>
       </el-table>
-    </el-card>
-
+    </el-dialog>
     <!--营销经理选择-->
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
       <span>姓名：</span>
@@ -239,36 +338,36 @@
               <el-input v-model="form.客户名称" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clearCustomer()"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="发票抬头" prop="发票抬头">
-              <el-input v-model="form.发票抬头" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="税号" prop="税号">
-              <el-input v-model="form.税号" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开票电话" prop="开票电话">
-              <el-input v-model="form.开票电话" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开票地址" prop="开票地址">
-              <el-input v-model="form.开票地址" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开户行" prop="开户行">
-              <el-input v-model="form.开户行" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="银行账号" prop="银行账号">
-              <el-input v-model="form.银行账号" clearable size="small" style="width:200px" disabled/>
-            </el-form-item>
-          </el-col>
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="发票抬头" prop="发票抬头">-->
+          <!--              <el-input v-model="form.发票抬头" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="税号" prop="税号">-->
+          <!--              <el-input v-model="form.税号" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="开票电话" prop="开票电话">-->
+          <!--              <el-input v-model="form.开票电话" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="开票地址" prop="开票地址">-->
+          <!--              <el-input v-model="form.开票地址" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="开户行" prop="开户行">-->
+          <!--              <el-input v-model="form.开户行" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="银行账号" prop="银行账号">-->
+          <!--              <el-input v-model="form.银行账号" clearable size="small" style="width:200px" disabled/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="开票金额" prop="开票金额">
               <el-input v-model="form.开票金额" clearable size="small" placeholder="请输入开票金额" style="width:200px"/>
@@ -350,6 +449,7 @@ export default {
   },
   data() {
     return {
+      row1: [],
       pickerOptions: {},
       timetime: '',
       name: '',
@@ -381,6 +481,7 @@ export default {
       dataPeople: [], // 营销经理数组
       peoplename: '', // 营销经理姓名
       title: '', // 开票记录对话框标题
+      dialogFormVisibleRecord: false, // 开票详情对话框
       dialogFormVisible1: false, // 开票记录对话框显示隐藏
       dialogCustomerFormVisible: false, // 打开选择客户对话框
       flag: '', // 开票记录增加编辑旗帜变量
@@ -389,6 +490,8 @@ export default {
       loading1: false, // 客户信息表加载框
       CustomerCode: '',
       invoiceRecordingCode: '',
+      customerName: '',
+      customerName_check: '',
       form: {
         客户名称: '',
         发票抬头: '',
@@ -403,7 +506,7 @@ export default {
       },
       rules: {
         客户名称: [{ required: true, message: '请双击选择客户名称', trigger: 'change' }],
-        开票金额: [{ required: true, message: '请双击选择客户名称', trigger: 'blur' }],
+        开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
         开票时间: [{ required: true, message: '请双击选择客户名称', trigger: 'change' }]
       }
     }
@@ -413,6 +516,10 @@ export default {
     this.fetchTableData1()
   },
   methods: {
+    opendialogFormVisibleRecordDialog(row) {
+      this.dialogFormVisibleRecord = true
+      this.fetchTableData2(row)
+    },
     changeTime() {
       this.pickerOptions = Object.assign({}, this.pickerOptions, {
         disabledDate: (time) => {
@@ -440,12 +547,13 @@ export default {
     },
     // 查询项目信息表格
     fetchTableData1() {
+      if (this.customerName === '' || this.customerName === null) { this.customerName_check = 0 } else { this.customerName_check = 1 }
       if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
       if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
       if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
       if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
       this.listLoading1 = true
-      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
+      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName, this.customerName_check).then(response => {
         this.listLoading1 = false
         const data = response.data
         for (let i = 0; i < data.rows.length; i++) {
@@ -472,6 +580,7 @@ export default {
     },
     // 查询开票记录表格
     fetchTableData2(row) {
+      this.row1 = row
       this.taxRate = row.税率
       this.projectid = row.项目流水号
       searchTableData2(this.projectid).then(response => {
@@ -565,13 +674,20 @@ export default {
       this.peopleid = ''
     },
     // 打开增加开票记录对话框
-    openAddInvoiceRecordingDialog(row) {
-      this.projectid = row.项目流水号
-      this.timetime = row.合同签订日期
-      this.changeTime()
-      this.addForm('form')
-      this.title = '增加开票记录'
-      this.dialogFormVisible1 = true
+    openAddInvoiceRecordingDialog() {
+      if (this.row1.项目流水号 === undefined) {
+        this.$message.error('请先选择合同')
+      } else {
+        console.log(this.row1)
+        this.projectid = this.row1.项目流水号
+        this.timetime = this.row1.合同签订日期
+        this.changeTime()
+        this.addForm('form')
+        this.title = '增加开票记录'
+        this.dialogFormVisible1 = true
+        this.form.客户名称 = this.row1.客户名称
+        this.CustomerCode = this.row1.客户流水号
+      }
     },
     // 打开选择
     CustomerChange() {

src/views/MarketingCenter/MarginManagement/index.vue

@@ -0,0 +1,35 @@
+<template>
+  <div class="app-container">
+    <el-tabs id="PurchasingCenter/PurchaseTaskAllocate" v-model="tabName" type="border-card">
+      <el-tab-pane label="投标保证金" name="投标保证金">
+        <BidBond/>
+      </el-tab-pane>
+      <el-tab-pane label="履约保证金" name="履约保证金">
+        <PerformanceBond/>
+      </el-tab-pane>
+      <el-tab-pane label="安全保证金" name="安全保证金">
+        <SafetyMargin/>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import BidBond from '@/views/MarketingCenter/BidBond'
+import PerformanceBond from '@/views/MarketingCenter/PerformanceBond'
+import SafetyMargin from '@/views/MarketingCenter/SafetyMargin'
+export default {
+  components: {
+    BidBond, PerformanceBond, SafetyMargin
+  },
+  data() {
+    return {
+      tabName: '投标保证金'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/MarketingCenter/PerformanceBond/index.vue

@@ -9,22 +9,23 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span style="margin-left: 10px">开始日期：</span>
-      <el-date-picker
-        v-model="startTime"
-        style="width: 200px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择开始日期"/>
-      <span style="margin-left: 10px">结束日期：</span>
-      <el-date-picker
-        v-model="endTime"
-        style="width: 200px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择结束日期"/>
+      <el-input v-model="customerName" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入客户名称"/>
+      <!--      <span style="margin-left: 10px">开始日期：</span>-->
+      <!--      <el-date-picker-->
+      <!--        v-model="startTime"-->
+      <!--        style="width: 200px;"-->
+      <!--        value-format="yyyy-MM-dd"-->
+      <!--        size="small"-->
+      <!--        type="date"-->
+      <!--        placeholder="请选择开始日期"/>-->
+      <!--      <span style="margin-left: 10px">结束日期：</span>-->
+      <!--      <el-date-picker-->
+      <!--        v-model="endTime"-->
+      <!--        style="width: 200px;"-->
+      <!--        value-format="yyyy-MM-dd"-->
+      <!--        size="small"-->
+      <!--        type="date"-->
+      <!--        placeholder="请选择结束日期"/>-->
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
     </el-card>
 
@@ -84,7 +85,7 @@
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="210px">
+        <el-table-column label="操作" align="center" fixed="right" width="210px">
           <template slot-scope="scope">
             <el-button
               :disabled="scope.row.是否禁用增加履约保证金"
@@ -125,9 +126,9 @@
               border
               stripe
               size="mini">
-              <el-table-column align="center" label="履约保证金金额">
+              <el-table-column align="center" label="履约保证金金额" style="padding:0px">
                 <template slot-scope="scope">
-                  <el-tag type="primary" size="mini">{{ scope.row.履约保证金金额 }}</el-tag>
+                  <el-tag type="primary" size="mini">{{ Number(scope.row.履约保证金金额).toFixed(2) }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="保证金类型">
@@ -260,17 +261,17 @@
       </div>
     </el-dialog>
 
-    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="70%">
-      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm">
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="600px">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="105px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
             <el-form-item label="保证金金额" prop="保证金金额">
-              <el-input-number v-model="form2.保证金金额" :precision="2" :step="1" style="width: 200px" size="small"/>
+              <el-input-number v-model="form2.保证金金额" :precision="2" :step="1" style="width: 150px" size="small"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="保证金类型" prop="保证金类型">
-              <el-select v-model="form2.保证金类型" filterable placeholder="请选择保证金类型" style="width: 200px" size="small">
+              <el-select v-model="form2.保证金类型" filterable placeholder="请选择保证金类型" style="width: 150px" size="small">
                 <el-option
                   v-for="item in performanceBondType"
                   :key="item.value"
@@ -283,7 +284,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="收回条件" prop="收回条件">
-              <el-select v-model="form2.收回条件" filterable placeholder="请选择收回条件" style="width: 200px" size="small">
+              <el-select v-model="form2.收回条件" filterable placeholder="请选择收回条件" style="width: 150px" size="small">
                 <el-option
                   v-for="item in plannedTime"
                   :key="item.value"
@@ -294,7 +295,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="截止时间(天)" prop="截止时间">
-              <el-input-number v-model="form2.截止时间" placeholder="请输入截止时间" style="width: 200px" size="small"/>
+              <el-input-number v-model="form2.截止时间" placeholder="请输入截止时间" style="width: 150px" size="small"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -352,6 +353,8 @@ export default {
       dialogImageUrl: '',
       fileList: [],
       performanceGuaranteeShow: true,
+      customerName_check: '',
+      customerName: '', // 客户名称
       form: {
         实际收回日期: ''
       },
@@ -402,8 +405,13 @@ export default {
       } else {
         this.endTime_check = 1
       }
+      if (this.customerName === '' || this.customerName === null) {
+        this.customerName_check = 0
+      } else {
+        this.customerName_check = 1
+      }
       this.listLoading1 = true
-      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
+      searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName_check, this.customerName).then(response => {
         this.tableData2 = []
         this.listLoading1 = false
         const data = response.data

src/views/MarketingCenter/SafetyMargin/index.vue

@@ -10,22 +10,23 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span style="margin-left: 10px">开始日期：</span>
-      <el-date-picker
-        v-model="startTime"
-        style="width: 200px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择开始日期"/>
-      <span style="margin-left: 10px">结束日期：</span>
-      <el-date-picker
-        v-model="endTime"
-        style="width: 200px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择结束日期"/>
+      <el-input v-model="customerName" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入客户名称"/>
+      <!--      <span style="margin-left: 10px">开始日期：</span>-->
+      <!--      <el-date-picker-->
+      <!--        v-model="startTime"-->
+      <!--        style="width: 200px;"-->
+      <!--        value-format="yyyy-MM-dd"-->
+      <!--        size="small"-->
+      <!--        type="date"-->
+      <!--        placeholder="请选择开始日期"/>-->
+      <!--      <span style="margin-left: 10px">结束日期：</span>-->
+      <!--      <el-date-picker-->
+      <!--        v-model="endTime"-->
+      <!--        style="width: 200px;"-->
+      <!--        value-format="yyyy-MM-dd"-->
+      <!--        size="small"-->
+      <!--        type="date"-->
+      <!--        placeholder="请选择结束日期"/>-->
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSizeProject = 30;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
     </el-card>
 
@@ -127,7 +128,7 @@
         <!--</el-table-column>-->
         <el-table-column align="center" label="保证金金额" width="100">
           <template slot-scope="scope">
-            <el-tag type="primary" size="mini">{{ scope.row.保证金金额 }}</el-tag>
+            <el-tag type="primary" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="交付日期" width="120">
@@ -147,17 +148,17 @@
         </el-table-column>
         <el-table-column align="center" label="扣款金额" width="100">
           <template slot-scope="scope">
-            {{ scope.row.扣款金额 }}
+            {{ Number(scope.row.扣款金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column :label="AmountReceivable" align="center" width="120">
           <template slot-scope="scope">
-            {{ scope.row.应收回金额 }}
+            {{ Number(scope.row.应收回金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="实际收回金额" align="center" width="120">
           <template slot-scope="scope">
-            {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '0' : scope.row.应收回金额 }}
+            {{ scope.row.实际收回日期 === '' || scope.row.实际收回日期 === null ? '0' : Number(scope.row.应收回金额).toFixed(2) }}
           </template>
         </el-table-column>
         <!--<el-table-column align="center" label="计划收回日期" width="150">-->
@@ -270,12 +271,12 @@
     </el-card>
 
     <!--新增编辑保证金信息对话框-->
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
-      <el-form ref="form" :model="form" :rules="rules1" label-position="left" label-width="120px" class="demo-ruleForm">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="600px">
+      <el-form ref="form" :model="form" :rules="rules1" label-position="left" label-width="95px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
             <el-form-item label="保证金金额" prop="保证金金额">
-              <el-input-number v-model="form.保证金金额" :precision="2" :step="1" style="width: 200px" size="small"/>
+              <el-input-number v-model="form.保证金金额" :precision="2" :step="1" style="width: 150px" size="small"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -283,7 +284,7 @@
               <el-date-picker
                 v-model="form.交付日期"
                 :picker-options="pickerOptions"
-                style="width: 200px;"
+                style="width: 150px;"
                 value-format="yyyy-MM-dd"
                 size="small"
                 type="date"
@@ -305,7 +306,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="收回条件" prop="收回条件">
-              <el-select v-model="form.收回条件" filterable placeholder="请选择收回条件" style="width: 200px" size="small">
+              <el-select v-model="form.收回条件" filterable placeholder="请选择收回条件" style="width: 150px" size="small">
                 <el-option
                   v-for="item in plannedTime"
                   :key="item.value"
@@ -315,15 +316,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="截止时间（天）" prop="提前X天提醒我">
-              <el-input-number v-model="form.提前X天提醒我" placeholder="请输入截止时间" style="width: 200px" size="small"/>
+            <el-form-item label="截止时间" prop="提前X天提醒我">
+              <el-input-number v-model="form.提前X天提醒我" placeholder="请输入截止时间" style="width: 150px" size="small"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="备注" prop="备注">
-              <el-input v-model="form.备注" type="textarea" autosize size="small" placeholder="请输入备注" style="width:575px"/>
+              <el-input v-model="form.备注" type="textarea" autosize size="small" placeholder="请输入备注" style="width:400px"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -541,6 +542,8 @@ export default {
       }
     }
     return {
+      customerName: '',
+      customerName_check: '',
       pickerOptions: {},
       pickerOptions1: {},
       pickerOptions2: {},
@@ -693,8 +696,13 @@ export default {
       } else {
         this.endTime_check = 1
       }
+      if (this.customerName === '' || this.customerName === null) {
+        this.customerName_check = 0
+      } else {
+        this.customerName_check = 1
+      }
       this.listLoadingProject = true
-      searchTableDataProject(this.PageCurrentProject, this.PageSizeProject, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
+      searchTableDataProject(this.PageCurrentProject, this.PageSizeProject, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName_check, this.customerName).then(response => {
         this.tableData1 = []
         this.tableData2 = []
         this.listLoadingProject = false

src/views/MarketingCenter/ShippingInquiries/index.vue

@@ -0,0 +1,204 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-input v-model="invoiceNumber" placeholder="请输入发货单号" clearable style="width: 150px;margin-right: 10px" size="mini"/>
+      <el-input v-model="receivingUnit" placeholder="请输入收货单位" clearable style="width: 150px;margin-right: 10px" size="mini"/>
+      <el-button type="success" icon="el-icon-menu" size="mini" style="margin-left: 10px" @click="openSearch">查询</el-button>
+    </el-card>
+    <el-card>
+      <el-table
+        :data="tableDataSearchList"
+        style="width: 100%; max-height: 500px"
+        height="650"
+        border
+        stripe
+        size="mini"
+        highlight-current-row
+        @row-click="searchListItem">
+        <!--      <el-table-->
+        <!--        :data="tableDataSearchList"-->
+        <!--        highlight-current-row-->
+        <!--        style="width: 100%; max-height: 500px"-->
+        <!--        border-->
+        <!--        size="mini"-->
+        <!--        @row-click="searchListItem">-->
+        <el-table-column align="center" label="状态" width="60px">
+          <template slot-scope="scope">
+            {{ scope.row.是否发出.toString() === '1' ? '已发出' : '未发出' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发货单号" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.发货单编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发货单名">
+          <template slot-scope="scope">
+            {{ scope.row.发货单名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="收货单位" width="180px">
+          <template slot-scope="scope">
+            {{ scope.row.收货单位 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="收货地址" width="150px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.收货地址 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="收货人员" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.收货人员 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="联系电话">
+          <template slot-scope="scope">
+            {{ scope.row.联系电话 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="车辆牌号" width="140px">
+          <template slot-scope="scope">
+            {{ scope.row.车辆牌号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="司机姓名" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.司机姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="司机电话">
+          <template slot-scope="scope">
+            {{ scope.row.司机电话 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="制单人">
+          <template slot-scope="scope">
+            {{ scope.row.制单人 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="审核人">
+          <template slot-scope="scope">
+            {{ scope.row.审核人 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发货人">
+          <template slot-scope="scope">
+            {{ scope.row.发货人 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="制单时间" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="scope.row.操作日期 === null"/>
+            <span v-else>{{ scope.row.操作日期.substr(0,10) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="审核时间">
+          <template slot-scope="scope">
+            <span v-if="scope.row.审核日期 === null"/>
+            <span v-else>{{ scope.row.审核日期.substr(0,10) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="发货时间">
+          <template slot-scope="scope">
+            <span v-if="scope.row.发出时间 === null"/>
+            <span v-else>{{ scope.row.发出时间.substr(0,10) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-card>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData"
+        highlight-current-row
+        style="width: 100%"
+        height="560"
+        border
+        size="mini">
+        <el-table-column align="center" label="货品类别" width="80">
+          <template slot-scope="scope">
+            <el-tag effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="货品编号">
+          <template slot-scope="scope">
+            {{ scope.row.货品编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="货品名称">
+          <template slot-scope="scope">
+            {{ scope.row.货品名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="货品规格">
+          <template slot-scope="scope">
+            {{ scope.row.货品规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="货品型号">
+          <template slot-scope="scope">
+            {{ scope.row.货品型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="数量" width="130">
+          <template slot-scope="scope">
+            <template v-if="disabledPick === false">
+              <el-input-number v-model="scope.row.数量" :min="1" label="描述文字" size="mini" controls-position="right" style="width:100px" @change="handleChange"/>
+            </template>
+            <template v-else>
+              {{ scope.row.数量 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="设计者" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.设计者 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { InvoiceListSearch, DetailsFeach } from '@/api/MarketingCenter/ShippingInquiries'
+export default {
+  data() {
+    return {
+      tableDataSearchList: [],
+      invoiceNumber: '',
+      receivingUnit: '',
+      invoiceNumber_check: '',
+      receivingUnit_check: '',
+      listLoading: '',
+      tableData: []
+    }
+  },
+  created() {
+    this.openSearch()
+  },
+  methods: {
+    openSearch() {
+      this.tableDataSearchList = []
+      this.invoiceNumber !== null && this.invoiceNumber !== '' ? this.invoiceNumber_check = 1 : this.invoiceNumber_check = 0
+      this.receivingUnit !== null && this.receivingUnit !== '' ? this.receivingUnit_check = 1 : this.receivingUnit_check = 0
+      InvoiceListSearch(this.invoiceNumber, this.receivingUnit, this.invoiceNumber_check, this.receivingUnit_check).then(response => {
+        if (response.data.length !== 0) {
+          console.log(response)
+          this.tableDataSearchList = response.data
+        }
+      })
+    },
+    searchListItem(row) {
+      DetailsFeach(row.发货单流水号).then(response => {
+        this.tableData = response.data
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/PurchasingCenter/ArrivalStateSearch/index.vue

@@ -2,6 +2,8 @@
   <div class="app-container">
     <el-card>
       <div slot="header">
+        <span>供应商:</span>
+        <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
         <span>合同号:</span>
         <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
           <el-option
@@ -13,8 +15,6 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <span>供应商:</span>
-        <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
         <el-button
           type="success"
           size="small"

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -37,36 +37,35 @@
     <el-row id="PurchasingCenter/CreateInquirySheet">
       <el-col :span="24">
         <el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
-          <el-tab-pane label="外购件" name="外购件">
+          <el-tab-pane label="外购/标准件" name="外购件">
             <el-row style="margin-bottom: 10px">
-              <el-select v-model="projectValue" placeholder="项目名称" size="small" style="width:100px" filterable clearable @change="projectChange">
-                <el-option
-                  v-for="item in project"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-              <el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable @change="machineChange">
+              <!--<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width:100px" filterable clearable @change="projectChange">-->
+              <!--<el-option-->
+              <!--v-for="item in project"-->
+              <!--:key="item.value"-->
+              <!--:label="item.label"-->
+              <!--:value="item.value"/>-->
+              <!--</el-select>-->
+              <el-input v-model="materialName" placeholder="名称规格" size="small" style="width:120px" clearable @keyup.enter.native="materialStatusValue=[0];pageCurrent11=1;pageSize11=20;total11=0;searchTable11()"/>
+              <el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
                 <el-option
                   v-for="item in machine"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-              <el-select v-model="groupValue" placeholder="组号" style="width:100px" size="small" clearable filterable>
-                <el-option
-                  v-for="item in group"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>
-              <el-input v-model="materialName" placeholder="物料名称" size="small" style="width:120px" clearable/>
-              <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>
-              <el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949"/>
-            </el-row>
-            <el-row style="margin-bottom: 10px">
-              <!--              <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>-->
+              <!--<el-select v-model="groupValue" placeholder="组号" style="width:100px" size="small" clearable filterable>-->
+              <!--<el-option-->
+              <!--v-for="item in group"-->
+              <!--:key="item.value"-->
+              <!--:label="item.label"-->
+              <!--:value="item.value"/>-->
+              <!--</el-select>-->
+              <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
+              <!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>-->
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="materialStatusValue=[0];pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button>
+              <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
+              <el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949" style="margin-left: 50px"/>
               <el-date-picker
                 v-model="startTime"
                 size="small"
@@ -79,23 +78,29 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 @change="timeChange1()"/>
-              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button>
-              <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
-              <el-popover v-model="visible" title="调整采购任务" placement="top" width="180">
-                <div style="text-align: right; margin: 0">
-                  <el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>
-                    <el-option
-                      v-for="item in Person"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"/>
-                  </el-select>
-                  <el-button type="primary" size="mini" @click="visible = false;tiaozheng1()">确定</el-button>
-                </div>
-                <el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
-              </el-popover>
+              <el-button type="success" size="small" style="float: right" @click="visible2 = false;tiaozheng1()">调整采购任务</el-button>
+              <el-select v-model="PersonValue" style="width:100px;float: right" placeholder="人员" size="small" filterable clearable>
+                <el-option
+                  v-for="item in Person"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <!--<el-popover v-model="visible" title="调整采购任务" placement="top" width="180">-->
+              <!--<div style="text-align: right; margin: 0">-->
+              <!--<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>-->
+              <!--<el-option-->
+              <!--v-for="item in Person"-->
+              <!--:key="item.value"-->
+              <!--:label="item.label"-->
+              <!--:value="item.value"/>-->
+              <!--</el-select>-->
+              <!--<el-button type="primary" size="mini" @click="visible = false;tiaozheng1()">确定</el-button>-->
+              <!--</div>-->
+              <!--<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>-->
+              <!--</el-popover>-->
             </el-row>
-            <el-rows>
+            <el-row>
               <el-table
                 v-loading=""
                 :data="tableData11"
@@ -117,10 +122,6 @@
                     <span v-if="inquiry(scope.row)" style="color: blue">已询价</span>
                     <span v-if="approval(scope.row)" style="color: green">审批中</span>
                     <span v-if="purchased(scope.row)">已采购</span>
-                  <!--                    <el-tag v-if="unInquiry(scope.row)" type="warning" size="mini">未询价</el-tag>-->
-                  <!--                    <el-tag v-if="inquiry(scope.row)" type="success" size="mini">已询价</el-tag>-->
-                  <!--                    <el-tag v-if="approval(scope.row)" type="primary" size="mini">审批中</el-tag>-->
-                  <!--                    <el-tag v-if="purchased(scope.row)" type="info" size="mini">已采购</el-tag>-->
                   </template>
                 </el-table-column>
                 <el-table-column :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商" show-overflow-tooltip>
@@ -128,44 +129,29 @@
                     {{ scope.row.供货商 }}
                   </template>
                 </el-table-column>
-                <!--<el-table-column label="项目名称" align="center" min-width="100">-->
-                <!--<template slot-scope="scope">-->
-                <!--{{ scope.row.项目名称 }}-->
-                <!--</template>-->
-                <!--</el-table-column>-->
-                <el-table-column label="机床图号" align="center" min-width="130" prop="机床图号" show-overflow-tooltip>
+                <el-table-column label="机床图号" align="center" width="130" prop="机床图号" show-overflow-tooltip>
                   <template slot-scope="scope">
                     {{ scope.row.机床图号 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="组号" align="center" min-width="50">
-                  <template slot-scope="scope">
-                    {{ scope.row.组号 }}
-                  </template>
-                </el-table-column>
-                <!--<el-table-column label="物料类别" align="center" min-width="100">-->
-                <!--<template slot-scope="scope">-->
-                <!--{{ scope.row.物料类别 }}-->
-                <!--</template>-->
-                <!--</el-table-column>-->
-                <!--<el-table-column label="物料品种" align="center" min-width="100">-->
-                <!--<template slot-scope="scope">-->
-                <!--{{ scope.row.物料品种 }}-->
-                <!--</template>-->
-                <!--</el-table-column>-->
-                <el-table-column label="名称" align="center" width="100" prop="名称">
+                <el-table-column label="名称" align="center" width="180" prop="名称">
                   <template slot-scope="scope">
                     {{ scope.row.物料名称 }}
                   </template>
                 </el-table-column>
+                <el-table-column label="规格" align="center" width="250" prop="物料规格" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{ scope.row.物料规格 }}
+                  </template>
+                </el-table-column>
                 <el-table-column label="图号或型号" align="center" min-width="130" prop="物料型号">
                   <template slot-scope="scope">
                     {{ scope.row.物料型号 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="规格" align="center" min-width="100" prop="物料规格" show-overflow-tooltip>
+                <el-table-column label="组号" align="center" min-width="50">
                   <template slot-scope="scope">
-                    {{ scope.row.物料规格 }}
+                    {{ scope.row.组号 }}
                   </template>
                 </el-table-column>
                 <el-table-column label="分配数" align="center" min-width="60">
@@ -211,7 +197,7 @@
                     {{ scope.row.备注 }}
                   </template>
                 </el-table-column>
-                <el-table-column label="分配时间" align="center" min-width="80">
+                <el-table-column label="分配时间" align="center" min-width="90">
                   <template slot-scope="scope">
                     {{ scope.row.任务分配时间.split(' ')[0] }}
                   </template>
@@ -244,37 +230,35 @@
                   @size-change="handleSizeChange11"
                   @current-change="handleCurrentChange11"/>
               </div>
-            </el-rows>
+            </el-row>
           </el-tab-pane>
           <el-tab-pane label="基本件" name="基本件">
             <el-row style="margin-bottom: 10px">
-              <el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 100px" filterable clearable @change="projectChange">
-                <el-option
-                  v-for="item in project"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-              <el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable @change="machineChange">
+              <!--<el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 100px" filterable clearable @change="projectChange">-->
+              <!--<el-option-->
+              <!--v-for="item in project"-->
+              <!--:key="item.value"-->
+              <!--:label="item.label"-->
+              <!--:value="item.value"/>-->
+              <!--</el-select>-->
+              <el-input v-model="partNum" placeholder="图号名称规格" size="small" clearable @keyup.enter.native="materialStatusValue=[0];pageCurrent11=1;pageSize11=20;total11=0;searchTable12()"/>
+              <el-select v-model="machineValue" placeholder="机床" size="small" clearable filterable>
                 <el-option
                   v-for="item in machine"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-              <el-select v-model="groupValue" placeholder="组号" size="small" style="width: 100px" clearable filterable>
-                <el-option
-                  v-for="item in group"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>
-              <el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
-              <el-input v-model="partName" placeholder="零件名称" size="small" style="width: 120px" clearable/>
-              <el-input v-model="partSpec" placeholder="零件规格" size="small" style="width: 120px" clearable/>
-            </el-row>
-            <el-row style="margin-bottom: 10px">
+              <!--<el-select v-model="groupValue" placeholder="组号" size="small" style="width: 100px" clearable filterable>-->
+              <!--<el-option-->
+              <!--v-for="item in group"-->
+              <!--:key="item.value"-->
+              <!--:label="item.label"-->
+              <!--:value="item.value"/>-->
+              <!--</el-select>-->
+              <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="materialStatusValue=[0];pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
+              <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
               <el-date-picker
                 v-model="endTime"
                 size="small"
@@ -287,21 +271,29 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 @change="timeChange2()"/>
-              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
-              <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
-              <el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">
-                <div style="text-align: right; margin: 0">
-                  <el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>
-                    <el-option
-                      v-for="item in Person"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"/>
-                  </el-select>
-                  <el-button type="primary" size="mini" @click="visible2 = false;tiaozheng2()">确定</el-button>
-                </div>
-                <el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
-              </el-popover>
+              <el-button type="success" size="small" style="float: right" @click="visible2 = false;tiaozheng2()">调整采购任务</el-button>
+              <el-select v-model="PersonValue" style="width:100px;float: right" placeholder="人员" size="small" filterable clearable>
+                <el-option
+                  v-for="item in Person"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+              <!--<el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">-->
+              <!--<div style="text-align: right; margin: 0">-->
+              <!--<el-select v-model="PersonValue" style="width:150px" placeholder="人员" size="small" filterable clearable>-->
+              <!--<el-option-->
+              <!--v-for="item in Person"-->
+              <!--:key="item.value"-->
+              <!--:label="item.label"-->
+              <!--:value="item.value"/>-->
+              <!--</el-select>-->
+              <!--<el-button type="primary" size="mini" @click="visible2 = false;tiaozheng2()">确定</el-button>-->
+              <!--</div>-->
+              <!--<el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>-->
+              <!--</el-popover>-->
+              <!--<el-input v-model="partName" placeholder="零件名称" size="small" style="width: 120px" clearable/>-->
+              <!--<el-input v-model="partSpec" placeholder="零件规格" size="small" style="width: 120px" clearable/>-->
             </el-row>
             <el-row style="margin-bottom: 10px">
               <el-table
@@ -332,21 +324,6 @@
                     {{ scope.row.供货商 }}
                   </template>
                 </el-table-column>
-                <!--                <el-table-column label="项目名称" align="center" min-width="100">-->
-                <!--                  <template slot-scope="scope">-->
-                <!--                    {{ scope.row.项目名称 }}-->
-                <!--                  </template>-->
-                <!--                </el-table-column>-->
-                <el-table-column label="机床图号" align="center" min-width="130">
-                  <template slot-scope="scope">
-                    {{ scope.row.机床图号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="组号" align="center" min-width="50">
-                  <template slot-scope="scope">
-                    {{ scope.row.组号 }}
-                  </template>
-                </el-table-column>
                 <el-table-column label="图号" align="center" min-width="130">
                   <template slot-scope="scope">
                     {{ scope.row.零件图号 }}
@@ -362,6 +339,21 @@
                     {{ scope.row.规格 }}
                   </template>
                 </el-table-column>
+                <!--                <el-table-column label="项目名称" align="center" min-width="100">-->
+                <!--                  <template slot-scope="scope">-->
+                <!--                    {{ scope.row.项目名称 }}-->
+                <!--                  </template>-->
+                <!--                </el-table-column>-->
+                <el-table-column label="机床图号" align="center" min-width="130">
+                  <template slot-scope="scope">
+                    {{ scope.row.机床图号 }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="组号" align="center" min-width="50">
+                  <template slot-scope="scope">
+                    {{ scope.row.组号 }}
+                  </template>
+                </el-table-column>
                 <el-table-column label="材料" align="center" min-width="80">
                   <template slot-scope="scope">
                     {{ scope.row.材料 }}
@@ -591,41 +583,41 @@
     </el-row>
 
     <el-card>
-      <div slot="header">
-        <!--        <span>询价单号:</span>-->
-        <el-input v-model="inquirySheetNum" placeholder="询价单号" size="small" style="margin: 0px 10px" clearable/>
-        <!--        <span>供应商:</span>-->
-        <el-input v-model="supplierName" placeholder="供应商" size="small" style="margin: 0px 10px" clearable/>
-        <el-button
-          type="success"
-          size="small"
-          icon="el-icon-search"
-          style="margin:0px 10px"
-          @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
-        <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
+      <el-card style="width: 1188px">
+        <el-row>
+          <el-input v-model="inquirySheetNum" placeholder="询价单号" size="small" clearable/>
+          <el-input v-model="supplierName" placeholder="供应商" size="small" style="margin: 0px 10px" clearable/>
           <el-button
-            type="warning"
+            type="success"
             size="small"
-            style="margin: 0px 20px"
-            @click="addInquirySheet">选入物料</el-button>
-        </el-tooltip>
-        <el-button
-          type="primary"
-          size="small"
-          style="float: right;margin:0px 10px"
-          @click="createInquirySheet">创建询价单</el-button>
-      </div>
-      <el-card>
-        <h3 style="margin: 0px 30px;display:inline-block; ">询价单</h3>
-        <el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin: 0px 20px" @click="editInquirySheet()">编辑</el-button>
-        <el-button type="danger" size="mini" plain icon="el-icon-delete" style="margin: 0px 60px 0px 20px" @click="deleteInquirySheet()">删除</el-button>
-        <!--        <h3 style="margin: 0px 40px;display:inline-block;">询价单明细</h3>-->
-        <el-button :disabled="tableData3.length===0" type="primary" size="small" plain style="margin-left:300px" @click="printInquirySheet()">打印</el-button>
-        <el-button :disabled="tableData3.length===0" type="warning" size="small" style="margin-left:10px" @click="exportInquirySheet()">导出</el-button>
-        <el-tooltip :open-delay="1000" effect="dark" content="保存该询价单" placement="top">
-          <el-button :disabled="tableData3.length===0" type="success" size="small" @click="saveOrder()">保存</el-button>
-        </el-tooltip>
-        <el-button :loading="baseInfoLoading" type="success" size="mini" style="float: right" plain @click="inquirySheetBaseInfoMaintain">信息维护</el-button>
+            icon="el-icon-search"
+            style="margin:0px 10px"
+            @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
+          <el-tooltip :open-delay="1000" effect="dark" content="为选择的询价单添加物料" placement="top">
+            <el-button
+              type="warning"
+              size="small"
+              style="margin: 0px 20px"
+              @click="addInquirySheet">选入物料</el-button>
+          </el-tooltip>
+          <el-button
+            type="primary"
+            size="small"
+            style="float: right;margin:0px 10px"
+            @click="createInquirySheet">创建询价单</el-button>
+        </el-row>
+        <el-row style="margin-top: 5px;">
+          <h3 style="margin: 0px 30px;display:inline-block; ">询价单</h3>
+          <el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin: 0px 20px" @click="editInquirySheet()">编辑</el-button>
+          <el-button type="danger" size="mini" plain icon="el-icon-delete" style="margin: 0px 60px 0px 20px" @click="deleteInquirySheet()">删除</el-button>
+          <!--<h3 style="margin: 0px 40px;display:inline-block;">询价单明细</h3>-->
+          <el-button :disabled="tableData3.length===0" type="primary" size="small" plain style="float: right" @click="printInquirySheet()">打印</el-button>
+          <el-button :disabled="tableData3.length===0" type="warning" size="small" style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button>
+          <el-tooltip :open-delay="1000" effect="dark" content="保存该询价单" placement="top" style="float: right">
+            <el-button :disabled="tableData3.length===0" type="success" size="small" @click="saveOrder()">保存</el-button>
+          </el-tooltip>
+        </el-row>
+        <!--<el-button :loading="baseInfoLoading" type="success" size="mini" style="float: right" plain @click="inquirySheetBaseInfoMaintain">信息维护</el-button>-->
       </el-card>
       <el-row>
         <el-col style="width:310px">
@@ -690,19 +682,19 @@
             </el-table>
           </el-card>
         </el-col>
-        <!--          <div class="block" style="margin: 10px 0;">-->
-        <!--            <el-pagination-->
-        <!--              :current-page="pageCurrent2"-->
-        <!--              :page-sizes="[10, 20, 30, 40]"-->
-        <!--              :page-size="pageSize2"-->
-        <!--              :total="total2"-->
-        <!--              layout="total"-->
-        <!--              @size-change="handleSizeChange2"-->
-        <!--              @current-change="handleCurrentChange2"/>-->
-        <!--          </div>-->
+        <!--<div class="block" style="margin: 10px 0;">-->
+        <!--<el-pagination-->
+        <!--:current-page="pageCurrent2"-->
+        <!--:page-sizes="[10, 20, 30, 40]"-->
+        <!--:page-size="pageSize2"-->
+        <!--:total="total2"-->
+        <!--layout="total"-->
+        <!--@size-change="handleSizeChange2"-->
+        <!--@current-change="handleCurrentChange2"/>-->
+        <!--</div>-->
         <el-col style="width:880px">
           <el-card>
-            <el-table v-loading="" :data="tableData3" border style="max-height: 500px;width: 850px;float: left" height="500px" size="mini" >
+            <el-table v-loading="" :data="tableData3" border style="max-height: 500px;width: 100%;float: left" height="500px" size="mini" >
               <!--            <el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>-->
               <!--              <template slot-scope="scope">-->
               <!--                {{ scope.row.供应商名称 }}-->
@@ -718,7 +710,7 @@
                   {{ scope.row.组件零件流水号 ? scope.row.物料名称 : scope.row.零件名称 }}
                 </template>
               </el-table-column>
-              <el-table-column label="规格" align="center" width="110" show-overflow-tooltip>
+              <el-table-column label="规格" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.组件零件流水号 ? scope.row.物料规格 : scope.row.规格 }}
                 </template>
@@ -728,9 +720,9 @@
                   {{ scope.row.技术下达数量 }}
                 </template>
               </el-table-column>
-              <el-table-column label="实询数" align="center" width="90">
+              <el-table-column label="实询数" align="center" width="110">
                 <template slot-scope="scope">
-                  <el-input v-direction="{x: 0, y: scope.$index}" v-model="scope.row.数量" size="mini" style="width:100%"/>
+                  <el-input v-direction="{x: 0, y: scope.$index}" v-model="scope.row.数量" size="mini" style="width: 75px"/>
                 </template>
               </el-table-column>
               <el-table-column label="单位" align="center" width="50">
@@ -740,7 +732,7 @@
               </el-table-column>
               <el-table-column label="询价备注" align="center" width="110">
                 <template slot-scope="scope">
-                  <el-input v-direction="{x: 1, y: scope.$index}" v-model="scope.row.备注" size="mini" style="width:100%"/>
+                  <el-input v-direction="{x: 1, y: scope.$index}" v-model="scope.row.备注" size="mini" style="width: 75px"/>
                 </template>
               </el-table-column>
               <!--            <el-table-column label="询价单编号" align="center" min-width="100">-->
@@ -760,8 +752,8 @@
               </el-table-column>
               <el-table-column label="操作" align="center" width="50">
                 <template slot-scope="scope">
-                  <el-tooltip :open-delay="1000" effect="dark" content="将该物料从询价单中删除" placement="top">
-                    <el-button type="text" size="mini" icon="el-icon-delete" @click="outInquirySheet(scope.row)"/>
+                  <el-tooltip :open-delay="1000" effect="dark" content="将该物料从询价单中移出" placement="top">
+                    <el-button type="text" size="mini" icon="el-icon-right" @click="outInquirySheet(scope.row)"/>
                   </el-tooltip>
                 </template>
               </el-table-column>
@@ -771,7 +763,7 @@
       </el-row>
     </el-card>
 
-    <div id="inquirySheet" style="width: 1000px;margin: 0 auto;display:none">
+    <div id="inquirySheet" style="width: 800px;margin: 0 auto;display:none">
       <table class="inquirySheet" cellspacing="0px" align="center" border="1 solid black" width="100%">
         <tr>
           <th style="border: none;text-align:left;font-size: 30px;font-weight: bold" colspan="3"><div style="margin: 10px;">GAOJING</div></th>
@@ -1293,6 +1285,7 @@ export default {
     this.timeSearch()
     this.getPerson()
     this.fetchData()
+    this.projectChange()
     // this.searchTable11() // 查表1
     this.searchTable2() // 查表2
     this.searchUnInquiryPartNumber()
@@ -1313,10 +1306,14 @@ export default {
       })
     },
     timeChange1() {
-      timeChange1(this.startTime[0], this.startTime[1])
+      if (this.startTime) {
+        timeChange1(this.startTime[0], this.startTime[1])
+      }
     },
     timeChange2() {
-      timeChange2(this.endTime[0], this.endTime[1])
+      if (this.endTime) {
+        timeChange2(this.endTime[0], this.endTime[1])
+      }
     },
     Jump() {
       window.location.hash = '#PurchasingCenter/CreateInquirySheet'
@@ -1717,8 +1714,8 @@ export default {
       this.projectValue ? check4 = 1 : check4 = 0
       this.machineValue ? check5 = 1 : check5 = 0
       this.groupValue ? check6 = 1 : check6 = 0
-      this.startTime ? check7 = 1 : (check7 = 0, this.startTime = [])
-      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2, check7, this.startTime[0], this.startTime[1]).then(response => {
+      this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
+      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => {
         this.tableData11 = response.data.rows
         this.total11 = response.data.total
         const remark = []
@@ -1888,7 +1885,8 @@ export default {
               this.supplierName = ''
               this.supplierValue = ''
               this.dialogVisible2 = false
-              this.searchTable2()
+              this.inquirySheetNum = this.form2.inquirySheetNum
+              this.searchTable2(this.inquirySheetNum)
             } else { this.$message.error('操作失败！该询价单已存在，请重新输入') }
           })
         }
@@ -1907,6 +1905,7 @@ export default {
         }).then(() => {
           deleteInquirySheet(this.row1.询价单流水号).then(response => {
             if (response.data[0].result === '1') {
+              this.row1 = ''
               this.$message.success('删除成功')
               this.inquirySheetNum = ''
               this.supplierName = ''
@@ -1927,7 +1926,6 @@ export default {
     },
     editInquirySheet() { // 编辑询价单
       if (this.row1 === '') {
-        console.log(this.row1)
         this.$message.error('请选择询价单')
       } else {
         if (this.$refs['form2'] !== undefined) {

src/views/PurchasingCenter/FundApproval1/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <h3 style="margin-top: 0">采购合同</h3>
-      <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable01">
         <el-table-column label="供应商" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -23,24 +23,8 @@
             {{ scope.row.请款金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="审核" align="center" width="320">
+        <el-table-column label="审核" align="center" width="200">
           <template slot-scope="scope">
-            <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData1" class="subTableHeader" stripe size="mini" highlight-current-row show-summary @row-click="searchContactDetail">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="采购合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.采购合同编号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable01(scope.row)">查看详情</el-button>
-            </el-popover>
             <el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
             <el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApproval(scope.row)">不通过</el-button>
           </template>
@@ -58,115 +42,77 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-
-    <el-card>
-      <h3 style="margin-top: 0">离线合同</h3>
-      <el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="供应商" align="center" min-width="170">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.请款时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款人" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
-          <template slot-scope="scope">
-            {{ scope.row.请款金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审核" align="center" width="320">
-          <template slot-scope="scope">
-            <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData2" stripe size="mini" show-summary highlight-current-row @row-click="searchOfflineContactDetail">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="离线合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.离线合同编号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
-            </el-popover>
-            <el-button type="primary" size="mini" icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" @click="noApprovalOffline(scope.row)">不通过</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-    <h3 style="margin-top: 0">采购合同</h3>
-    <div id="print" class="print" style="background-color:white;min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/>
-    <h3 style="">离线合同</h3>
-    <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
-      <el-table-column label="离线合同编号" align="center" min-width="150">
-        <template slot-scope="scope">
-          {{ scope.row.离线合同编号 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="物料名称" align="center" min-width="150">
-        <template slot-scope="scope">
-          {{ scope.row.物料名称 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="物料规格" align="center" min-width="100">
-        <template slot-scope="scope">
-          {{ scope.row.物料规格 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="物料型号" align="center" min-width="200">
-        <template slot-scope="scope">
-          {{ scope.row.物料型号 }}
-        </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" min-width="80" prop="单价">
-        <template slot-scope="scope">
-          {{ scope.row.单价 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="合计" align="center" min-width="80" prop="合计">
-        <template slot-scope="scope">
-          {{ parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
-        <template slot-scope="scope">
-          {{ scope.row.交货期要求 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" min-width="80" prop="备注">
-        <template slot-scope="scope">
-          {{ scope.row.备注 }}
-        </template>
-      </el-table-column>
-    </el-table>
+    <h3 style="">合同明细</h3>
+    <el-row>
+      <el-col :span="8">
+        <el-table :data="gridData1" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
+          <el-table-column min-width="150" align="center" label="合同编号">
+            <template slot-scope="scope">
+              {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
+            </template>
+          </el-table-column>
+          <el-table-column width="120" align="center" label="已付金额" prop="已付金额">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.已付金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column width="120" align="center" label="请款金额" prop="请款金额">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+      <el-col :span="16">
+        <el-table :data="contractDetail2" :summary-method="getSummaries" border height="500px" size="mini" stripe show-summary>
+          <el-table-column label="物料名称" align="center" min-width="150">
+            <template slot-scope="scope">
+              {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料规格" align="center" min-width="260">
+            <template slot-scope="scope">
+              {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料型号" align="center" width="150">
+            <template slot-scope="scope">
+              {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" align="center" width="70">
+            <template slot-scope="scope">
+              {{ scope.row.数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="到货数量" align="center" width="70">
+            <template slot-scope="scope">
+              {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
+            </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)).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单价" align="center" min-width="100" prop="单价">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.单价||0).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
+            <template slot-scope="scope">
+              {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" min-width="150" prop="备注">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -205,8 +151,10 @@ export default {
   },
   methods: {
     searchContactDetail(row) {
-      searchContactDetail(row.采购合同流水号).then(response => {
-        this.contractDetail1 = response.data[0].合同内容
+      var check
+      row.采购合同流水号 ? check = 1 : check = 2
+      searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => {
+        this.contractDetail2 = response.data
       })
     },
     searchOfflineContactDetail(row) { // 查询离线合同明细
@@ -220,7 +168,7 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '总价'
-        } else if (index === 7) {
+        } else if (index === 6) {
           const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量'])))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -231,7 +179,33 @@ export default {
                 return prev
               }
             }, 0)
-            sums[index] += ' 元'
+            sums[index] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
+      })
+      return sums
+    },
+    getSummaries2(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总价'
+          return
+        } else if (index === 2 || index === 3) {
+          const values = data.map(item => Number(item[column.property]))
+          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] = sums[index].toFixed(2) + ' 元'
           } else {
             sums[index] = 'N/A'
           }
@@ -241,7 +215,7 @@ export default {
     },
     fetchData() {
       this.searchTable1()
-      this.searchTable2()
+      // this.searchTable2()
     },
     searchTable1() {
       initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => {
@@ -274,6 +248,8 @@ export default {
       this.searchTable2()
     },
     searchTable01(row) { // 查看详情（请款信息包含的合同）
+      this.gridData1 = []
+      this.contractDetail2 = []
       searchRequsetFundDetail1(row.采购合同请款流水号).then(response => {
         this.gridData1 = response.data
       })
@@ -310,6 +286,7 @@ export default {
         execApproval(row.采购合同请款流水号, 2, value, this.id, 0).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('执行成功')
+            this.tableData2 = []
             this.searchTable1()
           } else { this.$message.error('执行失败') }
         })

src/views/PurchasingCenter/FundApproval2/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <h3 style="margin-top: 0">采购合同</h3>
-      <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable01">
         <el-table-column label="供应商" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -23,24 +23,8 @@
             {{ scope.row.请款金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="审核" align="center" width="320">
+        <el-table-column label="审核" align="center" width="200">
           <template slot-scope="scope">
-            <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData1" stripe size="mini" highlight-current-row show-summary @row-click="searchContactDetail">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="采购合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.采购合同编号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" plain size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
-            </el-popover>
             <el-button type="warning" plain size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
             <el-button type="danger" plain size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
           </template>
@@ -58,155 +42,78 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
+    <h3 style="">合同明细</h3>
+    <el-row>
+      <el-col :span="8">
+        <el-table :data="gridData1" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
+          <el-table-column min-width="150" align="center" label="合同编号">
+            <template slot-scope="scope">
+              {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
+            </template>
+          </el-table-column>
+          <el-table-column width="120" align="center" label="已付金额" prop="已付金额">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.已付金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column width="120" align="center" label="请款金额" prop="请款金额">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+      <el-col :span="16">
+        <el-table :data="contractDetail2" :summary-method="getSummaries" border height="500px" size="mini" stripe show-summary>
+          <el-table-column label="物料名称" align="center" min-width="150">
+            <template slot-scope="scope">
+              {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料规格" align="center" min-width="260">
+            <template slot-scope="scope">
+              {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料型号" align="center" width="150">
+            <template slot-scope="scope">
+              {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" align="center" width="70">
+            <template slot-scope="scope">
+              {{ scope.row.数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="到货数量" align="center" width="70">
+            <template slot-scope="scope">
+              {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
+            </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)).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单价" align="center" min-width="100" prop="单价">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.单价||0).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
+            <template slot-scope="scope">
+              {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" min-width="150" prop="备注">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
 
-    <el-card>
-      <h3 style="margin-top: 0">离线合同</h3>
-      <el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="供应商" align="center" min-width="170">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.请款时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款人" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
-          <template slot-scope="scope">
-            {{ scope.row.请款金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审核" align="center" width="320">
-          <template slot-scope="scope">
-            <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData2" stripe size="mini" highlight-current-row show-summary @row-click="searchOfflineContactDetail">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="离线合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.离线合同编号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
-            </el-popover>
-            <el-button type="primary" size="mini" icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" @click="noApprovalOffline(scope.row)">不通过</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-    <h3 id="firstAnchor" style="margin-top: 0">采购合同</h3>
-    <div id="print" class="print" style="background-color:white;min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/><hr>
-    <h3 id="secondAnchor" style="">离线合同</h3>
-    <div id="offlineContract" style="background-color:white;min-height:500px;margin: 0 auto;width: 800px;border:1px solid black">
-      <table v-show="contractDetail2.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
-        <tr>
-          <th colspan="14"><h1>离线合同</h1></th>
-        </tr>
-        <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="2" style="text-align: left;"/>
-          <td width="80px">供应商</td>
-          <td id="supplier" colspan="5" style="text-align: left;"/>
-          <td id="qrCode" colspan="2" rowspan="2"/>
-        </tr>
-        <tr>
-          <td width="80px">合同编号</td>
-          <td id="contractNum" colspan="2" style="text-align: left;"/>
-          <td width="80px">采购员</td>
-          <td id="buyer" colspan="5" style="text-align: left;"/>
-        </tr>
-        <tr id="tablehead">
-          <td width="50px">序号</td>
-          <td colspan="2">名称</td>
-          <td>规格</td>
-          <td colspan="2">型号</td>
-          <td>数量</td>
-          <td colspan="2">单价</td>
-          <td colspan="2">合计</td>
-          <td>交货期</td>
-          <td colspan="2">备注</td>
-        </tr>
-        <tr>
-          <td>总计</td>
-          <td id="remark" colspan="10"/>
-          <td id="total" colspan="2" style="text-align: left;"/>
-          <td/>
-        </tr>
-      </table>
-    </div>
-    <!--
-    <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
-      <el-table-column label="离线合同编号" align="center" min-width="150">
-        <template slot-scope="scope">
-          {{ scope.row.离线合同编号 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="物料名称" align="center" min-width="150">
-        <template slot-scope="scope">
-          {{ scope.row.物料名称 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="物料规格" align="center" min-width="100">
-        <template slot-scope="scope">
-          {{ scope.row.物料规格 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="物料型号" align="center" min-width="200">
-        <template slot-scope="scope">
-          {{ scope.row.物料型号 }}
-        </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" min-width="80" prop="单价">
-        <template slot-scope="scope">
-          {{ scope.row.单价 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="合计" align="center" min-width="80" prop="合计">
-        <template slot-scope="scope">
-          {{ parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
-        <template slot-scope="scope">
-          {{ scope.row.交货期要求 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" min-width="80" prop="备注">
-        <template slot-scope="scope">
-          {{ scope.row.备注 }}
-        </template>
-      </el-table-column>
-    </el-table>
-    -->
   </div>
 </template>
 
@@ -245,8 +152,33 @@ export default {
     this.fetchData()
   },
   methods: {
+    getSummaries2(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总价'
+          return
+        } else if (index === 2 || index === 3) {
+          const values = data.map(item => Number(item[column.property]))
+          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] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
+      })
+      return sums
+    },
     showOffline(row) {
-      console.log(row, 222)
       const children = document.getElementsByClassName('tableData')
       const parent = document.getElementsByClassName('offlineContract')[0]
       if (children.length !== 0) {
@@ -285,13 +217,13 @@ export default {
       document.getElementById('remark').innerHTML = row.离线合同备注
     },
     searchContactDetail(row) {
-      document.documentElement.scrollTop = this.$el.querySelector('#firstAnchor').offsetTop
-      searchContactDetail(row.采购合同流水号).then(response => {
-        this.contractDetail1 = response.data[0].合同内容
+      var check
+      row.采购合同流水号 ? check = 1 : check = 2
+      searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => {
+        this.contractDetail2 = response.data
       })
     },
     searchOfflineContactDetail(row) { // 查询离线合同明细
-      document.documentElement.scrollTop = this.$el.querySelector('#secondAnchor').offsetTop
       searchMateriel(row.离线合同流水号).then(response => {
         this.contractDetail2 = response.data
         this.showOffline(row)
@@ -303,7 +235,7 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '总价'
-        } else if (index === 7) {
+        } else if (index === 6) {
           const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量'])))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -314,7 +246,7 @@ export default {
                 return prev
               }
             }, 0)
-            sums[index] += ' 元'
+            sums[index] = sums[index].toFixed(2) + ' 元'
           } else {
             sums[index] = 'N/A'
           }
@@ -357,6 +289,8 @@ export default {
       this.searchTable2()
     },
     searchTable01(row) { // 查看详情（请款信息包含的合同）
+      this.gridData1 = []
+      this.contractDetail2 = []
       searchRequsetFundDetail1(row.采购合同请款流水号).then(response => {
         this.gridData1 = response.data
       })

src/views/PurchasingCenter/FundApproval3/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <h3 style="margin-top: 0">采购合同</h3>
-      <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable01">
         <el-table-column label="供应商" align="center" min-width="350">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -10,7 +10,7 @@
         </el-table-column>
         <el-table-column label="请款时间" align="center" min-width="140">
           <template slot-scope="scope">
-            {{ scope.row.请款时间 }}
+            {{ scope.row.请款时间.substr(0,10) }}
           </template>
         </el-table-column>
         <el-table-column label="请款人" align="center" min-width="80">
@@ -23,24 +23,8 @@
             {{ scope.row.请款金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="审核" align="center" width="320">
+        <el-table-column label="审核" align="center" width="200">
           <template slot-scope="scope">
-            <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData1" class="subTableHeader" stripe size="mini" show-summary highlight-current-row @row-click="searchContactDetail">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="采购合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.采购合同编号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" plain style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
-            </el-popover>
             <el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
             <el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApproval(scope.row)">不通过</el-button>
           </template>
@@ -58,114 +42,77 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-    <el-card>
-      <h3 style="margin-top: 0">离线合同</h3>
-      <el-table v-loading="" :data="tableData2" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="供应商" align="center" min-width="320">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="140">
-          <template slot-scope="scope">
-            {{ 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" min-width="90" prop="请款金额">
-          <template slot-scope="scope">
-            {{ scope.row.请款金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="付款" align="center" width="320">
-          <template slot-scope="scope">
-            <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData2" class="subTableHeader" stripe size="mini" show-summary highlight-current-row @row-click="searchOfflineContactDetail">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="离线合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.离线合同编号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="80" align="center" label="合同总额" prop="请款金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" plain style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
-            </el-popover>
-            <el-button type="primary" size="mini" plain icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApprovalOffline(scope.row)">不通过</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-    <h3 style="margin-top: 0">采购合同</h3>
-    <div id="print" class="print" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/>
-    <h3 style="">离线合同</h3>
-    <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border stripe style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
-      <el-table-column label="离线合同编号" align="center" min-width="130">
-        <template slot-scope="scope">
-          {{ scope.row.离线合同编号 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="物料名称" align="center" min-width="100 ">
-        <template slot-scope="scope">
-          {{ scope.row.物料名称 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="物料规格" align="center" min-width="150">
-        <template slot-scope="scope">
-          {{ scope.row.物料规格 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="物料型号" align="center" min-width="120">
-        <template slot-scope="scope">
-          {{ 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" min-width="80" prop="单价">
-        <template slot-scope="scope">
-          {{ scope.row.单价 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="合计" align="center" min-width="80" prop="合计">
-        <template slot-scope="scope">
-          {{ parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0) }}
-        </template>
-      </el-table-column>
-      <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
-        <template slot-scope="scope">
-          {{ scope.row.交货期要求 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" min-width="80" prop="备注">
-        <template slot-scope="scope">
-          {{ scope.row.备注 }}
-        </template>
-      </el-table-column>
-    </el-table>
+    <h3 style="">合同明细</h3>
+    <el-row>
+      <el-col :span="8">
+        <el-table :data="gridData1" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
+          <el-table-column min-width="150" align="center" label="合同编号">
+            <template slot-scope="scope">
+              {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
+            </template>
+          </el-table-column>
+          <el-table-column width="120" align="center" label="已付金额" prop="已付金额">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.已付金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column width="120" align="center" label="请款金额" prop="请款金额">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+      <el-col :span="16">
+        <el-table :data="contractDetail2" :summary-method="getSummaries" border height="500px" size="mini" stripe show-summary>
+          <el-table-column label="物料名称" align="center" min-width="150">
+            <template slot-scope="scope">
+              {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料规格" align="center" min-width="260">
+            <template slot-scope="scope">
+              {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="物料型号" align="center" width="150">
+            <template slot-scope="scope">
+              {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" align="center" width="70">
+            <template slot-scope="scope">
+              {{ scope.row.数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="到货数量" align="center" width="70">
+            <template slot-scope="scope">
+              {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
+            </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)).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单价" align="center" min-width="100" prop="单价">
+            <template slot-scope="scope">
+              {{ parseFloat(scope.row.单价||0).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
+            <template slot-scope="scope">
+              {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" min-width="150" prop="备注">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -203,9 +150,37 @@ export default {
     this.fetchData()
   },
   methods: {
+    getSummaries2(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总价'
+          return
+        } else if (index === 2 || index === 3) {
+          const values = data.map(item => Number(item[column.property]))
+          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] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
+      })
+      return sums
+    },
     searchContactDetail(row) {
-      searchContactDetail(row.采购合同流水号).then(response => {
-        this.contractDetail1 = response.data[0].合同内容
+      var check
+      row.采购合同流水号 ? check = 1 : check = 2
+      searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => {
+        this.contractDetail2 = response.data
       })
     },
     searchOfflineContactDetail(row) { // 查询离线合同明细
@@ -219,7 +194,7 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '总价'
-        } else if (index === 7) {
+        } else if (index === 6) {
           const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量'])))
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -230,7 +205,7 @@ export default {
                 return prev
               }
             }, 0)
-            sums[index] += ' 元'
+            sums[index] = sums[index].toFixed(2) + ' 元'
           } else {
             sums[index] = 'N/A'
           }
@@ -274,6 +249,8 @@ export default {
       this.searchTable2()
     },
     searchTable01(row) { // 查看详情（请款信息包含的合同）
+      this.gridData1 = []
+      this.contractDetail2 = []
       searchRequsetFundDetail1(row.采购合同请款流水号).then(response => {
         this.gridData1 = response.data
       })

src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue

@@ -2,13 +2,16 @@
   <div class="app-container">
     <el-card>
       <div slot="header">
+        <span>供应商:</span>
+        <el-input v-model="supperiler" placeholder="供应商" size="small" clearable/>
         <span>发票号:</span>
         <el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>
         <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
+        <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
       </div>
-      <h4 style="margin-top: 5px">发票结算申请单</h4>
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="350px" size="mini" @row-click="searchTable2">
+      <h4 style="margin-top: 5px;margin-bottom: 0px">发票结算申请单</h4>
+      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;max-height: 350px" size="mini" @row-click="searchTable2">
         <el-table-column type="expand">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
@@ -51,77 +54,76 @@
             {{ scope.row.发票号 }}
           </template>
         </el-table-column>
-        <el-table-column label="发票金额" align="center" width="100">
+        <el-table-column label="发票金额" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.发票金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="申请人" prop="申请人姓名" align="center" min-width="80">
+        <el-table-column label="申请人" prop="申请人姓名" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
           </template>
         </el-table-column>
-        <el-table-column label="申请时间" prop="申请时间" align="center" min-width="115" show-overflow-tooltip>
+        <el-table-column label="申请时间" prop="申请时间" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
+            {{ scope.row.申请时间 ? scope.row.申请时间.substr(0,10) : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="采购审批" align="center" min-width="60">
+        <el-table-column label="审核" align="center" min-width="60">
           <template slot-scope="scope">
-            {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
+            {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审核' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
+            {{ scope.row.审批1时间 ? scope.row.审批1时间.substr(0,10) : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="总经理审批" align="center" min-width="70">
+        <el-table-column label="审批" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
+            {{ scope.row.审批4时间 ? scope.row.审批4时间.substr(0,10) : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" align="center" min-width="60">
+        <el-table-column label="财务" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
+            {{ scope.row.审批3时间 ? scope.row.审批3时间.substr(0,10) : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="300" fixed="right">
+        <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" icon="el-icon-edit" plain size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="danger" icon="el-icon-delete" plain size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" plain size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</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 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>-->
     </el-card>
 
     <el-card>
-      <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
-      <span>发票号：</span>
-      <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
-      <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
+      <!--      <h4 style="margin-top: 5px;margin-bottom: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>-->
+      <!--      <span>发票号：</span>-->
+      <!--      <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>-->
       <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
@@ -138,11 +140,11 @@
             {{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="供应商" align="center" min-width="150">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.供应商名称 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="合同编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
@@ -324,12 +326,13 @@ export default {
   name: '', // 发票结算申请
   data() {
     return {
+      supperiler: '',
       disabled: false,
       contractType: '采购合同',
       invoiceNum: '',
       total1: 0,
       pageCurrent1: 1,
-      pageSize1: 10,
+      pageSize1: 100000,
       tableData1: [],
       applyOrderNum: '',
       invoiceNumber: '',
@@ -410,9 +413,10 @@ export default {
       this.dialogVisible1 = true
     },
     searchTable1() {
-      let check1
+      let check1, check2
       this.invoiceNum ? check1 = 1 : check1 = 0
-      searchTable1(check1, this.invoiceNum, this.pageCurrent1, this.pageSize1).then(response => {
+      this.supperiler ? check2 = 1 : check2 = 0
+      searchTable1(check1, this.invoiceNum, check2, this.supperiler, this.pageCurrent1, this.pageSize1).then(response => {
         this.tableData1 = response.data.rows
         this.tableData1.map(v => {
           this.$set(v, 'scanSrc', '')
@@ -431,7 +435,8 @@ export default {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
               this.dialogVisible1 = false
-              this.searchTable1()
+              this.invoiceNum = this.form1.invoiceNum
+              this.searchTable1(this.invoiceNum)
             } else {
               this.$message.error('增加失败')
             }

src/views/PurchasingCenter/MaterialMProcure/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-row>
+      <el-row v-if="false">
         <el-select
           v-model="MaterialCategoryValue"
           placeholder="物料类别"
@@ -85,6 +85,13 @@
           @click="pageCurrent=1;searchMaterial()">查询</el-button>
         <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增采购物料申请</el-button>
       </el-row>
+      <el-row>
+        <el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable/>
+        <el-input v-model="MaterialSpecification" placeholder="物料规格" size="small" clearable/>
+        <el-input v-model="MaterialModel" placeholder="物料型号" size="small" clearable/>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;searchMaterial()">查询</el-button>
+        <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增采购物料申请</el-button>
+      </el-row>
     </el-card>
 
     <el-card>

src/views/PurchasingCenter/OfflineContractSearch/index.vue

@@ -3,10 +3,8 @@
     <el-card>
       <div slot="header">
         <el-row>
-          <span>合同编号:</span>
-          <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px"/>
-          <span>供应商:</span>
-          <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
+          <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px;margin: 0px 10px"/>
+          <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>
           <el-button
             type="success"
             size="small"
@@ -15,92 +13,98 @@
             @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
         </el-row>
       </div>
-      <el-table
-        v-loading="loading1"
-        id="expandTable"
-        :data="tableData1"
-        size="mini"
-        border
-        style="width: 100%"
-        height="500px"
-        highlight-current-row
-        @row-click="searchTable2">
-        <el-table-column label="供应商" align="center" min-width="220">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="离线合同名称" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.离线合同名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="离线合同编号" align="center" min-width="160">
-          <template slot-scope="scope">
-            {{ scope.row.离线合同编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购员" align="center" min-width="60">
-          <template slot-scope="scope">
-            {{ scope.row.采购员 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总金额" align="center" min-width="60">
-          <template slot-scope="scope">
-            {{ scope.row.合同总额 }}
-          </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>
     </el-card>
-    <div id="offlineContract" style="background-color:white;min-height:500px;margin: 0 auto;width: 800px;border:1px solid black">
-      <table v-show="contractDetail.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
-        <tr>
-          <th colspan="14"><h1>离线合同</h1></th>
-        </tr>
-        <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="2" style="text-align: left;"/>
-          <td width="80px">供应商</td>
-          <td id="supplier" colspan="5" style="text-align: left;"/>
-          <td id="qrCode" colspan="2" rowspan="2"/>
-        </tr>
-        <tr>
-          <td width="80px">合同编号</td>
-          <td id="contractNum" colspan="2" style="text-align: left;"/>
-          <td width="80px">采购员</td>
-          <td id="buyer" colspan="5" style="text-align: left;"/>
-        </tr>
-        <tr id="tablehead">
-          <td width="50px">序号</td>
-          <td colspan="2">名称</td>
-          <td>规格</td>
-          <td colspan="2">型号</td>
-          <td>数量</td>
-          <td colspan="2">单价</td>
-          <td colspan="2">合计</td>
-          <td>交货期</td>
-          <td colspan="2">备注</td>
-        </tr>
-        <tr>
-          <td>总计</td>
-          <td id="remark" colspan="10"/>
-          <td id="total" colspan="2" style="text-align: left;"/>
-          <td/>
-        </tr>
-      </table>
-    </div>
+    <el-row>
+      <el-card style="width: 40%; float: left">
+        <el-table
+          v-loading="loading1"
+          id="expandTable"
+          :data="tableData1"
+          size="mini"
+          border
+          style="width: 100%"
+          height="700px"
+          highlight-current-row
+          @row-click="searchTable2">
+          <el-table-column label="供应商" align="center" min-width="200">
+            <template slot-scope="scope">
+              {{ scope.row.供应商名称 }}
+            </template>
+          </el-table-column>
+          <!--        <el-table-column label="离线合同名称" align="center" min-width="150">-->
+          <!--          <template slot-scope="scope">-->
+          <!--            {{ scope.row.离线合同名称 }}-->
+          <!--          </template>-->
+          <!--        </el-table-column>-->
+          <el-table-column label="离线合同编号" align="center" min-width="120">
+            <template slot-scope="scope">
+              {{ scope.row.离线合同编号 }}
+            </template>
+          </el-table-column>
+          <!--        <el-table-column label="采购员" align="center" min-width="60">-->
+          <!--          <template slot-scope="scope">-->
+          <!--            {{ scope.row.采购员 }}-->
+          <!--          </template>-->
+          <!--        </el-table-column>-->
+          <el-table-column label="总金额" align="center" min-width="75">
+            <template slot-scope="scope">
+              {{ Number(scope.row.合同总额).toFixed(2) }}
+            </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>
+      </el-card>
+      <el-card style="width: 58%">
+        <!--          <div id="offlineContract" style="background-color:white;min-height:500px;margin: 0 auto;width: 800px;border:1px solid black">-->
+        <table v-show="contractDetail.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="700px">
+          <tr>
+            <th colspan="14"><h1>离线合同</h1></th>
+          </tr>
+          <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="2" style="text-align: left;"/>
+            <td width="80px">供应商</td>
+            <td id="supplier" colspan="5" style="text-align: left;"/>
+            <td id="qrCode" colspan="2" rowspan="2"/>
+          </tr>
+          <tr>
+            <td width="80px">合同编号</td>
+            <td id="contractNum" colspan="2" style="text-align: left;"/>
+            <td width="80px">采购员</td>
+            <td id="buyer" colspan="5" style="text-align: left;"/>
+          </tr>
+          <tr id="tablehead">
+            <td width="50px">序号</td>
+            <td colspan="2">名称</td>
+            <td>规格</td>
+            <td colspan="2">型号</td>
+            <td>数量</td>
+            <td colspan="2">单价</td>
+            <td colspan="2">合计</td>
+            <td>交货期</td>
+            <td colspan="2">备注</td>
+          </tr>
+          <tr>
+            <td>总计</td>
+            <td id="remark" colspan="10"/>
+            <td id="total" colspan="2" style="text-align: left;"/>
+            <td/>
+          </tr>
+        </table>
+        <!--          </div>-->
+      </el-card>
+    </el-row>
   </div>
 </template>
 
@@ -164,7 +168,7 @@ export default {
       }
       const tr = []
       let length = 0
-      this.contractDetail.length < 15 ? length = 15 : length = this.contractDetail.length
+      length = this.contractDetail.length
       for (let i = 0; i < length; i++) {
         tr[i] = document.createElement('tr')
         tr[i].setAttribute('class', 'tableData')
@@ -215,7 +219,7 @@ export default {
 
 <style scoped>
   .el-card{
-    margin-bottom: 15px;
+    margin-bottom: 0px;
   }
   .el-date-editor{
     width:200px

src/views/PurchasingCenter/PayStateSearch/index.vue

@@ -159,6 +159,7 @@ export default {
       })
     },
     searchTable1() {
+      this.tableData1 = []
       this.contractNumValue ? this.check1 = 1 : this.check1 = 0
       this.supplierName ? this.check2 = 1 : this.check2 = 0
       searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {

src/views/PurchasingCenter/ProjectTotalSearch/index.vue

@@ -3,7 +3,7 @@
     <el-card>
       <div slot="header">
         <span>项目名称:</span>
-        <el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
+        <el-select v-model="projectValue" style="width:150px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
           <el-option
             v-for="item in project"
             :key="item.value"
@@ -11,21 +11,21 @@
             :value="item.value"/>
         </el-select>
         <span>机床图号:</span>
-        <el-select v-model="machineValue" style="width:190px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
+        <el-select v-model="machineValue" style="width:150px" placeholder="请选择" size="small" clearable filterable @change="searchTable1">
           <el-option
             v-for="item in machine"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>组号:</span>
-        <el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>
-          <el-option
-            v-for="item in group"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
+        <!--        <span>组号:</span>-->
+        <!--        <el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>-->
+        <!--          <el-option-->
+        <!--            v-for="item in group"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
         <el-button
           type="success"
           size="small"
@@ -35,11 +35,18 @@
       </div>
       <el-table v-loading="" :data="tableData1" show-summary stripe border style="width: 100%;max-height: 600px;" height="600px" size="mini">
         <el-table-column label="序号" align="center" width="80" type="index"/>
-        <el-table-column label="项目名称" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="采购状态" align="center" min-width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>采购</span>-->
+        <!--            <span>到货</span>-->
+        <!--            <span>领用</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="项目名称" align="center" min-width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.项目名称 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column align="center" label="机床图号" width="100px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -50,12 +57,12 @@
             {{ scope.row.组号 || '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="名称" align="center" min-width="100">
+        <el-table-column label="名称" align="center" min-width="120">
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="100">
+        <el-table-column label="图号或型号" align="center" min-width="120">
           <template slot-scope="scope">
             {{ scope.row.图号 }}
           </template>
@@ -70,21 +77,30 @@
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
+        <!--        <el-table-column label="单价" align="center" min-width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.单价 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="单价" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.单价 }}
+            {{ Number(scope.row.优惠后单价).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column label="优惠后单价" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.优惠后单价 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="优惠后小计(元)" align="center" min-width="100" prop="金额">
+        <el-table-column label="采购小计(元)" align="center" min-width="100" prop="金额">
           <template slot-scope="scope">
             {{ scope.row.金额 = (Number(scope.row.优惠后单价) * Number(scope.row.数量)).toFixed(2) }}
           </template>
         </el-table-column>
+        <!--        <el-table-column label="领用" align="center" min-width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.领用 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column><el-table-column label="领用小计" align="center" min-width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.领用小计 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
     </el-card>
   </div>
@@ -145,6 +161,7 @@ export default {
           })
         }
       })
+      this.searchTable1()
     },
     machineChange() {
       this.group = []
@@ -163,6 +180,7 @@ export default {
         let check2, check3
         this.machineValue ? check2 = 1 : check2 = 0
         this.groupValue ? check3 = 1 : check3 = 0
+        console.log(1, this.projectValue, check2, this.machineValue, check3, this.groupValue)
         searchProjectTotal(1, this.projectValue, check2, this.machineValue, check3, this.groupValue).then(response => {
           this.tableData1 = response.data
         })

src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue

@@ -11,16 +11,11 @@
             :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 type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
         <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
       </div>
       <h3>请款表</h3>
-      <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
+      <el-table v-loading="" :data="tableData1" border size="mini" stripe highlight-current-row @row-click="searchTable02">
         <el-table-column label="供应商" prop="供应商名称" align="center" width="220" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -36,13 +31,11 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额" align="center" width="70" prop="请款金额">
+        <el-table-column label="请款金额" align="center" width="150" prop="请款金额">
           <template slot-scope="scope">
             {{ scope.row.请款金额 }}
           </template>
         </el-table-column>
-        <!--<el-table-column label="请款付款情况" align="center">-->
-        <!--</el-table-column>-->
         <el-table-column label="审核内容" width="80" align="center">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.审核情况流水号)===3" type="primary" size="small">未审核</el-tag>
@@ -79,29 +72,8 @@
             {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row size="mini" show-summary @row-click="searchContract">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="采购合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.采购合同编号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="已付金额" prop="已付金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.已付金额 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="请款金额" prop="请款金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">详情</el-button>
-            </el-popover>
             <el-button :disabled="Number(id)!==Number(scope.row.请款人) || !((Number(scope.row.审核情况流水号) !== 1) || (Number(scope.row.审批情况流水号)===2) || (Number(scope.row.付款情况流水号)===2))" type="text" plain size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -118,65 +90,135 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-
+    <el-card>
+      <h3 style="margin-top: 0">合同明细</h3>
+      <el-row>
+        <el-col :span="8">
+          <el-table :data="gridData" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContract">
+            <el-table-column min-width="150" align="center" label="合同编号">
+              <template slot-scope="scope">
+                {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
+              </template>
+            </el-table-column>
+            <el-table-column width="120" align="center" label="已付金额" prop="已付金额">
+              <template slot-scope="scope">
+                {{ parseFloat(scope.row.已付金额).toFixed(2) }}
+              </template>
+            </el-table-column>
+            <el-table-column width="120" align="center" label="请款金额" prop="请款金额">
+              <template slot-scope="scope">
+                {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+        <el-col :span="16">
+          <el-table :data="tableData2" :summary-method="getSummaries" border height="500px" size="mini" stripe show-summary>
+            <el-table-column label="物料名称" align="center" min-width="150">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="物料规格" align="center" min-width="260">
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="物料型号" align="center" width="150">
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="到货数量" align="center" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
+              </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)).toFixed(2) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单价" align="center" min-width="100" prop="单价">
+              <template slot-scope="scope">
+                {{ parseFloat(scope.row.单价||0).toFixed(2) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
+              <template slot-scope="scope">
+                {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" min-width="150" prop="备注">
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+    </el-card>
     <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1000px">
       <span>供应商：</span>
-      <el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small">
+      <el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small" @change="searchTable01()">
         <el-option
           v-for="item in supplier"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 10px 10px 10px" @click="searchTable01()">查询</el-button>
-      <el-table v-loading="" :data="tableData01" border style="max-height: 300px;" height="300px" size="mini" @row-click="searchContract" @selection-change="handleSelectionChange">
-        <el-table-column :selectable="selectable" type="selection" align="center" width="50"/>
-        <el-table-column label="采购合同编号" align="center" min-width="100">
+      <!--<el-button type="success" size="small" icon="el-icon-search" style="margin: 0 10px 10px 10px" @click="searchTable01()">查询</el-button>-->
+      <el-table v-loading="" :data="tableData01" border style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
+        <el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
+        <el-table-column label="采购合同编号" align="center" min-width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" align="center" min-width="120">
+        <el-table-column label="采购合同名称" align="center" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="180">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购员" align="center" width="80">
+        <el-table-column label="采购员" align="center" width="70">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
+        <el-table-column label="合同类型" align="center" width="70">
+          <template slot-scope="scope">
+            {{ scope.row.合同类型 === 1 ? '采购' : '离线' }}
+          </template>
+        </el-table-column>
         <el-table-column label="合同总额" align="center" width="80" prop="合同总额">
           <template slot-scope="scope">
-            {{ scope.row.合同总额 ? parseInt(scope.row.合同总额 * 100)/100 : '-' }}
+            {{ scope.row.合同总额 ? (parseInt(scope.row.合同总额 * 100)/100).toFixed(2) : '-' }}
           </template>
         </el-table-column>
         <el-table-column label="已付金额" align="center" width="80" prop="已付金额">
           <template slot-scope="scope">
-            {{ scope.row.已付金额 }}
+            {{ parseFloat(scope.row.已付金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="申请中金额" align="center" min-width="100" prop="申请中金额">
           <template slot-scope="scope">
-            {{ scope.row.申请中金额 }}
+            {{ parseFloat(scope.row.申请中金额).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="120" prop="请款金额">
+        <el-table-column label="请款金额" align="center" min-width="180" prop="请款金额">
           <template slot-scope="scope">
             <el-input-number :max="scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额) === 0" :min="0" v-model="scope.row.请款金额" :precision="2" size="mini" controls-position="right" style="width: 100%;"/>
           </template>
         </el-table-column>
       </el-table>
-      <span>合计：<el-input v-model="SUM" readonly size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
+      <span>合计：<el-input v-model="SUM" readonly size="mini" style="width: 150px; margin: 10px 10px 0 10px"/>元</span>
       <el-button type="primary" size="small" style="float:right;margin: 10px" icon="el-icon-check" @click="submitRequestFund">确定请款</el-button>
     </el-dialog>
-
-    <div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
   </div>
 </template>
 
@@ -250,6 +292,7 @@ export default {
       tableData01: [],
       SUM: 0,
       contractGroup: [],
+      offGroup: [],
       gridData: []
     }
   },
@@ -289,10 +332,63 @@ export default {
       })
     },
     searchContract(row) {
-      searchContract(row.采购合同流水号).then(response => {
-        this.returns = response.data[0].合同内容
+      var check
+      row.采购合同流水号 ? check = 1 : check = 2
+      searchContract(check, row.采购合同流水号, row.离线合同流水号).then(response => {
+        this.tableData2 = response.data
       })
     },
+    getSummaries(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (index === 5) {
+          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] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
+      })
+      return sums
+    },
+    getSummaries2(param) { // 合计
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总价'
+          return
+        } else if (index === 2 || index === 3) {
+          const values = data.map(item => Number(item[column.property]))
+          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] = sums[index].toFixed(2) + ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
+        }
+      })
+      return sums
+    },
     handleSizeChange1(val) {
       this.pageSize1 = val
       this.pageCurrent1 = 1
@@ -312,7 +408,7 @@ export default {
       })
       this.totalSum = 0
       this.totalPay = 0
-      searchPurchaseContract(check2, this.supplierValue).then(response => {
+      searchPurchaseContract(1, check2, this.supplierValue).then(response => {
         response.data.map(data => {
           this.totalSum += data.合同总额
           this.totalPay += data.已付金额
@@ -329,9 +425,10 @@ export default {
     searchTable01() { // 查询待请款
       if (this.supplierValue) {
         this.contractGroup = []
+        this.offGroup = []
         let check
         this.supplierValue ? check = 1 : check = 0
-        searchPurchaseContract(check, this.supplierValue).then(response => {
+        searchPurchaseContract(2, check, this.supplierValue).then(response => {
           this.tableData01 = response.data
           this.tableData01.map(v => {
             this.$set(v, '请款金额', 0)
@@ -339,8 +436,6 @@ export default {
             return v
           })
         })
-      } else {
-        this.$message.error('请选择供应商')
       }
     },
     selectable(row, index) { // 控制某行是否可选
@@ -350,31 +445,43 @@ export default {
       this.selectContents = val
       this.SUM = 0
       this.contractGroup = []
+      this.offGroup = []
       this.sumGroup = []
       for (let i = 0; i < val.length; i++) {
         this.SUM += parseFloat(val[i].请款金额)
         this.contractGroup.push(val[i].采购合同流水号)
+        this.offGroup.push(val[i].采购合同流水号)
         this.sumGroup.push(val[i].请款金额)
       }
+      this.SUM = parseFloat(this.SUM).toFixed(2)
     },
     submitRequestFund() { // 确认请款
       if (this.supplierValue && this.contractGroup.length !== 0) {
         this.SUM = 0
         this.contractGroup = []
+        this.offGroup = []
         this.sumGroup = []
         for (let i = 0; i < this.tableData01.length; i++) {
           for (let j = 0; j < this.selectContents.length; j++) {
-            if (this.selectContents[j].采购合同流水号 === this.tableData01[i].采购合同流水号) {
-              this.SUM += parseFloat(this.tableData01[i].请款金额)
-              this.contractGroup.push(this.tableData01[i].采购合同流水号)
-              this.sumGroup.push(this.tableData01[i].请款金额)
+            if (this.selectContents[j].采购合同流水号 === this.tableData01[i].采购合同流水号 && this.selectContents[j].合同类型 === this.tableData01[i].合同类型) {
+              if (this.selectContents[j].合同类型 === 1) {
+                this.SUM += parseFloat(this.tableData01[i].请款金额)
+                this.contractGroup.push(this.tableData01[i].采购合同流水号)
+                this.offGroup.push('a974548')
+                this.sumGroup.push(this.tableData01[i].请款金额)
+              } else {
+                this.SUM += parseFloat(this.tableData01[i].请款金额)
+                this.contractGroup.push('a974548')
+                this.offGroup.push(this.tableData01[i].采购合同流水号)
+                this.sumGroup.push(this.tableData01[i].请款金额)
+              }
             }
           }
         }
         if (this.SUM === 0) {
           this.$message.error('请款金额不能为0')
         } else {
-          submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 采购合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person
+          submitRequestFund(this.contractGroup, this.offGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('请款成功')
               this.searchTable1()

src/views/PurchasingCenter/PurchaseContractReview/index.vue

@@ -1,41 +1,41 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <span>合同号:</span>
-      <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
-        <el-option
-          v-for="item in contractNum"
-          :key="item.value"
-          :label="item.label"
-          :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="personValue" placeholder="采购员" clearable size="small" style="width: 100px">
-        <el-option
-          v-for="item in person"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>供应商:</span>
-      <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
-      <el-button
-        type="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin-left:10px"
-        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-      <el-button
-        type="warning"
-        size="small"
-        plain
-        icon="el-icon-search"
-        style="margin-left:10px"
-        @click="setting()">通知</el-button>
-    </el-card>
+    <!--    <el-card>-->
+    <!--      <span>合同号:</span>-->
+    <!--      <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>-->
+    <!--        <el-option-->
+    <!--          v-for="item in contractNum"-->
+    <!--          :key="item.value"-->
+    <!--          :label="item.label"-->
+    <!--          :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="personValue" placeholder="采购员" clearable size="small" style="width: 100px">-->
+    <!--        <el-option-->
+    <!--          v-for="item in person"-->
+    <!--          :key="item.value"-->
+    <!--          :label="item.label"-->
+    <!--          :value="item.value"/>-->
+    <!--      </el-select>-->
+    <!--      <span>供应商:</span>-->
+    <!--      <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>-->
+    <!--      <el-button-->
+    <!--        type="success"-->
+    <!--        size="small"-->
+    <!--        icon="el-icon-search"-->
+    <!--        style="margin-left:10px"-->
+    <!--        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>-->
+    <!--      <el-button-->
+    <!--        type="warning"-->
+    <!--        size="small"-->
+    <!--        plain-->
+    <!--        icon="el-icon-search"-->
+    <!--        style="margin-left:10px"-->
+    <!--        @click="setting()">通知</el-button>-->
+    <!--    </el-card>-->
 
     <el-card>
       <el-table
@@ -43,8 +43,7 @@
         :data="tableData1"
         size="mini"
         border
-        style="width: 100%"
-        height="500px"
+        style="width: 60%; max-height: 500px"
         highlight-current-row
         @row-click="searchTable2">
         <el-table-column type="expand" label="详情">
@@ -83,11 +82,11 @@
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" align="center" min-width="130">
-          <template slot-scope="scope">
-            {{ scope.row.采购合同名称 }}
-          </template>
-        </el-table-column>
+        <!--        <el-table-column label="采购合同名称" align="center" min-width="130">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.采购合同名称 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="供应商" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -23,10 +23,10 @@
           <!--<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>-->
           <!--</el-option>-->
           <!--</el-select>-->
-          <!--<span>合同编号:</span>-->
-          <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px"/>
           <!--<span>供应商:</span>-->
-          <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
+          <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px" @keyup.enter.native="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()"/>
+          <!--<span>合同编号:</span>-->
+          <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:200px" @keyup.enter.native="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()"/>
           <!--<span>采购员:</span>-->
           <el-select v-model="personValue" placeholder="采购员" size="small" clearable style="width: 100px">
             <el-option
@@ -56,7 +56,7 @@
             size="small"
             icon="el-icon-search"
             style="margin-left:10px"
-            @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+            @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
           <el-tooltip :open-delay="1000" effect="dark" content="打印采购合同" placement="top">
             <el-button
               type="warning"
@@ -73,7 +73,7 @@
         size="mini"
         border
         style="width: 100%"
-        height="500px"
+        height="300px"
         highlight-current-row
         @row-click="searchTable2">
         <el-table-column label="详情" type="expand">
@@ -107,75 +107,100 @@
             </el-form>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" prop="供应商名称" align="center" width="150" show-overflow-tooltip>
+        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.采购合同名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购合同号" prop="采购合同编号" align="center" min-width="160">
+        <!--        <el-table-column label="采购合同名称" align="center" min-width="150">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.采购合同名称 }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="采购合同号" prop="采购合同编号" align="center" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="审核情况" prop="审核情况内容" align="center" min-width="100">
+        <el-table-column label="合同审核" prop="审核情况内容" align="center" width="70">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.审核情况内容==='未审核'" type="primary" size="small">未审核</el-tag>
-            <el-tag v-if="scope.row.审核情况内容==='通过审核'" type="success" size="small">已通过</el-tag>
-            <el-tag v-if="scope.row.审核情况内容==='未通过审核'" type="danger" size="small">未通过</el-tag>
+            <span v-if="scope.row.审核情况内容==='未审核'">未审核</span>
+            <span v-if="scope.row.审核情况内容==='通过审核'">已通过</span>
+            <span v-if="scope.row.审核情况内容==='未通过审核'">未通过</span>
+            <!--            <el-tag v-if="scope.row.审核情况内容==='未审核'" type="primary" size="small">未审核</el-tag>-->
+            <!--            <el-tag v-if="scope.row.审核情况内容==='通过审核'" type="success" size="small">已通过</el-tag>-->
+            <!--            <el-tag v-if="scope.row.审核情况内容==='未通过审核'" type="danger" size="small">未通过</el-tag>-->
           </template>
         </el-table-column>
-        <el-table-column label="审批情况" prop="审批情况内容" align="center" min-width="100">
+        <el-table-column label="合同审批" prop="审批情况内容" align="center" width="70">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.审批情况内容==='未审批'" type="primary" size="small">未审批</el-tag>
-            <el-tag v-if="scope.row.审批情况内容==='通过审批'" type="success" size="small">已通过</el-tag>
-            <el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>
+            <span v-if="scope.row.审批情况内容==='未审批'">未审批</span>
+            <span v-if="scope.row.审批情况内容==='通过审批'">已通过</span>
+            <span v-if="scope.row.审批情况内容==='不通过审批'">未通过</span>
+            <!--            <el-tag v-if="scope.row.审批情况内容==='未审批'" type="primary" size="small">未审批</el-tag>-->
+            <!--            <el-tag v-if="scope.row.审批情况内容==='通过审批'" type="success" size="small">已通过</el-tag>-->
+            <!--            <el-tag v-if="scope.row.审批情况内容==='不通过审批'" type="danger" size="small">未通过</el-tag>-->
           </template>
         </el-table-column>
-        <el-table-column label="未通过审核原因" align="center" width="150" show-overflow-tooltip>
+        <el-table-column label="未审核原因" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.未通过审核原因 ? scope.row.未通过审核原因 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="未通过审批原因" align="center" width="150" show-overflow-tooltip>
+        <el-table-column label="未审批原因" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.未通过原因 ? scope.row.未通过原因 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="审核时间" align="center" min-width="140">
-          <template slot-scope="scope">
-            {{ scope.row.审核时间 ? scope.row.审核时间 : '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="140">
-          <template slot-scope="scope">
-            {{ scope.row.审批时间 ? scope.row.审核时间 : '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="处理" align="center" min-width="130">
-          <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===1" type="success" size="small">处理完成</el-tag>
-            <el-button v-else-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===0" type="primary" size="mini" @click="done(scope.row)">点击处理完成</el-button>
-            <span v-else>—</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="采购员" prop="姓名" align="center" min-width="90">
+        <el-table-column label="采购员" prop="姓名" align="center" width="60">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="总金额" align="center" width="100">
+        <el-table-column label="总金额" align="center" width="90">
           <template slot-scope="scope">
             {{ scope.row.合同总额 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="100" fixed="right">
+        <el-table-column label="已付金额" align="center" width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-button :disabled="false" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button>
+            {{ scope.row.付款金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="欠款金额" align="center" width="90" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.欠款金额 }}
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="审核时间" align="center" width="80">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.审核时间 ? scope.row.审核时间.substr(0,9) : '—' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="审批时间" align="center" min-width="80">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.审批时间 ? scope.row.审核时间.substr(0,9) : '—' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="处理" align="center" width="110">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag v-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===1" type="success" size="small">处理完成</el-tag>-->
+        <!--            <el-button v-else-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===0" plain type="primary" size="mini" @click="done(scope.row)">点击处理</el-button>-->
+        <!--            <span v-else>—</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="到货进度" align="center" min-width="150">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-progress-->
+        <!--              :text-inside="true"-->
+        <!--              :stroke-width="18"-->
+        <!--              :percentage="scope.row.到货进度 = (100*(Number(scope.row.合同到货总数))/scope.row.合同采购总数) > 100 ? 100 : Number((100*(Number(scope.row.合同到货总数))/scope.row.合同采购总数).toFixed(2))"-->
+        <!--              status="success"/>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="操作" align="center" width="70">
+          <template slot-scope="scope">
+            <el-button :disabled="false" type="text" size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -201,7 +226,7 @@
 </template>
 
 <script>
-import { initContract, initBuyer, searchTable1, searchTable2, deleteContract, handleDone } from '@/api/PurchasingCenter/PurchaseContractSearch'
+import { initContract, initBuyer, searchTable1, searchTable2, handleDone, deleteContract } from '@/api/PurchasingCenter/PurchaseContractSearch'
 import QRCode from 'qrcode'
 import $ from 'jquery'
 // import { exportExcelMethod } from './exportExcel'
@@ -369,6 +394,7 @@ export default {
       })
     },
     searchTable1() {
+      this.tableData1 = []
       this.tableData2 = []
       this.textarea = ``
       this.loading1 = true
@@ -392,7 +418,26 @@ export default {
         for (let i = 0; i < response.data.rows.length; i++) {
           response.data.rows[i].审批情况内容 === '未审批' ? this.disable.push(false) : this.disable.push(true) // 删除按钮禁用
         }
-        this.tableData1 = response.data.rows
+        if (response.data.rows.length !== 0) {
+          for (let i = 0; i < response.data.rows.length; i++) {
+            this.tableData1.push({
+              供应商名称: response.data.rows[i].供应商名称,
+              采购合同编号: response.data.rows[i].采购合同编号,
+              未通过审核原因: response.data.rows[i].未通过审核原因,
+              审核情况内容: response.data.rows[i].审核情况内容,
+              审批情况内容: response.data.rows[i].审批情况内容,
+              未通过原因: response.data.rows[i].未通过原因,
+              合同总额: response.data.rows[i].合同总额,
+              付款金额: response.data.rows[i].付款金额,
+              是否未通过: response.data.rows[i].是否未通过,
+              不通过处理: response.data.rows[i].不通过处理,
+              姓名: response.data.rows[i].姓名,
+              合同金额: response.data.rows[i].合同金额,
+              欠款金额: response.data.rows[i].欠款金额,
+              采购合同流水号: response.data.rows[i].采购合同流水号
+            })
+          }
+        }
         this.total1 = response.data.total
         this.loading1 = false
       })

src/views/PurchasingCenter/PurchaseSituationSearch/index.vue

@@ -12,16 +12,16 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
-          <el-option
-            v-for="item in groupNumber"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-input v-model="Name" placeholder="名称" size="small" clearable/>
-        <el-input v-model="spec" placeholder="规格" size="small" clearable/>
-        <el-input v-model="model" placeholder="型号" size="small" clearable/>
+        <!--        <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>-->
+        <!--          <el-option-->
+        <!--            v-for="item in groupNumber"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <el-input v-model="Name" placeholder="名称规格型号" size="small" clearable/>
+        <!--        <el-input v-model="spec" placeholder="规格" size="small" clearable/>-->
+        <!--        <el-input v-model="model" placeholder="型号" size="small" clearable/>-->
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="将全部采购件导出到表格" placement="top">
           <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -22,13 +22,14 @@
     <el-tabs id="PurchasingCenter/PurchaseTaskAllocate" v-model="tabName" type="border-card" @tab-click="searchTable0();searchTable1();searchTable2();">
       <el-tab-pane label="标准件" name="标准件">
         <el-row style="margin-bottom: 5px">
-          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
-            <el-option
-              v-for="item in project"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
+          <!--<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
+          <!--<el-option-->
+          <!--v-for="item in project"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
+          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()"/>
           <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
             <el-option
               v-for="item in machine"
@@ -39,13 +40,13 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
-          <el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable width="100px">
-            <el-option
-              v-for="item in group"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
+          <!--<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable width="100px">-->
+          <!--<el-option-->
+          <!--v-for="item in group"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
           <el-date-picker
             v-show="false"
             v-model="dateRange"
@@ -59,7 +60,7 @@
             style="width:250px"
             start-placeholder="开始日期"
             end-placeholder="结束日期"/>
-          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" width="100px"/>
+          <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" width="100px"/>-->
           <el-select
             v-model="MaterialCategoryValue"
             placeholder="物料类别"
@@ -72,18 +73,6 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <div style="float:right;">
-            <span style="margin-left: 0">采购员:</span>
-            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
-              <el-option
-                v-for="item in person"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </div>
-        </el-row>
-        <el-row style="margin-bottom: 5px">
           <el-select
             v-model="MaterialVarietyValue"
             placeholder="物料品种"
@@ -95,11 +84,16 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
           <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
-          <div style="float:right">
+          <div style="float:right;">
+            <span style="margin-left: 0">采购员:</span>
+            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
+              <el-option
+                v-for="item in person"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
             <el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
               <el-button
                 type="primary"
@@ -129,6 +123,26 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="center" prop="物料名称" label="名称" min-width="180px">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料规格" label="规格" min-width="300">
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="150px">
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="数量" min-width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
@@ -154,26 +168,6 @@
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">
-              <template slot-scope="scope">
-                {{ scope.row.物料型号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.物料名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料规格" label="规格" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.物料规格 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="数量" min-width="80px">
-              <template slot-scope="scope">
-                {{ scope.row.零件数量 }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="备注" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
@@ -214,9 +208,8 @@
                 <el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
                   <el-button
                     :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
-                    type="primary"
-                    size="mini"
                     plain
+                    size="mini"
                     icon="el-icon-back"
                     @click="retract(scope.row)">撤回</el-button>
                 </el-tooltip>
@@ -238,14 +231,15 @@
       </el-tab-pane>
       <el-tab-pane label="外购件" name="外购件">
         <el-row style="margin-bottom: 5px">
-          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
-            <el-option
-              v-for="item in project"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
+          <!--<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
+          <!--<el-option-->
+          <!--v-for="item in project"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
+          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()"/>
+          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
             <el-option
               v-for="item in machine"
               :key="item.value"
@@ -255,14 +249,14 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
-          <el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
-            <el-option
-              v-for="item in group"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
+          <!--<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>-->
+          <!--<el-option-->
+          <!--v-for="item in group"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
+          <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>-->
           <el-select
             v-model="MaterialCategoryValue"
             placeholder="物料类别"
@@ -275,18 +269,6 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <div style="float:right;">
-            <span style="margin-left: 0">采购员:</span>
-            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
-              <el-option
-                v-for="item in person"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </div>
-        </el-row>
-        <el-row style="margin-bottom: 5px">
           <el-select
             v-model="MaterialVarietyValue"
             placeholder="物料品种"
@@ -298,28 +280,18 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-          <el-button
-            type="success"
-            size="small"
-            icon="el-icon-search"
-            style="margin-left: 10px;"
-            @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
-          <div style="float:right">
-            <el-button
-              type="primary"
-              size="small"
-              icon="el-icon-menu"
-              style="margin-left: 10px"
-              @click="allocateTask1">分配</el-button>
-            <el-button
-              type="danger"
-              size="small"
-              icon="el-icon-back"
-              style="margin-left: 10px"
-              @click="executeReturn1">退回</el-button>
+          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
+          <div style="float:right;">
+            <span style="margin-left: 0">采购员:</span>
+            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
+              <el-option
+                v-for="item in person"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+            <el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask1">分配</el-button>
+            <el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">退回</el-button>
           </div>
         </el-row>
         <el-row style="margin-bottom: 10px">
@@ -333,6 +305,26 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="center" prop="物料名称" label="名称" min-width="180px">
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料规格" label="规格" min-width="300">
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="150px">
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="数量" min-width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
@@ -358,26 +350,6 @@
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="110px">
-              <template slot-scope="scope">
-                {{ scope.row.物料型号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料名称" label="名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.物料名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="物料规格" label="规格" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.物料规格 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="数量" min-width="80px">
-              <template slot-scope="scope">
-                {{ scope.row.零件数量 }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="备注" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
@@ -417,7 +389,7 @@
               <template slot-scope="scope">
                 <el-button
                   :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
-                  type="primary"
+                  plain
                   size="mini"
                   icon="el-icon-back"
                   @click="retract(scope.row)">撤回</el-button>
@@ -439,14 +411,15 @@
       </el-tab-pane>
       <el-tab-pane label="基本件" name="基本件">
         <el-row style="margin-bottom: 5px">
-          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
-            <el-option
-              v-for="item in project"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
+          <!--<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
+          <!--<el-option-->
+          <!--v-for="item in project"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
+          <el-input v-model="partNum" placeholder="图号名称规格材料" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()"/>
+          <el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable>
             <el-option
               v-for="item in machine"
               :key="item.value"
@@ -456,15 +429,15 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
-          <el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
-            <el-option
-              v-for="item in group"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
-          <el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
+          <!--<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>-->
+          <!--<el-option-->
+          <!--v-for="item in group"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
+          <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>-->
+          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
           <div style="float:right">
             <span style="margin-left: 0">采购员:</span>
             <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
@@ -474,31 +447,8 @@
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
-          </div>
-        </el-row>
-        <el-row style="margin-bottom: 5px">
-          <el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
-          <el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
-          <el-input v-model="partMaterial" placeholder="零件材料" size="small" clearable/>
-          <el-button
-            type="success"
-            size="small"
-            icon="el-icon-search"
-            style="margin-left: 10px;"
-            @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
-          <div style="float:right">
-            <el-button
-              type="primary"
-              size="small"
-              icon="el-icon-menu"
-              style="margin-left: 10px"
-              @click="allocateTask2">分配</el-button>
-            <el-button
-              type="danger"
-              size="small"
-              icon="el-icon-back"
-              style="margin-left: 10px"
-              @click="executeReturn2">退回</el-button>
+            <el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>
+            <el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">退回</el-button>
           </div>
         </el-row>
         <el-row style="margin-bottom: 10px">
@@ -512,6 +462,31 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="center" prop="零件图号" label="图号" min-width="120px">
+              <template slot-scope="scope">
+                {{ scope.row.零件图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="零件名称" label="名称" width="180px">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="规格" label="规格" width="250px">
+              <template slot-scope="scope">
+                {{ scope.row.规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="材料" width="180">
+              <template slot-scope="scope">
+                {{ scope.row.材料 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="数量" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.零件数量 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
@@ -527,31 +502,6 @@
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="零件图号" label="图号" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.零件图号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="零件名称" label="名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.零件名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="规格" label="规格" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.规格 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="材料" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.材料 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="数量" min-width="80px">
-              <template slot-scope="scope">
-                {{ scope.row.零件数量 }}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="备注" min-width="100px">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
@@ -586,7 +536,7 @@
               <template slot-scope="scope">
                 <el-button
                   :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
-                  type="primary"
+                  plain
                   size="mini"
                   icon="el-icon-back"
                   @click="retract(scope.row)">撤回</el-button>
@@ -762,6 +712,7 @@ export default {
   created() {
     this.searchTable0() // 查表1
     this.fetchData() // 初始化数据
+    this.projectChange()
     this.searchUnallocatePartNumber()
     this.timer2 = setInterval(this.searchUnallocatePartNumber, 20 * 60 * 1000) // 20 分钟一刷新
     this.getDefaultTime()

src/views/PurchasingCenter/ReceiveCheck/index.vue

@@ -2,22 +2,32 @@
   <div class="app-container receiveCheck">
     <el-card>
       <div slot="header">
-        <span>项目名称:</span>
-        <el-select v-model="projectValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
+        <el-select v-model="machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="machineChange">
           <el-option
-            v-for="item in project"
+            v-for="item in machines"
             :key="item.value"
             :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>机床图号:</span>
-        <el-select v-model="machineValue" style="width:190px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
-          <el-option
-            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.value2 }}</div>
+          </el-option>
         </el-select>
+        <!--        <span>项目名称:</span>-->
+        <!--        <el-select v-model="projectValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="projectChange">-->
+        <!--          <el-option-->
+        <!--            v-for="item in project"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <!--        <span>机床图号:</span>-->
+        <!--        <el-select v-model="machineValue" style="width:190px" placeholder="请选择" size="small" clearable filterable @change="machineChange">-->
+        <!--          <el-option-->
+        <!--            v-for="item in machine"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
         <span>组号:</span>
         <el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>
           <el-option
@@ -63,7 +73,7 @@
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="物料型号">
+        <el-table-column align="center" label="物料型号" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
@@ -85,7 +95,7 @@
         </el-table-column>
         <el-table-column align="center" label="领用时间" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.出库时间 }}
+            {{ scope.row.出库时间.substr(0,10) }}
           </template>
         </el-table-column>
       </el-table>
@@ -94,14 +104,15 @@
 </template>
 
 <script>
-import { initProject, searchMachine, searchGroup, searchReceiveCheck } from '@/api/PurchasingCenter/ReceiveCheck'
+import { initProject, searchGroup, searchReceiveCheck, getMachines } from '@/api/PurchasingCenter/ReceiveCheck'
+import Cookie from 'js-cookie'
 export default {
   data() {
     return {
       projectValue: '', // 项目名称
       project: [],
-      machineValue: '',
-      machine: [],
+      machine: '',
+      machines: [],
       groupValue: '',
       group: [],
       tableData1: [],
@@ -113,29 +124,69 @@ export default {
   },
   created() {
     this.fetchData()
+    this.getMachine()
   },
   methods: {
+    getMachine() {
+      if (Cookie.get('machineValue') !== undefined) {
+        this.machine = ''
+        this.machines = []
+        getMachines().then(response => {
+          console.log(response, 343434)
+          for (let i = 0; i < response.data.length; i++) {
+            this.machines.push({
+              label: response.data[i].机床图号,
+              value: response.data[i].机床流水号,
+              value2: response.data[i].项目名称
+            })
+          }
+          if (Cookie.get('group') !== undefined) {
+            this.machine = parseInt(Cookie.get('machineValue'))
+            this.Group = parseInt(Cookie.get('group'))
+            // this.getTableData()
+            Cookie.remove('machineValue')
+            Cookie.remove('group')
+          } else {
+            // this.getTableData()
+            Cookie.remove('machineValue')
+            Cookie.remove('group')
+          }
+        })
+      } else {
+        this.Machine = ''
+        this.Machines = []
+        getMachines().then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.machines.push({
+              label: response.data[i].机床图号,
+              value: response.data[i].机床流水号,
+              value2: response.data[i].项目名称
+            })
+          }
+        })
+      }
+    },
     fetchData() {
       this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
     },
-    projectChange() {
-      this.machine = []
-      this.machineValue = ''
-      this.group = []
-      this.groupValue = ''
-      searchMachine(this.projectValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.machine.push({
-            value: response.data[i].机床流水号,
-            label: response.data[i].机床图号
-          })
-        }
-      })
-    },
+    // projectChange() {
+    //   this.machines = []
+    //   this.machine = ''
+    //   this.group = []
+    //   this.groupValue = ''
+    //   searchMachine(this.projectValue).then(response => {
+    //     for (let i = 0; i < response.data.length; i++) {
+    //       this.machines.push({
+    //         value: response.data[i].机床流水号,
+    //         label: response.data[i].机床图号
+    //       })
+    //     }
+    //   })
+    // },
     machineChange() {
       this.group = []
       this.groupValue = ''
-      searchGroup(this.machineValue).then(response => {
+      searchGroup(this.machine).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.group.push({
             value: response.data[i].组件流水号,
@@ -171,18 +222,18 @@ export default {
       return sums
     },
     searchProject() { // 查询
-      if (!this.projectValue) {
-        this.$message.error('请选择项目')
-      } else {
-        let check2, check3
-        this.machineValue ? check2 = 1 : check2 = 0
-        this.groupValue ? check3 = 1 : check3 = 0
-        searchReceiveCheck(1, this.projectValue, check2, this.machineValue, check3, this.groupValue).then(response => {
-          this.tableData1 = response.data
-        })
-      }
+      // if (!this.projectValue) {
+      //   this.$message.error('请选择项目')
+      // } else {
+      let check2, check3
+      this.machine ? check2 = 1 : check2 = 0
+      this.groupValue ? check3 = 1 : check3 = 0
+      searchReceiveCheck(0, this.projectValue, check2, this.machine, check3, this.groupValue).then(response => {
+        this.tableData1 = response.data
+      })
     }
   }
+  // }
 }
 </script>
 

src/views/PurchasingCenter/SupplierManagement/index.vue

@@ -8,61 +8,61 @@
               <el-input v-model="supplierName" placeholder="供应商名称" size="small" clearable/>
             </el-form-item>
           </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="法人">
-              <el-input v-model="businessNature" placeholder="法人" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="受托人">
-              <el-input v-model="registeredCapital" placeholder="受托人" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="邮编">
-              <el-input v-model="deliveryPeriod" placeholder="邮编" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="税号">
-              <el-input v-model="taxNumber" placeholder="税号" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="电子信箱">
-              <el-input v-model="email" placeholder="电子信箱" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="电话号码">
-              <el-input v-model="telephone" placeholder="电话号码" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="开户行">
-              <el-input v-model="bank" placeholder="开户行" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="帐号">
-              <el-input v-model="account" placeholder="帐号" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="地址">
-              <el-input v-model="address" placeholder="地址" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="传真">
-              <el-input v-model="fax" placeholder="传真" size="small" clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col style="width: 250px">
-            <el-form-item label="主要产品">
-              <el-input v-model="mainProduction" placeholder="主要产品" size="small" clearable/>
-            </el-form-item>
-          </el-col>
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="法人">-->
+          <!--              <el-input v-model="businessNature" placeholder="法人" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="受托人">-->
+          <!--              <el-input v-model="registeredCapital" placeholder="受托人" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="邮编">-->
+          <!--              <el-input v-model="deliveryPeriod" placeholder="邮编" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="税号">-->
+          <!--              <el-input v-model="taxNumber" placeholder="税号" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="电子信箱">-->
+          <!--              <el-input v-model="email" placeholder="电子信箱" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="电话号码">-->
+          <!--              <el-input v-model="telephone" placeholder="电话号码" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="开户行">-->
+          <!--              <el-input v-model="bank" placeholder="开户行" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="帐号">-->
+          <!--              <el-input v-model="account" placeholder="帐号" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="地址">-->
+          <!--              <el-input v-model="address" placeholder="地址" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="传真">-->
+          <!--              <el-input v-model="fax" placeholder="传真" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col style="width: 250px">-->
+          <!--            <el-form-item label="主要产品">-->
+          <!--              <el-input v-model="mainProduction" placeholder="主要产品" size="small" clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col style="width: 250px;margin:2px 0 0 15px">
             <el-button type="success" size="small" icon="el-icon-search" @click="pageCurrent = 1;fetchData()">查询</el-button>
             <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增供应商</el-button>
@@ -72,8 +72,8 @@
     </el-card>
 
     <el-card>
-      <div style="display: inline-block;margin-bottom: 20px">供应商列表</div>
-      <el-table :data="List" stripe highlight-current-row border style="width: 100%;max-height: 600px;" height="600" size="mini" @row-click="rowClick">
+      <div style="display: inline-block;margin-bottom: 5px">供应商列表</div>
+      <el-table :data="List" stripe highlight-current-row border style="width: 100%;max-height: 600px;" height="500" size="mini" @row-click="rowClick">
         <el-table-column label="供应商名称" align="center" fixed="left" min-width="250">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -144,7 +144,7 @@
       <div class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[10, 20, 30, 40, 100]"
           :page-size="pageSize"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
@@ -372,7 +372,7 @@ export default {
       check12: 0,
       List: [],
       pageCurrent: 1,
-      pageSize: 10,
+      pageSize: 100,
       total: 0,
       title: '',
       dialogFormVisible: false,
@@ -466,7 +466,7 @@ export default {
               this.$message.success('增加成功')
               this.dialogFormVisible = false
               this.pageCurrent = 1
-              this.pageSize = 10
+              this.pageSize = 100
               this.fetchData()
             } else { this.$message.error('增加失败') }
           })
@@ -505,7 +505,7 @@ export default {
               this.$message.success('编辑成功')
               this.dialogFormVisible = false
               this.pageCurrent = 1
-              this.pageSize = 10
+              this.pageSize = 100
               this.fetchData()
             } else { this.$message.error('编辑失败') }
           })
@@ -528,7 +528,7 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.pageCurrent = 1
-            this.pageSize = 10
+            this.pageSize = 100
             this.fetchData()
           } else { this.$message.error('删除失败') }
         })

src/views/TechnologyCenter/ImportChangeParts/index.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
     <el-card v-loading="loading">
-      <el-col :span="6">
-        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">
-          <el-step title="选择项目"/>
-          <el-step title="选择类型"/>
-          <el-step title="浏览"/>
-          <el-step title="导入到数据库"/>
-          <el-step title="传递"/>
-        </el-steps>
-      </el-col>
-      <div style="width: 620px;margin: 0 auto">
+      <!--      <el-col :span="6">-->
+      <!--        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">-->
+      <!--          <el-step title="选择项目"/>-->
+      <!--          <el-step title="选择类型"/>-->
+      <!--          <el-step title="浏览"/>-->
+      <!--          <el-step title="导入到数据库"/>-->
+      <!--          <el-step title="传递"/>-->
+      <!--        </el-steps>-->
+      <!--      </el-col>-->
+      <div style="width: 620px;margin: 0px 400px">
         <div style="overflow: hidden">
           <div style="margin-bottom: 10px;">
             <span>项目：</span>

src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue

@@ -36,7 +36,6 @@
       <el-table
         v-loading="listLoading"
         :data="tableData"
-        :row-class-name="tableRowClassName"
         size="mini"
         height="300"
         highlight-current-row
@@ -618,12 +617,6 @@ export default {
     pagination(pageCurrent, pageSize) {
       this.tableData = this.tableDataAll.slice((pageCurrent - 1) * pageSize, pageCurrent * pageSize)
     },
-    tableRowClassName({ row }) {
-      if (this.unSpecification.data.indexOf(row) > -1) {
-        return 'warning-row'
-      }
-      return ''
-    },
     handleEdit(row) {
       this.editForm(row, 'form', [this.title = '编辑零件信息', this.dialogFormVisible = true])
       if (this.type === 2) {

src/views/TechnologyCenter/ImportParts/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
     <el-card v-loading="loading">
+      <!--      <el-col :span="6">-->
+      <!--        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">-->
+      <!--          <el-step title="选择项目"/>-->
+      <!--          <el-step title="选择类型"/>-->
+      <!--          <el-step title="浏览"/>-->
+      <!--          <el-step title="导入到数据库"/>-->
+      <!--          <el-step title="传递"/>-->
+      <!--        </el-steps>-->
+      <!--      </el-col>-->
       <el-col :span="6">
-        <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">
-          <el-step title="选择项目"/>
-          <el-step title="选择类型"/>
-          <el-step title="浏览"/>
-          <el-step title="导入到数据库"/>
-          <el-step title="传递"/>
-        </el-steps>
-      </el-col>
-      <el-col :span="6">
-        <div style="width: 650px;margin: 0">
+        <div style="width: 650px;margin: 0px 400px ">
           <div style="overflow: hidden">
             <div style="margin-bottom: 0px;">
               <span>项目：</span>

src/views/TechnologyCenter/ImportParts/specificationData.vue

@@ -32,140 +32,147 @@
         </el-row>
       </div>
     </el-card>
-    <el-card>
-      <el-table
-        v-loading="listLoading"
-        :data="tableData"
-        size="mini"
-        border
-        stripe
-        height="280px"
-        highlight-current-row
-        @row-click="searchMaterial1">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column align="center" label="物料状态" min-width="50">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
-            <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="图号" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.图号或者型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="名称" min-width="200" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="材料" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.材料或者规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="规格" width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="备件数量" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.备件数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="装机数量" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.装机数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="部件数量" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.部件数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="制造商" min-width="200">
-          <template slot-scope="scope">
-            {{ scope.row.制造商 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="备注" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.备注 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="分类码" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.分类码 }}
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="操作" fixed="right" align="center" width="200">-->
-        <!--<template slot-scope="scope">-->
-        <!--<el-button-->
-        <!--size="mini"-->
-        <!--type="primary"-->
-        <!--icon="el-icon-edit"-->
-        <!--@click="handleEdit(scope.row)">编辑</el-button>-->
-        <!--<el-button-->
-        <!--size="mini"-->
-        <!--type="danger"-->
-        <!--icon="el-icon-delete"-->
-        <!--@click="handleDelete(scope.row)">删除</el-button>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-      </el-table>
-      <div class="block">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 40, 100]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
-    <el-card>
-      <el-table
-        :data="tableData10"
-        :cell-class-name="cell"
-        style="width: 100%"
-        size="mini"
-        height="200px"
-        highlight-current-row
-        border
-        stripe>
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column align="center" label="物料名称">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料规格">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="物料型号">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="供货商">
-          <template slot-scope="scope">
-            {{ scope.row.供货商 }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
+    <el-row>
+      <el-col style="width: 60%">
+        <el-card>
+          <el-table
+            v-loading="listLoading"
+            :data="tableData"
+            size="mini"
+            border
+            stripe
+            style="width: 100%"
+            height="500px"
+            highlight-current-row
+            @row-click="searchMaterial1">
+            <el-table-column
+              label="序号"
+              align="center"
+              type="index"
+              width="50"/>
+            <el-table-column align="center" label="物料状态" min-width="70">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
+                <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="图号" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.图号或者型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="名称" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="材料" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.材料或者规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="规格" width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="备件数量" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.备件数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="装机数量" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.装机数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="部件数量" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.部件数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="制造商" min-width="100">
+              <template slot-scope="scope">
+                {{ scope.row.制造商 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="备注" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="分类码" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.分类码 }}
+              </template>
+            </el-table-column>
+            <!--<el-table-column label="操作" fixed="right" align="center" width="200">-->
+            <!--<template slot-scope="scope">-->
+            <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="primary"-->
+            <!--icon="el-icon-edit"-->
+            <!--@click="handleEdit(scope.row)">编辑</el-button>-->
+            <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="danger"-->
+            <!--icon="el-icon-delete"-->
+            <!--@click="handleDelete(scope.row)">删除</el-button>-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+          </el-table>
+          <div class="block">
+            <el-pagination
+              :current-page="pageCurrent"
+              :page-sizes="[10, 20, 40, 100]"
+              :page-size="pageSize"
+              :total="total"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"/>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col style="width: 39%">
+        <el-card>
+          <el-table
+            :data="tableData10"
+            :cell-class-name="cell"
+            style="width: 100%"
+            size="mini"
+            height="530px"
+            highlight-current-row
+            border
+            stripe>
+            <el-table-column
+              label="序号"
+              align="center"
+              type="index"
+              width="50"/>
+            <el-table-column align="center" label="物料名称" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.物料名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="物料规格" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.物料规格 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="物料型号" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.物料型号 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="供货商" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.供货商 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
 
     <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">