改造数据分级分类表码及等等

config/dev.env.js

@@ -35,8 +35,8 @@ module.exports = merge(prodEnv, {
         "/dcucauth": {
             // target: "http://10.11.1.237:8861"
             // target: "http://10.254.11.203:8861"
-            //  target: "http://192.168.10.2:8871"
-               target: "http://192.168.6.133:3471"
+             target: "http://192.168.10.2:8871"
+            //    target: "http://192.168.6.133:3471"
 
         }
     })

src/assets/style/project.scss

@@ -72,6 +72,9 @@
 }
 
 .el-select-dropdown__wrap {
-  max-height: 550px;
+  max-height: 400px;
 }
 
+.el-button--small {
+  min-width: 80px !important;
+}

src/components/form-detail/index.vue

@@ -5,7 +5,7 @@
 -->
 <template>
   <div>
-    <el-form v-if="detailInfo.id" :model="detailInfo" :label-width="labelWidth" label-suffix="：">
+    <el-form v-if="visible" :model="detailInfo" :label-width="labelWidth" label-suffix="：">
       <el-row>
         <el-col :span="item.span || 12" v-for="(item, index) in config" :key="index">
           <el-form-item :label="item.label">
@@ -60,7 +60,9 @@ export default {
   },
   components: {},
   data() {
-    return {};
+    return {
+      visible: false
+    };
   },
   computed: {},
   methods: {
@@ -68,7 +70,9 @@ export default {
       this.$emit('close');
     }
   },
-  created() {},
+  created() {
+    this.visible = Object.keys(this.detailInfo).length > 0
+  },
   mounted() {}
 };
 </script>

src/pages/common/tree/index.vue

@@ -336,7 +336,7 @@ export default {
 }
 
 .u-tree__search {
-  margin: 8px;
+  margin-bottom: 8px;
   display: flex;
   align-items: center;
   &-btn {

src/pages/data-auth-module/auth-object-manage/service-resource-manage/add-form.vue

@@ -10,14 +10,19 @@
         <el-form-item label="服务资源标识符：" prop="serviceCode">
           <el-input
             v-model="form.serviceCode"
-            placeholder=""
+            placeholder="请输入服务资源标识符"
             :disabled="form.id !== null && form.id !== undefined"
             v-if="!isDetail"
           ></el-input>
           <span v-else>{{ form.serviceCode }}</span>
         </el-form-item>
         <el-form-item label="服务类型：" prop="serviceType">
-          <dg-select v-model="form.serviceType" enum="ServiceResourceTypeEnum" v-if="!isDetail"></dg-select>
+          <dg-select
+            v-model="form.serviceType"
+            enum="ServiceResourceTypeEnum"
+            placeholder="请选择服务类型"
+            v-if="!isDetail"
+          ></dg-select>
           <div v-else>
             <div class="u-detail__text" v-translate="{ enum: 'ServiceResourceTypeEnum' }">
               {{ form.serviceType }}
@@ -25,7 +30,13 @@
           </div>
         </el-form-item>
         <el-form-item label="是否自用服务：" prop="mustSelf">
-          <dg-select v-model="form.mustSelf" enum="BooleanEnum" v-if="!isDetail" clearable></dg-select>
+          <dg-select
+            v-model="form.mustSelf"
+            enum="BooleanEnum"
+            v-if="!isDetail"
+            placeholder="请选择是否自用服务"
+            clearable
+          ></dg-select>
           <div v-else>
             <div class="u-detail__text" v-translate="{ enum: 'BooleanEnum' }">{{ form.mustSelf }}</div>
           </div>
@@ -33,11 +44,16 @@
       </dg-col>
       <dg-col :span="12">
         <el-form-item label="服务资源名称：" prop="serviceName">
-          <el-input v-model="form.serviceName" placeholder="" v-if="!isDetail"></el-input>
+          <el-input v-model="form.serviceName" placeholder="请输入服务资源名称" v-if="!isDetail"></el-input>
           <span v-else>{{ form.serviceName }}</span>
         </el-form-item>
         <el-form-item label="服务提供方式：" prop="serviceProvideWay">
-          <dg-select v-model="form.serviceProvideWay" enum="ServiceProvideWayEnum" v-if="!isDetail"></dg-select>
+          <dg-select
+            v-model="form.serviceProvideWay"
+            enum="ServiceProvideWayEnum"
+            placeholder="请选择服务提供方式"
+            v-if="!isDetail"
+          ></dg-select>
           <div v-else>
             <div class="u-detail__text" v-translate="{ enum: 'ServiceProvideWayEnum' }">
               {{ form.serviceProvideWay }}
@@ -45,18 +61,12 @@
           </div>
         </el-form-item>
       </dg-col>
-      <dg-col :span="24">
-        <el-form-item label="服务访问地址：" prop="serviceUrl">
-          <el-input v-model="form.serviceUrl" placeholder="参数为字符串类型的数组对象" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.serviceUrl }}</span>
-        </el-form-item>
-      </dg-col>
       <dg-col :span="24">
         <el-form-item label="服务提供应用系统名称：" prop="appCode">
           <dg-select
             :data="apps"
             v-model="form.appCode"
