Skip to content

F
factory_front
Commit e51ef8ae by qinjianhui
Options

fix: 代码格式化

parent 9ca27d71
Showing with 70 additions and 73 deletions
src/views/order/index.vue
......@@ -3,7 +3,6 @@
<div class="header-filter">
<div class="header-filter-form">
<ElForm :model="searchForm" size="default" inline>
<ElFormItem label="SKU">
<ElInput
v-model="searchForm.mainSku"
......@@ -22,21 +21,15 @@
@blur="searchForm.endProductId = searchForm.endProductId.trim()"
></ElInput>
</ElFormItem>
<!-- <ElFormItem label="第三方订单号">-->
<!-- <ElInput-->
<!-- v-model="searchForm.erpOrderNumber"-->
<!-- placeholder="请输入第三方订单号"-->
<!-- clearable-->
<!-- style="width: 160px"-->
<!-- ></ElInput>-->
<!-- </ElFormItem>-->
<ElFormItem label="生产单号">
<ElInput
v-model="searchForm.subOrderNumber"
placeholder="生产单号"
clearable
style="width: 160px"
@blur="searchForm.subOrderNumber = searchForm.subOrderNumber.trim()"
@blur="
searchForm.subOrderNumber = searchForm.subOrderNumber.trim()
"
></ElInput>
</ElFormItem>
<ElFormItem label="订单号">
......@@ -101,7 +94,7 @@
class="item"
>
<ElButton type="warning" is-dark @click="downloadManuscript"
>下载稿件</ElButton
>下载稿件</ElButton
>
</span>
<span
......@@ -109,27 +102,33 @@
class="item"
>
<ElButton type="success" is-dark @click="reGenerateManuscript"
>更新稿件</ElButton
>更新稿件</ElButton
>
</span>
<span v-if="statusCode === 2 || statusCode === 3" class="item">
<ElButton type="primary" dark @click="printManuscript"
>打印生产单</ElButton
>打印生产单</ElButton
>
</span>
<span v-if="statusCode === 2 || statusCode === 3 || statusCode === 7" class="item">
<span
v-if="statusCode === 2 || statusCode === 3 || statusCode === 7"
class="item"
>
<ElButton type="success" dark @click="exportManuscript"
>导出生产单</ElButton
>导出生产单</ElButton
>
</span>
<span class="item">
<ElButton type="warning" @click="addInternalTag"
>添加内部标签</ElButton
>添加内部标签</ElButton
>
</span>
<span v-if="statusCode === 2 || statusCode === 3|| statusCode === 4" class="item">
<span
v-if="statusCode === 2 || statusCode === 3 || statusCode === 4"
class="item"
>
<ElButton type="primary" @click="refreshProduct"
>刷新商品信息</ElButton
>刷新商品信息</ElButton
>
</span>
<span v-if="statusCode === 3 || statusCode === 4" class="item">
......@@ -164,14 +163,14 @@
<span @click="openAll(row)">
<template v-if="!row.moreable">
展开全部<strong style="color: red"
>({{ row.productList.length }})</strong
>条商品信息<el-icon style="vertical-align: middle"
><ArrowDown /></el-icon
>({{ row.productList.length }})</strong
>条商品信息<el-icon style="vertical-align: middle"
><ArrowDown /></el-icon
></template>
<template v-else>
收起商品信息<el-icon style="vertical-align: middle"
><ArrowUp
/></el-icon>
><ArrowUp
/></el-icon>
</template>
</span>
</div>
......@@ -182,22 +181,22 @@
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">商品价:</span>
<span class="order-list-expand_item_value">{{
row.productAmount
}}</span>
row.productAmount
}}</span>
</div>
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">小计:</span>
<span class="order-list-expand_item_value">{{
row.totalAmount || '--'
}}</span>
row.totalAmount || '--'
}}</span>
</div>
<div
v-if="row.totolBuyNumber"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_value"
>共{{ row.totolBuyNumber }}件</span
>共{{ row.totolBuyNumber }}件</span
>
</div>
</div>
......@@ -231,27 +230,27 @@
<div class="order-time_info">
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label"
>创建时间:</span
>创建时间:</span
>
<span class="order-list-expand_item_value">{{
row.createTime || '--'
}}</span>
row.createTime || '--'
}}</span>
</div>
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label"
>确认时间:</span
>确认时间:</span
>
<span class="order-list-expand_item_value">{{
row.startStockingTime || '--'
}}</span>
row.startStockingTime || '--'
}}</span>
</div>
<div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label"
>完成时间:</span
>完成时间:</span
>
<span class="order-list-expand_item_value">{{
row.finishTime || '--'
}}</span>
row.finishTime || '--'
}}</span>
</div>
</div>
</div>
......@@ -260,9 +259,8 @@
<div class="order-operate_info">
<div class="order-list-expand_item_info_title">
<ElButton text type="primary" @click="openDetail(row.id)"
>查看详情
</ElButton
>
>查看详情
</ElButton>
</div>
<div
v-if="statusCode !== 2 && statusCode !== 3"
......@@ -272,25 +270,22 @@
text
type="primary"
@click="openShipment(row.id)"
>查看发货单
</ElButton
>
>查看发货单
</ElButton>
</div>
<div class="order-list-expand_item_info_title">
<ElButton text type="primary" @click="openLog(row.id)"
>操作日志
</ElButton
>
>操作日志
</ElButton>
</div>
<div
v-if="statusCode === 1 || statusCode === 3"
class="order-list-expand_item_info_title"
>
<ElButton text type="danger" @click="cancelOrder(row.id)"
>取消
</ElButton
>
>取消
</ElButton>
</div>
</div>
</div>
......@@ -312,14 +307,14 @@
<div class="order-detail_item">
<span class="label">第三方订单号:</span>
<span class="value" :title="scope.row.erpOrderNumber">{{
scope.row.erpOrderNumber || '--'
}}</span>
scope.row.erpOrderNumber || '--'
}}</span>
</div>
<div class="order-detail_item">
<span class="label">稿件下载状态:</span>
<span class="value" :title="scope.row.manuscriptStatusStr">{{
scope.row.manuscriptStatusStr || '--'
}}</span>
scope.row.manuscriptStatusStr || '--'
}}</span>
</div>
<div class="order-detail_item">
<span class="label">收货人:</span>
......@@ -332,8 +327,8 @@
<div class="order-detail_item">
<span class="label">收货地址:</span>
<span class="value" :title="scope.row.lanshouAddress">{{
scope.row.lanshouAddress
}}</span>
scope.row.lanshouAddress
}}</span>
</div>
<div class="order-detail_item">
<span class="label">邮编:</span>
......@@ -395,9 +390,8 @@
type="primary"
size="large"
@click="searchShipmentByOrderNumber"
>查询
</el-button
>
>查询
</el-button>
</div>
<Shipment
v-loading="shipmentLoading"
......@@ -464,13 +458,11 @@
<template #footer>
<div class="dialog-footer">
<el-button size="large" @click="shipmentVisible = false"
>取消
</el-button
>
>取消
</el-button>
<el-button size="large" type="primary" @click="saveShipment"
>发货
</el-button
>
>发货
</el-button>
</div>
</template>
</el-dialog>
......@@ -529,7 +521,8 @@ import {
getLogList,
getOrderDetail,
cancelOrderApi,
reGenerateScriptUrlApi, refreshProductInfo,
reGenerateScriptUrlApi,
refreshProductInfo,
} from '@/api/order'
import { showError, showConfirm } from '@/utils/ui'
import { useValue } from '@/utils/hooks/useValue'
......@@ -814,14 +807,18 @@ const refreshProduct = async () => {
} catch {
return
}
const res = await refreshProductInfo(selection.value.map(el =>el.id))
ElMessage({
message: res.message,
type: 'success',
offset: window.innerHeight / 2,
})
await loadTabData()
search()
try {
const res = await refreshProductInfo(selection.value.map((el) => el.id))
ElMessage({
message: res.message,
type: 'success',
offset: window.innerHeight / 2,
})
loadTabData()
search()
} catch (e) {
showError(e)
}
}
// 添加内部便签
const addInternalTag = async () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment