diff --git a/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue b/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue index c7f38c1e..0c58f891 100644 --- a/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue +++ b/oms_web/oms_vue/src/views/finance/invoice/components/ApplyInvoice.vue @@ -56,26 +56,12 @@
销售方
信息
- - - +
{{ form.sellerName }}
 统一社会信用代码/
纳税人识别号 - +
{{ form.sellerCreditCode }}
@@ -213,6 +199,10 @@ import { listCompanyInfo } from "@/api/system/companyInfo"; export default { name: "ApplyInvoice", dicts: ['finance_invoice_type'], + constants: { + FIXED_SELLER_NAME: '紫光汇智信息技术有限公司', + FIXED_SELLER_CREDIT_CODE: '91500108MA6078GXXQ' + }, props: { visible: { type: Boolean, @@ -242,8 +232,8 @@ export default { buyerCreditCode: undefined, buyerBank: undefined, buyerBankAccount: undefined, - sellerName: undefined, - sellerCreditCode: undefined, + sellerName: this.$options.constants.FIXED_SELLER_NAME, + sellerCreditCode: this.$options.constants.FIXED_SELLER_CREDIT_CODE, sellerBank: undefined, sellerBankAccount: undefined, informationNote: '默认开票', @@ -326,8 +316,8 @@ export default { buyerCreditCode: undefined, buyerBank: undefined, buyerBankAccount: undefined, - sellerName: undefined, - sellerCreditCode: undefined, + sellerName: this.$options.constants.FIXED_SELLER_NAME, + sellerCreditCode: this.$options.constants.FIXED_SELLER_CREDIT_CODE, sellerBank: undefined, sellerBankAccount: undefined, informationNote: '默认开票', @@ -344,16 +334,8 @@ export default { this.form.buyerBank = this.rowData.buyerBank ; this.form.buyerBankAccount = this.rowData.buyerBankAccount ; - if (this.rowData.sellerName) { - this.form.sellerName = this.rowData.sellerName; - this.form.sellerCreditCode = this.rowData.sellerCreditCode; - this.form.sellerBank = this.rowData.sellerBank; - this.form.sellerBankAccount = this.rowData.sellerBankAccount; - } else if (this.companyOptions.length > 0) { - const defaultCompany = this.companyOptions[0]; - this.form.sellerName = defaultCompany.companyName; - this.handleSellerChange(defaultCompany.companyName); - } + this.form.sellerName = this.$options.constants.FIXED_SELLER_NAME; + this.form.sellerCreditCode = this.$options.constants.FIXED_SELLER_CREDIT_CODE; this.form.invoiceBillCode = this.rowData.invoiceBillCode; this.form.id = this.rowData.id; @@ -771,6 +753,12 @@ export default { line-height: 32px; } +.fixed-field-text { + min-height: 32px; + line-height: 32px; + color: #606266; +} + /* Table Styling */ .items-table-container { padding: 0; diff --git a/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue b/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue index 581bc004..252baf8e 100644 --- a/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue +++ b/oms_web/oms_vue/src/views/inventory/delivery/Detail.vue @@ -51,7 +51,7 @@ - + diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue index ac1080c9..23257cc0 100644 --- a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue +++ b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue @@ -45,6 +45,13 @@ + + + + + + + @@ -113,6 +120,7 @@ export default { deliveryTimeType: '0', deliveryTime: new Date(), remark: '', + notifierAddress: '', }, rules: { logisticsCode: [{ required: true, message: "物流单号不能为空", trigger: "blur" }], @@ -147,21 +155,43 @@ export default { }, methods: { open(productRow, outerForm) { + console.group('[GenerateDeliveryForm] open 参数'); + console.log('productRow:', productRow); + console.log('outerForm:', outerForm); + console.log('productRow 关键字段:', { + productCode: productRow && productRow.productCode, + warehouseId: productRow && productRow.warehouseId, + quantity: productRow && productRow.quantity, + deliveryGenerateQuantity: productRow && productRow.deliveryGenerateQuantity, + deliveryConfirmQuantity: productRow && productRow.deliveryConfirmQuantity, + orderType: productRow && productRow.orderType + }); + console.log('outerForm 关键字段:', { + outerCode: outerForm && outerForm.outerCode, + deliveryTime: outerForm && outerForm.deliveryTime, + vendorName: outerForm && outerForm.vendorName, + notifierAddress: outerForm && outerForm.notifierAddress + }); + console.groupEnd(); this.selectedSnList.length=0; this.reset(); this.productData = productRow; this.outerData = outerForm; this.requiredDeliveryTime = outerForm.deliveryTime; + const notifierAddress = (outerForm && outerForm.notifierAddress) || ''; + this.form.notifierAddress = notifierAddress; this.queryParams.productCode = productRow.productCode; this.queryParams.warehouseId = productRow.warehouseId; this.queryParams.pageSize = productRow.quantity - productRow.deliveryGenerateQuantity - productRow.deliveryConfirmQuantity; this.isInitialLoad = true; - this.$nextTick(() => { - this.getSnList(); - }) this.visible = true; + this.$nextTick(() => { + // 再次回填，避免被 resetForm/渲染时机覆盖 + this.form.notifierAddress = notifierAddress; + this.getSnList(); + }) }, getSnList() { listProductSn(this.queryParams).then(response => { @@ -292,6 +322,7 @@ export default { deliveryTimeType: '0', deliveryTime: new Date(), remark: '', + notifierAddress: '', }; this.resetForm("form"); this.snList = []; diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue index b562f358..51cb4a5b 100644 --- a/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue +++ b/oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue @@ -144,7 +144,14 @@ export default { }, // 发货按钮 handleDeliver(row) { - this.$refs.deliveryForm.open(row, this.form); + const fallbackNotifierAddress = this.deliveryList.length > 0 + ? this.deliveryList[0].notifierAddress + : ''; + const formData = { + ...this.form, + notifierAddress: this.form.notifierAddress || row.notifierAddress || fallbackNotifierAddress || '' + }; + this.$refs.deliveryForm.open(row, formData); }, // 撤销发货记录 handleDeleteDelivery(deliveryId) {