添加首页统计报表

enterprise-manager-ui/admin/src/router.js

@@ -109,7 +109,6 @@ function getComponent(fileName) {
     try {
         return require('./views/' + fileName).default
     } catch (error) {
-        console.log("error:",error)
         return fileNotFound;
     }
 }

enterprise-manager-ui/admin/src/views/category/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "CategoryList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/company/drawershow.vue

@@ -5,7 +5,7 @@
             :visible.sync="open"
             :direction="direction"
             :destroy-on-close="true"
-            size="50%">
+            size="70%">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
                                             <Field label="公司名称" prop="companyName" v-model="form.companyName" placeholder="请输入公司名称"/>
@@ -17,6 +17,8 @@
                             <Field label="经营范围" prop="businessScope" v-model="form.businessScope" placeholder="请输入经营范围"/>
                             <Field label="经营地址" prop="businessAdress" v-model="form.businessAdress" placeholder="请输入经营地址"/>
                             <Field label="所在地" prop="location" v-model="form.location" placeholder="请输入所在地"/>
+                            <Field label="所属区域编码" prop="areaCode" v-model="form.areaCode" placeholder="请输入所属区域编码"/>
+                            <Field label="所属区域名称" prop="areaName" v-model="form.areaName" placeholder="请输入所属区域名称"/>
                             <Field label="联系电话" prop="contactPhone" v-model="form.contactPhone" placeholder="请输入联系电话"/>
                             <Field label="电子邮件地址" prop="email" v-model="form.email" placeholder="请输入电子邮件地址"/>
                             <Field label="公司网站" prop="website" v-model="form.website" placeholder="请输入公司网站"/>
@@ -30,9 +32,9 @@
                             <Field label="历史发展" prop="hisDevelop" v-model="form.hisDevelop" type="textarea" placeholder="请输入历史发展"/>
                             <Field label="经度" prop="lon" v-model="form.lon" placeholder="请输入经度"/>
                             <Field label="纬度" prop="lati" v-model="form.lati" placeholder="请输入纬度"/>
-                            <Field label="企业logo" prop="logoPath" v-model="form.logoPath" placeholder="请输入企业logo"/>
-                            <Field label="企业视频" prop="companyVideoPath" v-model="form.companyVideoPath" type="textarea" placeholder="请输入企业视频"/>
-                            <Field label="企业宣传图片" prop="companyPicPath" v-model="form.companyPicPath" type="textarea" placeholder="请输入企业宣传图片"/>
+                            <Field label="企业logo"><imageUpload v-model="form.logoPath" prePath="/file/preview"/></Field>
+                            <Field label="企业视频"><fileUpload v-model="form.companyVideoPath" :fileType="[ 'mp4', 'avi']"  prePath="/file/fileupload"/></Field>
+                            <Field label="企业宣传图片"><fileUpload v-model="form.companyPicPath" :fileType="['png', 'jpg', 'jpeg']" prePath="/file/preview"/></Field>
                             <Field label="公司介绍" prop="companyIntroduction" v-model="form.companyIntroduction" type="textarea" placeholder="请输入公司介绍"/>
                             <Field label="公司文化" prop="companyCulture" v-model="form.companyCulture" type="textarea" placeholder="请输入公司文化"/>
                             <Field label="排序" prop="sort" v-model="form.sort" placeholder="请输入排序"/>
@@ -59,9 +61,14 @@
                                     <el-input v-model="scope.row.labelId" placeholder="请输入标签Id" />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="标签名称" prop="labelName">
+                            <el-table-column label="公司名称" prop="labelName">
                                 <template slot-scope="scope">
-                                    <el-input v-model="scope.row.labelName" placeholder="请输入标签名称" />
+                                    <el-input v-model="scope.row.labelName" placeholder="请输入公司名称" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="公司名称" prop="companyName">
+                                <template slot-scope="scope">
+                                    <el-input v-model="scope.row.companyName" placeholder="请输入公司名称" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="备注" prop="remark">
@@ -135,6 +142,30 @@
                         {required: true,message: "请输入公司名称", trigger: "blur" },
                         {max: 128,message: "最多只能录入128个字符",trigger: "blur",},
                     ],
+                    areaCode: [
+                        {required: true,message: "请输入所属区域编码", trigger: "blur" },
+                        {max: 128,message: "最多只能录入128个字符",trigger: "blur",},
+                    ],
+                    areaName: [
+                        {required: true,message: "请输入所属区域名称", trigger: "blur" },
+                        {max: 128,message: "最多只能录入128个字符",trigger: "blur",},
+                    ],
+                    contactPhone: [
+                        {required: true,message: "请输入联系电话", trigger: "blur" },
+                        {max: 32,message: "最多只能录入32个字符",trigger: "blur",},
+                    ],
+                    lon: [
+                        {required: true,message: "请输入经度", trigger: "blur" },
+                        {max: 32,message: "最多只能录入32个字符",trigger: "blur",},
+                    ],
+                    lati: [
+                        {required: true,message: "请输入纬度", trigger: "blur" },
+                        {max: 32,message: "最多只能录入32个字符",trigger: "blur",},
+                    ],
+                    logoPath: [
+                        {required: true,message: "请输入企业logo", trigger: "blur" },
+                        {max: 128,message: "最多只能录入128个字符",trigger: "blur",},
+                    ],
                     establishDate: [
                         {required: true,message: "请选择成立日期" },
                     ],
