Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue

src/views/base/company/CompanyForm.vue

@@ -2,48 +2,49 @@
   <div class="app-container">
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
-                    <el-form-item label="企业名称" prop="corpName">
-                      <el-input v-model="formData.corpName" placeholder="请输入企业名称" />
-                    </el-form-item>
-                    <el-form-item label="统一社会信用代码" prop="orgCard">
-                      <el-input v-model="formData.orgCard" placeholder="请输入统一社会信用代码" />
-                    </el-form-item>
-                    <el-form-item label="注册资本（单位：万元）" prop="registFund">
-                      <el-input v-model="formData.registFund" placeholder="请输入注册资本（单位：万元）" />
-                    </el-form-item>
-                    <el-form-item label="注册日期" prop="registDate">
-                      <el-date-picker clearable v-model="formData.registDate" type="date" value-format="timestamp" placeholder="选择注册日期" />
-                    </el-form-item>
-                    <el-form-item label="详细地址" prop="address">
-                      <el-input v-model="formData.address" placeholder="请输入详细地址" />
-                    </el-form-item>
-                    <el-form-item label="法人姓名" prop="legalName">
-                      <el-input v-model="formData.legalName" placeholder="请输入法人姓名" />
-                    </el-form-item>
-                    <el-form-item label="法人身份证号" prop="legalCard">
-                      <el-input v-model="formData.legalCard" placeholder="请输入法人身份证号" />
-                    </el-form-item>
-                    <el-form-item label="联系人" prop="contactName">
-                      <el-input v-model="formData.contactName" placeholder="请输入联系人" />
-                    </el-form-item>
-                    <el-form-item label="联系方式" prop="mobilePhone">
-                      <el-input v-model="formData.mobilePhone" placeholder="请输入联系方式" />
-                    </el-form-item>
-                    <el-form-item label="企业简介">
-                      <Editor v-model="formData.corpContent" :min-height="192"/>
-                    </el-form-item>
-                    <el-form-item label="经营范围" prop="business">
-                      <el-input v-model="formData.business" placeholder="请输入经营范围" />
-                    </el-form-item>
-                    <el-form-item label="管理员登录账号" prop="loginAccount">
-                      <el-input v-model="formData.loginAccount" placeholder="请输入管理员登录账号" />
-                    </el-form-item>
-                    <el-form-item label="关联的菜单编号(实际就是这个企业的用户登录后有哪些菜单权限)" prop="menuIds">
-                      <el-input v-model="formData.menuIds" placeholder="请输入关联的菜单编号(实际就是这个企业的用户登录后有哪些菜单权限)" />
-                    </el-form-item>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="150px">
+        <el-form-item label="企业名称" prop="corpName">
+          <el-input v-model="formData.corpName" placeholder="请输入企业名称"/>
+        </el-form-item>
+        <el-form-item label="统一社会信用代码" prop="orgCard">
+          <el-input v-model="formData.orgCard" placeholder="请输入统一社会信用代码"/>
+        </el-form-item>
+        <el-form-item label="注册资本" prop="registFund">
+          <el-input type="number" v-model="formData.registFund" placeholder="请输入注册资本">
+            <template slot="append">万元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="注册日期" prop="registDate">
+          <el-date-picker clearable v-model="formData.registDate" type="date" value-format="timestamp"
+                          placeholder="选择注册日期"
+          />
+        </el-form-item>
+        <el-form-item label="详细地址" prop="address">
+          <el-input v-model="formData.address" placeholder="请输入详细地址"/>
+        </el-form-item>
+        <el-form-item label="法人姓名" prop="legalName">
+          <el-input v-model="formData.legalName" placeholder="请输入法人姓名"/>
+        </el-form-item>
+        <el-form-item label="法人身份证号" prop="legalCard">
+          <el-input v-model="formData.legalCard" placeholder="请输入法人身份证号"/>
+        </el-form-item>
+        <el-form-item label="联系人" prop="contactName">
+          <el-input v-model="formData.contactName" placeholder="请输入联系人"/>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="mobilePhone">
+          <el-input type="tel" v-model="formData.mobilePhone" placeholder="请输入联系方式"/>
+        </el-form-item>
+        <el-form-item label="企业简介">
+          <Editor v-model="formData.corpContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="经营范围" prop="business">
+          <el-input type="textarea" v-model="formData.business" placeholder="请输入经营范围"/>
+        </el-form-item>
+        <el-form-item label="管理员登录账号" prop="loginAccount">
+          <el-input v-model="formData.loginAccount" placeholder="请输入管理员登录账号"/>
+        </el-form-item>
       </el-form>
-              <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
         <el-button @click="dialogVisible = false">取 消</el-button>
       </div>
