From 0f46323296dd3abd61625d92077386ba5670dd44 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Fri, 29 Jul 2022 13:28:00 +0800
Subject: [PATCH] 2022.7.29
---
src/views/budget/budgetList.vue | 10 +++---
.../contract/components/detailContract.vue | 4 +--
.../components/detailContractSign.vue | 11 +++++--
.../contract/components/editorContract.vue | 33 ++++++++++++++-----
src/views/contract/contractList.vue | 24 ++++++++++----
5 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index 09938c0..84384e1 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -135,7 +135,7 @@
*项目名称
-
+
@@ -157,7 +157,7 @@
*项目所属年份
-
+
@@ -184,7 +184,7 @@
*内容
-
+
@@ -194,7 +194,7 @@
*金额
-
+
@@ -204,7 +204,7 @@
*备注
-
+
diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue
index cf381bb..130d425 100644
--- a/src/views/contract/components/detailContract.vue
+++ b/src/views/contract/components/detailContract.vue
@@ -319,9 +319,9 @@ export default {
&>div{
cursor: pointer;
- flex-basis: 25%;
+ flex-basis: 16%;
- padding: 0 20px;
+ margin: 0 20px;
}
}
}
diff --git a/src/views/contract/components/detailContractSign.vue b/src/views/contract/components/detailContractSign.vue
index 9c64310..fec1855 100644
--- a/src/views/contract/components/detailContractSign.vue
+++ b/src/views/contract/components/detailContractSign.vue
@@ -20,7 +20,7 @@
内容
-
+
@@ -31,7 +31,7 @@
金额
-
+
@@ -41,7 +41,7 @@
备注
-
+
@@ -114,5 +114,10 @@ export default {
top: 0;
content:'（元）'
}
+ ::v-deep .el-input__clear{
+ position: relative;
+ right: 30px;
+ z-index: 2;
+ }
}
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index 2dfff00..c0d8a83 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -8,7 +8,7 @@
*项目名称
-
+
@@ -18,7 +18,7 @@
*项目类型
-
+
@@ -30,7 +30,7 @@
*采购形式
-
+
@@ -42,7 +42,7 @@
*采购方式
-
+
@@ -54,7 +54,7 @@
*合同预算价
-
+
@@ -64,7 +64,7 @@
*合同金额
-
+
@@ -74,7 +74,7 @@
*资金渠道
-
+
@@ -86,7 +86,7 @@
*供应商
-
+
@@ -96,7 +96,7 @@
*执行部门
-
+
@@ -181,6 +181,7 @@ export default {
}
}
return {
+ isFocus:false,
contrantId:'',
isShowEditor:false,
isShowPlan:false,
@@ -358,6 +359,9 @@ export default {
})
},
+ },
+ computed:{
+
},
mounted() {
@@ -389,11 +393,17 @@ export default {
.xy-table-item-price{
position: relative;
&::after{
+ z-index: 1;
position: absolute;
right: 0;
top: 0;
content:'（元）'
}
+ ::v-deep .el-input__clear{
+ position: relative;
+ right: 30px;
+ z-index: 2;
+ }
}
.xy-table-item-price-wan{
position: relative;
@@ -403,5 +413,10 @@ export default {
top: 0;
content:'（万元）'
}
+ ::v-deep .el-input__clear{
+ position: relative;
+ right: 46px;
+ z-index: 2;
+ }
}
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 5851fb1..a419969 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -92,7 +92,7 @@
-
+
@@ -297,6 +297,13 @@ export default {
}
}
return {
+ window:{
+ width:0,
+ height:0,
+ top:0,
+ left:0
+ },
+
//搜索
select:{
showDatePicker:'',
@@ -572,7 +579,7 @@ export default {
{required:true,message:"必填"}
],
plan:[
- {validator:planPass}
+ {validator:planPass, trigger: 'change'}
]
},
isShowPlan:false,//新增中预算计划
@@ -593,7 +600,7 @@ export default {
}
let res = await getOatoken()
let url =`${process.env.VUE_APP_OUT_URL}/admin/flow/create/27?oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`
- let bidding = window.open(url,'bidding','top=100,left=100,width=1000,height=600')
+ let bidding = window.open(url,'bidding',`top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`)
},
//采购流程
@@ -610,7 +617,7 @@ export default {
}
let res = await getOatoken()
let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/2?oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`
- let buyProcess = window.open(url, 'buyProcess', 'top=100,left=100,width=1000,height=600')
+ let buyProcess = window.open(url, 'buyProcess', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`)
},
//会签流程
async signProcess(row){
@@ -622,13 +629,13 @@ export default {
}
let res = await getOatoken()
let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/3?oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`
- let signProcess = window.open(url, 'signProcess', 'top=100,left=100,width=1000,height=600')
+ let signProcess = window.open(url, 'signProcess', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`)
},
//请示流程
async askProcess(row){
let res = await getOatoken()
let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/17?oatoken=${res.oatoken}&out_contract_id=${row.id}`
- let askProcess = window.open(url, 'askProcess', 'top=100,left=100,width=1000,height=600')
+ let askProcess = window.open(url, 'askProcess', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`)
},
//防抖
@@ -762,6 +769,11 @@ export default {
},
},
mounted() {
+ this.window.width = screen.availWidth * 0.8
+ this.window.height = screen.availHeight * 0.8
+ this.window.top = (window.screen.height - 30 - this.window.height)/2
+ this.window.left = (window.screen.width - 10 - this.window.width)/2
+
this.getPurchaseType()
this.getContracts()
this.getDepartment()