huyuanxiang
/
nherp_vue2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix]页面优化

Browse Source
develop
huyuanxiang 2 years ago
parent 39b24b34ce
commit a5a6413c19
5 changed files with 165 additions and 95 deletions
Show Stats Download Patch File Download Diff File

1
src/components/jeecg/JImageUpload.vue
Unescape View File

@ -49,6 +49,7 @@
data(){ data(){
return { return {
uploadAction:window._CONFIG['domianURL']+"/sys/common/upload", uploadAction:window._CONFIG['domianURL']+"/sys/common/upload",
// uploadAction:'http://47.100.35.222:8080/jeecg-boot'+"/sys/common/upload",
uploadLoading:false, uploadLoading:false,
picUrl:false, picUrl:false,
headers:{}, headers:{},

2
src/utils/request.js
Unescape View File

@ -11,7 +11,7 @@ import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
* 则映射后端域名，通过 vue.config.js * 则映射后端域名，通过 vue.config.js
* @type {*|string} * @type {*|string}
*/ */
let apiBaseUrl = 'http://47.100.1.234:8080/jeecg-boot' let apiBaseUrl = 'http://47.100.35.222:8080/jeecg-boot'
// let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot"; // let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
//console.log("apiBaseUrl= ",apiBaseUrl) //console.log("apiBaseUrl= ",apiBaseUrl)
// 创建 axios 实例 // 创建 axios 实例

213
src/views/erp/BbsList.vue
Unescape View File

@ -11,8 +11,8 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</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-button type="primary" icon="download" @click="handleExportXls('评价')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
@ -68,7 +68,7 @@
</template> </template>
<span slot="action" slot-scope="text, record"> <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-divider type="vertical" />
<a-dropdown> <a-dropdown>
@ -79,7 +79,7 @@
</a-menu-item> </a-menu-item>
<a-menu-item> <a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a v-has="'erp:bbs:delete'">删除</a>
</a-popconfirm> </a-popconfirm>
</a-menu-item> </a-menu-item>
</a-menu> </a-menu>
@ -95,101 +95,132 @@
<script> <script>
import '@/assets/less/TableExpand.less' import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin' import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import BbsModal from './modules/BbsModal' import BbsModal from './modules/BbsModal'
export default { export default {
name: 'BbsList', name: 'BbsList',
mixins:[JeecgListMixin, mixinDevice], mixins:[JeecgListMixin, mixinDevice],
components: { components: {
BbsModal BbsModal
}, },
data () { data () {
return { return {
description: '评论管理页面', description: '评价管理页面',
// 表头 // 表头
columns: [ columns: [
{ {
title: '#', title: '#',
dataIndex: '', dataIndex: '',
key:'rowIndex', key:'rowIndex',
width:60, width:60,
align:"center", align:"center",
customRender:function (t,r,index) { customRender:function (t,r,index) {
return parseInt(index)+1; return parseInt(index)+1;
}
},
{
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:[], title:'内容',
} align:"center",
}, dataIndex: 'content'
created() { },
{
title:'评论时间',
align:"center",
dataIndex: 'createTime'
},
{
title:'物流打分',
align:"center",
dataIndex: 'deliveryScore'
},
{
title:'商品打分',
align:"center",
dataIndex: 'qualityScore'
},
{
title:'服务打分',
align:"center",
dataIndex: 'serviceScore'
},
{
title:'推荐打分',
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:[],
}
},
created() {
this.getSuperFieldList(); this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}, },
computed: { },
importExcelUrl: function(){ methods: {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; initDictConfig(){
},
}, },
methods: { getSuperFieldList(){
initDictConfig(){ let fieldList=[];
}, fieldList.push({type:'string',value:'content',text:'内容',dictCode:''})
getSuperFieldList(){ fieldList.push({type:'datetime',value:'createTime',text:'评论时间'})
let fieldList=[]; fieldList.push({type:'string',value:'deliveryScore',text:'物流打分，满分5星',dictCode:''})
fieldList.push({type:'string',value:'content',text:'内容',dictCode:''}) fieldList.push({type:'string',value:'qualityScore',text:'商品打分，满分5星',dictCode:''})
fieldList.push({type:'string',value:'userId',text:'用户id',dictCode:''}) fieldList.push({type:'string',value:'erviceScore',text:'服务打分，满分5星',dictCode:''})
fieldList.push({type:'string',value:'goodsName',text:'产品',dictCode:''}) fieldList.push({type:'string',value:'suggestScore',text:'是否推荐打分，满分5星',dictCode:''})
fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''}) fieldList.push({type:'string',value:'url',text:'图片url',dictCode:''})
fieldList.push({type:'string',value:'userName',text:'评论人',dictCode:''}) fieldList.push({type:'string',value:'goodsName',text:'产品',dictCode:''})
this.superFieldList = fieldList fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
} fieldList.push({type:'string',value:'userName',text:'评论人',dictCode:''})
this.superFieldList = fieldList
} }
} }
}
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>

4
src/views/erp/OrderList.vue
Unescape View File

@ -211,6 +211,10 @@
this.$message.warn('请填写物流单号') this.$message.warn('请填写物流单号')
return return
} }
if (type === "cancel" &&　[1, 2].includes(that.rowInfo.state) && !that.form.desc) {
this.$message.warn('不通过，请填写备注信息')
return
}
this.$refs.ruleForm.validate(valid => { this.$refs.ruleForm.validate(valid => {
if (valid) { if (valid) {

40
src/views/erp/modules/BbsForm.vue
Unescape View File

@ -9,8 +9,33 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item label="用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId"> <a-form-model-item label="评论时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
<a-input v-model="model.userId" placeholder="请输入用户id" ></a-input> <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="物流打分" ></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="商品打分" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="服务打分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="serviceScore">
<a-input v-model="model.serviceScore" placeholder="服务打分" ></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="推荐打分" ></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-form-model-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -65,6 +90,15 @@
}, },
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
content: [
{ required: true, message: '请输入内容!'},
],
createTime: [
{ required: true, message: '请输入评论时间!'},
],
goodsName: [
{ required: true, message: '请输入产品!'},
],
}, },
url: { url: {
add: "/erp/bbs/add", add: "/erp/bbs/add",
@ -116,7 +150,7 @@
that.confirmLoading = false; that.confirmLoading = false;
}) })
} }
}) })
}, },
} }

Write Preview
Loading…
Cancel
Save