Skip to content

肖康 / cloudSystem

Go to a project
Commit 3741487c by liangjianmin
Options

style: 统一代码格式并修复空格问题 

修复多个组件中的代码格式问题，包括：
1. 统一缩进为2个空格
2. 修复对象和数组声明中的多余空格
3. 保持组件导入和使用的格式一致
4. 移除多余空行和注释
parent 0e018907
Inline Side-by-side
Showing with 754 additions and 755 deletions
src/views/Goods/brand.vue
......@@ -81,18 +81,18 @@
</div>
</el-dialog>
</div>
<Menu/>
<Menu />
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Dialog, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Select, Table, TableColumn, Upload} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, Dialog, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Select, Table, TableColumn, Upload } from 'element-ui'
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination).use(Autocomplete)
Vue.use(TableColumn).use(Table).use(Upload)
export default {
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination).use(Autocomplete)
Vue.use(TableColumn).use(Table).use(Upload)
export default {
name: "brand",
data() {
return {
......@@ -307,13 +307,13 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/goods/brand.min.css";
@import "../../assets/css/goods/brand.min.css";
::v-deep .custom-dialog .el-dialog__body {
::v-deep .custom-dialog .el-dialog__body {
height: 500px;
overflow-y: auto;
}
}
</style>
\ No newline at end of file
src/views/Goods/goods.vue
......@@ -89,18 +89,18 @@
</div>
</el-dialog>
</div>
<Menu/>
<Menu />
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Cascader, DatePicker, Dialog, Form, FormItem, Image, Input, Message, Option, Pagination, Select, Table, TableColumn, Upload} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, Cascader, DatePicker, Dialog, Form, FormItem, Image, Input, Message, Option, Pagination, Select, Table, TableColumn, Upload } from 'element-ui'
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
Vue.use(TableColumn).use(Table).use(Cascader).use(Autocomplete).use(Image).use(DatePicker).use(Upload);
export default {
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
Vue.use(TableColumn).use(Table).use(Cascader).use(Autocomplete).use(Image).use(DatePicker).use(Upload);
export default {
name: "brand",
data() {
return {
......@@ -347,13 +347,13 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/goods/goods.min.css";
@import "../../assets/css/goods/goods.min.css";
::v-deep .custom-dialog .el-dialog__body {
::v-deep .custom-dialog .el-dialog__body {
height: 500px;
overflow-y: auto;
}
}
</style>
\ No newline at end of file
src/views/Index/index.vue
<template>
<div class="home-index boxsiz">
<Menu/>
<Menu />
<div class="row bothSide verCenter survey-top-show">
<div class="column left-bar">
<ul class="survey-top row bothSide boxsiz">
......@@ -67,7 +67,7 @@
<span style="width: 30%">排名</span>
</div>
<div class="box-wrap">
<div class="row verCenter box" v-for="(v,index) in rankList">
<div class="row verCenter box" v-for="(v, index) in rankList">
<span CLASS="t1">{{ v.name }}</span>
<template v-if="v.rank == 1">
<div class="sort row verCenter">
......@@ -98,13 +98,13 @@
<div class="rate-box boxsiz">
<div class="rate-tab row bothSide verCenter">
<div class="row">
<el-radio-group v-model="tabPosition" @change="change(tabPosition,'frqRates')">
<el-radio-group v-model="tabPosition" @change="change(tabPosition, 'frqRates')">
<el-radio-button label="0">询价报价率</el-radio-button>
<el-radio-button label="1">报价成单率</el-radio-button>
</el-radio-group>
</div>
<div class="row">
<el-radio-group v-model="tabDate" @change="change(tabDate,'frqRatesDate')">
<el-radio-group v-model="tabDate" @change="change(tabDate, 'frqRatesDate')">
<el-radio-button label="0">昨日</el-radio-button>
<el-radio-button label="1">本周</el-radio-button>
<el-radio-button label="2">本月</el-radio-button>
......@@ -119,14 +119,14 @@
<div class="offer boxsiz">
<div class="offer-tab row verCenter bothSide">
<div class="row">
<el-radio-group v-model="offerPosition" @change="change(offerPosition,'offerPosition')">
<el-radio-group v-model="offerPosition" @change="change(offerPosition, 'offerPosition')">
<el-radio-button label="1">询价量</el-radio-button>
<el-radio-button label="2">报价量</el-radio-button>
<el-radio-button label="3">成单量</el-radio-button>
</el-radio-group>
</div>
<div class="row">
<el-radio-group v-model="offerDate" @change="change(offerDate,'offerDate')">
<el-radio-group v-model="offerDate" @change="change(offerDate, 'offerDate')">
<el-radio-button label="1">近7天</el-radio-button>
<el-radio-button label="2">本月</el-radio-button>
<el-radio-button label="3">本年</el-radio-button>
......@@ -139,13 +139,13 @@
<el-table :data="inquiry_rank_list">
<el-table-column prop="numbers" label="排名" align="center" width="50">
<template slot-scope="scope">
<template v-if="scope.$index==0">
<template v-if="scope.$index == 0">
<span class="one row rowCenter verCenter">1</span>
</template>
<template v-else-if="scope.$index==1">
<template v-else-if="scope.$index == 1">
<span class="two row rowCenter verCenter">2</span>
</template>
<template v-else-if="scope.$index==2">
<template v-else-if="scope.$index == 2">
<span class="three row rowCenter verCenter">3</span>
</template>
<template v-else>
......@@ -163,16 +163,16 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import * as echarts from 'echarts';
import {DatePicker, Form, FormItem, Message, Progress, Radio, RadioButton, RadioGroup, Table, TableColumn, Tabs} from 'element-ui';
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import * as echarts from 'echarts';
import { DatePicker, Form, FormItem, Message, Progress, Radio, RadioButton, RadioGroup, Table, TableColumn, Tabs } from 'element-ui';
Vue.prototype.$message = Message;
Vue.use(Form).use(FormItem).use(DatePicker).use(Tabs).use(Radio).use(RadioGroup).use(RadioButton).use(Progress).use(Table).use(TableColumn);
Vue.prototype.$message = Message;
Vue.use(Form).use(FormItem).use(DatePicker).use(Tabs).use(Radio).use(RadioGroup).use(RadioButton).use(Progress).use(Table).use(TableColumn);
export default {
export default {
name: "index",
data() {
return {
......@@ -248,7 +248,7 @@ export default {
},
getFrqRates(type) {
//首页询报价比率信息
this.$http('GET', "/api/statistics/getFrqRates", {type: type}).then(res => {
this.$http('GET', "/api/statistics/getFrqRates", { type: type }).then(res => {
if (res.code === 0) {
if (this.tabPosition == 0) {
this.percentage = parseInt(res.data.inquiry_quote_rate);
......@@ -267,7 +267,7 @@ export default {
},
getFrqStatInfo(type) {
//首页询报价数量统计信息
this.$http('GET', "/api/statistics/getFrqStatInfo", {type: type}).then(res => {
this.$http('GET', "/api/statistics/getFrqStatInfo", { type: type }).then(res => {
if (res.code === 0) {
this.inquiry_rank_list = res.data.inquiry_rank_list;
if (this.offerPosition == 1) {
......@@ -354,8 +354,8 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/index/index.min.css";
@import "../../assets/css/index/index.min.css";
</style>
\ No newline at end of file
src/views/Info/message.vue
......@@ -4,7 +4,7 @@
<div class="tip">基本信息</div>
<div class="row verCenter">
<div class="up-box">
<img :src="userinfo.avatar || 'https://www.ichunt.com/v3/dist/res/home/images/headimg/boy1.png'" class="imspre"/>
<img :src="userinfo.avatar || 'https://www.ichunt.com/v3/dist/res/home/images/headimg/boy1.png'" class="imspre" />
<el-upload class="avatar-uploader" :data="fileData" :action="upUrl" :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
<span class="icon iconfont fl"></span>
<div class="fl">更换头像</div>
......@@ -60,7 +60,7 @@
<!--子账号消息推送配置-->
<section class="role-auth">
<ul class="row">
<li v-for="(item,index) in messageMenu" :key="item.id">
<li v-for="(item, index) in messageMenu" :key="item.id">
<el-tree :data="item" show-checkbox :props="defaultProps" :default-checked-keys="filteredMessageIds" default-expand-all node-key="id" @check-change="handleCheckMsgChange"></el-tree>
</li>
</ul>
......@@ -69,19 +69,19 @@
<el-button type="primary" @click="submituser">编辑</el-button>
</el-row>
</div>
<Menu/>
<Menu />
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {NODE_ENVS} from "../../ajax";
import Tool from '../../tool'
import {Form, FormItem, Input, Message, Row, Tree, Upload} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { NODE_ENVS } from "../../ajax";
import Tool from '../../tool'
import { Form, FormItem, Input, Message, Row, Tree, Upload } from 'element-ui'
Vue.prototype.$message = Message;
Vue.use(Form).use(FormItem).use(Input).use(Upload).use(Row).use(Tree);
export default {
Vue.prototype.$message = Message;
Vue.use(Form).use(FormItem).use(Input).use(Upload).use(Row).use(Tree);
export default {
name: "message",
data() {
return {
......@@ -91,7 +91,7 @@ export default {
},
filteredMessageIds: [],
upUrl: NODE_ENVS + '/api/user/setavatar',
fileData: {token: Tool.getCookie('token')},
fileData: { token: Tool.getCookie('token') },
messageMenu: [],//消息权限菜单
user_message_rule: [],
userinfo: {}
......@@ -237,16 +237,16 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/info/message.min.css";
@import "../../assets/css/info/message.min.css";
.tip {
.tip {
padding: 8px 16px;
background-color: #ecf8ff;
border-radius: 4px;
border-left: 5px solid #50bfff;
margin-bottom: 10px;
}
}
</style>
\ No newline at end of file
src/views/Info/subAccount.vue
......@@ -52,12 +52,12 @@
<el-table-column prop="update_time_cn" label="修改时间" width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column label="操作" width="250" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="goToSubAccountEdit(scope.row.sbat_id,scope.row.ynat_id)">编辑</el-button>
<el-button size="mini" @click="goToSubAccountEdit(scope.row.sbat_id, scope.row.ynat_id)">编辑</el-button>
<template v-if="scope.row.status == 1">
<el-button size="mini" type="warning" @click="confirmEnable(scope.row,2)">禁用</el-button>
<el-button size="mini" type="warning" @click="confirmEnable(scope.row, 2)">禁用</el-button>
</template>
<template v-else>
<el-button size="mini" type="success" @click="confirmEnable(scope.row,1)">启用</el-button>
<el-button size="mini" type="success" @click="confirmEnable(scope.row, 1)">启用</el-button>
</template>
<el-button size="mini" type="danger" @click="confirmDelete(scope.row)">删除</el-button>
</template>
......@@ -66,19 +66,19 @@
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
</div>
<Menu/>
<Menu />
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Option, Pagination, Popover, Radio, RadioButton, RadioGroup, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Option, Pagination, Popover, Radio, RadioButton, RadioGroup, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Radio).use(RadioGroup).use(RadioButton);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover).use(Tag).use(Tooltip);
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Radio).use(RadioGroup).use(RadioButton);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover).use(Tag).use(Tooltip);
export default {
export default {
name: "subAccount",
data() {
return {
......@@ -114,7 +114,7 @@ export default {
} else {
this.formParam.update_time = '';
}
var params = Object.assign({}, {page: this.page, limit: this.limit}, this.formParam);
var params = Object.assign({}, { page: this.page, limit: this.limit }, this.formParam);
this.$http('GET', "/api/subAccount/list", params).then(res => {
if (res.code === 0) {
this.tableData = res.data.list || [];
......@@ -143,7 +143,7 @@ export default {
type: type,
dangerouslyUseHTMLString: true
}).then(() => {
this.$http('POST', "/api/subAccount/changeStatus", {sbat_id: row.sbat_id, status: type}).then(res => {
this.$http('POST', "/api/subAccount/changeStatus", { sbat_id: row.sbat_id, status: type }).then(res => {
if (res.code === 0) {
this.getData();
} else {
......@@ -168,7 +168,7 @@ export default {
type: 'warning',
dangerouslyUseHTMLString: true
}).then(() => {
this.$http('POST', "/api/subAccount/changeStatus", {sbat_id: row.sbat_id, status: 0}).then(res => {
this.$http('POST', "/api/subAccount/changeStatus", { sbat_id: row.sbat_id, status: 0 }).then(res => {
if (res.code === 0) {
this.getData();
} else {
......@@ -221,8 +221,8 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/info/subAccount.min.css";
@import "../../assets/css/info/subAccount.min.css";
</style>
\ No newline at end of file
src/views/Info/subAccountAdd.vue
......@@ -26,7 +26,7 @@
<!--子账号权限配置-->
<section class="role-auth">
<ul class="row">
<li v-for="(item,index) in menuData" :key="item.id">
<li v-for="(item, index) in menuData" :key="item.id">
<el-tree ref="tree" :data="item" show-checkbox node-key="id" :props="defaultProps" default-expand-all @check-change="handleCheckChange"></el-tree>
</li>
</ul>
......@@ -35,7 +35,7 @@
<!--子账号消息推送配置-->
<section class="role-auth">
<ul class="row">
<li v-for="(item,index) in messageMenu" :key="item.id">
<li v-for="(item, index) in messageMenu" :key="item.id">
<el-tree ref="treeMsg" :data="item" show-checkbox node-key="id" :props="defaultProps" default-expand-all @check-change="handleCheckMsgChange"></el-tree>
</li>
</ul>
......@@ -45,19 +45,19 @@
<el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
</el-row>
</el-form>
<Menu/>
<Menu />
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Checkbox, CheckboxButton, CheckboxGroup, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, Option, Pagination, Popover, Radio, RadioButton, RadioGroup, Row, Select, Table, TableColumn, Tag, Tooltip, Tree} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, Checkbox, CheckboxButton, CheckboxGroup, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, Option, Pagination, Popover, Radio, RadioButton, RadioGroup, Row, Select, Table, TableColumn, Tag, Tooltip, Tree } from 'element-ui'
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Tree).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Radio).use(RadioGroup).use(RadioButton).use(Checkbox).use(CheckboxButton).use(CheckboxGroup);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover).use(Tag).use(Tooltip).use(Row);
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Tree).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Radio).use(RadioGroup).use(RadioButton).use(Checkbox).use(CheckboxButton).use(CheckboxGroup);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover).use(Tag).use(Tooltip).use(Row);
export default {
export default {
name: "subAccountAdd",
data() {
return {
......@@ -67,8 +67,8 @@ export default {
},
rules: {
mobile: [
{required: true, message: '请输入手机号', trigger: 'blur'},
{pattern: /^1\d{10}$/, message: '请输入有效的手机号', trigger: 'blur'}
{ required: true, message: '请输入手机号', trigger: 'blur' },
{ pattern: /^1\d{10}$/, message: '请输入有效的手机号', trigger: 'blur' }
],
name: [{
required: true,
......@@ -81,8 +81,8 @@ export default {
trigger: 'blur'
}],
email: [
{required: true, message: '请输入邮箱', trigger: 'blur'},
{type: 'email', message: '请输入有效的邮箱地址', trigger: ['blur', 'change']}
{ required: true, message: '请输入邮箱', trigger: 'blur' },
{ type: 'email', message: '请输入有效的邮箱地址', trigger: ['blur', 'change'] }
]
},
menuData: [],//权限菜单
......@@ -179,7 +179,7 @@ export default {
* 获取当前用户的权限菜单
*/
getMenu() {
this.$http('GET', "/api/subAccount/getMenu", {method: 'add'}).then(res => {
this.$http('GET', "/api/subAccount/getMenu", { method: 'add' }).then(res => {
if (res.code === 0) {
let newMenuData = res.data.data.map(item => [item]);
this.menuData = newMenuData;
......@@ -291,9 +291,9 @@ export default {
components: {
Menu
}
}
;
}
;
</script>
<style scoped>
@import "../../assets/css/info/subAccount.min.css";
@import "../../assets/css/info/subAccount.min.css";
</style>
\ No newline at end of file
src/views/Info/subAccountEdit.vue
......@@ -26,7 +26,7 @@
<!--子账号权限配置-->
<section class="role-auth">
<ul class="row">
<li v-for="(item,index) in menuData" :key="item.id">
<li v-for="(item, index) in menuData" :key="item.id">
<el-tree :data="item" show-checkbox :props="defaultProps" :default-checked-keys="filteredRuleIds" default-expand-all node-key="id" @check-change="handleCheckChange"></el-tree>
</li>
</ul>
......@@ -35,7 +35,7 @@
<!--子账号消息推送配置-->
<section class="role-auth">
<ul class="row">
<li v-for="(item,index) in messageMenu" :key="item.id">
<li v-for="(item, index) in messageMenu" :key="item.id">
<el-tree :data="item" show-checkbox :props="defaultProps" :default-checked-keys="filteredMessageIds" default-expand-all node-key="id" @check-change="handleCheckMsgChange"></el-tree>
</li>
</ul>
......@@ -45,19 +45,19 @@
<el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
</el-row>
</el-form>
<Menu/>
<Menu />
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Checkbox, CheckboxButton, CheckboxGroup, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, Option, Pagination, Popover, Radio, RadioButton, RadioGroup, Row, Select, Table, TableColumn, Tag, Tooltip, Tree} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, Checkbox, CheckboxButton, CheckboxGroup, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, Option, Pagination, Popover, Radio, RadioButton, RadioGroup, Row, Select, Table, TableColumn, Tag, Tooltip, Tree } from 'element-ui'
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Tree).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Radio).use(RadioGroup).use(RadioButton).use(Checkbox).use(CheckboxButton).use(CheckboxGroup);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover).use(Tag).use(Tooltip).use(Row);
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Tree).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Radio).use(RadioGroup).use(RadioButton).use(Checkbox).use(CheckboxButton).use(CheckboxGroup);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover).use(Tag).use(Tooltip).use(Row);
export default {
export default {
name: "subAccountEdit",
data() {
return {
......@@ -67,8 +67,8 @@ export default {
},
rules: {
mobile: [
{required: true, message: '请输入手机号', trigger: 'blur'},
{pattern: /^1\d{10}$/, message: '请输入有效的手机号', trigger: 'blur'}
{ required: true, message: '请输入手机号', trigger: 'blur' },
{ pattern: /^1\d{10}$/, message: '请输入有效的手机号', trigger: 'blur' }
],
name: [{
required: true,
......@@ -81,8 +81,8 @@ export default {
trigger: 'blur'
}],
email: [
{required: true, message: '请输入邮箱', trigger: 'blur'},
{type: 'email', message: '请输入有效的邮箱地址', trigger: ['blur', 'change']}
{ required: true, message: '请输入邮箱', trigger: 'blur' },
{ type: 'email', message: '请输入有效的邮箱地址', trigger: ['blur', 'change'] }
]
},
menuData: [],//权限菜单
......@@ -147,7 +147,7 @@ export default {
this.$router.push('/subAccount');
},
getData() {
this.$http('GET', "/api/subAccount/getSubAccountInfo", {sbat_id: this.formParam.sbat_id}).then(res => {
this.$http('GET', "/api/subAccount/getSubAccountInfo", { sbat_id: this.formParam.sbat_id }).then(res => {
if (res.code === 0) {
//赋值子账号信息
this.formParam.mobile = res.data.mobile;
......@@ -166,7 +166,7 @@ export default {
* 获取当前用户的权限菜单
*/
getMenu() {
this.$http('GET', "/api/subAccount/getMenu", {sbat_id: this.formParam.sbat_id}).then(res => {
this.$http('GET', "/api/subAccount/getMenu", { sbat_id: this.formParam.sbat_id }).then(res => {
if (res.code === 0) {
if (res.data.data.length > 0) {
let newMenuData = res.data.data.map(item => [item]);
......@@ -213,7 +213,7 @@ export default {
* 获取当前用户的消息权限菜单
*/
getMessageMenu() {
this.$http('GET', "/api/subAccount/getMessageMenu", {ynat_id: this.ynat_id}).then(res => {
this.$http('GET', "/api/subAccount/getMessageMenu", { ynat_id: this.ynat_id }).then(res => {
if (res.code === 0) {
if (res.data.data.length > 0) {
let newMenuData = res.data.data.map(item => [item]);
......@@ -334,9 +334,9 @@ export default {
components: {
Menu
}
}
;
}
;
</script>
<style scoped>
@import "../../assets/css/info/subAccount.min.css";
@import "../../assets/css/info/subAccount.min.css";
</style>
\ No newline at end of file
src/views/InquireTransform/index.vue
......@@ -157,23 +157,23 @@
</div>
</div>
</div>
<Menu/>
<Menu />
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Radio, RadioButton, RadioGroup, Select, Table, TableColumn, Tabs, Tag, Tooltip} from 'element-ui'
import Tool from "@/tool";
import {NODE_ENVS} from "@/ajax";
import qs from 'qs';
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Radio, RadioButton, RadioGroup, Select, Table, TableColumn, Tabs, Tag, Tooltip } from 'element-ui'
import Tool from "@/tool";
import { NODE_ENVS } from "@/ajax";
import qs from 'qs';
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem).use(Tabs).use(Radio).use(RadioGroup).use(RadioButton);
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem).use(Tabs).use(Radio).use(RadioGroup).use(RadioButton);
export default {
export default {
name: "inquireTransform",
data() {
return {
......@@ -250,7 +250,7 @@ export default {
this.formInline.create_time = '';
}
var params = Object.assign({}, {page: this.page, limit: this.limit}, this.formInline);
var params = Object.assign({}, { page: this.page, limit: this.limit }, this.formInline);
this.$http('GET', "/api/statistics/inquiryChangeStatisticsList", params).then(res => {
if (res.code === 0) {
this.list = res.data.list || [];
......@@ -268,7 +268,7 @@ export default {
* 导出
*/
exportChange() {
var params = Object.assign({}, {token: Tool.getCookie('token')}, this.formInline, {is_export: 1})
var params = Object.assign({}, { token: Tool.getCookie('token') }, this.formInline, { is_export: 1 })
var url = NODE_ENVS + '/api/statistics/inquiryChangeStatisticsList?' + qs.stringify(params);
const newsUrl = this.$router.resolve(url);
window.open(url);
......@@ -378,10 +378,10 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped lang="less">
.tetx-goods {
.tetx-goods {
font-size: 12px;
margin-top: 20px;
flex-wrap: wrap;
......@@ -396,5 +396,5 @@ export default {
font-weight: bold;
margin-right: 15px;
}
}
}
</style>
\ No newline at end of file
src/views/List/inquire.vue
......@@ -95,10 +95,10 @@
</el-table-column>
<el-table-column prop="i_status" label="状态" width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.i_status==2" type="success" @click="editInquire(scope.row.id)">已报价</el-tag>
<el-tag v-else-if="scope.row.i_status==1" @click="editInquire(scope.row.id)">待报价</el-tag>
<el-tag v-else-if="scope.row.i_status==9" type="danger">已删除</el-tag>
<el-tag v-else-if="scope.row.i_status==-1" type="warning">已关闭</el-tag>
<el-tag v-if="scope.row.i_status == 2" type="success" @click="editInquire(scope.row.id)">已报价</el-tag>
<el-tag v-else-if="scope.row.i_status == 1" @click="editInquire(scope.row.id)">待报价</el-tag>
<el-tag v-else-if="scope.row.i_status == 9" type="danger">已删除</el-tag>
<el-tag v-else-if="scope.row.i_status == -1" type="warning">已关闭</el-tag>
</template>
</el-table-column>
<el-table-column prop="buyer_info" label="猎芯采购员" width="100" :show-overflow-tooltip="true" align="center">
......@@ -117,7 +117,7 @@
<!--未成单-->
<span v-if="scope.row.is_purchased == 0">{{ scope.row.is_purchased_val }}</span>
<!--成单-->
<a v-if="scope.row.is_purchased == 1" class="alink" :href="'/#/orderTrackGoods?inquiry_sn='+scope.row.inquiry_sn">{{ scope.row.is_purchased_val }}</a>
<a v-if="scope.row.is_purchased == 1" class="alink" :href="'/#/orderTrackGoods?inquiry_sn=' + scope.row.inquiry_sn">{{ scope.row.is_purchased_val }}</a>
</template>
</el-table-column>
<el-table-column prop="customer_tag" label="客户性质" width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
......@@ -179,11 +179,11 @@
<el-table-column prop="brand_name" label="品牌" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="status" label="状态" width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.quote_status==1" type="info">确认中</el-tag>
<el-tag v-else-if="scope.row.quote_status==2" type="success">已选中</el-tag>
<a v-else-if="scope.row.quote_status==3" class="alink" :href="'/#/orderTrackGoods?inquiry_item_id='+scope.row.inquiry_items_id">已成单</a>
<el-tag v-else-if="scope.row.quote_status==4" type="warning">已关闭</el-tag>
<el-tag v-else-if="scope.row.quote_status==7">待确认</el-tag>
<el-tag v-if="scope.row.quote_status == 1" type="info">确认中</el-tag>
<el-tag v-else-if="scope.row.quote_status == 2" type="success">已选中</el-tag>
<a v-else-if="scope.row.quote_status == 3" class="alink" :href="'/#/orderTrackGoods?inquiry_item_id=' + scope.row.inquiry_items_id">已成单</a>
<el-tag v-else-if="scope.row.quote_status == 4" type="warning">已关闭</el-tag>
<el-tag v-else-if="scope.row.quote_status == 7">待确认</el-tag>
<template v-if="scope.row.status_tips">
<el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
<i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
......@@ -200,16 +200,16 @@
</el-table-column>
<el-table-column prop="price_origin" label="价格" width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<span>{{ scope.row.price_origin|floatZero }}</span>
<span>{{ scope.row.price_origin | floatZero }}</span>
</template>
</el-table-column>
<el-table-column prop="currency" label="币种" width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<span v-if="scope.row.currency==1">人民币</span>
<span v-else-if="scope.row.currency==2">美元</span>
<span v-else-if="scope.row.currency==3">港币</span>
<span v-else-if="scope.row.currency==4">欧元</span>
<span v-else-if="scope.row.currency==5">英磅</span>
<span v-if="scope.row.currency == 1">人民币</span>
<span v-else-if="scope.row.currency == 2">美元</span>
<span v-else-if="scope.row.currency == 3">港币</span>
<span v-else-if="scope.row.currency == 4">欧元</span>
<span v-else-if="scope.row.currency == 5">英磅</span>
</template>
</el-table-column>
<el-table-column prop="tax_rate" label="税率" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
......@@ -219,7 +219,7 @@
<el-table-column prop="moq" label="起订量" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="price_other" label="其他费用" width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<span>{{ scope.row.price_other|floatZero }}</span>
<span>{{ scope.row.price_other | floatZero }}</span>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
......@@ -249,7 +249,7 @@
<el-table-column prop="mpq" label="标准包装量" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="stock" label="库存数量" width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="cn_ladder_price" label="国内含税价" width="120" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope" v-if="scope.row.cn_ladder_price&&scope.row.cn_ladder_price.length>0">
<template slot-scope="scope" v-if="scope.row.cn_ladder_price && scope.row.cn_ladder_price.length > 0">
<el-popover effect="light" trigger="hover" placement="bottom">
<p class="row" v-for="item in scope.row.cn_ladder_price">
<span>{{ item.purchases }}+</span>
......@@ -260,7 +260,7 @@
</template>
</el-table-column>
<el-table-column prop="hk_ladder_price" label="香港交货价" width="120" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope" v-if="scope.row.hk_ladder_price&&scope.row.hk_ladder_price.length>0">
<template slot-scope="scope" v-if="scope.row.hk_ladder_price && scope.row.hk_ladder_price.length > 0">
<el-popover effect="light" trigger="hover" placement="bottom">
<p class="row" v-for="item in scope.row.hk_ladder_price">
<span>{{ item.purchases }}+</span>
......@@ -274,8 +274,8 @@
<el-table-column prop="hk_delivery_time" label="香港交期" width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="goods_status" label="状态" width="150" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.goods_status==1" class="f-green">上架</el-tag>
<el-tag type="info" v-else-if="scope.row.goods_status==3">下架</el-tag>
<el-tag type="success" v-if="scope.row.goods_status == 1" class="f-green">上架</el-tag>
<el-tag type="info" v-else-if="scope.row.goods_status == 3">下架</el-tag>
</template>
</el-table-column>
</el-table>
......@@ -312,20 +312,20 @@
<el-table-column prop="brand_name" label="品牌" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="status" label="状态" width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-tag type="info" v-if="scope.row.status==1">比价中</el-tag>
<el-tag type="info" v-else-if="scope.row.status==2">已选中</el-tag>
<el-tag type="info" v-else-if="scope.row.status==3">已确认</el-tag>
<el-tag type="success" v-else-if="scope.row.status==4">已成单</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==5">已关闭</el-tag>
<el-tag type="danger" v-else-if="scope.row.status==9">已删除</el-tag>
<el-tag type="warning" v-else-if="scope.row.status==-1">已撤销</el-tag>
<el-tag type="info" v-if="scope.row.status == 1">比价中</el-tag>
<el-tag type="info" v-else-if="scope.row.status == 2">已选中</el-tag>
<el-tag type="info" v-else-if="scope.row.status == 3">已确认</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 4">已成单</el-tag>
<el-tag type="warning" v-else-if="scope.row.status == 5">已关闭</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 9">已删除</el-tag>
<el-tag type="warning" v-else-if="scope.row.status == -1">已撤销</el-tag>
</template>
</el-table-column>
<el-table-column prop="expire_status_val" label="是否有效" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="price_rmb" label="价格" width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<span v-if="scope.row.currency == 1">{{ scope.row.price_rmb|floatZero }}</span>
<span v-else>{{ scope.row.price_origin|floatZero }}</span>
<span v-if="scope.row.currency == 1">{{ scope.row.price_rmb | floatZero }}</span>
<span v-else>{{ scope.row.price_origin | floatZero }}</span>
</template>
</el-table-column>
<el-table-column prop="currency_val" label="币种" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
......@@ -336,7 +336,7 @@
<el-table-column prop="moq" label="起订量" width="100" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="price_other" label="其他费用" width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<span>{{ scope.row.price_other|floatZero }}</span>
<span>{{ scope.row.price_other | floatZero }}</span>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
......@@ -345,7 +345,7 @@
</template>
</template>
</div>
<Menu/>
<Menu />
<!--弹窗日志-->
<el-dialog title="询价管理日志" :close-on-click-modal="false" :visible.sync="dialogVisibleLog" width="1000px">
<el-table :data="logs" border max-height="600">
......@@ -386,12 +386,12 @@
</div>
<div class="content row">
<ul class="row year-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in year" :class="{curr:yearIndex==indexY}" @click="tabChange(indexY,1)">{{ v }}年</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in year" :class="{ curr: yearIndex == indexY }" @click="tabChange(indexY, 1)">{{ v }}年</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(1,year[yearIndex])">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(1, year[yearIndex])">确定</el-button>
</div>
</div>
<div class="batch-box verCenter">
......@@ -400,12 +400,12 @@
</div>
<div class="content row">
<ul class="row period-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in period" :class="{curr:periodIndex==indexY}" @click="tabChange(indexY,2)">{{ v }}</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in period" :class="{ curr: periodIndex == indexY }" @click="tabChange(indexY, 2)">{{ v }}</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(2,period[periodIndex])">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(2, period[periodIndex])">确定</el-button>
</div>
</div>
<div class="batch-box verCenter">
......@@ -414,12 +414,12 @@
</div>
<div class="content row">
<ul class="row period-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in period" :class="{curr:periodIndexTwo==indexY}" @click="tabChange(indexY,3)">{{ v }}</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in period" :class="{ curr: periodIndexTwo == indexY }" @click="tabChange(indexY, 3)">{{ v }}</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(3,period[periodIndexTwo])">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(3, period[periodIndexTwo])">确定</el-button>
</div>
</div>
</div>
......@@ -474,19 +474,19 @@
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import VueClipboard from 'vue-clipboard2'
import Tool from '../../tool'
import {Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Radio, RadioButton, RadioGroup, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import {NODE_ENVS} from "../../ajax";
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import VueClipboard from 'vue-clipboard2'
import Tool from '../../tool'
import { Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Radio, RadioButton, RadioGroup, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
import { NODE_ENVS } from "../../ajax";
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Radio).use(RadioGroup).use(RadioButton);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover).use(Tag).use(Tooltip);
Vue.use(VueClipboard);
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Radio).use(RadioGroup).use(RadioButton);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover).use(Tag).use(Tooltip);
Vue.use(VueClipboard);
export default {
export default {
name: "inquire",
data() {
return {
......@@ -613,7 +613,7 @@ export default {
this.formParam.deadline_time = '';
}
var params = Object.assign({}, {page: this.page}, {limit: this.limit}, this.formParam)
var params = Object.assign({}, { page: this.page }, { limit: this.limit }, this.formParam)
this.$http('get', "/api/inquiry/getlist", params).then(res => {
if (res.code === 0) {
this.tableData = res.data.list || [];
......@@ -1445,8 +1445,8 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/list/inquire.min.css";
@import "../../assets/css/list/inquire.min.css";
</style>
\ No newline at end of file
src/views/List/inquireDetail.vue
......@@ -5,27 +5,27 @@
<div class="input-box clr">
<div class="fl">
<span class="p-text">型号</span>
<input type="text" placeholder="" disabled :value="inquiry_info.goods_name" style="width: 180px;margin-right: 30px; "/>
<input type="text" placeholder="" disabled :value="inquiry_info.goods_name" style="width: 180px;margin-right: 30px; " />
</div>
<div class="fl">
<span class="p-text">品牌</span>
<input type="text" placeholder="" disabled :value="inquiry_info.brand_name" style="width: 180px;margin-right: 30px; "/>
<input type="text" placeholder="" disabled :value="inquiry_info.brand_name" style="width: 180px;margin-right: 30px; " />
</div>
<div class="fl">
<span class="p-text">数量</span>
<input type="text" placeholder="" disabled :value="inquiry_info.inquiry_number" style="width: 180px ;margin-right: 30px;"/>
<input type="text" placeholder="" disabled :value="inquiry_info.inquiry_number" style="width: 180px ;margin-right: 30px;" />
</div>
<div class="fl">
<span class="p-text">批次<font style="visibility:hidden;">型号</font></span>
<input type="text" placeholder="" disabled :value="inquiry_info.batch" style="width: 180px;margin-right: 30px; "/>
<input type="text" placeholder="" disabled :value="inquiry_info.batch" style="width: 180px;margin-right: 30px; " />
</div>
<div class="fl">
<span class="p-text">交货日期</span>
<input type="text" placeholder="" disabled :value="inquiry_info.delivery_time" style="width: 180px;margin-right: 30px; "/>
<input type="text" placeholder="" disabled :value="inquiry_info.delivery_time" style="width: 180px;margin-right: 30px; " />
</div>
<div class="fl">
<span class="p-text">询价单号</span>
<input type="text" placeholder="" disabled :value="inquiry_info.inquiry_sn" style="width: 138px "/>
<input type="text" placeholder="" disabled :value="inquiry_info.inquiry_sn" style="width: 138px " />
</div>
</div>
<p class="text">
......@@ -49,26 +49,26 @@
<el-table-column prop="brand_name" label="报价品牌" width="200"></el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope">
<span v-if="scope.row.status==1" class="f-green">确认中</span>
<span v-else-if="scope.row.status==2" class="f-yellow1">已选中</span>
<span v-else-if="scope.row.status==3">已成单</span>
<span v-else-if="scope.row.status==4" class="f-red1">已关闭</span>
<span v-if="scope.row.status == 1" class="f-green">确认中</span>
<span v-else-if="scope.row.status == 2" class="f-yellow1">已选中</span>
<span v-else-if="scope.row.status == 3">已成单</span>
<span v-else-if="scope.row.status == 4" class="f-red1">已关闭</span>
</template>
</el-table-column>
<el-table-column prop="expire_status_val" label="是否有效" width="100"></el-table-column>
<el-table-column prop="quote_number" label="报价数量" width="100"></el-table-column>
<el-table-column prop="price_origin" label="价格" width="130" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.price_origin|floatZero }}</span>
<span>{{ scope.row.price_origin | floatZero }}</span>
</template>
</el-table-column>
<el-table-column prop="currency" label="币种" width="100">
<template slot-scope="scope">
<span v-if="scope.row.currency==1">人民币</span>
<span v-else-if="scope.row.currency==2">美元</span>
<span v-else-if="scope.row.currency==3">港币</span>
<span v-else-if="scope.row.currency==4">欧元</span>
<span v-else-if="scope.row.currency==5">英磅</span>
<span v-if="scope.row.currency == 1">人民币</span>
<span v-else-if="scope.row.currency == 2">美元</span>
<span v-else-if="scope.row.currency == 3">港币</span>
<span v-else-if="scope.row.currency == 4">欧元</span>
<span v-else-if="scope.row.currency == 5">英磅</span>
</template>
</el-table-column>
<el-table-column prop="tax_rate" label="税率" width="100"></el-table-column>
......@@ -78,7 +78,7 @@
<el-table-column prop="moq" label="起订量" width="100"></el-table-column>
<el-table-column prop="price_other" label="其他费用" width="100">
<template slot-scope="scope">
<span>{{ scope.row.price_other|floatZero }}</span>
<span>{{ scope.row.price_other | floatZero }}</span>
</template>
</el-table-column>
<el-table-column prop="expire_time" label="报价有效期" width="200"></el-table-column>
......@@ -90,17 +90,16 @@
<div class="assistant">
<i class="ic"></i>
<ul class="tab row verCenter">
<li @click="tab(index)" class="boxsiz row rowCenter verCenter" :class="{'curr':active==index}"
v-for="(item,index) in textArr" :key="index">{{ item }}
<li @click="tab(index)" class="boxsiz row rowCenter verCenter" :class="{ 'curr': active == index }" v-for="(item, index) in textArr" :key="index">{{ item }}
</li>
</ul>
<div class="data-box th-all">
<!--匹配库存-->
<template v-if="active==0">
<template v-if="active == 0">
<el-table :key="2" :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed label="操作" width="108" align="center">
<template slot-scope="scope">
<span class="dcg" :class="{'disabled':scope.row.disabled}" @click="handle(scope.$index, scope.row)">确认</span>
<span class="dcg" :class="{ 'disabled': scope.row.disabled }" @click="handle(scope.$index, scope.row)">确认</span>
</template>
</el-table-column>
<el-table-column fixed prop="goods_name" label="型号" width="180"></el-table-column>
......@@ -112,7 +111,7 @@
<el-table-column prop="stock" label="库存数量" width="150">
</el-table-column>
<el-table-column prop="cn_ladder_price" label="国内含税价（￥）" width="140">
<template slot-scope="scope" v-if="scope.row.cn_ladder_price&&scope.row.cn_ladder_price.length>0">
<template slot-scope="scope" v-if="scope.row.cn_ladder_price && scope.row.cn_ladder_price.length > 0">
<div class="price-more">
<el-tooltip placement="bottom" effect="light">
<div slot="content">
......@@ -129,7 +128,7 @@
</template>
</el-table-column>
<el-table-column prop="hk_ladder_price" label="香港交货价（＄）" width="150">
<template slot-scope="scope" v-if="scope.row.hk_ladder_price&&scope.row.hk_ladder_price.length>0">
<template slot-scope="scope" v-if="scope.row.hk_ladder_price && scope.row.hk_ladder_price.length > 0">
<div class="price-more">
<el-tooltip placement="bottom" effect="light">
<div slot="content">
......@@ -150,8 +149,8 @@
</el-table-column>
<el-table-column prop="goods_status" label="状态" width="150">
<template slot-scope="scope">
<span v-if="scope.row.goods_status==1" class="f-green">上架</span>
<span v-else-if="scope.row.goods_status==3">下架</span>
<span v-if="scope.row.goods_status == 1" class="f-green">上架</span>
<span v-else-if="scope.row.goods_status == 3">下架</span>
</template>
</el-table-column>
</el-table>
......@@ -162,26 +161,26 @@
<el-table :key="1" :data="historyList" border style="width: 100%">
<el-table-column fixed label="操作" width="108" align="center">
<template slot-scope="scope">
<span class="dcg " :class="{'disabled':scope.row.disabled}" @click="handle(scope.$index, scope.row)">确认</span>
<span class="dcg " :class="{ 'disabled': scope.row.disabled }" @click="handle(scope.$index, scope.row)">确认</span>
</template>
</el-table-column>
<el-table-column fixed prop="goods_name" label="报价型号" width="200"></el-table-column>
<el-table-column fixed prop="brand_name" label="报价品牌" width="200"></el-table-column>
<el-table-column fixed prop="status" label="状态" width="100">
<template slot-scope="scope">
<span v-if="scope.row.status==1" class="f-green">比价中</span>
<span v-else-if="scope.row.status==2" class="f-yellow1">已选中</span>
<span v-else-if="scope.row.status==3">已确认</span>
<span v-else-if="scope.row.status==4" class="f-green">已成单</span>
<span v-else-if="scope.row.status==5" class="f-red1">已关闭</span>
<span v-else-if="scope.row.status==9" class="f-red1">已删除</span>
<span v-else-if="scope.row.status==-1" class="f-red1">已撤销</span>
<span v-if="scope.row.status == 1" class="f-green">比价中</span>
<span v-else-if="scope.row.status == 2" class="f-yellow1">已选中</span>
<span v-else-if="scope.row.status == 3">已确认</span>
<span v-else-if="scope.row.status == 4" class="f-green">已成单</span>
<span v-else-if="scope.row.status == 5" class="f-red1">已关闭</span>
<span v-else-if="scope.row.status == 9" class="f-red1">已删除</span>
<span v-else-if="scope.row.status == -1" class="f-red1">已撤销</span>
</template>
</el-table-column>
<el-table-column prop="expire_status_val" label="是否有效" width="100"></el-table-column>
<el-table-column prop="price_rmb" label="价格" width="100">
<template slot-scope="scope">
<span>{{ scope.row.price_rmb|floatZero }}</span>
<span>{{ scope.row.price_rmb | floatZero }}</span>
</template>
</el-table-column>
<el-table-column prop="currency" label="币种" width="100"></el-table-column>
......@@ -192,7 +191,7 @@
<el-table-column prop="moq" label="起订量" width="100"></el-table-column>
<el-table-column prop="price_other" label="其他费用" width="200">
<template slot-scope="scope">
<span>{{ scope.row.price_other|floatZero }}</span>
<span>{{ scope.row.price_other | floatZero }}</span>
</template>
</el-table-column>
<el-table-column prop="expire_time" label="报价有效期" width="200"></el-table-column>
......@@ -202,8 +201,7 @@
<el-table-column prop="inquiry_brand_name" label="品牌" width="200"></el-table-column>
<el-table-column prop="inquiry_sn" label="询价单号" width="200"></el-table-column>
</el-table>
<el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total"
@current-change="handleCurrentChange" :current-page="page"></el-pagination>
<el-pagination layout="prev, pager, next,jumper" :page-size="limit" :total="total" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</template>
</div>
</div>
......@@ -239,12 +237,12 @@
</div>
<div class="content row">
<ul class="row year-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in year" :class="{curr:yearIndex==indexY}" @click="tabChange(indexY,1)">{{ v }}年</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in year" :class="{ curr: yearIndex == indexY }" @click="tabChange(indexY, 1)">{{ v }}年</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(1,year[yearIndex])">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(1, year[yearIndex])">确定</el-button>
</div>
</div>
<div class="batch-box verCenter">
......@@ -253,12 +251,12 @@
</div>
<div class="content row">
<ul class="row period-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in period" :class="{curr:periodIndex==indexY}" @click="tabChange(indexY,2)">{{ v }}</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in period" :class="{ curr: periodIndex == indexY }" @click="tabChange(indexY, 2)">{{ v }}</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(2,period[periodIndex])">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(2, period[periodIndex])">确定</el-button>
</div>
</div>
<div class="batch-box verCenter">
......@@ -267,12 +265,12 @@
</div>
<div class="content row">
<ul class="row period-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in period" :class="{curr:periodIndexTwo==indexY}" @click="tabChange(indexY,3)">{{ v }}</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in period" :class="{ curr: periodIndexTwo == indexY }" @click="tabChange(indexY, 3)">{{ v }}</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(3,period[periodIndexTwo])">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(3, period[periodIndexTwo])">确定</el-button>
</div>
</div>
</div>
......@@ -324,21 +322,21 @@
<el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
</div>
</el-dialog>
<Menu/>
<Menu />
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {dateTimeFormate} from "../../filters/formate.js";
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { dateTimeFormate } from "../../filters/formate.js";
import {Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tooltip} from 'element-ui'
import { Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Tooltip).use(Popover)
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination)
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Tooltip).use(Popover)
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination)
export default {
export default {
name: "InquireDetail",
data() {
return {
......@@ -673,7 +671,7 @@ export default {
currentChange(val) {
if (val == 1) {
this.ruleForm.tax_rate = '13%';
} else{
} else {
this.ruleForm.tax_rate = '0%';
}
},
......@@ -947,8 +945,8 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/list/inquireDetail.min.css";
@import "../../assets/css/list/inquireDetail.min.css";
</style>
\ No newline at end of file
src/views/List/quote.vue
......@@ -109,7 +109,7 @@
<el-table-column prop="moq" label="起订量" width="100" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="price_other" label="其他费用" width="100" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.price_other|floatZero }}</span>
<span>{{ scope.row.price_other | floatZero }}</span>
</template>
</el-table-column>
<el-table-column prop="expire_time_val" label="报价有效期" width="200" align="center" :show-overflow-tooltip="true"></el-table-column>
......@@ -124,7 +124,7 @@
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
</div>
<Menu/>
<Menu />
<el-dialog title="报价管理日志" :close-on-click-modal="false" :visible.sync="dialogVisible" width="1000px">
<el-table :data="logs" border max-height="600">
<el-table-column prop="create_time" label="时间" min-width="150" align="center"></el-table-column>
......@@ -164,12 +164,12 @@
</div>
<div class="content row">
<ul class="row year-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in year" :class="{curr:yearIndex==indexY}" @click="tabChange(indexY,1)">{{ v }}年</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in year" :class="{ curr: yearIndex == indexY }" @click="tabChange(indexY, 1)">{{ v }}年</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(1,year[yearIndex])">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(1, year[yearIndex])">确定</el-button>
</div>
</div>
<div class="batch-box verCenter">
......@@ -178,12 +178,12 @@
</div>
<div class="content row">
<ul class="row period-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in period" :class="{curr:periodIndex==indexY}" @click="tabChange(indexY,2)">{{ v }}</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in period" :class="{ curr: periodIndex == indexY }" @click="tabChange(indexY, 2)">{{ v }}</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(2,period[periodIndex])">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(2, period[periodIndex])">确定</el-button>
</div>
</div>
<div class="batch-box verCenter">
......@@ -192,12 +192,12 @@
</div>
<div class="content row">
<ul class="row period-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in period" :class="{curr:periodIndexTwo==indexY}" @click="tabChange(indexY,3)">{{ v }}</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in period" :class="{ curr: periodIndexTwo == indexY }" @click="tabChange(indexY, 3)">{{ v }}</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(3,period[periodIndexTwo])">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(3, period[periodIndexTwo])">确定</el-button>
</div>
</div>
</div>
......@@ -252,17 +252,17 @@
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import {NODE_ENVS} from "../../ajax";
import Tool from '../../tool'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
import { NODE_ENVS } from "../../ajax";
import Tool from '../../tool'
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Tooltip).use(Popover);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Tag);
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Autocomplete).use(Tooltip).use(Popover);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Tag);
export default {
export default {
name: "quote",
data() {
return {
......@@ -369,7 +369,7 @@ export default {
} else {
this.formParam.quote_time = '';
}
var params = Object.assign({}, {page: this.page}, {limit: this.limit}, this.formParam);
var params = Object.assign({}, { page: this.page }, { limit: this.limit }, this.formParam);
this.$http('get', "/api/quote/getlist", params).then(res => {
if (res.code === 0) {
this.tableData = res.data.list || [];
......@@ -789,8 +789,8 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/list/quote.min.css";
@import "../../assets/css/list/quote.min.css";
</style>
\ No newline at end of file
src/views/News/index.vue
......@@ -33,7 +33,7 @@
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
</div>
<Menu/>
<Menu />
<el-dialog title="消息详情" :close-on-click-modal="false" :visible.sync="dialogVisible" width="1000px">
<el-descriptions size="medium" border :column="2">
<el-descriptions-item>
......@@ -58,16 +58,16 @@
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "news",
data() {
return {
......@@ -89,10 +89,10 @@ export default {
methods: {
getData() {
var params = Object.assign({},
{page: this.page, limit: this.limit},
{ page: this.page, limit: this.limit },
this.formParam,
{start_time: this.formParam.date ? this.formParam.date[0] : ''},
{end_time: this.formParam.date ? this.formParam.date[1] : ''}
{ start_time: this.formParam.date ? this.formParam.date[0] : '' },
{ end_time: this.formParam.date ? this.formParam.date[1] : '' }
);
this.$http('GET', "/api/message/getMsgList", params).then(res => {
if (res.code === 0) {
......@@ -107,7 +107,7 @@ export default {
})
},
getMsgDetail(msg_id) {
this.$http('GET', "/api/message/getMsgDetail", {msg_id: msg_id}).then(res => {
this.$http('GET', "/api/message/getMsgDetail", { msg_id: msg_id }).then(res => {
if (res.code === 0) {
this.msgDetail = res.data;
this.dialogVisible = true;
......@@ -142,8 +142,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/News/notice.vue
......@@ -24,7 +24,7 @@
<div class="notice-content" v-html="noticeMsg.content"></div>
<div class="enclosure row verCenter">
<span>附件：</span>
<a class="down" :href="noticeMsg.attachment_url " target="_blank">{{ noticeMsg.attachment_name || '暂无附件' }}</a>
<a class="down" :href="noticeMsg.attachment_url" target="_blank">{{ noticeMsg.attachment_name || '暂无附件' }}</a>
</div>
<div class="notice-bottom row bothSide verCenter">
<span>发件人：深圳市猎芯科技有限公司</span>
......@@ -32,20 +32,20 @@
</div>
</el-dialog>
</div>
<Menu/>
<Menu />
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "notice",
data() {
return {
......@@ -95,8 +95,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped lang="less">
</style>
\ No newline at end of file
<style scoped lang="less"></style>
\ No newline at end of file
src/views/OrderTrack/goods.vue
......@@ -80,7 +80,7 @@
<el-table-column fixed type="selection" width="40" align="center"></el-table-column>
<el-table-column prop="purchase_sn" label="订单号" width="200" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<a :href="'/#/orderTrackGoodsDetail?purchase_id='+scope.row.purchase_id" class="alink">{{ scope.row.purchase_sn }}</a>
<a :href="'/#/orderTrackGoodsDetail?purchase_id=' + scope.row.purchase_id" class="alink">{{ scope.row.purchase_sn }}</a>
</template>
</el-table-column>
<el-table-column prop="company_name" label="订货公司" min-width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
......@@ -107,8 +107,8 @@
<el-table-column prop="shipping_status_val" label="发货状态" width="100" align="center">
<template slot-scope="scope">
<span v-if="scope.row.shipping_status_val == '待发货'">{{ scope.row.shipping_status_val }}</span>
<a class="f-yellow1" v-if="scope.row.shipping_status_val == '部分发货'" :href="'/#/orderTrackInvoice?purchase_id='+scope.row.purchase_id">{{ scope.row.shipping_status_val }}</a>
<a class="alink" v-if="scope.row.shipping_status_val == '全部发货'" :href="'/#/orderTrackInvoice?purchase_id='+scope.row.purchase_id">{{ scope.row.shipping_status_val }}</a>
<a class="f-yellow1" v-if="scope.row.shipping_status_val == '部分发货'" :href="'/#/orderTrackInvoice?purchase_id=' + scope.row.purchase_id">{{ scope.row.shipping_status_val }}</a>
<a class="alink" v-if="scope.row.shipping_status_val == '全部发货'" :href="'/#/orderTrackInvoice?purchase_id=' + scope.row.purchase_id">{{ scope.row.shipping_status_val }}</a>
</template>
</el-table-column>
<el-table-column prop="buyer_name" label="订单人员" width="100" align="center">
......@@ -158,17 +158,17 @@
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Cascader, DatePicker, Dialog, Form, FormItem, Input, Message, Option, Pagination, Popover, Select, Table, TableColumn, Tag} from 'element-ui'
import Tool from "@/tool";
import {NODE_ENVS} from "@/ajax";
import qs from 'qs';
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, Cascader, DatePicker, Dialog, Form, FormItem, Input, Message, Option, Pagination, Popover, Select, Table, TableColumn, Tag } from 'element-ui'
import Tool from "@/tool";
import { NODE_ENVS } from "@/ajax";
import qs from 'qs';
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
Vue.use(TableColumn).use(Table).use(Cascader).use(Autocomplete).use(DatePicker).use(Tag).use(Popover);
export default {
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
Vue.use(TableColumn).use(Table).use(Cascader).use(Autocomplete).use(DatePicker).use(Tag).use(Popover);
export default {
name: "orderTrackGoods",
data() {
return {
......@@ -219,7 +219,7 @@ export default {
} else {
this.formInline.create_time = '';
}
var params = Object.assign({}, {page: this.page}, {limit: this.limit}, this.formInline, {inquiry_item_id: this.inquiry_item_id})
var params = Object.assign({}, { page: this.page }, { limit: this.limit }, this.formInline, { inquiry_item_id: this.inquiry_item_id })
this.$http('post', "/api/purchase/getPurchaseList", params).then(res => {
if (res.code === 0) {
this.tableData = res.data.list || [];
......@@ -279,7 +279,7 @@ export default {
var ids = this.multipleSelection.map(obj => {
return obj.purchase_id;
});
var params = Object.assign({}, {token: Tool.getCookie('token')},{ids: ids.join(',')})
var params = Object.assign({}, { token: Tool.getCookie('token') }, { ids: ids.join(',') })
var url = NODE_ENVS + '/api/purchase/export?' + qs.stringify(params);
const newsUrl = this.$router.resolve(url);
window.open(url);
......@@ -370,12 +370,12 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped lang="less">
@import "../../assets/css/goods/goods.min.css";
@import "../../assets/css/goods/goods.min.css";
.tetx-goods {
.tetx-goods {
font-size: 12px;
margin-top: 20px;
flex-wrap: wrap;
......@@ -390,5 +390,5 @@ export default {
font-weight: bold;
margin-right: 15px;
}
}
}
</style>
\ No newline at end of file
src/views/OrderTrack/invoice.vue
......@@ -62,9 +62,9 @@
<el-table-column prop="in_qty" label="到货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="status_val" label="状态" min-width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.status == 2 " disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="primary" v-else-if="scope.row.status == 1 " disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="info" v-else-if="scope.row.status == -3 " disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="success" v-if="scope.row.status == 2" disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="primary" v-else-if="scope.row.status == 1" disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="info" v-else-if="scope.row.status == -3" disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="primary" v-else>{{ scope.row.status_val }}</el-tag>
<el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
<i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
......@@ -113,18 +113,18 @@
</div>
</el-dialog>
</div>
<Menu/>
<Menu />
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Dialog, Form, FormItem, Image, Input, Link, Message, MessageBox, Option, Pagination, Select, Table, TableColumn, Tag} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Dialog, Form, FormItem, Image, Input, Link, Message, MessageBox, Option, Pagination, Select, Table, TableColumn, Tag } from 'element-ui'
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
Vue.use(TableColumn).use(Table).use(Autocomplete).use(Tag).use(DatePicker).use(Image).use(Link);
export default {
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
Vue.use(TableColumn).use(Table).use(Autocomplete).use(Tag).use(DatePicker).use(Image).use(Link);
export default {
name: "orderTrackInvoice",
data() {
return {
......@@ -179,7 +179,7 @@ export default {
} else {
this.formInline.qc_time = '';
}
var params = Object.assign({}, {page: this.page}, {limit: this.limit}, this.formInline, {purchase_id: this.purchase_id});
var params = Object.assign({}, { page: this.page }, { limit: this.limit }, this.formInline, { purchase_id: this.purchase_id });
this.$http('post', "/api/purchase/getDeliveryList", params).then(res => {
if (res.code === 0) {
this.tableData = res.data.list || [];
......@@ -194,7 +194,7 @@ export default {
*/
viewPic(qc_id, type) {
if (type == 2) {
this.$http('POST', "/api/purchase/getQcAttachments", {qc_id: qc_id}).then(res => {
this.$http('POST', "/api/purchase/getQcAttachments", { qc_id: qc_id }).then(res => {
if (res.code === 0) {
this.dialogFileVisible = true;
this.qcAttachments = res.data.list;
......@@ -203,7 +203,7 @@ export default {
}
})
} else {
this.$http('POST', "/api/purchase/getQcImages", {qc_id: qc_id}).then(res => {
this.$http('POST', "/api/purchase/getQcImages", { qc_id: qc_id }).then(res => {
if (res.code === 0) {
this.dialogVisible = true;
this.qcImage = res.data.list;
......@@ -264,7 +264,7 @@ export default {
MessageBox.confirm('确定取消发货吗？', {
type: 'error'
}).then(() => {
this.$http('POST', "/api/purchase/cancelSupDelivery", {stock_in_ids: stock_in_ids.join(',')}).then(res => {
this.$http('POST', "/api/purchase/cancelSupDelivery", { stock_in_ids: stock_in_ids.join(',') }).then(res => {
if (res.code == 0) {
this.$message({
message: "操作成功",
......@@ -343,17 +343,17 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/goods/goods.min.css";
@import "../../assets/css/goods/goods.min.css";
.pic-list {
.pic-list {
flex-wrap: wrap;
}
}
.pic-list .el-image {
.pic-list .el-image {
margin-right: 10px;
margin-bottom: 10px;
}
}
</style>
\ No newline at end of file
src/views/OrderTrack/purAdd.vue
......@@ -64,14 +64,14 @@
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Cascader, DatePicker, Dialog, Form, FormItem, Input, Message, Option, Pagination, Select, Table, TableColumn} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, Cascader, DatePicker, Dialog, Form, FormItem, Input, Message, Option, Pagination, Select, Table, TableColumn } from 'element-ui'
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination).use(DatePicker);
Vue.use(TableColumn).use(Table).use(Cascader).use(Autocomplete);
export default {
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination).use(DatePicker);
Vue.use(TableColumn).use(Table).use(Cascader).use(Autocomplete);
export default {
name: "orderTrackPurAdd",
data() {
return {
......@@ -85,10 +85,10 @@ export default {
},
rules: {
shipping_id: [
{required: true, message: '请选择物流公司', trigger: 'change'}
{ required: true, message: '请选择物流公司', trigger: 'change' }
],
shipment_number: [
{required: true, message: '请输入物流单号', trigger: 'change'}
{ required: true, message: '请输入物流单号', trigger: 'change' }
]
},
itemlist: [],
......@@ -194,8 +194,8 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/goods/goods.min.css";
@import "../../assets/css/goods/goods.min.css";
</style>
\ No newline at end of file
src/views/OrderTrack/returnGoods.vue
......@@ -45,18 +45,18 @@
<el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
<el-table-column prop="stock_in_sn" label="对应发货单" width="160" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<a class="alink" :href="'/#/orderTrackInvoice?stock_in_sn='+scope.row.stock_in_sn">{{ scope.row.stock_in_sn }}</a>
<a class="alink" :href="'/#/orderTrackInvoice?stock_in_sn=' + scope.row.stock_in_sn">{{ scope.row.stock_in_sn }}</a>
</template>
</el-table-column>
<el-table-column prop="status_val" label="状态" width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-tag type="danger" v-if="scope.row.status==-3">作废</el-tag>
<el-tag type="primary" v-else-if=" scope.row.status==-2">待提审</el-tag>
<el-tag type="primary" v-else-if=" scope.row.status==-1">待审核</el-tag>
<el-tag type="primary" v-else-if=" scope.row.status==1">待退货入库</el-tag>
<el-tag type="warning" v-else-if=" scope.row.status==2">待付款退款</el-tag>
<el-tag type="success" v-else-if="scope.row.status==3">完成</el-tag>
<el-tag v-else-if="scope.row.status==4">待同步金蝶</el-tag>
<el-tag type="danger" v-if="scope.row.status == -3">作废</el-tag>
<el-tag type="primary" v-else-if="scope.row.status == -2">待提审</el-tag>
<el-tag type="primary" v-else-if="scope.row.status == -1">待审核</el-tag>
<el-tag type="primary" v-else-if="scope.row.status == 1">待退货入库</el-tag>
<el-tag type="warning" v-else-if="scope.row.status == 2">待付款退款</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 3">完成</el-tag>
<el-tag v-else-if="scope.row.status == 4">待同步金蝶</el-tag>
</template>
</el-table-column>
<el-table-column prop="goods_name" label="型号" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
......@@ -71,18 +71,18 @@
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
</div>
<Menu/>
<Menu />
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Dialog, Form, FormItem, Input, Message, Option, Pagination, Select, Table, TableColumn, Tag} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Dialog, Form, FormItem, Input, Message, Option, Pagination, Select, Table, TableColumn, Tag } from 'element-ui'
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
Vue.use(TableColumn).use(Table).use(Autocomplete).use(Tag).use(DatePicker);
export default {
Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
Vue.use(TableColumn).use(Table).use(Autocomplete).use(Tag).use(DatePicker);
export default {
name: "orderTrackInvoice",
data() {
return {
......@@ -113,7 +113,7 @@ export default {
} else {
this.formInline.create_time = '';
}
var params = Object.assign({}, {page: this.page}, {limit: this.limit}, this.formInline)
var params = Object.assign({}, { page: this.page }, { limit: this.limit }, this.formInline)
this.$http('post', "/api/purchase/getReturnMaterialList", params).then(res => {
if (res.code === 0) {
this.tableData = res.data.list || [];
......@@ -204,8 +204,8 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/goods/goods.min.css";
@import "../../assets/css/goods/goods.min.css";
</style>
\ No newline at end of file
src/views/Store/enter.vue
......@@ -32,16 +32,16 @@
<el-table-column fixed type="selection" width="40" align="center"></el-table-column>
<el-table-column label="单号" min-width="20%" align="center">
<template slot-scope="scope">
<a :href="'/#/listDetail?sn='+scope.row.up_sn+'&id='+scope.row.id" class="alink">{{ scope.row.up_sn }}</a>
<a :href="'/#/listDetail?sn=' + scope.row.up_sn + '&id=' + scope.row.id" class="alink">{{ scope.row.up_sn }}</a>
</template>
</el-table-column>
<el-table-column prop="file_name" label="文件名字" min-width="20%" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="status" label="状态" width="120" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="primary">待处理</el-tag>
<el-tag v-else-if="scope.row.status==2" type="warning">处理中</el-tag>
<el-tag v-else-if="scope.row.status==3" type="success">已处理</el-tag>
<el-tag v-else-if="scope.row.status==4" type="danger">失败</el-tag>
<el-tag v-if="scope.row.status == 1" type="primary">待处理</el-tag>
<el-tag v-else-if="scope.row.status == 2" type="warning">处理中</el-tag>
<el-tag v-else-if="scope.row.status == 3" type="success">已处理</el-tag>
<el-tag v-else-if="scope.row.status == 4" type="danger">失败</el-tag>
<el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
<i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
<div slot="content">{{ scope.row.status_tips }}</div>
......@@ -78,7 +78,7 @@
</template>
</p>
<p class="tt" style="font-size: 12px;">
上传的型号经由猎芯审核通过后，会展示在【猎芯网】进行售卖，并参与【猎芯询报价】系统自动推送询价<br/>
上传的型号经由猎芯审核通过后，会展示在【猎芯网】进行售卖，并参与【猎芯询报价】系统自动推送询价<br />
您此次上传的型号是否要对已在【猎芯网】展示的型号进行覆盖或是新增？
</p>
<p class="alink">覆盖：已在【猎芯网】进行展示的型号全部下架，展示现在新上传的型号；</p>
......@@ -91,26 +91,26 @@
<el-button @click="dialogVisible = false" style="margin-right: 10px;">取 消</el-button>
<el-upload :data="fileData" :action="uploadUrl" :before-upload="handleBeforeUpload" :on-success="handleChange" :on-progress="handleProgress">
<el-button type="primary" :loading="uploading">确 定</el-button>
<el-progress v-if="uploading" :percentage="progress"/>
<el-progress v-if="uploading" :percentage="progress" />
</el-upload>
</div>
</div>
</el-dialog>
</div>
<Menu/>
<Menu />
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import Tool from '../../tool'
import {NODE_ENVS} from "../../ajax";
import {Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Progress, Radio, Select, Table, TableColumn, Tag, Tooltip, Upload} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import Tool from '../../tool'
import { NODE_ENVS } from "../../ajax";
import { Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Progress, Radio, Select, Table, TableColumn, Tag, Tooltip, Upload } from 'element-ui'
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination).use(Tag).use(Tooltip);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Upload).use(Radio).use(Progress);
export default {
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination).use(Tag).use(Tooltip);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Upload).use(Radio).use(Progress);
export default {
name: "enter",
data() {
return {
......@@ -294,12 +294,12 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/store/enter.min.css";
@import "../../assets/css/store/enter.min.css";
.downTemplate {
.downTemplate {
width: 68px;
height: 28px;
text-align: center;
......@@ -312,15 +312,15 @@ export default {
margin-left: 10px;
margin-right: 10px;
display: block;
}
}
.dialog-text .tt {
.dialog-text .tt {
color: #333;
font-weight: bold;
margin-bottom: 16px;
}
}
.dialog-text .alink {
.dialog-text .alink {
font-size: 12px;
}
}
</style>
\ No newline at end of file
src/views/Store/goodDetail.vue
......@@ -39,20 +39,20 @@
</el-table>
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
<Menu/>
<Menu />
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Descriptions, DescriptionsItem, Message, Pagination, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import {NODE_ENVS} from "@/ajax";
import Tool from "@/tool";
import { Descriptions, DescriptionsItem, Message, Pagination, Table, TableColumn, Tag, Tooltip } from 'element-ui'
import { NODE_ENVS } from "@/ajax";
import Tool from "@/tool";
Vue.prototype.$message = Message;
Vue.use(Pagination).use(TableColumn).use(Table).use(Tag).use(Descriptions).use(DescriptionsItem).use(Tooltip);
export default {
Vue.prototype.$message = Message;
Vue.use(Pagination).use(TableColumn).use(Table).use(Tag).use(Descriptions).use(DescriptionsItem).use(Tooltip);
export default {
name: "goodDetail",
data() {
return {
......@@ -116,25 +116,25 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/store/listDetail.min.css";
@import "../../assets/css/store/listDetail.min.css";
.btn-nav {
.btn-nav {
background: #FFFFFF;
padding: 0 0 20px 20px;
}
}
::v-deep .el-descriptions-item__label {
::v-deep .el-descriptions-item__label {
white-space: nowrap;
}
}
::v-deep .el-descriptions-item__content {
::v-deep .el-descriptions-item__content {
white-space: nowrap;
}
}
.downTemplateExport {
.downTemplateExport {
width: 92px;
height: 28px;
text-align: center;
......@@ -147,5 +147,5 @@ export default {
margin-right: 10px;
display: block;
cursor: pointer;
}
}
</style>
\ No newline at end of file
src/views/Store/goodslist.vue
......@@ -45,7 +45,7 @@
<span style="width: 20%;" class="row verCenter">次数</span>
</div>
<div class="list">
<div class="box row verCenter" v-for="(v,index) in skuRankList[2]">
<div class="box row verCenter" v-for="(v, index) in skuRankList[2]">
<span style="width: 40%;">{{ v.goods_name }}</span>
<span style="width: 40%;">{{ v.brand_name }}</span>
<template v-if="index == 0">
......@@ -72,7 +72,7 @@
<span style="width: 20%;" class="row verCenter">次数</span>
</div>
<div class="list">
<div class="box row verCenter" v-for="(v,index) in skuRankList[3]">
<div class="box row verCenter" v-for="(v, index) in skuRankList[3]">
<span style="width: 40%;">{{ v.goods_name }}</span>
<span style="width: 40%;">{{ v.brand_name }}</span>
<template v-if="index == 0">
......@@ -99,7 +99,7 @@
<span style="width: 20%;" class="row verCenter">次数</span>
</div>
<div class="list">
<div class="box row verCenter" v-for="(v,index) in skuRankList[4]">
<div class="box row verCenter" v-for="(v, index) in skuRankList[4]">
<span style="width: 40%;">{{ v.goods_name }}</span>
<span style="width: 40%;">{{ v.brand_name }}</span>
<template v-if="index == 0">
......@@ -200,7 +200,7 @@
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
</div>
<Menu/>
<Menu />
<!--新增优势物料-->
<el-dialog title="新增优势物料" :close-on-click-modal="false" :visible.sync="addBestgoods.dialogVisible" width="1000px">
<div class="dialog-form bestGoodsList-dialog">
......@@ -241,7 +241,7 @@
<span>操作</span>
</th>
</tr>
<tr v-for="(item,index) in addBestgoodsParam">
<tr v-for="(item, index) in addBestgoodsParam">
<td>
<el-autocomplete v-model="addBestgoodsParam[index].goods_name" :trigger-on-focus="false" :fetch-suggestions="querySearchAsync" placeholder="型号"></el-autocomplete>
</td>
......@@ -270,12 +270,12 @@
</div>
<div class="content row">
<ul class="row year-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in year" :class="{curr:yearIndex==indexY}" @click="tabChange(indexY,1)">{{ v }}年</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in year" :class="{ curr: yearIndex == indexY }" @click="tabChange(indexY, 1)">{{ v }}年</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(1,year[yearIndex],index)">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(1, year[yearIndex], index)">确定</el-button>
</div>
</div>
<div class="batch-box verCenter">
......@@ -284,12 +284,12 @@
</div>
<div class="content row">
<ul class="row period-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in period" :class="{curr:periodIndex==indexY}" @click="tabChange(indexY,2)">{{ v }}</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in period" :class="{ curr: periodIndex == indexY }" @click="tabChange(indexY, 2)">{{ v }}</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(2,period[periodIndex],index)">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(2, period[periodIndex], index)">确定</el-button>
</div>
</div>
<div class="batch-box verCenter">
......@@ -298,12 +298,12 @@
</div>
<div class="content row">
<ul class="row period-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in period" :class="{curr:periodIndexTwo==indexY}" @click="tabChange(indexY,3)">{{ v }}</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in period" :class="{ curr: periodIndexTwo == indexY }" @click="tabChange(indexY, 3)">{{ v }}</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(1,index)">清空</el-button>
<el-button size="mini" round @click="confirm(3,period[periodIndexTwo],index)">确定</el-button>
<el-button size="mini" round @click="clear(1, index)">清空</el-button>
<el-button size="mini" round @click="confirm(3, period[periodIndexTwo], index)">确定</el-button>
</div>
</div>
</div>
......@@ -369,7 +369,7 @@
<span>香港交期</span>
</th>
</tr>
<tr v-for="(item,index) in updateBestgoodsParam">
<tr v-for="(item, index) in updateBestgoodsParam">
<td>
<el-autocomplete v-model="updateBestgoodsParam[index].goods_name" :trigger-on-focus="false" :fetch-suggestions="querySearchAsync" placeholder="型号"></el-autocomplete>
</td>
......@@ -398,12 +398,12 @@
</div>
<div class="content row">
<ul class="row year-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in year" :class="{curr:yearIndex==indexY}" @click="tabChange(indexY,1)">{{ v }}年</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in year" :class="{ curr: yearIndex == indexY }" @click="tabChange(indexY, 1)">{{ v }}年</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(2,index)">清空</el-button>
<el-button size="mini" round @click="confirmUpdate(1,year[yearIndex],index)">确定</el-button>
<el-button size="mini" round @click="clear(2, index)">清空</el-button>
<el-button size="mini" round @click="confirmUpdate(1, year[yearIndex], index)">确定</el-button>
</div>
</div>
<div class="batch-box verCenter">
......@@ -412,12 +412,12 @@
</div>
<div class="content row">
<ul class="row period-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in period" :class="{curr:periodIndex==indexY}" @click="tabChange(indexY,2)">{{ v }}</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in period" :class="{ curr: periodIndex == indexY }" @click="tabChange(indexY, 2)">{{ v }}</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(2,index)">清空</el-button>
<el-button size="mini" round @click="confirmUpdate(2,period[periodIndex],index)">确定</el-button>
<el-button size="mini" round @click="clear(2, index)">清空</el-button>
<el-button size="mini" round @click="confirmUpdate(2, period[periodIndex], index)">确定</el-button>
</div>
</div>
<div class="batch-box verCenter">
......@@ -426,12 +426,12 @@
</div>
<div class="content row">
<ul class="row period-list">
<li class="row rowCenter verCenter" v-for="(v,indexY) in period" :class="{curr:periodIndexTwo==indexY}" @click="tabChange(indexY,3)">{{ v }}</li>
<li class="row rowCenter verCenter" v-for="(v, indexY) in period" :class="{ curr: periodIndexTwo == indexY }" @click="tabChange(indexY, 3)">{{ v }}</li>
</ul>
</div>
<div class="footer-btn row verCenter">
<el-button size="mini" round @click="clear(2,index)">清空</el-button>
<el-button size="mini" round @click="confirmUpdate(3,period[periodIndexTwo],index)">确定</el-button>
<el-button size="mini" round @click="clear(2, index)">清空</el-button>
<el-button size="mini" round @click="confirmUpdate(3, period[periodIndexTwo], index)">确定</el-button>
</div>
</div>
</div>
......@@ -467,18 +467,18 @@
</section>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip, Upload} from 'element-ui'
import {NODE_ENVS} from "../../ajax";
import Tool from "@/tool";
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip, Upload } from 'element-ui'
import { NODE_ENVS } from "../../ajax";
import Tool from "@/tool";
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag)
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Upload)
export default {
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag)
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Upload)
export default {
name: "goodslisr",
data() {
return {
......@@ -584,7 +584,7 @@ export default {
onClose() {
that.$router.push({
path: "/goodDetail",
query: {import_sn: file.data.import_sn},
query: { import_sn: file.data.import_sn },
});
}
});
......@@ -747,7 +747,7 @@ export default {
return false;
}
}
this.$http('post', "/api/bestgoods/addBestgoods", {add_json: JSON.stringify(this.addBestgoodsParam)}).then(res => {
this.$http('post', "/api/bestgoods/addBestgoods", { add_json: JSON.stringify(this.addBestgoodsParam) }).then(res => {
if (res.code === 0) {
this.$message({
message: res.msg,
......@@ -799,7 +799,7 @@ export default {
}
}
this.$http('post', "/api/bestgoods/updateBestgoods", {update_json: JSON.stringify(this.updateBestgoodsParam)}).then(res => {
this.$http('post', "/api/bestgoods/updateBestgoods", { update_json: JSON.stringify(this.updateBestgoodsParam) }).then(res => {
if (res.code === 0) {
this.$message({
message: res.msg,
......@@ -838,7 +838,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http('POST', "/api/bestgoods/delBestgoods", {best_goods_ids: best_goods_ids.join(',')}).then(res => {
this.$http('POST', "/api/bestgoods/delBestgoods", { best_goods_ids: best_goods_ids.join(',') }).then(res => {
if (res.code === 0) {
this.$message({
message: res.msg,
......@@ -876,7 +876,7 @@ export default {
})
this.$http('post', "/api/bestgoods/isJoinInquiry", {join_inquiry: type, best_goods_ids: best_goods_ids.join(',')}).then(res => {
this.$http('post', "/api/bestgoods/isJoinInquiry", { join_inquiry: type, best_goods_ids: best_goods_ids.join(',') }).then(res => {
if (res.code === 0) {
this.$message({
message: res.msg,
......@@ -1051,7 +1051,7 @@ export default {
} else {
this.formParam.date = '';
}
var params = Object.assign({}, {page: this.page, limit: this.limit}, this.formParam);
var params = Object.assign({}, { page: this.page, limit: this.limit }, this.formParam);
this.$http('GET', "/api/bestgoods/getBestGoodsList", params).then(res => {
if (res.code === 0) {
this.list = res.data.list || [];
......@@ -1127,10 +1127,10 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
.downTemplate {
.downTemplate {
width: 68px;
height: 28px;
text-align: center;
......@@ -1143,7 +1143,7 @@ export default {
margin-left: 10px;
margin-right: 10px;
display: block;
}
}
@import "../../assets/css/store/goodslist.min.css";
@import "../../assets/css/store/goodslist.min.css";
</style>
\ No newline at end of file
src/views/Store/list.vue
......@@ -45,7 +45,7 @@
<span style="width: 20%;" class="row verCenter">次数</span>
</div>
<div class="list">
<div class="box row verCenter" v-for="(v,index) in skuRankList[2]">
<div class="box row verCenter" v-for="(v, index) in skuRankList[2]">
<span style="width: 40%;">{{ v.goods_name }}</span>
<span style="width: 40%;">{{ v.brand_name }}</span>
<template v-if="index == 0">
......@@ -72,7 +72,7 @@
<span style="width: 20%;" class="row verCenter">次数</span>
</div>
<div class="list">
<div class="box row verCenter" v-for="(v,index) in skuRankList[3]">
<div class="box row verCenter" v-for="(v, index) in skuRankList[3]">
<span style="width: 40%;">{{ v.goods_name }}</span>
<span style="width: 40%;">{{ v.brand_name }}</span>
<template v-if="index == 0">
......@@ -99,7 +99,7 @@
<span style="width: 20%;" class="row verCenter">次数</span>
</div>
<div class="list">
<div class="box row verCenter" v-for="(v,index) in skuRankList[4]">
<div class="box row verCenter" v-for="(v, index) in skuRankList[4]">
<span style="width: 40%;">{{ v.goods_name }}</span>
<span style="width: 40%;">{{ v.brand_name }}</span>
<template v-if="index == 0">
......@@ -168,7 +168,7 @@
<el-table-column prop="mpq" label="标准包装量" width="100" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="stock" label="库存数量" width="100" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="cn_ladder_price" label="含税成本价（￥）" width="120" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.cn_ladder_price && scope.row.cn_ladder_price.length>0">
<template slot-scope="scope" v-if="scope.row.cn_ladder_price && scope.row.cn_ladder_price.length > 0">
<el-popover effect="light" trigger="hover" placement="bottom">
<p class="row" v-for="item in scope.row.cn_ladder_price">
<span>{{ item.purchases }}+</span>
......@@ -179,7 +179,7 @@
</template>
</el-table-column>
<el-table-column prop="hk_ladder_price" label="美金成本价（$）" width="120" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.cn_ladder_price && scope.row.cn_ladder_price.length>0">
<template slot-scope="scope" v-if="scope.row.cn_ladder_price && scope.row.cn_ladder_price.length > 0">
<el-popover effect="light" trigger="hover" placement="bottom">
<p class="row" v-for="item in scope.row.hk_ladder_price">
<span>{{ item.purchases }}+</span>
......@@ -235,8 +235,8 @@
<el-table-column prop="source_val" label="来源" width="150" align="center" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="goods_status" label="状态" width="100" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.goods_status==1" class="f-green">上架</span>
<span v-else-if="scope.row.goods_status==3">下架</span>
<span v-if="scope.row.goods_status == 1" class="f-green">上架</span>
<span v-else-if="scope.row.goods_status == 3">下架</span>
</template>
</el-table-column>
<el-table-column prop="cp_time" label="上架有效期" width="150" align="center" :show-overflow-tooltip="true"></el-table-column>
......@@ -309,8 +309,8 @@
<el-table-column prop="brand_name" label="品牌" min-width="20%" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="goods_status" label="状态" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.goods_status==1" class="f-green">上架</span>
<span v-else-if="scope.row.goods_status==3">下架</span>
<span v-if="scope.row.goods_status == 1" class="f-green">上架</span>
<span v-else-if="scope.row.goods_status == 3">下架</span>
</template>
</el-table-column>
<el-table-column prop="cp_time_temp" label="上架有效期" width="160" :show-overflow-tooltip="true"></el-table-column>
......@@ -377,7 +377,7 @@
<el-table-column prop="create_time" label="时间" min-width="150" align="center"></el-table-column>
<el-table-column prop="message" label="操作说明" min-width="150" align="center">
<template slot-scope="scope">
<span>修改了价格，点击查看 <a style="color: #409EFF" href="javascript:;" @click="handleDetailClick(scope.row.message.pre_data,scope.row.message.current_data)">修改详情</a></span>
<span>修改了价格，点击查看 <a style="color: #409EFF" href="javascript:;" @click="handleDetailClick(scope.row.message.pre_data, scope.row.message.current_data)">修改详情</a></span>
</template>
</el-table-column>
<el-table-column prop="operator" label="操作人" min-width="150" align="center"></el-table-column>
......@@ -409,19 +409,19 @@
</div>
</el-dialog>
</div>
<Menu/>
<Menu />
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Util from "../../tool";
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
import Util from "../../tool";
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Tag).use(Link)
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover)
export default {
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Tag).use(Link)
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Popover)
export default {
name: "list",
data() {
return {
......@@ -548,11 +548,11 @@ export default {
this.formParam.cp_time = '';
}
var params = Object.assign({},
{page: this.page},
{limit: this.limit},
{ page: this.page },
{ limit: this.limit },
this.formParam,
{action_time: this.formParam.date ? this.formParam.date[0] : ''},
{end_time: this.formParam.date ? this.formParam.date[1] : ''})
{ action_time: this.formParam.date ? this.formParam.date[0] : '' },
{ end_time: this.formParam.date ? this.formParam.date[1] : '' })
this.$http('get', "/api/sku/list", params).then(res => {
if (res.code === 0) {
......@@ -864,7 +864,7 @@ export default {
type: 'warning'
});
} else {
this.$http('GET', "/api/sku/updateSkuOriginalStepPrice", {goods_id: this.goods_id, original_price: JSON.stringify(this.skuOriginalStepPriceData)}).then(res => {
this.$http('GET', "/api/sku/updateSkuOriginalStepPrice", { goods_id: this.goods_id, original_price: JSON.stringify(this.skuOriginalStepPriceData) }).then(res => {
if (res.code == 0) {
this.$message({
message: '操作成功',
......@@ -887,7 +887,7 @@ export default {
* 获取sku阶梯价格
*/
getSkuOriginalStepPrice(goods_id) {
this.$http('GET', "/api/sku/getSkuOriginalStepPrice", {goods_id: goods_id}).then(res => {
this.$http('GET', "/api/sku/getSkuOriginalStepPrice", { goods_id: goods_id }).then(res => {
if (res.code == 0) {
this.skuOriginalStepPriceData = res.data.data;
this.goods_id = goods_id;
......@@ -1034,8 +1034,8 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/store/list.min.css";
@import "../../assets/css/store/list.min.css";
</style>
\ No newline at end of file
src/views/Store/listDetail.vue
......@@ -27,10 +27,10 @@
<el-table-column fixed type="selection" width="40"></el-table-column>
<el-table-column prop="status" fixed label="状态" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="danger">审核前失败</el-tag>
<el-tag v-else-if="scope.row.status==2" type="info">待审核</el-tag>
<el-tag v-else-if="scope.row.status==3" type="success">审核通过</el-tag>
<el-tag v-else-if="scope.row.status==4" type="warning">审核未通过</el-tag>
<el-tag v-if="scope.row.status == 1" type="danger">审核前失败</el-tag>
<el-tag v-else-if="scope.row.status == 2" type="info">待审核</el-tag>
<el-tag v-else-if="scope.row.status == 3" type="success">审核通过</el-tag>
<el-tag v-else-if="scope.row.status == 4" type="warning">审核未通过</el-tag>
</template>
</el-table-column>
<el-table-column prop="error_msg" label="失败原因" width="200" :show-overflow-tooltip="true"></el-table-column>
......@@ -46,21 +46,21 @@
</el-table>
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
<Menu/>
<Menu />
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Descriptions, DescriptionsItem, Message, Pagination, Table, TableColumn, Tag, Tooltip,Upload} from 'element-ui'
import {NODE_ENVS} from "@/ajax";
import Tool from "@/tool";
import { Descriptions, DescriptionsItem, Message, Pagination, Table, TableColumn, Tag, Tooltip, Upload } from 'element-ui'
import { NODE_ENVS } from "@/ajax";
import Tool from "@/tool";
Vue.prototype.$message = Message;
Vue.use(Pagination).use(TableColumn).use(Table).use(Tag).use(Descriptions).use(DescriptionsItem).use(Tooltip).use(Upload);
export default {
Vue.prototype.$message = Message;
Vue.use(Pagination).use(TableColumn).use(Table).use(Tag).use(Descriptions).use(DescriptionsItem).use(Tooltip).use(Upload);
export default {
name: "ListDetail",
data() {
return {
......@@ -235,25 +235,25 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
@import "../../assets/css/store/listDetail.min.css";
@import "../../assets/css/store/listDetail.min.css";
.btn-nav {
.btn-nav {
background: #FFFFFF;
padding: 0 0 20px 20px;
}
}
::v-deep .el-descriptions-item__label {
::v-deep .el-descriptions-item__label {
white-space: nowrap;
}
}
::v-deep .el-descriptions-item__content {
::v-deep .el-descriptions-item__content {
white-space: nowrap;
}
}
.downTemplateExport {
.downTemplateExport {
width: 92px;
height: 28px;
text-align: center;
......@@ -267,5 +267,5 @@ export default {
margin-right: 10px;
display: block;
cursor: pointer;
}
}
</style>
\ No newline at end of file
src/views/User/bindError.vue
......@@ -31,26 +31,26 @@
watch: {},
created() {
this.getData();
var code_=this.$route.query.err_type
if(code_==1){
this.text='微信授权失败'
}else if(code_==2){
this.text='芯链token校验失败'
var code_ = this.$route.query.err_type
if (code_ == 1) {
this.text = '微信授权失败'
} else if (code_ == 2) {
this.text = '芯链token校验失败'
}
else if(code_==3){
this.text='请求access_token失败'
else if (code_ == 3) {
this.text = '请求access_token失败'
}
else if(code_==4){
this.text='open_id已绑定其他账号，不能重复绑定'
else if (code_ == 4) {
this.text = 'open_id已绑定其他账号，不能重复绑定'
}
else if(code_==5){
this.text='更新绑定关系失败'
else if (code_ == 5) {
this.text = '更新绑定关系失败'
}
else if(code_==6){
this.text='添加绑定关系失败'
else if (code_ == 6) {
this.text = '添加绑定关系失败'
}
else if(code_==7){
this.text='获取微信信息失败'
else if (code_ == 7) {
this.text = '获取微信信息失败'
}
},
......
src/views/User/login.vue
......@@ -3,7 +3,7 @@
<div class="head-box">
<div class="head-wrap lbBox">
<a class="logo lineBlock va-m" href="https://www.ichunt.com/">
<img src="../../assets/images/logo.png" alt=""/>
<img src="../../assets/images/logo.png" alt="" />
</a>
<span class="line lineBlock va-m"></span>
<div class="text lineBlock va-m">
......@@ -19,20 +19,20 @@
<p class="tit">欢迎登录芯链系统</p>
<div class="bar">
<form>
<div class="input-box lbBox" :class="errorClass1 ? 'error':''">
<div class="input-box lbBox" :class="errorClass1 ? 'error' : ''">
<i class="iconfont iconuser va-m"></i>
<input type="text" placeholder="请输入手机号" class="inp va-m" v-model="form.mobile" autocomplete="off"/>
<input type="text" placeholder="请输入手机号" class="inp va-m" v-model="form.mobile" autocomplete="off" />
<b class="lineBlock emptys"></b>
</div>
<div class="input-box lbBox" :class="errorClass2 ? 'error':''">
<div class="input-box lbBox" :class="errorClass2 ? 'error' : ''">
<i class="iconfont icondenglu-mimabeifen va-m"></i>
<input :type='pwdFlag?"password":"text"' placeholder="请输入登录密码" class="inp va-m" v-model="form.password"/>
<a href="javascript:;" class="iconfont eye" :class="pwdFlag ? 'iconyincang':'iconyanjing'" @click="changePwd()"></a>
<input :type='pwdFlag ? "password" : "text"' placeholder="请输入登录密码" class="inp va-m" v-model="form.password" />
<a href="javascript:;" class="iconfont eye" :class="pwdFlag ? 'iconyincang' : 'iconyanjing'" @click="changePwd()"></a>
<b class="lineBlock emptys"></b>
</div>
<div class="code-box clr" :class="errorClass3 ? 'error':''">
<div class="code-box clr" :class="errorClass3 ? 'error' : ''">
<div class="fl l">
<input type="text" placeholder="请输入验证码" v-model="form.captcha"/>
<input type="text" placeholder="请输入验证码" v-model="form.captcha" />
</div>
<a class="fr r" href="javascript:;" title="换一张" @click="updateCp()">
<img :src="imgSrc" alt="">
......@@ -42,7 +42,7 @@
<span class="error">{{ errror_text }}</span>
<a href="javascript:;" style="visibility:hidden;">忘记密码</a>
</p>
<a href="javascript:;" class="btn-submit" :class="active ? 'active':''" @click="submit()" :loading="true">登录</a>
<a href="javascript:;" class="btn-submit" :class="active ? 'active' : ''" @click="submit()" :loading="true">登录</a>
</form>
</div>
</div>
......@@ -51,12 +51,12 @@
</div>
</template>
<script>
import Vue from 'vue';
import {Loading, Message} from 'element-ui';
import Util from "../../tool";
import Vue from 'vue';
import { Loading, Message } from 'element-ui';
import Util from "../../tool";
Vue.prototype.$message = Message
export default {
Vue.prototype.$message = Message
export default {
name: "index",
data() {
return {
......@@ -209,12 +209,12 @@ export default {
});
}
}
};
};
</script>
<style scoped>
@import "../../assets/css/login/index.min.css";
@import "../../assets/css/login/index.min.css";
#app ::v-deep {
#app ::v-deep {
padding: 0 !important;
}
}
</style>
\ No newline at end of file
src/views/billManagement/allPayableBills.vue
......@@ -56,15 +56,15 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "allPayableBills",
data() {
return {
......@@ -91,7 +91,7 @@ export default {
if (params.create_time && params.create_time.length === 2) {
params.create_time = params.create_time.join(' ~ ');
}
params = Object.assign(params, {page: this.page, limit: this.limit});
params = Object.assign(params, { page: this.page, limit: this.limit });
this.$http('GET', "/api/bill/getUnPayBillList", params).then(res => {
if (res.code === 0) {
this.list = res.data.list || [];
......@@ -114,7 +114,7 @@ export default {
cb([]);
return;
}
this.$http('GET', "/api/search/getspu", {spu_name: queryString}).then(res => {
this.$http('GET', "/api/search/getspu", { spu_name: queryString }).then(res => {
if (res.code == 0 && res.data.list?.length) {
const arr = res.data.list.map(item => ({
value: item.spu_name
......@@ -169,8 +169,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/billManagement/fileManagement.vue
......@@ -23,17 +23,17 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import {NODE_ENVS} from "@/ajax";
import Tool from "@/tool";
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
import { NODE_ENVS } from "@/ajax";
import Tool from "@/tool";
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "fileManagement",
data() {
return {
......@@ -151,8 +151,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/billManagement/reconciledBill.vue
......@@ -41,7 +41,7 @@
<el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column>
<el-table-column prop="bill_sn" label="账单号" width="120" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-link type="primary" :underline="false" @click="$router.push({path: '/reconciledBillDetail', query: {bill_id: scope.row.bill_id,bill_sn:scope.row.bill_sn}})" style="font-size: 12px;">{{ scope.row.bill_sn }}</el-link>
<el-link type="primary" :underline="false" @click="$router.push({ path: '/reconciledBillDetail', query: { bill_id: scope.row.bill_id, bill_sn: scope.row.bill_sn } })" style="font-size: 12px;">{{ scope.row.bill_sn }}</el-link>
</template>
</el-table-column>
<el-table-column prop="bill_name" label="账单名称" min-width="170" :show-overflow-tooltip="true" align="center"></el-table-column>
......@@ -62,17 +62,17 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import {NODE_ENVS} from "@/ajax";
import Tool from "@/tool";
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
import { NODE_ENVS } from "@/ajax";
import Tool from "@/tool";
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "reconciledBill",
data() {
return {
......@@ -99,7 +99,7 @@ export default {
if (params.create_time && params.create_time.length === 2) {
params.create_time = params.create_time.join(' ~ ');
}
params = Object.assign(params, {page: this.page, limit: this.limit});
params = Object.assign(params, { page: this.page, limit: this.limit });
this.$http('GET', "/api/bill/getVerifiedBillList", params).then(res => {
if (res.code === 0) {
......@@ -123,7 +123,7 @@ export default {
cb([]);
return;
}
this.$http('GET', "/api/search/getspu", {spu_name: queryString}).then(res => {
this.$http('GET', "/api/search/getspu", { spu_name: queryString }).then(res => {
if (res.code == 0 && res.data.list?.length) {
const arr = res.data.list.map(item => ({
value: item.spu_name
......@@ -205,8 +205,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/billManagement/reconciledBillDetail.vue
......@@ -41,15 +41,15 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Col, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Row, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, Col, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Row, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider).use(Row).use(Col);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider).use(Row).use(Col);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "reconciledBillDetail",
data() {
return {
......@@ -71,7 +71,7 @@ export default {
},
methods: {
getData() {
this.$http('GET', "/api/bill/getVerifiedBillDetail", {bill_id: this.bill_id, bill_sn: this.bill_sn, page: this.page, limit: this.limit}).then(res => {
this.$http('GET', "/api/bill/getVerifiedBillDetail", { bill_id: this.bill_id, bill_sn: this.bill_sn, page: this.page, limit: this.limit }).then(res => {
if (res.code === 0) {
this.detailData = res.data.bill_info;
this.list = res.data.list;
......@@ -91,7 +91,7 @@ export default {
cb([]);
return;
}
this.$http('GET', "/api/search/getspu", {spu_name: queryString}).then(res => {
this.$http('GET', "/api/search/getspu", { spu_name: queryString }).then(res => {
if (res.code == 0 && res.data.list?.length) {
const arr = res.data.list.map(item => ({
value: item.spu_name
......@@ -146,8 +146,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/consignmentManagement/batchRecall.vue
......@@ -36,22 +36,22 @@
<div v-if="is_flag" style="margin-top: 20px;">
<el-button size="small" type="primary" @click="batchRecallSubmit">提交</el-button>
<el-button size="small" type="primary" @click="batchRecallExportFailed">导出失败数据</el-button>
<el-button size="small" @click="$router.push({path: '/consignmentRecall'})">取 消</el-button>
<el-button size="small" @click="$router.push({ path: '/consignmentRecall' })">取 消</el-button>
</div>
</div>
<Menu ref="menu"></Menu>
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip, Upload} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip, Upload } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Upload).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Upload).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "batchRecall",
data() {
return {
......@@ -99,7 +99,7 @@ export default {
*/
batchRecallSubmit() {
this.recall_upload_sn = this.list.filter(item => item.status === 1).map(item => item.recall_upload_sn);
this.$http('POST', "/api/consignmentRecall/batchRecallSubmit", {recall_upload_sn: this.recall_upload_sn}).then(res => {
this.$http('POST', "/api/consignmentRecall/batchRecallSubmit", { recall_upload_sn: this.recall_upload_sn }).then(res => {
if (res.code === 0) {
this.$message({
message: '操作成功',
......@@ -108,7 +108,7 @@ export default {
this.$refs.menu.closetab(this.$route.path);
setTimeout(() => {
if (this.$route.path !== '/consignmentRecall') {
this.$router.push({path: '/consignmentRecall'}).catch(err => {
this.$router.push({ path: '/consignmentRecall' }).catch(err => {
if (err.name !== 'NavigationDuplicated') {
throw err;
}
......@@ -127,7 +127,7 @@ export default {
*/
batchRecallExportFailed() {
this.recall_upload_sn = this.list.filter(item => item.status === 0).map(item => item.recall_upload_sn);
this.$http('POST', "/api/consignmentRecall/batchRecallExportFailed", {recall_upload_sn: this.recall_upload_sn}).then(res => {
this.$http('POST', "/api/consignmentRecall/batchRecallExportFailed", { recall_upload_sn: this.recall_upload_sn }).then(res => {
if (res.code === 0) {
this.$message({
message: '操作成功',
......@@ -145,8 +145,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/consignmentManagement/consignmentApplication.vue
......@@ -46,7 +46,7 @@
<el-table-column type="selection" width="40" align="center" fixed></el-table-column>
<el-table-column prop="consignment_sn" label="寄售申请单号" width="160" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<el-link type="primary" :underline="false" @click="$router.push({path: '/consignmentApplicationDetail', query: {consignment_id: scope.row.consignment_id}})" style="font-size: 12px;">{{ scope.row.consignment_sn }}</el-link>
<el-link type="primary" :underline="false" @click="$router.push({ path: '/consignmentApplicationDetail', query: { consignment_id: scope.row.consignment_id } })" style="font-size: 12px;">{{ scope.row.consignment_sn }}</el-link>
</template>
</el-table-column>
<el-table-column prop="consignment_status_val" label="状态" width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
......@@ -142,15 +142,15 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "consignmentApplication",
data() {
return {
......@@ -167,10 +167,10 @@ export default {
consignment_ids: '',
rules: {
shipping_id: [
{required: true, message: '请选择物流公司', trigger: 'blur'},
{ required: true, message: '请选择物流公司', trigger: 'blur' },
],
shipping_no: [
{required: true, message: '请输入物流单号', trigger: 'blur'},
{ required: true, message: '请输入物流单号', trigger: 'blur' },
{
pattern: /^[a-zA-Z0-9,，]*$/,
message: '物流单号只能输入英文、数字、中英文逗号',
......@@ -195,7 +195,7 @@ export default {
},
methods: {
getData() {
var params = Object.assign({}, this.formParam, {page: this.page, limit: this.limit});
var params = Object.assign({}, this.formParam, { page: this.page, limit: this.limit });
this.$http('GET', "/api/consignment/getConsignmentList", params).then(res => {
if (res.code === 0) {
this.list = res.data.list || [];
......@@ -218,7 +218,7 @@ export default {
cb([]);
return;
}
this.$http('GET', "/api/search/getspu", {spu_name: queryString}).then(res => {
this.$http('GET', "/api/search/getspu", { spu_name: queryString }).then(res => {
if (res.code == 0 && res.data.list?.length) {
const arr = res.data.list.map(item => ({
value: item.spu_name
......@@ -377,7 +377,7 @@ export default {
* 提交审核
*/
verifyConsignment() {
this.$http('POST', "/api/consignment/verifyConsignment", {consignment_ids: this.consignment_ids, remark: this.remark}).then(res => {
this.$http('POST', "/api/consignment/verifyConsignment", { consignment_ids: this.consignment_ids, remark: this.remark }).then(res => {
if (res.code === 0) {
this.$message({
message: '操作成功',
......@@ -397,7 +397,7 @@ export default {
* 作废
*/
cancelConsignment() {
this.$http('POST', "/api/consignment/cancelConsignment", {consignment_ids: this.consignment_ids, cancel_remark: this.remark}).then(res => {
this.$http('POST', "/api/consignment/cancelConsignment", { consignment_ids: this.consignment_ids, cancel_remark: this.remark }).then(res => {
if (res.code === 0) {
this.$message({
message: '操作成功',
......@@ -417,7 +417,7 @@ export default {
* 关单
*/
closeConsignment() {
this.$http('POST', "/api/consignment/closeConsignment", {consignment_ids: this.consignment_ids}).then(res => {
this.$http('POST', "/api/consignment/closeConsignment", { consignment_ids: this.consignment_ids }).then(res => {
if (res.code === 0) {
this.$message({
message: '操作成功',
......@@ -437,8 +437,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/consignmentManagement/consignmentApplicationDetail.vue
......@@ -48,15 +48,15 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Col, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Row, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, Col, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Row, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider).use(Row).use(Col);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider).use(Row).use(Col);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "consignmentApplicationDetail",
data() {
return {
......@@ -164,8 +164,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/consignmentManagement/consignmentContract.vue
......@@ -45,15 +45,15 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "consignmentContract",
data() {
return {
......@@ -72,7 +72,7 @@ export default {
},
methods: {
getData() {
var params = Object.assign({}, this.formParam, {page: this.page, limit: this.limit});
var params = Object.assign({}, this.formParam, { page: this.page, limit: this.limit });
this.$http('GET', "/api/consignmentContract/getConsignmentContractList", params).then(res => {
if (res.code === 0) {
this.list = res.data.list || [];
......@@ -127,8 +127,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/consignmentManagement/consignmentImport.vue
......@@ -35,16 +35,16 @@
<el-table-column fixed type="selection" width="40" align="center"></el-table-column>
<el-table-column label="单号" min-width="20%" align="center">
<template slot-scope="scope">
<el-link type="primary" :underline="false" @click="$router.push({path: '/consignmentImportDetail', query: {up_sn: scope.row.up_sn,id:scope.row.id}})" style="font-size: 12px;">{{ scope.row.up_sn }}</el-link>
<el-link type="primary" :underline="false" @click="$router.push({ path: '/consignmentImportDetail', query: { up_sn: scope.row.up_sn, id: scope.row.id } })" style="font-size: 12px;">{{ scope.row.up_sn }}</el-link>
</template>
</el-table-column>
<el-table-column prop="file_name" label="文件名字" min-width="20%" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="status" label="状态" width="120" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="primary">待处理</el-tag>
<el-tag v-else-if="scope.row.status==2" type="warning">处理中</el-tag>
<el-tag v-else-if="scope.row.status==3" type="success">已处理</el-tag>
<el-tag v-else-if="scope.row.status==4" type="danger">失败</el-tag>
<el-tag v-if="scope.row.status == 1" type="primary">待处理</el-tag>
<el-tag v-else-if="scope.row.status == 2" type="warning">处理中</el-tag>
<el-tag v-else-if="scope.row.status == 3" type="success">已处理</el-tag>
<el-tag v-else-if="scope.row.status == 4" type="danger">失败</el-tag>
<el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
<i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
<div slot="content">{{ scope.row.status_tips }}</div>
......@@ -77,7 +77,7 @@
<el-button @click="dialogVisible = false" style="margin-right: 10px;">取 消</el-button>
<el-upload ref="upload" :data="fileData" :action="uploadUrl" :before-upload="handleBeforeUpload" :on-success="handleChange" :on-progress="handleProgress">
<el-button type="primary" :loading="uploading">确 定</el-button>
<el-progress v-if="uploading" :percentage="progress"/>
<el-progress v-if="uploading" :percentage="progress" />
</el-upload>
</div>
</div>
......@@ -85,16 +85,16 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import Tool from '@/tool'
import {NODE_ENVS} from "@/ajax";
import {Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, Option, Pagination, Progress, Radio, Select, Table, TableColumn, Tag, Tooltip, Upload} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import Tool from '@/tool'
import { NODE_ENVS } from "@/ajax";
import { Button, DatePicker, Dialog, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, Option, Pagination, Progress, Radio, Select, Table, TableColumn, Tag, Tooltip, Upload } from 'element-ui'
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination).use(Tag).use(Tooltip).use(Link);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Upload).use(Radio).use(Progress);
export default {
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination).use(Tag).use(Tooltip).use(Link);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Upload).use(Radio).use(Progress);
export default {
name: "consignmentImport",
data() {
return {
......@@ -249,10 +249,10 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
.downTemplate {
.downTemplate {
width: 68px;
height: 28px;
text-align: center;
......@@ -265,15 +265,15 @@ export default {
margin-left: 10px;
margin-right: 10px;
display: block;
}
}
.dialog-text .tt {
.dialog-text .tt {
color: #333;
font-weight: bold;
margin-bottom: 16px;
}
}
.dialog-text .alink {
.dialog-text .alink {
font-size: 12px;
}
}
</style>
\ No newline at end of file
src/views/consignmentManagement/consignmentImportDetail.vue
......@@ -25,10 +25,10 @@
<el-table-column fixed type="selection" width="40"></el-table-column>
<el-table-column prop="status" fixed label="状态" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="danger">审核前失败</el-tag>
<el-tag v-else-if="scope.row.status==2" type="info">待审核</el-tag>
<el-tag v-else-if="scope.row.status==3" type="success">上传成功</el-tag>
<el-tag v-else-if="scope.row.status==4" type="warning">审核未通过</el-tag>
<el-tag v-if="scope.row.status == 1" type="danger">审核前失败</el-tag>
<el-tag v-else-if="scope.row.status == 2" type="info">待审核</el-tag>
<el-tag v-else-if="scope.row.status == 3" type="success">上传成功</el-tag>
<el-tag v-else-if="scope.row.status == 4" type="warning">审核未通过</el-tag>
</template>
</el-table-column>
<el-table-column prop="error_msg" label="失败原因" min-width="150" :show-overflow-tooltip="true"></el-table-column>
......@@ -64,16 +64,16 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Descriptions, DescriptionsItem, Message, Pagination, Table, TableColumn, Tag, Tooltip, Upload} from 'element-ui'
import {NODE_ENVS} from "@/ajax";
import Tool from "@/tool";
import { Descriptions, DescriptionsItem, Message, Pagination, Table, TableColumn, Tag, Tooltip, Upload } from 'element-ui'
import { NODE_ENVS } from "@/ajax";
import Tool from "@/tool";
Vue.prototype.$message = Message;
Vue.use(Pagination).use(TableColumn).use(Table).use(Tag).use(Descriptions).use(DescriptionsItem).use(Tooltip).use(Upload);
export default {
Vue.prototype.$message = Message;
Vue.use(Pagination).use(TableColumn).use(Table).use(Tag).use(Descriptions).use(DescriptionsItem).use(Tooltip).use(Upload);
export default {
name: "consignmentImportDetail",
data() {
return {
......@@ -108,7 +108,7 @@ export default {
* 获取详情
*/
getInfo() {
this.$http('GET', "/api/uploadSku/info", {id: this.id}).then(res => {
this.$http('GET', "/api/uploadSku/info", { id: this.id }).then(res => {
if (res.code === 0) {
this.detailData = res.data
} else {
......@@ -123,7 +123,7 @@ export default {
* 获取列表数据
*/
getList() {
this.$http('GET', "/api/uploadSku/itemList", {page: this.page, limit: this.limit, up_sn: this.up_sn, source: 12}).then(res => {
this.$http('GET', "/api/uploadSku/itemList", { page: this.page, limit: this.limit, up_sn: this.up_sn, source: 12 }).then(res => {
if (res.code === 0) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
......@@ -170,7 +170,7 @@ export default {
* 提交寄售审核
*/
submitConsignmentAudit() {
this.$http('POST', "/api/sku/submitConsignmentAudit", {sku_apply_num_json: JSON.stringify(this.sku_apply_num_json), remark: this.remark}).then(res => {
this.$http('POST', "/api/sku/submitConsignmentAudit", { sku_apply_num_json: JSON.stringify(this.sku_apply_num_json), remark: this.remark }).then(res => {
if (res.code === 0) {
this.$message({
message: '操作成功',
......@@ -213,8 +213,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/consignmentManagement/consignmentRecall.vue
......@@ -306,7 +306,7 @@
* 作废
*/
cancelConsignmentRecall() {
this.$http('POST', "/api/consignmentRecall/cancelConsignmentRecall", { recall_id: this.recall_ids}).then(res => {
this.$http('POST', "/api/consignmentRecall/cancelConsignmentRecall", { recall_id: this.recall_ids }).then(res => {
if (res.code === 0) {
this.$message({
message: '操作成功',
......
src/views/consignmentManagement/consignmentRecallDetail.vue
......@@ -35,15 +35,15 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Col, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Row, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, Col, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Row, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider).use(Row).use(Col);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider).use(Row).use(Col);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "consignmentRecallDetail",
data() {
return {
......@@ -66,7 +66,7 @@ export default {
},
methods: {
getData() {
this.$http('GET', "/api/consignmentRecall/getConsignmentRecallDetail", {recall_id: this.recall_id, page: this.page, limit: this.limit}).then(res => {
this.$http('GET', "/api/consignmentRecall/getConsignmentRecallDetail", { recall_id: this.recall_id, page: this.page, limit: this.limit }).then(res => {
if (res.code === 0) {
this.detailData = res.data;
this.list = res.data.items.list;
......@@ -86,7 +86,7 @@ export default {
cb([]);
return;
}
this.$http('GET', "/api/search/getspu", {spu_name: queryString}).then(res => {
this.$http('GET', "/api/search/getspu", { spu_name: queryString }).then(res => {
if (res.code == 0 && res.data.list?.length) {
const arr = res.data.list.map(item => ({
value: item.spu_name
......@@ -162,11 +162,12 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
.remark-content {
.remark-content {
min-width: 200px;
word-break: break-all; /* 防止文字溢出 */
}
word-break: break-all;
/* 防止文字溢出 */
}
</style>
\ No newline at end of file
src/views/consignmentManagement/consignmentReplenishment.vue
......@@ -42,15 +42,15 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "consignmentReplenishment",
data() {
return {
......@@ -70,7 +70,7 @@ export default {
},
methods: {
getData() {
var params = Object.assign({}, this.formParam, {page: this.page, limit: this.limit});
var params = Object.assign({}, this.formParam, { page: this.page, limit: this.limit });
this.$http('GET', "/api/consignmentReplenishment/getConsignmentReplenishmentList", params).then(res => {
if (res.code === 0) {
this.list = res.data.list || [];
......@@ -93,7 +93,7 @@ export default {
cb([]);
return;
}
this.$http('GET', "/api/search/getspu", {spu_name: queryString}).then(res => {
this.$http('GET', "/api/search/getspu", { spu_name: queryString }).then(res => {
if (res.code == 0 && res.data.list?.length) {
const arr = res.data.list.map(item => ({
value: item.spu_name
......@@ -153,7 +153,7 @@ export default {
return;
}
let sku_ids = this.multipleSelection.map(item => item.sku_id).join(',');
this.$http('POST', "/api/consignmentReplenishment/addConsignmentReplenishment", {sku_ids: sku_ids}).then(res => {
this.$http('POST', "/api/consignmentReplenishment/addConsignmentReplenishment", { sku_ids: sku_ids }).then(res => {
if (res.code === 0) {
this.$message({
message: '操作成功',
......@@ -171,8 +171,6 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
src/views/consignmentManagement/inOutStockLog.vue
......@@ -55,15 +55,15 @@
</div>
</template>
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, RadioButton, RadioGroup, Select, Table, TableColumn, Tag, Tooltip} from 'element-ui'
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import { Autocomplete, Button, DatePicker, Descriptions, DescriptionsItem, Dialog, Divider, Dropdown, DropdownItem, DropdownMenu, Form, FormItem, Input, Link, Message, MessageBox, Option, Pagination, Popover, RadioButton, RadioGroup, Select, Table, TableColumn, Tag, Tooltip } from 'element-ui'
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider).use(RadioGroup).use(RadioButton);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider).use(RadioGroup).use(RadioButton);
Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default {
name: "inOutStockLog",
data() {
return {
......@@ -115,7 +115,7 @@ export default {
cb([]);
return;
}
this.$http('GET', "/api/search/getspu", {spu_name: queryString}).then(res => {
this.$http('GET', "/api/search/getspu", { spu_name: queryString }).then(res => {
if (res.code == 0 && res.data.list?.length) {
const arr = res.data.list.map(item => ({
value: item.spu_name
......@@ -202,14 +202,14 @@ export default {
components: {
Menu
}
};
};
</script>
<style scoped>
.time-filter {
.time-filter {
margin: 15px 0;
}
}
.filter-btns .el-radio-group {
.filter-btns .el-radio-group {
margin-left: 0px !important;
}
}
</style>
\ No newline at end of file
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 sign in to comment