Skip to content

S
SuperMan
Commit e1ec9b93 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 1574004c 158d5445
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2406 additions and 2970 deletions
package-lock.json
View file @ e1ec9b93
This diff is collapsed.
package.json
View file @ e1ec9b93
...@@ -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/CashAccDetail.vue
View file @ e1ec9b93
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,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>
...@@ -472,8 +472,10 @@ export default { ...@@ -472,8 +472,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);
...@@ -502,6 +504,13 @@ export default { ...@@ -502,6 +504,13 @@ export default {
} }
},methods:{ },methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=1;
var fileName = "现金账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
addChuNaFun(){ // 添加出纳按钮点击事件 addChuNaFun(){ // 添加出纳按钮点击事件
let count = 0; let count = 0;
let allBPrice = 0; let allBPrice = 0;
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ e1ec9b93
...@@ -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 @ e1ec9b93
...@@ -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 @ e1ec9b93
...@@ -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 @ e1ec9b93
...@@ -367,7 +367,9 @@ ...@@ -367,7 +367,9 @@
<div class="approval_page_title">{{$t('fnc.lcshezhi')}}</div> <div class="approval_page_title">{{$t('fnc.lcshezhi')}}</div>
<div class="approval_page_content"> <div class="approval_page_content">
<div class="approval_person_content"> <div class="approval_person_content">
<span class="approval_span_type">{{$t('fnc.mrspliucheng')}}</span> <span class="approval_span_type">流程设置{{$t('fnc.mrspliucheng')}}</span>
<span style="float:right"><el-button @click="Auditshow=true,EditAudit()" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button></span>
<div class="approval_person_list fl"> <div class="approval_person_list fl">
<span class="approval_person_list_tit">{{$t('fnc.mrspiren')}}</span> <span class="approval_person_list_tit">{{$t('fnc.mrspiren')}}</span>
<div class="padding_l88"> <div class="padding_l88">
...@@ -494,6 +496,25 @@ ...@@ -494,6 +496,25 @@
<button class="normalBtn" type="primary" @click="saveAuditUser">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="saveAuditUser">{{$t('pub.sureBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog
title="修改审批人"
:visible.sync="Auditshow"
width="400px">
<div>
<ul>
<li v-for="(item,index) in myAuditList" :key="index+500" style="margin-bottom:10px">
<span style="display:inline-block;width:90px">{{item.AuditDescription}}</span>
<el-input v-model.number="item.Sort" size="mini" style="width:200px"></el-input>
</li>
</ul>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="dialogVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="AuditSort">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -504,7 +525,8 @@ export default { ...@@ -504,7 +525,8 @@ export default {
components: { Treeselect }, components: { Treeselect },
data(){ data(){
return{ return{
accListShow: true, Auditshow:false,
accListShow: true,
TemplateId:0, TemplateId:0,
radio:1, radio:1,
addMsg:{ addMsg:{
...@@ -566,7 +588,7 @@ export default { ...@@ -566,7 +588,7 @@ export default {
name:"分公司OP" name:"分公司OP"
}, },
], ],
accListMsg:[], accListMsg:[],
SpecialNodeSelectType:'', SpecialNodeSelectType:'',
AuditDescription:'', AuditDescription:'',
AuditWay:2, AuditWay:2,
...@@ -666,7 +688,8 @@ export default { ...@@ -666,7 +688,8 @@ export default {
filterText2(val) { filterText2(val) {
this.$refs.treeUser.filter(val); this.$refs.treeUser.filter(val);
} }
},created(){ },
created(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.TemplateId = this.$route.query.id; this.TemplateId = this.$route.query.id;
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
...@@ -679,7 +702,8 @@ export default { ...@@ -679,7 +702,8 @@ export default {
this.addMsg.RB_BranchId = this.$route.query.Branch_Id; this.addMsg.RB_BranchId = this.$route.query.Branch_Id;
}; };
} }
},mounted(){ },
mounted(){
this.getCompanyList(); this.getCompanyList();
this.getMaxDepartmentTierList(); this.getMaxDepartmentTierList();
...@@ -690,7 +714,31 @@ export default { ...@@ -690,7 +714,31 @@ export default {
} }
this.getFinancialFlowTemplate_post_GetNodeList(); this.getFinancialFlowTemplate_post_GetNodeList();
this.getRole() this.getRole()
},methods:{ },
methods:{
AuditSort(){
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(){
// console.log("myAuditList",this.myAuditList)
},
handleCheckAllChangeAcc(val) { handleCheckAllChangeAcc(val) {
this.accListMsg = val ? [1,2,3,4] : []; this.accListMsg = val ? [1,2,3,4] : [];
this.isIndeterminate = false; this.isIndeterminate = false;
......
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