From 80b42668ae0c40f195ae982b29ba0a31a5788757 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 18 Oct 2019 15:19:34 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=B7=E6=AC=BE?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/FundApproval1/index.vue | 2 - src/views/layout/components/Navbar.vue | 53 +++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue index 2a4a471b..9a3528c7 100644 --- a/src/views/PurchasingCenter/FundApproval1/index.vue +++ b/src/views/PurchasingCenter/FundApproval1/index.vue @@ -245,7 +245,6 @@ export default { }, searchTable1() { initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => { - console.log(response.data) this.tableData1 = response.data.rows this.total1 = response.data.total }) @@ -261,7 +260,6 @@ export default { }, searchTable2() { initApprovalOffline(this.pageCurrent2, this.pageSize2, 0).then(response => { - console.log(response.data.rows) this.tableData2 = response.data.rows this.total2 = response.data.total }) diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index c47317c7..0147e237 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -31,6 +31,7 @@ import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval' import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCenter/MaterialManagement' import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval' import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove' +import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund' export default { components: { Breadcrumb, @@ -40,6 +41,7 @@ export default { return { timer: '', noticeContract: null, + noticeContract1: null, noticeFund: null, noticeInvoice: null } @@ -87,6 +89,57 @@ export default { }) } }) + if (this.token.toString() === '2') { + searchRequestFund(1, 9999, 0, 0, 0, 0, 0).then(res => { + if (res.data.length) { + this.noticeContract = null + this.noticeContract = this.$notify.success({ + title: '提示', + message: '有合同请款申请审批结果，点击查看', + onClick: () => { + setChakan().then(res => { + this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) + setTimeout(this.noticeContract.close(), 1000) + }) + }, + duration: 1000 * 60 + }) + } + }) + initApproval(1, 999, 1).then(res => { + if (res.data.rows.length) { + this.noticeContract = null + this.noticeContract = this.$notify.success({ + title: '提示', + message: '有合同请款申请待审批，点击查看', + onClick: () => { + setChakan().then(res => { + this.$router.push({ path: '/PurchasingCenter/FundApproval1' }) + setTimeout(this.noticeContract.close(), 1000) + }) + }, + duration: 1000 * 60 + }) + } + }) + } else if (this.token.toString() === '3') { + searchRequestFund(1, 99999, 0, 0, 0, 0, 0).then(res => { + if (res.data.length) { + this.noticeContract = null + this.noticeContract = this.$notify.success({ + title: '提示', + message: '有合同请款申请审批结果，点击查看', + onClick: () => { + setChakan().then(res => { + this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) + setTimeout(this.noticeContract.close(), 1000) + }) + }, + duration: 1000 * 60 + }) + } + }) + } }, comfirmMaterial() { getMaterial().then(res => { From 69de4a6a54b7291c02d16245e33e04a7df0dea4f Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 18 Oct 2019 15:56:44 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateInquirySheet/index.vue | 228 ++++++++++++++++++ .../PurchaseTaskAllocate/index.vue | 23 +- 2 files changed, 250 insertions(+), 1 deletion(-) diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index e25ae23e..08976d48 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -422,6 +422,185 @@ @current-change="handleCurrentChange12"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1009,6 +1188,10 @@ export default { total12: 0, pageCurrent12: 1, pageSize12: 100, + tableData13: [], // 外购件列表 + total13: 0, + pageCurrent13: 1, + pageSize13: 100, remarkFilters: [], supplierFilters: [], tableData2: [], // 询价单列表 @@ -1587,6 +1770,41 @@ export default { this.pageCurrent12 = val this.searchTable12() }, + searchTable13() { // 查询基本件列表 + let check1, check2, check3, check4, check5, check6, check7 + this.partNum ? check1 = 1 : check1 = 0 + this.partName ? check2 = 1 : check2 = 0 + this.partSpec ? check3 = 1 : check3 = 0 + this.projectValue ? check4 = 1 : check4 = 0 + this.machineValue ? check5 = 1 : check5 = 0 + this.groupValue ? check6 = 1 : check6 = 0 + this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '') + searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => { + this.tableData12 = response.data.rows + this.total12 = response.data.total + const remark = [] + const supplier = [] + this.remarkFilters = [] + this.supplierFilters = [] + response.data.rows.map(v => { + if (!remark.includes(v.备注)) { + remark.push(v.备注) + supplier.push(v.供货商) + this.remarkFilters.push({ text: v.备注, value: v.备注 }) + this.supplierFilters.push({ text: v.供货商, value: v.供货商 }) + } + }) + }) + }, + handleSizeChange13(val) { // 基本件列表分页 + this.pageSize13 = val + this.pageCurrent13 = 1 + this.searchTable13() + }, + handleCurrentChange13(val) { // 基本件列表分页 + this.pageCurrent13 = val + this.searchTable13() + }, searchTable2() { // 查询询价单列表 this.supplierName ? this.check3 = 1 : this.check3 = 0 this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0 @@ -1856,6 +2074,16 @@ export default { this.基本件流水号[i] = val[i].基本件流水号 } }, + handleSelectionChange3(val) { // 基本件多选 + this.groupPartBasicNum = [] + this.allNum = [] + this.基本件流水号 = [] + for (let i = 0; i < val.length; i++) { + this.groupPartBasicNum[i] = val[i].组件零件基本件流水号 + this.allNum[i] = val[i].零件数量 + this.基本件流水号[i] = val[i].基本件流水号 + } + }, addInquirySheet() { // 追加物料 const numGroup1 = [] // 空数组，放该询价单中已有的组件零件流水号 const numGroup2 = [] // 空数组，放该询价单中已有的组件零件基本件流水号 diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index 76b2257f..65360cff 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -19,7 +19,7 @@ - + 项目名称: @@ -787,6 +787,19 @@ export default { 'id' ]) }, + watch: { + // 如果路由有变化，会再次执行该方法 + '$route': { + handler(route) { + const _this = this + if (route.name === 'PurchaseTaskAllocate') { + setTimeout(() => { + _this.Jump() + }, 1200) + } + } + } + }, created() { this.searchTable0() // 查表1 this.fetchData() // 初始化数据 @@ -794,10 +807,18 @@ export default { this.timer2 = setInterval(this.searchUnallocatePartNumber, 20 * 60 * 1000) // 20 分钟一刷新 this.getDefaultTime() }, + mounted() { + setTimeout(() => { + this.Jump() + }, 500) + }, beforeDestroy() { clearInterval(this.timer2) }, methods: { + Jump() { + window.location.hash = '#PurchasingCenter/PurchaseTaskAllocate' + }, getDefaultTime() { const end = new Date() const start = new Date() From eb26ed426f858b077b1eb8279f8fac0239746033 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 19 Oct 2019 10:13:57 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7?= =?UTF-8?q?=E5=8D=95=E6=8C=89=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/CreateInquirySheet.js | 37 ++++++++++++++++++- .../CreateInquirySheet/index.vue | 30 +++++++++++---- 2 files changed, 59 insertions(+), 8 deletions(-) diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index ab95d0a1..60b8c4a6 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -353,7 +353,7 @@ export function searchMerge(num) { } }) } -export function getPerson(num) { +export function getPerson() { return request({ url: '', method: 'post', @@ -387,3 +387,38 @@ export function tiaozheng2(num1, num2) { } }) } +// 查询时间@change修改 +export function timeChange1(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_创建询价单_外购件时间修改', + param: '外购件开始时间=' + num1 + '&外购件结束时间=' + num2 + } + }) +} +// 查询时间@change修改 +export function timeChange2(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_创建询价单_基本件时间修改', + param: '基本件开始时间=' + num1 + '&基本件结束时间=' + num2 + } + }) +} +// 查询时间初始化查询 +export function timeSearch() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_创建询价单_时间查询' + } + }) +} diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 08976d48..29b85b27 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -88,7 +88,8 @@ range-separator="～" style="width:250px" start-placeholder="开始日期" - end-placeholder="结束日期"/> + end-placeholder="结束日期" + @change="timeChange1()"/> 查询 导出未询价物料清单 @@ -301,7 +302,8 @@ range-separator="～" style="width:250px" start-placeholder="开始日期" - end-placeholder="结束日期"/> + end-placeholder="结束日期" + @change="timeChange2()"/> 查询 导出未询价物料清单 @@ -1086,7 +1088,7 @@ From 109c1ada91baca5c1264fe329bd9c1192a019fdd Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 22 Oct 2019 15:30:33 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/layout/components/Navbar.vue | 42 ++++++++++++++------------ 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 0147e237..af1da6c7 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -40,8 +40,12 @@ export default { data() { return { timer: '', - noticeContract: null, noticeContract1: null, + noticeContract2: null, + noticeContract3: null, + noticeContract4: null, + noticeContract5: null, + noticeContract6: null, noticeFund: null, noticeInvoice: null } @@ -75,14 +79,14 @@ export default { comfirmMaterial_CG() { getMaterial_NOTES().then(res => { if (res.data.length) { - this.noticeContract = null - this.noticeContract = this.$notify.success({ + this.noticeContract1 = null + this.noticeContract1 = this.$notify.success({ title: '提示', message: '有新采购物料审批结果，点击查看', onClick: () => { setChakan().then(res => { this.$router.push({ path: '/PurchasingCenter/MaterialMProcure' }) - setTimeout(this.noticeContract.close(), 1000) + setTimeout(this.noticeContract1.close(), 1000) }) }, duration: 1000 * 60 @@ -92,14 +96,14 @@ export default { if (this.token.toString() === '2') { searchRequestFund(1, 9999, 0, 0, 0, 0, 0).then(res => { if (res.data.length) { - this.noticeContract = null - this.noticeContract = this.$notify.success({ + this.noticeContract2 = null + this.noticeContract2 = this.$notify.success({ title: '提示', message: '有合同请款申请审批结果，点击查看', onClick: () => { setChakan().then(res => { this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) - setTimeout(this.noticeContract.close(), 1000) + setTimeout(this.noticeContract2.close(), 1000) }) }, duration: 1000 * 60 @@ -108,14 +112,14 @@ export default { }) initApproval(1, 999, 1).then(res => { if (res.data.rows.length) { - this.noticeContract = null - this.noticeContract = this.$notify.success({ + this.noticeContract3 = null + this.noticeContract3 = this.$notify.success({ title: '提示', message: '有合同请款申请待审批，点击查看', onClick: () => { setChakan().then(res => { this.$router.push({ path: '/PurchasingCenter/FundApproval1' }) - setTimeout(this.noticeContract.close(), 1000) + setTimeout(this.noticeContract3.close(), 1000) }) }, duration: 1000 * 60 @@ -125,14 +129,14 @@ export default { } else if (this.token.toString() === '3') { searchRequestFund(1, 99999, 0, 0, 0, 0, 0).then(res => { if (res.data.length) { - this.noticeContract = null - this.noticeContract = this.$notify.success({ + this.noticeContract4 = null + this.noticeContract4 = this.$notify.success({ title: '提示', message: '有合同请款申请审批结果，点击查看', onClick: () => { setChakan().then(res => { this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' }) - setTimeout(this.noticeContract.close(), 1000) + setTimeout(this.noticeContract4.close(), 1000) }) }, duration: 1000 * 60 @@ -144,13 +148,13 @@ export default { comfirmMaterial() { getMaterial().then(res => { if (res.data.length) { - this.noticeContract = null - this.noticeContract = this.$notify.success({ + this.noticeContract5 = null + this.noticeContract5 = this.$notify.success({ title: '提示', message: '您有采购物料申请待审批，请及时处理，点击查看', onClick: () => { this.$router.push({ path: '/PurchasingCenter/MaterialManagement' }) - setTimeout(this.noticeContract.close(), 1000) + setTimeout(this.noticeContract5.close(), 1000) }, duration: 1000 * 60 }) @@ -160,13 +164,13 @@ export default { checkApproval() { searchTable1(1, 999, 0, null, null, 0, 0, 0, 0, 0, 0).then(res => { if (res.data.total) { - this.noticeContract = null - this.noticeContract = this.$notify.success({ + this.noticeContract6 = null + this.noticeContract6 = this.$notify.success({ title: '提示', message: '您有采购合同待审批，请及时处理，点击查看', onClick: () => { this.$router.push({ path: '/PurchasingCenter/PurchaseContractApproval' }) - setTimeout(this.noticeContract.close(), 1000) + setTimeout(this.noticeContract6.close(), 1000) }, duration: 1000 * 60 }) From ca6f5b59361dbe746d098d683ea2d3548cfa32c0 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 23 Oct 2019 13:52:05 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArrivalStateSearch/index.vue | 8 ++-- .../CreateInquirySheet/index.vue | 26 ++++++------ .../CreatePurchaseContract/index.vue | 20 ++++----- .../OfflineContract/index.vue | 26 ++++++------ .../OfflineContractRequestFund/index.vue | 6 +-- .../PurchasingCenter/PayStateSearch/index.vue | 14 +++---- .../PurchaseContractRequestFund/index.vue | 14 +++---- .../PurchaseContractSearch/index.vue | 10 ++--- .../PurchaseSituationSearch/index.vue | 42 +++++++++---------- .../PurchasingCenter/SetPayPlan/index.vue | 29 ++++++------- 10 files changed, 96 insertions(+), 99 deletions(-) diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue index 992ad58d..c5c81bcc 100644 --- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue +++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue @@ -31,7 +31,7 @@ height="400px" size="mini" @row-click="searchTable2"> - + @@ -41,17 +41,17 @@ {{ scope.row.采购合同名称 }} - + - + - + diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index fe0b3ab2..2240ab0f 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -134,7 +134,7 @@ - + @@ -159,17 +159,17 @@ - + - + - + @@ -472,7 +472,7 @@ - + @@ -480,12 +480,12 @@ - + - + @@ -495,27 +495,27 @@ - + - + - + - + - + @@ -530,7 +530,7 @@ - + diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 3f75d696..6c1f7d15 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -2,7 +2,7 @@
- 供 应  商: + - 合同编号: + - || 供 应 商: + - 合同名称: + - 是否含税: + - 交货日期: + - 开票信息: + - 支付 日期: + - 支付方式: + - 其他说明: + 快速修改价格 还原 diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index b2b829b3..40a3ec4e 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -42,29 +42,29 @@ size="mini" @selection-change="handleSelectionChange1"> - + - + - + - + - + @@ -74,22 +74,22 @@ {{ scope.row.物料类别 }} - + - + - + - + @@ -296,7 +296,7 @@ 全部到货 - + @@ -306,17 +306,17 @@ {{ scope.row.离线合同名称 }} - + - + - + diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue index c5205a53..ad76fa90 100644 --- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue @@ -33,17 +33,17 @@

请款表

- + - + - + diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue index 5e01d065..6132d93b 100644 --- a/src/views/PurchasingCenter/PayStateSearch/index.vue +++ b/src/views/PurchasingCenter/PayStateSearch/index.vue @@ -54,7 +54,7 @@ - + @@ -64,32 +64,32 @@ {{ scope.row.采购合同名称 }} - + - + - + - + - + - + - + @@ -120,19 +120,19 @@ {{ scope.row.采购合同名称 }} - + - + - + - + diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue index 25c1c42e..e72d35b9 100644 --- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue @@ -39,7 +39,7 @@ - + - + - + - + @@ -67,12 +67,12 @@ {{ scope.row.物料型号 }} - + - + @@ -97,7 +97,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} - + @@ -127,7 +127,7 @@ - + - + - + - + @@ -155,12 +155,12 @@ {{ scope.row.物料型号 }} - + - + @@ -185,7 +185,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} - + @@ -215,7 +215,7 @@ - + - + - + - + @@ -243,7 +243,7 @@ {{ scope.row.零件图号 }} - + @@ -253,7 +253,7 @@ {{ scope.row.材料 }} - + @@ -278,7 +278,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }} - + diff --git a/src/views/PurchasingCenter/SetPayPlan/index.vue b/src/views/PurchasingCenter/SetPayPlan/index.vue index fbc8d73e..ec8008f8 100644 --- a/src/views/PurchasingCenter/SetPayPlan/index.vue +++ b/src/views/PurchasingCenter/SetPayPlan/index.vue @@ -70,17 +70,17 @@ - + - + - + @@ -302,18 +302,15 @@ export default { margin: 0 } .subTableHeader { - th { - background: #8ff4ea !important; - color: black; + th { + background: #8ff4ea !important; + color: black; + } + tr.el-table__row td { + background-color: #d8e5f6 !important; + } + tr.el-table__row.el-table__row--striped td { + background: #e9f0f9 !important; + } } - - tr.el-table__row td { - background-color: #d8e5f6 !important; - } - - tr.el-table__row.el-table__row--striped td { - background: #e9f0f9 !important; - } - } - From b1be1eaee93498fe84e3d72e29e8c114eb375aa7 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 23 Oct 2019 15:50:04 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=83=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/index.scss | 5 +- .../ArrivalStateSearch/index.vue | 2 +- .../CreateInquirySheet/index.vue | 26 +-- .../CreatePurchaseContract/index.vue | 4 +- .../InvoiceSettlementApprove/index.vue | 6 +- .../MaterialMProcure/index.vue | 208 ++++++++---------- .../OfflineContract/index.vue | 13 +- .../OfflineContractRequestFund/index.vue | 74 +++---- .../OfflineContractSearch/index.vue | 6 +- .../PurchasingCenter/PayStateSearch/index.vue | 2 +- .../PurchaseContractRequestFund/index.vue | 76 +++---- .../PurchaseContractReview/index.vue | 4 +- .../PurchaseContractSearch/index.vue | 23 +- .../PurchaseSituationSearch/index.vue | 25 +-- .../PurchaseTaskAllocate/index.vue | 6 +- .../PurchasingCenter/SetPayPlan/index.vue | 4 +- 16 files changed, 219 insertions(+), 265 deletions(-) diff --git a/src/styles/index.scss b/src/styles/index.scss index 6af05507..ae382d70 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -109,7 +109,7 @@ el-form-item__content{ //background-color: #2e296a!important; } .el-card__body{ - padding: 10px !important; + padding: 0 10px 0 10px !important; margin: 0px !important; } .app-container{ @@ -275,3 +275,6 @@ h3 { color: white; } } +.el-tabs--border-card>.el-tabs__content { + padding: 15px 15px 0px 15px!important; +} diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue index c5c81bcc..c0a5f1f5 100644 --- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue +++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue @@ -28,7 +28,7 @@ border highlight-current-row style="width: 100%" - height="400px" + height="600px" size="mini" @row-click="searchTable2"> diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 2240ab0f..345097fd 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -95,7 +95,7 @@ 调整采购任务 - + --> - -
- -
+
+ +
+ diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 6c1f7d15..222fa254 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -29,7 +29,7 @@ - + 预览合同 递交审批： - + 递交
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue index 8140bf86..9a67c928 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue @@ -7,7 +7,7 @@ 查询 -

发票结算申请单

+

发票结算申请单