Merge remote-tracking branch 'origin/dev' into dev

server/dao/projectFee.go

@@ -64,7 +64,7 @@ func (e ProjectFee) CreateProjectFee() error {
 }
 
 func (e ProjectFee) UpdateProjectFee() error {
-	return global.GVA_DB.Model(&ProjectFee{}).Save(&e).Error
+	return global.GVA_DB.Model(&ProjectFee{}).Where("id = ?", e.ID).Updates(&e).Error
 }
 
 func (e ProjectFee) DeleteProjectFee() error {

web/src/view/finance/financeAnalysis/components/payment.vue

@@ -193,6 +193,15 @@
             @clear="paymentAddData.collectionTime = ''"
           />
         </el-form-item>
+        <el-form-item
+          label="银行流水单号："
+          size="large"
+        >
+          <el-input
+            v-model="paymentAddData.serialNumber"
+            placeholder="可输入银行流水单号(选填)"
+          />
+        </el-form-item>
         <el-form-item
           label="收款备注："
           size="large"
@@ -250,7 +259,8 @@ const paymentEditData = reactive({
   projectCode: '',
   collectionPrice: 0,
   remarks: '',
-  collectionTime: ''
+  collectionTime: '',
+  serialNumber: ''
 })
 
 const editAmount = ref('')
@@ -261,7 +271,8 @@ const paymentAddData = reactive({
   projectCode: '',
   collectionPrice: 0,
   remarks: '',
-  collectionTime: ''
+  collectionTime: '',
+  serialNumber: ''
 })
 
 const addAmount = ref('')
@@ -335,6 +346,9 @@ const paymentAdd = () => {
   addData.collectionPrice = addAmount.value.length === 0 ? 0 : parseFloat(addAmount.value)
   addData.projectCode = serial.currentCode
   for (const item in addData) {
+    if (item === 'serialNumber') {
+      continue
+    }
     if (addData[item] === '' || addData[item] === 0) {
       ElMessage({
         message: '请将信息填写完整',