资金账户

api/pages/common/common.js

@@ -22,5 +22,6 @@ module.exports = {
         goodsCategoryListBy: 'goods_category_list_by', //商品种类
         unitListBy: 'unit_list_by', //计量单位
         warehouseListBy: 'get_warehouse_by_page', //仓库档案
+        getDictionarydataByPage: 'get_dictionarydata_by_page', //账户类别
     },
 };

api/pages/mst/moneyAccount.js

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

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

@@ -1,66 +1,143 @@
-// package-inventory/pages/fund-account/account-category/account-category.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
+/*******************************************************************************
+* Copyright(c) 2022 dongke All rights reserved. / Confidential
+* 类的信息：
+*		1.程序名称：
+* 编辑履历：
+*		作者				日期					版本				修改内容
+*		王英杰		 2024-1-24			1.00		    基础资料-选择账户类别
+*******************************************************************************/ 
+const util = require('@/utils/util.js')
+const mixins = require('@/mixins/index.js')
+const app = getApp()
 
+Page({
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    dataItem:{},
+    tableData: [],
+    formDataName: mixins.$t('goodsBrand'),
+    popContent:
+    [
+        { code: 'dataCode', type: 'str', title: mixins.$t('accountCode'), required: false, readonly: true, },
+        { code: 'dataValue', type: 'str', title: mixins.$t('accountName'), required: true },
+        { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }],
+    commonService: app.globalData['commonService'],
+    basicDataService: app.globalData['basicDataService'], 
+    contentList: [
+        { name: 'dataValue', title: mixins.$t('accountName') }
+      ],
+        // 路由
+    routeObjName: 'goodsBrand',
+  },
+
+   /**
+     * @desc   : 点击变色
+     * @author : 王英杰
+     * @date   : 2024/1/26 11:46
+     */ 
+  toChecked(e) {
+    console.log(e)
+    let index = e.currentTarget.dataset.index
+    let item = e.currentTarget.dataset.item
+    let tableData = this.data.tableData
+    tableData.forEach(res => {
+      res.checked = false
+    })
+    tableData[index].checked = true
+    this.setData({
+      tableData: tableData
+    })
+    const eventChannel = this.getOpenerEventChannel(); 
+    eventChannel.emit('bindData', { data: {id:item.dataid,name:item.datavalue} })
+    wx.navigateBack({
+      delta: 1
+    }) 
+  },
     /**
-     * 页面上拉触底事件的处理函数
+     * @desc   : 侧滑事件
+     * @author : 王英杰
+     * @date   : 2024/1/26 11:46
      */
-    onReachBottom() {
-
+    changeSwipe(e) {
+      console.log("e",e)
+      let item = e.currentTarget.dataset.item
+      //停用启用
+      let param = {
+        brandId: item.brandId,
+        flgValid: !item.flgValid,
+      }
+      this.setData({
+        formData: JSON.stringify(param)
+      })
+      //执行编辑操作
+      this.save({})
     },
+ /**
+ * @desc : 打开新建弹窗
+ * @author : 王英杰
+ * @date : 2024/1/23 9:16
+ */
+  toAdd() {
+    this.setData({
+      showPop: true
+    })
+  },
+  /**
+ * @desc : 关闭弹窗
+ * @author : 王英杰
+ * @date : 2024/1/23 9:16
+ */
+  onClosePopup() {
+    this.setData({
+      showPop: false
+    })
+  },
+/**
+  * @desc : 查询数据
+  * @date : 2024/2/1 15:49
+  * @author : 王英杰
+  */
+ getData(params) {
+  return this.excute(this.data.commonService, this.data.commonService.getDictionarydataByPage, params);
+},
+  /**
+   * @desc   : 新建编辑事件
+   * @author : 王英杰
+   * @date   : 2024/1/26 11:46
+   */
+  editItems(e) {
+    let data = e.detail.form
+    this.setData({
+      formData: JSON.stringify(data)
+    })
+    //执行保存编辑操作
+    this.save({})
+  },
+
+  /**
+   * @desc : 保存编辑
+   * @author : 王英杰
+   * @date : 2022/5/26 20:16
+   */
+  saveData(params) {
+    params.dictCode='账户类别'
+    return this.excute(this.data.basicDataService, this.data.basicDataService.insert,params);
+   
+  },
+  
+     /**
+   * @desc :保存接口的 后续处理方法
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */ 
+  handleData(data) { 
+    this.setData({
+      showPop: false, 
+    })
+  this.searchData()
+  },
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
 })

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

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText": "基础资料"
 }

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

