master
cody 15 hours ago
parent fe5b694ac1
commit cf475fa609

@ -2,8 +2,8 @@
ENV = 'development' ENV = 'development'
# base api # base api
VUE_APP_DOMIAN = http://hjjc-hdcontract-test.ali251.langye.net VUE_APP_DOMIAN = http://127.0.0.1:8000
VUE_APP_UPLOAD_API = http://hjjc-hdcontract-test.ali251.langye.net/api/admin/upload-file VUE_APP_UPLOAD_API = http://127.0.0.1:8000/api/admin/upload-file
VUE_APP_BASE_API = VUE_APP_BASE_API =
VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net VUE_APP_OUT_Book = http://hjjc-book-service-test.ali251.langye.net
VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net/admin VUE_APP_OUT_GDZC = http://hjjc-szemcgdzc.ali251.langye.net/admin

@ -246,9 +246,11 @@
<Select <Select
v-model="select.join_status" v-model="select.join_status"
multiple
clearable clearable
collapse-tags
placeholder="请选择" placeholder="请选择"
style="width: 100px" style="width: 180px"
> >
<Option <Option
v-for="item in options" v-for="item in options"
@ -1349,7 +1351,8 @@ export default {
end_plan_price: undefined, end_plan_price: undefined,
is_myself: 0, is_myself: 0,
is_simple: 0, is_simple: 0,
is_end: "" is_end: "",
join_status: []
}, },
selectCopy: { selectCopy: {
keyword: "", keyword: "",
@ -1369,7 +1372,8 @@ export default {
end_plan_price: undefined, end_plan_price: undefined,
is_myself: 0, is_myself: 0,
is_simple: 0, is_simple: 0,
is_end: "" is_end: "",
join_status: []
}, },
type: [ type: [
{ {
@ -2488,16 +2492,22 @@ export default {
}, },
// //
async getContracts(is_export,noloading=false,isopenOa=false) { async getContracts(is_export,noloading=false,isopenOa=false) {
const querySelect = {
...this.select,
join_status: Array.isArray(this.select.join_status)
? this.select.join_status.join(",")
: this.select.join_status,
};
let tokens = getToken(); let tokens = getToken();
if (is_export && this.select.is_export == 1) { if (is_export && this.select.is_export == 1) {
var url = "/api/admin/contract/index?is_auth=1&token=" + tokens; var url = "/api/admin/contract/index?is_auth=1&token=" + tokens;
Object.keys(this.select).forEach((key, item) => { Object.keys(querySelect).forEach((key, item) => {
if (key === 'page') { if (key === 'page') {
url += '&page=1'; url += '&page=1';
} else if (key === 'page_size') { } else if (key === 'page_size') {
url += '&page_size=9999'; url += '&page_size=9999';
} else { } else {
const v = this.select[key]; const v = querySelect[key];
if (v != null && v !== '') { if (v != null && v !== '') {
url += "&" + key + "=" + v; url += "&" + key + "=" + v;
} }
@ -2510,7 +2520,7 @@ export default {
return; return;
} }
const res = await getContract({ const res = await getContract({
...this.select, ...querySelect,
is_auth: 1, is_auth: 1,
},noloading); },noloading);
@ -2894,7 +2904,7 @@ export default {
if (/contractLedger/g.test(this.$route.path)) { if (/contractLedger/g.test(this.$route.path)) {
this.select.is_contract = 1; this.select.is_contract = 1;
this.select.purchase_status = 3; this.select.purchase_status = 3;
this.select.join_status = '2,3' this.select.join_status = [2, 3]
//this.select.invite_status = 3; //this.select.invite_status = 3;
this.select.is_simple = ""; this.select.is_simple = "";
} }
@ -2902,13 +2912,15 @@ export default {
this.select.is_simple = ""; this.select.is_simple = "";
} }
if (/contractList/g.test(this.$route.path)) { if (/contractList/g.test(this.$route.path)) {
this.select.is_substitute = 0;//is_substitute 1 this.select.is_substitute = 0;
this.select.join_status = [2, 3];//is_substitute 1
//this.select.contract_type = 2; //this.select.contract_type = 2;
} }
if (/waitPay/g.test(this.$route.path)) { if (/waitPay/g.test(this.$route.path)) {
this.select.wait_pay = 1; this.select.wait_pay = 1;
this.select.is_simple = 0; this.select.is_simple = 0;
} }
this.selectCopy = deepCopy(this.select);
}, },
destroyed() { destroyed() {
window.onfocus = null; window.onfocus = null;

@ -26,7 +26,7 @@ module.exports = {
* Detail: https://cli.vuejs.org/config/#publicpath * Detail: https://cli.vuejs.org/config/#publicpath
*/ */
publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin', publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
outputDir: process.env.ENV === 'staging' ? '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin_test':'/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin', outputDir: process.env.ENV === 'staging' ? '//Users/apple/www/hjjc-contract-business-service/public/admin_test':'//Users/apple/www/hjjc-contract-business-service/public/admin',
// outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin', // outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin',
// :'/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin', // :'/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin',
// /Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin // /Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hetong/public/admin

Loading…
Cancel
Save