Skip to content

F
factory_front
Commit e51ef8ae by qinjianhui
Options

fix: 代码格式化

parent 9ca27d71
Showing with 26 additions and 29 deletions
src/views/order/index.vue
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<div class="header-filter"> <div class="header-filter">
<div class="header-filter-form"> <div class="header-filter-form">
<ElForm :model="searchForm" size="default" inline> <ElForm :model="searchForm" size="default" inline>
<ElFormItem label="SKU"> <ElFormItem label="SKU">
<ElInput <ElInput
v-model="searchForm.mainSku" v-model="searchForm.mainSku"
...@@ -22,21 +21,15 @@ ...@@ -22,21 +21,15 @@
@blur="searchForm.endProductId = searchForm.endProductId.trim()" @blur="searchForm.endProductId = searchForm.endProductId.trim()"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<!-- <ElFormItem label="第三方订单号">-->
<!-- <ElInput-->
<!-- v-model="searchForm.erpOrderNumber"-->
<!-- placeholder="请输入第三方订单号"-->
<!-- clearable-->
<!-- style="width: 160px"-->
<!-- ></ElInput>-->
<!-- </ElFormItem>-->
<ElFormItem label="生产单号"> <ElFormItem label="生产单号">
<ElInput <ElInput
v-model="searchForm.subOrderNumber" v-model="searchForm.subOrderNumber"
placeholder="生产单号" placeholder="生产单号"
clearable clearable
style="width: 160px" style="width: 160px"
@blur="searchForm.subOrderNumber = searchForm.subOrderNumber.trim()" @blur="
searchForm.subOrderNumber = searchForm.subOrderNumber.trim()
"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem label="订单号"> <ElFormItem label="订单号">
...@@ -117,7 +110,10 @@ ...@@ -117,7 +110,10 @@
>打印生产单</ElButton >打印生产单</ElButton
> >
</span> </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 type="success" dark @click="exportManuscript"
>导出生产单</ElButton >导出生产单</ElButton
> >
...@@ -127,7 +123,10 @@ ...@@ -127,7 +123,10 @@
>添加内部标签</ElButton >添加内部标签</ElButton
> >
</span> </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 type="primary" @click="refreshProduct"
>刷新商品信息</ElButton >刷新商品信息</ElButton
> >
...@@ -261,8 +260,7 @@ ...@@ -261,8 +260,7 @@
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<ElButton text type="primary" @click="openDetail(row.id)" <ElButton text type="primary" @click="openDetail(row.id)"
>查看详情 >查看详情
</ElButton </ElButton>
>
</div> </div>
<div <div
v-if="statusCode !== 2 && statusCode !== 3" v-if="statusCode !== 2 && statusCode !== 3"
...@@ -273,15 +271,13 @@ ...@@ -273,15 +271,13 @@
type="primary" type="primary"
@click="openShipment(row.id)" @click="openShipment(row.id)"
>查看发货单 >查看发货单
</ElButton </ElButton>
>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<ElButton text type="primary" @click="openLog(row.id)" <ElButton text type="primary" @click="openLog(row.id)"
>操作日志 >操作日志
</ElButton </ElButton>
>
</div> </div>
<div <div
v-if="statusCode === 1 || statusCode === 3" v-if="statusCode === 1 || statusCode === 3"
...@@ -289,8 +285,7 @@ ...@@ -289,8 +285,7 @@
> >
<ElButton text type="danger" @click="cancelOrder(row.id)" <ElButton text type="danger" @click="cancelOrder(row.id)"
>取消 >取消
</ElButton </ElButton>
>
</div> </div>
</div> </div>
</div> </div>
...@@ -396,8 +391,7 @@ ...@@ -396,8 +391,7 @@
size="large" size="large"
@click="searchShipmentByOrderNumber" @click="searchShipmentByOrderNumber"
>查询 >查询
</el-button </el-button>
>
</div> </div>
<Shipment <Shipment
v-loading="shipmentLoading" v-loading="shipmentLoading"
...@@ -465,12 +459,10 @@ ...@@ -465,12 +459,10 @@
<div class="dialog-footer"> <div class="dialog-footer">
<el-button size="large" @click="shipmentVisible = false" <el-button size="large" @click="shipmentVisible = false"
>取消 >取消
</el-button </el-button>
>
<el-button size="large" type="primary" @click="saveShipment" <el-button size="large" type="primary" @click="saveShipment"
>发货 >发货
</el-button </el-button>
>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
...@@ -529,7 +521,8 @@ import { ...@@ -529,7 +521,8 @@ import {
getLogList, getLogList,
getOrderDetail, getOrderDetail,
cancelOrderApi, cancelOrderApi,
reGenerateScriptUrlApi, refreshProductInfo, reGenerateScriptUrlApi,
refreshProductInfo,
} from '@/api/order' } from '@/api/order'
import { showError, showConfirm } from '@/utils/ui' import { showError, showConfirm } from '@/utils/ui'
import { useValue } from '@/utils/hooks/useValue' import { useValue } from '@/utils/hooks/useValue'
...@@ -814,14 +807,18 @@ const refreshProduct = async () => { ...@@ -814,14 +807,18 @@ const refreshProduct = async () => {
} catch { } catch {
return return
} }
const res = await refreshProductInfo(selection.value.map(el =>el.id)) try {
const res = await refreshProductInfo(selection.value.map((el) => el.id))
ElMessage({ ElMessage({
message: res.message, message: res.message,
type: 'success', type: 'success',
offset: window.innerHeight / 2, offset: window.innerHeight / 2,
}) })
await loadTabData() loadTabData()
search() search()
} catch (e) {
showError(e)
}
} }
// 添加内部便签 // 添加内部便签
const addInternalTag = async () => { 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