diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue index d9d50248..1bcc4158 100644 --- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -24,9 +24,9 @@ - + - 新增工艺名称 + 新增工艺 @@ -67,16 +67,21 @@ {{ scope.row.工艺名称 }} + + + - + - + @@ -112,7 +112,7 @@ {{ scope.row.MES终端编号 }} - + diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue index b2057c8c..6530d9e2 100644 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue @@ -16,7 +16,7 @@ 查询全部 查询 - 导出 + 导出 diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index d7ab8a55..6334119e 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -310,7 +310,7 @@ - +
- - - - - 新增 - 编辑 - 删除 - - - - - - - - - - - - - - 新增工艺名称 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + 查询 + + 新增 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- 取 消 - 确 定 -
- - - - - - - -
- 取 消 - 确 定 -
- - - - - - - - - - -
- 取 消 - 确 定 -
- - - - - - - - - - - - - -
- 取 消 - 确 定 -
- - - - - - - -
- 取 消 - 确 定 -
- - - - - - - -
- 取 消 - 确 定 + 取消 + 确定
+ - - diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue index bb52fbef..8964c898 100644 --- a/src/views/MarketingCenter/BidBond/index.vue +++ b/src/views/MarketingCenter/BidBond/index.vue @@ -58,11 +58,11 @@ border stripe size="mini"> - + @@ -106,14 +106,14 @@ {{ Number(scope.row.转履约保证金金额).toFixed(2) }} - - - + + + + + @@ -167,7 +167,7 @@
- - + + @@ -419,21 +420,21 @@ - + - - - - - - - + + + + + + + + + + + @@ -565,7 +566,7 @@ export default { 回收金额: 0 }, Timeform: { - 投标结果公布日期: '', + 投标结果公布日期: getNowShotTime(), 中标服务费: '' }, PerformanceBondform: { @@ -609,7 +610,7 @@ export default { 保证金金额: [{ 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' }] } @@ -677,8 +678,8 @@ export default { } if (val.length !== 0) { import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约保证金(万元)', '应收(万元)', '已收(万元)', '未收(万元)', '保证金备注'] - const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '产品品种代码', '未收金额', '备注'] + const tHeader = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约保证金(万元)', '应收(万元)', '已收(万元)', '未收(万元)', '保金类型', '联系人', '联系电话', '保证金备注'] + const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '产品品种代码', '未收金额', '保证金类型', '联系人', '联系电话', '备注'] const list = val.data const data = this.formatJson(filterVal, list) excel.export_json_to_excel({ @@ -917,6 +918,7 @@ export default { if (row.投标结果 === '1') { this.radio = '1' this.dialogTimeVisible = true + // this.Timeform.投标结果公布日期 = getNowShotTime() this.tenderResultDisabled = false } else if (row.投标结果 === '2') { this.radio = '2' @@ -928,14 +930,18 @@ export default { this.dialogTimeVisible = false this.fetchTableData1() }, - submitTime() { - winningBid(this.code, this.radio, this.Timeform.投标结果公布日期, this.Timeform.中标服务费).then(response => { - if (response.data[0].result === '1') { - this.fetchTableData1() - this.dialogTimeVisible = false - this.$message.success('操作成功') - } else { - this.$message.error('操作失败') + submitTime(formName) { + this.$refs[formName].validate((valid) => { + if (valid) { + winningBid(this.code, this.radio, this.Timeform.投标结果公布日期, this.Timeform.中标服务费).then(response => { + if (response.data[0].result === '1') { + this.fetchTableData1() + this.dialogTimeVisible = false + this.$message.success('操作成功') + } else { + this.$message.error('操作失败') + } + }) } }) }, diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue index d401b3bb..c7279629 100644 --- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue +++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue @@ -10,18 +10,30 @@ :value="item.value"/> + 查询 - - - + + + - + @@ -80,23 +92,33 @@ @current-change="handleCurrentChange"/>
- + - + - + - + + + + + + + @@ -613,6 +635,34 @@ export default { }, data() { return { + dateRange: '', + 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]) + } + }] + }, customerName1: '', customerName1_check: '', tableDataLoadingDeliveryManagement: false, @@ -696,6 +746,9 @@ export default { this.peoplename = row.姓名 }, fetchTableData1() { + this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '') + this.startTime = this.dateRange[0] ? this.dateRange[0] : null + this.endTime = this.dateRange[1] ? this.dateRange[1] : null 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 } diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index 6467c70a..763fb8c8 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -382,7 +382,7 @@ export default { return prev } }, 0) - sums[index] = sums[index].toFixed(2) + ' 元' + sums[index] = sums[index].toFixed(2) + ' 万元' } else { sums[index] = '0' } diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue index 3c76b860..b0fb171d 100644 --- a/src/views/MarketingCenter/InvoiceRecord/index.vue +++ b/src/views/MarketingCenter/InvoiceRecord/index.vue @@ -286,11 +286,11 @@ - + - + filterVal.map(j => { return v[j] @@ -625,7 +629,7 @@ export default { return prev } }, 0) - sums[index] = sums[index].toFixed(2) + ' 元' + sums[index] = sums[index].toFixed(2) + ' 万元' } else { sums[index] = '0' } diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index afaf8490..b63e0c44 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -90,9 +90,9 @@ {{ scope.row.批次数量 }} - + @@ -341,7 +341,7 @@ export default { this.List3.push({ 外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号, 加工价格_成交: response.data[i].加工价格_成交.toFixed(2), - 机加工开始时间: response.data[i].机加工开始时间, + 机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '', 零件图号: response.data[i].零件图号, 零件名称: response.data[i].零件名称, 批次数量: response.data[i].批次数量, diff --git a/src/views/WorkshopProcurement/AccountingPrice/index.vue b/src/views/WorkshopProcurement/AccountingPrice/index.vue index 1fc3c073..6c306e04 100644 --- a/src/views/WorkshopProcurement/AccountingPrice/index.vue +++ b/src/views/WorkshopProcurement/AccountingPrice/index.vue @@ -57,7 +57,7 @@ @@ -118,6 +118,7 @@ export default { }, searchTable() { this.loading = true + this.tableData = [] this.contractNumValue ? this.check1 = 1 : this.check1 = 0 searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue).then(response => { this.loading = false @@ -127,7 +128,19 @@ export default { response.data.rows[i].物料型号 = response.data.rows[i].零件图号 } } - this.tableData = response.data.rows + if (response.data.rows.length !== 0) { + for (let i = 0; i < response.data.rows.length; i++) { + this.tableData.push({ + 采购合同编号: response.data.rows[i].采购合同编号, + 供应商名称: response.data.rows[i].供应商名称, + 物料型号: response.data.rows[i].物料型号, + 物料名称: response.data.rows[i].物料名称, + 数量: response.data.rows[i].数量, + 单价: Number(response.data.rows[i].单价).toFixed(2), + 金额: response.data.rows[i].金额 + }) + } + } console.log(this.tableData) this.total = response.data.total }) diff --git a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue index d1d7e22c..9b874ea7 100644 --- a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue +++ b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue @@ -15,32 +15,32 @@ - + - + - + - + - + - + diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue index 857dbcd7..0816dcd2 100644 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -142,7 +142,7 @@ {{ scope.row.姓名 }} - + @@ -156,7 +156,7 @@
- 打印 +
@@ -972,6 +972,25 @@ export default { right: 15px; top: 5px; } + .el-form--label-left >>> .el-form-item__label { + text-align: right; + } + >>>.el-dialog--center .el-dialog__body { + text-align: initial; + padding: 20px 30px 20px + } + >>>.el-dialog__header { + padding: 20px 20px 0px; + } + >>>.el-dialog__footer { + padding: 0px 20px 20px; + /*text-align: right;*/ + -webkit-box-sizing: border-box; + box-sizing: border-box; + } + >>>.el-form-item { + margin-bottom: 13px; + } + diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index e2b3cfeb..e99bd796 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -174,7 +174,7 @@ {{ scope.row.重量 }} - + diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue index f8e287db..98b8a994 100644 --- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue +++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue @@ -186,6 +186,55 @@ +
+ +
+ + + + + + + + + + + + + + + + + + + +

江苏高精机电装备有限公司

{{ 采购单名称 }}

下单单位{{ 下单单位 }}单号{{ 单号 }}
下单日期{{ 下单日期 }}计划完成日期{{ 计划完成日期 }}
+ + + + + + + + + + + + + + + + + + + + + +
序号物料编码名称材料单位数量成品尺寸（长、宽、高）备注
{{ index + 1 }}{{ list.物料零件编码 }}{{ list.零件名称 }}{{ list.材料 }}{{ list.单位 }}{{ list.数量 }}{{ list.成品尺寸 }}{{ list.备注 }}
+
联系人:___________ 联系电话:___________
+
+ +
@@ -244,6 +293,7 @@ export default { 离线采购计划流水号: '', tableData: [], tableData3: [], + tableData4: [], arrival: [], judge: [] } @@ -521,6 +571,9 @@ export default { searchMX(row.离线采购计划流水号).then(response => { this.tableData3 = response.data }) + searchMX(row.离线采购计划流水号).then(response => { + this.tableData4 = response.data + }) }, saveWeight(index, row) { saveWeight(row.离线采购计划明细流水号, row.成品尺寸, row.备注, row.数量) diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue index 6a740620..48582131 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue @@ -227,7 +227,7 @@ - + @@ -683,6 +683,25 @@ function saveAs(blob, filename = '下载文件.xls') { .el-input{ width:200px } + .el-form--label-left >>> .el-form-item__label { + text-align: right; + } + >>>.el-dialog--center .el-dialog__body { + text-align: initial; + padding: 20px 30px 20px + } + >>>.el-dialog__header { + padding: 20px 20px 0px; + } + >>>.el-dialog__footer { + padding: 0px 20px 20px; + /*text-align: right;*/ + -webkit-box-sizing: border-box; + box-sizing: border-box; + } + >>>.el-form-item { + margin-bottom: 13px; + } span{margin: 1px 0px; } .searchForm .el-form-item{ diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue index 8262f163..959506e8 100644 --- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue @@ -738,10 +738,18 @@ export default { .searchForm .el-form-item{ margin-bottom: 5px; } + el-button.is-disabled.is-plain, .el-button.is-disabled.is-plain:focus, .el-button.is-disabled.is-plain { + background: #9BD7FC; + border: 0px + } + el-button.is-disabled.is-plain, .el-button.is-disabled.is-plain:focus, .el-button.is-disabled.is-plain:hover { + background: rgb(238, 238, 238); + }