@@ -52,105 +53,116 @@
 </template>
 
 <script>
-  import * as CompanyApi from '@/api/base/company';
-  import Editor from '@/components/Editor';
-      export default {
-    name: "CompanyForm",
-    components: {
-          Editor,
-                    },
-    data() {
-      return {
-        // 弹出层标题
-        dialogTitle: "",
-        // 是否显示弹出层
-        dialogVisible: false,
-        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-        formLoading: false,
-        // 表单参数
-        formData: {
-                            id: undefined,
-                            corpName: undefined,
-                            orgCard: undefined,
-                            registFund: undefined,
-                            registDate: undefined,
-                            address: undefined,
-                            legalName: undefined,
-                            legalCard: undefined,
-                            contactName: undefined,
-                            mobilePhone: undefined,
-                            corpContent: undefined,
-                            business: undefined,
-                            loginAccount: undefined,
-                            menuIds: undefined,
-        },
-        // 表单校验
-        formRules: {
-        },
-                        };
-    },
-    methods: {
-      /** 打开弹窗 */
-     async open(id) {
-        this.dialogVisible = true;
-        this.reset();
-        // 修改时，设置数据
-        if (id) {
-          this.formLoading = true;
-          try {
-            const res = await CompanyApi.getCompany(id);
-            this.formData = res.data;
-            this.title = "修改企业信息表（每个租户的下属企业信息）";
-          } finally {
-            this.formLoading = false;
-          }
-        }
-        this.title = "新增企业信息表（每个租户的下属企业信息）";
-              },
-      /** 提交按钮 */
-      async submitForm() {
-        // 校验主表
-        await this.$refs["formRef"].validate();
-                  this.formLoading = true;
-        try {
-          const data = this.formData;
-                  // 修改的提交
-          if (data.id) {
-            await CompanyApi.updateCompany(data);
-            this.$modal.msgSuccess("修改成功");
-            this.dialogVisible = false;
-            this.$emit('success');
-            return;
-          }
-          // 添加的提交
-          await CompanyApi.createCompany(data);
-          this.$modal.msgSuccess("新增成功");
-          this.dialogVisible = false;
-          this.$emit('success');
-        } finally {
-          this.formLoading = false;
-        }
+import * as CompanyApi from '@/api/base/company'
+import Editor from '@/components/Editor'
+
+export default {
+  name: 'CompanyForm',
+  components: {
+    Editor
+  },
+  data() {
+    return {
+      // 弹出层标题
+      dialogTitle: '',
+      // 是否显示弹出层
+      dialogVisible: false,
+      // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+      formLoading: false,
+      // 表单参数
+      formData: {
+        id: undefined,
+        corpName: undefined,
+        orgCard: undefined,
+        registFund: undefined,
+        registDate: undefined,
+        address: undefined,
+        legalName: undefined,
+        legalCard: undefined,
+        contactName: undefined,
+        mobilePhone: undefined,
+        corpContent: undefined,
+        business: undefined,
+        loginAccount: undefined,
+        menuIds: undefined
       },
-                      /** 表单重置 */
-      reset() {
-        this.formData = {
-                            id: undefined,
-                            corpName: undefined,
-                            orgCard: undefined,
-                            registFund: undefined,
-                            registDate: undefined,
-                            address: undefined,
-                            legalName: undefined,
-                            legalCard: undefined,
-                            contactName: undefined,
-                            mobilePhone: undefined,
-                            corpContent: undefined,
-                            business: undefined,
-                            loginAccount: undefined,
-                            menuIds: undefined,
-        };
-        this.resetForm("formRef");
+      // 表单校验
+      formRules: {
+        corpName: [{ required: true, message: '企业名称不能为空', trigger: 'blur' }],
+        orgCard: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }],
+        registFund: [{ required: true, message: '注册资本不能为空', trigger: 'blur' }],
+        registDate: [{ required: true, message: '注册日期不能为空', trigger: 'blur' }],
+        address: [{ required: true, message: '详细地址不能为空', trigger: 'blur' }],
+        legalName: [{ required: true, message: '法人姓名不能为空', trigger: 'blur' }],
+        legalCard: [{ required: true, message: '法人身份证号不能为空', trigger: 'blur' }],
+        contactName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
+        mobilePhone: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+        loginAccount: [{ required: true, message: '管理员登录账号不能为空', trigger: 'blur' }],
       }
     }
-  };
-</script>
+  },
+  methods: {
+    /** 打开弹窗 */
+    async open(id) {
+      this.dialogVisible = true
+      this.reset()
+      // 修改时，设置数据
+      if (id) {
+        this.formLoading = true
+        try {
+          const res = await CompanyApi.getCompany(id)
+          this.formData = res.data
+          this.title = '修改企业信息表（每个租户的下属企业信息）'
+        } finally {
+          this.formLoading = false
+        }
+      }
+      this.title = '新增企业信息表（每个租户的下属企业信息）'
+    },
+    /** 提交按钮 */
+    async submitForm() {
+      // 校验主表
+      await this.$refs['formRef'].validate()
+      this.formLoading = true
+      try {
+        const data = this.formData
+        // 修改的提交
+        if (data.id) {
+          await CompanyApi.updateCompany(data)
+          this.$modal.msgSuccess('修改成功')
+          this.dialogVisible = false
+          this.$emit('success')
+          return
+        }
+        // 添加的提交
+        await CompanyApi.createCompany(data)
+        this.$modal.msgSuccess('新增成功')
+        this.dialogVisible = false
+        this.$emit('success')
+      } finally {
+        this.formLoading = false
+      }
+    },
+    /** 表单重置 */
+    reset() {
+      this.formData = {
+        id: undefined,
+        corpName: undefined,
+        orgCard: undefined,
+        registFund: undefined,
+        registDate: undefined,
+        address: undefined,
+        legalName: undefined,
+        legalCard: undefined,
+        contactName: undefined,
+        mobilePhone: undefined,
+        corpContent: undefined,
+        business: undefined,
+        loginAccount: undefined,
+        menuIds: undefined
+      }
+      this.resetForm('formRef')
+    }
+  }
+}
+</script>

src/views/base/company/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
       <el-form-item label="企业名称" prop="corpName">
         <el-input v-model="queryParams.corpName" placeholder="请输入企业名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="统一社会信用代码" prop="orgCard">
         <el-input v-model="queryParams.orgCard" placeholder="请输入统一社会信用代码" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="注册日期" prop="registDate">
-        <el-date-picker v-model="queryParams.registDate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+      <el-form-item label="注册日期" prop="registDateArray">
+        <el-date-picker v-model="queryParams.registDateArray" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
                         type="daterange"
                         range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
                         :default-time="['00:00:00', '23:59:59']"
@@ -52,10 +52,10 @@
     </el-row>
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键标识" align="center" prop="id"/>
+      <el-table-column label="序号" align="center" prop="id"/>
       <el-table-column label="企业名称" align="center" prop="corpName"/>
       <el-table-column label="统一社会信用代码" align="center" prop="orgCard"/>
-      <el-table-column label="注册资本（单位：万元）" align="center" prop="registFund"/>
+      <el-table-column label="注册资本（万元）" align="center" prop="registFund"/>
       <el-table-column label="注册日期" align="center" prop="registDate"/>
       <el-table-column label="详细地址" align="center" prop="address"/>
       <el-table-column label="法人姓名" align="center" prop="legalName"/>
@@ -125,18 +125,11 @@ export default {
         pageSize: 10,
         corpName: null,
         orgCard: null,
-        registFund: null,
-        registDate: [],
-        address: null,
+        registDateArray: [],
         legalName: null,
         legalCard: null,
         contactName: null,
-        mobilePhone: null,
-        corpContent: null,
-        business: null,
-        loginAccount: null,
-        menuIds: null,
-        createTime: []
+        mobilePhone: null
       }
     }
   },
