Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/BIZComponents/paymentCollectionPlan/Index.vue

@@ -11,24 +11,28 @@
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
         <div class="headbox">
-            <div>
-              <el-button
-                size="small"
-                type="primary"
-                icon="el-icon-plus"
-                class="ele-btn-icon"
-                @click="handlAdd"
-                v-if="showAddBtn"
-              >
-                新增
-              </el-button>
-            </div>
-
-            <div class="pricebox">
-                <span class="amount">比例合计：{{ allRatio }}%</span>
-                <span class="amount">计划{{ menu === 'purchase' ? '付款' : '收款' }}金额合计：{{ allPrice }}元</span>
-
-                <!-- <el-form-item
+          <div>
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-plus"
+              class="ele-btn-icon"
+              @click="handlAdd"
+              v-if="showAddBtn"
+            >
+              新增
+            </el-button>
+          </div>
+
+          <div class="pricebox">
+            <span class="amount">比例合计：{{ allRatio }}%</span>
+            <span class="amount"
+              >计划{{ menu === 'purchase' ? '付款' : '收款' }}金额合计：{{
+                allPrice
+              }}元</span
+            >
+
+            <!-- <el-form-item
                     style="width: 300px"
                     label="优惠后总金额："
                     prop="discountTotalPrice"
@@ -51,13 +55,13 @@
                     <template slot="append">元</template>
                     </el-input>
                 </el-form-item> -->
-            </div>
+          </div>
         </div>
       </template>
 
       <template v-slot:headerIssueNumber="{ column }">
         <span class="is-required">{{ column.label }}</span>
-      </template> 
+      </template>
 
       <template v-slot:headerType="{ column }">
         <span class="is-required">{{ column.label }}</span>
@@ -80,8 +84,7 @@
           <el-input
             v-model="scope.row.moneyName"
             placeholder="请输入"
-            :disabled="type=='view'"
-
+            :disabled="type == 'view'"
           ></el-input>
         </el-form-item>
       </template>
@@ -100,7 +103,7 @@
           <el-input
             v-model="scope.row.ratio"
             placeholder="请输入"
-            :disabled="type=='view'"
+            :disabled="type == 'view'"
             @input="(val) => ratioInput(val, scope.$index)"
           >
             <template slot="append">%</template>
@@ -121,7 +124,7 @@
             v-model="scope.row.type"
             placeholder="请选择"
             style="width: 100%"
-            :disabled="type=='view'"
+            :disabled="type == 'view'"
             @change="(val) => typeChange(val, scope.$index)"
           >
             <el-option
@@ -134,6 +137,29 @@
           </el-select>
         </el-form-item>
       </template>
+      <template v-slot:subType="scope">
+        <el-form-item
+          v-if="scope.row.type == 1"
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + scope.$index + '.subType'"
+        >
+          <el-select
+            v-model="scope.row.subType"
+            placeholder="请选择款项子类型"
+            style="width: 100%"
+            :disabled="type == 'view'"
+            @change="(val) => subTypeChange(val, scope.$index)"
+          >
+            <el-option
+              v-for="item in subTypeOp"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </template>
       <template v-slot:headerRatio="{ column }">
         <span class="is-required">{{ column.label }}</span>
       </template>
@@ -152,16 +178,16 @@
             trigger: 'change'
           }"
         >
-            <el-input
-                type="number"
-                :min="0"
-                disabled
-                v-model="scope.row.price"
-                style="width: 100%"
-                placeholder="请输入"
-            >
-                <template slot="append">元</template>
-            </el-input>
+          <el-input
+            type="number"
+            :min="0"
+            disabled
+            v-model="scope.row.price"
+            style="width: 100%"
+            placeholder="请输入"
+          >
+            <template slot="append">元</template>
+          </el-input>
         </el-form-item>
       </template>
       <template v-slot:deadLine="scope">
@@ -196,7 +222,7 @@
             v-model="scope.row.remark"
             type="textarea"
             placeholder="请输入"
-            :disabled="type=='view'"
+            :disabled="type == 'view'"
           ></el-input>
         </el-form-item>
       </template>
