ldeyun/jeecgBootUniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.请假领导干部不再选择审批/分管领导

Browse Source
This commit is contained in:
yangzhq68909 2025-06-09 11:25:55 +08:00
parent 1b31ccdf34
commit 8645e1f1d6
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
env/.env.development vendored
View File

@ -4,6 +4,6 @@ NODE_ENV = 'development'
VITE_DELETE_CONSOLE = false VITE_DELETE_CONSOLE = false
# 是否开启sourcemap # 是否开启sourcemap
VITE_SHOW_SOURCEMAP = true VITE_SHOW_SOURCEMAP = true
#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot' #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'

12
src/pages-humanResource/absence/add.vue
View File

@ -25,8 +25,8 @@
:rules="[{ required: true, message: '请选择开始时间' }]" :min-date="minBegintime" /> :rules="[{ required: true, message: '请选择开始时间' }]" :min-date="minBegintime" />
<wd-calendar label="结束时间" prop="endtime" v-model="model.endtime" <wd-calendar label="结束时间" prop="endtime" v-model="model.endtime"
:rules="[{ required: true, message: '请选择结束时间' }]" :min-date="minEndtime" /> :rules="[{ required: true, message: '请选择结束时间' }]" :min-date="minEndtime" />
<wd-picker :label="examineleader" prop="examineleader" v-model="model.examineleader" <wd-picker label="审批领导" prop="examineleader" v-model="model.examineleader" v-if="zwmc == '0'"
:columns="examineleaderData" :rules="[{ required: true, message: '请选择' + examineleader }]" /> :columns="examineleaderData" :rules="[{ required: true, message: '请选择审批领导'}]" />
<wd-picker label="单位劳资员" prop="hr" v-model="model.hr" :columns="hrData" v-if="zwmc == '0'"/> <wd-picker label="单位劳资员" prop="hr" v-model="model.hr" :columns="hrData" v-if="zwmc == '0'"/>
<SelectUser label="班组长" v-model="model.teamleader" isRadioSelection v-if="zwmc == '0'"></SelectUser> <SelectUser label="班组长" v-model="model.teamleader" isRadioSelection v-if="zwmc == '0'"></SelectUser>
<wd-input label="出发地" prop="departure" v-model="model.departure" <wd-input label="出发地" prop="departure" v-model="model.departure"
@ -88,7 +88,6 @@
type: [], //用[]、0无法正常被验证 就是不选请假类型时也能通过表单验证 所以在form中使用自定义验证 type: [], //用[]、0无法正常被验证 就是不选请假类型时也能通过表单验证 所以在form中使用自定义验证
begintime: null, begintime: null,
endtime: null, endtime: null,
examineleader: '',
hr: '', hr: '',
teamleader: '', teamleader: '',
departure: appStore.location, departure: appStore.location,
@ -101,8 +100,6 @@
const typeData = ref([]) const typeData = ref([])
const examineleaderData = ref([]) const examineleaderData = ref([])
const hrData = ref([]) const hrData = ref([])
/**判断显示审批 / 分管领导*/
const examineleader = ref('')
const zwmc = ref('') const zwmc = ref('')
const ifOk = ref(true) const ifOk = ref(true)
const minBegintime = ref(0) const minBegintime = ref(0)
@ -251,11 +248,6 @@
} }
}) })
zwmc.value = res.result.zwmc zwmc.value = res.result.zwmc
if (zwmc.value == '2') {
examineleader.value = '分管领导';
} else {
examineleader.value = '审批领导';
}
} else { } else {
toast.warning(res.message) toast.warning(res.message)
setTimeout(() => { setTimeout(() => {

4
src/pages/login/login.vue
View File

@ -105,9 +105,9 @@
let pw = Base64.encode(encodeURIComponent(password.value)) let pw = Base64.encode(encodeURIComponent(password.value))
loading.value = true loading.value = true
/*生产环境 begin */ /*生产环境 begin */
loginApi({ username: un, password: pw }) // loginApi({ username: un, password: pw })
/*开发环境 begin */ /*开发环境 begin */
// loginApi({ username: userName.value, password: password.value, captcha: 'app' }) loginApi({ username: userName.value, password: password.value, captcha: 'app' })
.then((res : any) => { .then((res : any) => {
if (res.success) { if (res.success) {
const { result } = res const { result } = res