@@ -147,6 +140,7 @@ export default {
     /** 查询列表 */
     async getList() {
       try {
+        debugger
         this.loading = true
         const res = await CompanyApi.getCompanyPage(this.queryParams)
         this.list = res.data.records
@@ -172,7 +166,7 @@ export default {
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id
-      await this.$modal.confirm('是否确认删除企业信息表（每个租户的下属企业信息）编号为"' + id + '"的数据项?')
+      await this.$modal.confirm('是否确认删除数据？')
       try {
         await CompanyApi.deleteCompany(id)
         await this.getList()
@@ -182,11 +176,11 @@ export default {
     },
     /** 导出按钮操作 */
     async handleExport() {
-      await this.$modal.confirm('是否确认导出所有企业信息表（每个租户的下属企业信息）数据项?')
+      await this.$modal.confirm('是否确认导出所有企业信息数据？')
       try {
         this.exportLoading = true
         const data = await CompanyApi.exportCompanyExcel(this.queryParams)
-        this.$download.excel(data, '企业信息表（每个租户的下属企业信息）.xls')
+        this.$download.excel(data, '企业信息表.xls')
       } catch {
       } finally {
         this.exportLoading = false

vue.config.js

@@ -55,6 +55,7 @@ module.exports = {
   },
   configureWebpack: {
     name: name,
+    devtool: "source-map",
     resolve: {
       alias: {
         '@': resolve('src')