采购

api/pages/mac/transfer.js

@@ -19,7 +19,7 @@ module.exports = {
 			chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-choose-staff/select-choose-staff'  },
 			staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add'  },
 			chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-choose-org/select-choose-org' }, 
-			chooseMoneyAccount: { key: 'chooseMoneyAccount',url: '/package-inventory/pages/fund-account/fund-account' }, 
+			// chooseMoneyAccount: { key: 'chooseMoneyAccount',url: '/package-inventory/pages/fund-account/fund-account' }, 
 		}
 	} 
 

api/pages/mst/moneyAccount.js

@@ -18,7 +18,7 @@ module.exports = {
         moneyAccount: {
        
           add: {key: 'add', url: './add/add'},
-          accountCategory: { key: 'accountCategory', url: '/package-inventory/pages/fund-account/account-category/account-category'  },
+          accountCategory: { key: 'accountCategory', url: '/package-base-select/pages/select-account-category/select-account-category'  },
         }
     }
 };

app.json

@@ -105,11 +105,7 @@
                 "pages/inventory-freeze/detail/detail",
                 "pages/inventory-check/inventory-check",
                 "pages/inventory-check/add/add",
-                "pages/inventory-check/detail/detail",
-                "pages/fund-account/fund-account",
-                "pages/fund-account/add/add",
-                "pages/fund-account/detail/detail",
-                "pages/fund-account/account-category/account-category"
+                "pages/inventory-check/detail/detail"
             ]
         },
         {
@@ -160,7 +156,11 @@
                 "pages/accounting-verification/detail/detail",
                 "pages/daily-reconciliation-statement/daily-reconciliation-statement",
                 "pages/fund-journal/fund-journal",
-                "pages/supplier-transaction-table/supplier-transaction-table"
+                "pages/supplier-transaction-table/supplier-transaction-table",
+                "pages/fund-account/fund-account",
+                "pages/fund-account/add/add",
+                "pages/fund-account/detail/detail",
+                "pages/fund-account/account-category/account-category"
             ]
         },
         {
@@ -209,7 +209,8 @@
                 "pages/select-source-purchase-order-reversal/select-source-purchase-order-reversal",
                 "pages/select-choose-org/select-choose-org",
                 "pages/select-choose-staff/select-choose-staff",
-                "pages/select-warehouse/select-warehouse"
+                "pages/select-warehouse/select-warehouse",
+                "pages/select-account-category/select-account-category"
             ]
         }
     ],

package-accounts-manage/pages/fund-account/account-category/account-category.js

@@ -0,0 +1,66 @@
+// package-accounts-manage/pages/fund-account/account-category/account-category.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

package-accounts-manage/pages/fund-account/account-category/account-category.wxml

@@ -0,0 +1,2 @@
+<!--package-accounts-manage/pages/fund-account/account-category/account-category.wxml-->
+<text>package-accounts-manage/pages/fund-account/account-category/account-category.wxml</text>

package-base-select/pages/select-account-category/select-account-category.wxss

@@ -0,0 +1 @@
+/* package-base-select/pages/select-account-category/select-account-category.wxss */

package-inventory/pages/fund-account/account-category/account-category.wxss

@@ -1 +0,0 @@
-/* package-inventory/pages/fund-account/account-category/account-category.wxss */

package-purchase/pages/purchase-order/add/add.js

@@ -165,7 +165,7 @@ Page({
         // 将数组元素转换为逗号分隔的字符串
         formData.fromNos = orderNoArray.join(',').split(',') //来源单号
         formData.fromIds = orderIdArray.join(',').split(',') //来源单id
-        formData.fromNo = orderNoArray.join(',');
+        formData.fromNo = orderNoArray.join(','); 
         let cardList_ = this.data.cardList
         cardList_.forEach(card => { //循环出商品总共价格
             if (card.name === 'items') {
@@ -235,7 +235,14 @@ Page({
      * @author : 王英杰
      */
     setValuesByEdit(data) {
-        data.goodsList = data.purchaseItemResponseList
+        data.goodsList = data.purchaseItemResponseList 
+        // 提取purNo字段为数组，并去重
+        const orderNoArray = [...new Set( data.goodsList.map(item => item.orderNo))];
+        const orderIdArray = [...new Set( data.goodsList.map(item => item.orderId))];
+        // 将数组元素转换为逗号分隔的字符串
+        data.fromNos = orderNoArray.join(',').split(',') //来源单号
+        data.fromIds = orderIdArray.join(',').split(',') //来源单id
+        data.fromNo = orderNoArray.join(','); 
         data.goodsList.forEach(element => {
             element.chooseFlg = "biu" //辨别选品标识
             element.priceStd = element.priceStandard
@@ -318,7 +325,7 @@ Page({
         let formData = JSON.parse(this.data.formData)
         let totalAmout = Number(0)
         formData.goodsList.forEach(element => {
-            element.itemId = (this.data.formMode == Constants.formMode.add) ? element.null : itemId
+            element.itemId = (this.data.formMode == Constants.formMode.add) ? null : element.itemId
             totalAmout += Number(element.priceStd * element.itemQty) //标价金额
         })
         params.fromIds = formData.fromIds

pages/index/index.js

@@ -342,9 +342,9 @@ Page({
         PFunctionCode: '05',
         FunctionCode: '0509'
       }, 
-      {
+      { 
         FunctionName: '资金账户',
-        FormName: '/package-inventory/pages/fund-account/fund-account',
+        FormName: '/package-accounts-manage/pages/fund-account/fund-account',
         ImageUri: '/static/img/collection.png',
         PFunctionCode: '05',
         FunctionCode: '0510'