@@ -155,6 +186,7 @@
                 let obj = {};
                 obj.labelId = "";
                 obj.labelName = "";
+                obj.companyName = "";
                 obj.remark = "";
                 obj.createUserId = "";
                 obj.createTime = "";
@@ -238,6 +270,8 @@
                     businessScope : "",
                     businessAdress : "",
                     location : "",
+                    areaCode : "",
+                    areaName : "",
                     contactPhone : "",
                     email : "",
                     website : "",

enterprise-manager-ui/admin/src/views/company/labels/drawershow.vue

+<template>
+    <!-- 弹出框表单 -->
+    <el-drawer
+            :title="title"
+            :visible.sync="open"
+            :direction="direction"
+            :destroy-on-close="true"
+            size="50%">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+            <el-row>
+                                            <Field label="标签Id" prop="labelId" v-model="form.labelId" placeholder="请输入标签Id"/>
+                            <Field label="公司名称" prop="labelName" v-model="form.labelName" placeholder="请输入公司名称"/>
+                            <Field label="公司Id" prop="companyId" v-model="form.companyId" placeholder="请输入公司Id"/>
+                            <Field label="公司名称" prop="companyName" v-model="form.companyName" placeholder="请输入公司名称"/>
+                            <Field label="备注" prop="remark" v-model="form.remark" placeholder="请输入备注"/>
+
+            </el-row>
+
+            <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
+        </el-form>
+
+    </el-drawer>
+</template>
+
+<script>
+    import form from "@/assets/mixins/formdialog";
+    export default {
+        name: "CompanyLabelsDetail",
+        mixins: [form],
+        components: {
+
+        },
+        created() {
+            this.changePath("company/labels")
+        },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 弹出层标题
+                title: "公司标注",
+                // 是否显示弹出层
+                open: false,
+                direction:"rtl",
+                toString:[
+                ],
+                toDate:[
+                ],
+                // 表单校验
+                rules: {
+                    createTime: [
+                        {required: true,message: "请选择创建时间" },
+                    ],
+                }
+            };
+        },
+
+        methods: {
+            /** 编辑 */
+            edit(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="company/labels/edit";
+                this.getData();
+                this.pageInfo.type="edit"
+                this.title = "修改公司标注";
+            },
+            /** 新增 */
+            add(row) {
+                this.reset()
+                this.urls.currUrl = "company/labels/add";
+                this.getData();
+                this.pageInfo.type="add"
+                this.title = "新增公司标注";
+            },
+            /** 查看*/
+            view(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="company/labels/view";
+                this.getData();
+                this.pageInfo.type="view"
+                this.title = "公司标注详细";
+            },
+            /**取消按钮 */
+            cancel() {
+                this.open = false;
+            },
+            /**获取数据后弹框 */
+            afterRender(data) {
+                this.open = true;
+            },
+
+            afterSubmit(data) {
+                this.open = false;
+                this.$emit("ok");
+            },
+
+            // 表单重置
+            reset() {
+                this.form = {
+                    labelId : null,
+                    labelName : "",
+                    companyId : null,
+                    companyName : "",
+                    remark : "",
+                };
+                this.resetForm("form");
+            },
+            resetForm(refName) {
+                if (this.$refs[refName]) {
+                    this.$refs[refName].resetFields();
+                }
+            },
+        },
+    };
+</script>

enterprise-manager-ui/admin/src/views/company/labels/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "CompanyLabelsList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },
@@ -46,9 +46,11 @@
 
                         {label: "标签Id", prop: "labelId", formatter: this.formatter},
 
+                        {label: "公司名称", prop: "labelName"},
+
                         {label: "公司Id", prop: "companyId", formatter: this.formatter},
 
-                        {label: "标签名称", prop: "labelName"},
+                        {label: "公司名称", prop: "companyName"},
 
                         {label: "创建用户", prop: "createUserId", formatter: this.formatter},
                         {

enterprise-manager-ui/admin/src/views/company/labels/view.vue

@@ -11,11 +11,14 @@
                                     <el-descriptions-item label="标签Id" label-class-name="labelClass" content-class-name="contentClass">
                             {{form.labelId}}
                         </el-descriptions-item>
+                        <el-descriptions-item label="公司名称" label-class-name="labelClass" content-class-name="contentClass">
+                            {{form.labelName}}
+                        </el-descriptions-item>
                         <el-descriptions-item label="公司Id" label-class-name="labelClass" content-class-name="contentClass">
                             {{form.companyId}}
                         </el-descriptions-item>
-                        <el-descriptions-item label="标签名称" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.labelName}}
+                        <el-descriptions-item label="公司名称" label-class-name="labelClass" content-class-name="contentClass">
+                            {{form.companyName}}
                         </el-descriptions-item>
                         <el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
                             {{form.remark}}

