From a9c3e4d2049d9a5f0adbf83350da369059168482 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 15 Jun 2023 08:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/KcGongkaikeForm.vue            |   2 +-
 src/views/kc/pktj/pkmxb/pkmxb.vue             |  18 +-
 src/views/site/tingKeZuJi/list.vue            |  13 +-
 src/views/system/user/user.data.ts            | 190 +++++++++---------
 4 files changed, 121 insertions(+), 102 deletions(-)

diff --git a/src/views/kc/kcGongkaike/components/KcGongkaikeForm.vue b/src/views/kc/kcGongkaike/components/KcGongkaikeForm.vue
index 89d0526..00b8cfb 100644
--- a/src/views/kc/kcGongkaike/components/KcGongkaikeForm.vue
+++ b/src/views/kc/kcGongkaike/components/KcGongkaikeForm.vue
@@ -14,7 +14,7 @@
         </a-col>
         <a-col :span="12">
           <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-col>
         <a-col :span="12">
diff --git a/src/views/kc/pktj/pkmxb/pkmxb.vue b/src/views/kc/pktj/pkmxb/pkmxb.vue
index 73dcf10..70237dc 100644
--- a/src/views/kc/pktj/pkmxb/pkmxb.vue
+++ b/src/views/kc/pktj/pkmxb/pkmxb.vue
@@ -67,6 +67,7 @@
     <BasicTable @register="registerTable">
       <template #openDcwj="{ text ,record}">
         <span @click="openDcwjxx(record)">{{text}}</span>
+        <!-- <span v-has="'get:pkmx:info'">{{text}}123123</span> -->
       </template>
       <template #openDcwjOrSourceName="{ text ,record}">
         <span @click="openDcwjxx(record)" v-if="text == 0">门户添加</span>
@@ -90,12 +91,19 @@
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { dateFormat } from '/@/utils/common/compUtils';
   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 toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
 const viewModal = ref();
+enum Api {
+  roleList = '/sys/user/queryUserRole',
+}
+
+const roleListApi = (params) => defHttp.get({ url: Api.roleList, params });
+
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
@@ -167,7 +175,13 @@ const viewModal = ref();
   }
 
   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;
     //jc,zc,evaId
     //{{ form.kcmc }}-{{ form.skjs }}-星期{{ form.WEEK }}-{{ form.hh }}
diff --git a/src/views/site/tingKeZuJi/list.vue b/src/views/site/tingKeZuJi/list.vue
index 1f777b7..d0826b9 100644
--- a/src/views/site/tingKeZuJi/list.vue
+++ b/src/views/site/tingKeZuJi/list.vue
@@ -68,7 +68,7 @@ import { defHttp } from '/@/utils/http/axios';
 enum Api {
   list = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId',
   
-  listTkjl = '/kcTingke/kcTingke/getSftk'
+  listTkjl = '/kcTingke/kcTingke/findTingKeZuJiBytingketimeAndUserId'
 }
 
 const tingKeZuJiAddModal = ref();