@@ -248,6 +274,8 @@
         remark: '',
         type: '',
         typeName: '',
+        subType: '',
+        subTypeName: '',
         issueNumber: null
       };
       return {
@@ -268,10 +296,25 @@
       canHandl() {
         return this.form.datasource.length;
       },
+      // 款项子类型选项：销售=预收款/定金，采购=预付款/定金
+      subTypeOp() {
+        if (this.menu === 'purchase') {
+          return [
+            { value: 'PREPAY', label: '预付款' },
+            { value: 'DEPOSIT', label: '定金' }
+          ];
+        }
+        return [
+          { value: 'ADVANCE', label: '预收款' },
+          { value: 'DEPOSIT', label: '定金' }
+        ];
+      },
       showAddBtn() {
         // console.log('showAddBtn~~~~', this.type, this.info);
         // console.log('showAddBtn!!!!',!['1', '2'].includes(this.info.settlementMode) || this.type != 'view');
-        return !(['1', '2'].includes(this.info?.settlementMode)) && this.type != 'view' 
+        return (
+          !['1', '2'].includes(this.info?.settlementMode) && this.type != 'view'
+        );
       },
       columns() {
         return [
@@ -298,12 +341,19 @@
             headerSlot: 'headerType',
             align: 'center'
           },
+          {
+            width: 150,
+            prop: 'subType',
+            label: '款项子类型',
+            slot: 'subType',
+            align: 'center'
+          },
           {
             prop: 'moneyName',
             label: '款项名称',
             slot: 'moneyName',
             // headerSlot: 'headerMoneyName',
-            align: 'center',
+            align: 'center'
             // width: 170
           },
           {
@@ -319,7 +369,7 @@
             prop: 'price',
             label: this.menu === 'purchase' ? '计划付款金额' : '计划收款金额',
             slot: 'price',
-            align: 'center',
+            align: 'center'
             // headerSlot: 'headerPrice',
           },
 
@@ -350,12 +400,19 @@
         ];
       },
       allRatio() {
-        return formatPrice(this.form.datasource.reduce((acc, cur) => acc + Number(cur.ratio), 0));
+        return formatPrice(
+          this.form.datasource.reduce((acc, cur) => acc + Number(cur.ratio), 0)
+        );
       },
       allPrice() {
         // 使用分进行计算，避免浮点数精度问题
-        return formatPrice(this.form.datasource.reduce((acc, cur) => acc + Math.round(Number(cur.price) * 100), 0) / 100);
-      },
+        return formatPrice(
+          this.form.datasource.reduce(
+            (acc, cur) => acc + Math.round(Number(cur.price) * 100),
+            0
+          ) / 100
+        );
+      }
     },
     watch: {
       discountAmount(newval) {
@@ -389,7 +446,25 @@
       typeChange(val, index = null) {
         // console.log(val, index, '55555');
         if (val) {
-          this.$set(this.form.datasource[index], 'typeName', this.paymentTypeOp.find(item => item.value === val).label);
+          this.$set(
+            this.form.datasource[index],
+            'typeName',
+            this.paymentTypeOp.find((item) => item.value === val).label
+          );
+        }
+        // 非预付款时清空子类型
+        if (val != 1) {
+          this.$set(this.form.datasource[index], 'subType', '');
+          this.$set(this.form.datasource[index], 'subTypeName', '');
+        }
+      },
+      subTypeChange(val, index = null) {
+        if (val) {
+          this.$set(
+            this.form.datasource[index],
+            'subTypeName',
+            this.subTypeOp.find((item) => item.value === val).label
+          );
         }
       },
       //输入比例更新金额
@@ -451,11 +526,11 @@
         if (this.isLoadingFromApi) {
           return;
         }
-        
+
         // 创建一个新的数组，避免直接修改原数组
         let newData = JSON.parse(JSON.stringify(this.form.datasource));
         console.log('newData after copy:', newData);
-        
+
         // 先根据比例计算所有价格
         for (let i = 0; i < newData.length; i++) {
           const r = newData[i];
@@ -470,29 +545,56 @@
             };
           }
         }
-        
+
         // 验证并调整最后一行价格，确保总和等于优惠后的总金额
         // 使用分进行计算，避免浮点数精度问题
