Skip to content

S
SuperMan
Commit 158d5445 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

新增导出，op增加排序

parent 6d808bbf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2372 additions and 2983 deletions
package-lock.json
View file @ 158d5445
This diff is collapsed.
package.json
View file @ 158d5445
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"@riophae/vue-treeselect": "0.0.38", "@riophae/vue-treeselect": "0.0.38",
"@xkeshi/vue-barcode": "^1.0.0", "@xkeshi/vue-barcode": "^1.0.0",
"ali-oss": "^5.3.1", "ali-oss": "^5.3.1",
"axios": "^0.18.0", "axios": "^0.19.0",
"browser-md5-file": "^1.0.0", "browser-md5-file": "^1.0.0",
"child_process": "^1.0.2", "child_process": "^1.0.2",
"co": "^4.6.0", "co": "^4.6.0",
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
"lrz": "^4.9.40", "lrz": "^4.9.40",
"moment": "^2.24.0", "moment": "^2.24.0",
"node-sass": "^4.11.0", "node-sass": "^4.11.0",
"particleground-light": "^1.0.6",
"pdfjs-dist": "^2.0.489", "pdfjs-dist": "^2.0.489",
"pinyin": "^2.8.3", "pinyin": "^2.8.3",
"qrcode": "^1.2.2", "qrcode": "^1.2.2",
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
"vue": "^2.5.2", "vue": "^2.5.2",
"vue-amap": "^0.5.6", "vue-amap": "^0.5.6",
"vue-draggable-resizable": "^1.7.2", "vue-draggable-resizable": "^1.7.2",
"vue-echarts-v3": "^1.0.19", "vue-echarts-v3": "^2.0.1",
"vue-i18n": "^7.6.0", "vue-i18n": "^7.6.0",
"vue-quill-editor": "^3.0.6", "vue-quill-editor": "^3.0.6",
"vue-treeselect": "^1.0.7", "vue-treeselect": "^1.0.7",
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
"babel-preset-stage-2": "^6.22.0", "babel-preset-stage-2": "^6.22.0",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"copy-webpack-plugin": "^4.0.1", "copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.28.11", "css-loader": "^2.1.1",
"eslint": "^4.15.0", "eslint": "^4.15.0",
"eslint-config-standard": "^10.2.1", "eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0", "eslint-friendly-formatter": "^3.0.0",
...@@ -79,7 +80,7 @@ ...@@ -79,7 +80,7 @@
"less": "^3.9.0", "less": "^3.9.0",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",
"node-notifier": "^5.1.2", "node-notifier": "^5.1.2",
"optimize-css-assets-webpack-plugin": "^3.2.0", "optimize-css-assets-webpack-plugin": "^5.0.1",
"ora": "^1.2.0", "ora": "^1.2.0",
"portfinder": "^1.0.13", "portfinder": "^1.0.13",
"postcss-import": "^11.0.0", "postcss-import": "^11.0.0",
...@@ -90,14 +91,14 @@ ...@@ -90,14 +91,14 @@
"shelljs": "^0.7.6", "shelljs": "^0.7.6",
"style-loader": "^0.21.0", "style-loader": "^0.21.0",
"uglifyjs-webpack-plugin": "^1.1.1", "uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^0.5.9", "url-loader": "^2.0.0",
"vue-easytable": "^1.7.2", "vue-easytable": "^1.7.2",
"vue-loader": "^13.3.0", "vue-loader": "^13.3.0",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vue-style-loader": "^3.0.1", "vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2", "vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0", "webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.9.0", "webpack-bundle-analyzer": "^3.3.2",
"webpack-dev-server": "^2.9.1", "webpack-dev-server": "^2.9.1",
"webpack-merge": "^4.1.0" "webpack-merge": "^4.1.0"
}, },
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 158d5445
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/> --> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -415,8 +415,11 @@ export default { ...@@ -415,8 +415,11 @@ export default {
count:0, count:0,
allBPrice:0, allBPrice:0,
allWPrice:0, allWPrice:0,
userInfo:{},
} }
},created(){ },
created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){ if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier); this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
...@@ -445,6 +448,13 @@ export default { ...@@ -445,6 +448,13 @@ export default {
} }
},methods:{ },methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=2;
var fileName = "银行账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){ goUrlNew(item){
let status=false; let status=false;
if(item.CostTypeList){ if(item.CostTypeList){
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 158d5445
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/> --> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -407,8 +407,10 @@ export default { ...@@ -407,8 +407,10 @@ export default {
count:0, count:0,
allBPrice:0, allBPrice:0,
allWPrice:0, allWPrice:0,
userInfo:{},
} }
},created(){ },created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){ if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier); this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
...@@ -437,6 +439,13 @@ export default { ...@@ -437,6 +439,13 @@ export default {
} }
},methods:{ },methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=3;
var fileName = "平台账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){ goUrlNew(item){
let status=false; let status=false;
if(item.CostTypeList){ if(item.CostTypeList){
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 158d5445
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> --> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -436,8 +436,11 @@ export default { ...@@ -436,8 +436,11 @@ export default {
count:0, count:0,
allBPrice:0, allBPrice:0,
allWPrice:0, allWPrice:0,
userInfo:{},
} }
},created(){ },created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){ if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier); this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
...@@ -467,6 +470,13 @@ export default { ...@@ -467,6 +470,13 @@ export default {
} }
},methods:{ },methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=4;
var fileName = "奖金池账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){ goUrlNew(item){
let status=false; let status=false;
if(item.CostTypeList){ if(item.CostTypeList){
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ 158d5445
...@@ -500,19 +500,19 @@ ...@@ -500,19 +500,19 @@
<el-dialog <el-dialog
title="修改审批人" title="修改审批人"
:visible.sync="Auditshow" :visible.sync="Auditshow"
width="30%"> width="400px">
<div> <div>
<el-tree <ul>
:data="myAuditList" <li v-for="(item,index) in myAuditList" :key="index+500" style="margin-bottom:10px">
node-key="id" <span style="display:inline-block;width:90px">{{item.AuditDescription}}</span>
default-expand-all <el-input v-model.number="item.Sort" size="mini" style="width:200px"></el-input>
draggable </li>
:allow-drop="allowDrop"> </ul>
</el-tree>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button> <el-button size="mini" type="danger" @click="AuditSort">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
...@@ -525,7 +525,6 @@ export default { ...@@ -525,7 +525,6 @@ export default {
components: { Treeselect }, components: { Treeselect },
data(){ data(){
return{ return{
NewAuditList:[],
Auditshow:false, Auditshow:false,
accListShow: true, accListShow: true,
TemplateId:0, TemplateId:0,
...@@ -717,17 +716,28 @@ export default { ...@@ -717,17 +716,28 @@ export default {
this.getRole() this.getRole()
}, },
methods:{ methods:{
allowDrop(){ AuditSort(){
console.log("myAuditList",this.myAuditList) let sum=0;
let sortnum=0;
for(let i=0;i<this.myAuditList.length;i++){
let id=this.myAuditList[i].Sort;
sum+=i+1;
sortnum+=this.myAuditList[i].Sort;
}
if(sum!=sortnum){
this.Error("请输入连续的排序！")
return;
}
this.myAuditList.sort(
this.$commonUtils.createComprisonFunction("Sort")
);
this.Auditshow=false;
}, },
EditAudit(){ EditAudit(){
let msg={};
msg.label="审批人"; // console.log("myAuditList",this.myAuditList)
// this.NewAuditList.push(msg);
// this.NewAuditList[0].children=[];
// this.NewAuditList[0].children.push(this.myAuditList);
console.log("myAuditList",this.myAuditList)
}, },
handleCheckAllChangeAcc(val) { handleCheckAllChangeAcc(val) {
this.accListMsg = val ? [1,2,3,4] : []; this.accListMsg = val ? [1,2,3,4] : [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment