tangning 1 年之前
父节点
当前提交
75c593af20

+ 8 - 0
src/views/productOperation/cameraScene.vue

@@ -282,6 +282,14 @@
           width: 100,
           width: 100,
         },
         },
         {
         {
+          title: t('routes.staff.userName'),
+          dataIndex: 'nickName',
+          width: 100,
+          customRender: ({ record }) => {
+            return record.nickName || '-';
+          },
+        },
+        {
           title: '浏览量',
           title: '浏览量',
           dataIndex: 'viewCount',
           dataIndex: 'viewCount',
           width: 80,
           width: 80,

+ 4 - 2
src/views/productOperation/modal/PowersModal.vue

@@ -14,7 +14,7 @@
           {{ model[field] }}
           {{ model[field] }}
         </template>
         </template>
       </BasicForm>
       </BasicForm>
-      <BasicTable v-show="fileFlow.showList" class="powesrTable" @register="registerTable">
+      <BasicTable class="powesrTable" @register="registerTable">
         <template #toolbar>
         <template #toolbar>
           <a-button type="primary" v-if="getCheckPerm('scenes-powers-add')" @click="addPowes"> 新增 </a-button>
           <a-button type="primary" v-if="getCheckPerm('scenes-powers-add')" @click="addPowes"> 新增 </a-button>
         </template>
         </template>
@@ -130,6 +130,7 @@
         immediate: false,
         immediate: false,
         searchInfo: {
         searchInfo: {
           num: numRef,
           num: numRef,
+          // type: fileFlow.showList,
         },
         },
         // afterFetch: (T) => {
         // afterFetch: (T) => {
         //   let { authType } = getRawDataSource();
         //   let { authType } = getRawDataSource();
@@ -163,6 +164,7 @@
             ],
             ],
             onChange: (value) => {
             onChange: (value) => {
               fileFlow.showList = value.target.value ? false : true;
               fileFlow.showList = value.target.value ? false : true;
+              reload();
               console.log('fileFlow.showList', value.target.value, fileFlow.showList);
               console.log('fileFlow.showList', value.target.value, fileFlow.showList);
             },
             },
           },
           },
@@ -220,7 +222,7 @@
         }
         }
       };
       };
       function addPowes() {
       function addPowes() {
-        openDetaileModal(true, { num: modelRef.value.num});
+        openDetaileModal(true, { num: modelRef.value.num, qxType: fileFlow.showList});
       }
       }
       function handleEdit(record: Recordable) {
       function handleEdit(record: Recordable) {
         openDetaileModal(true, record);
         openDetaileModal(true, record);

+ 24 - 9
src/views/productOperation/modal/detailModal.vue

@@ -196,7 +196,7 @@
               required: true,
               required: true,
               // @ts-ignore
               // @ts-ignore
               validator: async (rule, value) => {
               validator: async (rule, value) => {
-                console.log('value',value, dayjs().isBefore(dayjs(value)))
+                console.log('value', value, dayjs().isBefore(dayjs(value)));
                 if (!value) {
                 if (!value) {
                   return Promise.reject('请选中日期');
                   return Promise.reject('请选中日期');
                 }
                 }
@@ -350,8 +350,11 @@
           ...data,
           ...data,
           isEmpower: [0], //[data.canAuthLook ? 0 : '', data.canEditLook ? 1 : ''],
           isEmpower: [0], //[data.canAuthLook ? 0 : '', data.canEditLook ? 1 : ''],
         };
         };
-        let lookEndTime = checkAuthOther.lookEndTime?checkAuthOther.lookEndTime:dayjs().format('YYYY-MM-DD HH:mm:ss')
-        let mylookEndTime = checkAuthOther.editEndTime>lookEndTime?checkAuthOther.editEndTime:lookEndTime
+        let lookEndTime = checkAuthOther.lookEndTime
+          ? checkAuthOther.lookEndTime
+          : dayjs().format('YYYY-MM-DD HH:mm:ss');
+        let mylookEndTime =
+          checkAuthOther.editEndTime > lookEndTime ? checkAuthOther.editEndTime : lookEndTime;
         editTime.value = checkAuthOther.editEndTime;
         editTime.value = checkAuthOther.editEndTime;
         console.log('setData', setData);
         console.log('setData', setData);
         isEdit.value = true;
         isEdit.value = true;
@@ -386,6 +389,7 @@
           },
           },
           {
           {
             field: 'lookAuth',
             field: 'lookAuth',
+            ifShow: setData.qxType,
             componentProps: {
             componentProps: {
               disabled: false,
               disabled: false,
               options: getOptionList('lookAuth', setData.lookAuth),
               options: getOptionList('lookAuth', setData.lookAuth),
@@ -411,15 +415,12 @@
           },
           },
           {
           {
             field: 'lookEndTime',
             field: 'lookEndTime',
-            ifShow: setData.lookAuth == 2,
+            ifShow: setData.lookAuth == 2 && setData.qxType,
             componentProps: {
             componentProps: {
               disabled: checkAuthOther.lookEndTime,
               disabled: checkAuthOther.lookEndTime,
               disabledDate: (current) => {
               disabledDate: (current) => {
                 if (mylookEndTime) {
                 if (mylookEndTime) {
-                  return (
-                    current &&
-                    (current < dayjs(mylookEndTime))
-                  );
+                  return current && current < dayjs(mylookEndTime);
                 } else {
                 } else {
                   return current && current < dayjs().startOf('day');
                   return current && current < dayjs().startOf('day');
                 }
                 }
@@ -435,8 +436,21 @@
         }
         }
         // return option.value.indexOf(inputText.toUpperCase()) >= 0;
         // return option.value.indexOf(inputText.toUpperCase()) >= 0;
       }
       }
-
+      function throttle(func, delay) {
+        var timer = null;
+        return function () {
+          var context = this;
+          var args = arguments;
+          if (!timer) {
+            timer = setTimeout(function () {
+              func.apply(context, args);
+              timer = null;
+            }, delay);
+          }
+        };
+      }
       async function onSearch(searchText) {
       async function onSearch(searchText) {
+        if (searchText.length < 7) return;
         const list = await getByRyId({ ryNo: searchText });
         const list = await getByRyId({ ryNo: searchText });
         optionsName.value =
         optionsName.value =
           list.map((ele) => {
           list.map((ele) => {
@@ -542,6 +556,7 @@
         title,
         title,
         t,
         t,
         disabledTime,
         disabledTime,
+        throttle,
       };
       };
     },
     },
   });
   });