From 0546d42422d06d2a505d4616f2619db9f9720f81 Mon Sep 17 00:00:00 2001 From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn> Date: Tue, 21 Feb 2023 16:24:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common.js | 6 + src/api/financialCenter/enterpriseRecharge.js | 8 +- .../enterpriseRechargeDetails.js | 6 +- .../companyAuth/OilCompanyAuthAdd.vue | 375 ++++-- .../companyManagement/index.vue | 1192 ++++++++++------- .../accountManagement/components/recharge.vue | 2 +- .../financialCenter/billDetails/index.vue | 2 +- .../enterpriseRecharge/components/add.vue | 4 +- .../enterpriseRecharge/components/addTurn.vue | 7 +- .../enterpriseRecharge/index.vue | 4 +- .../enterpriseRechargeDetails/index.vue | 55 +- src/views/product/components/add.vue | 2 +- src/views/product/components/adjust.vue | 2 +- src/views/product/components/batch.vue | 2 +- src/views/product/components/create.vue | 2 +- src/views/product/components/record.vue | 2 +- src/views/product/index.vue | 2 +- src/views/refineryAccount/components/add.vue | 2 +- src/views/refineryAccount/index.vue | 2 +- src/views/refineryInfo/components/add.vue | 2 +- src/views/refineryInfo/index.vue | 2 +- 21 files changed, 972 insertions(+), 709 deletions(-) diff --git a/src/api/common.js b/src/api/common.js index 2a1f213..f56fe62 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -13,7 +13,13 @@ const liekQuery = (query) => { ); }; +//公司账户详情 +const getByCompanyId = (query) => { + return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`); +}; + export default { getRefineryCompanyList, liekQuery, + getByCompanyId, }; diff --git a/src/api/financialCenter/enterpriseRecharge.js b/src/api/financialCenter/enterpriseRecharge.js index 6b0b0af..e09528d 100644 --- a/src/api/financialCenter/enterpriseRecharge.js +++ b/src/api/financialCenter/enterpriseRecharge.js @@ -10,12 +10,9 @@ const getByPage = (params) => { const get = (query) => { return request.get(`/oil-finance/oilCompanyAccountReverse/get/${query}`); }; -//公司详情 -const getByCompanyId = (query) => { - return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`); -}; + //公司财务详情 -const getByCompanyIdSec = (query) => { +const getByCompanyId = (query) => { return request.get(`/oil-user/oilCompanyFinance/getByCompanyId/${query}`); }; // 新增 @@ -47,7 +44,6 @@ export default { getByCompanyId, save, update, - getByCompanyIdSec, getCascaderList, getLikeByNameSuccess, }; diff --git a/src/api/financialCenter/enterpriseRechargeDetails.js b/src/api/financialCenter/enterpriseRechargeDetails.js index d6857a6..612b0b2 100644 --- a/src/api/financialCenter/enterpriseRechargeDetails.js +++ b/src/api/financialCenter/enterpriseRechargeDetails.js @@ -10,12 +10,8 @@ const getByPage = (params) => { const get = (query) => { return request.get(`/oil-finance/oilCompanyAccountReverse/get/${query}`); }; -//详情 -const getByCompanyId = (query) => { - return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`); -}; + export default { getByPage, get, - getByCompanyId, }; diff --git a/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue b/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue index 9d705eb..56bc6f4 100644 --- a/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue +++ b/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue @@ -1,23 +1,31 @@ <template> - <div style="padding:30px 75px 50px;"> - <div style="width:100%;position: absolute;top: 15px;left: 0;"> - <div style="display: flex; - align-items: center;padding-left: 20px;"> + <div style="padding: 30px 75px 50px"> + <div style="width: 100%; position: absolute; top: 15px; left: 0"> + <div style="display: flex; align-items: center; padding-left: 20px"> <svg-icon - icon-class="iconsiji2" - style="font-size: 30px;margin-right: 10px;" - /> - <span>添加认证信息</span> + icon-class="iconsiji2" + style="font-size: 30px; margin-right: 10px" + /> + <span>添加认证信息</span> </div> - <el-divider style="width:100%"></el-divider> + <el-divider style="width: 100%"></el-divider> </div> <el-row> - <el-form ref="form" :rules="rules" :model="oilCompanyAuth" label-width="100px" :size="$store.getters.size"> + <el-form + ref="form" + :rules="rules" + :model="oilCompanyAuth" + label-width="100px" + :size="$store.getters.size" + > <el-row :gutter="gridNum.row.gutter"> - <el-col :span="12"> <el-form-item label="企业名称" prop="companyName"> - <el-input v-model="oilCompanyAuth.companyName" clearable disabled/> + <el-input + v-model="oilCompanyAuth.companyName" + clearable + disabled + /> </el-form-item> </el-col> <el-col :span="12"> @@ -28,7 +36,11 @@ :size="$store.getters.size" style="width: 100%" :options="areaTree" - :props="{value:'id', label:'areaName', children:'childList'}" + :props="{ + value: 'id', + label: 'areaName', + children: 'childList', + }" filterable clearable /> @@ -36,41 +48,68 @@ </el-col> <el-col :span="12"> <el-form-item label="详细地址" prop="address"> - <el-input v-model="oilCompanyAuth.address" clearable placeholder="不包含省市区" /> + <el-input + v-model="oilCompanyAuth.address" + clearable + placeholder="不包含省市区" + /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="法人代表" prop="companyLegalPerson"> - <el-input v-model="oilCompanyAuth.companyLegalPerson" clearable placeholder="法人姓名" /> + <el-input + v-model="oilCompanyAuth.companyLegalPerson" + clearable + placeholder="法人姓名" + /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="注册资本" prop="registeredCapital"> - <el-input v-model="oilCompanyAuth.registeredCapital" clearable placeholder="小写数字" /> + <el-input + v-model="oilCompanyAuth.registeredCapital" + clearable + placeholder="小写数字" + /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="经营资质" prop="businessQualia"> - <el-input v-model="oilCompanyAuth.businessQualia" clearable placeholder="企业经营资质" /> + <el-input + v-model="oilCompanyAuth.businessQualia" + clearable + placeholder="企业经营资质" + /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="联系方式" prop="contactPhone"> - <el-input v-model="oilCompanyAuth.contactPhone" clearable placeholder="手机号" /> + <el-input + v-model="oilCompanyAuth.contactPhone" + clearable + placeholder="手机号" + /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="企业网址" prop="website"> - <el-input v-model="oilCompanyAuth.website" clearable placeholder="企业门户" /> + <el-input + v-model="oilCompanyAuth.website" + clearable + placeholder="企业门户" + /> </el-form-item> </el-col> <el-col :span="24"> - <el-col :span="12"> - <el-form-item label="营业执照号码" prop="businessLienceId"> - <el-input v-model="oilCompanyAuth.businessLienceId" clearable placeholder="营业执照号码" /> - </el-form-item></el-col> - + <el-col :span="12"> + <el-form-item label="营业执照号码" prop="businessLienceId"> + <el-input + v-model="oilCompanyAuth.businessLienceId" + clearable + placeholder="营业执照号码" + /> </el-form-item + ></el-col> </el-col> <!-- <el-col :span="12"> <el-form-item label="打款名称" prop="bankCardName"> @@ -117,7 +156,7 @@ </el-col> --> <el-col :span="24"> <el-form-item label="营业执照照片" prop="businessLienceImg"> - <el-upload + <!-- <el-upload action="/lsm/ocr/business" list-type="picture-card" :on-preview="businessLienceImgPreview" @@ -127,7 +166,7 @@ :limit="1" > <i class="el-icon-plus" /> - </el-upload> + </el-upload> --> </el-form-item> <el-dialog v-el-drag-dialog @@ -135,7 +174,11 @@ title="营业执照" :modal="false" > - <img width="100%" :src="oilCompanyAuth.ibusinessLienceImgImageShow" alt=""> + <img + width="100%" + :src="oilCompanyAuth.ibusinessLienceImgImageShow" + alt="" + /> </el-dialog> </el-col> <!-- <el-col :span="12"> @@ -147,49 +190,59 @@ /> </el-form-item> </el-col> --> - </el-row> </el-form> </el-row> - <div :span="24" style="background:#fff;margin-top:20px;text-align: right;width:100%;position: absolute;bottom: 15px;left: 0;"> - <el-divider style="width:100%"></el-divider> - <el-button @click="close">取消</el-button> - <el-button type="primary" @click="submit" style="margin-right:10px">提交</el-button> - </div> + <div + :span="24" + style=" + background: #fff; + margin-top: 20px; + text-align: right; + width: 100%; + position: absolute; + bottom: 15px; + left: 0; + " + > + <el-divider style="width: 100%"></el-divider> + <el-button @click="close">取消</el-button> + <el-button type="primary" @click="submit" style="margin-right: 10px" + >提交</el-button + > + </div> </div> </template> <script> -import oilCompanyAuthApi from '@/api/customerManagement/oilCompanyAuth' -import AreaCodeApi from '@/api/customerManagement/areaCode' -import { imgCompress } from '@/utils' -import axios from 'axios' +import oilCompanyAuthApi from "@/api/customerManagement/oilCompanyAuth"; +import AreaCodeApi from "@/api/customerManagement/areaCode"; +// import { imgCompress } from "@/utils"; +import axios from "axios"; export default { props: { oilCompanyInfo: { type: Object, - default() { - - } - } + default() {}, + }, }, data() { return { gridNum: { row: { - gutter: 2 + gutter: 2, }, cols: { xs: 24, sm: 24, md: 12, lg: 12, - xl: 6 - } + xl: 6, + }, }, - loading:false, - imgCompress, - userList:[], + loading: false, + // imgCompress, + userList: [], uploadUrl: process.env.VUE_APP_UPLOAD_PRIVATE_URL, // 加密图片url imgeDialogVisible: false, areaTree: [], // 省市区树形结构 @@ -212,145 +265,193 @@ export default { businessLienceId: undefined, auth: false, auditMark: undefined, - createSource: 'WEBM' + createSource: "WEBM", }, rules: { companyName: [ - { required: true, message: '请输入企业名称', trigger: 'blur' }, - { min: 3, max: 50, message: '长度在 3 到 50 个字符', trigger: 'blur' } + { required: true, message: "请输入企业名称", trigger: "blur" }, + { + min: 3, + max: 50, + message: "长度在 3 到 50 个字符", + trigger: "blur", + }, ], - bankCardName:[ - { required: true, message: '请输入打款名称', trigger: 'blur' }, + bankCardName: [ + { required: true, message: "请输入打款名称", trigger: "blur" }, ], - bankCardNo:[ - { required: true, message: '请输入银行卡号', trigger: 'blur' }, + bankCardNo: [ + { required: true, message: "请输入银行卡号", trigger: "blur" }, ], - bankName:[ - { required: true, message: '请输入开户行名称', trigger: 'change' }, + bankName: [ + { required: true, message: "请输入开户行名称", trigger: "change" }, ], - interBankCode:[ - { required: true, message: '请输入联行号', trigger: 'blur' }, + interBankCode: [ + { required: true, message: "请输入联行号", trigger: "blur" }, ], address: [ - { min: 1, max: 300, message: '长度在 1 到 300 个字符', trigger: 'blur' } + { + min: 1, + max: 300, + message: "长度在 1 到 300 个字符", + trigger: "blur", + }, ], companyLegalPerson: [ - { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' } - ], - registeredCapital: [ - { pattern: /^\d*$/, message: '只能输入数值' } + { + min: 1, + max: 50, + message: "长度在 1 到 50 个字符", + trigger: "blur", + }, ], + registeredCapital: [{ pattern: /^\d*$/, message: "只能输入数值" }], businessQualia: [ - { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' } + { + min: 1, + max: 255, + message: "长度在 1 到 255 个字符", + trigger: "blur", + }, ], contactPhone: [ - { pattern: /^1[3456789]\d{9}$/, message: '目前只支持中国大陆的手机号码' } - + { + pattern: /^1[3456789]\d{9}$/, + message: "目前只支持中国大陆的手机号码", + }, ], website: [ - { pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\*\+,;=.]+$/, message: '请输入正确网址' } + { + pattern: + /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\*\+,;=.]+$/, + message: "请输入正确网址", + }, ], businessLienceId: [ - { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' } + { + min: 1, + max: 50, + message: "长度在 1 到 50 个字符", + trigger: "blur", + }, ], businessScope: [ - { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' } - ] - } - } + { + min: 1, + max: 255, + message: "长度在 1 到 255 个字符", + trigger: "blur", + }, + ], + }, + }; }, created() { - this.oilCompanyAuth.companyId = this.oilCompanyInfo.id - this.oilCompanyAuth.companyName = this.oilCompanyInfo.name - AreaCodeApi.getTree().then(res => { - this.areaTree = res.data - }) + this.oilCompanyAuth.companyId = this.oilCompanyInfo.id; + this.oilCompanyAuth.companyName = this.oilCompanyInfo.name; + AreaCodeApi.getTree().then((res) => { + this.areaTree = res.data; + }); }, methods: { - handleSelect(e){ - console.log(e) - if(e){ - console.log(this.userList.filter((item,index)=>item.bankName==e)[0].cnaps); - this.oilCompanyAuth.interBankCode = this.userList.filter((item,index)=>item.bankName==e)[0].cnaps + handleSelect(e) { + console.log(e); + if (e) { + console.log( + this.userList.filter((item, index) => item.bankName == e)[0].cnaps + ); + this.oilCompanyAuth.interBankCode = this.userList.filter( + (item, index) => item.bankName == e + )[0].cnaps; } }, - userRemoteMethod(queryString){ - this.loading = true; - if(this.timer){ - clearTimeout(this.timer) + userRemoteMethod(queryString) { + this.loading = true; + if (this.timer) { + clearTimeout(this.timer); } - this.timer = setTimeout(()=>{ - AreaCodeApi.findAllByName({name:queryString}).then(res=>{ - this.loading = false - this.userList = res.data - }) - },300) - + this.timer = setTimeout(() => { + AreaCodeApi.findAllByName({ name: queryString }).then((res) => { + this.loading = false; + this.userList = res.data; + }); + }, 300); }, - businessLienceImgPreview(file) { // 查询大图 - this.oilCompanyAuth.ibusinessLienceImgImageShow = file.url - this.imgeDialogVisible = true + businessLienceImgPreview(file) { + // 查询大图 + this.oilCompanyAuth.ibusinessLienceImgImageShow = file.url; + this.imgeDialogVisible = true; }, - businessLienceImgSuccess(response, file) { // 营业执照上传成功 - if (response.code === '0') { - this.oilCompanyAuth.businessLienceId = response.data.words_result.creditCode.words - this.oilCompanyAuth.companyName = response.data.words_result.unitName.words - this.oilCompanyAuth.companyLegalPerson = response.data.words_result.legal.words - this.oilCompanyAuth.businessScope = response.data.words_result.scope.words + businessLienceImgSuccess(response, file) { + // 营业执照上传成功 + if (response.code === "0") { + this.oilCompanyAuth.businessLienceId = + response.data.words_result.creditCode.words; + this.oilCompanyAuth.companyName = + response.data.words_result.unitName.words; + this.oilCompanyAuth.companyLegalPerson = + response.data.words_result.legal.words; + this.oilCompanyAuth.businessScope = + response.data.words_result.scope.words; } - imgCompress(file.raw).then(res => { - const form = new FormData() - res.fileName = file.fileName - form.append('file', res) - form.append('code', 'A003') + // imgCompress(file.raw).then((res) => { + // const form = new FormData(); + // res.fileName = file.fileName; + // form.append("file", res); + // form.append("code", "A003"); - // 上传到oss - axios.post(this.uploadUrl, form, { headers: { 'Content-type': 'application/x-www-form-urlencoded' }}).then(res => { - if (res.data.code === 20000) { - this.oilCompanyAuth.businessLienceImg = res.data.data.path - } - }) - }) + // // 上传到oss + // axios + // .post(this.uploadUrl, form, { + // headers: { "Content-type": "application/x-www-form-urlencoded" }, + // }) + // .then((res) => { + // if (res.data.code === 20000) { + // this.oilCompanyAuth.businessLienceImg = res.data.data.path; + // } + // }); + // }); }, - businessLienceImgRemove() { // 营业执照删除 - this.oilCompanyAuth.ibusinessLienceImgImageShow = undefined - this.oilCompanyAuth.businessLienceImg = undefined + businessLienceImgRemove() { + // 营业执照删除 + this.oilCompanyAuth.ibusinessLienceImgImageShow = undefined; + this.oilCompanyAuth.businessLienceImg = undefined; }, submit() { - this.$refs['form'].validate((valid) => { + this.$refs["form"].validate((valid) => { if (valid) { - this.save(this.oilCompanyAuth) + this.save(this.oilCompanyAuth); } - }) + }); }, save() { - const data = { ...this.oilCompanyAuth } + const data = { ...this.oilCompanyAuth }; if (data.auth) { - data.auditMark = 1 + data.auditMark = 1; } else { - data.auditMark = 2 + data.auditMark = 2; } if (this.addrCode.length > 1) { - data.provinceCode = this.addrCode[0] - data.cityCode = this.addrCode[1] - data.areaCode = this.addrCode[2] + data.provinceCode = this.addrCode[0]; + data.cityCode = this.addrCode[1]; + data.areaCode = this.addrCode[2]; } // 保存 - oilCompanyAuthApi.save(data).then(res => { - this.$message.success(res.msg) - this.$emit('closeDialog') - this.$emit('getByPage') - }) + oilCompanyAuthApi.save(data).then((res) => { + this.$message.success(res.msg); + this.$emit("closeDialog"); + this.$emit("getByPage"); + }); }, close() { - this.$emit('closeDialog') - } - } -} + this.$emit("closeDialog"); + }, + }, +}; </script> <style scoped> -.el-divider--horizontal{ +.el-divider--horizontal { margin: 10px 0; - } +} </style> diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue index 7efd1f8..cfb8863 100644 --- a/src/views/customerManagement/companyManagement/index.vue +++ b/src/views/customerManagement/companyManagement/index.vue @@ -1,7 +1,6 @@ <template> <div class="enterprise-recharge-details"> <div class="frame"> - <el-form :model="parameter.params" :inline="true"> <!-- 公司名称 --> <autocomplete @@ -10,19 +9,36 @@ :config="configAutocomplete" /> <el-form-item> - <el-autocomplete v-model="parameter.params.name" placeholder="总公司名称" :fetch-suggestions="querySearch" - :trigger-on-focus="false" clearable filterable remote reserve-keyword @keyup.enter.native="getByPage" /> + <el-autocomplete + v-model="parameter.params.name" + placeholder="总公司名称" + :fetch-suggestions="querySearch" + :trigger-on-focus="false" + clearable + filterable + remote + reserve-keyword + @keyup.enter.native="getByPage" + /> </el-form-item> <el-form-item> - <el-select v-model="parameter.params.parentMark" placeholder="是否为主体公司" clearable - @keyup.enter.native="getByPage"> + <el-select + v-model="parameter.params.parentMark" + placeholder="是否为主体公司" + clearable + @keyup.enter.native="getByPage" + > <el-option label="主体公司" value="0" /> <el-option label="分公司" value="1" /> </el-select> </el-form-item> <el-form-item> - <el-select v-model="parameter.params.companyNature" placeholder="企业性质" clearable - @keyup.enter.native="getByPage"> + <el-select + v-model="parameter.params.companyNature" + placeholder="企业性质" + clearable + @keyup.enter.native="getByPage" + > <el-option label="零售客户" value="0" /> <el-option label="外请客户" value="1" /> <el-option label="渠道客户" value="2" /> @@ -33,14 +49,24 @@ </el-select> </el-form-item> <el-form-item> - <el-select v-model="parameter.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage"> + <el-select + v-model="parameter.params.enableMark" + placeholder="启用标识" + clearable + @keyup.enter.native="getByPage" + > <el-option label="禁用" value="0" /> <el-option label="启用" value="1" /> </el-select> </el-form-item> <el-form-item> - <el-select v-model="parameter.params.auditMark" placeholder="审核标识" clearable @keyup.enter.native="getByPage"> + <el-select + v-model="parameter.params.auditMark" + placeholder="审核标识" + clearable + @keyup.enter.native="getByPage" + > <el-option label="未提交" value="0" /> <el-option label="审核通过" value="1" /> <el-option label="提交待审核" value="2" /> @@ -49,7 +75,12 @@ </el-form-item> <el-form-item> - <el-select v-model="parameter.params.companyType" placeholder="账户类型" clearable @keyup.enter.native="getByPage"> + <el-select + v-model="parameter.params.companyType" + placeholder="账户类型" + clearable + @keyup.enter.native="getByPage" + > <el-option label="柴油账户" value="0" /> <el-option label="LNG账户" value="2" /> <el-option label="汽油账户" value="1" /> @@ -58,17 +89,39 @@ </el-select> </el-form-item> - <el-form-item> - <el-select v-model="parameter.params.businessLeader" clearable filterable remote reserve-keyword - placeholder="企业负责人姓名或联系方式" :remote-method="userRemoteMethod" @keyup.enter.native="getByPage"> - <el-option v-for="item in userList" :key="item.id" - :label="item.phone + '(' + (item.nickName ? item.nickName + '-' : '') + item.userCode + ')'" :value="item.id" /> + <el-select + v-model="parameter.params.businessLeader" + clearable + filterable + remote + reserve-keyword + placeholder="企业负责人姓名或联系方式" + :remote-method="userRemoteMethod" + @keyup.enter.native="getByPage" + > + <el-option + v-for="item in userList" + :key="item.id" + :label=" + item.phone + + '(' + + (item.nickName ? item.nickName + '-' : '') + + item.userCode + + ')' + " + :value="item.id" + /> </el-select> </el-form-item> <el-form-item> - <el-select v-model="parameter.params.companyDockType" placeholder="公司对接类型" clearable @keyup.enter.native="getByPage"> + <el-select + v-model="parameter.params.companyDockType" + placeholder="公司对接类型" + clearable + @keyup.enter.native="getByPage" + > <el-option label="对接客户" :value="0" /> <el-option label="平台客户" :value="1" /> </el-select> @@ -76,10 +129,14 @@ </el-form> <div class="buttons"> - - <el-button v-permission="['company:info:add']" class="group-item" type="primary" :size="$store.getters.size" - @click="toAdd"> - <svg-icon icon-class="iconxinzeng"/> + <el-button + v-permission="['company:info:add']" + class="group-item" + type="primary" + :size="$store.getters.size" + @click="toAdd" + > + <svg-icon icon-class="iconxinzeng" /> <span class="padding-left-xs">添加</span> </el-button> <el-button icon="el-icon-search" @click="search">查询</el-button> @@ -87,156 +144,269 @@ </div> </div> <div class="table"> - <div class="operation"> - </div> + <div class="operation"></div> <!-- 列表开始 --> - <el-table :max-height="tableHeight" stripe :data="dataPage.list" fit style="width: 100%;" - :size="$store.getters.size" @sort-change="sortHandler" - @selection-change="handleSelectionChange"> - <el-table-column type="selection" width="55"/> - - <el-table-column label="序号" type="index" :index="indexMethod"/> + <el-table + :max-height="tableHeight" + stripe + :data="dataPage.list" + fit + style="width: 100%" + :size="$store.getters.size" + @sort-change="sortHandler" + @selection-change="handleSelectionChange" + > + <el-table-column type="selection" width="55" /> + + <el-table-column label="序号" type="index" :index="indexMethod" /> <el-table-column prop="name" label="企业名称" width="200"> - <template slot-scope="{row}"> + <template slot-scope="{ row }"> <div class="display: flex"> <el-tag v-if="row.parentMark === 0" effect="dark">总公司</el-tag> <el-tag v-else effect="dark">分公司</el-tag> <div> - <span> - {{row.name}}<br/> - </span> - <span> - NO:{{row.id}} - </span> + <span> {{ row.name }}<br /> </span> + <span> NO:{{ row.id }} </span> </div> </div> </template> </el-table-column> // TODO <el-table-column label="加价策略"> - <template slot-scope="{row}"> - <p>{{row.oilsPriceStrategy === '1' ? '费率' : '增减'}}:{{row.oilsPriceScale}}</p> + <template slot-scope="{ row }"> + <p> + {{ row.oilsPriceStrategy === "1" ? "费率" : "增减" }}:{{ + row.oilsPriceScale + }} + </p> </template> </el-table-column> <el-table-column prop="consumRebateStrategy" label="折返策略"> - <template slot-scope="{row}"> - <p v-if="row.consumRebateStrategy == 'TYFL' || row.consumRebateStrategy == 'SITE_lEVEL'"> - <span>{{row.consumRebateStrategy == 'TYFL' ? '统一费率' : '油站等级'}}</span> - <span>{{row.consumRebateScale ? row.consumRebateScale : '0'}}</span> + <template slot-scope="{ row }"> + <p + v-if=" + row.consumRebateStrategy == 'TYFL' || + row.consumRebateStrategy == 'SITE_lEVEL' + " + > + <span>{{ + row.consumRebateStrategy == "TYFL" ? "统一费率" : "油站等级" + }}</span> + <span>{{ + row.consumRebateScale ? row.consumRebateScale : "0" + }}</span> </p> <p v-if="row.consumRebateStrategy == 'TYSSFL'"> - {{row.consumRebateStrategy == 'TYSSFL' ? '统一升数' : '未知'}} - <span>{{row.consumRebateScale ? row.consumRebateScale + '元/L' : '0'}}</span> + {{ row.consumRebateStrategy == "TYSSFL" ? "统一升数" : "未知" }} + <span>{{ + row.consumRebateScale ? row.consumRebateScale + "元/L" : "0" + }}</span> </p> - <p v-if="row.consumRebateStrategy != 'TYFL' && row.consumRebateStrategy != 'SITE_lEVEL' && row.consumRebateStrategy != 'TYSSFL'"> + <p + v-if=" + row.consumRebateStrategy != 'TYFL' && + row.consumRebateStrategy != 'SITE_lEVEL' && + row.consumRebateStrategy != 'TYSSFL' + " + > 暂无 </p> </template> </el-table-column> <el-table-column label="企业性质"> - <template slot-scope="{row}"> - {{ row.companyNature === 0 ? '零售客户' : row.companyNature === 1 ? '外请客户' : row.companyNature === 2 ? '渠道客户' : row.companyNature === 3 ? '存量客户' : row.companyNature === 4 ? '批发客户' : row.companyNature === 5 ? 'LNG客户' : '推广业务'}} + <template slot-scope="{ row }"> + {{ + row.companyNature === 0 + ? "零售客户" + : row.companyNature === 1 + ? "外请客户" + : row.companyNature === 2 + ? "渠道客户" + : row.companyNature === 3 + ? "存量客户" + : row.companyNature === 4 + ? "批发客户" + : row.companyNature === 5 + ? "LNG客户" + : "推广业务" + }} </template> </el-table-column> <el-table-column label="账户类型"> - <template slot-scope="{row}"> - {{ row.companyType === '0' ? '柴油账户' : row.companyType === '1' ? '汽油账户' : row.companyType === '2' ? 'LNG账户' : row.companyType === '3' ? '尿素账户' : '油批账户'}} + <template slot-scope="{ row }"> + {{ + row.companyType === "0" + ? "柴油账户" + : row.companyType === "1" + ? "汽油账户" + : row.companyType === "2" + ? "LNG账户" + : row.companyType === "3" + ? "尿素账户" + : "油批账户" + }} </template> </el-table-column> <el-table-column label="公司对接类型"> - <template slot-scope="{row}"> - {{ row.companyDockType === 0 ? '对接客户' : row.companyDockType === 1 ? '平台客户' : '暂无'}} + <template slot-scope="{ row }"> + {{ + row.companyDockType === 0 + ? "对接客户" + : row.companyDockType === 1 + ? "平台客户" + : "暂无" + }} </template> </el-table-column> <el-table-column label="启用状态"> - <template slot-scope="{row}"> - <el-switch v-model="row.enableMark" :active-value=1 :inactive-value=0 @change="enableMarkClike(row)"></el-switch> + <template slot-scope="{ row }"> + <el-switch + v-model="row.enableMark" + :active-value="1" + :inactive-value="0" + @change="enableMarkClike(row)" + ></el-switch> </template> </el-table-column> <el-table-column label="联动分油"> - <template slot-scope="{row}"> - <el-switch v-model="row.shareDistribute" active-color="#13ce66" inactive-color="row.parentMark == 0 ? '#999' : '#ff4949'" :active-value="1" :inactive-value="0" :disabled="row.parentMark == 0" @change="enableMarkOpem(row)"></el-switch> + <template slot-scope="{ row }"> + <el-switch + v-model="row.shareDistribute" + active-color="#13ce66" + inactive-color="row.parentMark == 0 ? '#999' : '#ff4949'" + :active-value="1" + :inactive-value="0" + :disabled="row.parentMark == 0" + @change="enableMarkOpem(row)" + ></el-switch> </template> </el-table-column> <el-table-column lable="审核标识"> - <template slot-scope="{row}"> - <el-tag v-if="row.auditMark === 0" type="info" effect="dark">未提交</el-tag> - <el-tag v-if="row.auditMark === 1" type="success" effect="dark">审核通过</el-tag> - <el-tag v-if="row.auditMark === 2" type="warning" >提交待审核</el-tag> - <el-tag v-if="row.auditMark > 2 && row.auditMark < 0" type="danger" >审核不通过</el-tag> + <template slot-scope="{ row }"> + <el-tag v-if="row.auditMark === 0" type="info" effect="dark" + >未提交</el-tag + > + <el-tag v-if="row.auditMark === 1" type="success" effect="dark" + >审核通过</el-tag + > + <el-tag v-if="row.auditMark === 2" type="warning" + >提交待审核</el-tag + > + <el-tag v-if="row.auditMark > 2 && row.auditMark < 0" type="danger" + >审核不通过</el-tag + > </template> </el-table-column> <el-table-column label="企业负责人"> - <template slot-scope="{row}"> - {{row.userName ? row.userName : '企业负责人'}} <br/> - {{row.phone ? row.phone : '暂无电话'}} + <template slot-scope="{ row }"> + {{ row.userName ? row.userName : "企业负责人" }} <br /> + {{ row.phone ? row.phone : "暂无电话" }} </template> </el-table-column> <el-table-column label="企业负责人"> - <template slot-scope="{row}"> - {{row.userName ? row.userName : '企业负责人'}} <br/> - {{row.phone ? row.phone : '暂无电话'}} + <template slot-scope="{ row }"> + {{ row.userName ? row.userName : "企业负责人" }} <br /> + {{ row.phone ? row.phone : "暂无电话" }} </template> </el-table-column> <el-table-column label="创建信息"> - <template slot-scope="{row}"> - {{row.createUserName ? row.createUserName : '创建人'}} <br/> - {{row.createTime ? row.createTime : '创建时间'}} + <template slot-scope="{ row }"> + {{ row.createUserName ? row.createUserName : "创建人" }} <br /> + {{ row.createTime ? row.createTime : "创建时间" }} </template> </el-table-column> - <el-table-column fixed="right" label="操作" width="180px" align="center"> + <el-table-column + fixed="right" + label="操作" + width="180px" + align="center" + > <template slot-scope="scope"> - <el-button :size="$store.getters.size" type="text" @click="handleDetail(scope.row.id)"> - <svg-icon icon-class="iconxiangqing1"/> + <el-button + :size="$store.getters.size" + type="text" + @click="handleDetail(scope.row.id)" + > + <svg-icon icon-class="iconxiangqing1" /> </el-button> - <el-button @click="codeFn(scope.row)" :size="$store.getters.size" type="text" icon="el-icon-oilEwm"> + <el-button + @click="codeFn(scope.row)" + :size="$store.getters.size" + type="text" + icon="el-icon-oilEwm" + > </el-button> <el-dropdown> <el-button type="text"> 更多 - <i class="el-icon-arrow-down el-icon--right"/> + <i class="el-icon-arrow-down el-icon--right" /> </el-button> <el-dropdown-menu slot="dropdown"> <el-dropdown-item @click.native="toUpdate(scope.row.id)"> - <el-button v-permission="['company:info:base']" :size="$store.getters.size" type="text"> - <svg-icon icon-class="iconicon-"/> + <el-button + v-permission="['company:info:base']" + :size="$store.getters.size" + type="text" + > + <svg-icon icon-class="iconicon-" /> 基础资料 </el-button> </el-dropdown-item> - <el-dropdown-item v-if="scope.row.auditMark === 0" @click.native="toAddAuth(scope.row.id)"> - <el-button v-permission="['company:info:auth']" :size="$store.getters.size" type="text"> - <svg-icon icon-class="iconicon-"/> + <el-dropdown-item + v-if="scope.row.auditMark === 0" + @click.native="toAddAuth(scope.row.id)" + > + <el-button + v-permission="['company:info:auth']" + :size="$store.getters.size" + type="text" + > + <svg-icon icon-class="iconicon-" /> 认证信息 </el-button> </el-dropdown-item> - <el-dropdown-item v-if="scope.row.auditMark !== 0" @click.native="toUpdateAuth(scope.row.id)"> - <el-button v-permission="['company:info:auth']" :size="$store.getters.size" type="text"> - <svg-icon icon-class="iconicon-"/> + <el-dropdown-item + v-if="scope.row.auditMark !== 0" + @click.native="toUpdateAuth(scope.row.id)" + > + <el-button + v-permission="['company:info:auth']" + :size="$store.getters.size" + type="text" + > + <svg-icon icon-class="iconicon-" /> 认证信息 </el-button> </el-dropdown-item> <el-dropdown-item @click.native="toBankAuth(scope.row)"> - <el-button v-permission="['company:info:auth']" :size="$store.getters.size" type="text"> - <svg-icon icon-class="iconicon-"/> + <el-button + v-permission="['company:info:auth']" + :size="$store.getters.size" + type="text" + > + <svg-icon icon-class="iconicon-" /> 银行信息 </el-button> </el-dropdown-item> <el-dropdown-item @click.native="toFinance(scope.row.id)"> - <el-button v-permission="['company:info:finance']" :size="$store.getters.size" type="text"> - <svg-icon icon-class="iconicon-"/> + <el-button + v-permission="['company:info:finance']" + :size="$store.getters.size" + type="text" + > + <svg-icon icon-class="iconicon-" /> 财务信息 </el-button> </el-dropdown-item> </el-dropdown-menu> </el-dropdown> - </template> </el-table-column> </el-table> <!-- 分页组件结束 --> <!-- 分页 --> - <pagination :parameter="parameter" @searchAgain="getByPage"/> + <pagination :parameter="parameter" @searchAgain="getByPage" /> </div> <!-- 详情 --> <el-drawer @@ -244,8 +414,8 @@ direction="ltr" size="60%" :withHeader="false" - :visible="controlWindows.detail" - > + :visible.sync="controlWindows.detail" + > <general-details title="详情" :isHeader="true" @@ -253,7 +423,7 @@ :sourceData="oilCompanyMatch" :mappingData="mappingData" @close="controlWindows.detail = false" - > + > <template #offlineTransactionProof> <el-image style="width: 100px; height: 100px" @@ -264,448 +434,490 @@ </el-drawer> <!-- 添加弹窗 --> - <el-dialog v-el-drag-dialog title="添加" :visible.sync="addDialog" width="55%"> - <OilCompanyInfoAdd v-if="addDialog" @getByPage="getByPage" @closeDialog="closeDialog"/> + <el-dialog + v-el-drag-dialog + title="添加" + :visible.sync="addDialog" + width="55%" + > + <OilCompanyInfoAdd + v-if="addDialog" + @getByPage="getByPage" + @closeDialog="closeDialog" + /> </el-dialog> - <!-- 添加认证信息弹窗 --> <el-drawer :visible.sync="addAuthDialog" size="70%"> - <OilCompanyAuthAdd v-if="addAuthDialog" :oil-company-info="oilCompanyInfo" @getByPage="getByPage" - @closeDialog="closeDialog"/> + <OilCompanyAuthAdd + v-if="addAuthDialog" + :oil-company-info="oilCompanyInfo" + @getByPage="getByPage" + @closeDialog="closeDialog" + /> </el-drawer> </div> </template> <script> - import OilCompanyInfoAdd from "@/views/customerManagement/companyManagement/OilCompanyInfoAdd"; - import serve from "api/financialCenter/enterpriseRechargeDetails.js"; - import commonServe from "api/common.js"; - import oilCompanyInfoApi from "@/api/customerManagement/oilCompanyInfo"; - import autocomplete from "components/autocomplete/index.vue"; - import pagination from "components/pagination/index.vue"; - import generalDetails from "components/generalDetails/index.vue"; - - import { - rechargeTypeEnum, - rechargeStatusEnum, - repaymentExamineEnum, - } from "utils/dataType.js"; - - export default { - components: { - OilCompanyInfoAdd, - pagination, - autocomplete, - generalDetails, - }, - data() { - return { - // 部门树选项 - deptOptions: [], - deptDataList: { - companyIds: [] - }, - rowData: null, - showCode: false, - bankFinanceDialog: false, - syncDialog: false, - output: { - outputType: 4, // 导出方式,1导出选中,2导出本页,3条件导出,4导出全部 - startPage: 1, // 导出开始页 - endPage: 1, // 导出结束页 - pageSize: 20 // 每页条数 +import OilCompanyInfoAdd from "@/views/customerManagement/companyManagement/OilCompanyInfoAdd"; +import serve from "api/financialCenter/enterpriseRechargeDetails.js"; +import commonServe from "api/common.js"; + +import oilCompanyInfoApi from "@/api/customerManagement/oilCompanyInfo"; + +import autocomplete from "components/autocomplete/index.vue"; +import pagination from "components/pagination/index.vue"; +import generalDetails from "components/generalDetails/index.vue"; + +import { + rechargeTypeEnum, + rechargeStatusEnum, + repaymentExamineEnum, +} from "utils/dataType.js"; + +export default { + components: { + OilCompanyInfoAdd, + pagination, + autocomplete, + generalDetails, + }, + data() { + return { + // 部门树选项 + deptOptions: [], + deptDataList: { + companyIds: [], + }, + rowData: null, + showCode: false, + bankFinanceDialog: false, + syncDialog: false, + output: { + outputType: 4, // 导出方式,1导出选中,2导出本页,3条件导出,4导出全部 + startPage: 1, // 导出开始页 + endPage: 1, // 导出结束页 + pageSize: 20, // 每页条数 + }, + queryCompanyList: [], + userList: [], + piliangDialog: false, + updateFinanceDialog: false, // 修改财务信息弹窗 + BatchModifyingDialog: false, // 批量修改策略比例 + oilCompanyAuth: {}, + oilCompanyFinance: {}, + addFinanceDialog: false, // 添加财务信息弹窗 + updateAuthDialog: false, // 修改认证信息弹窗 + addAuthDialog: false, // 添加认证信息弹窗 + multipleSelection: [], // 选择表格数据集合 + outPutDialog: false, // 导出弹窗 + showTableDrawer: false, + page: { + pageSize: 20, // 每页显示条数 + currentPage: 1, // 默认页 + params: {}, // 查询参数 + sorted: { + createTime: "desc", }, - queryCompanyList: [], - userList: [], - piliangDialog: false, - updateFinanceDialog: false, // 修改财务信息弹窗 - BatchModifyingDialog: false, // 批量修改策略比例 - oilCompanyAuth: {}, - oilCompanyFinance: {}, - addFinanceDialog: false, // 添加财务信息弹窗 - updateAuthDialog: false, // 修改认证信息弹窗 - addAuthDialog: false, // 添加认证信息弹窗 - multipleSelection: [], // 选择表格数据集合 - outPutDialog: false, // 导出弹窗 - showTableDrawer: false, - page: { - pageSize: 20, // 每页显示条数 - currentPage: 1, // 默认页 - params: {}, // 查询参数 - sorted: { - createTime: 'desc' - }, - columns: [] + columns: [], + }, + tableHeight: document.documentElement.clientHeight - 300 - 60, + filters: this.$options.filters, + dataPage: { + // 分页显示page + pageSize: 20, // 每页显示条数 + currentPage: 1, // 默认页 + params: { + // 查询参数 }, - tableHeight: document.documentElement.clientHeight - 300 - 60, - filters: this.$options.filters, - dataPage: { // 分页显示page - pageSize: 20, // 每页显示条数 - currentPage: 1, // 默认页 - params: { // 查询参数 - }, - sorted: {}, - list: [] + sorted: {}, + list: [], + }, + tableColumns: [], + // 查询参数 + queryParams: {}, + addDialog: false, // 添加弹窗 + updateDialog: false, // 修改弹窗 + oilCompanyInfo: {}, + oilCompanyInfoId: { + id: "", + list: [], + }, + restaurants: [], // 企业名称搜索列表 + valColumn: [ + "name", + "abbreviaName", + "companyNature", + "parentMark", + "enableMark", + "auditMark", + "userName", + "createUserName", + "createTime", + "auditUserName", + "auditTime", + "updateUserName", + "updateTime", + ], + headers: [ + "企业名称", + "企业简称", + "企业性质", + "公司性质", + "启用状态", + "审核标识", + "企业负责人", + "创建人", + "创建时间", + "审核人", + "审核时间", + "修改人", + "修改时间", + ], + + rechargeTypeEnum: rechargeTypeEnum, + rechargeStatusEnum: rechargeStatusEnum, + repaymentExamineEnum: repaymentExamineEnum, + controlWindows: { + detail: false, + }, + datetime: [], + tableData: [], + configAutocomplete: { + serveTarget: commonServe.getRefineryCompanyList, + autocompleteKey: "name", + labelKey: "name", + valueKey: "id", + placeholder: "企业名称", + querykey: "companyId", + }, + configAutocompleteSec: { + serveTarget: commonServe.liekQuery, + autocompleteKey: "", + labelKey: "nickName", + valueKey: "id", + placeholder: "业务负责人", + querykey: "businessLeader", + }, + parameter: { + currentPage: 1, + pageSize: 10, + total: 0, + params: {}, + }, + LoopBackTypeEnum: [ + { + label: "充值圈回", + value: 1, }, - tableColumns: [ - ], - // 查询参数 - queryParams: {}, - addDialog: false, // 添加弹窗 - updateDialog: false, // 修改弹窗 - oilCompanyInfo: {}, - oilCompanyInfoId: { - id: '', - list: [] + { + label: "赊销圈回", + value: 2, }, - restaurants: [], // 企业名称搜索列表 - valColumn: ['name', 'abbreviaName', 'companyNature', 'parentMark', 'enableMark', 'auditMark', 'userName', 'createUserName', 'createTime', 'auditUserName', 'auditTime', - 'updateUserName', 'updateTime'], - headers: ['企业名称', '企业简称', '企业性质', '公司性质', '启用状态', '审核标识', '企业负责人', '创建人', '创建时间', '审核人', '审核时间', - '修改人', '修改时间'], - - - rechargeTypeEnum: rechargeTypeEnum, - rechargeStatusEnum: rechargeStatusEnum, - repaymentExamineEnum: repaymentExamineEnum, - controlWindows: { - detail: false, + { + label: "充值返利圈回", + value: 3, }, - datetime: [], - tableData: [], - configAutocomplete: { - serveTarget: commonServe.getRefineryCompanyList, - autocompleteKey: "name", - labelKey: "name", - valueKey: "id", - placeholder: "企业名称", - querykey: "companyId", + { + label: "消费返利圈回", + value: 4, }, - configAutocompleteSec: { - serveTarget: commonServe.liekQuery, - autocompleteKey: "", - labelKey: "nickName", - valueKey: "id", - placeholder: "业务负责人", - querykey: "businessLeader", + ], + oilCompanyMatch: {}, + mappingData: [ + { + carTitle: "", + carItems: [ + { label: "ID", value: "id" }, + { label: "交易类型", value: "transactionType" }, + { label: "交易状态", value: "transactionState" }, + { label: "交易金额", value: "transactionAmount" }, + { label: "充值返利比例", value: "rechargeRebate" }, + { label: "充值返利金额", value: "rechargeRebateAmount" }, + { label: "线下汇款公司账户", value: "offlinePaymentCompany" }, + { label: "线下交易发起时间", value: "offlineStartTime" }, + { label: "线下交易完成时间", value: "offlineCompleteTime" }, + { label: "线下交易凭证", value: "offlineTransactionProof" }, + { label: "交易审核标识", value: "auditMark" }, + { label: "审核人", value: "auditUserName" }, + { label: "交易说明", value: "reverseRemark" }, + { label: "审核时间", value: "auditTime" }, + { label: "审核系统来源", value: "auditSource" }, + { label: "赊销还款审核", value: "chargeSalesAuditMark" }, + { label: "赊销还款审核人", value: "chargeSalesAuditUser" }, + { label: "赊销还款审核时间", value: "chargeSalesAuditTime" }, + { label: "赊销还款审核来源", value: "chargeSalesAuditSource" }, + { label: "创建用户", value: "createUserName" }, + { label: "创建时间", value: "createTime" }, + { label: "创建数据来源", value: "createSource" }, + { label: "企业收款账户", value: "internalCompanyName" }, + { label: "开户行", value: "bankDeposit" }, + { label: "银行卡号", value: "bankCardNo" }, + ], }, - parameter: { - currentPage: 1, - pageSize: 10, - total: 0, - params: {}, + { + carTitle: "账户信息", + carItems: [ + { label: "账户总余额", value: "balance" }, + { label: "待还总金额", value: "totalChargeAmount" }, + { label: "账户状态", value: "accountState" }, + { label: "账户类型", value: "accountType" }, + { label: "账户充值余额", value: "rechargeBalance" }, + { label: "赊销充值余额", value: "chargeRechargeBalance" }, + { label: "充值返利余额", value: "rechargeRebateBalance" }, + { label: "消费返利余额", value: "consumeRebateBalance" }, + { label: "累计充值金额", value: "totalRechargeAmount" }, + { label: "累计赊销充值金额", value: "totalChargeRechargeAmount" }, + { label: "累计充值返利金额", value: "totalRechargeRebateAmount" }, + { label: "累计消费返利金额", value: "totalConsumeRebateAmount" }, + ], }, - LoopBackTypeEnum: [ - { - label: "充值圈回", - value: 1, - }, - { - label: "赊销圈回", - value: 2, - }, - { - label: "充值返利圈回", - value: 3, - }, - { - label: "消费返利圈回", - value: 4, - }, - ], - oilCompanyMatch: {}, - mappingData: [ - { - carTitle: "", - carItems: [ - {label: "ID", value: "id"}, - {label: "交易类型", value: "transactionType"}, - {label: "交易状态", value: "transactionState"}, - {label: "交易金额", value: "transactionAmount"}, - {label: "充值返利比例", value: "rechargeRebate"}, - {label: "充值返利金额", value: "rechargeRebateAmount"}, - {label: "线下汇款公司账户", value: "offlinePaymentCompany"}, - {label: "线下交易发起时间", value: "offlineStartTime"}, - {label: "线下交易完成时间", value: "offlineCompleteTime"}, - {label: "线下交易凭证", value: "offlineTransactionProof"}, - {label: "交易审核标识", value: "auditMark"}, - {label: "审核人", value: "auditUserName"}, - {label: "交易说明", value: "reverseRemark"}, - {label: "审核时间", value: "auditTime"}, - {label: "审核系统来源", value: "auditSource"}, - {label: "赊销还款审核", value: "chargeSalesAuditMark"}, - {label: "赊销还款审核人", value: "chargeSalesAuditUser"}, - {label: "赊销还款审核时间", value: "chargeSalesAuditTime"}, - {label: "赊销还款审核来源", value: "chargeSalesAuditSource"}, - {label: "创建用户", value: "createUserName"}, - {label: "创建时间", value: "createTime"}, - {label: "创建数据来源", value: "createSource"}, - {label: "企业收款账户", value: "internalCompanyName"}, - {label: "开户行", value: "bankDeposit"}, - {label: "银行卡号", value: "bankCardNo"}, - ], - }, - { - carTitle: "账户信息", - carItems: [ - {label: "账户总余额", value: "balance"}, - {label: "待还总金额", value: "totalChargeAmount"}, - {label: "账户状态", value: "accountState"}, - {label: "账户类型", value: "accountType"}, - {label: "账户充值余额", value: "rechargeBalance"}, - {label: "赊销充值余额", value: "chargeRechargeBalance"}, - {label: "充值返利余额", value: "rechargeRebateBalance"}, - {label: "消费返利余额", value: "consumeRebateBalance"}, - {label: "累计充值金额", value: "totalRechargeAmount"}, - {label: "累计赊销充值金额", value: "totalChargeRechargeAmount"}, - {label: "累计充值返利金额", value: "totalRechargeRebateAmount"}, - {label: "累计消费返利金额", value: "totalConsumeRebateAmount"}, - ], - }, - ], + ], + }; + }, + created() { + this.initDateTime(); + this.getByPage(); + }, + updated() { + this.$nextTick(() => { + this.$refs.multipleTable && this.$refs.multipleTable.doLayout(); + }); + }, + mounted() { + this.$nextTick(() => { + this.heightHandle(); + }); + window.addEventListener( + "resize", + this.$utils.debounce(this.heightHandle, 500) + ); + }, + methods: { + search() { + this.parameter.currentPage = 1; + console.log("111111111111111111111"); + console.log(this.parameter); + this.getByPage(); + }, + closeDialog() { + this.addDialog = false; + this.updateDialog = false; + this.addAuthDialog = false; + this.updateAuthDialog = false; + this.addFinanceDialog = false; + this.updateFinanceDialog = false; + this.piliangDialog = false; + this.BatchModifyingDialog = false; + this.showTableDrawer = false; + this.bankFinanceDialog = false; + this.syncDialog = false; + }, + enableMarkOpem(row) { + // 启用禁用点击 + const data = { + id: row.id, + shareDistribute: row.shareDistribute, }; + oilCompanyInfoApi.openShareDistribute(data).then((res) => { + if (res.code === 20000) { + this.$message.success(res.msg); + } + this.getByPage(); + }); + }, + getByPage() { + oilCompanyInfoApi.getByPage(this.parameter).then((res) => { + this.dataPage.list = res.data.list; + this.parameter.total = res.data.totalCount; + }); + console.log(this.tableData); }, - created() { + //新增 + addition() { + this.controlWindows.addInfo.title = "产品新增"; + this.controlWindows.add = true; + }, + // detail(row) { + // Promise.all([ + // serve.get(row.id), + // serve.getByCompanyId(row.companyId), + // ]).then(([firstRes, secondRes]) => { + // this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data }; + + // console.log("this.oilCompanyMatch", this.oilCompanyMatch); + // this.controlWindows.detail = true; + // }); + // }, + // 启用禁用点击 + enableMarkClike(row) { + console.log("111111111111111111111"); + const data = [row]; + oilCompanyInfoApi.updateBatchEnable(data).then((res) => { + if (res.code === 20000) { + this.$message.success(res.msg); + } + this.getByPage(); + }); + }, + //重置 + reset() { + this.parameter = { + currentPage: 1, + pageSize: 10, + total: 0, + params: {}, + }; this.initDateTime(); + }, + // init时间 + initDateTime() { + let now = new Date().getTime(); + let beforeDay30 = now - 1000 * 60 * 60 * 24 * 30; + let nowRes = this.$utils.parseTime(now); + let beforeDay30Res = this.$utils.parseTime(beforeDay30); + let { y, M, d } = nowRes; + let { y: beforey, M: beforeM, d: befored } = beforeDay30Res; + this.datetime = [ + `${beforey}-${beforeM}-${befored} 00:00:00`, + `${y}-${M}-${d} 23:59:59`, + ]; + this.changeDateTime(this.datetime); + }, + changeDateTime(val) { + if (val) { + this.parameter.params.createTimeStart = val[0]; + this.parameter.params.createTimeEnd = val[1]; + } + console.log(val); + }, + // table height + heightHandle() { + let bodyHeight = document.body.clientHeight; + let frameHeight = this.obtainElement(".frame").clientHeight; + let operationHeight = this.obtainElement(".operation").clientHeight; + let paginationHeight = this.obtainElement(".el-pagination").clientHeight; + this.tableHeight = + bodyHeight - frameHeight - operationHeight - paginationHeight - 145; + }, + handleSizeChange(val) { + this.page.pageSize = val; this.getByPage(); }, - updated() { - this.$nextTick(() => { - this.$refs.multipleTable && this.$refs.multipleTable.doLayout(); - }); + handleCurrentChange(val) { + this.page.currentPage = val; + this.getByPage(); + }, + indexMethod(index) { + return (index + 1) * 1; }, - mounted() { - this.$nextTick(() => { - this.heightHandle(); + sortHandler(column) { + // 排序查询 + console.log(column.column.sortable); + const key = column.column.sortable; + const value = column.order; + this.page.sorted = {}; + this.page.sorted[key] = value; + this.getByPage(); + }, + toAdd() { + // 跳转到添加 + this.oilCompanyInfo = {}; + this.addDialog = true; + }, + toAddAuth(id) { + // 跳转添加认证信息 + oilCompanyInfoApi.get(id).then((res) => { + this.oilCompanyInfo = res.data; + this.addAuthDialog = true; }); - window.addEventListener( - "resize", - this.$utils.debounce(this.heightHandle, 500) - ); }, - methods: { - search() { - this.parameter.currentPage = 1; - console.log("111111111111111111111"); - console.log(this.parameter) - this.getByPage(); - }, - closeDialog() { - this.addDialog = false - this.updateDialog = false - this.addAuthDialog = false - this.updateAuthDialog = false - this.addFinanceDialog = false - this.updateFinanceDialog = false - this.piliangDialog = false - this.BatchModifyingDialog = false - this.showTableDrawer = false - this.bankFinanceDialog = false - this.syncDialog = false - }, - enableMarkOpem(row) { // 启用禁用点击 - const data = { - id: row.id, - shareDistribute: row.shareDistribute - } - oilCompanyInfoApi.openShareDistribute(data).then(res => { - if (res.code === 20000) { - this.$message.success(res.msg) - } - this.getByPage() - }) - }, - getByPage() { - oilCompanyInfoApi.getByPage(this.parameter).then((res) => { - this.dataPage.list = res.data.list; - this.parameter.total = res.data.totalCount; - }); - console.log(this.tableData) - }, - //新增 - addition() { - this.controlWindows.addInfo.title = "产品新增"; - this.controlWindows.add = true; - }, - detail(row) { - Promise.all([ - serve.get(row.id), - serve.getByCompanyId(row.companyId), - ]).then(([firstRes, secondRes]) => { - this.oilCompanyMatch = {...firstRes.data, ...secondRes.data}; - - console.log("this.oilCompanyMatch", this.oilCompanyMatch); - this.controlWindows.detail = true; - }); - }, - // 启用禁用点击 - enableMarkClike(row) { - console.log("111111111111111111111"); - const data = [row] - oilCompanyInfoApi.updateBatchEnable(data).then(res => { - if (res.code === 20000) { - this.$message.success(res.msg) - } - this.getByPage() - }) - }, - //重置 - reset() { - this.parameter = { - currentPage: 1, - pageSize: 10, - total: 0, - params: {}, - }; - this.initDateTime(); - }, - // init时间 - initDateTime() { - let now = new Date().getTime(); - let beforeDay30 = now - 1000 * 60 * 60 * 24 * 30; - let nowRes = this.$utils.parseTime(now); - let beforeDay30Res = this.$utils.parseTime(beforeDay30); - let {y, M, d} = nowRes; - let {y: beforey, M: beforeM, d: befored} = beforeDay30Res; - this.datetime = [ - `${beforey}-${beforeM}-${befored} 00:00:00`, - `${y}-${M}-${d} 23:59:59`, - ]; - this.changeDateTime(this.datetime); - }, - changeDateTime(val) { - if (val) { - this.parameter.params.createTimeStart = val[0]; - this.parameter.params.createTimeEnd = val[1]; - } - console.log(val); - }, - // table height - heightHandle() { - let bodyHeight = document.body.clientHeight; - let frameHeight = this.obtainElement(".frame").clientHeight; - let operationHeight = this.obtainElement(".operation").clientHeight; - let paginationHeight = this.obtainElement(".el-pagination").clientHeight; - this.tableHeight = - bodyHeight - frameHeight - operationHeight - paginationHeight - 145; - }, - handleSizeChange(val) { - this.page.pageSize = val - this.getByPage() - }, - handleCurrentChange(val) { - this.page.currentPage = val - this.getByPage() - }, - indexMethod(index) { - return (index + 1) * 1 - }, - sortHandler(column) { - // 排序查询 - console.log(column.column.sortable) - const key = column.column.sortable - const value = column.order - this.page.sorted = {} - this.page.sorted[key] = value - this.getByPage() - }, - toAdd() { - // 跳转到添加 - this.oilCompanyInfo = {} - this.addDialog = true - }, - toAddAuth(id) { - // 跳转添加认证信息 - oilCompanyInfoApi.get(id).then(res => { - this.oilCompanyInfo = res.data - this.addAuthDialog = true - }) - }, - handleSelectionChange(val) { // 选择表格数据 - this.multipleSelection = val - }, - obtainElement(className) { - return document.documentElement.querySelector(className); - }, + handleSelectionChange(val) { + // 选择表格数据 + this.multipleSelection = val; }, - }; + obtainElement(className) { + return document.documentElement.querySelector(className); + }, + }, +}; </script> <style lang="scss" scoped> - .enterprise-recharge-details { - .frame { - margin: 20px; - padding: 20px; - border-radius: 6px; - border: 1px solid #e3e3e5; - background: #fff; - - .el-input, - .el-select { - width: 183px; - height: 40px; - } - - .el-autocomplete + .el-input, - .el-input + .el-autocomplete, - .el-autocomplete + .el-select, - .el-input + .el-input, - .el-input + .el-select, - .el-select + .el-select, - .el-select + .el-input { - margin-right: 20px; - margin-bottom: 15px; - } +.enterprise-recharge-details { + .frame { + margin: 20px; + padding: 20px; + border-radius: 6px; + border: 1px solid #e3e3e5; + background: #fff; + + .el-input, + .el-select { + width: 183px; + height: 40px; + } - .mr20 { - margin-right: 20px; - } + .el-autocomplete + .el-input, + .el-input + .el-autocomplete, + .el-autocomplete + .el-select, + .el-input + .el-input, + .el-input + .el-select, + .el-select + .el-select, + .el-select + .el-input { + margin-right: 20px; + margin-bottom: 15px; + } - .buttons { - text-align: right; - } + .mr20 { + margin-right: 20px; } - .table { - overflow: hidden; - margin: 0 20px; - padding-bottom: 20px; - background: #fff; - border-radius: 6px; - border: 1px solid #e3e3e5; + .buttons { + text-align: right; + } + } - > .operation { - box-sizing: content-box; - padding: 15px; - } + .table { + overflow: hidden; + margin: 0 20px; + padding-bottom: 20px; + background: #fff; + border-radius: 6px; + border: 1px solid #e3e3e5; + + > .operation { + box-sizing: content-box; + padding: 15px; + } - .gray { - color: #999; + .gray { + color: #999; - span { - color: #333; - } + span { + color: #333; } + } - .el-table { - margin-bottom: 20px; - border-radius: 10px 10px 0px 0px; - } + .el-table { + margin-bottom: 20px; + border-radius: 10px 10px 0px 0px; + } - .el-dropdown-link { - margin-right: 10px; - cursor: pointer; - color: #409eff; + .el-dropdown-link { + margin-right: 10px; + cursor: pointer; + color: #409eff; - &.special { - margin-right: 0; - } + &.special { + margin-right: 0; } + } - .el-icon-arrow-down { - font-size: 12px; - } + .el-icon-arrow-down { + font-size: 12px; } } +} </style> diff --git a/src/views/financialCenter/accountManagement/components/recharge.vue b/src/views/financialCenter/accountManagement/components/recharge.vue index 5ce448c..da2d698 100644 --- a/src/views/financialCenter/accountManagement/components/recharge.vue +++ b/src/views/financialCenter/accountManagement/components/recharge.vue @@ -1,7 +1,7 @@ <template> <el-dialog title="充值" - :visible="controlWindows.recharge" + :visible.sync="controlWindows.recharge" width="30%" :before-close="closeWindow" @opened="openDrawer" diff --git a/src/views/financialCenter/billDetails/index.vue b/src/views/financialCenter/billDetails/index.vue index 66bd0ea..de9e271 100644 --- a/src/views/financialCenter/billDetails/index.vue +++ b/src/views/financialCenter/billDetails/index.vue @@ -129,7 +129,7 @@ direction="ltr" size="60%" :withHeader="false" - :visible="controlWindows.detail" + :visible.sync="controlWindows.detail" > <general-details title="详情" diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue index 9df9e48..8f69055 100644 --- a/src/views/financialCenter/enterpriseRecharge/components/add.vue +++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue @@ -3,7 +3,7 @@ :title="controlWindows.addInfo.title" direction="ltr" size="50%" - :visible="controlWindows.add" + :visible.sync="controlWindows.add" @opened="openDrawer" :before-close="closeWindow" > @@ -273,7 +273,7 @@ export default { // 公司change companyChange(id) { if (id) { - serve.getByCompanyIdSec(id).then((res) => { + serve.getByCompanyId(id).then((res) => { this.companyFinance = res.data; }); } diff --git a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue index 0aa7c45..b6a3c77 100644 --- a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue +++ b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue @@ -3,7 +3,7 @@ :title="controlWindows.addInfo.title" direction="ltr" size="50%" - :visible="controlWindows.addTurn" + :visible.sync="controlWindows.addTurn" @opened="openDrawer" :before-close="closeWindow" > @@ -92,6 +92,7 @@ <script> import serve from "api/financialCenter/enterpriseRecharge.js"; +import commonServe from "api/common.js"; import autocomplete from "components/autocomplete/index.vue"; @@ -184,7 +185,7 @@ export default { // 公司财务信息 companyChange(id) { if (id) { - serve.getByCompanyIdSec(id).then((res) => { + serve.getByCompanyId(id).then((res) => { this.companyFinance = res.data; this.getByCompanyId(res.data.companyId); }); @@ -192,7 +193,7 @@ export default { }, // getByCompanyId(id) { - serve.getByCompanyId(id).then((res) => { + commonServe.getByCompanyId(id).then((res) => { this.companyInfo = res.data; }); }, diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue index 90c3187..13541f2 100644 --- a/src/views/financialCenter/enterpriseRecharge/index.vue +++ b/src/views/financialCenter/enterpriseRecharge/index.vue @@ -264,7 +264,7 @@ direction="ltr" size="60%" :withHeader="false" - :visible="controlWindows.detail" + :visible.sync="controlWindows.detail" > <general-details title="详情" @@ -555,7 +555,7 @@ export default { detail(row) { Promise.all([ serve.get(row.id), - serve.getByCompanyId(row.companyId), + commonServe.getByCompanyId(row.companyId), ]).then(([firstRes, secondRes]) => { this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data }; this.controlWindows.detail = true; diff --git a/src/views/financialCenter/enterpriseRechargeDetails/index.vue b/src/views/financialCenter/enterpriseRechargeDetails/index.vue index 0478afb..2cb9e4a 100644 --- a/src/views/financialCenter/enterpriseRechargeDetails/index.vue +++ b/src/views/financialCenter/enterpriseRechargeDetails/index.vue @@ -178,7 +178,7 @@ direction="ltr" size="60%" :withHeader="false" - :visible="controlWindows.detail" + :visible.sync="controlWindows.detail" > <general-details title="详情" @@ -252,24 +252,7 @@ export default { total: 0, params: {}, }, - // rechargeTypeEnum: [ - // { - // label: "充值", - // value: "RECHARGE", - // }, - // { - // label: "销账", - // value: "REVOKE", - // }, - // { - // label: "赊销", - // value: "CHARGE_SALES", - // }, - // { - // label: "消费返利", - // value: "CONSUME_REBATE", - // }, - // ], + LoopBackTypeEnum: [ { label: "充值圈回", @@ -289,38 +272,6 @@ export default { }, ], - // rechargeStatusEnum: [ - // { - // label: "已申请", - // value: 0, - // }, - // { - // label: "已成功", - // value: 1, - // }, - // { - // label: "已撤销", - // value: -1, - // }, - // ], - // repaymentExamineEnum: [ - // { - // label: "还款待审核", - // value: 0, - // }, - // { - // label: "还款成功", - // value: 1, - // }, - // { - // label: "还款失败", - // value: -1, - // }, - // { - // label: "待还款", - // value: -2, - // }, - // ], oilCompanyMatch: {}, mappingData: [ { @@ -412,7 +363,7 @@ export default { detail(row) { Promise.all([ serve.get(row.id), - serve.getByCompanyId(row.companyId), + commonServe.getByCompanyId(row.companyId), ]).then(([firstRes, secondRes]) => { this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data }; diff --git a/src/views/product/components/add.vue b/src/views/product/components/add.vue index 8bb95fc..dfbd6db 100644 --- a/src/views/product/components/add.vue +++ b/src/views/product/components/add.vue @@ -3,7 +3,7 @@ :title="controlWindows.addInfo.title" direction="ltr" size="40%" - :visible="controlWindows.add" + :visible.sync="controlWindows.add" @opened="openDrawer" :before-close="closeWindow" > diff --git a/src/views/product/components/adjust.vue b/src/views/product/components/adjust.vue index 125fb9a..ffc97f4 100644 --- a/src/views/product/components/adjust.vue +++ b/src/views/product/components/adjust.vue @@ -1,7 +1,7 @@ <template> <el-dialog title="调价" - :visible="controlWindows.adjust" + :visible.sync="controlWindows.adjust" width="30%" :before-close="closeWindow" @opened="openDrawer" diff --git a/src/views/product/components/batch.vue b/src/views/product/components/batch.vue index 39a9104..381c54b 100644 --- a/src/views/product/components/batch.vue +++ b/src/views/product/components/batch.vue @@ -1,7 +1,7 @@ <template> <el-dialog title="批量修改" - :visible="controlWindows.batch" + :visible.sync="controlWindows.batch" width="30%" :before-close="closeWindow" @opened="openDrawer" diff --git a/src/views/product/components/create.vue b/src/views/product/components/create.vue index 0727492..bd375af 100644 --- a/src/views/product/components/create.vue +++ b/src/views/product/components/create.vue @@ -3,7 +3,7 @@ title="创建订单" direction="ltr" size="40%" - :visible="controlWindows.create" + :visible.sync="controlWindows.create" @opened="openDrawer" :before-close="closeWindow" > diff --git a/src/views/product/components/record.vue b/src/views/product/components/record.vue index d3dedaa..34f3d33 100644 --- a/src/views/product/components/record.vue +++ b/src/views/product/components/record.vue @@ -3,7 +3,7 @@ title="调价记录" direction="ltr" size="60%" - :visible="controlWindows.record" + :visible.sync="controlWindows.record" :before-close="closeWindow" @opened="openDrawer" > diff --git a/src/views/product/index.vue b/src/views/product/index.vue index b6056d6..273d3e4 100644 --- a/src/views/product/index.vue +++ b/src/views/product/index.vue @@ -170,7 +170,7 @@ direction="ltr" size="60%" :withHeader="false" - :visible="controlWindows.detail" + :visible.sync="controlWindows.detail" > <general-details title="详情" diff --git a/src/views/refineryAccount/components/add.vue b/src/views/refineryAccount/components/add.vue index b493cb3..af8a2f9 100644 --- a/src/views/refineryAccount/components/add.vue +++ b/src/views/refineryAccount/components/add.vue @@ -3,7 +3,7 @@ :title="controlWindows.addInfo.title" direction="ltr" size="40%" - :visible="controlWindows.add" + :visible.sync="controlWindows.add" @opened="openDrawer" :before-close="closeWindow" > diff --git a/src/views/refineryAccount/index.vue b/src/views/refineryAccount/index.vue index 61bda8a..9f22710 100644 --- a/src/views/refineryAccount/index.vue +++ b/src/views/refineryAccount/index.vue @@ -121,7 +121,7 @@ direction="ltr" size="60%" :withHeader="false" - :visible="controlWindows.detail" + :visible.sync="controlWindows.detail" > <general-details title="详情" diff --git a/src/views/refineryInfo/components/add.vue b/src/views/refineryInfo/components/add.vue index dda78cd..8cedf52 100644 --- a/src/views/refineryInfo/components/add.vue +++ b/src/views/refineryInfo/components/add.vue @@ -3,7 +3,7 @@ :title="controlWindows.addInfo.title" direction="ltr" size="40%" - :visible="controlWindows.add" + :visible.sync="controlWindows.add" @opened="openDrawer" :before-close="closeWindow" > diff --git a/src/views/refineryInfo/index.vue b/src/views/refineryInfo/index.vue index ecb5f23..68deadb 100644 --- a/src/views/refineryInfo/index.vue +++ b/src/views/refineryInfo/index.vue @@ -150,7 +150,7 @@ direction="ltr" size="60%" :withHeader="false" - :visible="controlWindows.detail" + :visible.sync="controlWindows.detail" > <general-details title="详情"