-            placeholder=""
+            placeholder="服务提供应用系统名称"
             value-name="applyCode"
             label-name="applyName"
             filterable
@@ -65,9 +75,21 @@
           <span v-else>{{ form.appName }}</span>
         </el-form-item>
       </dg-col>
+      <dg-col :span="24">
+        <el-form-item label="服务访问地址：" prop="serviceUrl">
+          <el-input v-model="form.serviceUrl" placeholder="参数为字符串类型的数组对象" v-if="!isDetail"></el-input>
+          <span v-else>{{ form.serviceUrl }}</span>
+        </el-form-item>
+      </dg-col>
       <dg-col :span="24">
         <el-form-item label="服务资源描述：" prop="remark">
-          <el-input v-model="form.remark" placeholder="" type="textarea" :rows="3" v-if="!isDetail"></el-input>
+          <el-input
+            v-model="form.remark"
+            placeholder="请输入服务资源描述"
+            type="textarea"
+            :rows="3"
+            v-if="!isDetail"
+          ></el-input>
           <span v-else>{{ form.remark }}</span>
         </el-form-item>
       </dg-col>
@@ -138,7 +160,7 @@ export default {
               const { result, msg } = res.data;
               if (result == '200') {
                 this.$message.success('保存成功!');
-                this.$emit("success");
+                this.$emit('success');
               } else {
                 this.$message.warning(msg);
               }
@@ -182,10 +204,11 @@ export default {
       this.show = true;
     }
   },
-  mounted() {}
+  mounted() {
+  
+  }
 };
 </script>
 
 <style lang='scss'>
-
 </style>

src/pages/data-auth-module/auth-object-manage/sort-code-manage/DataConfig.js

@@ -104,6 +104,23 @@ export const safeLevelForm = [
 ];
 
 /** ************************************  字段分类相关  **********************************/
