sc
This commit is contained in:
@@ -38,34 +38,29 @@
|
||||
<el-table-column type="expand" fixed="left">
|
||||
<template #default="{ row }">
|
||||
<div class="p-10px flex justify-center">
|
||||
<!-- <VueDraggable
|
||||
target="tbody"
|
||||
v-model="row.signProducts"
|
||||
:animation="150"
|
||||
@end="onDragEnd"
|
||||
style="width: 100%"
|
||||
> -->
|
||||
<el-table
|
||||
:data="row.childrenOrder"
|
||||
row-key="id"
|
||||
stripe
|
||||
style="width: 90%; margin: 0 auto"
|
||||
>
|
||||
<el-table-column prop="signId" label="子订单号" />
|
||||
<el-table-column prop="createUserName" label="登记人" width="120px" />
|
||||
<el-table-column prop="dealDate" label="成交日期" width="120px" />
|
||||
<el-table-column prop="signPrice" label="成交价" width="120px" />
|
||||
<el-table-column prop="payAmount" label="支付金额" width="120px" />
|
||||
<el-table-column prop="receivedMoney" label="已到账金额" width="120px" />
|
||||
<el-table-column prop="isCommissioned" label="提成状态" width="120px" />
|
||||
<el-table-column prop="remark" label="备注">
|
||||
<el-table :data="row.childrenOrder" row-key="signId" stripe>
|
||||
<el-table-column
|
||||
:prop="item.field"
|
||||
:label="item.label"
|
||||
v-for="item in allSchemas.tableColumns.filter((it) => it.paramLevel == 2)"
|
||||
:key="item.id"
|
||||
width="100px"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-popover trigger="hover" placement="top">
|
||||
<el-popover
|
||||
v-if="item.field == 'remark' || item.form?.component == 'Editor'"
|
||||
trigger="hover"
|
||||
placement="top"
|
||||
>
|
||||
<div v-dompurify-html="scope.row.remark"></div>
|
||||
<template #reference>
|
||||
<el-button type="primary" link>查看</el-button>
|
||||
</template>
|
||||
</el-popover>
|
||||
<div v-else>
|
||||
<span v-if="item.isCustom">{{ scope.row.diyParams[item.field] }}</span>
|
||||
<span v-else>{{ scope.row[item.field] }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="260px" fixed="right">
|
||||
@@ -111,75 +106,7 @@
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column prop="productName" label="成交产品" width="120px" />
|
||||
<el-table-column prop="specsName" label="产品规格" width="120px" />
|
||||
<el-table-column prop="signNum" label="成交数量" width="90px" />
|
||||
<el-table-column prop="remark" label="成交备注" width="100px" />
|
||||
<el-table-column label="生产状态" width="160px">
|
||||
<template #default="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.isProduced"
|
||||
:active-value="true"
|
||||
:inactive-value="false"
|
||||
active-text="已生产"
|
||||
inactive-text="待生产"
|
||||
:disabled="!checkPermi(['clue:order:update-produce'])"
|
||||
size="small"
|
||||
@change="handleChangeProdoce(scope.row)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发货状态" prop="sendState" width="90px">
|
||||
<template #default="scope">
|
||||
<el-tag
|
||||
:type="scope.row.sendState == '待发货' ? 'danger' : 'success'"
|
||||
size="small"
|
||||
>
|
||||
{{ scope.row.sendState }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发货备注" width="100px">
|
||||
<template #default="scope">
|
||||
<el-popover
|
||||
placement="top"
|
||||
width="500px"
|
||||
trigger="click"
|
||||
v-if="scope.row.warehouseName && scope.row.sendRemark"
|
||||
>
|
||||
<template #reference>
|
||||
<el-button type="primary" style="padding: 0" text>点击查看</el-button>
|
||||
</template>
|
||||
<div v-dompurify-html="scope.row.sendRemark"></div>
|
||||
</el-popover>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="100px">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
type="primary"
|
||||
class="mr-10px"
|
||||
link
|
||||
:disabled="scope.row.sendState == '已发货'"
|
||||
style="padding: 0; margin-left: 0"
|
||||
v-hasPermi="['clue:order:send']"
|
||||
@click="handleDelivery(scope.row)"
|
||||
>
|
||||
发货
|
||||
</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
link
|
||||
style="padding: 0; margin-left: 0"
|
||||
v-hasPermi="['clue:order:remove-product']"
|
||||
@click="handleRemoveProduct(scope.row)"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
</el-table>
|
||||
<!-- </VueDraggable> -->
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -194,7 +121,7 @@
|
||||
<div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
|
||||
<el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
|
||||
<template #reference>
|
||||
<el-button type="primary" style="padding: 0" text>点击查看</el-button>
|
||||
<el-button type="primary" style="padding: 0" link>点击查看</el-button>
|
||||
</template>
|
||||
<div v-dompurify-html="row[item.field]"></div>
|
||||
</el-popover>
|
||||
@@ -306,7 +233,7 @@ async function getTableList() {
|
||||
pageSize: tableObject.value.pageSize
|
||||
}
|
||||
const data = await SignApi.getSignPage(removeNullField(params))
|
||||
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
|
||||
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.orderDiyParams }))
|
||||
tableObject.value.total = data.total
|
||||
} finally {
|
||||
tableObject.value.loading = false
|
||||
|
||||
Reference in New Issue
Block a user