Skip to content

S
saas-manage
Commit 4f757e05 by zhuzhequan
Options

Merge branch 'dev' into 'master' 

样式修改

See merge request !42
parents 97279c64 3fb0b51c
Showing with 561 additions and 573 deletions
src/views/system/abbreviation.vue
<template>
<div class='wraper'>
<div class='page_left'>
<div class="wraper">
<div class="page_left">
<el-tree
:data='treeData'
:props='defaultProps'
:data="treeData"
:props="defaultProps"
highlight-current
ref='tree'
ref="tree"
:node-key="'continentCode'"
current-node-key=''
@node-click='handleNodeClick'>
<span class='custom-tree-node' slot-scope='{ node }'>
<span v-html='node.label'></span>
current-node-key=""
@node-click="handleNodeClick">
<span class="custom-tree-node" slot-scope="{ node }">
<span v-html="node.label"></span>
</span>
</el-tree>
</div>
<div class='page_right'>
<el-form :inline='true' size='mini' :model='searchForm' class='search_form'>
<el-form-item label='国家代码'>
<el-select v-model='searchForm.countryCode' filterable clearable placeholder='国家代码'>
<div class="page_right">
<el-form
:inline="true"
size="mini"
:model="searchForm"
class="search_form">
<el-form-item label="国家代码">
<el-select
v-model="searchForm.countryCode"
filterable
clearable
placeholder="国家代码">
<el-option
v-for='(item,index) in countryList'
:key='index'
v-for="(item, index) in countryList"
:key="index"
:label="item.nameCn + '(' + item.countryCode + ')'"
:value='item.countryCode'>
</el-option>
:value="item.countryCode"></el-option>
</el-select>
</el-form-item>
<el-form-item label='州/省编码'>
<el-form-item label="州/省编码">
<el-input
v-model='searchForm.provinceCode'
placeholder='中文名称'
style='width: 120px'
v-model="searchForm.provinceCode"
placeholder="中文名称"
style="width: 120px"
clearable></el-input>
</el-form-item>
<el-form-item label='州/省英文名称'>
<el-form-item label="州/省英文名称">
<el-input
v-model='searchForm.province'
placeholder='英文名称'
style='width: 120px'
v-model="searchForm.province"
placeholder="英文名称"
style="width: 120px"
clearable></el-input>
</el-form-item>
<el-form-item label=''>
<el-button type='primary' @click='getList()'>查询</el-button>
<el-form-item label="">
<el-button :loading="searchLoading" type="primary" @click="getList()">
查询
</el-button>
</el-form-item>
<el-form-item>
<el-button type='success' @click='addDialog(1)'>新增</el-button>
<el-button type="success" @click="addDialog(1)">新增</el-button>
</el-form-item>
<el-form-item>
<el-button type='danger' @click='deleteSection()'>删除</el-button>
<el-button
:loading="delLoading"
type="danger"
@click="deleteSection()">
删除
</el-button>
</el-form-item>
</el-form>
<div class='my-table-cont my-flex-1'>
<div class="my-table-cont my-flex-1">
<my-table
:sourceData='userData'
ref='multipleTable'
:selection='true'
:tableColumns='tableColumns'
@selectionChange='selectionChange'
@current-change='currentTabFn'></my-table>
:sourceData="userData"
ref="multipleTable"
:selection="true"
:tableColumns="tableColumns"
@selectionChange="selectionChange"
@current-change="currentTabFn"></my-table>
</div>
<pagination
:setValue='setpaginationOptions'
:options='paginationOptions' />
:setValue="setpaginationOptions"
:options="paginationOptions" />
</div>
<!-- 弹出层 -->
<el-dialog
:close-on-click-modal='false'
:close-on-click-modal="false"
:title="is_title === 1 ? '新增' : '编辑'"
:visible.sync='dialogVisible'
width='700px'>
:visible.sync="dialogVisible"
width="700px">
<el-form
label-position='right'
label-width='130px'
size='mini'
:inline='true'
:model='addcurrencyform'
:rules='addrules'
ref='addcurrencyform'>
<el-row type='flex' class='row-bg' justify='center'>
label-position="right"
label-width="130px"
size="mini"
:inline="true"
:model="addcurrencyform"
:rules="addrules"
ref="addcurrencyform">
<el-row type="flex" class="row-bg" justify="center">
<el-col>
<el-form-item label='国家代码' prop='countryCode'>
<el-select v-model='addcurrencyform.countryCode' filterable placeholder='国家代码' style='width: 164px'>
<el-form-item label="国家代码" prop="countryCode">
<el-select
v-model="addcurrencyform.countryCode"
filterable
placeholder="国家代码"
style="width: 164px">
<el-option
v-for='(item,index) in countryList'
:key='index'
v-for="(item, index) in countryList"
:key="index"
:label="item.nameCn + '(' + item.countryCode + ')'"
:value='item.countryCode'>
</el-option>
:value="item.countryCode"></el-option>
</el-select>
</el-form-item>
<el-form-item label='州/省编码' prop='provinceCode'>
<el-form-item label="州/省编码" prop="provinceCode">
<el-input
v-model='addcurrencyform.provinceCode'
placeholder='请输入州/省编码'></el-input>
v-model="addcurrencyform.provinceCode"
placeholder="请输入州/省编码"></el-input>
</el-form-item>
<el-form-item label='州/省英文名称' prop='province'>
<el-form-item label="州/省英文名称" prop="province">
<el-input
v-model='addcurrencyform.province'
placeholder='请输入州/省英文名称'></el-input>
v-model="addcurrencyform.province"
placeholder="请输入州/省英文名称"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot='footer'>
<span slot="footer">
<el-button
@click='dialogVisible = false'
size='mini'
style='width: 130px'>
@click="dialogVisible = false"
size="mini"
style="width: 130px">
取消
</el-button>
<el-button
type='primary'
@click='addCurrency()'
size='mini'
style='width: 130px'>
type="primary"
@click="addCurrency()"
size="mini"
style="width: 130px">
确认
</el-button>
</span>
......@@ -127,23 +144,25 @@ import MyTable from '@/common/components/base/tableView.vue'
export default {
name: 'system_abbreviation',
components: {
MyTable,
MyTable
},
data() {
return {
paginationOptions: {
currentPage: 1,
total: 0,
pageSize: 100,
pageSize: 100
},
is_title: 1,
searchLoading: false,
delLoading: false,
userData: [],
dialogVisible: false,
addcurrencyform: {
id: '',
countryCode: '',
provinceCode: '',
province: '',
province: ''
},
continentList: [],
countryList: [],
......@@ -155,34 +174,34 @@ export default {
{
required: true,
message: '请输入国家代码',
trigger: 'blur',
},
trigger: 'blur'
}
],
province: [
{
required: true,
message: '请输入州/省名称',
trigger: 'blur',
},
trigger: 'blur'
}
],
provinceCode: [
{
required: true,
message: '请输入州/省编码',
trigger: 'change',
},
],
trigger: 'change'
}
]
},
treeData: [],
defaultProps: {
children: 'children',
label: 'continentName',
label: 'continentName'
},
searchForm: {
countryCode: '',
province: '',
provinceCode: '',
},
provinceCode: ''
}
}
},
created() {
......@@ -197,19 +216,19 @@ export default {
return [
{
label: '国家代码',
key: 'countryCode',
key: 'countryCode'
},
{
label: '国家名称',
key: 'nameCn',
key: 'nameCn'
},
{
label: '州/省编码',
key: 'provinceCode',
key: 'provinceCode'
},
{
label: '州/省英文名',
key: 'province',
key: 'province'
},
{
label: '相关操作',
......@@ -217,32 +236,30 @@ export default {
width: 80,
render: (item) => (
<div>
{(
<span class='icon-view icon-edit-view' title='编辑'>
{
<span class="icon-view icon-edit-view" title="编辑">
<i
class='el-icon-edit'
class="el-icon-edit"
onClick={() => this.addDialog(2, item)}></i>
</span>
)}
{(
<span class='icon-view icon-del-view' title='删除'>
}
{
<span class="icon-view icon-del-view" title="删除">
<i
class='el-icon-delete-solid'
class="el-icon-delete-solid"
onClick={() => this.deleteSection(item)}></i>
</span>
)}
}
</div>
),
},
)
}
]
},
}
},
methods: {
loadTreeData() {
get('common/commonCountryCode/findByContinent').then((res) => {
this.treeData = [
...res.data,
]
this.treeData = [...res.data]
if (this.treeData.length > 0) {
this.treeStatus = this.treeData[0].continentCode
}
......@@ -262,8 +279,8 @@ export default {
post('common/commonCountryCode/list_page', {
currentPage: 1,
pageSize: 1000,
continentCode: this.treeStatus,
}).then(res => {
continentCode: this.treeStatus
}).then((res) => {
if (res.code === 200) {
this.countryList = res.data.records
if (this.countryList.length > 0 && this.treeStatus === 'NA') {
......@@ -294,7 +311,7 @@ export default {
} else {
this.$nextTick(() => {
this.addcurrencyform = JSON.parse(
JSON.stringify(this.addcurrencyform2),
JSON.stringify(this.addcurrencyform2)
)
})
}
......@@ -319,25 +336,28 @@ export default {
* @description {查询}
*/
getList() {
const {
pageSize,
currentPage,
} = this.paginationOptions
const { pageSize, currentPage } = this.paginationOptions
this.searchLoading = true
post('common/commonProvinceData/list_page', {
pageSize,
currentPage,
...this.searchForm,
continentCode: this.treeStatus,
}).then((res) => {
if (res.code === 200) {
this.userData = res.data.records
this.paginationOptions.total = res.data.total
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true,
})
}
continentCode: this.treeStatus
})
.then((res) => {
if (res.code === 200) {
this.userData = res.data.records
this.paginationOptions.total = res.data.total
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true
})
}
this.searchLoading = false
})
.catch(() => {
this.searchLoading = false
})
},
/**
* @description {部门职员查询}
......@@ -357,7 +377,7 @@ export default {
this.dialogVisible = true
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true,
dangerouslyUseHTMLString: true
})
}
})
......@@ -372,12 +392,12 @@ export default {
this.dialogVisible = false
this.$message({
message: '修改成功',
type: 'success',
type: 'success'
})
this.getList(this.currentPage)
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true,
dangerouslyUseHTMLString: true
})
}
})
......@@ -392,12 +412,12 @@ export default {
this.dialogVisible = false
this.$message({
message: '添加成功',
type: 'success',
type: 'success'
})
this.getList(this.currentPage)
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true,
dangerouslyUseHTMLString: true
})
}
})
......@@ -425,28 +445,31 @@ export default {
this.$confirm('确定删除选中的信息？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
type: 'warning'
})
.then(() => {
this.delLoading = true
const url = `common/commonProvinceData/delete?ids=${ids}`
get(url).then((res) => {
if (res.code === 200) {
this.$message({
type: 'success',
message: '删除成功!',
message: '删除成功!'
})
this.getList(this.currentPage)
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true,
dangerouslyUseHTMLString: true
})
}
this.delLoading = false
})
})
.catch(() => {
this.delLoading = false
})
},
},
}
}
}
</script>
<style lang='scss' scoped>
......
src/views/system/announceManage.vue
......@@ -6,8 +6,7 @@
size="mini"
v-enter-submit="search"
@submit.native.prevent
:inline="true"
>
:inline="true">
<el-form-item label="创建时间">
<el-date-picker
style="width: 164px"
......@@ -15,8 +14,7 @@
align="right"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
></el-date-picker>
value-format="yyyy-MM-dd"></el-date-picker>
<!-- <el-input v-model="searchForm.time"></el-input> -->
</el-form-item>
<el-form-item label="创建人">
......@@ -24,142 +22,102 @@
v-model="searchForm.creator"
placeholder="请选择"
clearable
filterable
>
filterable>
<el-option
v-for="user in userList"
:key="user.id"
:label="user.realName"
:value="user.id"
></el-option>
:value="user.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label>
<el-button
type="primary"
:loading="searchLoading"
native-type="submit"
@click="search()"
>
@click="search()">
查询
</el-button>
</el-form-item>
<el-form-item label>
<el-button type="success" @click="editDialog()"
>新增</el-button
>
<el-button type="success" @click="editDialog()">新增</el-button>
</el-form-item>
</el-form>
<div class="table_wrap" style="padding: 0">
<table-view
:sourceData="sourceData"
:serialNumber="false"
:tableColumns="tableColumns"
></table-view>
:tableColumns="tableColumns"></table-view>
</div>
<pagination
:setValue="setpaginationOptions"
:options="paginationOptions"
/>
<pagination :setValue="setpaginationOptions" :options="paginationOptions" />
<el-dialog
:title="isEdit ? '编辑' : '新增'"
:close-on-click-modal="false"
:visible.sync="dialogVisible"
width="900px"
>
width="900px">
<el-form
:model="editForm"
:inline="true"
label-width="80px"
:rules="addrules"
size="mini"
ref="editForm"
>
<el-form-item
label="标题"
size="small"
prop="title"
>
<el-input
style="width: 530px"
v-model="editForm.title"
></el-input>
ref="editForm">
<el-form-item label="标题" size="small" prop="title">
<el-input style="width: 530px" v-model="editForm.title"></el-input>
<el-checkbox
style="margin-left: 20px"
v-model="editForm.titleWeight"
label="粗体"
></el-checkbox>
label="粗体"></el-checkbox>
</el-form-item>
<el-form-item label>
<el-color-picker
style="vertical-align: text-top"
v-model="editForm.titleColor"
></el-color-picker>
v-model="editForm.titleColor"></el-color-picker>
</el-form-item>
<br />
<el-form-item label="置顶">
<el-switch
v-model="editForm.priority"
></el-switch>
<el-switch v-model="editForm.priority"></el-switch>
</el-form-item>
</el-form>
<v-editor
filename="files"
v-model="editForm.content"
ref="wangeditor"
height="300px"
/>
height="300px" />
<div slot="footer">
<el-button
@click="dialogVisible = false"
size="mini"
>取 消</el-button
>
<el-button
type="primary"
@click="submit"
size="mini"
>确 定</el-button
>
<el-button @click="dialogVisible = false" size="mini">取 消</el-button>
<el-button type="primary" @click="submit" size="mini">确 定</el-button>
</div>
</el-dialog>
<el-dialog
:visible.sync="releaseVisible"
:close-on-click-modal="false"
title="发布"
width="600px"
>
width="600px">
<el-checkbox
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
>全选</el-checkbox
>
@change="handleCheckAllChange">
全选
</el-checkbox>
<div style="margin: 15px 0"></div>
<el-checkbox-group
v-model="checkedCompany"
@change="handleCheckedCompanyChange"
>
@change="handleCheckedCompanyChange">
<el-checkbox
style="width: 100px"
v-for="c in releaseList"
:label="c.id"
:key="c.id"
>{{ c.apiName }}</el-checkbox
>
:key="c.id">
{{ c.apiName }}
</el-checkbox>
</el-checkbox-group>
<span slot="footer">
<el-button
size="mini"
@click="releaseVisible = false"
>取消</el-button
>
<el-button
size="mini"
@click="confirmRelease"
type="primary"
>确认</el-button
>
<el-button size="mini" @click="releaseVisible = false">取消</el-button>
<el-button size="mini" @click="confirmRelease" type="primary">
确认
</el-button>
</span>
</el-dialog>
</div>
......@@ -176,6 +134,7 @@ export default {
return {
checkAll: false,
isIndeterminate: false,
searchLoading: false,
checkedCompany: [],
userList: [],
pageSize: 50,
......@@ -184,32 +143,32 @@ export default {
paginationOptions: {
pageSize: 100,
currentPage: 1,
total: 0,
total: 0
},
addrules: {
title: [
{
required: true,
message: '请输入标题',
trigger: 'blur',
},
],
trigger: 'blur'
}
]
},
sourceData: [],
searchForm: {},
isEdit: false,
dialogVisible: false,
editForm: {
title: '',
title: ''
},
defaultEditFrom: {
title: '',
enableFlag: false,
content: '',
priority: false,
priority: false
},
releaseVisible: false,
releaseList: [],
releaseList: []
}
},
mounted() {
......@@ -227,12 +186,11 @@ export default {
<span
style={{
color: item.titleColor,
fontWeight: item.titleWeight ? 'bold' : '',
}}
>
fontWeight: item.titleWeight ? 'bold' : ''
}}>
{item.title}
</span>
),
)
},
{ label: '创建人', key: 'creatorName' },
{ label: '创建时间', key: 'creationTime' },
......@@ -241,11 +199,7 @@ export default {
label: '是否发布',
key: 'enableFlag',
width: 100,
render: (item) => (
<span>
{item.enableFlag ? '已发布' : '未发布'}
</span>
),
render: (item) => <span>{item.enableFlag ? '已发布' : '未发布'}</span>
},
{
label: '操作',
......@@ -256,8 +210,7 @@ export default {
<span
class="icon-view icon-edit-view"
title="编辑"
onClick={() => this.editDialog(item)}
>
onClick={() => this.editDialog(item)}>
<i class="el-icon-edit"></i>
</span>
)}
......@@ -265,8 +218,7 @@ export default {
<span
class="icon-view icon-primary-view"
title="发布"
onClick={() => this.release(item)}
>
onClick={() => this.release(item)}>
<i class="el-icon-s-promotion"></i>
</span>
)}
......@@ -274,31 +226,26 @@ export default {
<span
class="icon-view icon-del-view"
title="删除"
onClick={() => this.deleteAnnounces(item)}
>
onClick={() => this.deleteAnnounces(item)}>
<i class="el-icon-delete"></i>
</span>
)}
</div>
),
},
)
}
]
},
}
},
methods: {
handleCheckAllChange(val) {
this.checkedCompany = val
? this.releaseList.map((e) => e.id)
: []
this.checkedCompany = val ? this.releaseList.map((e) => e.id) : []
this.isIndeterminate = false
},
handleCheckedCompanyChange(value) {
const checkedCount = value.length
this.checkAll =
checkedCount === this.releaseList.length
this.checkAll = checkedCount === this.releaseList.length
this.isIndeterminate =
checkedCount > 0 &&
checkedCount < this.releaseList.length
checkedCount > 0 && checkedCount < this.releaseList.length
},
search() {
this.getList()
......@@ -319,16 +266,22 @@ export default {
},
async getList() {
try {
const { pageSize, currentPage } =
this.paginationOptions
const res = await post('sys/announcement/list', {
pageSize,
currentPage,
...this.searchForm,
})
if (res.code !== 200) return
this.sourceData = res.data.records
this.paginationOptions.total = res.data.total
const { pageSize, currentPage } = this.paginationOptions
this.searchLoading = true
try {
const res = await post('sys/announcement/list', {
pageSize,
currentPage,
...this.searchForm
})
this.searchLoading = false
if (res.code !== 200) return
this.sourceData = res.data.records
this.paginationOptions.total = res.data.total
} catch (e) {
this.searchLoading = false
}
} catch (e) {
console.error(e)
}
......@@ -340,22 +293,18 @@ export default {
async editDialog(item) {
if (item) {
try {
const res = await get(
'sys/announcement/get/' + item.id,
)
const res = await get('sys/announcement/get/' + item.id)
if (res.code !== 200) return
this.editForm = {
...this.editForm,
...res.data,
...res.data
}
this.isEdit = true
} catch (e) {
console.error(e)
}
} else {
this.editForm = JSON.parse(
JSON.stringify(this.defaultEditFrom),
)
this.editForm = JSON.parse(JSON.stringify(this.defaultEditFrom))
this.$nextTick(() => {
this.$refs.editForm.clearValidate()
})
......@@ -387,7 +336,7 @@ export default {
try {
const res = await post('sys/announcement/edit', {
id: item.id,
enableFlag: val,
enableFlag: val
})
if (res.code !== 200) return
this.$message.success(res.message)
......@@ -410,9 +359,7 @@ export default {
},
async deleteAnnounces(item) {
try {
const res = await get(
'sys/announcement/delete/' + item.id,
)
const res = await get('sys/announcement/delete/' + item.id)
if (res.code !== 200) return
this.$message.success(res.message)
this.getList()
......@@ -427,7 +374,7 @@ export default {
try {
const res = await post('sys/announcement/publish', {
id: this.rowId,
dataSourcelist: this.checkedCompany,
dataSourcelist: this.checkedCompany
})
if (res.code !== 200) return
this.$message.success(res.message)
......@@ -436,8 +383,8 @@ export default {
} catch (e) {
console.error(e)
}
},
},
}
}
}
</script>
<style scoped>
......
src/views/system/category-style.vue
......@@ -23,10 +23,14 @@
<el-button type="success" @click="addDialog(1)">新增</el-button>
</el-form-item>
<el-form-item style="margin-bottom: 0px">
<el-button type="danger" @click="deleteSection()">删除</el-button>
<el-button :loading="delLoading" type="danger" @click="deleteSection()">
删除
</el-button>
</el-form-item>
<el-form-item style="margin-bottom: 0px">
<el-button type="warning" @click="getList(1)">刷新</el-button>
<el-button :loading="searchLoading" type="warning" @click="getList">
刷新
</el-button>
</el-form-item>
<el-form-item style="margin-bottom: 0px">
<el-button type="primary" @click="importExcel">导入</el-button>
......@@ -245,6 +249,8 @@ export default {
is_title: 1,
sourceData: [],
dialogVisible: false,
delLoading: false,
refreshLoading: false,
addcurrencyform: {
code: '',
id: '',
......@@ -494,6 +500,7 @@ export default {
handleClick(v) {
this.is_tab = v
this.selections = []
this.sourceData = []
this.getList(1)
},
currentTabFn(val) {
......@@ -544,6 +551,7 @@ export default {
getList() {
if (this.is_tab === '2') {
const { pageSize, currentPage } = this.paginationOptions
this.searchLoading = true
axios
.get('baseStyleInfo/list_page', {
params: {
......@@ -563,6 +571,10 @@ export default {
dangerouslyUseHTMLString: true
})
}
this.searchLoading = false
})
.catch(() => {
this.searchLoading = false
})
} else {
this.alllist('baseCategoryInfo/tree_list', 'sourceData')
......@@ -643,6 +655,7 @@ export default {
type: 'warning'
})
.then(() => {
if (!v) this.delLoading = true
const text =
this.is_tab === '1' ? 'baseCategoryInfo' : 'baseStyleInfo'
const url = `${text}/delete?ids=${ids}`
......@@ -654,11 +667,15 @@ export default {
})
this.getList(this.currentPage)
}
if (!v) this.delLoading = false
})
})
.catch(() => {})
.catch(() => {
if (!v) this.delLoading = false
})
},
alllist(url, arr) {
this.searchLoading = true
axios.get(url, { baseURL: '/api/manage/rest' }).then((res) => {
if (res.code === 200) {
this[arr] = res.data
......@@ -672,6 +689,7 @@ export default {
dangerouslyUseHTMLString: true
})
}
this.searchLoading = false
})
}
}
......
src/views/system/countryCode.vue
<template>
<div class='wraper'>
<div class='page_left'>
<div class="wraper">
<div class="page_left">
<el-tree
:data='treeData'
:props='defaultProps'
:data="treeData"
:props="defaultProps"
highlight-current
:node-key="'continentCode'"
current-node-key=''
@node-click='handleNodeClick'>
<span class='custom-tree-node' slot-scope='{ node, data }'>
<span v-html='node.label'></span>
current-node-key=""
@node-click="handleNodeClick">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span v-html="node.label"></span>
<span>({{ data.quantity }})</span>
</span>
</el-tree>
</div>
<div class='page_right'>
<el-form :inline='true' size='mini' :model='searchForm' class='search_form'>
<el-form-item label='国家代码' prop=''>
<div class="page_right">
<el-form
:inline="true"
size="mini"
:model="searchForm"
class="search_form">
<el-form-item label="国家代码" prop="">
<el-input
v-model='searchForm.countryCode'
placeholder='国家代码'
style='width: 120px'
v-model="searchForm.countryCode"
placeholder="国家代码"
style="width: 120px"
clearable></el-input>
</el-form-item>
<el-form-item label='国家中文名称' prop=''>
<el-form-item label="国家中文名称" prop="">
<el-input
v-model='searchForm.nameCn'
placeholder='中文名称'
style='width: 120px'
v-model="searchForm.nameCn"
placeholder="中文名称"
style="width: 120px"
clearable></el-input>
</el-form-item>
<el-form-item label='国家英文名称' prop=''>
<el-form-item label="国家英文名称" prop="">
<el-input
v-model='searchForm.nameEn'
placeholder='英文名称'
style='width: 120px'
v-model="searchForm.nameEn"
placeholder="英文名称"
style="width: 120px"
clearable></el-input>
</el-form-item>
<el-form-item label=''>
<el-button type='primary' @click='getList()'>查询</el-button>
<el-form-item label="">
<el-button :loading="searchLoading" type="primary" @click="getList()">
查询
</el-button>
</el-form-item>
<el-form-item>
<el-button type='success' @click='addDialog(1)'>新增</el-button>
<el-button type="success" @click="addDialog(1)">新增</el-button>
</el-form-item>
<el-form-item>
<el-button type='danger' @click='deleteSection()'>删除</el-button>
<el-button
:loading="delLoading"
type="danger"
@click="deleteSection()">
删除
</el-button>
</el-form-item>
</el-form>
<div class='my-table-cont my-flex-1'>
<div class="my-table-cont my-flex-1">
<my-table
:sourceData='userData'
ref='multipleTable'
:selection='true'
:tableColumns='tableColumns'
@selectionChange='selectionChange'
@current-change='currentTabFn'></my-table>
:sourceData="userData"
ref="multipleTable"
:selection="true"
:tableColumns="tableColumns"
@selectionChange="selectionChange"
@current-change="currentTabFn"></my-table>
</div>
<pagination
:setValue='setpaginationOptions'
:options='paginationOptions' />
:setValue="setpaginationOptions"
:options="paginationOptions" />
</div>
<!-- 弹出层 -->
<el-dialog
:close-on-click-modal='false'
:close-on-click-modal="false"
:title="is_title === 1 ? '新增' : '编辑'"
:visible.sync='dialogVisible'
width='700px'>
:visible.sync="dialogVisible"
width="700px">
<el-form
label-position='right'
label-width='130px'
size='mini'
:inline='true'
:model='addcurrencyform'
:rules='addrules'
ref='addcurrencyform'>
<el-row type='flex' class='row-bg' justify='center'>
label-position="right"
label-width="130px"
size="mini"
:inline="true"
:model="addcurrencyform"
:rules="addrules"
ref="addcurrencyform">
<el-row type="flex" class="row-bg" justify="center">
<el-col>
<el-form-item label='国家代码' prop='countryCode'>
<el-form-item label="国家代码" prop="countryCode">
<el-input
v-model='addcurrencyform.countryCode'
placeholder='请输入国家代码'></el-input>
v-model="addcurrencyform.countryCode"
placeholder="请输入国家代码"></el-input>
</el-form-item>
<el-form-item label='速卖通代码' prop='aeCountryCode'>
<el-form-item label="速卖通代码" prop="aeCountryCode">
<el-input
v-model='addcurrencyform.aeCountryCode'
placeholder='请输入国家代码'></el-input>
v-model="addcurrencyform.aeCountryCode"
placeholder="请输入国家代码"></el-input>
</el-form-item>
<el-form-item label='洲' prop='continentCode'>
<el-form-item label="洲" prop="continentCode">
<el-select
v-model='addcurrencyform.continentCode'
style='width: 164px'
placeholder='请选择洲'
v-model="addcurrencyform.continentCode"
style="width: 164px"
placeholder="请选择洲"
filterable>
<el-option
v-for='item in continentList'
:key='item.code'
v-for="item in continentList"
:key="item.code"
:label="item.cName + '(' + item.code + ')'"
:value='item.code'>
:value="item.code">
{{ item.cName }}({{ item.code }})
</el-option>
</el-select>
</el-form-item>
<el-form-item label='需要州/省简称' prop='needProviceAbbr'>
<el-form-item label="需要州/省简称" prop="needProviceAbbr">
<el-radio-group v-model="addcurrencyform.needProviceAbbr">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label='中文名称' prop='nameCn'>
<el-form-item label="中文名称" prop="nameCn">
<el-input
v-model='addcurrencyform.nameCn'
placeholder='请输入国家中文名称'></el-input>
v-model="addcurrencyform.nameCn"
placeholder="请输入国家中文名称"></el-input>
</el-form-item>
<el-form-item label='英文名称' prop='nameEn'>
<el-form-item label="英文名称" prop="nameEn">
<el-input
v-model='addcurrencyform.nameEn'
placeholder='国家英文名称'></el-input>
v-model="addcurrencyform.nameEn"
placeholder="国家英文名称"></el-input>
</el-form-item>
<el-form-item label='国际电话区号' prop='telephoneAreaCode'>
<el-form-item label="国际电话区号" prop="telephoneAreaCode">
<el-input
v-model='addcurrencyform.telephoneAreaCode'
placeholder='国际电话区号'></el-input>
v-model="addcurrencyform.telephoneAreaCode"
placeholder="国际电话区号"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot='footer'>
<span slot="footer">
<el-button
@click='dialogVisible = false'
size='mini'
style='width: 130px'>
@click="dialogVisible = false"
size="mini"
style="width: 130px">
取消
</el-button>
<el-button
type='primary'
@click='addCurrency()'
size='mini'
style='width: 130px'>
type="primary"
@click="addCurrency()"
size="mini"
style="width: 130px">
确认
</el-button>
</span>
......@@ -150,16 +161,17 @@ import MyTable from '@/common/components/base/tableView.vue'
export default {
name: 'basics_countryCode',
components: {
MyTable,
MyTable
},
data() {
return {
paginationOptions: {
currentPage: 1,
total: 0,
pageSize: 100,
pageSize: 100
},
searchLoading: false,
delLoading: false,
is_title: 1,
userData: [],
dialogVisible: false,
......@@ -168,7 +180,7 @@ export default {
countryCode: '',
nameCn: '',
nameEn: '',
needProviceAbbr: '1',
needProviceAbbr: '1'
},
continentList: [],
selection: [],
......@@ -179,53 +191,55 @@ export default {
{
required: true,
message: '请输入国家代码',
trigger: 'blur',
},
trigger: 'blur'
}
],
aeCountryCode: [
{
required: true,
message: '请输入速卖通代码',
trigger: 'blur',
},
trigger: 'blur'
}
],
continentCode: [
{
required: true,
message: '请输入洲',
trigger: 'change',
},
trigger: 'change'
}
],
needProviceAbbr: [
{
required: true,
message: '请选择',
trigger: 'change',
},
trigger: 'change'
}
],
nameCn: [
{
required: true,
message: '请输入中文名称',
trigger: 'blur',
},
trigger: 'blur'
}
],
nameEn: [{
required: true,
message: '请输入英文名称',
trigger: 'blur',
}],
nameEn: [
{
required: true,
message: '请输入英文名称',
trigger: 'blur'
}
]
},
treeData: [],
defaultProps: {
children: 'children',
label: 'continentName',
label: 'continentName'
},
searchForm: {
countryCode: '',
nameCn: '',
nameEn: '',
},
nameEn: ''
}
}
},
created() {
......@@ -241,28 +255,28 @@ export default {
return [
{
label: '国家代码',
key: 'countryCode',
key: 'countryCode'
},
{
label: '速卖通代码',
key: 'aeCountryCode',
key: 'aeCountryCode'
},
{
label: '洲',
key: 'continentCode',
render: (item) => item.nameCn + '(' + item.nameEn + ')',
render: (item) => item.nameCn + '(' + item.nameEn + ')'
},
{
label: '国家中文名称',
key: 'nameCn',
key: 'nameCn'
},
{
label: '国家英文名称',
key: 'nameEn',
key: 'nameEn'
},
{
label: '国际电话区号',
key: 'telephoneAreaCode',
key: 'telephoneAreaCode'
},
{
label: '相关操作',
......@@ -270,25 +284,25 @@ export default {
width: 80,
render: (item) => (
<div>
{(
<span class='icon-view icon-edit-view' title='编辑'>
{
<span class="icon-view icon-edit-view" title="编辑">
<i
class='el-icon-edit'
class="el-icon-edit"
onClick={() => this.addDialog(2, item)}></i>
</span>
)}
{(
<span class='icon-view icon-del-view' title='删除'>
}
{
<span class="icon-view icon-del-view" title="删除">
<i
class='el-icon-delete-solid'
class="el-icon-delete-solid"
onClick={() => this.deleteSection(item)}></i>
</span>
)}
}
</div>
),
},
)
}
]
},
}
},
methods: {
loadTreeData() {
......@@ -300,9 +314,9 @@ export default {
{
continentCode: '',
quantity: totalData,
continentName: '全部',
continentName: '全部'
},
...res.data,
...res.data
]
})
},
......@@ -331,7 +345,7 @@ export default {
} else {
this.$nextTick(() => {
this.addcurrencyform = JSON.parse(
JSON.stringify(this.addcurrencyform2),
JSON.stringify(this.addcurrencyform2)
)
})
}
......@@ -356,25 +370,28 @@ export default {
* @description {查询}
*/
getList() {
const {
pageSize,
currentPage,
} = this.paginationOptions
const { pageSize, currentPage } = this.paginationOptions
this.searchLoading = true
post('common/commonCountryCode/list_page', {
pageSize,
currentPage,
...this.searchForm,
continentCode: this.treeStatus,
}).then((res) => {
if (res.code === 200) {
this.userData = res.data.records
this.paginationOptions.total = res.data.total
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true,
})
}
continentCode: this.treeStatus
})
.then((res) => {
if (res.code === 200) {
this.userData = res.data.records
this.paginationOptions.total = res.data.total
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true
})
}
this.searchLoading = false
})
.catch(() => {
this.searchLoading = false
})
},
/**
* @description {部门职员查询}
......@@ -394,7 +411,7 @@ export default {
this.dialogVisible = true
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true,
dangerouslyUseHTMLString: true
})
}
})
......@@ -409,13 +426,13 @@ export default {
this.dialogVisible = false
this.$message({
message: '修改成功',
type: 'success',
type: 'success'
})
this.loadTreeData()
this.getList(this.currentPage)
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true,
dangerouslyUseHTMLString: true
})
}
})
......@@ -430,13 +447,13 @@ export default {
this.dialogVisible = false
this.$message({
message: '添加成功',
type: 'success',
type: 'success'
})
this.loadTreeData()
this.getList(this.currentPage)
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true,
dangerouslyUseHTMLString: true
})
}
})
......@@ -464,29 +481,33 @@ export default {
this.$confirm('确定删除选中的信息？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
type: 'warning'
})
.then(() => {
if (!v) this.delLoading = true
const url = `common/commonCountryCode/delete?ids=${ids}`
get(url).then((res) => {
if (res.code === 200) {
this.$message({
type: 'success',
message: '删除成功!',
message: '删除成功!'
})
this.loadTreeData()
this.getList(this.currentPage)
} else {
this.$alert(res.message, '错误提示', {
dangerouslyUseHTMLString: true,
dangerouslyUseHTMLString: true
})
}
if (!v) this.delLoading = false
})
})
.catch(() => {
if (!v) this.delLoading = false
})
},
},
}
}
}
</script>
<style lang='scss' scoped>
......
src/views/system/sku-sort.vue
......@@ -140,7 +140,13 @@
</el-button>
</span>
</p>
<div style="min-height: 40px; background: #fff">
<div
style="
min-height: 40px;
background: #fff;
max-height: 368px;
overflow-y: auto;
">
<div
v-for="(item, index) in selectProps"
class="variants"
......@@ -149,6 +155,7 @@
<div class="title">{{ `${item.name}(${item.code})` }}</div>
<ul class>
<li
class="close-icon"
v-for="g in item.children"
:key="g.id"
:style="{
......@@ -182,13 +189,16 @@
</el-dialog>
<el-dialog
:visible.sync="propDialogVisible"
width="800px"
width="80%"
:close-on-click-modal="false"
title="选择属性">
<div class="filter" style="margin-bottom: 10px">
<el-input placeholder="请输入属性类名称" clearable v-model="filterVal"></el-input>
<el-input
placeholder="请输入属性类名称"
clearable
v-model="filterVal"></el-input>
</div>
<div class="product-prop">
<div class="product-prop" style="max-height: 500px; overflow-y: auto">
<div
class="product-prop_item"
v-for="(item, index) in productPropertiesMap"
......@@ -357,7 +367,10 @@ export default {
enname: item.enname,
children: []
}
const current = properties.find((e) => e.code === item.cateCode && item.cnname.includes(this.filterVal))
const current = properties.find(
(e) =>
e.code === item.cateCode && item.cnname.includes(this.filterVal)
)
if (current) {
current.children.push(item)
} else {
......@@ -365,11 +378,18 @@ export default {
properties.push(prop)
}
})
console.log(properties)
properties.forEach(el => {
el.children = el.children.filter(item => item.cnname.includes(this.filterVal))
const arr = []
properties.forEach((el) => {
el.children = el.children.filter((item) =>
item.cnname.includes(this.filterVal)
)
if (el.children.length > 0) {
arr.push(el)
}
})
return properties
console.log(arr)
return arr
}
},
created() {
......@@ -829,4 +849,11 @@ export default {
.custom-dialog .el-dialog__body {
height: 600px;
}
.close-icon .el-icon-close::before {
border: 1px solid red;
padding: 1px;
border-radius: 50%;
color: black;
font-size: 10px;
}
</style>
src/views/system/timed_task.vue
<template>
<layout class="drag" style="height: 99.5%;">
<layout class="drag" style="height: 99.5%">
<drag height="calc(54% - 20px)">
<div slot="header">
<el-form
......@@ -8,8 +8,7 @@
:inline="true"
size="mini"
v-enter-submit="search"
@submit.native.prevent
>
@submit.native.prevent>
<el-form-item label="类型">
<el-select
style="width: 150px"
......@@ -17,29 +16,25 @@
value-key=""
placeholder="请选择"
@change="typeChange"
clearable
>
clearable>
<el-option
v-for="(item, index) in types"
:key="index"
:label="item.value"
:value="item.key"
></el-option>
:value="item.key"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
:loading="searchLoading"
native-type="submit"
@click="search"
>
@click="search">
查询
</el-button>
</el-form-item>
<el-form-item label="">
<el-button type="success" @click="showEdit()"
>新增</el-button
>
<el-button type="success" @click="showEdit()">新增</el-button>
</el-form-item>
</el-form>
<div class="table_wrap">
......@@ -47,27 +42,23 @@
:sourceData="sourceData"
:tableColumns="tableColumns"
:selection="true"
@currentChange="currentChange"
></my-table>
@currentChange="currentChange"></my-table>
</div>
</div>
<div slot="footer">
<el-tabs
v-model="activeName"
type="border-card"
style="height: 100%; width: 100%"
>
style="height: 100%; width: 100%">
<el-tab-pane label="日志" name="1">
<div style="height: calc(100% - 30px)">
<my-table
:sourceData="logList"
:tableColumns="logTableColumns"
></my-table>
:tableColumns="logTableColumns"></my-table>
</div>
<pagination
:setValue="setpaginationOptions"
:options="paginationOptions"
/>
:options="paginationOptions" />
</el-tab-pane>
</el-tabs>
</div>
......@@ -76,102 +67,78 @@
:title="isEdit ? '编辑' : '新增'"
:visible.sync="editVisible"
:close-on-click-modal="false"
width="600px"
>
width="600px">
<el-form
:model="editForm"
ref="editForm"
label-width="100px"
size="mini"
:inline="true"
>
:inline="true">
<el-form-item label="类型" prop="taskType" required>
<el-select
style="width: 168px"
v-model="editForm.taskType"
value-key=""
placeholder="请选择"
@change="typeChange"
>
@change="typeChange">
<el-option
v-for="(item, index) in types"
:key="index"
:label="item.value"
:value="item.key"
></el-option>
:value="item.key"></el-option>
</el-select>
</el-form-item>
<el-form-item
label="任务开始时间"
v-if="editForm.quartzType === 'SIMPLE'"
>
v-if="editForm.quartzType === 'SIMPLE'">
<el-date-picker
style="width: 168px"
v-model="editForm.startTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
></el-date-picker>
placeholder="选择日期时间"></el-date-picker>
</el-form-item>
<el-form-item
label="执行频率:"
prop="interval"
required
v-if="editForm.quartzType === 'SIMPLE'"
>
v-if="editForm.quartzType === 'SIMPLE'">
每
<el-input
style="width: 50px"
v-model="editForm.interval"
placeholder="1"
></el-input>
placeholder="1"></el-input>
&nbsp;
<el-select
style="width: 60px"
v-model="editForm.unit"
>
<el-select style="width: 60px" v-model="editForm.unit">
<el-option label="秒" value="s"></el-option>
<el-option label="分" value="m"></el-option>
<el-option label="时" value="h"></el-option>
<el-option label="天" value="day"></el-option>
<el-option label="月" value="month"></el-option>
</el-select>
<el-button @click="editForm.quartzType = 1"
>高级</el-button
>
<el-button @click="editForm.quartzType = 1">高级</el-button>
</el-form-item>
<cron
v-else
@change="changeCron"
@close="cronPopover = false"
v-model="editForm.cron"
>
<el-button @click="editForm.quartzType = 'SIMPLE'"
>返回</el-button
>
v-model="editForm.cron">
<el-button @click="editForm.quartzType = 'SIMPLE'">返回</el-button>
</cron>
<el-form-item label="任务描述" size="normal">
<el-input
style="width: 438px"
v-model="editForm.note"
placeholder=""
type="textarea"
></el-input>
type="textarea"></el-input>
</el-form-item>
</el-form>
<span slot="footer">
<el-button @click="editVisible = false" size="mini"
>取消</el-button
>
<el-button
type="primary"
@click="submit"
size="mini"
>提交</el-button
>
<el-button @click="editVisible = false" size="mini">取消</el-button>
<el-button type="primary" @click="submit" size="mini">提交</el-button>
</span>
</el-dialog>
</layout>
......@@ -185,7 +152,7 @@ export default {
name: 'system_timed_task',
components: {
cron,
MyTable,
MyTable
},
mixins: [pagination],
data() {
......@@ -194,16 +161,17 @@ export default {
searchForm: {},
sourceData: [],
isEdit: false,
searchLoading: false,
editVisible: false,
defaultEditForm: JSON.stringify({
unit: '',
quartzType: 'SIMPLE',
cron: '',
cron: ''
}),
editForm: {},
cronPopover: true,
activeName: '1',
logList: [],
logList: []
}
},
computed: {
......@@ -214,68 +182,66 @@ export default {
type: '',
width: 200,
key: 'taskTypeTxt',
align: 'left',
align: 'left'
},
{
label: '分组',
type: '',
width: 100,
key: 'taskGroup',
key: 'taskGroup'
},
{
label: '定时器类型',
type: '',
width: 100,
key: 'quartzType',
key: 'quartzType'
},
{ label: 'cron', type: '', width: '', key: 'cron' },
{
label: '开始时间',
type: '',
width: 130,
key: 'startTime',
key: 'startTime'
},
{
label: '间隔',
type: '',
width: 100,
key: 'interval',
align: 'right',
align: 'right'
},
{
label: '单位',
type: '',
width: 100,
key: 'unitTxt',
key: 'unitTxt'
},
{
label: '状态',
type: '',
width: 60,
key: 'status',
render: item => (
render: (item) => (
<el-switch
value={item.status}
active-value={true}
inactive-value={false}
onChange={status =>
this.statusChange(item, status)
}
onChange={(status) => this.statusChange(item, status)}
/>
),
)
},
{
label: '任务描述',
type: '',
width: '',
key: 'note',
align: 'left',
align: 'left'
},
{
label: '创建时间',
type: '',
width: 130,
key: 'createTime',
key: 'createTime'
},
{
label: '操作',
......@@ -283,31 +249,20 @@ export default {
width: 100,
fixed: 'right',
key: '',
render: item => (
render: (item) => (
<div>
<span
class="icon-view icon-edit-view"
title="编辑"
>
<i
class="el-icon-edit"
onClick={() => this.showEdit(item)}
></i>
<span class="icon-view icon-edit-view" title="编辑">
<i class="el-icon-edit" onClick={() => this.showEdit(item)}></i>
</span>
<span
class="icon-view icon-del-view"
title="删除"
>
<span class="icon-view icon-del-view" title="删除">
<i
class="el-icon-delete-solid"
onClick={() => this.remove(item.id)}
></i>
onClick={() => this.remove(item.id)}></i>
</span>
<span
onClick={() => this.clearLog(item.id)}
class="icon-view icon-tools-view"
title="清空日志"
>
title="清空日志">
<svg
t="1627348192624"
style="margin-top:3px"
......@@ -316,18 +271,16 @@ export default {
xmlns="http://www.w3.org/2000/svg"
p-id="1348"
width="18"
height="18"
>
height="18">
<path
d="M274.688 811.52c-8.32 10.688-20.48 24-36.48 39.936a44.736 44.736 0 0 1-43.136 11.52l-78.08-20.864-23.104-8.704c-29.632-25.536-44.608-61.44-39.36-95.552 5.76-37.12 32.32-67.648 82.112-88.704 34.368-14.656 67.584-74.176 89.664-157.44l3.84-14.464-2.24-4.032-14.272-4.48c-17.856-5.504-30.08-16.96-34.432-31.808-4.352-14.912-0.064-30.72 12.096-43.904l123.776-135.488c9.92-10.752 24.832-19.392 41.856-23.936 16.64-4.416 33.984-4.672 48.64-0.768l123.584 33.024 4.096-2.368 55.36-205.824c8.704-32.448 43.968-51.456 78.72-42.24l83.2 22.272c34.752 9.28 55.808 43.392 47.104 75.84l-55.36 205.824 2.368 4.096 118.528 31.68c14.592 3.84 29.568 12.8 41.728 24.96 12.416 12.352 21.12 27.2 24.192 41.472l39.36 179.072c3.84 17.536-0.384 33.28-11.648 44.032a43.776 43.776 0 0 1-25.92 11.712l-12.928 1.408-2.944 3.072-1.024 12.864c-2.56 34.048-6.4 62.976-17.92 139.52l-6.528 43.648c-3.84 26.048-6.528 46.976-8.768 66.304-4.224 36.544-23.488 65.28-54.656 81.6-15.424 8.128-32 12.672-45.824 13.44l-4.032 0.192-90.432-24.32a18.88 18.88 0 0 1-12.16-26.688l35.392-71.552-20.352 26.24a515.328 515.328 0 0 1-47.36 50.56 19.008 19.008 0 0 1-18.112 4.672l-75.456-20.16a18.88 18.88 0 0 1-12.16-26.624l35.456-71.552-20.352 26.24a510.336 510.336 0 0 1-47.36 50.56 18.944 18.944 0 0 1-18.112 4.672l-88.448-23.68a18.944 18.944 0 0 1-12.096-26.56l35.392-71.552-20.352 26.24a515.84 515.84 0 0 1-47.36 50.56 18.944 18.944 0 0 1-18.112 4.672l-62.528-16.704a18.944 18.944 0 0 1-12.096-26.688l35.392-71.488-20.352 26.24z m577.024-413.824l-142.784-38.208a22.272 22.272 0 0 1-15.808-27.264l61.056-227.072a22.272 22.272 0 0 0-15.808-27.264L657.728 56.32a22.4 22.4 0 0 0-27.328 15.744l-60.992 227.136a22.336 22.336 0 0 1-27.392 15.744l-147.84-39.552c-14.848-3.968-37.248 1.728-46.464 11.84l-113.92 124.544a11.072 11.072 0 0 0 5.376 18.24l669.184 178.816a11.136 11.136 0 0 0 13.824-13.12l-36.16-164.608-34.304-33.408zM317.44 709.76a22.4 22.4 0 0 1 27.328-6.848l3.392 1.6h0.128a21.888 21.888 0 0 1 10.432 29.248c-15.616 32.896-27.136 56.32-34.432 70.4-3.584 6.912-7.232 13.696-10.88 20.48l-11.648 21.12 34.176 9.152 2.944-0.64 6.208-4.928c29.504-23.68 61.888-59.136 97.088-106.176a22.4 22.4 0 0 1 27.264-6.848l3.52 1.6 0.128 0.064c10.944 5.12 15.616 18.24 10.432 29.12-15.616 32.896-27.136 56.32-34.432 70.4-3.904 7.552-7.552 14.336-10.88 20.48l-11.712 21.12 54.592 14.592 2.944-0.64 6.208-4.928c29.44-23.68 61.76-58.88 96.896-105.92 6.4-8.512 17.984-11.328 27.584-6.72l3.2 1.536a22.208 22.208 0 0 1 10.432 29.504c-15.36 32.384-26.752 55.68-34.112 69.76a854.4 854.4 0 0 1-10.88 20.48l-11.712 21.12 55.04 14.72 2.944-0.64 6.208-4.928c29.44-23.68 61.76-58.944 96.96-105.984 6.4-8.512 17.92-11.328 27.52-6.784l3.2 1.536h0.064a22.016 22.016 0 0 1 10.432 29.44c-21.44 44.608-36.48 74.752-45.12 90.304l-11.712 21.248 63.104 16.832 5.248-0.768c8.064-1.664 15.552-4.48 22.4-8.448 17.024-9.792 26.432-24.96 28.928-46.336 1.856-16.128 31.552-223.616 33.6-255.552l0.832-12.736-2.432-3.456-592.512-158.272-4.096 2.368-4.096 14.976a572.608 572.608 0 0 1-27.584 80c-24.192 55.04-53.568 90.112-86.784 104.192-32.64 13.824-52.224 32.64-55.68 54.848-2.56 16.256 4.096 33.92 17.792 48.64l3.072 3.328 92.16 25.152 3.008-0.64 6.144-4.928 97.152-106.24z"
fill="#ffffff"
p-id="1349"
></path>
p-id="1349"></path>
</svg>
</span>
</div>
),
},
)
}
]
},
logTableColumns() {
......@@ -336,13 +289,13 @@ export default {
label: 'Task Id',
width: 100,
key: 'taskId',
align: 'right',
align: 'right'
},
{
label: '状态',
width: 70,
key: 'status',
render: item => (
render: (item) => (
<span
style={{
color:
......@@ -350,12 +303,11 @@ export default {
? 'red'
: item.status === 'SUCCESS'
? 'green'
: '#ddd',
}}
>
: '#ddd'
}}>
{item.status}
</span>
),
)
},
{ label: '开始时间', width: 130, key: 'startTime' },
{ label: '结束时间', width: 130, key: 'endTime' },
......@@ -363,22 +315,22 @@ export default {
label: '错误信息',
width: '',
key: 'errorMessage',
align: 'left',
},
align: 'left'
}
]
},
}
},
mounted() {
this.getlist()
get('quartzTask/typeList').then(res => {
get('quartzTask/typeList').then((res) => {
this.types = res.data
})
},
methods: {
clearLog(taskId) {
get('quartzTask/clearLogs', {
taskId: taskId,
}).then(res => {
taskId: taskId
}).then((res) => {
this.$message.success(res.message)
this.getDetail(taskId)
})
......@@ -389,15 +341,12 @@ export default {
}
},
getDetail(id) {
const {
pageSize,
currentPage,
} = this.paginationOptions
const { pageSize, currentPage } = this.paginationOptions
get('quartzTask/logs', {
id,
currentPage,
pageSize,
}).then(res => {
pageSize
}).then((res) => {
this.paginationOptions.total = res.data.total
this.logList = res.data.records
})
......@@ -409,7 +358,7 @@ export default {
} else {
url = 'quartzTask/pause'
}
get(url, { id: item.id }).then(res => {
get(url, { id: item.id }).then((res) => {
this.$message.success(res.message)
if (res.code === 200) {
this.$set(item, 'status', status)
......@@ -421,7 +370,7 @@ export default {
console.log(val)
},
remove(id) {
get('quartzTask/delete', { ids: id }).then(res => {
get('quartzTask/delete', { ids: id }).then((res) => {
this.$message.success(res.message)
this.getlist()
})
......@@ -430,21 +379,24 @@ export default {
this.getlist()
},
getlist() {
this.searchLoading = true
post('quartzTask/list', {
...this.searchForm,
}).then(res => {
this.sourceData = res.data
...this.searchForm
})
.then((res) => {
this.sourceData = res.data
this.searchLoading = false
}).catch(() => {
this.searchLoading = false
})
},
submit() {
this.$refs.editForm.validate(v => {
this.$refs.editForm.validate((v) => {
if (!v) return
const url = this.isEdit
? 'quartzTask/update'
: 'quartzTask/add'
const url = this.isEdit ? 'quartzTask/update' : 'quartzTask/add'
delete this.editForm.createTime
delete this.editForm.updateTime
post(url, this.editForm).then(res => {
post(url, this.editForm).then((res) => {
this.$message.success(res.message)
this.editVisible = false
this.getlist()
......@@ -477,7 +429,7 @@ export default {
break
}
}
},
},
}
}
}
</script>
src/views/system/transporters.vue
......@@ -7,20 +7,18 @@
:inline="true"
size="small"
v-enter-submit="search"
@submit.native.prevent
>
@submit.native.prevent>
<el-form-item label="名称">
<el-input
style="width: 300px"
v-model="searchForm.name"
placeholder="请输入名称&中文名称&英文名称"
clearable
></el-input>
clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search"
>查询</el-button
>
<el-button :loading="searchLoading" type="primary" @click="search">
查询
</el-button>
</el-form-item>
</el-form>
</div>
......@@ -28,8 +26,7 @@
<div class="table-wrap">
<table-view
:sourceData="sourceData"
:tableColumns="tableColumns"
></table-view>
:tableColumns="tableColumns"></table-view>
<!-- <vxe-table
border
......@@ -56,9 +53,7 @@
:page-size="paginationOptions.pageSize"
:current-page="paginationOptions.currentPage"
@size-change="sizeChange"
@current-change="onCurrentChange"
>
</el-pagination>
@current-change="onCurrentChange"></el-pagination>
</div>
</div>
</template>
......@@ -69,21 +64,22 @@ import TableView from '@/common/components/base/tableView.vue'
export default {
name: 'logistics_transporters',
components: {
TableView,
TableView
},
data() {
return {
sourceData: [],
searchForm: {},
isLoad: false,
searchLoading: false,
bodyHeight: 0,
currentPage: 1,
sourceDataTotal: 0,
paginationOptions: {
total: 0,
pageSize: 100,
currentPage: 1,
},
currentPage: 1
}
}
},
computed: {
......@@ -93,9 +89,9 @@ export default {
{ label: '中文名称', key: 'nameCn', align: 'left' },
{ label: '英文名称', key: 'nameEn', align: 'left' },
{ label: '港澳名称', key: 'nameHk', align: 'left' },
{ label: '链接', key: 'url', align: 'left' },
{ label: '链接', key: 'url', align: 'left' }
]
},
}
},
mounted() {
this.getlist()
......@@ -120,9 +116,7 @@ export default {
if (!this.isLoad) {
this.isLoad = true
this.currentPage++
if (
this.sourceData.length >= this.sourceDataTotal
) {
if (this.sourceData.length >= this.sourceDataTotal) {
return
}
this.getlist(true)
......@@ -130,27 +124,34 @@ export default {
}
},
getlist() {
const { pageSize, currentPage } =
this.paginationOptions
const { pageSize, currentPage } = this.paginationOptions
this.searchLoading = true
axios
.post('LogisticsCarrierCode/list_page', {
pageSize,
currentPage,
...this.searchForm,
}, {
baseURL: '/api/manage/rest',
})
.post(
'LogisticsCarrierCode/list_page',
{
pageSize,
currentPage,
...this.searchForm
},
{
baseURL: '/api/manage/rest'
}
)
.then((res) => {
this.sourceData = res.data.records
this.paginationOptions.total = res.data.total
this.searchLoading = false
})
},
},
.catch(() => {
this.searchLoading = false
})
}
}
}
</script>
<style scoped>
.wrap {
height: 100%;
overflow: hidden;
......@@ -170,8 +171,7 @@ export default {
padding-left: 0;
}
.table_wrap >>> .vxe-header--column.tablecolgroup,
.table_wrap
>>> .vxe-header--column.col--ellipsis.tablecolgroup {
.table_wrap >>> .vxe-header--column.col--ellipsis.tablecolgroup {
height: 22px !important;
}
.table_wrap >>> .vxe-cell {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment