1

src/api/order/index.ts

@@ -196,6 +196,7 @@ export function InvoiceRegister(
   );
 }
 export const authorizeRtkList = (params: PageParams) =>
+  // 发起POST请求
   defHttp.post<InvoiceListResul>({
     url: Api.authorizeRtkList,
     params,

src/store/modules/permission.ts

@@ -72,6 +72,7 @@ export const usePermissionStore = defineStore({
     },
     getCheckPerm(value: string | string[]): boolean {
       const permCodeList = this.permCodeList;
+      console.log(permCodeList);
       if (!value) {
         return false;
       }

src/views/account/details/data.ts

@@ -260,7 +260,7 @@ export const equityColumns: BasicColumn[] = [
         4: '货到付款',
       };
 
-      return obj[record.payType] || '-';
+      return obj[record.payType] || record.payType;
     },
     // slots: { customRender: 'orderType' },
     width: 80,
@@ -679,7 +679,7 @@ export const dowmColumns: BasicColumn[] = [
   },
   {
     title: '支付方式',
-    dataIndex: 'payMethod',
+    dataIndex: 'payType',
     // slots: { customRender: 'orderType' },
     width: 80,
   },

src/views/device/putModal.vue

@@ -96,7 +96,7 @@
                 { field: 'version', componentProps: { options: option } },
                 { field: 'wifiNamePrefix', componentProps: { options: wifiNamePrefixlist } },
               ]);
-              setFieldsValue({ colour: '', wifiNamePrefix: wifiNamePrefixlist[0].value, version: '标准版' });
+              setFieldsValue({ colour: '黑色', wifiNamePrefix: wifiNamePrefixlist[0].value, version: '标准版' });
             },
           },
         },
@@ -159,7 +159,6 @@
         modelRef.value = data;
         resetFields();
         let wifiNamePrefix = data.wifiName && data.wifiName.split('_')[0];
-        if (!data.id) return
         updateSchema([
           { field: 'colour', componentProps: { options: getColor(data.type || 1) } },
           {
@@ -191,6 +190,7 @@
           { field: 'wifiNamePrefix', show: !data.id,  componentProps: { options: getWifilist(data.type || 1) } },
           { field: 'snCode', show: !data.id, },
         ]);
+        if (!data.id) return
         setFieldsValue({
           ...data,
           cameraType: data.type,

src/views/empower/camera.vue

@@ -16,6 +16,7 @@
           :actions="[
             {
               label: '详情',
+              ifShow: getCheckPerm('empowerCamera-loglist'),
               onClick: handleDetail.bind(null, record),
             },
             {

src/views/empower/modal/camera/detailModel.vue

@@ -12,7 +12,7 @@
         <div class="table_list">
           <BasicTable @register="registerSubtable">
             <template #toolbar>
-              <a-button type="primary" @click="handllogList" v-if="getCheckPerm('empowerCamera-loglist')" 
+              <a-button type="primary" @click="handllogList" v-if="getCheckPerm('empowerCamera-change')" 
               >更换记录</a-button
               >
             </template>

src/views/empower/modal/difference/logListModal.vue

@@ -49,6 +49,7 @@
       console.log('overviewInfo', overviewInfo);
       // const overviewInfo = getOverviewInfo() || {}
       const rtkSnCode = ref('');
+      const rtkDeviceId = ref('');
       const fileFlow = reactive({
         file: null,
         id: '',
@@ -82,7 +83,7 @@
         },
       ];
       const [registerSubtable, { reload }] = useTable({
-        api: (params) => authorizeRtkList({...params, rtkSnCode: rtkSnCode.value}),
+        api: (params) => authorizeRtkList({...params, rtkDeviceId: rtkDeviceId.value}),
         columns: columns,
         immediate: false,
         rowKey: 'id',
@@ -104,7 +105,7 @@
       });
       function onDataReceive(data) {
         console.log('onDataReceive', data);
-        fileFlow.id = data.id;
+        rtkDeviceId.value = data.id;
         rtkSnCode.value = data.rtkSnCode;
         reload();
       }

src/views/order/data.ts

@@ -416,7 +416,7 @@ export const dowmColumns: BasicColumn[] = [
   },
   {
     title: '支付方式',
-    dataIndex: 'payMethod',
+    dataIndex: 'payType',
     // slots: { customRender: 'orderType' },
     width: 80,
   },

src/views/product/rtk/list.vue

@@ -40,7 +40,7 @@
           <a-button type="primary" @click="handleuserEdit" v-if="getCheckPerm('rtk-addUser')"
             >新增账号</a-button
           >
-          <a-button type="primary" @click="handleExport(4)" v-if="getCheckPerm('rtk-batch')"
+          <a-button type="primary" @click="handleExport(4)" v-if="getCheckPerm('rtk-user-batch')"
             >批量导入</a-button
           >
           <a-button

src/views/productOperation/viewKankan.vue

@@ -90,7 +90,7 @@
               },
               {
                 label: '重算',
-                disabled: record.calcStatus == 0 || (record.panoStatus != 3 && record.panoStatus != -1) || (record.status == 1 && record.payStatus != 1),
+                disabled: record.calcStatus != -1 && (record.calcStatus == 0 || (record.panoStatus != 3 && record.panoStatus != -1) || (record.status == 1 && record.payStatus != 1)),
                 ifShow: getTypeCheckPerm('scenes-recalculate') && tableType != 3,
                 popConfirm: {
                   title: '是否重算？',