初始款项

api/pages/mst/customer.js

@@ -49,6 +49,7 @@ module.exports = {
       toReceipt:{ key: 'toReceipt', url: '/package-accounts-manage/pages/receipt/add/add', formMode: 'add',formType:'add', idKey: 'cusId' } ,//跳转收款单新建
       toReceiptDetail:{ key: 'toReceiptDetail', url: '/package-accounts-manage/pages/receipt/detail/detail', formMode: 'edit',formType:'edit', idKey: 'cusId' } ,//跳转收款单新建
       chooseInitialPaymentType: { key: 'chooseInitialPaymentType', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'初始款项' ,  },
+      chooseMoneyAccount: { key: 'chooseMoneyAccount', url: '/package-base-select/pages/select-data/select-data',type:'moneyAccount',  },
     }
   }
 };

i18n/zh-CN.js

@@ -295,7 +295,7 @@ const basicData = {
   saleStaff: '销售人员',
   initialPayment: '初始款项',
   saleOrg: '销售部门',
-  initialDebtOwed: '初次欠款',
+  initialDebtOwed: '初始欠款',
   incomeCategory: '收入类别',
   expenditureCategory: '支出类别',
   reasonStorage: '入库原因',
@@ -587,6 +587,7 @@ const fund = {
   commodityPicture: "商品图片",
   defaultAccount: "默认账户",
   balanceDate: "余额日期",
+  moneyAccount: "资金账户",
   newFundAccount: "新建资金账户",
   editFundAccount: "编辑资金账户",
   negativeBalance: "余额负数",

package-base-select/pages/select-data/select-data.js

@@ -52,9 +52,9 @@ Page({
     // 是否有默认值
     defaultFlag: false,
     // 状态
-    status:null,
+    status: null,
     // 控制是否显示状态
-    statusFlag:false,
+    statusFlag: false,
     // 确定按钮
     buttonList: [{
       name: 'confirm',
@@ -97,7 +97,7 @@ Page({
    * @date : 2024/3/25 15:16
    */
   chooseData(e) {
-    console.log('eerere',e);
+    console.log('eerere', e);
     let list = e.detail.list;
     let item = e.detail.item;
     let valueKey = this.data.valueKey;
@@ -229,7 +229,6 @@ Page({
           name: item.roleName,
         }
         break;
-
       //渠道
       case Constants.chooseType.saleChannel:
         data = {
@@ -238,6 +237,14 @@ Page({
           code: item.channelCode
         }
         break;
+      //资金账户
+      case Constants.chooseType.moneyAccount:
+        data = {
+          id: item.macId,
+          name: item.macName,
+          code: item.macCode
+        }
+        break;
       //客户来源
       case Constants.chooseType.cusFrom:
         data = {
@@ -637,6 +644,29 @@ Page({
           placeholder: ['sourceName']
         })
         break;
+
+      // 资金账户
+      case Constants.chooseType.moneyAccount:
+        title = "资金账户"
+        this.setData({
+          routeObjName: 'common',
+          pageFlag: false,
+          method: 'getMac',
+          title: 'macName',
+          contentList: [{
+            name: 'macCode',
+            title: '账户编码'
+          },
+          {
+            name: 'macName',
+            title: '账户名称'
+          },
+
+          ],
+          placeholder: ['moneyAccount']
+        })
+        break;
+
       //销售渠道
       case Constants.chooseType.saleChannel:
         title = "销售渠道"
@@ -834,13 +864,13 @@ Page({
         })
         break;
       // 计量单位 刘尧 2024.05.29
-      case Constants.chooseType.unit: 
+      case Constants.chooseType.unit:
         title = "单位"
         this.setData({
           routeObjName: 'common',
           routeObjNamePop: 'unit',
           method: 'getUnitNoPage',
-          status:'decimalPlacesStr',
+          status: 'decimalPlacesStr',
           chooseFlag: route.chooseFlag,
           repeatFlag: route.repeatFlag,
           statusFlag: true,
@@ -851,7 +881,7 @@ Page({
           simpleFlag: true,
           placeholder: ['unitName']
         })
-      break;
+        break;
       // 数据字典
       case Constants.chooseType.dictionary:
         title = "数据字典"
@@ -977,20 +1007,20 @@ Page({
     this.searchData();
   },
 
-    /** 
-   * @desc : 对获取到的数据进行处理
-   * @date : 2024年5月29日
-   * @author : 刘尧
-   */
-  handleSearchData(tableData){
+  /** 
+ * @desc : 对获取到的数据进行处理
+ * @date : 2024年5月29日
+ * @author : 刘尧
+ */
+  handleSearchData(tableData) {
     tableData.forEach(item => {
       // 判断数据中是否存在计量单位的小数位数字段
-      if(item && (item.decimalPlaces || item.decimalPlaces === 0)){
+      if (item && (item.decimalPlaces || item.decimalPlaces === 0)) {
         item.decimalPlacesStr = '小数：' + item.decimalPlaces
       }
     })
     this.setData({
-        tableData: tableData
+      tableData: tableData
     })
   }
 })

package-basic-data/pages/customer-list/add/add.js

@@ -35,8 +35,7 @@ Page({
         { code: 'channelId', name: 'channelName', required: true, title: mixins.$t('saleChannel'), type: 'choose', urlKey: 'chooseChannel' },
         { code: 'staffId', name: 'staffName', type: 'choose', required: true, title: mixins.$t('saleStaff'), urlKey: 'chooseStaff' },
         { code: 'orgId', name: 'orgName', type: 'choose', required: true, title: mixins.$t('saleOrg'), urlKey: 'chooseOrg' },
-        { code: 'initialPaymentId', name: 'initialPayment', type: 'choose',   title: mixins.$t('initialPayment'), urlKey: 'chooseInitialPaymentType' },
-        // { code: 'startAmount', type: 'number', required: false, title: '初始欠款' },
+        { code: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialPayment'), urlKey: 'chooseInitialPaymentType' }, 
       ],
       remarks: [
         { code: 'remarks', type: 'textarea', title: mixins.$t('remarks') }
@@ -50,12 +49,12 @@ Page({
 * @author : 于继渤
 */
   chooseData(e) {
-    
+
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
     let data = e.detail.data.data
 
-    console.log(code,data);
+    console.log(code, data);
 
     if (code == "staffId") { //员工
       formData.staffId = data.id
@@ -77,10 +76,49 @@ Page({
       formData.cusFromCode = data.code
       formData.cusFromName = data.name
     }
+     //客户来源
+     if (code == 'macId') {
+      formData.macId = data.id
+      formData.macCode = data.code
+      formData.macName = data.name
+    }
     //初始款项
-    if (code == "initialPaymentId") { 
-      formData.initialPaymentId  = data.id
+    if (code == "initialPaymentId") {
+      formData.initialPaymentId = data.id
       formData.initialPayment = data.name
+      let contentObj = this.data.contentObj;
+      // 初始款项-欠款
+      if (data.id == Constants.initialPayType.debt) {
+        contentObj.center = [
+          { code: 'channelId', name: 'channelName', required: true, title: mixins.$t('saleChannel'), type: 'choose', urlKey: 'chooseChannel' },
+          { code: 'staffId', name: 'staffName', type: 'choose', required: true, title: mixins.$t('saleStaff'), urlKey: 'chooseStaff' },
+          { code: 'orgId', name: 'orgName', type: 'choose', required: true, title: mixins.$t('saleOrg'), urlKey: 'chooseOrg' },
+          { code: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialPayment'), urlKey: 'chooseInitialPaymentType' },
+          { code: 'startAmount', type: 'number', required: true, title: mixins.$t('initialDebtOwed') },
+        ]
+
+      } else if (data.id == Constants.initialPayType.payment) {
+        // 初始款项-预收
+        contentObj.center = [
+          { code: 'channelId', name: 'channelName', required: true, title: mixins.$t('saleChannel'), type: 'choose', urlKey: 'chooseChannel' },
+          { code: 'staffId', name: 'staffName', type: 'choose', required: true, title: mixins.$t('saleStaff'), urlKey: 'chooseStaff' },
+          { code: 'orgId', name: 'orgName', type: 'choose', required: true, title: mixins.$t('saleOrg'), urlKey: 'chooseOrg' },
+          { code: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialPayment'), urlKey: 'chooseInitialPaymentType' },
+          { code: 'startAmount', type: 'number', required: true, title: mixins.$t('initialDebtOwed') },
+          { code: 'macId', name: 'macName', type: 'choose', required: true,  title: mixins.$t('moneyAccount'), urlKey: 'chooseMoneyAccount' },
+        ]
+      } else {
+        // 初始款项-无
+        contentObj.center = [
+          { code: 'channelId', name: 'channelName', required: true, title: mixins.$t('saleChannel'), type: 'choose', urlKey: 'chooseChannel' },
+          { code: 'staffId', name: 'staffName', type: 'choose', required: true, title: mixins.$t('saleStaff'), urlKey: 'chooseStaff' },
+          { code: 'orgId', name: 'orgName', type: 'choose', required: true, title: mixins.$t('saleOrg'), urlKey: 'chooseOrg' },
+          { code: 'initialPaymentId', name: 'initialPayment', type: 'choose', title: mixins.$t('initialPayment'), urlKey: 'chooseInitialPaymentType' },
+        ]
+      }
+      this.setData({
+        contentObj: contentObj
+      })
     }
     this.setData({
       formData: JSON.stringify(formData)
@@ -120,13 +158,13 @@ Page({
     })
     // 控制初始欠款不允许编辑
     let contentObj = this.data.contentObj;
-    let filters =  contentObj.center.filter(it=>it.code == 'startAmount')
+    let filters = contentObj.center.filter(it => it.code == 'initialPaymentId')
 
-    if(filters && filters.length > 0){
+    if (filters && filters.length > 0) {
       filters[0].readonly = true;
     }
     this.setData({
-      contentObj:contentObj
+      contentObj: contentObj
     })
   },
 

utils/Constants.js

@@ -216,6 +216,13 @@ module.exports = {
   },
   ],
 
+   // 初始款项
+   initialPayType: {
+    none: '初始款项-无',
+    debt: '初始款项-欠款',
+    payment: '初始款项-预收', 
+  },
+
   // 收付款类型
   rpType: {
     receipt: '收付款类型-收款',