+export const fieldSortConditionForm = [
+  {
+    label: '字段一级分类',
+    name: 'firName',
+    op: 'like',
+    value: '',
+    component: 'ElInput'
+  },
+  {
+    label: '字段二级分类',
+    name: 'secName',
+    op: 'like',
+    value: '',
+    component: 'ElInput'
+  }
+]
+
 
 export const fieldSortConfig = [
   {
@@ -148,6 +165,30 @@ export const fieldSortConfig = [
 ];
 
 /** ************************************  数据资源分类表码  **********************************/
+export const sourceSortConditionForm = [
+  {
+    label: '数据组织一级分类',
+    name: 'firName',
+    op: 'like',
+    value: '',
+    component: 'ElInput'
+  },
+  {
+    label: '数据组织二级分类',
+    name: 'secName',
+    op: 'like',
+    value: '',
+    component: 'ElInput'
+  },
+  {
+    label: '标签名称',
+    name: 'labName',
+    op: 'like',
+    value: '',
+    component: 'ElInput'
+  }
+]
+
 export const sourceSortConfig = [
   {
     label: '一级代码',

src/pages/data-auth-module/auth-object-manage/sort-code-manage/field-sort-code.vue

@@ -6,7 +6,7 @@
 <template>
   <div>
     <!-- 搜索栏 -->
-    <search-bar :conditionForm="conditionForm" @submitSearch="receiveSearch"></search-bar>
+    <search-bar :conditionForm="fieldSortConditionForm" @submitSearch="receiveSearch"></search-bar>
     <!-- 操作栏 -->
     <operate-bar :pageOptList="pageOptList" @submitPageOpt="receviceOpt"></operate-bar>
     <!-- 列表 -->
@@ -23,48 +23,40 @@
 </template>
 
 <script>
-import fieldSortForm from './forms/field-sort-form';
-import { fieldClassifyTableUrl, delFieldClassify } from '@/api/data-auth';
-import { fieldSortSyncUrl } from '@/api/sync';
 import searchBar from '@/components/search-bar';
 import operateBar from '@/components/operate-bar';
 import newTable from '@/pages/common/new-table';
-import { fieldSortConfig, pageOptList, tableOptList } from './DataConfig';
-import { searchOpt, importOpt, syncOpt } from '@/mixins/page-opt';
-
+import { fieldSortConfig, pageOptList, tableOptList, fieldSortConditionForm } from './DataConfig';
+import { fieldClassifyTableUrl, delFieldClassify, getFieldClassifyDetail, saveFieldClassify, updateFieldClassify } from '@/api/data-auth';
+import { fieldSortSyncUrl } from '@/api/sync';
+import { searchOpt, importOpt, syncOpt, addEditOpt } from '@/mixins/page-opt';
+const area = ['900px', '400px'];
+const labelWidth = '160px';
 export default {
   components: { searchBar, operateBar, newTable },
-  mixins: [searchOpt, importOpt, syncOpt],
+  mixins: [searchOpt, importOpt, syncOpt, addEditOpt],
   data() {
     return {
       fieldClassifyTableUrl,
-      tableHeader: fieldSortConfig.slice(0, -1),
-      conditionForm: [
-        {
-          label: '字段一级分类',
-          name: 'firName',
-          op: 'like',
-          value: '',
-          component: 'ElInput'
-        },
-        {
-          label: '字段二级分类',
-          name: 'secName',
-          op: 'like',
-          value: '',
-          component: 'ElInput'
-        }
-      ],
+      tableHeader: fieldSortConfig,
+      fieldSortConditionForm,
       tableOptList: tableOptList.slice(1, 3),
       pageOptList
     };
   },
   computed: {},
   methods: {
-    receviceOpt(opt, row) {
+    async receviceOpt(opt, row) {
+      const otherParams = {
+        config: fieldSortConfig,
+        labelWidth,
+        area
+      };
       if (opt == '新增') {
-        this.handleAdd();
+        this.handleOpenEditForm('新增', 'add', otherParams);
       } else if (opt == '修改') {
+        const detailInfo = await this.getDetail(row.secId);
+        this.handleOpenEditForm('编辑', 'update', { ...otherParams, detailInfo });
         this.handleEdit(row);
       } else if (opt == '详情') {
         this.handleViewDetail(row);
@@ -77,17 +69,16 @@ export default {
       }
     },
     /**
-     * 编辑
+     * 获取详情
      */
-    handleEdit(row, e) {
-      this.handleOpenForm(row.secId, '编辑');
-    },
-    /**
-     * 查看详情id
-     */
-    handleViewDetail(row, e) {
-      this.handleOpenForm(row.secId, '详情', true);
+    getDetail(id) {
+      return new Promise((resolve) => {
+        getFieldClassifyDetail(id).then((res) => {
+          resolve(res.data.content);
+        });
+      });
     },
+
     /**
      * 删除
      */
@@ -100,27 +91,33 @@ export default {
       });
     },
     /**
-     * 新增
+     * @description: 保存表单
+     * @param { 表单数据 } form
+     * @param { 新增还是编辑 } type
+     * @param { 弹框 } layer
      */
-    handleAdd() {
-      this.handleOpenForm(void 0, '新增');
+    async saveForm(form, type, layer) {
+      const res = type == 'update' ? await this.update(form) : await this.add(form);
+      if (res.data.result == '200') {
+        this.$message.success('保存成功');
+        layer.close(layer.dialogIndex);
+        this.handleSearch();
+      } else {
+        this.$message.warning(res.data.msg);
+      }
     },
-    handleOpenForm(id, title, isDetail = false) {
-      const vm = this;
-      const layer = this.$dgLayer({
-        title,
-        content: fieldSortForm,
-        props: {
-          id,
-          isDetail
-        },
-        on: {
-          success() {
-             vm.handleSearch();
-             layer.close(layer.dialogIndex);
-          }
-        },
-        area: ['900px', '500px']
+    add(form) {
+      return new Promise((resolve) => {
+        saveFieldClassify(form).then((res) => {
+          resolve(res);
+        });
+      });
+    },
+    update(form) {
+      return new Promise((resolve) => {
+        updateFieldClassify(form).then((res) => {
+          resolve(res);
+        });
       });
     }
   },

src/pages/data-auth-module/auth-object-manage/sort-code-manage/forms/field-sort-form.vue

@@ -1,132 +0,0 @@
-<!--
-字段分级分类
-@Author: linqian
-@Date: 2021-06-02 16:03
--->
-<template>
-  <dg-row>
-    <el-form ref="form" :model="form" :rules="rules" label-width="160px" label-suffix="：">
-      <dg-col :span="12">
-        <el-form-item label="字段一级代码" prop="firCode">
-          <el-input v-model="form.firCode" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.firCode }}</span>
-        </el-form-item>
-        <el-form-item label="字段二级代码" prop="secCode">
-          <el-input v-model="form.secCode" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.secCode }}</span>
-        </el-form-item>
-      </dg-col>
-      <dg-col :span="12">
-        <el-form-item label="字段一级分类" prop="firName">
-          <el-input v-model="form.firName" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.firName }}</span>
-        </el-form-item>
-        <el-form-item label="字段二级分类" prop="secName">
-          <el-input v-model="form.secName" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.secName }}</span>
-        </el-form-item>
-      </dg-col>
-      <dg-col :span="24">
-        <el-form-item label="说明" prop="remark">
-          <el-input v-model="form.remark" placeholder="" type="textarea" :rows="3" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.remark }}</span>
-        </el-form-item>
-      </dg-col>
-    </el-form>
-    <div v-footer>
-      <dg-button @click="handleClose">{{ isDetail ? '关闭' : '取消' }}</dg-button>
-      <dg-button v-if="!isDetail" type="primary" @click="handleSave">保存</dg-button>
-    </div>
-  </dg-row>
-</template>
-
-<script>
-import { getFieldClassifyDetail, saveFieldClassify, updateFieldClassify } from '@/api/data-auth';
-export default {
-  props: {
-    id: String,
-    isDetail: {
-      type: Boolean,
-      default: false
-    }
-  },
-  components: {},
-  data() {
-    return {
-      form: {
-        firCode: '',
-        secCode: '',
-        firName: '',
-        secName: '',
-        remark: ''
-      },
-      rules: {
-        firCode: [{ required: true, message: '请输入字段一级代码', trigger: 'change' }],
-        secCode: [{ required: true, message: '请输入字段二级代码', trigger: 'change' }],
-        firName: [{ required: true, message: '请输入字段一级分类', trigger: 'change' }],
-        secName: [{ required: true, message: '请输入字段二级分类', trigger: 'change' }]
-      }
-    };
-  },
-  computed: {},
-  methods: {
-    /**
-     * 取消、关闭
-     */
-    handleClose() {
-      this.$emit('close');
-    },
-
-    /**
-     * 保存
-     */
-    handleSave() {
-      this.$refs.form.validate(async (valid) => {
-        if (valid) {
-          const res = this.id ? await this.update() : await this.add();
-          if (res.data.result == '200') {
-            this.$message.success('保存成功');
-            this.$emit('success');
-          } else {
-            this.$message.warning(res.data.msg);
-          }
-        }
-      });
-    },
-    add() {
-      return new Promise((resolve) => {
-        saveFieldClassify(this.form).then((res) => {
-          resolve(res);
-        });
-      });
-    },
-    update() {
-      return new Promise((resolve) => {
-        updateFieldClassify(this.form).then((res) => {
-          resolve(res);
-        });
-      });
-    },
-    /**
-     * 获取详情
-     */
-    getDetail() {
-      getFieldClassifyDetail(this.id).then((res) => {
-        this.form = res.data.content;
-      });
-    }
-  },
-  created() {
-    if (this.id) {
-      if (this.isDetail) {
-        this.rules = {};
-      }
-      this.getDetail();
-    }
-  },
-  mounted() {}
-};
-</script>
-
-<style lang='scss'>
-</style>

