Bladeren bron

Merge branch 'dev-fix-delCode' into 'dev'

fix: 部分表隐藏code的查改

See merge request skyeye/skyeye_frontend/skyeye-admin!99
宏耀 孙 1 jaar geleden
bovenliggende
commit
88193b2f9c

+ 1 - 1
src/views/system-config/scene-manage/CompanyDrawer.vue

@@ -26,7 +26,7 @@
         <el-form-item label="上级场景" prop="seniorScene">
           <el-input v-model="ruleForm.seniorScene" style="width: 200px" disabled />
         </el-form-item>
-        <el-form-item label="公司代码" prop="code">
+        <el-form-item v-if="!props.comEdit" label="公司代码" prop="code">
           <el-input v-model="ruleForm.code" style="width: 200px" />
         </el-form-item>
         <el-form-item label="标签&模板" required>

+ 4 - 3
src/views/system-config/scene-manage/use-method.tsx

@@ -10,12 +10,13 @@ import { useGlobSetting } from '@/hooks/setting';
 const { appPCUrl } = useGlobSetting()
 
 export const colomns = [
-  { label: '场景名称', prop: 'name', width: 300 },
-  { label: '场景标签', prop: 'labelName', width: 300 },
-  { label: '代码', prop: 'code' },
+  { label: '场景名称', prop: 'name', minWidth: 300 },
+  { label: '场景标签', prop: 'labelName', minWidth: 300 },
+  // { label: '代码', prop: 'code' },
   {
     label: '预览',
     prop: 'preview',
+    minWidth: 300,
     render: ({ row, column }) => {
       if (!row.parent && row.labelList?.[0]?.id) {
         return (

+ 1 - 1
src/views/system-config/template/CardCommon.vue

@@ -17,7 +17,7 @@
     <div style="margin-top: 20px">
       <el-table style="width: 100%" :data="tableData" highlight-current-row>
         <el-table-column :label="props.type + `名称`" prop="name" />
-        <el-table-column :label="props.type + `代码`" prop="code" />
+        <!-- <el-table-column :label="props.type + `代码`" prop="code" /> -->
 
         <el-table-column prop="status" label="状态">
           <template #default="scope">

+ 6 - 1
src/views/system-config/template/DrawerCommon.vue

@@ -16,6 +16,11 @@
       </el-form-item>
 
       <el-form-item
+        v-if="
+          isEqual(props.detail, {}) ||
+          !props.detail.code ||
+          (props.detail.code && props.detail.code == '')
+        "
         :label="props.type === '模板' ? '模板代码' : '标签代码'"
         prop="code"
         :rules="[
@@ -57,7 +62,7 @@
   import { ref, watch } from 'vue';
   import { FormInstance } from 'element-plus';
   import { onMounted } from 'vue';
-  import { cloneDeep } from 'lodash-es';
+  import { cloneDeep, isEqual } from 'lodash-es';
 
   export interface FormModelCommon {
     id?: number;