Skip to content

肖康 / cloudSystem

Go to a project
Commit 8621717f by liangjianmin
Options

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

修复 consignmentRecall.vue 和 createConsignmentRecallOrder.vue 中的代码格式问题，包括：
1. 统一缩进为2个空格
2. 修复对象和数组声明中的多余空格
3. 保持组件导入和使用的格式一致
4. 移除多余空行和注释
parent 21afcb4a
Inline Side-by-side
Showing with 45 additions and 46 deletions
src/views/consignmentManagement/consignmentRecall.vue
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column> <el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column>
<el-table-column prop="msg_sn" label="寄售召回单号" min-width="150" :show-overflow-tooltip="true" align="center"> <el-table-column prop="msg_sn" label="寄售召回单号" min-width="150" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="primary" :underline="false" @click="$router.push({path: '/consignmentRecallDetail', query: {recall_id: scope.row.recall_id}})" style="font-size: 12px;">{{ scope.row.recall_sn }}</el-link> <el-link type="primary" :underline="false" @click="$router.push({ path: '/consignmentRecallDetail', query: { recall_id: scope.row.recall_id } })" style="font-size: 12px;">{{ scope.row.recall_sn }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="recall_status_val" label="状态" min-width="200" :show-overflow-tooltip="true" align="center"></el-table-column> <el-table-column prop="recall_status_val" label="状态" min-width="200" :show-overflow-tooltip="true" align="center"></el-table-column>
...@@ -102,16 +102,16 @@ ...@@ -102,16 +102,16 @@
</div> </div>
</template> </template>
<script> <script>
import Vue from 'vue'; import Vue from 'vue';
import Menu from "@/components/menu.vue"; import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Cascader, 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 { Autocomplete, Button, Cascader, 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 {pcaTextArr} from 'element-china-area-data' import { pcaTextArr } from 'element-china-area-data'
Vue.prototype.$message = Message Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm; Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Cascader).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider); Vue.use(Button).use(Link).use(Cascader).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); Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default { export default {
name: "consignmentRecall", name: "consignmentRecall",
data() { data() {
return { return {
...@@ -129,16 +129,16 @@ export default { ...@@ -129,16 +129,16 @@ export default {
remark: '', remark: '',
rules: { rules: {
contact: [ contact: [
{required: true, message: '请输入收货人', trigger: 'blur'}, { required: true, message: '请输入收货人', trigger: 'blur' },
], ],
mobile: [ mobile: [
{required: true, message: '请输入收货电话', trigger: 'blur'}, { required: true, message: '请输入收货电话', trigger: 'blur' },
], ],
province: [ province: [
{required: true, message: '请选择收货地址', trigger: 'change'}, { required: true, message: '请选择收货地址', trigger: 'change' },
], ],
detail: [ detail: [
{required: true, message: '请输入详细地址', trigger: 'blur'}, { required: true, message: '请输入详细地址', trigger: 'blur' },
] ]
}, },
updateConsignmentRecallReceiptInfoParams: { updateConsignmentRecallReceiptInfoParams: {
...@@ -162,7 +162,7 @@ export default { ...@@ -162,7 +162,7 @@ export default {
}, },
methods: { methods: {
getData() { 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/consignmentRecall/getConsignmentRecallList", params).then(res => { this.$http('GET', "/api/consignmentRecall/getConsignmentRecallList", params).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.list = res.data.list || []; this.list = res.data.list || [];
...@@ -197,7 +197,7 @@ export default { ...@@ -197,7 +197,7 @@ export default {
cb([]); cb([]);
return; 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) { if (res.code == 0 && res.data.list?.length) {
const arr = res.data.list.map(item => ({ const arr = res.data.list.map(item => ({
value: item.spu_name value: item.spu_name
...@@ -289,7 +289,7 @@ export default { ...@@ -289,7 +289,7 @@ export default {
* 提交审核 * 提交审核
*/ */
verifyConsignmentRecall() { verifyConsignmentRecall() {
this.$http('POST', "/api/consignmentRecall/verifyConsignmentRecall", {recall_ids: this.recall_ids, remark: this.remark}).then(res => { this.$http('POST', "/api/consignmentRecall/verifyConsignmentRecall", { recall_ids: this.recall_ids, remark: this.remark }).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
...@@ -309,7 +309,7 @@ export default { ...@@ -309,7 +309,7 @@ export default {
* 作废 * 作废
*/ */
cancelConsignmentRecall() { cancelConsignmentRecall() {
this.$http('POST', "/api/consignmentRecall/cancelConsignmentRecall", {recall_ids: this.recall_ids, cancel_remark: this.remark}).then(res => { this.$http('POST', "/api/consignmentRecall/cancelConsignmentRecall", { recall_ids: this.recall_ids, cancel_remark: this.remark }).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
...@@ -364,8 +364,6 @@ export default { ...@@ -364,8 +364,6 @@ export default {
components: { components: {
Menu Menu
} }
}; };
</script> </script>
<style scoped> <style scoped></style>
\ No newline at end of file
</style>
\ No newline at end of file
src/views/consignmentManagement/createConsignmentRecallOrder.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</div> </div>
<div class="row bothSide" style="margin-bottom: 10px;"> <div class="row bothSide" style="margin-bottom: 10px;">
<div style="width: 48%"> <div style="width: 48%">
<div class="xktitle" style="margin-bottom: 10px">收货信息<i class="el-icon-edit-outline" style="margin-left: 10px;" @click="dialogVisible_3=true"></i></div> <div class="xktitle" style="margin-bottom: 10px">收货信息<i class="el-icon-edit-outline" style="margin-left: 10px;" @click="dialogVisible_3 = true"></i></div>
<div class="row" v-if="updateConsignmentRecallReceiptInfoParams.province"> <div class="row" v-if="updateConsignmentRecallReceiptInfoParams.province">
<i class="el-icon-map-location" style="margin-top: 16px;"></i> <i class="el-icon-map-location" style="margin-top: 16px;"></i>
<el-descriptions :column="1" :colon="false"> <el-descriptions :column="1" :colon="false">
...@@ -119,16 +119,16 @@ ...@@ -119,16 +119,16 @@
</div> </div>
</template> </template>
<script> <script>
import Vue from 'vue'; import Vue from 'vue';
import Menu from "@/components/menu.vue"; import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Cascader, 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 { Autocomplete, Button, Cascader, 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 {pcaTextArr} from 'element-china-area-data' import { pcaTextArr } from 'element-china-area-data'
Vue.prototype.$message = Message Vue.prototype.$message = Message
Vue.prototype.$confirm = MessageBox.confirm; Vue.prototype.$confirm = MessageBox.confirm;
Vue.use(Button).use(Link).use(Cascader).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Tooltip).use(Autocomplete).use(Popover).use(Tag).use(Divider); Vue.use(Button).use(Link).use(Cascader).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); Vue.use(DatePicker).use(Dropdown).use(DropdownMenu).use(DropdownItem).use(TableColumn).use(Table).use(Pagination).use(Descriptions).use(DescriptionsItem);
export default { export default {
name: "createConsignmentRecallOrder", name: "createConsignmentRecallOrder",
data() { data() {
return { return {
...@@ -154,16 +154,16 @@ export default { ...@@ -154,16 +154,16 @@ export default {
}, },
rules: { rules: {
contact: [ contact: [
{required: true, message: '请输入收货人', trigger: 'blur'}, { required: true, message: '请输入收货人', trigger: 'blur' },
], ],
mobile: [ mobile: [
{required: true, message: '请输入收货电话', trigger: 'blur'}, { required: true, message: '请输入收货电话', trigger: 'blur' },
], ],
province: [ province: [
{required: true, message: '请选择收货地址', trigger: 'change'}, { required: true, message: '请选择收货地址', trigger: 'change' },
], ],
detail: [ detail: [
{required: true, message: '请输入详细地址', trigger: 'blur'}, { required: true, message: '请输入详细地址', trigger: 'blur' },
] ]
}, },
wmsStockListParams: { wmsStockListParams: {
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
}, },
methods: { methods: {
getData() { 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/consignmentRecall/getConsignmentRecallList", params).then(res => { this.$http('GET', "/api/consignmentRecall/getConsignmentRecallList", params).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.list = res.data.list || []; this.list = res.data.list || [];
...@@ -326,7 +326,7 @@ export default { ...@@ -326,7 +326,7 @@ export default {
* 获取wms库存列表 * 获取wms库存列表
*/ */
getWmsStockList() { getWmsStockList() {
var params = Object.assign({}, this.wmsStockListParams, {page: this.page, limit: this.limit}); var params = Object.assign({}, this.wmsStockListParams, { page: this.page, limit: this.limit });
this.$http('GET', "/api/consignmentRecall/getWmsStockList", params).then(res => { this.$http('GET', "/api/consignmentRecall/getWmsStockList", params).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.wmsStockList = res.data.list || []; this.wmsStockList = res.data.list || [];
...@@ -359,7 +359,7 @@ export default { ...@@ -359,7 +359,7 @@ export default {
const originalLimit = this.limit; const originalLimit = this.limit;
this.limit = 1000000; // 临时设置较大的limit this.limit = 1000000; // 临时设置较大的limit
const params = Object.assign({}, this.wmsStockListParams, {page: this.page, limit: this.limit}); const params = Object.assign({}, this.wmsStockListParams, { page: this.page, limit: this.limit });
const res = await this.$http('GET', "/api/consignmentRecall/getWmsStockList", params); const res = await this.$http('GET', "/api/consignmentRecall/getWmsStockList", params);
if (res.code === 0) { if (res.code === 0) {
...@@ -415,7 +415,7 @@ export default { ...@@ -415,7 +415,7 @@ export default {
cb([]); cb([]);
return; 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) { if (res.code == 0 && res.data.list?.length) {
const arr = res.data.list.map(item => ({ const arr = res.data.list.map(item => ({
value: item.spu_name value: item.spu_name
...@@ -463,10 +463,10 @@ export default { ...@@ -463,10 +463,10 @@ export default {
components: { components: {
Menu Menu
} }
}; };
</script> </script>
<style scoped> <style scoped>
.xktitle { .xktitle {
border-left: 5px solid #1969F9; border-left: 5px solid #1969F9;
height: 38px; height: 38px;
line-height: 38px; line-height: 38px;
...@@ -474,13 +474,13 @@ export default { ...@@ -474,13 +474,13 @@ export default {
padding-left: 20px; padding-left: 20px;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
} }
.el-icon-edit-outline { .el-icon-edit-outline {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: #409eff; color: #409eff;
} }
} }
</style> </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