@@ -1,2 +1,82 @@
-<!--package-inventory/pages/fund-account/account-category/account-category.wxml-->
-<text>package-inventory/pages/fund-account/account-category/account-category.wxml</text>
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<!-- 顶部信息 -->
+<van-sticky scroll-top="0">
+   <!-- 查询条件 -->
+   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName'])}}">
+  </dk-dropdown-menu>
+</van-sticky>
+
+
+
+<!-- 内容列表 -->
+<view style="width: 100%;">
+  <view wx:for="{{tableData}}" wx:key="index" class="main-class">
+    <van-swipe-cell right-width="{{ 65 }}">
+      <view bind:tap="toChecked" data-index="{{index}}" data-item="{{item}}" class="{{item.checked ? 'main-foot-1' : 'main-foot'}}" style="border-radius:15rpx;" style="{{item.checked ?'background-color: #E1E5EE;':''}}">
+        <view class="table-content">
+          <view class="table-content-row">
+            <view style="display: flex;">
+              <view>
+                <!-- <van-checkbox value="{{item.checked}}" data-index="{{index}}" checked-color="#1989FA" /> -->
+              </view> 
+
+              <view style="font-size: 14px;font-weight: 600;width: 80%;margin-left: 20rpx;">
+               {{"账户类别"}}
+              </view> 
+            </view> 
+          </view>
+          <view class="table-row">
+            <view class="table-content-row">
+              <view style="display: flex;">
+                <view class="table-content-row-font">
+                  <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="{{$t['accountCode']}}" copyValue="{{item.code}}"></dk-text>
+                </view>
+                <view class="table-content-class">
+                  {{item.datacode ? item.datacode :''}}
+                </view>
+              </view>
+            </view>
+          </view> 
+          <view class="table-row">
+            <view class="table-content-row">
+              <view style="display: flex;">
+                <view class="table-content-row-font">
+                  <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="{{$t['accountName']}}" copyValue="{{item.supplierName}}"></dk-text>
+                </view>
+                <view class="table-content-class">
+                  {{item.datavalue ? item.datavalue :''}}
+                </view>
+              </view>
+            </view>
+          </view>  
+        </view>
+      </view>
+      <view data-item="{{item}}" bind:tap="changeSwipe" slot="right">{{item.flgValid ? $t['disable'] : $t['enable'] }}</view>
+    </van-swipe-cell>
+
+  </view>
+  <!-- 保留高度 -->
+  <view style="height: 220rpx;"></view>
+</view>
+
+
+ 
+
+<dk-popup defaultFlagCol="flgDefault" defaultFlagTitle="默认" type="basic" priceTitle="" priceCol="pricePromotion" subCol="desc" title="{{formDataName}}" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjNameGoTo}}" contentObj="{{popContent}}" bind:commit="editItems">
+</dk-popup>
+
+<!-- 底部加号 -->
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
+  <view bind:tap="toAdd" style="background: #CAA977;border-radius: 50%;display: flex;justify-content: center;align-items: center;padding:20rpx;box-shadow: 0px 17px 22px 0px #1B365D33;">
+    <van-icon name="plus" color="#FFFFFF" size="60rpx" />
+  </view>
+</view>
+
+
+
+
+
+
+<!-- 底部信息 -->
+<!-- <dk-save-bottom flagTypeName="product-file-add-select" bottomClass="{{true}}" bind:submit="toClose" bind:allClean="toAdd" /> -->

package-inventory/pages/fund-account/add/add.js