enterprise-manager-ui/admin/src/views/company/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "CompanyList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -41,15 +41,15 @@
             },
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },
@@ -58,8 +58,9 @@
                 /** 子表列元素 */
                 columnSet:[
                     {label: "标签Id", prop: "labelId", formatter: this.formatter},
+                    {label: "公司名称", prop: "labelName"},
                     {label: "公司Id", prop: "companyId", formatter: this.formatter},
-                    {label: "标签名称", prop: "labelName"},
+                    {label: "公司名称", prop: "companyName"},
                     {label: "备注", prop: "remark"},
                 ],
                 config: {

enterprise-manager-ui/admin/src/views/company/patent/drawershow.vue

+<template>
+    <!-- 弹出框表单 -->
+    <el-drawer
+            :title="title"
+            :visible.sync="open"
+            :direction="direction"
+            :destroy-on-close="true"
+            size="50%">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+            <el-row>
+                                            <Field label="公司Id" prop="companyId" v-model="form.companyId" placeholder="请输入公司Id"/>
+                            <Field label="公司名称" prop="companyName" v-model="form.companyName" placeholder="请输入公司名称"/>
+                            <Field label="知识产权类型" prop="intellectPropertyType" v-model="form.intellectPropertyType" placeholder="请输入知识产权类型"/>
+                            <Field label="知识产权数量" prop="intellectPropertyNum" v-model="form.intellectPropertyNum" placeholder="请输入知识产权数量"/>
+                            <Field label="备注" prop="remark" v-model="form.remark" placeholder="请输入备注"/>
+
+            </el-row>
+
+            <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
+        </el-form>
+
+    </el-drawer>
+</template>
+
+<script>
+    import form from "@/assets/mixins/formdialog";
+    export default {
+        name: "CompanyPatentDetail",
+        mixins: [form],
+        components: {
+
+        },
+        created() {
+            this.changePath("company/patent")
+        },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 弹出层标题
+                title: "公司专利",
+                // 是否显示弹出层
+                open: false,
+                direction:"rtl",
+                toString:[
+                ],
+                toDate:[
+                ],
+                // 表单校验
+                rules: {
+                    createTime: [
+                        {required: true,message: "请选择创建时间" },
+                    ],
+                }
+            };
+        },
+
+        methods: {
+            /** 编辑 */
+            edit(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="company/patent/edit";
+                this.getData();
+                this.pageInfo.type="edit"
+                this.title = "修改公司专利";
+            },
+            /** 新增 */
+            add(row) {
+                this.reset()
+                this.urls.currUrl = "company/patent/add";
+                this.getData();
+                this.pageInfo.type="add"
+                this.title = "新增公司专利";
+            },
+            /** 查看*/
+            view(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="company/patent/view";
+                this.getData();
+                this.pageInfo.type="view"
+                this.title = "公司专利详细";
+            },
+            /**取消按钮 */
+            cancel() {
+                this.open = false;
+            },
+            /**获取数据后弹框 */
+            afterRender(data) {
+                this.open = true;
+            },
+
+            afterSubmit(data) {
+                this.open = false;
+                this.$emit("ok");
+            },
+
+            // 表单重置
+            reset() {
+                this.form = {
+                    companyId : null,
+                    companyName : "",
+                    intellectPropertyType : "",
+                    intellectPropertyNum : null,
+                    remark : "",
+                };
+                this.resetForm("form");
+            },
+            resetForm(refName) {
+                if (this.$refs[refName]) {
+                    this.$refs[refName].resetFields();
+                }
+            },
+        },
+    };
+</script>

enterprise-manager-ui/admin/src/views/company/patent/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "CompanyPatentList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },
@@ -46,6 +46,8 @@
 
                         {label: "公司Id", prop: "companyId", formatter: this.formatter},
 
+                        {label: "公司名称", prop: "companyName"},
+
                         {label: "知识产权类型", prop: "intellectPropertyType"},
 
                         {label: "知识产权数量", prop: "intellectPropertyNum",formatter: this.formatter},

enterprise-manager-ui/admin/src/views/company/patent/view.vue

@@ -11,6 +11,9 @@
                                     <el-descriptions-item label="公司Id" label-class-name="labelClass" content-class-name="contentClass">
                             {{form.companyId}}
                         </el-descriptions-item>
+                        <el-descriptions-item label="公司名称" label-class-name="labelClass" content-class-name="contentClass">
+                            {{form.companyName}}
+                        </el-descriptions-item>
                         <el-descriptions-item label="知识产权类型" label-class-name="labelClass" content-class-name="contentClass">
                             {{form.intellectPropertyType}}
                         </el-descriptions-item>

