Merge branch 'develop'

src/views/music-library/music-sheet/modal/music-create-img.tsx

@@ -44,8 +44,9 @@ export default defineComponent({
         : 'dev'
       const apiUrl = apiUrls[environment]
       const prefix = /(localhost|192)/.test(location.host) ? 'https://dev.kt.colexiu.com' : apiUrl
+      const xmlFileUrl = encodeURIComponent(props.xmlFileUrl)
       state.productIfameSrc =
-        prefix + `/instrument/#/product-img?xmlUrl=${props.xmlFileUrl}&isCreateImg=true&isCbs=true`
+        prefix + `/instrument/#/product-img?xmlUrl=${xmlFileUrl}&isCreateImg=true&isCbs=true`
       // state.productOpen = true
     }
     const handleProductResult = (res: MessageEvent) => {

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

@@ -1,4 +1,4 @@
-import type { SelectOption } from 'naive-ui'
+import type {SelectOption} from 'naive-ui'
 import {
   NAlert,
   NButton,
@@ -20,20 +20,19 @@ import {
   useDialog,
   useMessage
 } from 'naive-ui'
-import { defineComponent, onMounted, onUnmounted, PropType, reactive, ref } from 'vue'
-import { musicSheetCategoriesQueryTree, musicSheetDetail, musicSheetSave } from '../../api'
+import {defineComponent, onMounted, PropType, reactive, ref} from 'vue'
+import {musicSheetCategoriesQueryTree, musicSheetDetail, musicSheetSave} from '../../api'
 import UploadFile from '@/components/upload-file'
 import styles from './index.module.less'
 import deepClone from '@/utils/deep.clone'
 import axios from 'axios'
-import { appKey, clientType, musicSheetSourceType, musicSheetType } from '@/utils/constant'
-import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
-import { musicalInstrumentPage } from '@views/system-manage/subject-manage/api'
-import { subjectPage } from '@views/system-manage/api'
+import {appKey, clientType, musicSheetSourceType, musicSheetType} from '@/utils/constant'
+import {getMapValueByKey, getSelectDataFromObj} from '@/utils/objectUtil'
+import {musicalInstrumentPage} from '@views/system-manage/subject-manage/api'
+import {subjectPage} from '@views/system-manage/api'
 import MusicSheetOwnerDialog from '@views/music-library/music-sheet/modal/musicSheetOwnerDialog'
-import { sysApplicationPage } from '@views/menu-manage/api'
-import { filterPointCategory } from '@views/teaching-manage/unit-test'
-import { api_uploadFile } from '@/plugins/uploadFile'
+import {sysApplicationPage} from '@views/menu-manage/api'
+import {filterPointCategory} from '@views/teaching-manage/unit-test'
 import MusicCreateImg from './music-create-img'
 
 /**
@@ -664,11 +663,6 @@ export default defineComponent({
         const detail = props.data
         try {
           const { data } = await musicSheetDetail({ id: detail.id })
-          forms.audioType = data.audioType
-          forms.musicSheetAccompanimentList = data.musicSheetAccompanimentList
-          data.musicSheetAccompanimentList?.forEach((next: any) => {
-            state.musicSheetAccompanimentUrlList.push(next.audioFileUrl)
-          })
           forms.playMode = data.playMode
           forms.xmlFileUrl = data.xmlFileUrl
           forms.midiUrl = data.midiUrl
@@ -684,13 +678,10 @@ export default defineComponent({
           forms.musicCover = data.musicCover
           forms.remark = data.remark
           forms.status = data.status
-          forms.musicCategoryId = data.musicCategoryId
-          forms.evaluationStandard = data.evaluationStandard
-
           forms.musicSheetType = data.musicSheetType || 'SINGLE'
-          forms.evaluationStandard = data.evaluationStandard
-          forms.musicalInstrumentIdList = data.musicalInstrumentIds.split(',') || []
-
+          forms.sourceType = data.sourceType
+          forms.appAuditFlag = data.appAuditFlag ? 1 : 0
+          forms.midiFileUrl = data.midiFileUrl
           forms.subjectIds = []
           if (data.subjectIds) {
             const subjectIds = data.subjectIds.split(',') || []
@@ -700,10 +691,15 @@ export default defineComponent({
               }
             })
           }
-          forms.sourceType = data.sourceType
-          forms.musicSheetExtend = data.musicSheetExtend
-
-
+          forms.musicalInstrumentIdList = data.musicalInstrumentIds.split(',') || []
+          forms.musicCategoryId = data.musicCategoryId
+          data.musicSheetAccompanimentList?.forEach((next: any) => {
+            state.musicSheetAccompanimentUrlList.push(next.audioFileUrl)
+          })
+          forms.musicSheetAccompanimentList = data.musicSheetAccompanimentList
+          forms.audioType = data.audioType
+          forms.isPlayBeat = data.isPlayBeat
+          forms.isUseSystemBeat = data.isUseSystemBeat
           // 获取渐变 和 是否多声部
           try {
             const extConfigJson = data.extConfigJson ? JSON.parse(data.extConfigJson) : {}
@@ -711,6 +707,9 @@ export default defineComponent({
             forms.repeatedBeats = !!extConfigJson.repeatedBeats
 
           } catch (error) {}
+          forms.evaluationStandard = data.evaluationStandard
+          forms.musicSheetExtend = data.musicSheetExtend
+
           setOwnerName()
           axios.get(data.xmlFileUrl).then((res: any) => {
             if (res?.data) {
@@ -1316,7 +1315,7 @@ export default defineComponent({
               {forms.isPlayBeat && (
                 <NFormItemGi
                   label="播放方式"
-                  path="audioType"
+                  path="isUseSystemBeat"
                   rule={[
                     {
                       required: true,

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

@@ -94,6 +94,8 @@ export default defineComponent({
         } else {
           state.searchForm.applicationId = state.appData[0].value
         }
+        state.searchForm.orgName = null
+        state.searchForm.name = null
       }
 
       getList()

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

@@ -96,7 +96,7 @@ export default defineComponent({
       ]
       for (let i = 0; i < fieldList.length; i++) {
         const fieldValue = app[fieldList[i]]
-        if (fieldValue) {
+        if (fieldValue != null && fieldValue != undefined && fieldValue != '') {
           return true
         }
       }

src/views/music-library/musicUtil.ts

@@ -7,7 +7,7 @@ export const getOwnerName = (musicSheetExtend: any, sourceType: string) => {
   }
   let ownerName = '';
 
-  if (musicSheetExtend && musicSheetExtend.userName) {
+  if (musicSheetExtend) {
     const appName = musicSheetExtend.applicationName;
     if (sourceType == 'ORG') {
       const organizationRole = musicSheetExtend.organizationRole ? '-' + musicSheetExtend.organizationRole : '';

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

@@ -151,10 +151,10 @@ export default defineComponent({
           message.error('收费方式不能为空')
           return
         }
-        if (item.paymentType === 'FREE') {
+        if (!item.paymentType.includes('CHARGE')) {
           item.musicPrice = 0
         } else {
-          if (!item.musicPrice) {
+          if (item.musicPrice === null || item.musicPrice === undefined || item.musicPrice==='') {
             message.error('曲目价格不能为空')
             return
           }
@@ -172,7 +172,7 @@ export default defineComponent({
           return
         }
 
-        if (!item.sortNo) {
+        if (item.sortNo === null || item.sortNo === undefined || item.sortNo === '') {
           message.error('排序号不能为空')
           return
         }
@@ -310,6 +310,7 @@ export default defineComponent({
           )
         },
         key: 'musicTagIds',
+        width:'180px',
         render: (row: any) => {
           // })
           return (
@@ -407,6 +408,7 @@ export default defineComponent({
               options={getSelectDataFromObj(musicSheetPaymentType)}
               clearable
               multiple
+              maxTagCount={1}
               onUpdate:value={(value) => {
                 row.paymentType = value
                 const free = 'FREE'