@@ -1,66 +1,160 @@
-// package-inventory/pages/fund-account/add/add.js
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.新建资金账户
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		王英杰		   2024-2-12	   1.00		   	    
+ *******************************************************************************/
+const mixins = require('@/mixins/index.js')
+const Constants = require('@/utils/Constants')
 Page({
-
+    mixins: [mixins],
     /**
      * 页面的初始数据
      */
     data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
+        cardList: ['main','center','other'],
+        contentObj: {
+            main: [{ //账户编码
+                    code: 'accountCode',
+                    type: 'str',
+                    readonly: true,
+                    title: mixins.$t('accountCode')
+                },
+                { //账户类别
+                    code: 'macType',
+                    name: 'accountCategory',
+                    title: mixins.$t("accountCategory"),
+                    type: 'choose',
+                    urlKey:'accountCategory' ,
+                    required: true, 
+                  },
+                { //账户名称
+                    code: 'macName',
+                    type: 'str',
+                    required: true,
+                    title: mixins.$t('accountName')
+                },
+                { //收款码
+                    code: 'file',
+                    type: 'uploader',
+                    title: '商品图片'
+                  },
+                { //默认账户
+                    code: 'flgDefault',
+                    type: 'switch',
+                    title: '默认账户', 
+                } 
+            ],
+            center: [
+                  { //期初余额
+                    code: 'balancce',
+                    type: 'textarea',
+                    title: '期初余额',
+                  },
+                  { code: 'deliveryDate', type: 'date', title: '余额日期' }
+            ],
+            other: [ //备注
+                { code: 'remarks', type: 'textarea', title: mixins.$t('remarks') }
+            ],
+        },
+        // 路由
+        routeObjName: 'moneyAccount',
     },
-
     /**
-     * 生命周期函数--监听页面显示
+     * @desc   : 处理数据-保存和查询后的逻辑
+     * @author : 姜永辉
+     * @date   : 2024/1/26 11:46
      */
-    onShow() {
-
+    handleData() {
+        wx.navigateBack({
+            data: 1
+        })
     },
-
+ 
+      /**
+     * @desc   : dk-form choose类型组件回调
+     * @author : 王英杰
+     * @date   : 2024/1/26 11:46
+     */ 
+    chooseData(e){
+        console.log("t",e,this.data.formData);
+        let formData = JSON.parse(this.data.formData)
+        let code = e.detail.code
+        let data = e.detail.data.data
+        if(code == "macType"){ //账户类别
+          formData.macType = data.id
+          formData.accountCategory = data.name
+        } 
+        this.setData({
+          formData: JSON.stringify(formData)
+        })
+      },
     /**
-     * 生命周期函数--监听页面隐藏
+     * @desc : 保存的參數設置
+     * @date : 2024/2/1 15:49
+     * @author : 姜永辉
      */
-    onHide() {
-
+    setParams(params) {
+        params.roleIds = (params.roleIds && params.roleIds.length > 0) ? params.roleIds.split(',') : []
+        return params
     },
 
     /**
-     * 生命周期函数--监听页面卸载
+     * @desc : 保存数据服务
+     * @date : 2024/2/1 15:49
+     * @author : 王英杰
      */
-    onUnload() {
+    saveData() {
+        if (this.data.formMode == Constants.formMode.edit) {
+            return this.excute(this.data.service, this.data.service.update, this.data.params)
+        } else {
+            return this.excute(this.data.service, this.data.service.insert, this.data.params)
+        }
 
     },
-
     /**
-     * 页面相关事件处理函数--监听用户下拉动作
+     * @desc : 给表单赋值
+     * @date : 2024/2/1 15:49
+     * @author : 姜永辉
      */
-    onPullDownRefresh() {
+    setValuesByEdit(data) {
+        data.roleIds = (data.roleIds && data.roleIds.length > 0) ? data.roleIds.join(',') : undefined
+        this.setData({
+            formData: JSON.stringify(data)
+        })
 
     },
 
+  /**
+   * @desc : 给表单赋值
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  setValuesByEdit(data) { 
+    data.serviceCategories = (data.serviceCategories && data.serviceCategories.length > 0) ? data.serviceCategories.join(',') : undefined
+    data.brandIds = (data.brandIds && data.brandIds.length > 0) ? data.brandIds.split(',') : undefined
+    this.setData({
+      formData: JSON.stringify(data)
+    }) 
+
+  },
     /**
-     * 页面上拉触底事件的处理函数
+     * @desc : 页面加载数据方法
+     * @date : 2024/2/1 15:49
+     * @author : 王英杰
      */
-    onReachBottom() {
-
+    loadInit() {
+        if (this.data.formMode == Constants.formMode.edit) {
+            wx.setNavigationBarTitle({
+                title: "编辑资金账户",
+            })
+        } else {
+            wx.setNavigationBarTitle({
+                title: "新建资金账户",
+            })
+        }
     },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
 })

package-inventory/pages/fund-account/add/add.json

@@ -1,3 +1,6 @@
 {
-    "usingComponents": {}
-}
+    "usingComponents": {},
+    "navigationBarTitleText": "新建资金账户",
+    "enablePullDownRefresh": true,
+    "backgroundTextStyle": "light"
+  }

package-inventory/pages/fund-account/add/add.wxml

@@ -1,2 +1,12 @@
-<!--package-inventory/pages/fund-account/add/add.wxml-->
-<text>package-inventory/pages/fund-account/add/add.wxml</text>
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<!-- 加载图层 -->
+<loading wx:if="{{loading}}"></loading>
+<!-- 列表区 -->
+<dk-form id="{{formName}}"  routeObjName="{{routeObjName}}"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+</dk-form>
+<!--  保存 -->
+<view class="bottom-class">
+  <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="save" type="default">保存
+  </van-button>
+</view>

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

@@ -1 +1,20 @@
-/* package-inventory/pages/fund-account/add/add.wxss */
+/**底部的样式*/
+.bottom-class{
+	position: fixed;
+	bottom: 20rpx;
+	width: 100%;
+	align-items: center;
+	justify-content: center;
+	border-top: 2rpx solid #efefef;
+	z-index: 2;
+	display: flex;
+  }  
+  /**底部保存按钮的样式*/
+  .save-button-class{
+	width: 640rpx;
+	background: #1B365D !important;
+	border-radius: 15rpx !important;
+	color:#fff !important;
+	font-size: 16px !important;
+	font-weight: 500 !important;
+  }

package-inventory/pages/fund-account/fund-account.js

@@ -91,4 +91,28 @@ Page({
     }
   })
 },
+  /**
+   * @desc : 详细页面 （编辑）
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  toDetail(e) { 
+    let macId = e.currentTarget.dataset.item.macId
+    wx.navigateTo({
+      url: this.data.route.add.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+          console.log("toDetail", e);
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', {
+          id: macId,
+          formMode: Constants.formMode.edit
+        })
+      }
+    })
+  },
 })

package-inventory/pages/fund-account/fund-account.wxml

@@ -11,13 +11,17 @@
 <van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
 
 <!-- 列表区 -->
-<view wx:for="{{tableData}}" wx:for-item="item" wx:for-index="index" data-item="{{item}}" wx:key="index" class="main-class">
+<view wx:for="{{tableData}}" wx:for-item="item" wx:for-index="index" data-item="{{item}}"   wx:key="index" class="main-class">
   <view class="main-foot-2" style="position: relative;">
     <view class="corner-view" style="padding:20rpx">
       <view style="display: flex;">
-        <view class="corner-view-text font" style="width: 60%;font-size: 15px;">{{item.macName}}</view>
-        <view style="width: 10%;">{{ item.balance?item.balance:0 }} </view>
-        <view style="width: 30%;text-align: right;" data-index="{{index}}" data-item="{{item}}" catch:tap="collapseAndExpand">
+        <view class="corner-view-text font" style="width: 70%;font-size: 15px;">{{item.macName}}</view>
+        
+        <view style="width: 20%;margin-right: 5vw;display: flex;  color: #CAA977;"> 
+            <view class="sign-class">¥</view>
+            <view>{{wxmlUtil.toThousandCents(item.balance ? item.balance : 0)}}</view>
+          </view>
+        <view style="width: 10%;text-align: right;" data-index="{{index}}" data-item="{{item}}" catch:tap="collapseAndExpand">
 
           <van-icon wx:if="{{ item.checked }}" color="#bdb7b7" name="arrow-down" />
           <van-icon wx:else color="#bdb7b7" name="arrow" /> 
@@ -26,17 +30,20 @@
     </view>
 
     <view style="background-color: white;">
-      <view wx:for="{{item.children}}" wx:for-item="item_" wx:if="{{item.checked}}" wx:for-index="index_" wx:key="index_" style="display: flex;padding:10rpx">
+      <view wx:for="{{item.children}}"  data-item="{{item_}}"  catchtap="toDetail" wx:for-item="item_" wx:if="{{item.checked}}" wx:for-index="index_" wx:key="index_" style="display: flex;padding:10rpx">
         <view style="display: flex; font-size: 13px;width: 100%;margin:2vw">
           <view style="flex: 1;">{{item_.macName}}</view>
-          <view style="margin-right: 5vw;">{{item_.balance?item_.balance:0}}</view>
+          <view style="margin-right: 5vw;display: flex;  color: #CAA977;"> 
+            <view class="sign-class">¥</view>
+            <view>{{wxmlUtil.toThousandCents(item_.balance ? item_.balance : 0)}}</view>
+          </view>
         </view> 
       </view>
     </view>
   </view>
 </view>
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
-<view style="height: 135rpx;"></view>
+<view style="height: 200rpx;"></view>
 
 
 <!--  保存 -->

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

@@ -20,3 +20,9 @@
 	font-size: 16px !important;
 	font-weight: 500 !important;
 }
+.sign-class{
+	padding-left: 10rpx;
+	padding-right:5rpx;
+	padding-top: 5rpx;
+	font-size: 10px;
+  }