enterprise-manager-ui/admin/src/views/company/product/drawershow.vue

+<template>
+    <!-- 弹出框表单 -->
+    <el-drawer
+            :title="title"
+            :visible.sync="open"
+            :direction="direction"
+            :destroy-on-close="true"
+            size="50%">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+            <el-row>
+                                            <Field label="公司Id" prop="companyId" v-model="form.companyId" placeholder="请输入公司Id"/>
+                            <Field label="公司名称" prop="companyName" v-model="form.companyName" placeholder="请输入公司名称"/>
+                            <Field label="产品Id" prop="productId" v-model="form.productId" placeholder="请输入产品Id"/>
+                            <Field label="产品名称" prop="productName" v-model="form.productName" placeholder="请输入产品名称"/>
+                            <Field label="备注" prop="remark" v-model="form.remark" placeholder="请输入备注"/>
+
+            </el-row>
+
+            <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
+        </el-form>
+
+    </el-drawer>
+</template>
+
+<script>
+    import form from "@/assets/mixins/formdialog";
+    export default {
+        name: "CompanyProductDetail",
+        mixins: [form],
+        components: {
+
+        },
+        created() {
+            this.changePath("company/product")
+        },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 弹出层标题
+                title: "公司产品",
+                // 是否显示弹出层
+                open: false,
+                direction:"rtl",
+                toString:[
+                ],
+                toDate:[
+                ],
+                // 表单校验
+                rules: {
+                    createTime: [
+                        {required: true,message: "请选择创建时间" },
+                    ],
+                }
+            };
+        },
+
+        methods: {
+            /** 编辑 */
+            edit(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="company/product/edit";
+                this.getData();
+                this.pageInfo.type="edit"
+                this.title = "修改公司产品";
+            },
+            /** 新增 */
+            add(row) {
+                this.reset()
+                this.urls.currUrl = "company/product/add";
+                this.getData();
+                this.pageInfo.type="add"
+                this.title = "新增公司产品";
+            },
+            /** 查看*/
+            view(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="company/product/view";
+                this.getData();
+                this.pageInfo.type="view"
+                this.title = "公司产品详细";
+            },
+            /**取消按钮 */
+            cancel() {
+                this.open = false;
+            },
+            /**获取数据后弹框 */
+            afterRender(data) {
+                this.open = true;
+            },
+
+            afterSubmit(data) {
+                this.open = false;
+                this.$emit("ok");
+            },
+
+            // 表单重置
+            reset() {
+                this.form = {
+                    companyId : null,
+                    companyName : "",
+                    productId : null,
+                    productName : "",
+                    remark : "",
+                };
+                this.resetForm("form");
+            },
+            resetForm(refName) {
+                if (this.$refs[refName]) {
+                    this.$refs[refName].resetFields();
+                }
+            },
+        },
+    };
+</script>

enterprise-manager-ui/admin/src/views/company/product/list.vue

+<template>
+    <div class="page">
+        <LayoutTable :data="tableData" :config="tableConfig">
+                    </LayoutTable>
+
+
+        <drawer-show ref="drawerform" @ok="getData" />
+    </div>
+</template>
+
+<script>
+    /** 表单弹出框模式需引入 */
+    import drawerShow from "./drawershow";
+    import table from "@/assets/mixins/table";
+    export default {
+        name: "CompanyProductList",
+        components: {
+            drawerShow
+},
+        mixins: [table],
+        created() {
+        },
+        methods: {
+            /** 重写新增方法 */
+            toAdd(row) {
+                this.$refs.drawerform.add(row);
+            },
+            /** 重写编辑方法 */
+            toEdit(row) {
+                this.$refs.drawerform.edit(row);
+            },
+            /** 重写查看方法 */
+            toView(row) {
+                this.$refs.drawerform.view(row);
+            },
+
+        },
+        data() {
+            return {
+                config: {
+                    search: [
+                    ],
+                    columns: [
+                        {type: "selection", width: 60},
+                        {type: "index",label: "序号",width: 50},
+
+                        {label: "公司Id", prop: "companyId", formatter: this.formatter},
+
+                        {label: "公司名称", prop: "companyName"},
+
+                        {label: "产品Id", prop: "productId", formatter: this.formatter},
+
+                        {label: "产品名称", prop: "productName"},
+
+                        {label: "创建用户", prop: "createUserId", formatter: this.formatter},
+                        {
+                            label: "操作",
+                            width: 240,
+                            formatter: row => {
+                                return (
+                                    <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
+                            );
+                            }
+                        }
+                    ]
+                }
+            };
+        }
+    };
+</script>
\ No newline at end of file

enterprise-manager-ui/admin/src/views/company/product/view.vue

