Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

i18n/zh-CN.js

@@ -214,6 +214,7 @@ const supplier = {
   serviceProvider: "服务供应商",
   meet: "应付",
   save: '保存',
+  returnAddress:'退货地址',
   serviceCategories:'服务类别'
 }
 // 商品档案
@@ -236,7 +237,15 @@ const goodsSku = {
   SellableQuantityAsc: '可售量升序',
   SellableQuantityDesc: '可售量降序',
 }
+const fund ={
+  openingBalance : "期初余额",
+  commodityPicture : "商品图片",
+  defaultAccount : "默认账户",
+  balanceDate : "余额日期",
+  newFundAccount : "新建资金账户",
+  editFundAccount : "编辑资金账户",
 
+}
 module.exports = {
-  items: Object.assign({}, home, basicData, columns, saleOrder, button, messages, others, accountsManage, org, supplier, goodsSku)
+  items: Object.assign({}, fund,home, basicData, columns, saleOrder, button, messages, others, accountsManage, org, supplier, goodsSku)
 }

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

@@ -25,7 +25,7 @@ Page({
                 },
                 { //账户类别
                     code: 'macType',
-                    name: 'accountCategory',
+                    name: 'macTypeName',
                     title: mixins.$t("accountCategory"),
                     type: 'choose',
                     urlKey:'accountCategory' ,
@@ -40,21 +40,21 @@ Page({
                 { //收款码
                     code: 'file',
                     type: 'uploader',
-                    title: '商品图片'
+                    title: mixins.$t('commodityPicture')
                   },
                 { //默认账户
                     code: 'flgDefault',
                     type: 'switch',
-                    title: '默认账户', 
+                    title: mixins.$t('defaultAccount')
                 } 
             ],
             center: [
                   { //期初余额
-                    code: 'balancce',
-                    type: 'textarea',
-                    title: '期初余额',
+                    code: 'balance',
+                    type: 'number',
+                    title: mixins.$t('openingBalance')
                   },
-                  { code: 'deliveryDate', type: 'date', title: '余额日期' }
+                  { code: 'deliveryDate', type: 'date', title: mixins.$t('balanceDate') }
             ],
             other: [ //备注
                 { code: 'remarks', type: 'textarea', title: mixins.$t('remarks') }
@@ -86,7 +86,7 @@ Page({
         let data = e.detail.data.data
         if(code == "macType"){ //账户类别
           formData.macType = data.id
-          formData.accountCategory = data.name
+          formData.macTypeName = data.name
         } 
         this.setData({
           formData: JSON.stringify(formData)
@@ -149,11 +149,11 @@ Page({
     loadInit() {
         if (this.data.formMode == Constants.formMode.edit) {
             wx.setNavigationBarTitle({
-                title: "编辑资金账户",
+                title: mixins.$t('editFundAccount'),
             })
         } else {
             wx.setNavigationBarTitle({
-                title: "新建资金账户",
+                title: mixins.$t('newFundAccount'),
             })
         }
     },

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

@@ -7,6 +7,6 @@
 </dk-form>
 <!--  保存 -->
 <view class="bottom-class">
-  <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="save" type="default">保存
+  <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="save" type="default">{{$t['save']}}
   </van-button>
 </view>

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

@@ -18,12 +18,12 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    pageFlag:false,
 
     // 路由
     routeObjName: 'moneyAccount',
   },
-
+ 
   /**
    * @desc : 查询
    * @date : 2024/2/1 15:49
@@ -115,4 +115,5 @@ Page({
       }
     })
   },
+ 
 })

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

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','telephone'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['accountName'])}}">
   </dk-dropdown-menu>
 </van-sticky>
 
@@ -42,7 +42,7 @@
     </view>
   </view>
 </view>
-<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}</van-divider>
 <view style="height: 200rpx;"></view>
 
 

package-purchase/pages/supplier-list/add/add.js

@@ -59,7 +59,7 @@ Page({
           type: 'phone',
           title: mixins.$t("contactPhone"),
 
-        }
+        },{ code: 'returnAddress', type: 'address', title: mixins.$t("returnAddress"),   }
       ],
       staff: [{//采购人员
         code: 'staffId',