zouxuan пре 1 година
родитељ
комит
fe689a8d6a

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

@@ -469,9 +469,9 @@ export default defineComponent({
                   clearable
               />
             </NFormItem>
-            <NFormItem label="声部" path="musicSubject">
+            <NFormItem label="可用声部" path="musicSubject">
               <NSelect
-                  placeholder="请选择声部"
+                  placeholder="请选择可用声部"
                   v-model:value={state.searchForm.subjectId}
                   options={state.subjectList}
                   clearable
@@ -484,6 +484,24 @@ export default defineComponent({
                   clearable
               />
             </NFormItem>
+            <NFormItem label="作者属性" path="sourceType">
+              <NSelect
+                  placeholder="请选择作者属性"
+                  v-model:value={state.searchForm.sourceType}
+                  options={getSelectDataFromObj(musicSheetSourceType)}
+                  onUpdateValue={async (value: any) => {
+                    state.userIdData = []
+                    state.searchForm.userId = null
+                    if (value && value !== 'PLATFORM') {
+                      await updateUserIdData(value);
+                      state.userIdDisable = !state.searchForm.useAppId;
+                    } else {
+                      state.userIdDisable = true
+                    }
+                  }}
+                  clearable
+              />
+            </NFormItem>
             <NFormItem label="适用项目" path="app">
               <NSelect
                   placeholder="请选择适用项目"
@@ -494,6 +512,7 @@ export default defineComponent({
                     state.searchForm.useAppId = value
                     if (value) {
                       await updateUserIdData(state.searchForm.sourceType);
+                      state.userIdDisable = !state.searchForm.sourceType;
                     } else {
                       state.searchForm.userId = null
                       state.userIdDisable = true
@@ -502,24 +521,6 @@ export default defineComponent({
                   }}
               />
             </NFormItem>
-            <NFormItem label="作者属性" path="sourceType">
-              <NSelect
-                  placeholder="请选择作者属性"
-                  v-model:value={state.searchForm.sourceType}
-                  options={getSelectDataFromObj(musicSheetSourceType)}
-                  onUpdateValue={async (value: any) => {
-                    state.userIdData = []
-                    state.searchForm.userId = null
-                    if (value && value !== 'PLATFORM') {
-                      await updateUserIdData(value);
-                      state.userIdDisable = false
-                    } else {
-                      state.userIdDisable = true
-                    }
-                  }}
-                  clearable
-              />
-            </NFormItem>
             <NFormItem label="所属人" path="author">
               <NSelect
                   filterable

+ 9 - 11
src/views/system-manage/subject-manage/subject/subject-list.tsx

@@ -203,17 +203,15 @@ export default defineComponent({
     const onChangeStatus = (row: any) => {
       const statusStr = row.enableFlag ? '停用' : '启用'
       dialog.warning({
-        title: '提示',
-        content: (() => {
-          return <div>
-            <div>
-              是否{statusStr}?
-            </div>
-            <div>
-              注:内容管理平台停用声部不允许各业务平台选择关联
-            </div>
-          </div>
-        }),
+        title: `提示`,
+        content:`是否${statusStr}?${!row.enableFlag ?'':'停用声部不允许业务系统关联'}`,
+        // content: (() => {
+        //   return <div>
+        //     <div>
+        //       是否{statusStr}?停用声部不允许业务系统关联
+        //     </div>
+        //   </div>
+        // }),
         positiveText: '确定',
         negativeText: '取消',
         onPositiveClick: async () => {