+<template>
+    <layout-view>
+        <el-descriptions  :title="title" :column="column" :size="size" :colon="false" border>
+            <template slot="title">
+                <i class="el-icon-tickets"></i>
+                基本详细信息
+            </template>
+            <template slot="extra">
+                <el-button type="primary" @click="$router.go(-1)" size="small">返回</el-button>
+            </template>
+                                    <el-descriptions-item label="公司Id" label-class-name="labelClass" content-class-name="contentClass">
+                            {{form.companyId}}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="公司名称" label-class-name="labelClass" content-class-name="contentClass">
+                            {{form.companyName}}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="产品Id" label-class-name="labelClass" content-class-name="contentClass">
+                            {{form.productId}}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="产品名称" label-class-name="labelClass" content-class-name="contentClass">
+                            {{form.productName}}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
+                            {{form.remark}}
+                        </el-descriptions-item>
+        </el-descriptions>
+
+    </layout-view>
+</template>
+
+<script>
+    import view from "@/assets/mixins/view";
+    export default {
+        mixins: [view],
+        components: {
+        },
+        methods: {
+
+        },
+        data() {
+            return {
+                size:"small",
+                column:2,
+                toString:[
+                ],
+                toArrays: [
+
+                ],
+                toDate: [
+
+                ]
+            }
+        }
+    }
+</script>
+<style lang="less">
+    .labelClass{
+        width: 200px;
+    }
+    .el-descriptions__body{
+        margin-left: 5px;
+        margin-right: 5px;
+        color: #606266;
+        background-color: #FFF;
+    }
+    .contentClass{
+        width: 600px;
+    }
+</style>
\ No newline at end of file

enterprise-manager-ui/admin/src/views/company/view.vue

@@ -81,13 +81,13 @@
                             {{form.lati}}
                         </el-descriptions-item>
                         <el-descriptions-item label="企业logo" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.logoPath}}
+                            <imageUpload v-model="form.logoPath" prePath="/file/preview"/>
                         </el-descriptions-item>
                         <el-descriptions-item label="企业视频" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.companyVideoPath}}
+                            <fileUpload v-model="form.companyVideoPath"  prePath="/file/fileupload"/>
                         </el-descriptions-item>
                         <el-descriptions-item label="企业宣传图片" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.companyPicPath}}
+                            <imageUpload v-model="form.companyPicPath" prePath="/file/preview"/>
                         </el-descriptions-item>
                         <el-descriptions-item label="公司介绍" label-class-name="labelClass" content-class-name="contentClass">
                             {{form.companyIntroduction}}
@@ -111,9 +111,13 @@
 
 <script>
     import view from "@/assets/mixins/view";
+    import ImageUpload from '@/components/ImageUpload';
+    import FileUpload from '@/components/FileUpload';
     export default {
         mixins: [view],
         components: {
+            ImageUpload,
+            FileUpload,
         },
         methods: {
 

enterprise-manager-ui/admin/src/views/feedback/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "FeedbackList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/labels/drawershow.vue

@@ -10,7 +10,7 @@
             <el-row>
                                             <Field label="标签名称" prop="labelName" v-model="form.labelName" placeholder="请输入标签名称"/>
                             <Field label="标签描述" prop="labelDesc" v-model="form.labelDesc" placeholder="请输入标签描述"/>
-                            <Field label="标签图标" prop="labelLogoPath" v-model="form.labelLogoPath" placeholder="请输入标签图标"/>
+                            <Field label="标签图标"><imageUpload v-model="form.labelLogoPath" prePath="/file/preview"/></Field>
                             <Field label="排序" prop="sort" v-model="form.sort" placeholder="请输入排序"/>
                             <Field label="备注" prop="remark" v-model="form.remark" placeholder="请输入备注"/>
 

enterprise-manager-ui/admin/src/views/labels/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "LabelsList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/labels/view.vue

@@ -15,7 +15,7 @@
                             {{form.labelDesc}}
                         </el-descriptions-item>
                         <el-descriptions-item label="标签图标" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.labelLogoPath}}
+                            <imageUpload v-model="form.labelLogoPath" prePath="/file/preview"/>
                         </el-descriptions-item>
                         <el-descriptions-item label="排序" label-class-name="labelClass" content-class-name="contentClass">
                             {{form.sort}}
@@ -30,9 +30,11 @@
 
 <script>
     import view from "@/assets/mixins/view";
