Skip to content

F
factory_front
Commit e9ea2851 by qinjianhui
Options

Merge branch 'wq' into 'master' 

Wq

See merge request !1
parents 62abad04 21cc65b9
Showing with 64 additions and 14 deletions
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/api/order.ts
...@@ -148,7 +148,18 @@ export function loadSendOutList(id: number) { ...@@ -148,7 +148,18 @@ export function loadSendOutList(id: number) {
}, },
) )
} }
// 设置备注
export function backEndCommentsApi(id: number, remark: string) {
return axios.get<never, BaseRespData<SendOrderData[]>>(
'factory/customJomallOrderProduct/setRemark',
{
params: {
id,
remark
},
},
)
}
// 操作日志 // 操作日志
export function getLogList(id: number) { export function getLogList(id: number) {
return axios.get<never, BaseRespData<LogListData[]>>( return axios.get<never, BaseRespData<LogListData[]>>(
......
src/views/order/ProductInfo.vue
...@@ -11,13 +11,20 @@ ...@@ -11,13 +11,20 @@
<img :src="item.variantImage" style="width: 100%; height: 100%" /> <img :src="item.variantImage" style="width: 100%; height: 100%" />
</div> </div>
<div class="order-list-expand_item_info"> <div class="order-list-expand_item_info">
<div :title="item.productName || '--'" class="order-list-expand_item_info_title" style="font-weight: bold"> <div
:title="item.productName || '--'"
class="order-list-expand_item_info_title"
style="font-weight: bold"
>
<span class="order-list-expand_item_label">商品名:</span> <span class="order-list-expand_item_label">商品名:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
item.productName || '--' item.productName || '--'
}}</span> }}</span>
</div> </div>
<div :title="item.baseSku || ''" class="order-list-expand_item_info_title"> <div
:title="item.baseSku || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">Base SKU:</span> <span class="order-list-expand_item_label">Base SKU:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.baseSku || '--' >{{ item.baseSku || '--'
...@@ -25,7 +32,10 @@ ...@@ -25,7 +32,10 @@
><DocumentCopy /></el-icon ><DocumentCopy /></el-icon
></span> ></span>
</div> </div>
<div :title="item.variantSku || ''" class="order-list-expand_item_info_title"> <div
:title="item.variantSku || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">Variant SKU:</span> <span class="order-list-expand_item_label">Variant SKU:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.variantSku || '--' }} >{{ item.variantSku || '--' }}
...@@ -34,7 +44,10 @@ ...@@ -34,7 +44,10 @@
/></el-icon> /></el-icon>
</span> </span>
</div> </div>
<div :title="item.shopNumber || ''" class="order-list-expand_item_info_title"> <div
:title="item.shopNumber || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">店铺单号:</span> <span class="order-list-expand_item_label">店铺单号:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.shopNumber || '--' }} >{{ item.shopNumber || '--' }}
...@@ -43,7 +56,10 @@ ...@@ -43,7 +56,10 @@
/></el-icon> /></el-icon>
</span> </span>
</div> </div>
<div :title="item.subOrderNumber || ''" class="order-list-expand_item_info_title"> <div
:title="item.subOrderNumber || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">生产单号:</span> <span class="order-list-expand_item_label">生产单号:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.subOrderNumber || '--' >{{ item.subOrderNumber || '--'
...@@ -52,7 +68,7 @@ ...@@ -52,7 +68,7 @@
/></el-icon> /></el-icon>
</span> </span>
</div> </div>
<div class="order-list-expand_item_info_title"> <div class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">发货状态:</span> <span class="order-list-expand_item_label">发货状态:</span>
<span <span
v-if="(item.shipmentNum || 0) - (item.notPassNum || 0) === item.num" v-if="(item.shipmentNum || 0) - (item.notPassNum || 0) === item.num"
...@@ -76,12 +92,29 @@ ...@@ -76,12 +92,29 @@
<el-tag effect="dark" type="danger"> 未发货 </el-tag> <el-tag effect="dark" type="danger"> 未发货 </el-tag>
</span> </span>
</div> </div>
<div :title="item.material || ''" class="order-list-expand_item_info_title"> <div
:title="item.material || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">材质:</span> <span class="order-list-expand_item_label">材质:</span>
<span class="order-list-expand_item_value" <span class="order-list-expand_item_value"
>{{ item.material || '--' >{{ item.material || '--' }}
}} </span>
</div>
<div
:title="item.remark || ''"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">备注:</span>
<span class="order-list-expand_item_value"
>{{ item.remark || '--' }}
</span> </span>
<el-icon
class="icon"
style="color: #e6a23c"
@click="setRemarks(item.id, item.remark)"
><EditPen
/></el-icon>
</div> </div>
</div> </div>
<div class="order-list-expand_item_price"> <div class="order-list-expand_item_price">
...@@ -145,12 +178,11 @@ ...@@ -145,12 +178,11 @@
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { DocumentCopy } from '@element-plus/icons-vue' import { DocumentCopy, EditPen } from '@element-plus/icons-vue'
import { filePath } from '@/api/axios' import { filePath } from '@/api/axios'
import { downloadOrder } from '@/api/order' import { downloadOrder } from '@/api/order'
import { OrderData, ProductList } from '@/types/api/order' import { OrderData, ProductList } from '@/types/api/order'
import { PropType } from 'vue' import { PropType ,defineEmits} from 'vue'
defineProps({ defineProps({
row: { row: {
type: Object as PropType<OrderData>, type: Object as PropType<OrderData>,
...@@ -164,6 +196,9 @@ defineProps({ ...@@ -164,6 +196,9 @@ defineProps({
type: Number, type: Number,
}, },
}) })
const emit = defineEmits<{
(e: 'update-remark', payload: { id: number; remark: string }): void;
}>();
const downloadManuscriptBySubOrder = async (item: ProductList) => { const downloadManuscriptBySubOrder = async (item: ProductList) => {
try { try {
const res = await downloadOrder(item.id) const res = await downloadOrder(item.id)
...@@ -176,6 +211,10 @@ const copy = (text: string) => { ...@@ -176,6 +211,10 @@ const copy = (text: string) => {
navigator.clipboard.writeText(text) navigator.clipboard.writeText(text)
ElMessage.success('复制成功') ElMessage.success('复制成功')
} }
const setRemarks = (id: number, remark: string) => {
emit('update-remark', { id, remark })
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.order-list-expand_item { .order-list-expand_item {
...@@ -183,7 +222,6 @@ const copy = (text: string) => { ...@@ -183,7 +222,6 @@ const copy = (text: string) => {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
padding: 20px; padding: 20px;
} }
.order-list-expand_item:last-child { .order-list-expand_item:last-child {
border-bottom: 0; border-bottom: 0;
} }
...@@ -206,6 +244,7 @@ const copy = (text: string) => { ...@@ -206,6 +244,7 @@ const copy = (text: string) => {
.order-list-expand_item_info_title { .order-list-expand_item_info_title {
line-height: 26px; line-height: 26px;
display: flex; display: flex;
align-items: center;
} }
.order-list-expand_item_label { .order-list-expand_item_label {
......
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