src/pages/data-auth-module/auth-object-manage/sort-code-manage/forms/source-sort-form.vue

@@ -1,154 +0,0 @@
-<!--
-数据资源分类
-@Author: linqian
-@Date: 2021-05-31 09:04
--->
-<template>
-  <dg-row>
-    <el-form ref="form" :model="form" :rules="rules" label-width="160px" label-suffix="：">
-      <dg-col :span="12">
-        <el-form-item label="一级代码" prop="firCode">
-          <el-input v-model="form.firCode" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.firCode }}</span>
-        </el-form-item>
-        <el-form-item label="二级代码" prop="secCode">
-          <el-input v-model="form.secCode" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.secCode }}</span>
-        </el-form-item>
-        <el-form-item label="标签分类代码" prop="labClaCode">
-          <el-input v-model="form.labClaCode" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.labClaCode }}</span>
-        </el-form-item>
-        <el-form-item label="标签代码" prop="labCode">
-          <el-input v-model="form.labCode" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.labCode }}</span>
-        </el-form-item>
-      </dg-col>
-      <dg-col :span="12">
-        <el-form-item label="数据组织一级分类" prop="firName">
-          <el-input v-model="form.firName" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.firName }}</span>
-        </el-form-item>
-        <el-form-item label="数据组织二级分类" prop="secName">
-          <el-input v-model="form.secName" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.secName }}</span>
-        </el-form-item>
-        <el-form-item label="标签分类" prop="labClaName">
-          <el-input v-model="form.labClaName" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.labClaName }}</span>
-        </el-form-item>
-        <el-form-item label="标签名称" prop="labName">
-          <el-input v-model="form.labName" placeholder="" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.labName }}</span>
-        </el-form-item>
-      </dg-col>
-      <dg-col :span="24">
-        <el-form-item label="说明" prop="remark">
-          <el-input v-model="form.remark" placeholder="" type="textarea" :rows="3" v-if="!isDetail"></el-input>
-          <span v-else>{{ form.remark }}</span>
-        </el-form-item>
-      </dg-col>
-    </el-form>
-    <div v-footer>
-      <dg-button @click="handleClose">{{ isDetail ? '关闭' : '取消' }}</dg-button>
-      <dg-button v-if="!isDetail" type="primary" @click="handleSave">保存</dg-button>
-    </div>
-  </dg-row>
-</template>
-
-<script>
-import { getDataSourceClaDetail, saveDataSourceCla, updateDataSourceCla } from '@/api/data-auth';
-export default {
-  props: {
-    id: String,
-    isDetail: {
-      type: Boolean,
-      default: false
-    }
-  },
-  components: {},
-  data() {
-    return {
-      form: {
-        firCode: '',
-        secCode: '',
-        labClaCode: '',
-        labCode: '',
-        firName: '',
-        secName: '',
-        labClaName: '',
-        labName: '',
-        remark: ''
-      },
-      rules: {
-        firCode: [{ required: true, message: '请输入一级代码', trigger: 'change' }],
-        secCode: [{ required: true, message: '请输入二级代码', trigger: 'change' }],
-        labClaCode: [{ required: true, message: '请输入标签分类代码', trigger: 'change' }],
-        labCode: [{ required: true, message: '请输入标签代码', trigger: 'change' }],
-        firName: [{ required: true, message: '请输入数据组织一级分类', trigger: 'change' }],
-        secName: [{ required: true, message: '请输入数据组织二级分类', trigger: 'change' }],
-        labClaName: [{ required: true, message: '请输入标签分类', trigger: 'change' }],
-        labName: [{ required: true, message: '请输入标签名称', trigger: 'change' }]
-      }
-    };
-  },
-  computed: {},
-  methods: {
-    /**
-     * 取消、关闭
-     */
-    handleClose() {
-      this.$emit('close');
-    },
-    /**
-     * 保存
-     */
-    handleSave() {
-      this.$refs.form.validate(async (valid) => {
-        if (valid) {
-          const res = this.id ? await this.update() : await this.add();
-          if (res.data.result == '200') {
-            this.$message.success('保存成功');
-          } else {
-            this.$message.warning(res.data.msg);
-          }
-        }
-      });
-    },
-    add() {
-      return new Promise((resolve) => {
-        saveDataSourceCla(this.form).then((res) => {
-          resolve(res);
-        });
-      });
-    },
-    update() {
-      return new Promise((resolve) => {
-        updateDataSourceCla(this.form).then((res) => {
-          resolve(res);
-        });
-      });
-    },
-    /**
-     * 获取详情
-     */
-    getDetail() {
-      getDataSourceClaDetail(this.id).then((res) => {
-        this.form = res.data.content;
-      });
-    }
-  },
-  created() {
-    if (this.id) {
-      if (this.isDetail) {
-        this.rules = {};
-      }
-      this.getDetail();
-    }
-  },
-  mounted() {}
-};
-</script>
-
-<style lang='scss'>
-</style>