+    import ImageUpload from '@/components/ImageUpload';
     export default {
         mixins: [view],
         components: {
+            ImageUpload,
         },
         methods: {
 

enterprise-manager-ui/admin/src/views/news/category/drawershow.vue

@@ -8,7 +8,7 @@
             size="50%">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-                                            <Field label="产品名称" prop="name" v-model="form.name" placeholder="请输入产品名称"/>
+                                            <Field label="频道名称" prop="name" v-model="form.name" placeholder="请输入频道名称"/>
                             <Field label="备注" prop="remark" v-model="form.remark" placeholder="请输入备注"/>
 
             </el-row>

enterprise-manager-ui/admin/src/views/news/category/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "NewsCategoryList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/news/drawershow.vue

@@ -11,7 +11,7 @@
                                             <Field label="分类id" prop="categoryId" v-model="form.categoryId" placeholder="请输入分类id"/>
                             <Field label="分类名称" prop="categoryName" v-model="form.categoryName" placeholder="请输入分类名称"/>
                             <Field label="标题" prop="title" v-model="form.title" type="textarea" placeholder="请输入标题"/>
-                            <Field label="标题logo" prop="titleLogoPath" v-model="form.titleLogoPath" type="textarea" placeholder="请输入标题logo"/>
+                            <Field label="标题logo"><imageUpload v-model="form.titleLogoPath" prePath="/file/preview"/></Field>
                             <Field label="内容"><editor v-model="form.content" :min-height="256"/></Field>
                             <Field label="置顶 " prop="top" v-model="form.top" type="select" :enumData="dict.top" placeholder="请选择置顶 "/>
                             <Field label="浏览次数" prop="viewNums" v-model="form.viewNums" type="select" :enumData="dict.viewNums" placeholder="请选择浏览次数"/>

enterprise-manager-ui/admin/src/views/news/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "NewsList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/news/record/drawershow.vue

+<template>
+    <!-- 弹出框表单 -->
+    <el-drawer
+            :title="title"
+            :visible.sync="open"
+            :direction="direction"
+            :destroy-on-close="true"
+            size="50%">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+            <el-row>
+                                            <Field label="新闻ID" prop="newsId" v-model="form.newsId" placeholder="请输入新闻ID"/>
+                            <Field label="查看人名称" prop="viewName" v-model="form.viewName" placeholder="请输入查看人名称"/>
+                            <Field label="累计查看次数" prop="sumViews" v-model="form.sumViews" placeholder="请输入累计查看次数"/>
+                            <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
+                            <Field label="最后浏览时间" prop="viewTime" v-model="form.viewTime" type="date" />
+
+            </el-row>
+
+            <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
+        </el-form>
+
+    </el-drawer>
+</template>
+
+<script>
+    import form from "@/assets/mixins/formdialog";
+    export default {
+        name: "NewsRecordDetail",
+        mixins: [form],
+        components: {
+
+        },
+        created() {
+            this.changePath("news/record")
+        },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 弹出层标题
+                title: "新闻访问记录信息",
+                // 是否显示弹出层
+                open: false,
+                direction:"rtl",
+                toString:[
+                ],
+                toDate:[
+                    "viewTime",
+                ],
+                // 表单校验
+                rules: {
+                    viewName: [
+                        {required: true,message: "请输入查看人名称", trigger: "blur" },
+                        {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
+                    ],
+                    viewTime: [
+                        {required: true,message: "请选择最后浏览时间" },
+                    ],
+                    createTime: [
+                        {required: true,message: "请选择创建时间" },
+                    ],
+                }
+            };
+        },
+
+        methods: {
+            /** 编辑 */
+            edit(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="news/record/edit";
+                this.getData();
+                this.pageInfo.type="edit"
+                this.title = "修改新闻访问记录信息";
+            },
+            /** 新增 */
+            add(row) {
+                this.reset()
+                this.urls.currUrl = "news/record/add";
+                this.getData();
+                this.pageInfo.type="add"
+                this.title = "新增新闻访问记录信息";
+            },
+            /** 查看*/
+            view(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="news/record/view";
+                this.getData();
+                this.pageInfo.type="view"
+                this.title = "新闻访问记录信息详细";
+            },
+            /**取消按钮 */
+            cancel() {
+                this.open = false;
+            },
+            /**获取数据后弹框 */
+            afterRender(data) {
+                this.open = true;
+            },
+
+            afterSubmit(data) {
+                this.open = false;
+                this.$emit("ok");
+            },
+
+            // 表单重置
+            reset() {
+                this.form = {
+                    newsId : null,
+                    viewName : "",
+                    sumViews : 0,
+                    remark : "",
+                    viewTime : null,
+                };
+                this.resetForm("form");
+            },
+            resetForm(refName) {
+                if (this.$refs[refName]) {
+                    this.$refs[refName].resetFields();
+                }
+            },
+        },
+    };
+</script>

enterprise-manager-ui/admin/src/views/news/record/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "NewsRecordList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/news/share/drawershow.vue

+<template>
+    <!-- 弹出框表单 -->
+    <el-drawer
+            :title="title"
+            :visible.sync="open"
+            :direction="direction"
+            :destroy-on-close="true"
+            size="50%">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+            <el-row>
+                                            <Field label="新闻ID" prop="newsId" v-model="form.newsId" placeholder="请输入新闻ID"/>
+                            <Field label="分享人名称" prop="shareName" v-model="form.shareName" placeholder="请输入分享人名称"/>
+                            <Field label="累计分享次数" prop="sumShares" v-model="form.sumShares" placeholder="请输入累计分享次数"/>
+                            <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
+                            <Field label="最近分享时间" prop="shareTime" v-model="form.shareTime" type="date" />
+
+            </el-row>
+
+            <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
+        </el-form>
+
+    </el-drawer>
+</template>
+
+<script>
+    import form from "@/assets/mixins/formdialog";
+    export default {
+        name: "NewsShareDetail",
+        mixins: [form],
+        components: {
+
+        },
+        created() {
+            this.changePath("news/share")
+        },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 弹出层标题
+                title: "新闻分享记录信息",
+                // 是否显示弹出层
+                open: false,
+                direction:"rtl",
+                toString:[
+                ],
+                toDate:[
+                    "shareTime",
+                ],
+                // 表单校验
+                rules: {
+                    shareName: [
+                        {required: true,message: "请输入分享人名称", trigger: "blur" },
+                        {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
+                    ],
+                    shareTime: [
+                        {required: true,message: "请选择最近分享时间" },
+                    ],
+                    createTime: [
+                        {required: true,message: "请选择创建时间" },
+                    ],
+                }
+            };
+        },
+
+        methods: {
+            /** 编辑 */
+            edit(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="news/share/edit";
+                this.getData();
+                this.pageInfo.type="edit"
+                this.title = "修改新闻分享记录信息";
+            },
+            /** 新增 */
+            add(row) {
+                this.reset()
+                this.urls.currUrl = "news/share/add";
+                this.getData();
+                this.pageInfo.type="add"
+                this.title = "新增新闻分享记录信息";
+            },
+            /** 查看*/
+            view(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="news/share/view";
+                this.getData();
+                this.pageInfo.type="view"
+                this.title = "新闻分享记录信息详细";
+            },
+            /**取消按钮 */
+            cancel() {
+                this.open = false;
+            },
+            /**获取数据后弹框 */
+            afterRender(data) {
+                this.open = true;
+            },
+
+            afterSubmit(data) {
+                this.open = false;
+                this.$emit("ok");
+            },
+
+            // 表单重置
+            reset() {
+                this.form = {
+                    newsId : null,
+                    shareName : "",
+                    sumShares : 0,
+                    remark : "",
+                    shareTime : null,
+                };
+                this.resetForm("form");
+            },
+            resetForm(refName) {
+                if (this.$refs[refName]) {
+                    this.$refs[refName].resetFields();
+                }
+            },
+        },
+    };
+</script>

