From 0fa7650909fbfaf7697abfc0587b154e08883349 Mon Sep 17 00:00:00 2001
From: NH-LHG <lhg0612@126.com>
Date: Wed, 7 Jun 2023 11:12:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90init=E3=80=91=20=E5=88=9B=E5=BB=BAerp?=
 =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/erp/BbsList.vue         | 219 +++++++++++++++++-------------
 src/views/erp/modules/BbsForm.vue |  40 +++++-
 2 files changed, 162 insertions(+), 97 deletions(-)

diff --git a/src/views/erp/BbsList.vue b/src/views/erp/BbsList.vue
index a8c680d..61b8f66 100644
--- a/src/views/erp/BbsList.vue
+++ b/src/views/erp/BbsList.vue
@@ -11,8 +11,8 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('评论')">导出</a-button>
+      <a-button @click="handleAdd" v-has="'erp:bbs:add'" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('评价')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -68,7 +68,7 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a v-has="'erp:bbs:edit'" @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
           <a-dropdown>
@@ -79,7 +79,7 @@
               </a-menu-item>
               <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
+                  <a v-has="'erp:bbs:delete'">删除</a>
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
@@ -95,100 +95,131 @@
 
 <script>
 
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import BbsModal from './modules/BbsModal'
+    import '@/assets/less/TableExpand.less'
+    import { mixinDevice } from '@/utils/mixin'
+    import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import BbsModal from './modules/BbsModal'
 
-  export default {
-    name: 'BbsList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      BbsModal
-    },
-    data () {
-      return {
-        description: '评论管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
+    export default {
+        name: 'BbsList',
+        mixins:[JeecgListMixin, mixinDevice],
+        components: {
+            BbsModal
+        },
+        data () {
+            return {
+                description: '评价管理页面',
+                // 表头
+                columns: [
+                    {
+                        title: '#',
+                        dataIndex: '',
+                        key:'rowIndex',
+                        width:60,
+                        align:"center",
+                        customRender:function (t,r,index) {
+                            return parseInt(index)+1;
+                        }
+                    },
+                    {
+                        title:'内容',
+                        align:"center",
+                        dataIndex: 'content'
+                    },
+                    {
+                        title:'评论时间',
+                        align:"center",
+                        dataIndex: 'createTime'
+                    },
+                    {
+                        title:'物流打分，满分5星',
+                        align:"center",
+                        dataIndex: 'deliveryScore'
+                    },
+                    {
+                        title:'商品打分，满分5星',
+                        align:"center",
+                        dataIndex: 'qualityScore'
+                    },
+                    {
+                        title:'服务打分，满分5星',
+                        align:"center",
+                        dataIndex: 'erviceScore'
+                    },
+                    {
+                        title:'是否推荐打分，满分5星',
+                        align:"center",
+                        dataIndex: 'suggestScore'
+                    },
+                    {
+                        title:'图片url',
+                        align:"center",
+                        dataIndex: 'url',
+                        scopedSlots: {customRender: 'imgSlot'}
+                    },
+                    {
+                        title:'产品',
+                        align:"center",
+                        dataIndex: 'goodsName'
+                    },
+                    {
+                        title:'备注',
+                        align:"center",
+                        dataIndex: 'remark'
+                    },
+                    {
+                        title:'评论人',
+                        align:"center",
+                        dataIndex: 'userName'
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align:"center",
+                        fixed:"right",
+                        width:147,
+                        scopedSlots: { customRender: 'action' }
+                    }
+                ],
+                url: {
+                    list: "/erp/bbs/list",
+                    delete: "/erp/bbs/delete",
+                    deleteBatch: "/erp/bbs/deleteBatch",
+                    exportXlsUrl: "/erp/bbs/exportXls",
+                    importExcelUrl: "erp/bbs/importExcel",
+
+                },
+                dictOptions:{},
+                superFieldList:[],
             }
-          },
-          {
-            title:'内容',
-            align:"center",
-            dataIndex: 'content'
-          },
-          {
-            title:'用户id',
-            align:"center",
-            dataIndex: 'userId'
-          },
-          {
-            title:'产品',
-            align:"center",
-            dataIndex: 'goodsName'
-          },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
-          },
-          {
-            title:'评论人',
-            align:"center",
-            dataIndex: 'userName'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/erp/bbs/list",
-          delete: "/erp/bbs/delete",
-          deleteBatch: "/erp/bbs/deleteBatch",
-          exportXlsUrl: "/erp/bbs/exportXls",
-          importExcelUrl: "erp/bbs/importExcel",
-          
         },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'content',text:'内容',dictCode:''})
-        fieldList.push({type:'string',value:'userId',text:'用户id',dictCode:''})
-        fieldList.push({type:'string',value:'goodsName',text:'产品',dictCode:''})
-        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
-        fieldList.push({type:'string',value:'userName',text:'评论人',dictCode:''})
-        this.superFieldList = fieldList
-      }
+        created() {
+            this.getSuperFieldList();
+        },
+        computed: {
+            importExcelUrl: function(){
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+            },
+        },
+        methods: {
+            initDictConfig(){
+            },
+            getSuperFieldList(){
+                let fieldList=[];
+                fieldList.push({type:'string',value:'content',text:'内容',dictCode:''})
+                fieldList.push({type:'datetime',value:'createTime',text:'评论时间'})
+                fieldList.push({type:'string',value:'deliveryScore',text:'物流打分，满分5星',dictCode:''})
+                fieldList.push({type:'string',value:'qualityScore',text:'商品打分，满分5星',dictCode:''})
+                fieldList.push({type:'string',value:'erviceScore',text:'服务打分，满分5星',dictCode:''})
+                fieldList.push({type:'string',value:'suggestScore',text:'是否推荐打分，满分5星',dictCode:''})
+                fieldList.push({type:'string',value:'url',text:'图片url',dictCode:''})
+                fieldList.push({type:'string',value:'goodsName',text:'产品',dictCode:''})
+                fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
+                fieldList.push({type:'string',value:'userName',text:'评论人',dictCode:''})
+                this.superFieldList = fieldList
+            }
+        }
     }
-  }
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
diff --git a/src/views/erp/modules/BbsForm.vue b/src/views/erp/modules/BbsForm.vue
index c1da9bc..57c9a4e 100644
--- a/src/views/erp/modules/BbsForm.vue
+++ b/src/views/erp/modules/BbsForm.vue
@@ -9,8 +9,33 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户id"  ></a-input>
+            <a-form-model-item label="评论时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
+              <j-date placeholder="请选择评论时间"  v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="物流打分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryScore">
+              <a-input v-model="model.deliveryScore" placeholder="请输入物流打分，满分5星"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品打分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qualityScore">
+              <a-input v-model="model.qualityScore" placeholder="请输入商品打分，满分5星"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="服务打分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="erviceScore">
+              <a-input v-model="model.erviceScore" placeholder="请输入服务打分，满分5星"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否推荐打分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="suggestScore">
+              <a-input v-model="model.suggestScore" placeholder="请输入是否推荐打分，满分5星"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片url" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="url">
+              <j-image-upload isMultiple  v-model="model.url" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -65,6 +90,15 @@
         },
         confirmLoading: false,
         validatorRules: {
+           content: [
+              { required: true, message: '请输入内容!'},
+           ],
+           createTime: [
+              { required: true, message: '请输入评论时间!'},
+           ],
+           goodsName: [
+              { required: true, message: '请输入产品!'},
+           ],
         },
         url: {
           add: "/erp/bbs/add",
@@ -116,7 +150,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }