Commit 587c9b13 by songwenlu

gx

parents 84764eff c10eb393
import { api, formatParams, baseUrl } from '@/utils/axios'
// import { api1, formatParams1, config } from '@/utils/request'
import axios from 'axios'
import { getToken } from "@/utils/auth";
/**
* 初审部门列表列表
*/
export function queryCommerListDeedTaxFromInitDepartment(params) {
return api(
Object.assign(formatParams("POST", params), {
url: "/admin-api/commercial-deedTax/queryListDeedTaxFromInitDepartment",
})
);
}
/**
* 主审部门列表列表
*/
export function queryCommerListDeedTax(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/commercial-deedTax/queryListDeedTax`
}))
}
/**
* 契税补贴查询详情
*/
export function queryCommerDeedTaxDetailInfo(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/commercial-deedTax/queryDeedTaxDetailInfo`
}))
}
/**
* 契税补贴查询操作记录
*/
export function queryCommerDeedTaxRecord(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/commercial-deedTax/queryDeedTaxRecord`
}))
}
/**
* 契税补贴初审部门审核
*/
export function updateCommerInitDepartmentState(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/commercial-deedTax/updateInitDepartmentState`
}))
}
/**
* 契税补贴主审部门审核
*/
export function updateCommerDeedTaxState(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/commercial-deedTax/updateDeedTaxState`
}))
}
/**
* 契税补贴初审部门撤回
*/
export function initCommerDepartmentRevocation(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/commercial-deedTax/initDepartmentRevocation`
}))
}
/**
* 契税补贴主审部门撤回
*/
export function mainCommerRevocation(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/commercial-deedTax/mainRevocation`
}))
}
/**
* 保存申请模板
*/
export function saveCommerFileUrl(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/commercial-deedTax/saveFileUrl`
}))
}
/**
* 修改申请单审核辖市区
*/
export function updateCommerCheckArea(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/commercial-deedTax/updateCheckArea`
}))
}
/**
* 导出
*/
export function userCommerExport(params) {
return axios({
method: 'post',
data: params,
url: `${baseUrl}/admin-api/commercial-deedTax/userExport`,
responseType: 'blob',
headers: {
"Authorization": getToken() ? ( 'Bearer ' + getToken()) : "",
}
})
}
/**
* 契税补贴数据推送(至市契税)
*/
export function dtSubsidy(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/deedTax/dtSubsidy`
}))
}
\ No newline at end of file
import { api, formatParams, baseUrl } from '@/utils/axios'
// import { api1, formatParams1, config } from '@/utils/request'
import axios from 'axios'
import { getToken } from "@/utils/auth";
/**
* 初审部门列表列表
*/
export function queryMultipleListDeedTaxFromInitDepartment(params) {
return api(
Object.assign(formatParams("POST", params), {
url: "/admin-api/multipleChildren-deedTax/queryListDeedTaxFromInitDepartment",
})
);
}
/**
* 主审部门列表列表
*/
export function queryMultipleListDeedTax(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/multipleChildren-deedTax/queryListDeedTax`
}))
}
/**
* 契税补贴查询详情
*/
export function queryMultipleDeedTaxDetailInfo(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/multipleChildren-deedTax/queryDeedTaxDetailInfo`
}))
}
/**
* 契税补贴查询操作记录
*/
export function queryMultipleDeedTaxRecord(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/multipleChildren-deedTax/queryDeedTaxRecord`
}))
}
/**
* 契税补贴初审部门审核
*/
export function updateMultipleInitDepartmentState(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/multipleChildren-deedTax/updateInitDepartmentState`
}))
}
/**
* 契税补贴主审部门审核
*/
export function updateMultipleDeedTaxState(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/multipleChildren-deedTax/updateDeedTaxState`
}))
}
/**
* 契税补贴初审部门撤回
*/
export function initMultipleDepartmentRevocation(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/multipleChildren-deedTax/initDepartmentRevocation`
}))
}
/**
* 契税补贴主审部门撤回
*/
export function mainMultipleRevocation(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/multipleChildren-deedTax/mainRevocation`
}))
}
/**
* 保存申请模板
*/
export function saveMultipleFileUrl(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/multipleChildren-deedTax/saveFileUrl`
}))
}
/**
* 修改申请单审核辖市区
*/
export function updateMultipleCheckArea(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/multipleChildren-deedTax/updateCheckArea`
}))
}
/**
* 导出
*/
export function userMultipleExport(params) {
return axios({
method: 'post',
data: params,
url: `${baseUrl}/admin-api/multipleChildren-deedTax/userExport`,
responseType: 'blob',
headers: {
"Authorization": getToken() ? ( 'Bearer ' + getToken()) : "",
}
})
}
/**
* 契税补贴数据推送(至市契税)
*/
export function dtSubsidy(params) {
return api(Object.assign(formatParams('POST', params), {
url: `/admin-api/deedTax/dtSubsidy`
}))
}
\ No newline at end of file
const domain = { const domain = {
// dev: "http://192.168.3.87:8881", // 姚镇接口 // dev: "http://192.168.3.87:8881", // 姚镇接口
dev: "http://81.69.231.72:8881", // 测试接口 dev: "http://81.69.231.72:8881", // 姚镇接口
// dev: "http://81.69.231.72:8881", // 测试接口
// dev: "https://exam.smart-zj.cn:9100/smartExam/", // 新正式接口 // dev: "https://exam.smart-zj.cn:9100/smartExam/", // 新正式接口
}; };
// 腾讯地图 key // 腾讯地图 key
const map = { const map = {
dev: { dev: {
key: 'HJEBZ-U5BLP-SRWDB-LBKOS-PCIQH-F4FLG', key: "HJEBZ-U5BLP-SRWDB-LBKOS-PCIQH-F4FLG",
appName: '测试' appName: "测试",
}, },
// 配置之后没有权限 暂时使用测试key // 配置之后没有权限 暂时使用测试key
// dev: { // dev: {
// appName: '智慧镇江', // appName: '智慧镇江',
// key: 'THOBZ-J7ILW-AWERU-O3K2T-HLROF-XZFDC' // key: 'THOBZ-J7ILW-AWERU-O3K2T-HLROF-XZFDC'
// } // }
} };
// 核酸地图 // 核酸地图
// export const appointmentUrl = 'https://exam.smart-zj.cn:9100' // export const appointmentUrl = 'https://exam.smart-zj.cn:9100'
export const appointmentUrl = '' export const appointmentUrl = "";
export const mapKey = map.dev export const mapKey = map.dev;
export const baseUrl = domain.dev; export const baseUrl = domain.dev;
...@@ -49,6 +49,7 @@ export default { ...@@ -49,6 +49,7 @@ export default {
parent.children.push(item) parent.children.push(item)
}) })
this.menuList = menuList; this.menuList = menuList;
this.menuList.sort((x,z)=> Number(x.sequence)-Number(z.sequence) )
} }
}, },
}; };
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @LastEditors: zhouyh * @LastEditors: zhouyh
* @LastEditTime: 2021-09-26 10:20:02 * @LastEditTime: 2021-09-26 10:20:02
*/ */
const TokenKey = "Authorization"; export const TokenKey = "Authorization";
const MenuList = "MenuList"; const MenuList = "MenuList";
export function getToken() { export function getToken() {
return localStorage.getItem(TokenKey); return localStorage.getItem(TokenKey);
......
...@@ -8,6 +8,7 @@ import { ...@@ -8,6 +8,7 @@ import {
import { import {
getToken getToken
} from "@/utils/auth"; } from "@/utils/auth";
import {TokenKey} from '@/utils/auth'
import router from "@/router"; import router from "@/router";
const api = axios.create({ const api = axios.create({
baseURL: `${baseUrl}`, baseURL: `${baseUrl}`,
...@@ -16,6 +17,7 @@ const api = axios.create({ ...@@ -16,6 +17,7 @@ const api = axios.create({
// 请求拦截 // 请求拦截
api.interceptors.request.use( api.interceptors.request.use(
(config) => { (config) => {
config.headers['Authorization'] = 'Bearer ' + localStorage.getItem(TokenKey)
let appId = /*getToken()*/ "1234"; let appId = /*getToken()*/ "1234";
if (config.data) config.data.appId = appId; if (config.data) config.data.appId = appId;
return config; return config;
......
...@@ -3,9 +3,9 @@ import { Message } from "element-ui"; ...@@ -3,9 +3,9 @@ import { Message } from "element-ui";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
const config = { const config = {
proxy: 'http://192.168.3.87:8881', // 本地 // proxy: 'http://192.168.3.144:9089/', // 本地
// proxy: "https://exam.smart-zj.cn:9100/exam/", // 新线上地址 // proxy: "https://exam.smart-zj.cn:9100/exam/", // 新线上地址
// proxy: "http://81.69.231.72:9089", // 测试地址 proxy: "http://81.69.231.72:8881/", // 测试地址
}; };
//axios基本配置 //axios基本配置
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="状态码"> <el-form-item label="状态码">
<el-select <el-select
v-model="searchForm.stateCode" v-model="searchForm.stateCode"
...@@ -181,7 +182,7 @@ ...@@ -181,7 +182,7 @@
> >
<el-form-item label="状态码"> <el-form-item label="状态码">
<el-select <el-select
v-model="auditData.state" v-model="auditData.stateCode"
placeholder="请选择通过状态" placeholder="请选择通过状态"
> >
<el-option <el-option
...@@ -589,7 +590,8 @@ export default { ...@@ -589,7 +590,8 @@ export default {
confirmBtn() { confirmBtn() {
if (this.flag == 0) { if (this.flag == 0) {
// 通过 // 通过
if (this.auditData.state) { if (this.auditData.stateCode) {
console.log(this.auditData,"审核");
familyAudit(this.auditData).then((res) => { familyAudit(this.auditData).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success(res.msg || "审核成功"); this.$message.success(res.msg || "审核成功");
...@@ -608,7 +610,6 @@ export default { ...@@ -608,7 +610,6 @@ export default {
familyAudit(this.auditData).then((res) => { familyAudit(this.auditData).then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log(res, 111); console.log(res, 111);
this.$message.success(res.msg || "审核成功"); this.$message.success(res.msg || "审核成功");
this.auditDialog = false; this.auditDialog = false;
this.init(); this.init();
......
...@@ -155,6 +155,7 @@ export default { ...@@ -155,6 +155,7 @@ export default {
this.treeList.push(item); this.treeList.push(item);
} }
}); });
this.treeList.sort((x,z)=> Number(x.sequence)-Number(z.sequence) )
}, },
addMenu(type) { addMenu(type) {
if (type == 0) { if (type == 0) {
...@@ -207,6 +208,7 @@ export default { ...@@ -207,6 +208,7 @@ export default {
putMenu() { putMenu() {
console.log(this.form) console.log(this.form)
updateMenu(this.form).then((res) => { updateMenu(this.form).then((res) => {
console.log(res.data+'menu');
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: "success", type: "success",
......
const env = process.env.NODE_ENV === 'production' const env = process.env.NODE_ENV === "production";
const publicPath = env ? '/manage-h5/' : '/'; //正式 // const publicPath = env ? "/manage-h5/" : "/"; //正式
// const publicPath = env ? '/smartExam-h5/' : '/'; //测试 const publicPath = env ? "/smartExam-h5/" : "/"; //测试
module.exports = { module.exports = {
publicPath, publicPath,
...@@ -10,38 +10,45 @@ module.exports = { ...@@ -10,38 +10,45 @@ module.exports = {
hot: true, hot: true,
disableHostCheck: true, disableHostCheck: true,
proxy: { proxy: {
'/baiduapi': { "/baiduapi": {
target: 'https://apis.map.qq.com/', target: "https://apis.map.qq.com/",
pathRewrite: { pathRewrite: {
'^/baiduapi': '' "^/baiduapi": "",
} },
},
"/api-admin": {
target: "http://81.69.231.72:8881",
changeOrigin: true,
pathRewrite: {
"^/api-admin": "",
},
}, },
// 所属社区 网格信息 // 所属社区 网格信息
'/appointment': { "/appointment": {
target: 'https://appointment.smart-zj.cn/api/appointment/', target: "https://appointment.smart-zj.cn/api/appointment/",
changOrigin: true, changOrigin: true,
pathRewrite: { pathRewrite: {
'^/appointment': '' "^/appointment": "",
} },
}, },
// 楼栋 房间信息 // 楼栋 房间信息
'/comApplet': { "/comApplet": {
// target: 'http://192.168.3.110:10013/comApplet/', //测试地址 // target: 'http://192.168.3.110:10013/comApplet/', //测试地址
target: 'https://www.smart-zj.cn:55901/comApplet/', target: "https://www.smart-zj.cn:55901/comApplet/",
changOrigin: true, changOrigin: true,
pathRewrite: { pathRewrite: {
'^/comApplet': '' "^/comApplet": "",
} },
}, },
} },
}, },
configureWebpack: { configureWebpack: {
externals: { externals: {
BMapGL: "BMapGL", BMapGL: "BMapGL",
AMap: 'AMap', AMap: "AMap",
wx: 'wx', wx: "wx",
AlipayJSBridge: 'AlipayJSBridge', AlipayJSBridge: "AlipayJSBridge",
qq: 'qq' qq: "qq",
}, },
}, },
} };
\ No newline at end of file
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