Преглед на файлове

fix(bugs): 房间管理部分问题修复

tangning преди 3 години
родител
ревизия
bdeeb2b6a0
променени са 3 файла, в които са добавени 16 реда и са изтрити 23 реда
  1. 7 3
      src/views/corporation/SetMealModal.vue
  2. 2 1
      src/views/scenes/room.vue
  3. 7 19
      src/views/scenes/roomDeital.vue

+ 7 - 3
src/views/corporation/SetMealModal.vue

@@ -65,7 +65,7 @@
               console.log('data', e.target.value);
               updateSchema({
                 field: 'liveRoomCapacities',
-                ifShow: e.target.value == 1 ? true : false,
+                // ifShow: e.target.value == 1 ? true : false,
               });
             },
           },
@@ -78,10 +78,14 @@
           colProps: {
             span: 22,
           },
-          ifShow: modelRef.value.ifShow,
+          // ifShow: modelRef.value.ifShow,
           componentProps: {
             options: [
               {
+                label: '1+4',
+                value: 5,
+              },
+              {
                 label: '1+29',
                 value: 30,
               },
@@ -134,7 +138,7 @@
         setFieldsValue({ ...data });
         updateSchema({
           field: 'liveRoomCapacities',
-          ifShow: modelRef.value.ifShow,
+          // ifShow: modelRef.value.ifShow,
         });
       }
       const handleSubmit = async () => {

+ 2 - 1
src/views/scenes/room.vue

@@ -24,7 +24,8 @@
         <Time :value="record.createTime" mode="datetime" />
       </template>
       <template #liveEndTime="{ record }">
-        <Time :value="record.liveEndTime" mode="datetime" />
+        <Time v-if="record.liveEndTime" :value="record.liveEndTime" mode="datetime" />
+        <span v-else>-</span>
       </template>
 
       <template #liveTime="{ record }">

+ 7 - 19
src/views/scenes/roomDeital.vue

@@ -30,7 +30,6 @@
   import { bindUserList, createOrUpdate } from '/@/api/scene/list';
   // import dayjs from 'dayjs';
   import { cloneDeep } from 'lodash-es';
-
   const { t } = useI18n();
   export default defineComponent({
     components: { BasicModal, BasicForm },
@@ -104,11 +103,11 @@
           },
           required: true,
           componentProps: {
-            api: () => {},
+            api: bindUserList,
             showSearch: true,
             disabled: true,
             resultField: 'list',
-            labelField: 'name',
+            labelField: 'userAndNick',
             valueField: 'id',
             immediate: true,
             params: {
@@ -186,7 +185,7 @@
             resultField: 'list',
             labelField: 'nickName',
             valueField: 'id',
-            immediate: true,
+            immediate: false,
             params: {
               page: 1,
               limit: 1000,
@@ -312,9 +311,9 @@
       function handleClose() {
         resetFields();
       }
-      function brandIdChange(data) {
-        let disabled = isPropsData.isUpdate ? isPropsData.isUpdate : data ? false : true;
-        if (!data) {
+      function brandIdChange(brandId) {
+        let disabled = isPropsData.isUpdate ? isPropsData.isUpdate : brandId ? false : true;
+        if (!brandId) {
           return;
         }
         if (!disabled) {
@@ -331,22 +330,11 @@
         updateSchema({
           field: 'anchorUserId',
           componentProps: {
-            api: async function (params) {
-              const res = await bindUserList({ ...params, id: data });
-              return res.map((ele) => {
-                return { ...ele, userName: ele.userName + `(${ele.nickName})` };
-              });
-            },
-            disabled,
-            showSearch: true,
-            resultField: 'list',
-            labelField: 'userName',
-            valueField: 'id',
             immediate: true,
             params: {
               page: 1,
               limit: 1000,
-              id: data,
+              id: brandId,
             },
             onChange: UserIdChange,
           },