master
lion 4 days ago
parent fb797ee9df
commit e4f7bf3d0e

@ -19,4 +19,4 @@ VUE_APP_OUT_GPS=http://hjjc-gps.ali251.langye.net
#VUE_APP_OLD_OA = http://192.168.0.66:16667
VUE_APP_OLD_OA = http://hjjc-szemcold-test.ali251.langye.net
VUE_APP_UPLOAD_API=/api/admin/upload-file
#VUE_APP_UPLOAD_API=/api/admin/upload-file

@ -2,9 +2,9 @@
ENV = 'production'
# base api
#VUE_APP_DOMIAN=http://192.168.0.66:9001/
#VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file
#VUE_APP_BASE_API = ''
VUE_APP_DOMIAN=http://192.168.0.66:9001/
VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file
VUE_APP_BASE_API = ''
VUE_APP_OUT_Book=http://192.168.0.66:9002/
VUE_APP_OUT_GDZC=http://192.168.0.66:17777/admin
VUE_APP_OUT_OLD=http://192.168.0.66
@ -24,4 +24,4 @@ VUE_APP_OUT_GPS=http://192.168.0.66:9003/admin/#/
VUE_APP_PUBLIC_PATH=/admin
VUE_APP_OUTPUT_DIR=/www/szemc-budget-execution/backend/public/admin
VUE_APP_UPLOAD_API=/api/admin/upload-file
#VUE_APP_UPLOAD_API=/api/admin/upload-file

@ -2780,12 +2780,16 @@ export default {
}
},
async getContracts(is_export,noloading=false,isopenOa=false) {
const joinStatus = Array.isArray(this.select.join_status)
? this.select.join_status.join(",")
: this.select.join_status
const querySelect = {
...this.select,
join_status: Array.isArray(this.select.join_status)
? this.select.join_status.join(",")
: this.select.join_status,
...(joinStatus ? { join_status: joinStatus } : {}),
};
if (!joinStatus) {
delete querySelect.join_status
}
let tokens = getToken();
if (is_export && this.select.is_export == 1) {
var url = "/api/admin/contract/index?is_auth=1&token=" + tokens;
@ -3223,7 +3227,7 @@ export default {
}
if (/contractList/g.test(this.$route.path)) {
this.select.is_substitute = 0;
this.select.join_status = [2, 3];//is_substitute 1
this.select.join_status = [];
//this.select.contract_type = 2;
}
if (/waitPay/g.test(this.$route.path)) {

Loading…
Cancel
Save