@@ -101,13 +101,15 @@ watch(
 
 function txpjFun(item){
 
-  let kechengbiaoid = item.ketangbiaoid;
+  let ketangbiaoid = item.ketangbiaoid;
   let userid = item.userid;
-  listTkjlApi({ userid: userid, kechengbiaoid:kechengbiaoid}).then(res => {
+  listTkjlApi({ userid: userid, ketangbiaoid:ketangbiaoid}).then(res => {
     var list = res
     console.log(`🚀 ~ file: list.vue:106 ~ listTkjlApi ~ list:`, list)
     if(list.length>0){
-      Modal.error({
+      var score = list[0].score
+      if(score){
+        Modal.error({
             icon: createVNode({}),
             content:  h('div', {style:'height:200px;text-align:center;'}, [
               h('icon', {style:'font-size:80px;font-weight:600;color:red;'}, createVNode(CloseOutlined)),
@@ -116,6 +118,9 @@ function txpjFun(item){
             okText: 'OK',
             width:'500px',
           });
+      }else{
+        tingKeZuJiAddModal.value.view(item)
+      }
     }else{
       tingKeZuJiAddModal.value.view(item)
     }
diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts
index cf4fadb..c41c3f9 100644
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@@ -173,16 +173,16 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     dynamicRules: ({ model, schema }) => rules.duplicateCheckRule('sys_user', 'work_no', model, schema, true),
   },
-  {
-    label: '职务',
-    field: 'post',
-    required: false,
-    component: 'JSelectPosition',
-    componentProps: {
-      rowKey: 'code',
-      labelKey: 'name',
-    },
-  },
+  // {
+  //   label: '职务',
+  //   field: 'post',
+  //   required: false,
+  //   component: 'JSelectPosition',
+  //   componentProps: {
+  //     rowKey: 'code',
+  //     labelKey: 'name',
+  //   },
+  // },
   {
     label: '角色',
     field: 'selectedroles',
@@ -194,69 +194,69 @@ export const formSchema: FormSchema[] = [
       valueField: 'id',
     },
   },
-  {
-    label: '所属部门',
-    field: 'selecteddeparts',
-    component: 'JSelectDept',
-    componentProps: ({ formActionType, formModel }) => {
-      return {
-        sync: false,
-        checkStrictly: true,
-        defaultExpandLevel: 2,
+  // {
+  //   label: '所属部门',
+  //   field: 'selecteddeparts',
+  //   component: 'JSelectDept',
+  //   componentProps: ({ formActionType, formModel }) => {
+  //     return {
+  //       sync: false,
+  //       checkStrictly: true,
+  //       defaultExpandLevel: 2,
 
-        onSelect: (options, values) => {
-          const { updateSchema } = formActionType;
-          //所属部门修改后更新负责部门下拉框数据
-          updateSchema([
-            {
-              field: 'departIds',
-              componentProps: { options },
-            },
-          ]);
-          //所属部门修改后更新负责部门数据
-          formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
-        },
-      };
-    },
-  },
-  {
-    label: '租户',
-    field: 'relTenantIds',
-    component: 'ApiSelect',
-    componentProps: {
-      mode: 'multiple',
-      api: getAllTenantList,
-      numberToString: true,
-      labelField: 'name',
-      valueField: 'id',
-    },
-  },
-  {
-    label: '身份',
-    field: 'userIdentity',
-    component: 'RadioGroup',
-    defaultValue: 1,
-    componentProps: ({ formModel }) => {
-      return {
-        options: [
-          { label: '普通用户', value: 1, key: '1' },
-          { label: '上级', value: 2, key: '2' },
-        ],
-        onChange: () => {
-          formModel.userIdentity == 1 && (formModel.departIds = []);
-        },
-      };
-    },
-  },
-  {
-    label: '负责部门',
-    field: 'departIds',
-    component: 'Select',
-    componentProps: {
-      mode: 'multiple',
-    },
-    ifShow: ({ values }) => values.userIdentity == 2,
-  },
+  //       onSelect: (options, values) => {
+  //         const { updateSchema } = formActionType;
+  //         //所属部门修改后更新负责部门下拉框数据
+  //         updateSchema([
+  //           {
+  //             field: 'departIds',
+  //             componentProps: { options },
+  //           },
+  //         ]);
+  //         //所属部门修改后更新负责部门数据
+  //         formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
+  //       },
+  //     };
+  //   },
+  // },
+  // {
+  //   label: '租户',
+  //   field: 'relTenantIds',
+  //   component: 'ApiSelect',
+  //   componentProps: {
+  //     mode: 'multiple',
+  //     api: getAllTenantList,
+  //     numberToString: true,
+  //     labelField: 'name',
+  //     valueField: 'id',
+  //   },
+  // },
+  // {
+  //   label: '身份',
+  //   field: 'userIdentity',
+  //   component: 'RadioGroup',
+  //   defaultValue: 1,
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       options: [
+  //         { label: '普通用户', value: 1, key: '1' },
+  //         { label: '上级', value: 2, key: '2' },
+  //       ],
+  //       onChange: () => {
+  //         formModel.userIdentity == 1 && (formModel.departIds = []);
+  //       },
+  //     };
+  //   },
+  // },
+  // {
+  //   label: '负责部门',
+  //   field: 'departIds',
+  //   component: 'Select',
+  //   componentProps: {
+  //     mode: 'multiple',
+  //   },
+  //   ifShow: ({ values }) => values.userIdentity == 2,
+  // },
   {
     label: '头像',
     field: 'avatar',
@@ -290,30 +290,30 @@ export const formSchema: FormSchema[] = [
     label: '手机号码',
     field: 'phone',
     component: 'Input',
-    dynamicRules: ({ model, schema }) => {
-      return [
-        { ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0] },
-        { 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,
-    },
+    // dynamicRules: ({ model, schema }) => {
+    //   return [
+    //     { ...rules.duplicateCheckRule('sys_user', 'phone', model, schema, true)[0] },
+    //     { 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,
+  //   },
+  // },
 ];
 
 export const formPasswordSchema: FormSchema[] = [