Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss_wx_app

components/dkbase/dk-form/dk-form.wxml

@@ -59,8 +59,8 @@
       </van-field>
 
       <!--日期-->
-      <van-field wx:if="{{item.type=='date'}}" required="{{item.required?true:false }}" is-link value="{{ form[item.code]}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" data-item="{{item}}" data-key="{{item.code}}" data-index="{{index}}" data-card="{{card.name}}" errorMessage="{{item.errMsg}}" clearable border="{{ false }}" readonly="{{true}}" label-class="{{!!item.readonly?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" catchtap="openDatePop">
-        <van-icon wx:if="{{!readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
+      <van-field wx:if="{{item.type=='date'}}" required="{{item.required?true:false }}" is-link value="{{ form[item.code]}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" data-item="{{item}}" data-key="{{item.code}}" data-index="{{index}}" data-card="{{card.name}}" errorMessage="{{item.errMsg}}" clearable border="{{ false }}" readonly="{{true}}" label-class="{{!!item.readonly?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" catchtap="openDatePop">  
+        <van-icon wx:if="{{!readonly && !item.readonly &&  form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
       </van-field>
       <!-- 日期范围 -->
       <van-field wx:if="{{item.type=='dateDay'}}" required="{{item.required?true:false }}" is-link value="{{ form[item.code]}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" data-item="{{item}}" data-key="{{item.code}}" data-index="{{index}}" data-card="{{card.name}}" errorMessage="{{item.errMsg}}" clearable border="{{ false }}" readonly="{{true}}" label-class="{{!!item.readonly?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" catchtap="openDatePopDay">

components/dkbase/dk-tip/dk-tip.wxss

@@ -14,6 +14,7 @@
   /* 如果需要，可以调整或移除 */
   border-radius: 12rpx;
   width: max-content;
+  z-index: 99;
 }
 
 .tipDownRight:after {
@@ -46,6 +47,7 @@
   /* 如果需要，可以调整或移除 */
   border-radius: 12rpx;
   width: max-content;
+  z-index: 99;
 }
 
 .tipDownLeft:after {
@@ -82,6 +84,7 @@
   /* 如果需要，可以调整或移除 */
   border-radius: 12rpx;
   width: max-content;
+  z-index: 99;
 }
 
 .tipUpRight:after {
@@ -115,6 +118,7 @@
   /* 如果需要，可以调整或移除 */
   border-radius: 12rpx;
   width: max-content;
+  z-index: 99;
 }
 
 .tipUpLeft:after {

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

@@ -58,7 +58,7 @@ Page({
           code: 'flgNegative',
           type: 'switch',
           title: mixins.$t('negativeBalance'),
-          tip:mixins.$t("flgNegativetip"),
+          tip: mixins.$t("flgNegativetip"),
         }
       ],
       center: [{ //期初余额
@@ -153,7 +153,7 @@ Page({
     contentObj.center.forEach(element => {
       element.readonly = true
     });
- 
+
     this.setData({
       contentObj: contentObj,
       formData: JSON.stringify(data)
@@ -174,6 +174,47 @@ Page({
       wx.setNavigationBarTitle({
         title: mixins.$t('newFundAccount'),
       })
+      //新建的时候 不显示账户编码 编辑的时候在显示
+      let contentObj = this.data.contentObj
+      contentObj.main = [{ //账户类别
+          code: 'macType',
+          name: 'macTypeName',
+          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: mixins.$t('commodityPicture')
+        },
+        { //默认账户
+          code: 'flgDefault',
+          type: 'switch',
+          title: mixins.$t('defaultAccount')
+        },
+        { //余额负数
+          code: 'flgNegative',
+          type: 'switch',
+          title: mixins.$t('negativeBalance'),
+          tip: mixins.$t("flgNegativetip"),
+        }
+      ]
+      this.setData({
+        contentObj: contentObj
+      })
     }
+
+    // 加载完毕
+    this.setData({
+      okFlag: true
+    })
   },
 })

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

@@ -3,7 +3,7 @@
 <!-- 加载图层 -->
 <loading wx:if="{{loading}}"></loading>
 <!-- 列表区 -->
-<dk-form id="{{formName}}"  routeObjName="{{routeObjName}}"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData"  bindtap="handleTap"  >
+<dk-form wx:if="{{okFlag}}" id="{{formName}}"  routeObjName="{{routeObjName}}"  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" table="{{table}}"bind:chooseData="chooseData"  bindtap="handleTap"  >
 </dk-form>
  
 

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

@@ -958,6 +958,7 @@ Page({
           dictCode: route.dictCode,
           chooseFlag: route.chooseFlag,
           repeatFlag: route.repeatFlag,
+          simpleFlag: true,
           pageFlag: false,
           valueKey: 'dataId',
           title: 'dataValue',

package-inventory/pages/warehousing-processing/detail/detail.js

@@ -436,22 +436,7 @@ Page({
    * @author : 姜永辉
    */
     loadInit() {
-        // 专业版要能看到入库对象
-        if(this.data.gradeCode == Constants.gradeCode.PRO){
-            let contentObj = this.data.contentObj
-            contentObj.main.push(
-                {
-                    code: 'intoObject',
-                    name: 'intoObjectName',
-                    title: mixins.$t('inObject'),
-                    type: 'choose',
-                    urlKey: 'chooseStorageObject'
-                },
-            )
-            this.setData({
-                contentObj:contentObj
-            })
-        }
+     
 
         if (this.data.item.intoStatus == Constants.intoStatus.inBounded) {
             this.setData({
@@ -736,6 +721,23 @@ Page({
                 sumQuantityCol: 'intoQty',
             })
         }
+   // 专业版要能看到入库对象
+   if(this.data.gradeCode == Constants.gradeCode.PRO){
+    let contentObj = this.data.contentObj
+    contentObj.main.push(
+        {
+            code: 'intoObject',
+            name: 'intoObjectName',
+            title: mixins.$t('inObject'),
+            type: 'choose',
+            urlKey: 'chooseStorageObject'
+        },
+    )
+    this.setData({
+        contentObj:contentObj
+    })
+}
+
     },
     /**
      * @desc : （编辑）