refactor(contract): 统一合同编号字段名从contractNo改为contractCode
修改多个组件中合同编号字段名以保持一致性,移除未使用的props和清理冗余代码
This commit is contained in:
@@ -74,7 +74,7 @@
|
||||
<!-- 合同名称和编号 -->
|
||||
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 8px;">
|
||||
<div style="font-weight: bold;">{{ row.contractName }}</div>
|
||||
<div style="font-size: 12px; color: #606266;">{{ row.contractNo }}</div>
|
||||
<div style="font-size: 12px; color: #606266;">{{ row.contractCode }}</div>
|
||||
</div>
|
||||
|
||||
<!-- 供方和需方 -->
|
||||
@@ -144,7 +144,7 @@ export default {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
contractName: undefined,
|
||||
contractNo: undefined,
|
||||
contractCode: undefined,
|
||||
supplier: undefined,
|
||||
customer: undefined,
|
||||
signTime: undefined,
|
||||
@@ -230,7 +230,7 @@ export default {
|
||||
|
||||
// 合同编号
|
||||
worksheet.mergeCells('G2:H2');
|
||||
worksheet.getCell('G2').value = `合同编号:${row.contractNo || ''}`;
|
||||
worksheet.getCell('G2').value = `合同编号:${row.contractCode || ''}`;
|
||||
worksheet.getCell('G2').alignment = { horizontal: 'right', vertical: 'middle' };
|
||||
|
||||
// 供方信息
|
||||
@@ -692,7 +692,7 @@ export default {
|
||||
// 5. 导出文件
|
||||
const buffer = await workbook.xlsx.writeBuffer();
|
||||
const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
|
||||
saveAs(blob, `合同_${row.contractNo || row.contractName || '未命名'}.xlsx`);
|
||||
saveAs(blob, `合同_${row.contractCode || row.contractName || '未命名'}.xlsx`);
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
@@ -95,18 +95,6 @@ export default {
|
||||
type: [Number, String],
|
||||
default: null
|
||||
},
|
||||
customerId: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
financeList: {
|
||||
type: Array,
|
||||
default: () => []
|
||||
},
|
||||
objectionList: {
|
||||
type: Array,
|
||||
default: () => []
|
||||
},
|
||||
coilList: {
|
||||
type: Array,
|
||||
default: () => []
|
||||
@@ -115,10 +103,6 @@ export default {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
tabLoading: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
// 附件字段
|
||||
contractAttachment: {
|
||||
type: String,
|
||||
@@ -132,10 +116,6 @@ export default {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
wmsDeliveryWaybills: {
|
||||
type: Array,
|
||||
default: () => []
|
||||
},
|
||||
// 新增必要的props
|
||||
form: {
|
||||
type: Object,
|
||||
@@ -145,10 +125,6 @@ export default {
|
||||
type: Object,
|
||||
default: () => ({})
|
||||
},
|
||||
customerList: {
|
||||
type: Array,
|
||||
default: () => []
|
||||
},
|
||||
deliveryWaybillList: {
|
||||
type: Array,
|
||||
default: () => []
|
||||
@@ -179,10 +155,6 @@ export default {
|
||||
.replace('{i}', minutes)
|
||||
.replace('{s}', seconds);
|
||||
},
|
||||
// 处理订单保存
|
||||
handleOrderSave() {
|
||||
// 这里可以添加保存逻辑
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@@ -23,9 +23,7 @@
|
||||
|
||||
<!-- 右侧下方:Tab标签页 -->
|
||||
<div class="tab-panel" ref="tabPanel" style="flex: 1; overflow-y: auto;">
|
||||
<ContractTabs :orderId="form.orderId" :customerId="form.customerId" :financeList="financeList"
|
||||
:objectionList="objectionList" :wmsDeliveryWaybills="wmsDeliveryWaybills" :coilList="coilList"
|
||||
:tabLoading="tabLoading" :contract-attachment="form.businessAnnex" :technical-agreement="form.techAnnex"
|
||||
<ContractTabs :orderId="form.orderId" :deliveryWaybillList="wmsDeliveryWaybills" :coilList="coilList" :contract-attachment="form.businessAnnex" :technical-agreement="form.techAnnex"
|
||||
:other-attachment="form.productionSchedule" :currentOrder="form" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -339,15 +337,10 @@ export default {
|
||||
/** 行点击事件 */
|
||||
handleRowClick(row) {
|
||||
this.form = row;
|
||||
// this.tabLoading = true;
|
||||
this.getCoilList();
|
||||
// listContractOrderObjection(row.contractId).then(response => {
|
||||
// this.financeList = response.data.financeList || [];
|
||||
// this.objectionList = response.data.oobjectionList || [];
|
||||
// this.wmsDeliveryWaybills = response.data.wmsDeliveryWaybills || [];
|
||||
// }).finally(() => {
|
||||
// this.tabLoading = false;
|
||||
// })
|
||||
listDeliveryWaybill({ orderId: row.orderId, pageNum: 1, pageSize: 50 }).then(res => {
|
||||
this.wmsDeliveryWaybills = res.rows || [];
|
||||
})
|
||||
},
|
||||
/** 查询合同配卷列表 */
|
||||
getCoilList() {
|
||||
@@ -360,7 +353,7 @@ export default {
|
||||
this.form = {
|
||||
contractId: undefined,
|
||||
contractName: '产品销售合同',
|
||||
contractNo: undefined,
|
||||
contractCode: undefined,
|
||||
supplier: '嘉祥科伦普重工有限公司',
|
||||
customer: undefined,
|
||||
signTime: undefined,
|
||||
@@ -478,8 +471,12 @@ export default {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
this.buttonLoading = true;
|
||||
const payload = {
|
||||
...this.form,
|
||||
orderCode: this.form.contractCode,
|
||||
}
|
||||
if (this.form.orderId != null) {
|
||||
updateOrder(this.form).then(response => {
|
||||
updateOrder(payload).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.$refs.orderList.getList();
|
||||
@@ -487,7 +484,7 @@ export default {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
} else {
|
||||
addOrder(this.form).then(response => {
|
||||
addOrder(payload).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.$refs.orderList.getList();
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="合同号" prop="contractId">
|
||||
<el-select style="width: 100%;" v-model="form.contractId" placeholder="请选择合同号" filterable clearable @change="handleContractChange">
|
||||
<el-option v-for="item in contractList" :key="item.contractId" :label="item.contractNo"
|
||||
<el-option v-for="item in contractList" :key="item.contractId" :label="item.contractCode"
|
||||
:value="item.contractId" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
Reference in New Issue
Block a user