商品档案

components/dkbase/dk-form-more-items/dk-form-more-items.js

@@ -749,6 +749,7 @@ Component({
         form: form,
         contentObj: contentObj
       })
+      this.triggerEvent("changeItemNumberField", { })
     },
     /**
      * @desc   : 修改数值输入框的值

package-accounts-manage/pages/other-receipt/add/add.js

@@ -9,16 +9,26 @@ Page({
    */
   data: {
     table: Constants.tables.income,
-    cardList: [
-      { name: 'main' },
-      { name: 'items', title: '应收', chooseFlag: true, addFlag:false, chooseTitle: '选类别', urlKey: 'selectIncomeCategory' },
-      { name: 'file' }],
+    cardList: [{
+        name: 'main'
+      },
+      {
+        name: 'items',
+        title: '应收',
+        chooseFlag: true,
+        addFlag: false,
+        chooseTitle: '选类别',
+        urlKey: 'selectIncomeCategory'
+      },
+      {
+        name: 'file'
+      }
+    ],
     contentObj: {
-      main: [
-        {
+      main: [{
           code: 'accDate',
           name: 'accDate',
-          title:'收款日期',
+          title: '收款日期',
           type: 'date',
           required: true,
         },
@@ -45,21 +55,44 @@ Page({
         },
 
       ],
-      items: [ 
-        { code: 'receivableWaive',name: 'receivableWaiveName', type: 'str', title: '收入类别', readonly: true,required: true  },
-        { code: 'receiptResidue',type: 'number', title: '收入金额',required: true  },
-      
+      items: [{
+          code: 'receivableWaive',
+          name: 'receivableWaiveName',
+          type: 'str',
+          title: '收入类别',
+          readonly: true,
+          required: true
+        },
+        {
+          code: 'receiptResidue',
+          type: 'number',
+          title: '收入金额',
+          required: true
+        },
+
       ],
       file: [{
-        code: 'remarks', type: 'textarea', title: '备注'
-      },
-      { code: 'file', type: 'uploader', title: '附件' }]
+          code: 'remarks',
+          type: 'textarea',
+          title: '备注'
+        },
+        {
+          code: 'file',
+          type: 'uploader',
+          title: '附件'
+        }
+      ]
     },
-    totalObj: { 
-      items: [ 
-        { code: 'receivableWaive',title: '合计应收',   },
-        { code: 'receivableWaive',title: '核销金额',   }, 
-      ], 
+    totalObj: {
+      items: [{
+          code: 'receivableWaive',
+          title: '合计应收',
+        },
+        {
+          code: 'receivableWaives',
+          title: '核销金额',
+        },
+      ],
     },
     // 弹出按钮
     buttonList: [{
@@ -80,10 +113,10 @@ Page({
   },
 
   /**
-      * @desc   : 绑定数据-选择页面返回的逻辑处理
-      * @author : 王英杰
-      * @date   : 2024年3月12日
-      */
+   * @desc   : 绑定数据-选择页面返回的逻辑处理
+   * @author : 王英杰
+   * @date   : 2024年3月12日
+   */
   chooseData(e) {
     console.log("t", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
@@ -103,7 +136,7 @@ Page({
       formData.orgName = data.name
     }
     if (code == "items") { //选单 
-      if(data && data.list){
+      if (data && data.list) {
         data.list.forEach(element => {
           element.receivableWaive = element.dataCode
           element.receivableWaiveName = element.dataValue
@@ -111,31 +144,54 @@ Page({
         formData.itemList = data.list
       }
     }
-  
+
     this.setData({
       cardList: cardList_,
       formData: JSON.stringify(formData)
     })
   },
+  /**
+   * @desc : 明细里得 收入金额 输入完回调 计算出合计
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  changeItemNumberField() {
+    let formData = JSON.parse(this.data.formData)
+    let cardList = this.data.cardList
+    if (formData.itemList) {
+      let itemNumber = 0
+      formData.itemList.forEach(element => {
+        if (!isNaN(element.receiptResidue)) { //是数字才能加减
+          itemNumber += element.receiptResidue
+        }
+      });
+      cardList.forEach(element => {
+        if (element.name == 'items') {
+          element.receivableWaive = itemNumber
+        }
+      });
+      this.setData({
+        cardList: cardList
+      })
+    }
+  },
 
-
- 
   /**
    * @desc : 保存的參數設置
    * @date : 2024/2/1 15:49
    * @author : 王英杰
    */
-  setParams(params) {   
-    let formData = JSON.parse(this.data.formData) 
+  setParams(params) {
+    let formData = JSON.parse(this.data.formData)
     //收付款类型-收款的查询参数
     params.objectType = '客户'
     params.objectId = formData.objInfo.cusId
-    params.orgId = formData.orgId  //组织部门
-    params.staffId = formData.staffId  // 员工
+    params.orgId = formData.orgId //组织部门
+    params.staffId = formData.staffId // 员工
     params.accDate = formData.accDate
     params.annexPaths = formData.annexPaths || [] //附件 
-    params.remarks = formData.remarks  // 备注
-    params.makeStaff = app.globalData.user.staffId  // 制单人 
+    params.remarks = formData.remarks // 备注
+    params.makeStaff = app.globalData.user.staffId // 制单人 
     let itemList = []
     formData.itemList.forEach(element => {
       let item = {}
@@ -149,37 +205,40 @@ Page({
   },
 
   /**
-  * @desc : 保存数据服务
-  * @date : 2024/2/1 15:49
-  * @author : 王英杰
-  */
+   * @desc : 保存数据服务
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
   saveData() {
     // return this.excute(this.data.service, this.data.service.insert, this.data.params)
 
     this.open()
   },
- /**
-  * @desc : 保存数据服务-跳转收款页面
-  * @date : 2024/2/1 15:49
-  * @author : 王英杰
-  */
- open(e) {
-  let _this = this
-  wx.navigateTo({
-    url: '/package-base-select/pages/select-collection_confirm/select-collection_confirm',
-    events: {
-      // 回调后
-      bindData: function (data) {
-        // 保存成功后 回调
-        wx.navigateBack({
-          data: 1
+  /**
+   * @desc : 保存数据服务-跳转收款页面
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  open(e) {
+    let _this = this
+    wx.navigateTo({
+      url: '/package-base-select/pages/select-collection_confirm/select-collection_confirm',
+      events: {
+        // 回调后
+        bindData: function (data) {
+          // 保存成功后 回调
+          wx.navigateBack({
+            data: 1
+          })
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 
+        res.eventChannel.emit('params', {
+          item: _this.data.formData,
+          formType: 7
         })
       }
-    },
-    success: function (res) {
-      // 通过eventChannel向被打开页面传送数据 
-      res.eventChannel.emit('params', { item: _this.data.formData, formType: 7 })
-    }
-  })
-}
+    })
+  }
 })

package-accounts-manage/pages/other-receipt/add/add.wxml

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objCol="customerId" objLabel="客户名称" objType="customer"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData" totalObj="{{totalObj}}">
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objCol="customerId" objLabel="客户名称" objType="customer"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData" totalObj="{{totalObj}}" bind:changeItemNumberField ="changeItemNumberField">
 </dk-form-more-items>
 
 <view style="height: 220rpx;"></view>

package-basic-data/pages/product-file/product-file.js

@@ -17,6 +17,10 @@ Page({
    */
   data: {
     flgValidList:null,
+    buttonList: [{
+      name: 'merge',
+      title: mixins.$t("add"), //'保存'
+  }],
     //接口
     goodsSeriesService: app.globalData['goodsSeriesService'],
     routeObjName: 'goodsSku',

package-basic-data/pages/product-file/product-file.wxml

@@ -25,6 +25,6 @@
 </view>
 
 
-
-<!-- 底部信息 -->
-<dk-save-bottom flagTypeName="Product-file" bottomClass="{{true}}" bind:allClean="toAdd" />
+ 
+<!-- 新建按钮 -->
+<dk-save-button   btnAutoWidthFlag="{{true}}"  buttonList="{{buttonList}}"   bind:open="toAdd"></dk-save-button>