src/pages/data-auth-module/auth-object-manage/sort-code-manage/source-sort-code.vue

@@ -6,7 +6,7 @@
 <template>
   <div>
     <!-- 搜索栏 -->
-    <search-bar :conditionForm="conditionForm" @submitSearch="receiveSearch"></search-bar>
+    <search-bar :conditionForm="sourceSortConditionForm" @submitSearch="receiveSearch"></search-bar>
     <!-- 操作栏 -->
     <operate-bar :pageOptList="pageOptList" @submitPageOpt="receviceOpt"></operate-bar>
     <!-- 列表 -->
@@ -23,44 +23,28 @@
 </template>
 
 <script>
-import sourceSortForm from './forms/source-sort-form';
-import { dataSourceClaTableUrl, delDataSourceCla } from '@/api/data-auth';
+import {
+  dataSourceClaTableUrl,
+  delDataSourceCla,
+  getDataSourceClaDetail,
+  saveDataSourceCla,
+  updateDataSourceCla
+} from '@/api/data-auth';
 import { dataSourceSyncUrl } from '@/api/sync';
 import searchBar from '@/components/search-bar';
 import operateBar from '@/components/operate-bar';
 import newTable from '@/pages/common/new-table';
-import { sourceSortConfig, pageOptList, tableOptList } from './DataConfig';
-import { searchOpt, importOpt, syncOpt } from '@/mixins/page-opt';
-
+import { sourceSortConfig, pageOptList, tableOptList, sourceSortConditionForm } from './DataConfig';
+import { searchOpt, importOpt, syncOpt, addEditOpt, detailOpt } from '@/mixins/page-opt';
+const area = ['900px', '600px'];
+const labelWidth = '160px';
 export default {
   components: { searchBar, operateBar, newTable },
-  mixins: [searchOpt, importOpt, syncOpt],
+  mixins: [searchOpt, importOpt, syncOpt, addEditOpt, detailOpt],
   data() {
     return {
       dataSourceClaTableUrl,
-      conditionForm: [
-        {
-          label: '数据组织一级分类',
-          name: 'firName',
-          op: 'like',
-          value: '',
-          component: 'ElInput'
-        },
-        {
-          label: '数据组织二级分类',
-          name: 'secName',
-          op: 'like',
-          value: '',
-          component: 'ElInput'
-        },
-        {
-          label: '标签名称',
-          name: 'labName',
-          op: 'like',
-          value: '',
-          component: 'ElInput'
-        }
-      ],
+      sourceSortConditionForm,
       tableHeader: sourceSortConfig.slice(0, -1),
       pageOptList,
       tableOptList,
@@ -73,13 +57,19 @@ export default {
   },
   computed: {},
   methods: {
-    receviceOpt(opt, row) {
+    async receviceOpt(opt, row) {
+      const otherParams = {
+        config: sourceSortConfig,
+        labelWidth,
+        area
+      };
       if (opt == '新增') {
-        this.handleAdd();
+        this.handleOpenEditForm('新增', 'add', otherParams);
       } else if (opt == '修改') {
-        this.handleEdit(row);
+        const detailInfo = await this.getDetail(row.labId);
+        this.handleOpenEditForm('编辑', 'update', { ...otherParams, detailInfo });
       } else if (opt == '详情') {
-        this.handleViewDetail(row);
+         this.handleViewDetail(row.labId, otherParams);
       } else if (opt == '删除') {
         this.handleDelete(row);
       } else if (opt == '同步') {
@@ -89,17 +79,16 @@ export default {
       }
     },
     /**
-     * 编辑
-     */
-    handleEdit(row, e) {
-      this.handleOpenForm(row.labId, '编辑');
-    },
-    /**
-     * 查看详情id
+     * 获取详情
      */
-    handleViewDetail(row, e) {
-      this.handleOpenForm(row.labId, '详情', true);
+    getDetail(id) {
+      return new Promise((resolve) => {
+        getDataSourceClaDetail(id).then((res) => {
+          resolve(res.data.content);
+        });
+      });
     },
+
     /**
      * 删除
      */
@@ -112,25 +101,33 @@ export default {
       });
     },
     /**
-     * 新增
+     * @description: 保存表单
+     * @param { 表单数据 } form
+     * @param { 新增还是编辑 } type
+     * @param { 弹框 } layer
      */
-    handleAdd() {
-      this.handleOpenForm(void 0, '新增');
+    async saveForm(form, type, layer) {
+      const res = type == 'update' ? await this.update(form) : await this.add(form);
+      if (res.data.result == '200') {
+        this.$message.success('保存成功');
+        layer.close(layer.dialogIndex);
+        this.handleSearch();
+      } else {
+        this.$message.warning(res.data.msg);
+      }
+    },
+    add(form) {
+      return new Promise((resolve) => {
+        saveDataSourceCla(form).then((res) => {
+          resolve(res);
+        });
+      });
     },
-    handleOpenForm(id, title, isDetail = false) {
-      const vm = this;
-      const layer = this.$dgLayer({
-        title,
-        content: sourceSortForm,
-        props: {
-          id,
-          isDetail
-        },
-        success() {
-          vm.handleSearch();
-          layer.close(layer.dialogIndex);
-        },
-        area: ['900px', '500px']
+    update(form) {
+      return new Promise((resolve) => {
+        updateDataSourceCla(form).then((res) => {
+          resolve(res);
+        });
       });
     }
   },

src/pages/log-manage/err-auth-earlywarning-manage/auth-earlywarning-info.vue

@@ -56,7 +56,7 @@ export default {
           }
         },
         {
-          label: '创建时间',
+          label: '预警时间',
           name: 'createTime',
           op: 'between',
           type: 'DATE',

src/pages/permission-selfhelp-manage/component/basic-form.vue

@@ -26,6 +26,7 @@
                 enum="SelfAuthApplyTypeEnum"
                 v-model="sizeForm.applyType"
                 :disabled="type == 'edit'"
+                placeholder="请选择审批类型"
                 @change="handleChangeApplyType"
               ></dg-select>
             </div>
@@ -35,7 +36,7 @@
           <el-form-item label="流程名称：" prop="processName">
             <div v-if="isDetail">{{ sizeForm.processName }}</div>
             <div v-else>
-              <el-input v-model="sizeForm.processName" :disabled="true"></el-input>
+              <el-input v-model="sizeForm.processName" placeholder="请输入流程名称" :disabled="true"></el-input>
             </div>
           </el-form-item>
         </dg-col>
@@ -54,7 +55,7 @@
           <el-form-item label="审批单标题：" prop="flowTitle">
             <div v-if="isDetail">{{ sizeForm.flowTitle }}</div>
             <div v-else>
-              <el-input v-model="sizeForm.flowTitle" :disabled="true"></el-input>
+              <el-input v-model="sizeForm.flowTitle" :disabled="true" placeholder="请输入审批单标题"></el-input>
             </div>
           </el-form-item>
         </dg-col>
@@ -78,7 +79,7 @@
           <el-form-item label="申请人手机号码：" prop="applicantPhoneNo">
             <div v-if="isDetail">{{ sizeForm.applicantPhoneNo }}</div>
             <div v-else>
-              <el-input v-model="sizeForm.applicantPhoneNo"></el-input>
+              <el-input v-model="sizeForm.applicantPhoneNo" placeholder="请输入申请人手机号码"></el-input>
             </div>
           </el-form-item>
         </dg-col>
@@ -118,7 +119,7 @@
           <!-- <component :is="approveComponent"></component> -->
           <el-form-item label="审批内容：" class="self-form-item" prop="flowContent">
             <div style="display: flex" v-if="!isDetail">
-              <el-input type="textarea" :autosize="{ minRows: 5 }" :value="flowContentStr" :disabled="true"></el-input>
+              <el-input type="textarea" :autosize="{ minRows: 5 }" :value="flowContentStr" :disabled="true" placeholder="请选择审批内容"></el-input>
               <dg-button style="margin-left: 10px" @click="handleChoice" v-if="sizeForm.applyType && !this.repeatApply"
                 >选择</dg-button
               >
@@ -142,6 +143,7 @@
                 maxlength="300"
                 show-word-limit
                 :autosize="{ minRows: 5 }"
+                placeholder="请输入申请理由"
               ></el-input>
             </div>
           </el-form-item>