From 95605ca3f4a48f5af03017bd541c249dc32a7303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
<153298343@qq.com>
Date: Tue, 13 Sep 2022 10:48:22 +0800
Subject: [PATCH] up
---
package.json | 1 +
src/components/XyTable/index.vue | 10 +-
src/main.js | 4 +
src/views/budget/budgetList.vue | 4 +
src/views/budget/seeBudget.vue | 4 +
.../contract/components/contractSign.vue | 20 +-
.../contract/components/detailContract.vue | 10 +
.../contract/components/editorContract.vue | 20 +-
src/views/contract/contractList.vue | 2626 +++++++++--------
src/views/contract/seeContract.vue | 2301 +++++++++------
src/views/dashboard/index.vue | 15 +-
src/views/finance/paymentRegistrationList.vue | 13 +-
.../statisticalReport/budgetProgress.vue | 4 +
13 files changed, 2952 insertions(+), 2080 deletions(-)
diff --git a/package.json b/package.json
index c6ec39a..4d0d5f4 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"html2canvas": "^1.4.1",
"js-cookie": "2.2.0",
"less": "^3.13.1",
+ "moment": "^2.29.4",
"normalize.css": "7.0.0",
"nprogress": "0.2.0",
"path-to-regexp": "2.4.0",
diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 312bedf..a346aed 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -63,7 +63,7 @@ export default {
return { width: '100%', marginBottom: "20px"}
}
},
-
+
btnWidth:{
type:Number,
default:190
@@ -93,6 +93,9 @@ export default {
selectClick(selection, row){
this.$emit('select',selection, row)
},
+ rowClick(selection, row){
+ this.$emit('rowClick',selection, row)
+ },
cellClick(row, column, cell){
this.$emit('cellClick',row, column, cell)
},
@@ -117,7 +120,7 @@ export default {
mounted() {
},
render(h) {
- let {summaryMethod,cellClick,btnWidth,selectClick,height,createIndexRow,tableStyle,treeProps,showSummary,showHeader,$scopedSlots,showIndex,defaultExpandAll,headerCellStyle,headerRowStyle,rowStyle,cellStyle,indent,tableHeight,tableItem,list,deleteClick,editorClick} = this
+ let {summaryMethod,cellClick,btnWidth,selectClick,height,createIndexRow,tableStyle,treeProps,showSummary,showHeader,$scopedSlots,showIndex,defaultExpandAll,headerCellStyle,headerRowStyle,rowStyle,cellStyle,indent,tableHeight,tableItem,list,deleteClick,editorClick,rowClick} = this
return (
{ tableItem && tableItem.length>0 ?
@@ -140,7 +143,7 @@ export default {
default-expand-all={defaultExpandAll}
tree-props={treeProps}
fit={true}
- on={{['select']:selectClick,['cell-click']:cellClick}}>
+ on={{['select']:selectClick,['cell-click']:cellClick,['row-click']:rowClick}}>
{
//序号
showIndex ? createIndexRow() : ''
@@ -285,4 +288,3 @@ export default {
-
diff --git a/src/main.js b/src/main.js
index c571d9f..c2ed041 100644
--- a/src/main.js
+++ b/src/main.js
@@ -43,6 +43,10 @@ Vue.component('xy-dialog',xyDialog)
Vue.config.productionTip = false
+import moment from 'moment'
+
+Vue.prototype.$moment = moment;
+
new Vue({
el: '#app',
router,
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index 235b0cc..91763e4 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -520,6 +520,10 @@ export default {
})
},
},
+ created() {
+
+ this.select.year=this.$moment().format('YYYY');
+ },
mounted() {
this.getTypes()
this.getDepartment()
diff --git a/src/views/budget/seeBudget.vue b/src/views/budget/seeBudget.vue
index c5bf9eb..ea208c4 100644
--- a/src/views/budget/seeBudget.vue
+++ b/src/views/budget/seeBudget.vue
@@ -232,6 +232,10 @@ export default {
})
},
},
+ created() {
+
+ this.select.year=this.$moment().format('YYYY');
+ },
mounted() {
this.getTypes()
this.getDepartment()
diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index 9b43390..62d6fa9 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -77,6 +77,19 @@
+
+
+
+
+
+ *
+ 签订日期
+
+
+
+
+
+
@@ -174,11 +187,15 @@ export default {
time:[],
guaranteeMoney:'',
guaranteeYear:'',
+ date:""
},
rules:{
number:[
{required:true,message:"必填"}
],
+ date:[
+ {required:true,message:"必填"}
+ ],
supply:[
{required:true,message:"必填"}
],
@@ -274,7 +291,8 @@ export default {
guarantee_money:this.form.guaranteeMoney,
guarantee_year:this.form.guaranteeYear,
start_date:this.form.time[0],
- end_date:this.form.time[1]
+ end_date:this.form.time[1],
+ date:this.form.date
}).then(res=>{
this.isShow = false
Message({
diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue
index 11e54bf..d0a9868 100644
--- a/src/views/contract/components/detailContract.vue
+++ b/src/views/contract/components/detailContract.vue
@@ -23,6 +23,16 @@
{{detail.purchase_type.value}}
+
+
+
签订时间
+
{{detail.date}}
+
+
+
服务时间
+
{{detail.start_date}}至{{detail.end_date}}
+
+
项目预算
{{moneyFormat(detail.plan_price)}}
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index 0f81ae5..40888d2 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -103,6 +103,16 @@
+
+
+
@@ -219,7 +229,7 @@
}
}
return {
- userList: ["liuxiangyu", "zhushulan","admin","jiangjiao"],
+ userList: ["liuxiangyu", "zhushulan", "admin", "jiangjiao"],
user: null,
adminEdit: false,
isFocus: false,
@@ -414,7 +424,8 @@
id: id
})
this.contrantId = res.id
- this.detail = {
+ this.detail = {
+ date:res.date,
req_status: res.req_status,
purchase_status: res.purchase_status,
join_status: res.join_status,
@@ -456,7 +467,8 @@
req_status: this.detail.req_status,
purchase_status: this.detail.purchase_status,
join_status: this.detail.join_status,
- invite_status: this.detail.invite_status,
+ invite_status: this.detail.invite_status,
+ date:this.detail.date,
contract_plan_links: this.detail.plan.map(item => {
return item.value
})
@@ -474,7 +486,7 @@
computed: {
},
- mounted() {
+ mounted() {
let that = this;
getInfo().then(response => {
console.log(response)
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index fabdb66..0120ecf 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -1,1163 +1,1465 @@
-
-
-
-
-
-
-
- 关键字
-
-
-
-
-
-
- 创建日期
-
-
-
-
-
-
-
- 项目类型
-
-
-
-
-
-
- 业务科室
-
-
-
-
-
-
-
-
-
- 采购形式
-
-
-
-
-
-
- 采购方式
-
-
-
-
-
-
- 预算金额
-
-
- -
-
-
-
-
-
- 状态
-
-
-
-
-
-
-
-
-
-
-
-
-
deleteContract(row.id)" @editor="">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- deleteContract(scope.row.id)">
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- *是否为预算内确定项目
-
-
-
-
-
-
-
-
-
- *关联预算计划
-
-
-
-
-
- {{ item.label }}
-
-
-
- 请选择关联计划
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index 6ee5df8..49c6a0d 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -1,903 +1,1404 @@
-
-
-
-
-
-
-
- 关键字
-
-
-
-
-
-
- 创建日期
-
-
-
-
-
-
-
- 项目类型
-
-
-
-
-
-
- 业务科室
-
-
-
-
-
-
-
-
-
- 采购形式
-
-
-
-
-
-
- 采购方式
-
-
-
-
-
-
- 预算金额
-
-
- -
-
-
-
-
-
- 状态
-
-
-
-
-
-
-
-
-
-
-
-
deleteContract(row.id)" @editor="">
-
-
-
-
+
+
+
+
+
+
+
+ 关键字
+
+
+
+
+
+ 预算计划
+
+
+
+
+
+
+ 签订年份
+
+ select.year = e">
+
+
+
+ 创建日期
+
+
+
+
+
+
+
+ 项目类型
+
+
+
+
+
+
+ 业务科室
+
+
+
+
+
+
+
+
+
+ 采购形式
+
+
+
+
+
+
+ 采购方式
+
+
+
+
+
+
+ 预算金额
+
+
+ -
+
+
+
+
+
+ 合同状态
+
+
+
+
+
+
+ 招标流程状态
+
+
+
+
+
+
+ 采购流程状态
+
+
+
+
+
+
+ 合同会签状态
+
+
+
+
+
+
+ 请示流程状态
+
+
+
+
+
+
+
+
+
+
+
+
deleteContract(row.id)" @editor="">
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index e64dc08..8f36ad6 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -123,7 +123,7 @@ export default {
data() {
return {
select:{
-year:'2022'
+year:''
},
statistic:'',
department_id: [],
@@ -155,7 +155,7 @@ year:'2022'
},
{
label:'合计金额(元)',
- width: 140,
+ width: 120,
align:'right',
sortable:false,
prop:'money_total',
@@ -165,7 +165,7 @@ year:'2022'
},
{
label:'已使用(元)',
- width: 140,
+ width: 120,
align:'right',
sortable:false,
prop:'use_money_total',
@@ -176,12 +176,11 @@ year:'2022'
{
label:'进展情况',
sortable:false,
- minWidth: 220,
align: 'left',
customFn:(row)=>{
return (
-
+
)
}
@@ -231,8 +230,10 @@ year:'2022'
}
},
created() {
- this.getNotices()
- this.getStatistic()
+ this.select.year=this.$moment().format('YYYY');
+ this.getNotices();
+
+ this.getStatistic();
getInfo().then(response => {
console.log(response)
diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue
index 4b27ca5..9389517 100644
--- a/src/views/finance/paymentRegistrationList.vue
+++ b/src/views/finance/paymentRegistrationList.vue
@@ -12,7 +12,15 @@
-
+
+
+ 状态
+
+
@@ -53,6 +61,7 @@ export default {
},
data() {
return {
+ status:0,
keyword:'',
selectDate:'',
list:[],
@@ -124,7 +133,7 @@ export default {
},
async getFundLogs(){
- const res = await getFundLog({page_size:10,page:this.pageIndex,keyword:this.keyword,date:this.selectDate})
+ const res = await getFundLog({page_size:10,page:this.pageIndex,keyword:this.keyword,date:this.selectDate,status:this.status})
this.list = res.data
this.total = res.total
},
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index 5950367..6f8f449 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -177,6 +177,10 @@ export default {
console.log(res)
}
},
+ created() {
+
+ this.select.year=this.$moment().format('YYYY');
+ },
async mounted() {
await this.getType()
await this.getDepartment()