机构管理部门管理 的机构展示字段修复

jcjyhr/web/src/components/institutionTree/depart.vue

@@ -66,9 +66,9 @@ watch(
 )
 const fetchInstitutionTree = () => {
     state.loading = true
-    delete baTable.form.defaultItems!.institution_id
-    const result = baTable.table.filter?.search?.find(item => item.field === 'institution_id');
-    const comSearchInstitution = baTable.comSearch.form?.institution_id
+    delete baTable.form.defaultItems!.institution_code
+    const result = baTable.table.filter?.search?.find(item => item.field === 'institution_code');
+    const comSearchInstitution = baTable.comSearch.form?.institution_code
     let params //添加过滤条件 刷新时用
     if (result && (result.val === comSearchInstitution)) {
         params = {

jcjyhr/web/src/stores/localSelect.ts

@@ -38,7 +38,7 @@ const STATUS_LIST: LocalSelectOption = getCodeLocalSelectOption([
     { code: 2, name: '否', },
 ])
 
-const HR_STATUS_LIST: LocalSelectOption = getDefaultLocalSelectOption([
+const HR_STATUS_LIST: LocalSelectOption = getCodeLocalSelectOption([
     { code: 1, name: '互认', },
     { code: 2, name: '不互认', },
 ])

jcjyhr/web/src/views/backend/dashboard.vue

@@ -214,7 +214,7 @@
               </div>
             </div>
             <el-row :gutter="20">
-                <el-col :sm="12" :lg="6" v-for="(item, i) in state.all_ins" :key="i" @click="goInstitution(item.name)">
+                <el-col :sm="12" :lg="6" v-for="(item, i) in state.all_ins" :key="i" @click="goInstitution(item)">
                     <div class="small-panel user-reg suspension ins-panel">
                         <div class="small-panel-title">{{item.name}}</div>
                         <div class="small-panel-type">机构类型:  {{item.institution_type}}</div>
@@ -433,8 +433,8 @@ const goDict = (type: string) => {
 const goHRResult = () => {
     routePush('/admin/hospital/hrpatient')
 }
-const goInstitution = (name: string) => {
-    routePush('/admin/hospital/hrpatient?name=' + name)
+const goInstitution = (item: any) => {
+    routePush('/admin/hospital/hrpatient?name=' + item.name + '&code=' + item.institution_code)
 }
 const countUpFun = (id: string) => {
     nextTick(() => {

jcjyhr/web/src/views/backend/hospital/hrpatient/myTable.vue

@@ -190,6 +190,7 @@ onMounted(async() => {
     baTable.table.ref = tableRef.value
     baTable.mount()
     await localSelect.initLISTS([localSelect._KEY.INS_NAME_LIST])
+    baTable.comSearch.form['ORGCODE'] =  route.query.code ? route.query.code : adminInfo.institution_id
     baTable.comSearch.form['ORGNAME'] =  route.query.name ? route.query.name : adminInfo.institution
     if(baTable.onComSearch) {
         baTable.onComSearch()
@@ -206,6 +207,11 @@ watch(
     (newVal) => {
         setTimeout(() => {
             baTable.comSearch.form['ORGNAME'] =  newVal ? newVal : adminInfo.institution
+            baTable.comSearch.form['ORGCODE'] =  route.query.code ? route.query.code : adminInfo.institution_id
+            if(baTable.onComSearch) {
+                baTable.onComSearch()
+                updateBaTable(baTable)
+            }
         }, 100);
     },
     {deep: true}

jcjyhr/web/src/views/backend/institution/depart/index.vue

@@ -91,14 +91,14 @@ const baTable = new baTableClass(
             { comSearchWeight: 250, comSearchLabel: t('institution.depart.depart_code'), showOverflowTooltip: true, label: t('institution.depart.depart_code'), prop: 'depart_code', align: 'center', operator: 'LIKE', sortable: 'custom' },
             { comSearchWeight: 300, comSearchLabel: t('institution.depart.depart_name'), showOverflowTooltip: true, label: t('institution.depart.depart_name'), prop: 'depart_name', align: 'center', operator: 'LIKE', sortable: 'custom' },
             // { label: t('institution.depart.institution__name'), prop: 'institution.name', align: 'center', render: 'tags', operator: 'LIKE' },
-            { comSearchWeight: 200, comSearchLabel: t('institution.depart.institution__name'), showOverflowTooltip: true, label: t('institution.depart.Affiliated Institution'), prop: 'institution.name', align: 'center', 
+            { comSearchWeight: 200, comSearchLabel: t('institution.depart.institution__name'), showOverflowTooltip: true, label: t('institution.depart.Affiliated Institution'), prop: 'institution.NAME', align: 'center', 
                 filterable: true,
                 comSearchRender: 'localSelect',
                 local: localSelect.INS_LIST,
                 sortable: 'custom',
                 operator: false,
             },
-            { show: false, comSearchWeight: 200, comSearchLabel: t('institution.depart.institution__name'), showOverflowTooltip: true, label: t('institution.depart.Affiliated Institution'), prop: 'institution_id', align: 'center', 
+            { show: false, comSearchWeight: 200, comSearchLabel: t('institution.depart.institution__name'), showOverflowTooltip: true, label: t('institution.depart.Affiliated Institution'), prop: 'institution_code', align: 'center', 
                 // comSearchRender: 'remoteSelect', 
                 // remote: {
                 // // TODO 后期看看需不需要传ID服务端做对应调整

jcjyhr/web/src/views/backend/institution/institution/index.vue

@@ -113,7 +113,11 @@ const baTable = new baTableClass(
                 comSearchRender: 'localSelect',
                 local: localSelect.INS_TYPE_LIST, },
             // { label: t('institution.institution.parent_institution_name'), prop: 'parentInstitution.name',  align: 'center', render: 'tags', operator: 'LIKE' },
-            { comSearchWeight: 50, comSearchLabel: t('institution.institution.parent_institution_name'), showOverflowTooltip: true, label: t('institution.institution.parent_institution_name'), prop: 'parentInstitution.name', width: 135, align: 'center', operator: 'LIKE', sortable: 'custom' },
+            { comSearchWeight: 50, comSearchLabel: t('institution.institution.parent_institution_name'), showOverflowTooltip: true, label: t('institution.institution.parent_institution_name'), prop: 'parentInstitution.name', width: 135, align: 'center', operator: 'LIKE', sortable: 'custom',
+                formatter(row, column, cellValue, index) {
+                    return row.parentinstitution__name
+                }
+            },
             { comSearchWeight: 100, comSearchLabel: t('institution.institution.port_empower'), showOverflowTooltip: true, label: t('institution.institution.port_empower'), prop: 'port_empower', width: 120, align: 'center', operator: false, sortable: 'custom' },
             { comSearchWeight: 100, comSearchLabel: t('institution.institution.address'), showOverflowTooltip: true, label: t('institution.institution.address'), prop: 'address', width: 120, align: 'center', operator: false, sortable: 'custom' },
             { comSearchWeight: 150, comSearchLabel: t('institution.institution.area'), showOverflowTooltip: true, label: t('institution.institution.area'), prop: 'area', width: 110, align: 'center', sortable: 'custom',