enterprise-manager-ui/admin/src/views/news/share/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "NewsShareList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/news/view.vue

@@ -18,7 +18,7 @@
                             {{form.title}}
                         </el-descriptions-item>
                         <el-descriptions-item label="标题logo" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.titleLogoPath}}
+                            <imageUpload v-model="form.titleLogoPath" prePath="/file/preview"/>
                         </el-descriptions-item>
                         <el-descriptions-item label="内容" label-class-name="labelClass" content-class-name="contentClass">
                             <editor v-model="form.content" :min-height="256"/>
@@ -39,10 +39,12 @@
 
 <script>
     import view from "@/assets/mixins/view";
+    import ImageUpload from '@/components/ImageUpload';
     import Editor from '@/components/Editor';
     export default {
         mixins: [view],
         components: {
+            ImageUpload,
             Editor,
         },
         methods: {

enterprise-manager-ui/admin/src/views/position/drawershow.vue

+<template>
+    <!-- 弹出框表单 -->
+    <el-drawer
+            :title="title"
+            :visible.sync="open"
+            :direction="direction"
+            :destroy-on-close="true"
+            size="50%">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+            <el-row>
+                                            <Field label="分组id" prop="groupId" v-model="form.groupId" placeholder="请输入分组id"/>
+                            <Field label="分组名称" prop="groupName" v-model="form.groupName" placeholder="请输入分组名称"/>
+                            <Field label="职位编码" prop="positionCode" v-model="form.positionCode" placeholder="请输入职位编码"/>
+                            <Field label="职位名称" prop="positionName" v-model="form.positionName" placeholder="请输入职位名称"/>
+                            <Field label="节点类型" prop="type" v-model="form.type" type="select" :enumData="dict.type" placeholder="请选择节点类型"/>
+                            <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
+
+            </el-row>
+
+            <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
+        </el-form>
+
+    </el-drawer>
+</template>
+
+<script>
+    import form from "@/assets/mixins/formdialog";
+    export default {
+        name: "PositionDetail",
+        mixins: [form],
+        components: {
+
+        },
+        created() {
+            this.changePath("position")
+        },
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 弹出层标题
+                title: "职位信息",
+                // 是否显示弹出层
+                open: false,
+                direction:"rtl",
+                toString:[
+                    "type",
+                ],
+                toDate:[
+                ],
+                // 表单校验
+                rules: {
+                }
+            };
+        },
+
+        methods: {
+            /** 编辑 */
+            edit(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="position/edit";
+                this.getData();
+                this.pageInfo.type="edit"
+                this.title = "修改职位信息";
+            },
+            /** 新增 */
+            add(row) {
+                this.reset()
+                this.urls.currUrl = "position/add";
+                this.getData();
+                this.pageInfo.type="add"
+                this.title = "新增职位信息";
+            },
+            /** 查看*/
+            view(row) {
+                this.reset()
+                this.query = { id: row.id };
+                this.urls.currUrl ="position/view";
+                this.getData();
+                this.pageInfo.type="view"
+                this.title = "职位信息详细";
+            },
+            /**取消按钮 */
+            cancel() {
+                this.open = false;
+            },
+            /**获取数据后弹框 */
+            afterRender(data) {
+                this.open = true;
+            },
+
+            afterSubmit(data) {
+                this.open = false;
+                this.$emit("ok");
+            },
+
+            // 表单重置
+            reset() {
+                this.form = {
+                    groupId : null,
+                    groupName : "",
+                    positionCode : "",
+                    positionName : "",
+                    type : 1,
+                    remark : "",
+                };
+                this.resetForm("form");
+            },
+            resetForm(refName) {
+                if (this.$refs[refName]) {
+                    this.$refs[refName].resetFields();
+                }
+            },
+        },
+    };
+</script>

