From 0dc1e26569ab570259fef29cd5cde70cb96d7f2c Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 09 一月 2024 11:08:44 +0800
Subject: [PATCH] 修订版本3.0
---
src/components/view/data-comparison.vue | 58 ++++++++------
src/components/view/finance-submit.vue | 86 ++++++++++++++++-----
src/components/view/fans-submit.vue | 29 ++++++-
src/components/view/data-reporting.vue | 4
src/assets/api/controller.js | 14 ++-
src/components/view/index-index.vue | 8 +-
6 files changed, 137 insertions(+), 62 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 3b99793..5abe1b0 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -37,20 +37,22 @@
downRegistrantCountFile: "/dataReporting/downRegistrantCountFile", //瀵煎嚭鍛樺伐鏁版嵁缁熻
downFansSubmitFile: "/dataReporting/downFansSubmitFile", //瀵煎嚭杩涚矇涓婃姤
inputFansSubmitCsv: "/dataReporting/inputFansSubmitCsv", //瀵煎叆杩涚矇涓婃姤
+ downFinanceSubmitFile: "/dataReporting/downFinanceSubmitFile", //瀵煎嚭璐㈠姟涓婃姤
+ inputFinanceSubmitCsv: "/dataReporting/inputFinanceSubmitCsv", //瀵煎叆璐㈠姟涓婃姤
selectDataComparisonDtoPageList: "/dataReporting/selectDataComparisonDtoPageList", //鑾峰彇鏁版嵁瀵规瘮鍒楄〃
-
+
selectFansSubmitList: "/dataReporting/selectFansSubmitList", //鑾峰彇杩涚矇涓婃姤鍒楄〃
delFansSubmit: "/dataReporting/delFansSubmit", //鍒犻櫎杩涚矇涓婃姤淇℃伅
updateFansSubmit: "/dataReporting/updateFansSubmit", //淇敼杩涚矇涓婃姤淇℃伅
addFansSubmit: "/dataReporting/addFansSubmit", //娣诲姞杩涚矇涓婃姤淇℃伅
-
+
selectFinanceSubmitList: "/dataReporting/selectFinanceSubmitList", //鑾峰彇璐㈠姟涓婃姤鍒楄〃
delFinanceSubmit: "/dataReporting/delFinanceSubmit", //鍒犻櫎璐㈠姟涓婃姤淇℃伅
updateFinanceSubmit: "/dataReporting/updateFinanceSubmit", //淇敼璐㈠姟涓婃姤淇℃伅
addFinanceSubmit: "/dataReporting/addFinanceSubmit", //娣诲姞璐㈠姟涓婃姤淇℃伅
-
+
getDataList: "/dataReporting/getDataList", //鑾峰彇棣栭〉鏁版嵁
-
+
inputCsv: "/dataReporting/inputCsv", //瀵煎叆
}
@@ -60,10 +62,10 @@
delCustomEnum: "/enum/delCustomEnum", //鍒犻櫎瀹㈡埛淇℃伅
updateCustomEnum: "/enum/updateCustomEnum", //淇敼瀹㈡埛淇℃伅
addCustomEnum: "/enum/addCustomEnum", //娣诲姞瀹㈡埛淇℃伅
-
+
selectProductEnumLists: "/enum/selectProductEnumLists", //鑾峰彇椤圭洰鍒楄〃
selectProductEnumList: "/enum/selectProductEnumList", //鑾峰彇椤圭洰鏋氫妇
delProductEnum: "/enum/delProductEnum", //鍒犻櫎椤圭洰淇℃伅
updateProductEnum: "/enum/updateProductEnum", //淇敼椤圭洰淇℃伅
addProductEnum: "/enum/addProductEnum", //娣诲姞椤圭洰淇℃伅
-}
\ No newline at end of file
+}
diff --git a/src/components/view/data-comparison.vue b/src/components/view/data-comparison.vue
index 45b69a3..dfe4142 100644
--- a/src/components/view/data-comparison.vue
+++ b/src/components/view/data-comparison.vue
@@ -45,19 +45,20 @@
</div>
<div class="search">
<div class="search_thing">
- <div class="search_label">璐︽埛鍚嶇О锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.name"
- ></el-input></div>
+ <div class="search_label">涓昏处鎴峰悕绉帮細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.name"></el-input></div>
</div>
- <div class="search_thing">
- <div class="search_label">瀵规瘮鐨勮处鎴峰悕绉帮細</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.comparisonName"
- ></el-input></div>
+ <div class="search_thing">
+ <div class="search_label">瀛愯处鎴峰悕绉帮細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.comparisonName"></el-input></div>
</div>
- <div class="search_thing">
+ <div class="search_thing">
<div class="search_label">鐧昏鏃ユ湡锛�</div>
<div class="search_input">
- <el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd" clearable></el-date-picker>
+ <el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd" clearable></el-date-picker>
</div>
</div>
<div class="search_thing" style="padding-left: 30px;">
@@ -66,7 +67,8 @@
</div>
</div>
<div class="table">
- <ValueTable ref="ValueTable" :url="$api.dataReporting.selectDataComparisonDtoPageList" :componentData="componentData" :key="upIndex"/>
+ <ValueTable ref="ValueTable" :url="$api.dataReporting.selectDataComparisonDtoPageList"
+ :componentData="componentData" :key="upIndex" />
</div>
</div>
</template>
@@ -82,8 +84,8 @@
componentData: {
entity: {
name: null,
- comparisonName:null,
- createTime: null,
+ comparisonName: null,
+ createTime: null,
orderBy: {
field: 'createTime',
order: 'desc'
@@ -102,7 +104,7 @@
outPower: true
}
},
- created() {
+ created() {
var today = new Date();
var yesterday = new Date(today);
yesterday.setDate(today.getDate() - 1);
@@ -119,28 +121,32 @@
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
- this.selectDataComparisonDtoPageList()
+ // this.selectDataComparisonDtoPageList()
},
methods: {
refreshTable() {
- if(this.componentData.entity.name == null || this.componentData.entity.name == '') {
- this.$message.error('璐︽埛鍚嶇О鏄繀濉」')
- }else if(this.componentData.entity.comparisonName == null || this.componentData.entity.comparisonName == '') {
- this.$message.error('瀵规瘮鐨勮处鎴峰悕绉版槸蹇呭～椤�')
- }else if(this.componentData.entity.createTime == null) {
- this.$message.error('鐧昏鏃堕棿鏄繀濉」')
- }else if(this.componentData.entity.name === this.componentData.entity.comparisonName) {
- this.$message.error('瀵规瘮鐨勮处鎴蜂笉鑳介噸澶�')
- }else {
- this.$refs['ValueTable'].selectList()
- }
+ if (this.componentData.entity.name == null || this.componentData.entity.name == '') {
+ this.$message.error('璐︽埛鍚嶇О鏄繀濉」')
+ } else if (this.componentData.entity.comparisonName == null || this.componentData.entity.comparisonName == '') {
+ this.$message.error('瀵规瘮鐨勮处鎴峰悕绉版槸蹇呭～椤�')
+ } else if (this.componentData.entity.createTime == null) {
+ this.$message.error('鐧昏鏃堕棿鏄繀濉」')
+ } else if (this.componentData.entity.name === this.componentData.entity.comparisonName) {
+ this.$message.error('瀵规瘮鐨勮处鎴蜂笉鑳介噸澶�')
+ } else {
+ this.$refs['ValueTable'].selectList()
+ }
},
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
this.upIndex++
},
selectDataComparisonDtoPageList() {
- this.$axios.get(this.$api.dataReporting.selectDataComparisonDtoPageList).then(res => {
+ this.$axios.post(this.$api.dataReporting.selectDataComparisonDtoPageList, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
res.data.forEach(a => {
a.isClick = false
a.look = false
diff --git a/src/components/view/data-reporting.vue b/src/components/view/data-reporting.vue
index 5db24a8..39ae996 100644
--- a/src/components/view/data-reporting.vue
+++ b/src/components/view/data-reporting.vue
@@ -207,7 +207,7 @@
<el-col :span="7">
<el-input v-model="upData.customerRebate" size="small"></el-input>
</el-col>
- <el-col :span="4" style="text-align: right;padding-right: 8px;">澶囩敤瀛楁</el-col>
+ <el-col :span="4" style="text-align: right;padding-right: 8px;">鍋氳繘鏉�</el-col>
<el-col :span="7">
<el-input v-model="upData.remark" size="small"></el-input>
</el-col>
@@ -424,4 +424,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/view/fans-submit.vue b/src/components/view/fans-submit.vue
index 5013b5d..c540f67 100644
--- a/src/components/view/fans-submit.vue
+++ b/src/components/view/fans-submit.vue
@@ -156,6 +156,19 @@
outPower: true
}
},
+ created() {
+ var today = new Date();
+ var yyyy = today.getFullYear();
+ var mm = today.getMonth() + 1;
+ var dd = today.getDate()
+ if (dd < 10) {
+ dd = "0" + dd;
+ }
+ if (mm < 10) {
+ mm = "0" + mm;
+ }
+ this.componentData.entity.createTime = this.HaveJson(`${yyyy}-${mm}-${dd} 00:00:00`)
+ },
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
this.selectProductEnumList()
@@ -205,6 +218,8 @@
let up = false
let del = false
let add = false
+ let inPower = false
+ let outPower = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'upDataReporting') {
up = true
@@ -215,6 +230,12 @@
if (power[i].menuMethod == 'addFansSubmit') {
add = true
}
+ if (power[i].menuMethod == 'inputFansSubmitCsv') {
+ inPower = true
+ }
+ if (power[i].menuMethod == 'downFansSubmitFile') {
+ outPower = true
+ }
}
if (!del) {
this.componentData.do.splice(1, 1)
@@ -223,10 +244,10 @@
this.componentData.do.splice(0, 1)
}
this.addPower = add
+ this.inPower = inPower
+ this.outPower = outPower
},
- openUpload() {
-
- }
+ openUpload() {}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/view/finance-submit.vue b/src/components/view/finance-submit.vue
index a411213..1d60a3b 100644
--- a/src/components/view/finance-submit.vue
+++ b/src/components/view/finance-submit.vue
@@ -42,15 +42,31 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">璐㈠姟涓婃姤</el-col>
<el-col :span="12" style="text-align: right;">
+ <el-button size="medium" @click="$refs.ValueTable.openUpload()" v-if="inPower">
+ <i class="el-icon-upload2" style="color: #3A7BFA;"></i>
+ <span style="color: #3A7BFA;">瀵煎叆</span>
+ </el-button>
+ <el-button size="medium" @click="$refs.ValueTable.openDownDia()" v-if="outPower">
+ <i class="el-icon-download" style="color: #3A7BFA;"></i>
+ <span style="color: #3A7BFA;">瀵煎嚭</span>
+ </el-button>
<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
</el-col>
</el-row>
</div>
<div class="search">
<div class="search_thing">
+ <div class="search_label">绯荤粺鏃ユ湡锛�</div>
+ <div class="search_input">
+ <el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="閫夋嫨鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss" clearable></el-date-picker>
+ </div>
+ </div>
+ <div class="search_thing">
<div class="search_label">璐︽埛鍚嶏細</div>
<div class="search_input">
- <el-input size="small" v-model="componentData.entity.name" clearable placeholder="璐︽埛鍚�" @keyup.enter.native="refreshTable()"></el-input>
+ <el-input size="small" v-model="componentData.entity.name" clearable placeholder="璐︽埛鍚�"
+ @keyup.enter.native="refreshTable()"></el-input>
</div>
</div>
<div class="search_thing" style="padding-left: 30px;">
@@ -59,7 +75,9 @@
</div>
</div>
<div class="table">
- <ValueTable ref="ValueTable" :url="$api.dataReporting.selectFinanceSubmitList" :upUrl="$api.dataReporting.updateFinanceSubmit" :delUrl="$api.dataReporting.delFinanceSubmit" :componentData="componentData" :key="upIndex"/>
+ <ValueTable ref="ValueTable" :url="$api.dataReporting.selectFinanceSubmitList"
+ :upUrl="$api.dataReporting.updateFinanceSubmit" :delUrl="$api.dataReporting.delFinanceSubmit"
+ :componentData="componentData" :key="upIndex" :downUrl="$api.dataReporting.downFinanceSubmitFile" :inputUrl="$api.dataReporting.inputFinanceSubmitCsv"/>
</div>
</div>
</template>
@@ -75,6 +93,7 @@
componentData: {
entity: {
name: null,
+ createTime: null,
orderBy: {
field: 'id',
order: 'asc'
@@ -88,8 +107,8 @@
font: '缂栬緫',
type: 'text',
method: 'doDiy',
- field:['createUserName']
- },{
+ field: ['createUserName']
+ }, {
id: 'delete',
font: '鍒犻櫎',
type: 'text',
@@ -100,7 +119,9 @@
product: {
select: []
},
- custom: {select: []}
+ custom: {
+ select: []
+ }
},
requiredAdd: ['company', 'name', 'employeeRebate'],
requiredUp: ['company', 'name', 'employeeRebate']
@@ -109,8 +130,23 @@
upIndex: 0,
product: [],
custom: [],
- addPower: true
+ addPower: true,
+ inPower: true,
+ outPower: true
}
+ },
+ created() {
+ var today = new Date();
+ var yyyy = today.getFullYear();
+ var mm = today.getMonth() + 1;
+ var dd = today.getDate()
+ if (dd < 10) {
+ dd = "0" + dd;
+ }
+ if (mm < 10) {
+ mm = "0" + mm;
+ }
+ this.componentData.entity.createTime = this.HaveJson(`${yyyy}-${mm}-${dd} 00:00:00`)
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
@@ -126,14 +162,14 @@
this.componentData.entity = this.HaveJson(this.entityCopy)
this.upIndex++
},
- openAdd(){
+ openAdd() {
this.$refs.ValueTable.openAddDia(this.$api.dataReporting.addFinanceSubmit);
},
- selectProductEnumList(){
- this.$axios.get(this.$api.enums.selectProductEnumList).then(res=>{
+ selectProductEnumList() {
+ this.$axios.get(this.$api.enums.selectProductEnumList).then(res => {
this.product = res.data
var str = []
- res.data.forEach(a=>{
+ res.data.forEach(a => {
str.push({
label: a.product,
value: a.product
@@ -142,11 +178,11 @@
this.componentData.selectField.product.select = str
})
},
- selectCustomEnumList(){
- this.$axios.get(this.$api.enums.selectCustomEnumList).then(res=>{
+ selectCustomEnumList() {
+ this.$axios.get(this.$api.enums.selectCustomEnumList).then(res => {
this.custom = res.data
var str = []
- res.data.forEach(a=>{
+ res.data.forEach(a => {
str.push({
label: a.name,
value: a.name
@@ -156,30 +192,40 @@
})
},
// 鏉冮檺鍒嗛厤
- getPower(){
+ getPower() {
let power = JSON.parse(sessionStorage.getItem('power'))
let up = false
let del = false
let add = false
+ let inPower = false
+ let outPower = false
for (var i = 0; i < power.length; i++) {
- if(power[i].menuMethod=='updateFinanceSubmit'){
+ if (power[i].menuMethod == 'updateFinanceSubmit') {
up = true
}
- if(power[i].menuMethod=='delFinanceSubmit'){
+ if (power[i].menuMethod == 'delFinanceSubmit') {
del = true
}
- if(power[i].menuMethod=='addFinanceSubmit'){
+ if (power[i].menuMethod == 'addFinanceSubmit') {
add = true
}
+ if (power[i].menuMethod == 'inputFinanceSubmitCsv') {
+ inPower = true
+ }
+ if (power[i].menuMethod == 'downFinanceSubmitFile') {
+ outPower = true
+ }
}
- if(!del){
+ if (!del) {
this.componentData.do.splice(1, 1)
}
- if(!up){
+ if (!up) {
this.componentData.do.splice(0, 1)
}
this.addPower = add
+ this.inPower = inPower
+ this.outPower = outPower
}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 507fa7a..5f6a141 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -193,7 +193,7 @@
<div class="left-2">
<div class="card card-1">
<div class="label">
- <p class="p1">浠婃棩瀹㈡埛娑堣垂</p>
+ <p class="p1">鏄ㄦ棩瀹㈡埛娑堣垂</p>
<p class="p2">{{data.data1.data1}}</p>
</div>
<div class="icon">
@@ -202,7 +202,7 @@
</div>
<div class="card card-1">
<div class="label">
- <p class="p1">浠婃棩瀹為檯娑堣垂</p>
+ <p class="p1">鏄ㄦ棩瀹為檯娑堣垂</p>
<p class="p2">{{data.data1.data2}}</p>
</div>
<div class="icon">
@@ -211,7 +211,7 @@
</div>
<div class="card card-1">
<div class="label">
- <p class="p1">浠婃棩鎴愭湰</p>
+ <p class="p1">鏄ㄦ棩鎴愭湰</p>
<p class="p2">{{data.data1.data3}}</p>
</div>
<div class="icon">
@@ -220,7 +220,7 @@
</div>
<div class="card card-1" style="margin-right: 0;">
<div class="label">
- <p class="p1">浠婃棩瀹為檯鎴愭湰</p>
+ <p class="p1">鏄ㄦ棩瀹為檯鎴愭湰</p>
<p class="p2">{{data.data1.data4}}</p>
</div>
<div class="icon">
--
Gitblit v1.9.3