Browse Source

参数错误修改

yuanliang 1 year ago
parent
commit
b1dff4ffbf

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

@@ -33,7 +33,7 @@ export default defineComponent({
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人
         composer: null, //作曲人/音乐人
         userId: null, //所属人
-        applicationId: null, //适用项目ID
+        useAppId: null, //适用项目ID
         status: null, //曲目状态(0:停用,1:启用)
         appAuditFlag: null, //是否审核版本
         categoriesId: null, //是否审核版本
@@ -455,7 +455,7 @@ export default defineComponent({
             <NFormItem label="适用项目" path="app">
               <NSelect
                   placeholder="请选择适用项目"
-                  v-model:value={state.searchForm.applicationId}
+                  v-model:value={state.searchForm.useAppId}
                   options={state.useProjectData}
                   clearable
               />

+ 26 - 31
src/views/music-library/music-sheet/modal/use-project.tsx

@@ -1,13 +1,8 @@
 import {defineComponent, onMounted, reactive, ref} from 'vue'
 import styles from "@views/music-library/music-sheet/modal/index.module.less";
 import {NButton, NCascader, NCheckbox, NCheckboxGroup, NForm, NFormItem, NInput, NInputNumber, NSelect, NSpace, NTabPane, NTabs, useMessage} from "naive-ui";
-import {appKey, musicSheetType, musicSheetPaymentType, musicSheetAvailableType} from "@/utils/constant";
-import {
-  musicSheetApplicationExtendCategoryApplicationExtendInfo,
-  musicSheetApplicationExtendCategoryList,
-  musicSheetApplicationExtendSave,
-  musicSheetDetail,
-} from "@views/music-library/api";
+import {appKey, musicSheetAvailableType, musicSheetPaymentType} from "@/utils/constant";
+import {musicSheetApplicationExtendCategoryApplicationExtendInfo, musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendSave, musicSheetDetail,} from "@views/music-library/api";
 import {getSelectDataFromObj} from "@/utils/objectUtil";
 
 export default defineComponent({
@@ -53,8 +48,6 @@ export default defineComponent({
           musicSheetCategoryId: null as any,
           sortNo: null as any,
         },
-
-
       } as any,
     })
     const state = reactive({
@@ -64,6 +57,8 @@ export default defineComponent({
       userProjectList: [] as any, // 适用项目列表
       musicSheetCategoryOptions: {} as any,//项目曲目分类选择
 
+      ktFieldRequired: false,
+
 
     })
 
@@ -99,7 +94,7 @@ export default defineComponent({
       const appIdCodeMap = new Map<number, string>
       props.useProject.forEach((project: any) => {
         projectIdArr.push(project.id)
-        appIdCodeMap.set(project.id, project.name)
+        appIdCodeMap.set(project.id, project.appKey)
       })
       if (projectIdArr.length > 0) {
         const {data} = await musicSheetApplicationExtendCategoryList({applicationIds: projectIdArr.join(',')})
@@ -110,22 +105,12 @@ export default defineComponent({
           }
         })
       }
-      for (let i = 0; i < state.selectAppKey.length; i++) {
-        const appKey = state.selectAppKey[i];
-        // 初始化数据
-        const res = await musicSheetApplicationExtendCategoryApplicationExtendInfo({musicSheetId: props.id, appKey: appKey}) as any
-        if (res && res.code === 200 && res.data?.length > 0) {
-          if (appKey === 'KT') {
-            forms.useProjectParamConfig.KT = res.data[0]
-          } else if (appKey === 'GYT') {
-            forms.useProjectParamConfig.GYT = res.data[0]
-          } else if (appKey === 'GYM') {
-            forms.useProjectParamConfig.GYM = res.data[0]
-          } else if (appKey === 'KLX') {
-            forms.useProjectParamConfig.KLX = res.data[0]
-          }
-        }
-
+      {
+        const {data} = await musicSheetApplicationExtendCategoryApplicationExtendInfo({musicSheetId: props.id}) as any
+        data.forEach((next: any) => {
+          const key = next.appKey;
+          forms.useProjectParamConfig[key] = next
+        })
       }
 
 
@@ -152,11 +137,15 @@ export default defineComponent({
             Object.keys(forms.useProjectParamConfig).forEach(key => {
               if (appKey === key) {
                 const value = forms.useProjectParamConfig[key];
-                applicationExtends.push({
-                  ...value,
-                  musicSheetId: props.id,
-                  applicationId: appKeyIdMap.get(key)
-                })
+                //除了排序号,其他字段都不为空时才保存数据
+                const every = Object.values(value).every(val => val);
+                if (every) {
+                  applicationExtends.push({
+                    ...value,
+                    musicSheetId: props.id,
+                    applicationId: appKeyIdMap.get(key)
+                  })
+                }
               }
             })
           })
@@ -405,6 +394,12 @@ export default defineComponent({
                           <NFormItem
                               label="曲目分类"
                               path="useProjectParamConfig.KT.musicSheetCategoryId"
+                              rule={[
+                                {
+                                  required: state.ktFieldRequired,
+                                  message: '请选择曲目分类'
+                                }
+                              ]}
                           >
                               <NCascader
                                   valueField="id"