feat(goodsList): 商品列表 -移除系统类型字段
This commit is contained in:
parent
7336306eaa
commit
9470890aa5
21
src/main.js
21
src/main.js
|
|
@ -26,21 +26,20 @@ import App from './App'
|
||||||
import store from './store'
|
import store from './store'
|
||||||
import router from './router'
|
import router from './router'
|
||||||
import './utils/rem'
|
import './utils/rem'
|
||||||
import Pagination from "@/components/Pagination";
|
import Pagination from '@/components/Pagination'
|
||||||
import '@/icons' // icon
|
import '@/icons' // icon
|
||||||
import '@/permission' // permission control
|
import '@/permission' // permission control
|
||||||
//国际化
|
// 国际化
|
||||||
// import i18n from './i18n/index'
|
// import i18n from './i18n/index'
|
||||||
import i18n from '@/assets/i18n/index'
|
import i18n from '@/assets/i18n/index'
|
||||||
import permission from './directive/permission'
|
import permission from './directive/permission'
|
||||||
|
|
||||||
import * as echarts from 'echarts';
|
import * as echarts from 'echarts'
|
||||||
|
|
||||||
import moment from "moment"
|
import moment from 'moment'
|
||||||
Vue.prototype.$moment = moment;
|
Vue.prototype.$moment = moment
|
||||||
import noImgEditor from '@/components/noImgEditor'
|
import noImgEditor from '@/components/noImgEditor'
|
||||||
|
|
||||||
|
|
||||||
// 下载
|
// 下载
|
||||||
// import { download } from "@/utils/ruoyi";
|
// import { download } from "@/utils/ruoyi";
|
||||||
/**
|
/**
|
||||||
|
|
@ -59,7 +58,7 @@ if (process.env.NODE_ENV === 'production') {
|
||||||
Vue.component('Pagination', Pagination)
|
Vue.component('Pagination', Pagination)
|
||||||
Vue.component('noImgEditor', noImgEditor)
|
Vue.component('noImgEditor', noImgEditor)
|
||||||
|
|
||||||
import { download } from '@/utils/request';
|
import { download } from '@/utils/request'
|
||||||
Vue.prototype.download = download
|
Vue.prototype.download = download
|
||||||
|
|
||||||
// set ElementUI lang to EN
|
// set ElementUI lang to EN
|
||||||
|
|
@ -67,19 +66,19 @@ Vue.use(ElementUI, { locale })
|
||||||
// 如果想要中文版 element-ui,按如下方式声明
|
// 如果想要中文版 element-ui,按如下方式声明
|
||||||
// Vue.use(ElementUI)
|
// Vue.use(ElementUI)
|
||||||
|
|
||||||
import { numberToCurrencyNo, isDollar, isLocal,stateFormat,isLocalSymbol } from '@/utils/numberToCurrency'
|
import { numberToCurrencyNo, isDollar, isLocal, stateFormat, isLocalSymbol } from '@/utils/numberToCurrency'
|
||||||
Vue.prototype.stateFormat = stateFormat
|
Vue.prototype.stateFormat = stateFormat
|
||||||
Vue.prototype.isLocalSymbol = isLocalSymbol
|
Vue.prototype.isLocalSymbol = isLocalSymbol
|
||||||
Vue.prototype.systemTypes = [{value:0, label:'会员系统'},{value:1, label:'海圣优选'}]
|
Vue.prototype.systemTypes = []
|
||||||
// 配置全局过滤器,实现数字千分位格式
|
// 配置全局过滤器,实现数字千分位格式
|
||||||
Vue.filter('numberToCurrency', numberToCurrencyNo)
|
Vue.filter('numberToCurrency', numberToCurrencyNo)
|
||||||
//海外pv添加美元
|
// 海外pv添加美元
|
||||||
Vue.filter('isDollar', isDollar)
|
Vue.filter('isDollar', isDollar)
|
||||||
// 海外添加当地币
|
// 海外添加当地币
|
||||||
Vue.filter('isLocal', isLocal)
|
Vue.filter('isLocal', isLocal)
|
||||||
|
|
||||||
Vue.use(permission)
|
Vue.use(permission)
|
||||||
Vue.prototype.$echarts = echarts;
|
Vue.prototype.$echarts = echarts
|
||||||
|
|
||||||
Vue.config.productionTip = false
|
Vue.config.productionTip = false
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,18 +35,6 @@
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
|
||||||
<el-form-item :label="$t('系统类型')">
|
|
||||||
<el-select v-model="select.systemType" clearable>
|
|
||||||
<el-option
|
|
||||||
v-for="item in systemTypes"
|
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
|
||||||
:value="item.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item :label="'上架状态'">
|
<el-form-item :label="'上架状态'">
|
||||||
<el-select v-model="select.isPutOn" clearable>
|
<el-select v-model="select.isPutOn" clearable>
|
||||||
|
|
@ -502,21 +490,7 @@
|
||||||
prop="actualSales"
|
prop="actualSales"
|
||||||
:label="'实际销量'"
|
:label="'实际销量'"
|
||||||
/>
|
/>
|
||||||
<el-table-column
|
|
||||||
align="center"
|
|
||||||
prop="systemType"
|
|
||||||
:label="$t('系统类型')"
|
|
||||||
>
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<div
|
|
||||||
v-for="item in systemTypes"
|
|
||||||
v-if="scope.row.systemType == item.value"
|
|
||||||
:key="item.value"
|
|
||||||
>
|
|
||||||
{{ item.label }}
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center"
|
align="center"
|
||||||
width="120"
|
width="120"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue