Skip to content

Z
zj-manage
Commit 36c685e4 by swl
Options

feat: gx

parent c04d8468
Showing with 154 additions and 117 deletions
.DS_Store
No preview for this file type
src/config/index.js
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: "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 = {
......
src/utils/request.js
...@@ -5,9 +5,9 @@ import { TokenKey } from "@/utils/auth"; ...@@ -5,9 +5,9 @@ import { TokenKey } from "@/utils/auth";
const config = { const config = {
// proxy: "https://exam.smart-zj.cn:9100/exam/", // 新线上地址 // proxy: "https://exam.smart-zj.cn:9100/exam/", // 新线上地址
proxy: "http://81.69.231.72:8881", // 测试地址 // proxy: "http://81.69.231.72:8881", // 测试地址
// proxy: "http://192.168.3.87:8881", //本地 // proxy: "http://192.168.3.87:8881", //本地
// proxy: "https://exam.smart-zj.cn:9100/smartExam", // 新正式接口zs proxy: "https://exam.smart-zj.cn:9100/smartExam", // 新正式接口zs
// proxy: "http://81.69.231.72:9089/", // 测试地址 // proxy: "http://81.69.231.72:9089/", // 测试地址
// proxy1: "http://81.69.231.72:8881/admin-api", // 测试地址 // proxy1: "http://81.69.231.72:8881/admin-api", // 测试地址
// proxy1: "https://exam.smart-zj.cn:9100/smartExam/admin-api", // 新正式接口 // proxy1: "https://exam.smart-zj.cn:9100/smartExam/admin-api", // 新正式接口
......
src/views/Commercialdeedtax/dy_house.vue
...@@ -946,11 +946,18 @@ export default { ...@@ -946,11 +946,18 @@ export default {
// }) // })
// } // }
} else { } else {
this.appLoading?.close();
this.$message.warning( this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过" res.msg || "该申请已被其他部门驳回，无法审核通过"
); );
} }
}); });
} else {
this.appLoading?.close();
this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过"
);
} }
}); });
}) })
...@@ -971,13 +978,6 @@ export default { ...@@ -971,13 +978,6 @@ export default {
this.$message.error("未输入原因"); this.$message.error("未输入原因");
return; return;
} }
this.appLoading = this.$loading({
lock: true,
text: "审核中",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
customClass: "fullLoading",
});
queryCommerDeedTaxDetailInfo({ code: row.code }).then((res) => { queryCommerDeedTaxDetailInfo({ code: row.code }).then((res) => {
if (res.success) { if (res.success) {
...@@ -1221,8 +1221,8 @@ export default { ...@@ -1221,8 +1221,8 @@ export default {
}); });
} else { } else {
that.$message.error(res.msg); that.$message.error(res.msg);
queryCommerDeedTaxDetailInfo({ code: that.rowDetail.code }).then( queryCommerDeedTaxDetailInfo({ code: that.rowDetail.code })
(res) => { .then((res) => {
if (res.success) { if (res.success) {
let params = { let params = {
code: that.rowDetail.code, code: that.rowDetail.code,
...@@ -1235,8 +1235,10 @@ export default { ...@@ -1235,8 +1235,10 @@ export default {
resolve(res); resolve(res);
}); });
} }
} })
); .finally(() => {
that.appLoading?.close();
});
} }
}); });
}); });
......
src/views/Commercialdeedtax/index.vue
...@@ -818,7 +818,6 @@ export default { ...@@ -818,7 +818,6 @@ export default {
this.tableData = []; this.tableData = [];
} }
} }
console.log(" this.appLoading?.close();--->", 111);
this.appLoading?.close(); this.appLoading?.close();
}); });
}); });
...@@ -996,11 +995,15 @@ export default { ...@@ -996,11 +995,15 @@ export default {
} }
}); });
} else { } else {
this.appLoading?.close();
this.$message.warning( this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过" res.msg || "该申请已被其他部门驳回，无法审核通过"
); );
} }
}); });
} else {
this.appLoading?.close();
} }
}); });
}) })
...@@ -1125,8 +1128,8 @@ export default { ...@@ -1125,8 +1128,8 @@ export default {
}); });
} else { } else {
that.$message.error(res.msg); that.$message.error(res.msg);
queryCommerDeedTaxDetailInfo({ code: that.rowDetail.code }).then( queryCommerDeedTaxDetailInfo({ code: that.rowDetail.code })
(res) => { .then((res) => {
console.log(res); console.log(res);
if (res.success) { if (res.success) {
let params = { let params = {
...@@ -1136,14 +1139,15 @@ export default { ...@@ -1136,14 +1139,15 @@ export default {
state: res.data.state, state: res.data.state,
}; };
initCommerDepartmentRevocation(params).then(async (res) => { initCommerDepartmentRevocation(params).then(async (res) => {
console.log(res);
await that.initNew(); await that.initNew();
resolve(); resolve(res);
}); });
} }
} })
); .finally(() => {
that.appLoading?.close();
});
} }
}); });
// 将目标文件对象保存为目标类型的文件，并命名 // 将目标文件对象保存为目标类型的文件，并命名
......
src/views/Deedtax/dy_house.vue
...@@ -722,26 +722,30 @@ export default { ...@@ -722,26 +722,30 @@ export default {
checkArea: this.realEstateArea, checkArea: this.realEstateArea,
checkArealEstateArea: this.searchForm.checkArealEstateArea, checkArealEstateArea: this.searchForm.checkArealEstateArea,
}; };
queryListDeedTax(parmas).then((res) => { queryListDeedTax(parmas)
this.loading = false; .then((res) => {
if (res.success) { this.loading = false;
this.pagination.total = res.data.total; if (res.success) {
if (res.data.total) { this.pagination.total = res.data.total;
this.tableData = res.data.list.map((item) => { if (res.data.total) {
item.stateName = this.getSatusArr(item.state).stateName; this.tableData = res.data.list.map((item) => {
item.type = this.getSatusArr(item.state).type; item.stateName = this.getSatusArr(item.state).stateName;
return item; item.type = this.getSatusArr(item.state).type;
}); return item;
if (localStorage.getItem("userName") == "admin") { });
this.tableData = changeList(this.tableData); if (localStorage.getItem("userName") == "admin") {
this.tableData = changeList(this.tableData);
}
resolve();
} else {
this.tableData = [];
} }
resolve();
} else {
this.tableData = [];
} }
} this.appLoading?.close();
this.appLoading?.close(); })
}); .finally(() => {
this.appLoading?.close();
});
}); });
}, },
onSubmit() { onSubmit() {
...@@ -946,11 +950,18 @@ export default { ...@@ -946,11 +950,18 @@ export default {
// }) // })
// } // }
} else { } else {
this.appLoading?.close();
this.$message.warning( this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过" res.msg || "该申请已被其他部门驳回，无法审核通过"
); );
} }
}); });
} else {
this.appLoading?.close();
this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过"
);
} }
}); });
}) })
...@@ -971,13 +982,7 @@ export default { ...@@ -971,13 +982,7 @@ export default {
this.$message.error("未输入原因"); this.$message.error("未输入原因");
return; return;
} }
this.appLoading = this.$loading({
lock: true,
text: "审核中",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
customClass: "fullLoading",
});
queryDeedTaxDetailInfo({ code: row.code }).then((res) => { queryDeedTaxDetailInfo({ code: row.code }).then((res) => {
if (res.success) { if (res.success) {
let params = { let params = {
...@@ -1226,8 +1231,8 @@ export default { ...@@ -1226,8 +1231,8 @@ export default {
}); });
} else { } else {
that.$message.error(res.msg); that.$message.error(res.msg);
queryDeedTaxDetailInfo({ code: that.rowDetail.code }).then( queryDeedTaxDetailInfo({ code: that.rowDetail.code })
(res) => { .then((res) => {
console.log(res); console.log(res);
if (res.success) { if (res.success) {
let params = { let params = {
...@@ -1242,8 +1247,10 @@ export default { ...@@ -1242,8 +1247,10 @@ export default {
resolve(); resolve();
}); });
} }
} })
); .finally(() => {
that.appLoading?.close();
});
} }
}); });
}); });
......
src/views/Deedtax/index.vue
...@@ -992,6 +992,8 @@ export default { ...@@ -992,6 +992,8 @@ export default {
} }
}); });
} else { } else {
this.appLoading?.close();
this.$message.warning( this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过" res.msg || "该申请已被其他部门驳回，无法审核通过"
); );
...@@ -1123,9 +1125,8 @@ export default { ...@@ -1123,9 +1125,8 @@ export default {
}); });
} else { } else {
that.$message.error(res.msg); that.$message.error(res.msg);
queryDeedTaxDetailInfo({ code: that.rowDetail.code }).then( queryDeedTaxDetailInfo({ code: that.rowDetail.code })
(res) => { .then((res) => {
console.log(res);
if (res.success) { if (res.success) {
let params = { let params = {
code: that.rowDetail.code, code: that.rowDetail.code,
...@@ -1139,8 +1140,10 @@ export default { ...@@ -1139,8 +1140,10 @@ export default {
resolve(); resolve();
}); });
} }
} })
); .finally(() => {
that.appLoading?.close();
});
} }
}); });
// 将目标文件对象保存为目标类型的文件，并命名 // 将目标文件对象保存为目标类型的文件，并命名
......
src/views/Housedeedtax/dy_house.vue
...@@ -945,11 +945,18 @@ export default { ...@@ -945,11 +945,18 @@ export default {
// }) // })
// } // }
} else { } else {
this.appLoading?.close();
this.$message.warning( this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过" res.msg || "该申请已被其他部门驳回，无法审核通过"
); );
} }
}); });
} else {
this.appLoading?.close();
this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过"
);
} }
}); });
}) })
...@@ -970,13 +977,7 @@ export default { ...@@ -970,13 +977,7 @@ export default {
this.$message.error("未输入原因"); this.$message.error("未输入原因");
return; return;
} }
this.appLoading = this.$loading({
lock: true,
text: "审核中",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
customClass: "fullLoading",
});
queryHouseDeedTaxDetailInfo({ code: row.code }).then((res) => { queryHouseDeedTaxDetailInfo({ code: row.code }).then((res) => {
if (res.success) { if (res.success) {
let params = { let params = {
...@@ -1225,8 +1226,8 @@ export default { ...@@ -1225,8 +1226,8 @@ export default {
}); });
} else { } else {
that.$message.error(res.msg); that.$message.error(res.msg);
queryHouseDeedTaxDetailInfo({ code: that.rowDetail.code }).then( queryHouseDeedTaxDetailInfo({ code: that.rowDetail.code })
(res) => { .then((res) => {
console.log(res); console.log(res);
if (res.success) { if (res.success) {
let params = { let params = {
...@@ -1241,8 +1242,10 @@ export default { ...@@ -1241,8 +1242,10 @@ export default {
resolve(); resolve();
}); });
} }
} })
); .finally(() => {
that.appLoading?.close();
});
} }
}); });
}); });
......
src/views/Housedeedtax/index.vue
...@@ -996,17 +996,15 @@ export default { ...@@ -996,17 +996,15 @@ export default {
: ""; : "";
}); });
this.initTemplate(); this.initTemplate();
} else {
this.appLoading?.close();
} }
}); });
} else { } else {
this.$message.warning( this.appLoading?.close();
res.msg || "该申请已被其他部门驳回，无法审核通过"
);
} }
}); });
} else { } else {
this.appLoading?.close();
this.$message.warning(res.msg); this.$message.warning(res.msg);
} }
}); });
...@@ -1133,8 +1131,8 @@ export default { ...@@ -1133,8 +1131,8 @@ export default {
}); });
} else { } else {
that.$message.error(res.msg); that.$message.error(res.msg);
queryHouseDeedTaxDetailInfo({ code: that.rowDetail.code }).then( queryHouseDeedTaxDetailInfo({ code: that.rowDetail.code })
(res) => { .then((res) => {
console.log(res); console.log(res);
if (res.success) { if (res.success) {
let params = { let params = {
...@@ -1149,8 +1147,10 @@ export default { ...@@ -1149,8 +1147,10 @@ export default {
resolve(); resolve();
}); });
} }
} })
); .finally(() => {
that.appLoading?.close();
});
} }
}); });
// 将目标文件对象保存为目标类型的文件，并命名 // 将目标文件对象保存为目标类型的文件，并命名
......
src/views/Multipledeedtax/dy_house.vue
...@@ -945,11 +945,19 @@ export default { ...@@ -945,11 +945,19 @@ export default {
// }) // })
// } // }
} else { } else {
this.appLoading?.close();
this.$message.warning( this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过" res.msg || "该申请已被其他部门驳回，无法审核通过"
); );
} }
}); });
} else {
this.appLoading?.close();
this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过"
);
} }
}); });
}) })
...@@ -970,13 +978,7 @@ export default { ...@@ -970,13 +978,7 @@ export default {
this.$message.error("未输入原因"); this.$message.error("未输入原因");
return; return;
} }
this.appLoading = this.$loading({
lock: true,
text: "审核中",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
customClass: "fullLoading",
});
queryMultipleDeedTaxDetailInfo({ code: row.code }).then((res) => { queryMultipleDeedTaxDetailInfo({ code: row.code }).then((res) => {
if (res.success) { if (res.success) {
let params = { let params = {
...@@ -1228,22 +1230,28 @@ export default { ...@@ -1228,22 +1230,28 @@ export default {
queryMultipleDeedTaxDetailInfo({ queryMultipleDeedTaxDetailInfo({
code: that.rowDetail.code, code: that.rowDetail.code,
}).then((res) => { })
console.log(res); .then((res) => {
if (res.success) { console.log(res);
let params = { if (res.success) {
code: that.rowDetail.code, let params = {
phone: res.data.phone, code: that.rowDetail.code,
reviewerId: that.rowDetail.reviewerId, phone: res.data.phone,
state: res.data.state, reviewerId: that.rowDetail.reviewerId,
}; state: res.data.state,
initMultipleDepartmentRevocation(params).then(async (res) => { };
console.log(res); initMultipleDepartmentRevocation(params).then(
await that.initNew(); async (res) => {
resolve(); console.log(res);
}); await that.initNew();
} resolve();
}); }
);
}
})
.finally(() => {
that.appLoading?.close();
});
} }
}); });
}); });
......
src/views/Multipledeedtax/index.vue
...@@ -993,12 +993,16 @@ export default { ...@@ -993,12 +993,16 @@ export default {
} }
}); });
} else { } else {
this.appLoading?.close();
this.$message.warning( this.$message.warning(
res.msg || "该申请已被其他部门驳回，无法审核通过" res.msg || "该申请已被其他部门驳回，无法审核通过"
); );
} }
}); });
} else { } else {
this.appLoading?.close();
this.$message.warning(res.msg); this.$message.warning(res.msg);
} }
}); });
...@@ -1127,22 +1131,28 @@ export default { ...@@ -1127,22 +1131,28 @@ export default {
that.$message.error(res.msg); that.$message.error(res.msg);
queryMultipleDeedTaxDetailInfo({ queryMultipleDeedTaxDetailInfo({
code: that.rowDetail.code, code: that.rowDetail.code,
}).then((res) => { })
console.log(res); .then((res) => {
if (res.success) { console.log(res);
let params = { if (res.success) {
code: that.rowDetail.code, let params = {
phone: res.data.phone, code: that.rowDetail.code,
reviewerId: that.rowDetail.reviewerId, phone: res.data.phone,
state: res.data.state, reviewerId: that.rowDetail.reviewerId,
}; state: res.data.state,
initMultipleDepartmentRevocation(params).then(async (res) => { };
console.log(res); initMultipleDepartmentRevocation(params).then(
await that.initNew(); async (res) => {
resolve(); console.log(res);
}); await that.initNew();
} resolve();
}); }
);
}
})
.finally(() => {
that.appLoading?.close();
});
} }
}); });
// 将目标文件对象保存为目标类型的文件，并命名 // 将目标文件对象保存为目标类型的文件，并命名
......
vue.config.js
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,
......
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