所属人调整

src/views/music-library/music-sheet/component/music-list.tsx

@@ -12,6 +12,7 @@ import {getMapValueByKey} from "@/utils/filters";
 import {appKey, musicSheetSourceType, musicSheetType} from "@/utils/constant";
 import {getSelectDataFromObj} from "@/utils/objectUtil";
 import {sysApplicationPage} from "@views/menu-manage/api";
+import {getOwnerName} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'music-list',
@@ -97,7 +98,7 @@ export default defineComponent({
           title: '所属人',
           key: 'composer',
           render(row: any) {
-            return (getOwnerName(row))
+            return <div>{getOwnerName(row.musicSheetExtend, row.sourceType)}</div>
           }
         },
         {
@@ -240,27 +241,6 @@ export default defineComponent({
       ]
     }
 
-    const getOwnerName = ((row: any) => {
-      let ownerName;
-      if (row.musicSheetExtend?.userName) {
-        ownerName = row.musicSheetExtend.userName
-      }
-
-      const filter = state.useProjectData.filter((next: any) => {
-        return next.id == row.musicSheetExtend?.applicationId
-      }) as any;
-      if (row.sourceType && filter.length > 0) {
-        if (row.sourceType == 'ORG') {
-          ownerName += ' (' + filter[0].appName + ')'
-        } else if (row.sourceType == 'PERSON') {
-          ownerName += ' (' + filter[0].appName + ')'
-        } else if (row.sourceType == 'PLATFORM') {
-          ownerName += ' (' + filter[0].appName + ')'
-        }
-      }
-      return ownerName;
-    })
-
     const checkedRowKeysRef = ref<DataTableRowKey[]>([])
     const handleCheck = (rowKeys: DataTableRowKey[]) => {
       checkedRowKeysRef.value = rowKeys

src/views/music-library/music-sheet/modal/music-operation.tsx

@@ -551,7 +551,7 @@ export default defineComponent({
         state.ownerName = app[0].appName
       }
       if (forms.sourceType == 'ORG') {
-        state.ownerName += '-' + forms.musicSheetExtend.orgName
+        state.ownerName += '-' + forms.musicSheetExtend.organizationRole
 
       } else if (forms.sourceType == 'PERSON') {
         state.ownerName += '-' + getMapValueByKey(forms.musicSheetExtend.clientType, new Map(Object.entries(clientType)))

src/views/music-library/music-sheet/modal/musicSheetOwnerDialog.tsx

@@ -3,8 +3,7 @@ import {defineComponent, onMounted, PropType, reactive, ref} from 'vue'
 import {musicSheetApplicationOwnerList} from '../../api'
 import SaveForm from "@components/save-form";
 import Pagination from "@components/pagination";
-import {sysApplicationPage} from "@views/menu-manage/api";
-import {appKey, clientType} from "@/utils/constant";
+import {clientType} from "@/utils/constant";
 import {getMapValueByKey} from "@/utils/objectUtil";
 import deepClone from "@/utils/deep.clone";
 
@@ -45,10 +44,7 @@ export default defineComponent({
       appData: [] as any, // 适用项目行数据
     })
 
-    const btnLoading = ref(false)
-    const formsRef = ref()
     const message = useMessage()
-    const dialog = useDialog()
     const saveForm = ref()
 
     const onSubmit = () => {
@@ -58,9 +54,6 @@ export default defineComponent({
     const onSearch = () => {
       saveForm.value?.submit()
     }
-    const onBtnReset = () => {
-      saveForm.value?.reset()
-    }
     const getList = async () => {
       try {
         const applicationId = state.searchForm.applicationId;

src/views/music-library/musicUtil.ts

@@ -0,0 +1,24 @@
+export const getOwnerName = (musicSheetExtend: any, sourceType: string) => {
+  let ownerName;
+  if (musicSheetExtend?.userName) {
+    ownerName = musicSheetExtend.userName
+  }
+  if (!ownerName) {
+    return null
+  }
+
+  if (musicSheetExtend && musicSheetExtend.userName) {
+    ownerName = musicSheetExtend.userName
+    const appName = musicSheetExtend.applicationName;
+    const clientType = musicSheetExtend.clientType ? '-' + musicSheetExtend.clientType : '';
+    const organizationRole = musicSheetExtend.organizationRole ? '-' + musicSheetExtend.organizationRole : '';
+    if (sourceType == 'ORG') {
+      ownerName += ' (' + appName + organizationRole + ')'
+    } else if (sourceType == 'PERSON') {
+      ownerName += ' (' + appName + clientType + ')'
+    } else if (sourceType == 'PLATFORM') {
+      ownerName += ' (' + appName + clientType + ')'
+    }
+  }
+  return ownerName;
+}

src/views/music-library/project-music-sheet/module/gym/addMusic.tsx

@@ -6,6 +6,7 @@ import {getMapValueByKey, getSelectDataFromObj} from "@/utils/objectUtil";
 import {musicSheetSourceType, musicSheetType} from "@/utils/constant";
 import {musicSheetApplicationExtendSaveBatch, musicSheetPage} from "@views/music-library/api";
 import deepClone from "@/utils/deep.clone";
+import {getOwnerName} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'gym-addMusic',
@@ -169,7 +170,7 @@ export default defineComponent({
         title: '所属人',
         key: 'userName',
         render: (row: any) => {
-          return <div>{row.musicSheetExtend?.userName ? row.musicSheetExtend?.userName : ''}</div>
+          return <div>{getOwnerName(row.musicSheetExtend, row.sourceType)}</div>
         }
       },
     ]

src/views/music-library/project-music-sheet/module/gyt/addMusic.tsx

@@ -6,6 +6,7 @@ import {getMapValueByKey, getSelectDataFromObj} from "@/utils/objectUtil";
 import {musicSheetSourceType, musicSheetType} from "@/utils/constant";
 import {musicSheetApplicationExtendSaveBatch, musicSheetPage} from "@views/music-library/api";
 import deepClone from "@/utils/deep.clone";
+import {getOwnerName} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'gyt-addMusic',
@@ -169,7 +170,7 @@ export default defineComponent({
         title: '所属人',
         key: 'userName',
         render: (row: any) => {
-          return <div>{row.musicSheetExtend?.userName ? row.musicSheetExtend?.userName : ''}</div>
+          return <div>{getOwnerName(row.musicSheetExtend, row.sourceType)}</div>
         }
       },
     ]

src/views/music-library/project-music-sheet/module/klx/addMusic.tsx

@@ -6,6 +6,7 @@ import {getMapValueByKey, getSelectDataFromObj} from "@/utils/objectUtil";
 import {musicSheetAvailableType, musicSheetPaymentType, musicSheetSourceType, musicSheetType} from "@/utils/constant";
 import {musicSheetApplicationExtendSaveBatch, musicSheetPage} from "@views/music-library/api";
 import deepClone from "@/utils/deep.clone";
+import {getOwnerName} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'klx-addMusic',
@@ -201,7 +202,7 @@ export default defineComponent({
         title: '所属人',
         key: 'userName',
         render: (row: any) => {
-          return <div>{row.musicSheetExtend?.userName ? row.musicSheetExtend?.userName : ''}</div>
+          return <div>{getOwnerName(row.musicSheetExtend, row.sourceType)}</div>
         }
       },
     ]

src/views/music-library/project-music-sheet/module/kt/addMusic.tsx

@@ -6,6 +6,7 @@ import {getMapValueByKey, getSelectDataFromObj} from "@/utils/objectUtil";
 import {musicSheetSourceType, musicSheetType} from "@/utils/constant";
 import {musicSheetApplicationExtendSaveBatch, musicSheetPage} from "@views/music-library/api";
 import deepClone from "@/utils/deep.clone";
+import {getOwnerName} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'kt-addMusic',
@@ -120,8 +121,6 @@ export default defineComponent({
         emit('getList')
         emit('close')
       }
-
-
     }
 
     const columnsField = [
@@ -169,7 +168,7 @@ export default defineComponent({
         title: '所属人',
         key: 'userName',
         render: (row: any) => {
-          return <div>{row.musicSheetExtend?.userName ? row.musicSheetExtend?.userName : ''}</div>
+          return <div>{getOwnerName(row.musicSheetExtend, row.sourceType)}</div>
         }
       },
     ]

src/views/system-manage/system-apply/apply-operation.tsx

@@ -35,6 +35,7 @@ export default defineComponent({
       applyType: props.parentId == 0 ? 0 : 1, // 顶级分类，子级分类
       parentId: props.parentId,
       appName: null,
+      appKey: null,
       clientIds: null,
       permissionFlag: true,
       remark: null
@@ -130,6 +131,7 @@ export default defineComponent({
         forms.clientIds = data.clientIds
         forms.permissionFlag = data.permissionFlag
         forms.remark = data.remark
+        forms.appKey = data.appKey
       }
     })
 
@@ -196,6 +198,23 @@ export default defineComponent({
             ></NInput>
           </NFormItem>
           <NFormItem
+              label="应用编码"
+              path="appKey"
+              rule={[
+                {
+                  required: false,
+                  message: '请输入应用编码'
+                }
+              ]}
+          >
+            <NInput
+                v-model:value={forms.appKey}
+                placeholder="请输入应用编码"
+                clearable
+                maxlength={100}
+            ></NInput>
+          </NFormItem>
+          <NFormItem
             label="权限客户端"
             path="clientIds"
             rule={[