enterprise-manager-ui/admin/src/views/position/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "PositionList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/product/category/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "ProductCategoryList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/product/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "ProductList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -41,15 +41,15 @@
             },
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/product/question/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "ProductQuestionList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/product/view.vue

@@ -18,16 +18,16 @@
                             {{form.productSlogan}}
                         </el-descriptions-item>
                         <el-descriptions-item label="产品图标" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.productLogoPath}}
+                            <imageUpload v-model="form.productLogoPath" prePath="/file/preview"/>
                         </el-descriptions-item>
                         <el-descriptions-item label="产品封面图片" label-class-name="labelClass" content-class-name="contentClass">
                             {{form.productFacePath}}
                         </el-descriptions-item>
                         <el-descriptions-item label="产品视频,多个视频逗号分割" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.productVideoPath}}
+                            <fileUpload v-model="form.productVideoPath"  prePath="/file/fileupload"/>
                         </el-descriptions-item>
                         <el-descriptions-item label="产品宣传图片,多个视频逗号分割" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.productPicPath}}
+                            <imageUpload v-model="form.productPicPath" prePath="/file/preview"/>
                         </el-descriptions-item>
                         <el-descriptions-item label="产品介绍" label-class-name="labelClass" content-class-name="contentClass">
                             {{form.productIntroduction}}
@@ -51,9 +51,13 @@
 
 <script>
     import view from "@/assets/mixins/view";
+    import ImageUpload from '@/components/ImageUpload';
+    import FileUpload from '@/components/FileUpload';
     export default {
         mixins: [view],
         components: {
+            ImageUpload,
+            FileUpload,
         },
         methods: {
 

enterprise-manager-ui/admin/src/views/staff/drawershow.vue

@@ -78,6 +78,14 @@
                         {required: true,message: "请输入员工姓名", trigger: "blur" },
                         {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
                     ],
+                    phoneNumber: [
+                        {required: true,message: "请输入联系电话", trigger: "blur" },
+                        {max: 128,message: "最多只能录入128个字符",trigger: "blur",},
+                    ],
+                    companyIds: [
+                        {required: true,message: "请输入所属公司", trigger: "blur" },
+                        {max: 128,message: "最多只能录入128个字符",trigger: "blur",},
+                    ],
                     createTime: [
                         {required: true,message: "请选择创建时间" },
                     ],

enterprise-manager-ui/admin/src/views/staff/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "StaffList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },

enterprise-manager-ui/admin/src/views/staff/record/list.vue

@@ -4,18 +4,18 @@
                     </LayoutTable>
 
 
-        <dialog-show ref="dialogform" @ok="getData" />
+        <drawer-show ref="drawerform" @ok="getData" />
     </div>
 </template>
 
 <script>
     /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
+    import drawerShow from "./drawershow";
     import table from "@/assets/mixins/table";
     export default {
         name: "StaffRecordList",
         components: {
-            dialogShow
+            drawerShow
 },
         mixins: [table],
         created() {
@@ -23,15 +23,15 @@
         methods: {
             /** 重写新增方法 */
             toAdd(row) {
-                this.$refs.dialogform.add(row);
+                this.$refs.drawerform.add(row);
             },
             /** 重写编辑方法 */
             toEdit(row) {
-                this.$refs.dialogform.edit(row);
+                this.$refs.drawerform.edit(row);
             },
             /** 重写查看方法 */
             toView(row) {
-                this.$refs.dialogform.view(row);
+                this.$refs.drawerform.view(row);
             },
 
         },