diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js index b613987c..25fdf5ec 100644 --- a/src/api/MarketingCenter/ContractCapitalManagement.js +++ b/src/api/MarketingCenter/ContractCapitalManagement.js @@ -26,7 +26,7 @@ export function initMarketingManager() { } }) } -export function searchTable1(pageCurrent, pageSize, num1, num2, num3) { +export function searchTable1(pageCurrent, pageSize, num1, num2, num3, check1, starttime, endtime, ordername, order) { return request({ url: '', method: 'post', @@ -35,7 +35,7 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3) { ModularID: router.currentRoute.path, type: '1', name: '合同资金管理_资金信息_查询1', - param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&客户名称=' + num3 + '=string', + param: '客户名称=' + num3 + '=string' + '&时间_check=' + check1 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index ef4311f0..91080446 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -12,17 +12,17 @@ - 分配外购备料 + 外购备料 - 分配自家备料 - - - 打印自家备料单 - - - 导出 + 自家备料 + + + + + + @@ -44,14 +44,16 @@ @selection-change="handleSelectionChange"> - + @@ -75,12 +77,12 @@ {{ scope.row.材料 }} - + - + @@ -170,6 +172,15 @@ export default { this.searchTable() }, methods: { + // 复选框 + checkboxT(row, rowIndex) { + if (row.备料打印 === '0' && row.是否外购备料 === '0') { + // if(row.lie =='1'){ + return true// 禁用 + } else { + return false// 不禁用 + } + }, sortChange(column, prop, order) { console.log(column + '-' + column.prop + '-' + column.order, 11111) if (column.prop === '零件名称') { diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue index 37cab537..c517b5a1 100644 --- a/src/views/MarketingCenter/BidBond/index.vue +++ b/src/views/MarketingCenter/BidBond/index.vue @@ -3,6 +3,19 @@ + 签订日期 + @@ -26,7 +39,7 @@ 查询 - 新增 + 保证金 @@ -40,7 +53,7 @@ border stripe size="mini"> - + - + - + - + R @@ -68,58 +81,63 @@ {{ scope.row.联系电话 }} - + - + - + - + - + - + + + + - + - + - + - + - + - + - + @@ -193,7 +212,7 @@ - +
- - - - + + + + + + - - - - - - + + + + + + + + + +
- 取消 - 确认 + 取消 + 确认 + + - +
- 取消 - 确 定 + 取消 + 确 定 + +
- + @@ -275,8 +298,8 @@ - - + + @@ -298,35 +321,35 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -336,14 +359,14 @@
- 取消 - 确 定 + 取消 + 确 定
- + - + - - + +
- 取消 - 确 定 + 取消 + 确 定
- - + + - + - - - - - - - - - - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
- 取消 - 确 定 + 取消 + 确 定
@@ -430,8 +449,56 @@ export default { elInput }, data() { + const validateValue = (rule, value, callback) => { + console.log(value, 2222) + if (value === 0.00) { + callback(new Error('金额不能为0')) + } else if (value) { + // const reg = /^\-\d\.?\d*$/ + // const boolean = reg.test(value) + const boolean = new RegExp(/^(\+)?\d+(\.\d+)?$/).test(value) + console.log(boolean) + if (!boolean) { + callback(new Error('请输入正数')) + this.form.contractAmount = '' + } else { + console.log(2222) + callback() + } + } else { + callback() + } + } return { - pickerOptions: {}, + dateRange: '', + check1: '', + pickerOptions: { + shortcuts: [{ + text: '上季度', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3) + picker.$emit('pick', [start, end]) + } + }, { + text: '过去半年', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2) + picker.$emit('pick', [start, end]) + } + }, { + text: '过去一年', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 365) + picker.$emit('pick', [start, end]) + } + }] + }, timetime: '', treeData: [7], entryName: [], @@ -462,7 +529,7 @@ export default { time: [], // 时间区间 radio: '', tableData1: [], - tenderResultMax: null, + tenderResultMax: 0, PageSize: 30, PageCurrent: 1, total: null, @@ -471,6 +538,7 @@ export default { ListPeople: [], peopleid: '', peoplename: '', + test: 9.00, dialogFormVisible1: false, dialogTimeVisible: false, form1: { @@ -507,7 +575,7 @@ export default { 保证金类型: [{ required: true, message: '请选择保证金类型', trigger: 'change' }], 收回条件: [{ required: true, message: '请选择收回条件', trigger: 'change' }], 截止时间: [{ required: true, message: '请选择截止日期', trigger: 'change' }], - 保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'change' }] + 保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'change' }, { required: true, trigger: 'change', validator: validateValue }] }, TimeRules: { // 表单验证规则 投标结果公布日期: [{ required: true, message: '请选择投标结果公布日期', trigger: 'change' }], @@ -517,10 +585,10 @@ export default { 招标企业: [{ required: true, message: '请输入招标企业', trigger: 'blur' }], 联系人: [{ required: true, message: '请输入联系人', trigger: 'blur' }], 联系电话: [{ required: true, message: '请输入联系电话', trigger: 'blur' }], - 保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'blur' }], + 保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'blur' }, { required: true, trigger: 'change', validator: validateValue }], 保证金类型: [{ required: true, message: '请输入保证金类型', trigger: 'change' }], 投标人: [{ required: true, message: '请输入投标人', trigger: 'change' }], - 投标日期: [{ required: true, message: '请选择收回日期', trigger: 'change' }], + // 投标日期: [{ required: true, message: '请选择收回日期', trigger: 'change' }], 计划收回日期: [{ required: true, message: '请选择计划收回日期', trigger: 'change' }], 提前X天提醒我: [{ required: true, message: '提前X天提醒我', trigger: 'blur' }] } @@ -565,18 +633,20 @@ export default { } else { this.TenderingEnterprise_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.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '') + // 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.tableData1Loading = true - selectBidBond(this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.PageCurrent, this.PageSize).then(response => { + selectBidBond(this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.check1, this.dateRange[0], this.check1, this.dateRange[1], this.PageCurrent, this.PageSize).then(response => { this.tableData1Loading = false const data = response.data.rows for (let i = 0; i < data.length; i++) { @@ -731,7 +801,8 @@ export default { }, changeTenderResult(row) { this.code = row.招标保证金流水号 - this.tenderResultMax = row.应收回金额 + // this.tenderResultMax = Number(row.应收回金额)).toFixed(2) + this.tenderResultMax = parseFloat(row.应收回金额) if (row.投标结果 === '1') { this.radio = '1' this.dialogTimeVisible = true @@ -780,6 +851,24 @@ export default { diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue index 68450be3..befa99e8 100644 --- a/src/views/MarketingCenter/CRM/index.vue +++ b/src/views/MarketingCenter/CRM/index.vue @@ -24,58 +24,58 @@ 查询 - 添加营销经理 - 新增客户 - - - - - - - - - - - - - - - - - - - - - - + + 客户 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -122,7 +122,7 @@ {{ scope.row.电话 }} - + @@ -137,21 +137,21 @@ {{ scope.row.电子邮箱 }} - - - - - - - - - + + + + + + + + + + + + + + +