diff --git a/src/views/goods/Create.vue b/src/views/goods/Create.vue index acb767c..b5fde0f 100644 --- a/src/views/goods/Create.vue +++ b/src/views/goods/Create.vue @@ -36,7 +36,6 @@ :dropdownStyle="{ maxHeight: '500px', overflow: 'auto' }" :treeData="formData.categoryList" treeCheckable - treeCheckStrictly allowClear v-decorator="['categorys', { rules: [{ required: true, message: '请至少选择1个商品分类' }] }]" ></a-tree-select> @@ -158,7 +157,7 @@ v-for="(item, index) in formData.deliveryList" :key="index" :value="item.delivery_id" - >{{ item.name }}</a-select-option + >{{ item.name }}</a-select-option > </a-select> <div class="form-item-help"> @@ -377,8 +376,11 @@ <span>{{ province.name }}</span> <template v-if="province.citys.length"> <span>(</span> - <span class="city-name" v-for="(city, cidx) in province.citys" :key="cidx" - >{{ city.name }}{{ province.citys.length > cidx + 1 ? '、' : '' }}</span + <span + class="city-name" + v-for="(city, cidx) in province.citys" + :key="cidx" + >{{ city.name }}{{ province.citys.length > cidx + 1 ? '、' : '' }}</span > <span>)</span> </template> @@ -534,7 +536,7 @@ import { AreasModal } from '@/components/Modal' const defaultItem = { key: 0, region: [], - region_text: [], + region_text: [] } export default { components: { @@ -544,9 +546,9 @@ export default { Ueditor, InputNumberGroup, MultiSpec, - AreasModal, + AreasModal }, - data() { + data () { return { // 默认的标签索引 tabKey: 0, @@ -570,15 +572,15 @@ export default { title: '销售区域', dataIndex: 'region_text', width: '400px', - scopedSlots: { customRender: 'region_text' }, - }, + scopedSlots: { customRender: 'region_text' } + } ], // 城市总数 - citysCount: null, + citysCount: null } }, // 初始化数据 - created() { + created () { this.isLoading = true // 获取form所需的数据 GoodsModel.getFromData().then(() => { @@ -587,7 +589,7 @@ export default { }, methods: { // 手动强制更新页面 - onForceUpdate(bool = false) { + onForceUpdate (bool = false) { this.$forceUpdate() // bool为true时再执行一次 $forceUpdate, 特殊情况下需执行两次,原因如下: // 第一次执行 $forceUpdate时, 新元素绑定v-decorator无法获取到form.getFieldValue @@ -598,12 +600,12 @@ export default { }, // 切换tab选项卡 - handleTabs(key) { + handleTabs (key) { this.tabKey = key }, // 刷新分类列表 - onReloadCategoryList() { + onReloadCategoryList () { this.isLoading = true GoodsModel.getCategoryList().then(() => { this.isLoading = false @@ -611,7 +613,7 @@ export default { }, // 刷新服务与承诺列表 - onReloadServiceList() { + onReloadServiceList () { this.isLoading = true GoodsModel.getServiceList().then(() => { this.isLoading = false @@ -619,7 +621,7 @@ export default { }, // 刷新配送模板列表 - onReloadDeliveryList() { + onReloadDeliveryList () { this.isLoading = true GoodsModel.getDeliveryList().then(() => { this.isLoading = false @@ -627,12 +629,12 @@ export default { }, // 确认按钮 - handleSubmit(e) { + handleSubmit (e) { e.preventDefault() // 表单验证 const { form: { validateFields }, - ruleList, + ruleList } = this validateFields((errors, values) => { // 定位到错误的tab选项卡 @@ -661,14 +663,14 @@ export default { }, // 定位到错误的tab选项卡 - onTargetTabError(errors) { + onTargetTabError (errors) { // 表单字段与tabKey对应关系 // 只需要必填字段就可 const tabsFieldsMap = [ ['goods_type', 'goods_name', 'categorys', 'imagesIds', 'delivery_id', 'is_ind_delivery_type', 'delivery_type'], ['spec_type', 'goods_price', 'is_restrict', 'restrict_total', 'restrict_single'], ['content'], - ['alone_grade_equity', 'first_money', 'second_money', 'third_money'], + ['alone_grade_equity', 'first_money', 'second_money', 'third_money'] ] const field = Object.keys(errors).shift() for (const key in tabsFieldsMap) { @@ -680,7 +682,7 @@ export default { }, // 提交到后端api - onFormSubmit(values) { + onFormSubmit (values) { this.isLoading = true this.isBtnLoading = true GoodsApi.add({ form: values }) @@ -698,7 +700,7 @@ export default { .finally(() => (this.isLoading = false)) }, // 新增记录 - handleAdd() { + handleAdd () { const index = this.ruleList.length const newItem = { ...defaultItem, key: index } // 排除的城市id集(已存在的城市id集) @@ -712,7 +714,7 @@ export default { }, // 编辑记录 - handleEdit(index, item) { + handleEdit (index, item) { // 排除的城市id集(已存在的城市id集) const excludedCityIds = this.getExcludedCityIds() // 显示选择地区对话框 @@ -720,9 +722,9 @@ export default { }, // 选择地区后的回调 - handleAreaSubmit(result) { + handleAreaSubmit (result) { const { - custom: { scene, item }, + custom: { scene, item } } = result item.region = result.selectedCityIds item.region_text = result.selectedText @@ -732,7 +734,7 @@ export default { }, // 排除的城市id集(已存在的城市id集) - getExcludedCityIds() { + getExcludedCityIds () { const excludedCityIds = [] this.ruleList.forEach((item) => { item.region.forEach((cityId) => { @@ -743,22 +745,22 @@ export default { }, // 显示选择地区对话框 - handleAreasModal(scene, index, item, excludedCityIds) { + handleAreasModal (scene, index, item, excludedCityIds) { this.$refs.AreasModal.handle({ scene, index, item }, item.region, excludedCityIds) }, // 删除记录 - handleDelete(index) { + handleDelete (index) { const app = this const modal = this.$confirm({ title: '您确定要删除该记录吗?', - onOk() { + onOk () { app.ruleList.splice(index, 1) modal.destroy() - }, + } }) - }, - }, + } + } } </script> <style lang="less" scoped> diff --git a/src/views/server/Index.vue b/src/views/server/Index.vue index d08992c..b954cb2 100644 --- a/src/views/server/Index.vue +++ b/src/views/server/Index.vue @@ -127,8 +127,8 @@ const columns = [ scopedSlots: { customRender: 'server_price' } }, { - title: '成本价', - dataIndex: 'cost_price', + title: '划线价', + dataIndex: 'line_price', scopedSlots: { customRender: 'cost_price' } }, { diff --git a/src/views/server/modules/Add.vue b/src/views/server/modules/Add.vue index 1765af5..b23768a 100644 --- a/src/views/server/modules/Add.vue +++ b/src/views/server/modules/Add.vue @@ -38,7 +38,7 @@ <a-input-number :min="0.01" :precision="2" - v-decorator="['cost_price', { initialValue: 1, rules: [{ required: true, message: '请输入成本价' }] }]" + v-decorator="['line_price', { initialValue: 1, rules: [{ required: true, message: '请输入划线价' }] }]" /> <span class="ml-10">元</span> </a-form-item> @@ -94,41 +94,41 @@ import { SelectImage, Ueditor } from '@/components' export default { components: { SelectImage, - Ueditor, + Ueditor }, props: { // 分类列表 }, - data() { + data () { return { categoryList: [], // 对话框标题 title: '', // 标签布局属性 labelCol: { - span: 7, + span: 7 }, // 输入框布局属性 wrapperCol: { - span: 13, + span: 13 }, // modal(对话框)是否可见 visible: false, // modal(对话框)确定按钮 loading confirmLoading: false, // 当前表单元素 - form: this.$form.createForm(this), + form: this.$form.createForm(this) } }, methods: { // 显示对话框 - add() { + add () { // 显示窗口 this.getCategoryList() this.visible = true }, // 获取分类列表 - getCategoryList() { + getCategoryList () { this.isLoading = true Api.categoryList() .then((result) => { @@ -137,11 +137,11 @@ export default { .finally(() => (this.isLoading = false)) }, // 确认按钮 - handleSubmit(e) { + handleSubmit (e) { e.preventDefault() // 表单验证 const { - form: { validateFields }, + form: { validateFields } } = this validateFields((errors, values) => { // 提交到后端api @@ -152,13 +152,13 @@ export default { }, // 关闭对话框事件 - handleCancel() { + handleCancel () { this.visible = false this.form.resetFields() }, // 提交到后端api - onFormSubmit(values) { + onFormSubmit (values) { this.confirmLoading = true Api.addServer({ form: values }) .then((result) => { @@ -172,7 +172,7 @@ export default { .finally((result) => { this.confirmLoading = false }) - }, - }, + } + } } </script> diff --git a/src/views/server/modules/Edit.vue b/src/views/server/modules/Edit.vue index 13a07ab..c840f47 100644 --- a/src/views/server/modules/Edit.vue +++ b/src/views/server/modules/Edit.vue @@ -34,11 +34,11 @@ /> <span class="ml-10">元</span> </a-form-item> - <a-form-item label="成本价" :labelCol="labelCol" :wrapperCol="wrapperCol"> + <a-form-item label="划线价" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-input-number :min="0.01" :precision="2" - v-decorator="['cost_price', { initialValue: 1, rules: [{ required: true, message: '请输入成本价' }] }]" + v-decorator="['line_price', { initialValue: 1, rules: [{ required: true, message: '请输入划线价' }] }]" /> <span class="ml-10">元</span> </a-form-item> @@ -94,23 +94,23 @@ import { SelectImage, Ueditor } from '@/components' export default { components: { SelectImage, - Ueditor, + Ueditor }, props: { // 分类列表 }, - data() { + data () { return { categoryList: [], // 对话框标题 title: '', // 标签布局属性 labelCol: { - span: 7, + span: 7 }, // 输入框布局属性 wrapperCol: { - span: 13, + span: 13 }, // modal(对话框)是否可见 visible: false, @@ -119,12 +119,12 @@ export default { // 当前表单元素 form: this.$form.createForm(this), // 当前记录 - record: {}, + record: {} } }, methods: { // 显示对话框 - edit(record) { + edit (record) { this.getCategoryList() // 显示窗口 this.visible = true @@ -134,7 +134,7 @@ export default { this.setFieldsValue() }, // 获取分类列表 - getCategoryList() { + getCategoryList () { this.isLoading = true Api.categoryList() .then((result) => { @@ -143,9 +143,9 @@ export default { .finally(() => (this.isLoading = false)) }, // 设置默认值 - setFieldsValue() { + setFieldsValue () { const { - form: { setFieldsValue }, + form: { setFieldsValue } } = this // 设置表单内容 this.$nextTick(() => { @@ -161,17 +161,17 @@ export default { 'content', 'comment_rate', 'sold', - 'comment_num', + 'comment_num' ]) ) }) }, // 确认按钮 - handleSubmit(e) { + handleSubmit (e) { e.preventDefault() // 表单验证 const { - form: { validateFields }, + form: { validateFields } } = this validateFields((errors, values) => { // 提交到后端api @@ -182,13 +182,13 @@ export default { }, // 关闭对话框事件 - handleCancel() { + handleCancel () { this.visible = false this.form.resetFields() }, // 提交到后端api - onFormSubmit(values) { + onFormSubmit (values) { this.confirmLoading = true Api.editServer({ serverId: this.record['server_id'], form: values }) .then((result) => { @@ -202,7 +202,7 @@ export default { .finally((result) => { this.confirmLoading = false }) - }, - }, + } + } } </script>