From c334c2d76c1b51d0fbe1531bf524e1b90f921a7c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 五月 2025 15:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/invoiceRegistration/index.vue | 85 +++++++++++++++++++-----------------------
1 files changed, 38 insertions(+), 47 deletions(-)
diff --git a/src/views/salesManagement/invoiceRegistration/index.vue b/src/views/salesManagement/invoiceRegistration/index.vue
index 92835df..fbae169 100644
--- a/src/views/salesManagement/invoiceRegistration/index.vue
+++ b/src/views/salesManagement/invoiceRegistration/index.vue
@@ -43,10 +43,10 @@
<el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" />
<el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" />
<el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" />
- <el-table-column label="鏈寮�绁ㄦ暟" prop="invoiceNum" />
- <el-table-column label="鏈寮�绁ㄩ噾棰�(鍏�)" prop="invoiceAmount" />
- <el-table-column label="鏈紑绁ㄦ暟(鍏�)" prop="noInvoiceNum" />
- <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmount" />
+ <el-table-column label="寮�绁ㄦ暟" prop="invoiceNum" />
+ <el-table-column label="寮�绁ㄩ噾棰�(鍏�)" prop="invoiceAmount" />
+ <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" />
+ <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmount"/>
</el-table>
</template>
</el-table-column>
@@ -57,11 +57,7 @@
<el-table-column label="涓氬姟鍛�" prop="salesman" show-overflow-tooltip/>
<el-table-column label="椤圭洰鍚嶇О" prop="projectName" show-overflow-tooltip/>
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" show-overflow-tooltip/>
- <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
- <template #default="scope">
- <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
- </template>
- </el-table-column>
+ <el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmountTotal" show-overflow-tooltip/>
</el-table>
<pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current"
:limit="page.size" @pagination="paginationChange" />
@@ -98,7 +94,7 @@
<el-form-item label="浜у搧淇℃伅锛�" prop="entryDate">
</el-form-item>
</el-row>
- <el-table :data="productData" border>
+ <el-table :data="productData" border show-summary :summary-method="summarizeChildrenTable">
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
@@ -110,28 +106,22 @@
<el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" />
<el-table-column label="鏈寮�绁ㄦ暟" prop="invoiceNum">
<template #default="scope">
- <el-input :disabled="!scope.row.editFlag" v-model="scope.row.invoiceNum"></el-input>
+ <el-input type="number" :step="1" min="0" v-model="scope.row.invoiceNum" @blur="invoiceNumBlur(scope.row)"></el-input>
</template>
</el-table-column>
<el-table-column label="鏈寮�绁ㄩ噾棰�(鍏�)" prop="invoiceAmount" >
<template #default="scope">
- <el-input :disabled="!scope.row.editFlag" v-model="scope.row.invoiceAmount"></el-input>
+ <el-input type="number" :step="0.01" min="0" v-model="scope.row.invoiceAmount" @blur="invoiceAmountBlur(scope.row)"></el-input>
</template>
</el-table-column>
- <el-table-column label="鏈紑绁ㄦ暟(鍏�)" prop="noInvoiceNum" >
+ <el-table-column label="鏈紑绁ㄦ暟" prop="noInvoiceNum" >
<template #default="scope">
- <el-input :disabled="!scope.row.editFlag" v-model="scope.row.noInvoiceNum"></el-input>
+ <el-input type="number" min="0" disabled v-model="scope.row.noInvoiceNum"></el-input>
</template>
</el-table-column>
<el-table-column label="鏈紑绁ㄩ噾棰�(鍏�)" prop="noInvoiceAmount" >
<template #default="scope">
- <el-input :disabled="!scope.row.editFlag" v-model="scope.row.noInvoiceAmount"></el-input>
- </template>
- </el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
- <template #default="scope">
- <el-button v-if="!scope.row.editFlag" link type="primary" size="small" @click="openProductEdit(scope.row);">缂栬緫</el-button>
- <el-button v-else link type="primary" size="small" @click="openProductEdit(scope.row);">淇濆瓨</el-button>
+ <el-input type="number" min="0" disabled v-model="scope.row.noInvoiceAmount"></el-input>
</template>
</el-table-column>
</el-table>
@@ -193,21 +183,6 @@
}
})
const { searchForm, form, rules } = toRefs(data)
-// 浜у搧琛ㄥ崟寮规鏁版嵁
-const productFormData = reactive({
- productForm: {
- productCategory: '',
- specificationModel: '',
- unit: '',
- quantity: '',
- taxInclusiveUnitPrice: '',
- taxRate: '',
- taxInclusiveTotalPrice: '',
- taxExclusiveTotalPrice: '',
- invoiceType: '',
- },
-})
-const { productForm } = toRefs(productFormData)
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -229,6 +204,7 @@
item.children = []
})
total.value = res.data.total
+ expandedRowKeys.value = []
})
}
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -324,9 +300,6 @@
proxy.$refs["formRef"].validate(valid => {
if (valid) {
form.value.productDtoList = proxy.HaveJson(productData.value)
- form.value.productDtoList.forEach(item => {
- item.id = ''
- })
delete form.value.productData
invoiceRegistrationSaveOrUpdate(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛")
@@ -340,13 +313,6 @@
const closeDia = () => {
proxy.resetForm("formRef")
dialogFormVisible.value = false
-}
-// 鎵撳紑浜у搧寮规
-const openProductEdit = (row) => {
- const index = productData.value.findIndex(item => item.id === row.id);
- if (index > -1) {
- productData.value[index].editFlag = !productData.value[index].editFlag
- }
}
// 瀵煎嚭
const handleOut = () => {
@@ -402,15 +368,40 @@
customerId: res.customerId,
}
productData.value = form.value.productData.map(item => {
- item.editFlag = false
+ item.noInvoiceNum = item.futureTickets
+ item.noInvoiceAmount = item.futureTicketsAmount
return item
})
+ console.log('productData.value ',productData.value )
})
}else {
proxy.resetForm("formRef")
productData.value = []
}
}
+
+//鏈寮�绁ㄥけ鐒︽搷浣�
+const invoiceNumBlur = (row) => {
+ if(!row.invoiceNum){
+ row.invoiceNum = 0
+ }
+ if(row.invoiceNum > row.noInvoiceNum){
+ proxy.$modal.msgWarning('鏈寮�绁ㄦ暟涓嶅緱澶т簬鏈紑绁ㄦ暟')
+ row.invoiceNum = 0
+ }
+ row.noInvoiceNum = row.futureTickets - row.invoiceNum
+}
+// 鏈寮�绁ㄩ噾棰濆け鐒︽搷浣�
+const invoiceAmountBlur = (row) => {
+ if(!row.invoiceAmount){
+ row.invoiceAmount = 0
+ }
+ if(row.invoiceAmount > row.noInvoiceAmount){
+ proxy.$modal.msgWarning('鏈寮�绁ㄩ噾棰濅笉寰楀ぇ浜庢湭寮�绁ㄩ噾棰�')
+ row.invoiceAmount = 0
+ }
+ row.noInvoiceAmount = row.futureTicketsAmount - row.invoiceAmount
+}
getList()
</script>
--
Gitblit v1.9.3