yangjun
/
dbsd_kczx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2023-06-15 08:48:51 +08:00
parent a867a20587
commit a9c3e4d204
4 changed files with 121 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/kc/kcGongkaike/components/KcGongkaikeForm.vue
View File

@ -14,7 +14,7 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="职称" v-bind="validateInfos.zc"> <a-form-item label="职称" v-bind="validateInfos.zc">
<JDictSelectTag placeholder="请选择职称" v-model:value="formData.zc" :disabled="disabled" dictCode="zhicheng" /> <JDictSelectTag placeholder="请选择职称" v-model:value="formData.zc" :disabled="disabled" dictCode="zhiwu" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">

18
src/views/kc/pktj/pkmxb/pkmxb.vue
View File

@ -67,6 +67,7 @@
<BasicTable @register="registerTable"> <BasicTable @register="registerTable">
<template #openDcwj="{ text ,record}"> <template #openDcwj="{ text ,record}">
<span @click="openDcwjxx(record)">{{text}}</span> <span @click="openDcwjxx(record)">{{text}}</span>
<!-- <span v-has="'get:pkmx:info'">{{text}}123123</span> -->
</template> </template>
<template #openDcwjOrSourceName="{ text ,record}"> <template #openDcwjOrSourceName="{ text ,record}">
<span @click="openDcwjxx(record)" v-if="text == 0">门户添加</span> <span @click="openDcwjxx(record)" v-if="text == 0">门户添加</span>
@ -90,12 +91,19 @@
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { dateFormat } from '/@/utils/common/compUtils'; import { dateFormat } from '/@/utils/common/compUtils';
import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue'; import viewModalPage from '/@/views/site/tingKeZuJi/components/viewModal.vue';
import { getSysConfig } from '/@/views/site/utils/index'; import { getUserId,getSysConfig } from '/@/views/site/utils/index';
import { defHttp } from '/@/utils/http/axios';
const queryParam = ref<any>({}); const queryParam = ref<any>({});
const toggleSearchStatus = ref<boolean>(false); const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref(); const registerModal = ref();
const viewModal = ref(); const viewModal = ref();
enum Api {
roleList = '/sys/user/queryUserRole',
}
const roleListApi = (params) => defHttp.get({ url: Api.roleList, params });
//注册table数据 //注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: { tableProps: {
@ -167,7 +175,13 @@ const viewModal = ref();
} }
function openDcwjxx(record){ function openDcwjxx(record){
console.log(`🚀 ~ file: pkmxb.vue:150 ~ openDcwjxx ~ record:`, record)
// roleListApi({ userid: getUserId()}).then(res => {
// let list = res ?? [];
// console.log(`🚀 ~ file: pkmxb.vue:181 ~ roleListApi ~ list:`, list)
// });
let { kcmc,skjs,zc:WEEK,jc:hh,userid,id:ketangbiaoid,evaluationver,} = record; let { kcmc,skjs,zc:WEEK,jc:hh,userid,id:ketangbiaoid,evaluationver,} = record;
//jc,zc,evaId //jc,zc,evaId
//{{ form.kcmc }}-{{ form.skjs }}-星期{{ form.WEEK }}-{{ form.hh }} //{{ form.kcmc }}-{{ form.skjs }}-星期{{ form.WEEK }}-{{ form.hh }}

13
src/views/site/tingKeZuJi/list.vue
View File

@ -68,7 +68,7 @@ import { defHttp } from '/@/utils/http/axios';
enum Api { enum Api {
list = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId', list = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId',
listTkjl = '/kcTingke/kcTingke/getSftk' listTkjl = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId'
} }
const tingKeZuJiAddModal = ref(); const tingKeZuJiAddModal = ref();
@ -101,13 +101,15 @@ watch(
function txpjFun(item){ function txpjFun(item){
let kechengbiaoid = item.ketangbiaoid; let ketangbiaoid = item.ketangbiaoid;
let userid = item.userid; let userid = item.userid;
listTkjlApi({ userid: userid, kechengbiaoid:kechengbiaoid}).then(res => { listTkjlApi({ userid: userid, ketangbiaoid:ketangbiaoid}).then(res => {
var list = res var list = res
console.log(`🚀 ~ file: list.vue:106 ~ listTkjlApi ~ list:`, list) console.log(`🚀 ~ file: list.vue:106 ~ listTkjlApi ~ list:`, list)
if(list.length>0){ if(list.length>0){
Modal.error({ var score = list[0].score
if(score){
Modal.error({
icon: createVNode({}), icon: createVNode({}),
content: h('div', {style:'height:200px;text-align:center;'}, [ content: h('div', {style:'height:200px;text-align:center;'}, [
h('icon', {style:'font-size:80px;font-weight:600;color:red;'}, createVNode(CloseOutlined)), h('icon', {style:'font-size:80px;font-weight:600;color:red;'}, createVNode(CloseOutlined)),
@ -116,6 +118,9 @@ function txpjFun(item){
okText: 'OK', okText: 'OK',
width:'500px', width:'500px',
}); });
}else{
tingKeZuJiAddModal.value.view(item)
}
}else{ }else{
tingKeZuJiAddModal.value.view(item) tingKeZuJiAddModal.value.view(item)
} }

190
src/views/system/user/user.data.ts
View File

@ -173,16 +173,16 @@ export const formSchema: FormSchema[] = [
component: 'Input', component: 'Input',
dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true), dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true),
}, },
{ // {
label: '职务', // label: '职务',
field: 'post', // field: 'post',
required: false, // required: false,
component: 'JSelectPosition', // component: 'JSelectPosition',
componentProps: { // componentProps: {
rowKey: 'code', // rowKey: 'code',
labelKey: 'name', // labelKey: 'name',
}, // },
}, // },
{ {
label: '角色', label: '角色',
field: 'selectedroles', field: 'selectedroles',
@ -194,69 +194,69 @@ export const formSchema: FormSchema[] = [
valueField: 'id', valueField: 'id',
}, },
}, },
{ // {
label: '所属部门', // label: '所属部门',
field: 'selecteddeparts', // field: 'selecteddeparts',
component: 'JSelectDept', // component: 'JSelectDept',
componentProps: ({ formActionType, formModel }) => { // componentProps: ({ formActionType, formModel }) => {
return { // return {
sync: false, // sync: false,
checkStrictly: true, // checkStrictly: true,
defaultExpandLevel: 2, // defaultExpandLevel: 2,
onSelect: (options, values) => { // onSelect: (options, values) => {
const { updateSchema } = formActionType; // const { updateSchema } = formActionType;
//所属部门修改后更新负责部门下拉框数据 // //所属部门修改后更新负责部门下拉框数据
updateSchema([ // updateSchema([
{ // {
field: 'departIds', // field: 'departIds',
componentProps: { options }, // componentProps: { options },
}, // },
]); // ]);
//所属部门修改后更新负责部门数据 // //所属部门修改后更新负责部门数据
formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1)); // formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
}, // },
}; // };
}, // },
}, // },
{ // {
label: '租户', // label: '租户',
field: 'relTenantIds', // field: 'relTenantIds',
component: 'ApiSelect', // component: 'ApiSelect',
componentProps: { // componentProps: {
mode: 'multiple', // mode: 'multiple',
api: getAllTenantList, // api: getAllTenantList,
numberToString: true, // numberToString: true,
labelField: 'name', // labelField: 'name',
valueField: 'id', // valueField: 'id',
}, // },
}, // },
{ // {
label: '身份', // label: '身份',
field: 'userIdentity', // field: 'userIdentity',
component: 'RadioGroup', // component: 'RadioGroup',
defaultValue: 1, // defaultValue: 1,
componentProps: ({ formModel }) => { // componentProps: ({ formModel }) => {
return { // return {
options: [ // options: [
{ label: '普通用户', value: 1, key: '1' }, // { label: '普通用户', value: 1, key: '1' },
{ label: '上级', value: 2, key: '2' }, // { label: '上级', value: 2, key: '2' },
], // ],
onChange: () => { // onChange: () => {
formModel.userIdentity == 1 && (formModel.departIds = []); // formModel.userIdentity == 1 && (formModel.departIds = []);
}, // },
}; // };
}, // },
}, // },
{ // {
label: '负责部门', // label: '负责部门',
field: 'departIds', // field: 'departIds',
component: 'Select', // component: 'Select',
componentProps: { // componentProps: {
mode: 'multiple', // mode: 'multiple',
}, // },
ifShow: ({ values }) => values.userIdentity == 2, // ifShow: ({ values }) => values.userIdentity == 2,
}, // },
{ {
label: '头像', label: '头像',
field: 'avatar', field: 'avatar',
@ -290,30 +290,30 @@ export const formSchema: FormSchema[] = [
label: '手机号码', label: '手机号码',
field: 'phone', field: 'phone',
component: 'Input', component: 'Input',
dynamicRules: ({ model, schema }) => { // dynamicRules: ({ model, schema }) => {
return [ // return [
{ ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0] }, // { ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0] },
{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' }, // { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
]; // ];
}, // },
},
{
label: '座机',
field: 'telephone',
component: 'Input',
rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }],
},
{
label: '工作流引擎',
field: 'activitiSync',
defaultValue: 1,
component: 'JDictSelectTag',
componentProps: {
dictCode: 'activiti_sync',
type: 'radio',
stringToNumber: true,
},
}, },
// {
// label: '座机',
// field: 'telephone',
// component: 'Input',
// rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }],
// },
// {
// label: '工作流引擎',
// field: 'activitiSync',
// defaultValue: 1,
// component: 'JDictSelectTag',
// componentProps: {
// dictCode: 'activiti_sync',
// type: 'radio',
// stringToNumber: true,
// },
// },
]; ];
export const formPasswordSchema: FormSchema[] = [ export const formPasswordSchema: FormSchema[] = [