-        const allPriceSum = newData.reduce((acc, cur) => acc + Math.round(Number(cur.price || 0) * 100), 0) / 100;
+        const allPriceSum =
+          newData.reduce(
+            (acc, cur) => acc + Math.round(Number(cur.price || 0) * 100),
+            0
+          ) / 100;
         const discountAmount = Number(this.discountAmount);
         // 直接计算比例总和，避免字符串转换问题
-        const allRatio = newData.reduce((acc, cur) => acc + Number(cur.ratio || 0), 0);
-        
-        console.log('allPriceSum:', allPriceSum, 'discountAmount:', discountAmount, 'allRatio:', allRatio);
-        
+        const allRatio = newData.reduce(
+          (acc, cur) => acc + Number(cur.ratio || 0),
+          0
+        );
+
+        console.log(
+          'allPriceSum:',
+          allPriceSum,
+          'discountAmount:',
+          discountAmount,
+          'allRatio:',
+          allRatio
+        );
+
         // 检查是否所有数据都有price且比例合计为100%
-        const allHavePrice = newData.every(item => item.price != null && item.price !== '');
-        
+        const allHavePrice = newData.every(
+          (item) => item.price != null && item.price !== ''
+        );
+
         console.log('allHavePrice:', allHavePrice);
-        
-        if (allHavePrice && Math.abs(allRatio - 100) < 0.01 && Math.abs(allPriceSum - discountAmount) >= 0.01) {
+
+        if (
+          allHavePrice &&
+          Math.abs(allRatio - 100) < 0.01 &&
+          Math.abs(allPriceSum - discountAmount) >= 0.01
+        ) {
           // 调整最后一行的价格
           if (newData.length > 0) {
             const lastIndex = newData.length - 1;
             // 使用分进行计算，避免浮点数精度问题
-            const otherPriceSum = newData.slice(0, lastIndex).reduce((acc, cur) => acc + Math.round(Number(cur.price || 0) * 100), 0) / 100;
+            const otherPriceSum =
+              newData
+                .slice(0, lastIndex)
+                .reduce(
+                  (acc, cur) => acc + Math.round(Number(cur.price || 0) * 100),
+                  0
+                ) / 100;
             // 计算最后一行应该有的价格
-            const lastPrice = Math.round((discountAmount - otherPriceSum) * 100) / 100;
+            const lastPrice =
+              Math.round((discountAmount - otherPriceSum) * 100) / 100;
             newData[lastIndex] = {
               ...newData[lastIndex],
               price: formatPrice(lastPrice)
@@ -500,9 +602,9 @@
             console.log('adjusted last item price:', lastPrice);
           }
         }
-        
+
         console.log('newData before update:', newData);
-        
+
         // 确保更新this.form.datasource，触发Vue的响应式更新
         this.form.datasource = newData;
         console.log('after update, datasource:', this.form.datasource);
@@ -542,21 +644,22 @@
       },
       defaultList(method, issueNumber, dateRange) {
         // console.log('method, issueNumber', method, issueNumber, dateRange);
-        const tempList = []
-        if(dateRange) {
+        const tempList = [];
+        if (dateRange) {
           this.setDefaultList(dateRange, issueNumber);
-          return
+          return;
         }
-        if(method == 3) {
+        if (method == 3) {
           let params = ['预付款', '交货款'];
-          for(let i = 0; i < issueNumber; i++) {
+          for (let i = 0; i < issueNumber; i++) {
             let item = JSON.parse(JSON.stringify(this.defaultForm));
-              item.moneyName = i < params.length ? params[i] : '';
-              item.type = i < params.length ? this.paymentTypeOp[i].value : '';
-              item.typeName = i < params.length ? this.paymentTypeOp[i].label : '';
-              item.key = i + 1;
-              item.issueNumber = i + 1;
-              tempList.push(item);
+            item.moneyName = i < params.length ? params[i] : '';
+            item.type = i < params.length ? this.paymentTypeOp[i].value : '';
+            item.typeName =
+              i < params.length ? this.paymentTypeOp[i].label : '';
+            item.key = i + 1;
+            item.issueNumber = i + 1;
+            tempList.push(item);
           }
           // params.forEach((item, index) => {
           //     let i = JSON.parse(JSON.stringify(this.defaultForm));
@@ -575,9 +678,9 @@
           //     i.issueNumber = index + 1;
           //     tempList.push(i);
           // });
-          for(let i = 0; i < issueNumber; i++) {
+          for (let i = 0; i < issueNumber; i++) {
             let item = JSON.parse(JSON.stringify(this.defaultForm));
-            if(issueNumber == 1) {
+            if (issueNumber == 1) {
               item.moneyName = '';
               item.type = 2;
               item.typeName = '交货款';
@@ -611,26 +714,27 @@
         const startDate = new Date(date[0]);
         const endDate = new Date(date[1]);
         // 计算毫秒差并转换为天数，使用Math.ceil确保结果为整数
-        const days = Math.ceil((endDate - startDate) / (1000 * 60 * 60 * 24)) + 1;
+        const days =
+          Math.ceil((endDate - startDate) / (1000 * 60 * 60 * 24)) + 1;
         console.log('包含两头的天数：', days);
 
         // 生成包括头尾在内的所有日期
         const allDates = [];
         const current = new Date(startDate);
-        
+
         // 遍历从开始日期到结束日期的所有天数
         while (current <= endDate) {
           // 格式化日期为YYYY-MM-dd
           const year = current.getFullYear();
           const month = current.getMonth() + 1; // 月份从0开始，需要+1
           const day = current.getDate();
-          
+
           const formattedMonth = String(month).padStart(2, '0');
           const formattedDay = String(day).padStart(2, '0');
           const formattedDateStr = `${year}-${formattedMonth}-${formattedDay}`;
-          
+
           allDates.push(formattedDateStr);
-          
+
           // 移动到下一天
           current.setDate(current.getDate() + 1);
         }
@@ -642,27 +746,29 @@
         const parseMonthDate = (dateStr) => {
           return dateStr instanceof Date ? dateStr : new Date(dateStr + '-01');
         };
-        
+
         const start = parseMonthDate(date[0]);
         const end = parseMonthDate(date[1]);
-        
+
         // 先生成所有月份的日期数组
         const allMonthDates = [];
         const currentDate = new Date(start);
-        
+
         // 遍历从开始月份到结束月份的所有月份
         while (currentDate <= end) {
           const year = currentDate.getFullYear();
           const month = currentDate.getMonth() + 1; // 月份从0开始，需要+1
           const receiptDate = day;
-          
+
           // 格式化日期为YYYY-MM-dd
           const formattedMonth = String(month).padStart(2, '0');
           const formattedDate = String(receiptDate).padStart(2, '0');
-          const deadLine = receiptDate ? `${year}-${formattedMonth}-${formattedDate}` : '';
-          
+          const deadLine = receiptDate
+            ? `${year}-${formattedMonth}-${formattedDate}`
+            : '';
+
           allMonthDates.push(deadLine);
-          
+
           // 使用Date对象的setMonth方法正确移动到下一个月（自动处理年份变化）
           currentDate.setMonth(currentDate.getMonth() + 1);
         }
@@ -675,13 +781,13 @@
         // 计算基本比例
         const basicRatio = 100 / tempPeriod;
         let totalRatio = 0;
-        
+
         // 保存原有数据
         const existingData = [...this.form.datasource];
-        
+
         // 生成付款计划列表项
         const tempList = [];
-        
+
         // 根据传入的period参数生成付款计划
         for (let i = 0; i < tempPeriod; i++) {
           let item = JSON.parse(JSON.stringify(this.defaultForm));
@@ -692,7 +798,7 @@
           // } else {
           //   item = JSON.parse(JSON.stringify(this.defaultForm));
           // }
-          
+
           // 获取日期：如果i小于日期数组长度则使用对应日期，否则设为空
           const deadLine = i < dateRange.length ? dateRange[i] : '';
           const ratio = parseFloat(basicRatio.toFixed(2));
@@ -707,7 +813,7 @@
           tempList.push(item);
           // totalRatio += ratio;
         }
-        
+
         // 调整最后一项的比例，确保总和为100
         // if (tempList.length > 0) {
         //   const difference = 100 - totalRatio;
@@ -715,7 +821,7 @@
         //     tempList[tempList.length - 1].ratio = parseFloat((tempList[tempList.length - 1].ratio + difference).toFixed(2));
         //   }
         // }
-        
+
         console.log('付款计划列表：~~', tempList);
         // this.$set(this.form, 'datasource', tempList);
         console.log('付款计划列表：', this.form.datasource);
@@ -766,7 +872,7 @@
           }
           callback(valid);
         });
-      },
+      }
     }
   };
 </script>
@@ -788,12 +894,12 @@
   }
 
   .pricebox {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-      font-weight: bold;
-    }
-    :deep(.el-input-group__append) {
-      padding: 0;
-    }
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    font-weight: bold;
+  }
+  :deep(.el-input-group__append) {
+    padding: 0;
+  }
 </style>

src/api/purchasingManage/purchaseOrder.js

@@ -31,6 +31,16 @@ export async function getByIdCondition(id,productType) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+/**
+ * 获取编辑信息（更新前获取最新数据）
+ */
+export async function getByIdForEdit(id) {
+  const res = await request.get(`/eom/purchaseorder/getByIdForEdit/${id}`, {});
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
 /**
  * 更新信息

src/views/financialManage/invoiceManage/components/addOrEditDialogNew.vue

@@ -1191,24 +1191,11 @@
         const sameKeyItems = this.form.relatedList.filter((d) => d.sourceCode === item.key);
         console.log('sameKeyItems~~~', sameKeyItems);
 
-        // 从关联物品清单中取该订单的"未开票金额"和"本次开票金额"（per-detail 字段）
-        const tableInfoRef = this.$refs.tableInfoRef;
-        let unInvoiceAmount = 0;
-        let invoiceAmount = 0;
-        if (tableInfoRef && tableInfoRef.tableForm && tableInfoRef.tableForm.detailList) {
-          const matchedDetail = tableInfoRef.tableForm.detailList.find(
-            (d) => d.key === item.key
-          );
-          if (matchedDetail) {
-            unInvoiceAmount = parseFloat(matchedDetail.unInvoiceAmount) || 0;
-            invoiceAmount = parseFloat(matchedDetail.invoiceAmount) || 0;
-          }
-        }
-
         let remainingTotal = sum;
         const lastIndex = sameKeyItems.length - 1;
 
         // 从上到下分配 sum 给相同订单号的数据，多余数量放在最后一个
+        // paymentItem.unInvoiceAmount 直接使用接口返回值，不再被关联物品清单覆盖
         sameKeyItems.forEach((paymentItem, index) => {
           if (remainingTotal <= 0) {
             paymentItem.invoiceAmount = 0;
@@ -1223,19 +1210,13 @@
           }
         });
 
-        // 来源清单的未开票金额 = 关联物品清单的未开票金额 - 本次开票金额
-        const remainingUnInvoice = (unInvoiceAmount - invoiceAmount).toFixed(2);
-        sameKeyItems.forEach((paymentItem) => {
-          this.$set(paymentItem, 'unInvoiceAmount', remainingUnInvoice);
-        });
-
         this.updateInvoiceAmount();
         console.log('分配完成后的 sameKeyItems:', sameKeyItems);
       },
 
       updatePlanPaymentAmount(item) {
         console.log('item~~~', item);
-        item.unInvoiceAmount = item.planPaymentAmount - item.invoicedAmount;
+        // unInvoiceAmount 不再本地计算，直接使用接口返回的值
         // 更新关联物品清单中的 defaultAmountTotalPrice
         const tableInfoRef = this.$refs.tableInfoRef;
         if (tableInfoRef && item.sourceCode) {

src/views/financialManage/receivableManage/components/collectionDialog.vue

@@ -142,13 +142,13 @@ export default {
     selectedReceivableAmount() {
       return this.row.receivableTotalPrice || 0;
     },
-    // 已收金额 = 勾选的应收明细「折让合计」之和 || 接口下发的 row.receivedTotalPrice 
+    // 已收金额 = 勾选的应收明细「折让合计」之和 || 接口下发的 row.receivableTotalPrice 
     receivedAmount() {
       const sum = this.selection.reduce((pre, item) => {
         const val = parseFloat(item.statementAmount);
         return pre + (isNaN(val) ? 0 : val);
       }, 0);
-      return sum.toFixed(2) || (this.row.receivedTotalPrice || 0);
+      return sum.toFixed(2) || this.selectedReceivableAmount;
     },
     // 未收金额 = 接口下发的 row.unreceiveTotalPrice
     unreceivedAmount() {
@@ -532,8 +532,8 @@ export default {
         ...this.form,
         statementAmount,
         receivableTotalPrice: Number(this.selectedReceivableAmount),  // 应收金额（勾选行折让合计之和）
-        receivedTotalPrice: this.row.receivedTotalPrice,      // 历史已收总额（接口下发）
-        unreceiveTotalPrice: this.row.unreceiveTotalPrice,    // 历史未收金额（接口下发）
+        receivedTotalPrice: Number(this.receivedAmount),      // 历史已收总额（接口下发）
+        unreceiveTotalPrice: Number(this.unreceivedAmount),    // 历史未收金额（接口下发）
         receivableId: this.row.id,
         receivableCode: this.row.code,
         productList

src/views/purchasingManage/purchaseOrder/accountstatement/components/payablesInfo.vue

@@ -85,9 +85,9 @@
           />
         </template>
 
-        <template v-slot:statementAdvanceConfirmAmount="scope">
+        <template v-slot:nowConfirmedPrepayAmt="scope">
           <el-form-item
-            :prop="'payablesList.' + scope.$index + '.statementAdvanceConfirmAmount'"
+            :prop="'payablesList.' + scope.$index + '.nowConfirmedPrepayAmt'"
             :rules="{
               validator: (rule, value, cb) =>
                 validateConfirmAmount(rule, value, cb, scope.row),
@@ -95,7 +95,7 @@
             }"
           >
             <el-input
-              v-model="scope.row.statementAdvanceConfirmAmount"
+              v-model="scope.row.nowConfirmedPrepayAmt"
               type="number"
               :disabled="isView"
               @input="handleConfirmAmountChange(scope.row, scope.$index)"
@@ -236,18 +236,18 @@
           // },
           // {
           //   minWidth: 190,
-          //   prop: 'statementAdvanceConfirmAmount',
+          //   prop: 'nowConfirmedPrepayAmt',
           //   label: '本次对账预付款确收金额',
           //   align: 'center',
-          //   // slot: 'statementAdvanceConfirmAmount'
+          //   // slot: 'nowConfirmedPrepayAmt'
           // },
           {
             minWidth: 190,
             headerSlot: 'columnRequired',
-            prop: 'statementAdvanceConfirmAmount',
+            prop: 'nowConfirmedPrepayAmt',
             label: '本次对账预付款确收金额',
             align: 'center',
-            slot: 'statementAdvanceConfirmAmount'
+            slot: 'nowConfirmedPrepayAmt'
           },
           {
             minWidth: 160,
@@ -287,7 +287,7 @@
         return (
           this.localList.reduce(
             (pre, cur) =>
-              pre + Math.round((+cur.statementAdvanceConfirmAmount || 0) * 100),
+              pre + Math.round((+cur.nowConfirmedPrepayAmt || 0) * 100),
             0
           ) / 100
         );
@@ -348,7 +348,7 @@
           paymentConditionId: '',
           paymentConditionName: '',
           unreconciledAdvanceConfirmAmount: 0,
-          statementAdvanceConfirmAmount: 0,
+          nowConfirmedPrepayAmt: 0,
           lastPayableAmt: 0,
           statementAmount: 0,
           payablePrice: 0,
@@ -372,11 +372,11 @@
       },
       handleConfirmAmountChange(row, index) {
         // 限制本次确收金额不能超过未对账金额和本次对账金额
-        let val = +row.statementAdvanceConfirmAmount || 0;
+        let val = +row.nowConfirmedPrepayAmt || 0;
         const max = this.getMaxConfirmAmount(row);
         if (val > max) {
           val = max;
-          this.$set(row, 'statementAdvanceConfirmAmount', val);
+          this.$set(row, 'nowConfirmedPrepayAmt', val);
           this.$message.warning(
             '本次对账预付款确收金额不能超过未对账金额和本次对账金额'
           );
@@ -389,10 +389,10 @@
       // 累计应付金额 = 本次对账金额 - 累计预付确付金额 + 上期累计应付金额
       recalcRow(row) {
         const statementAmount = +row.statementAmount || 0;
-        let val = +row.statementAdvanceConfirmAmount || 0;
+        let val = +row.nowConfirmedPrepayAmt || 0;
         const max = this.getMaxConfirmAmount(row);
         if (val > max) val = max;
-        this.$set(row, 'statementAdvanceConfirmAmount', val);
+        this.$set(row, 'nowConfirmedPrepayAmt', val);
         // 本次应付金额 = 本次对账金额 - 确收金额
         this.$set(
           row,

src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -337,7 +337,7 @@
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item v-if="form.settlementMode == 2" label="结算月份范围" prop="settlementDate">
+          <el-form-item v-if="form.settlementMode == 2 || isInstallment" label="结算月份范围" prop="settlementDate">
             <!-- <el-date-picker
               v-model="form.contractEndDate"
               type="date"
@@ -348,7 +348,7 @@
             <el-date-picker
               v-model="form.settlementDate"
               type="monthrange"
-              :clearable="false"
+              :clearable="isInstallment"
               range-separator="至"
               start-placeholder="开始月份"
               end-placeholder="结束月份"
@@ -358,7 +358,7 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item  v-if="form.settlementMode == 2" label="收款日期" prop="receiptDate">
+          <el-form-item  v-if="form.settlementMode == 2 || isInstallment" label="收款日期" prop="receiptDate">
             <el-input type="number" :min="1" :max="31" placeholder="请输入" v-model="form.receiptDate" @input="receiptDateChange">
               <template slot="prepend">每月</template>
               <template slot="append">日</template>
@@ -793,7 +793,8 @@
     getpurchaseorderDetail,
     getPurchasePlanByContractIdAPI,
     UpdateInformation,
-    getSupplierInfo
+    getSupplierInfo,
+    getByIdForEdit
   } from '@/api/purchasingManage/purchaseOrder';
   import { getplanDetail } from '@/api/purchasingManage/purchasePlanManage';
   import { getpurchaseinquiry } from '@/api/purchasingManage/inquiryManage';
@@ -999,6 +1000,12 @@
       filterList() {
         return this.isUpdate ? this.requirementSourceType : this.requirementSourceType.filter(item => item.value !== '8');
       },
+      // 结算方式是否为「分期付款」
+      isInstallment() {
+        const mode = this.form.settlementMode;
+        if (mode === '' || mode === null || mode === undefined) return false;
+        return mode == 4 || this.form.settlementModeName === '分期付款';
+      },
       rules() {
         let isRequired = true;
         // console.log(this.isRequired);
@@ -1238,6 +1245,12 @@
       },
       setIssueNumber(len) {
         this.form.issueNumber = len;
+        // 分期付款下手工增删行后，同步回填新行的计划付款日期
+        if (this.isInstallment) {
+          this.$nextTick(() => {
+            this.setInstallmentDeadLine();
+          });
+        }
       },
       getSupplierData(data) {
         console.log('data~~~', data);
@@ -2251,7 +2264,7 @@
             })
           }
           this.form.contractStartDate = formatDate(new Date(), 'yyyy-MM-dd');
-          // this.form.isGeneratePaymentPlan = +this.isGenReceiptPlan;
+          this.form.isGeneratePaymentPlan = +this.isGenReceiptPlan;
         } else {
           this.isUpdate = true;
           await this.getpurchaseorderDetail(row.id);
@@ -2281,7 +2294,7 @@
         this.visible = true;
         this.isUpdate = false;
         this.form.relationType = 4;
-        // this.form.isGeneratePaymentPlan = +this.isGenReceiptPlan;
+        this.form.isGeneratePaymentPlan = +this.isGenReceiptPlan;
         this.changeContract(row);
       },
       handleGoodsList() {
@@ -2500,24 +2513,25 @@
           // console.log('提交数据', commitData);  
 
           if (this.isUpdate) {
-            UpdateInformation(commitData)
-              .then((res) => {
-                this.loading = false;
-                this.$message.success('修改成功');
-                updateRelationStatus([this.form.partbId]);
-                if (this.form.contractId) {
-                  updateContractStatus([this.form.contractId]);
-                }
-                if (type === 'sub') {
-                  this.sub(res);
-                  return;
-                }
-                this.cancel();
-                this.$emit('done');
-              })
-              .catch((e) => {
-                //this.loading = false;
-              });
+            try {
+              // 更新前先拉取最新编辑数据，确保基于最新版本提交
+              await getByIdForEdit(this.form.id || this.businessId);
+              const res = await UpdateInformation(commitData);
+              this.loading = false;
+              this.$message.success('修改成功');
+              updateRelationStatus([this.form.partbId]);
+              if (this.form.contractId) {
+                updateContractStatus([this.form.contractId]);
+              }
+              if (type === 'sub') {
+                this.sub(res);
+                return;
+              }
+              this.cancel();
+              this.$emit('done');
+            } catch (e) {
+              this.loading = false;
+            }
           } else {
             addInformation(commitData)
               .then((res) => {
@@ -2607,6 +2621,11 @@
       // 日期范围变化
       settlementDateChange(val) {
         // console.log(val);
+        // 分期付款：期数由用户自行填写，这里只把计划付款日期回填到已有的付款计划行
+        if (this.isInstallment) {
+          this.setInstallmentDeadLine();
+          return;
+        }
         let dateRange = [];
         if(this.form.settlementMode == 1) {
         //   // this.transformDays(val)
@@ -2624,20 +2643,40 @@
       // 收款日变化
       receiptDateChange(v) {
         // this.transformMonth(this.form.settlementDate)
+        if (this.isInstallment) {
+          this.setInstallmentDeadLine();
+          return;
+        }
         if(this.form.settlementDate.length > 0 && this.form.issueNumber) {
           const dateRange = this.transformMonthFun(this.form.settlementDate, v);
           this.$refs.paymentCollectionPlanRef.defaultList(this.form.settlementMode, this.form.issueNumber, dateRange);
         }
       },
+      // 分期付款：按「结算月份范围 + 收款日期」给付款计划回填计划付款日期
+      // 结算月份范围/收款日期均非必填，未填时不做任何赋值；只覆盖 deadLine，不影响用户已填的比例/款项名称/金额/说明
+      setInstallmentDeadLine() {
+        const { settlementDate, receiptDate } = this.form;
+        if (!settlementDate || settlementDate.length < 2) return;
+        const day = parseInt(receiptDate, 10);
+        if (!day || day < 1 || day > 31) return;
+        const dateRange = this.transformMonthFun(settlementDate, day);
+        this.$refs.paymentCollectionPlanRef?.setDeadLineList(dateRange);
+      },
       // 期数变化
       issueNumberChange(v) {
         let dateRange = [];
         if(this.form.settlementMode == 1) {
           dateRange = this.transformDaysFun(this.form.settlementDate, v);
-          this.$refs.paymentCollectionPlanRef?.defaultList(this.form.settlementMode, v, dateRange); 
+          this.$refs.paymentCollectionPlanRef?.defaultList(this.form.settlementMode, v, dateRange);
         } else if(this.form.settlementMode == 2) {
           dateRange = this.transformMonthFun(this.form.settlementDate, v);
           this.$refs.paymentCollectionPlanRef?.defaultList(this.form.settlementMode, v, dateRange);
+        } else if (this.isInstallment) {
+          // 先按期数重建行，再回填计划付款日期
+          this.$refs.paymentCollectionPlanRef?.defaultList(this.form.settlementMode, v);
+          this.$nextTick(() => {
+            this.setInstallmentDeadLine();
+          });
         } else {
           this.$refs.paymentCollectionPlanRef?.defaultList(this.form.settlementMode, v);
         }