feat(crm): 传递合同ID至订单页面并完善标签逻辑
在合同页面将合同ID传递给订单页面,确保订单与合同关联 优化标签渲染逻辑,根据仓库类型显示不同标签 移除无用注释和代码
This commit is contained in:
@@ -197,7 +197,7 @@
|
||||
合同信息
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="下发订单" name="second">
|
||||
<OrderPage v-if="activeTab === 'second'" />
|
||||
<OrderPage v-if="activeTab === 'second'" :contractId="form.contractId" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="收款记录" name="third">
|
||||
<KLPTable v-loading="loading" :data="financeList">
|
||||
|
||||
@@ -123,9 +123,6 @@
|
||||
:value="item.contractId" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="合同号" prop="contractCode">
|
||||
<el-input v-model="form.contractCode" placeholder="请输入合同号" disabled />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="交货日期" prop="deliveryDate">
|
||||
<el-date-picker clearable v-model="form.deliveryDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择交货日期">
|
||||
@@ -172,6 +169,12 @@ export default {
|
||||
FileList
|
||||
},
|
||||
dicts: ['customer_level', 'customer_industry', 'wip_pack_saleman'],
|
||||
props: {
|
||||
contractId: {
|
||||
type: String,
|
||||
default: ''
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
ORDER_STATUS,
|
||||
@@ -182,6 +185,7 @@ export default {
|
||||
customerId: '',
|
||||
salesman: '',
|
||||
orderStatus: '',
|
||||
contractId: this.contractId,
|
||||
orderType: ORDER_TYPE['正式订单'],
|
||||
financeStatus: '',
|
||||
pageNum: 1,
|
||||
@@ -258,6 +262,12 @@ export default {
|
||||
|
||||
// 表单重置
|
||||
reset() {
|
||||
// 如果有合同号,重置合同号
|
||||
let contractCode = ''
|
||||
if (this.contractId) {
|
||||
contractCode = this.contractList.find(item => item.contractId === this.contractId).contractNo
|
||||
}
|
||||
// 重置表单数据
|
||||
this.form = {
|
||||
orderId: undefined,
|
||||
orderCode: undefined,
|
||||
@@ -266,6 +276,8 @@ export default {
|
||||
orderAmount: undefined,
|
||||
salesman: undefined,
|
||||
deliveryDate: undefined,
|
||||
contractId: this.contractId,
|
||||
contractCode: contractCode,
|
||||
preOrderStatus: undefined,
|
||||
auditUser: undefined,
|
||||
auditTime: undefined,
|
||||
|
||||
Reference in New Issue
Block a user