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

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

@@ -28,7 +28,7 @@
       <!--开关-->
       <van-field wx:if="{{item.type=='switch'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="right" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
         <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
-        <view slot="inputbefor" style="text-align: left;padding-top: 5rpx;">
+        <view slot="inputbefor" style="width:100%;text-align: left;padding-top: 5rpx;" bindtap="onChange">
           <van-switch size="20px" checked="{{ form[item.code]}}" bind:change="onChange" active-color="#3E69F6" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" data-value="{{form[item.code]}}" data-key="{{item.code}}"disabled="{{item.disabled}}" />
         </view>
       </van-field> 

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

@@ -61,7 +61,7 @@ Page({
       title: '确定'
     }],
     // 新加的数据
-    addItem:null,
+    addItem: null,
   },
   /**
    * @desc : 调到新建
@@ -298,7 +298,7 @@ Page({
       case Constants.chooseType.series:
         data = {
           id: item.seriesId,
-          name: item.serieName
+          name: item.seriesName
         }
         break;
       // 计量单位 刘尧 2024.05.29
@@ -449,7 +449,7 @@ Page({
     let routeObjNamePop = this.data.routeObjNamePop
     if (!routeObjNamePop) return;
     this.setData({
-      addItem:null
+      addItem: null
     })
     let service = app.globalData[routeObjNamePop + 'Service']
     let defaultFlag = this.data.defaultFlag;
@@ -465,12 +465,12 @@ Page({
           if (res.data.data) {
             setTimeout(() => {
               // 多选就选中
-              if(this.data.chooseFlag){
+              if (this.data.chooseFlag) {
                 this.setData({
-                  addItem:res.data.data
+                  addItem: res.data.data
                 })
                 this.searchData();
-              }else{
+              } else {
                 // 执行点击事件
                 this._toDetail(res.data.data)
               }
@@ -593,7 +593,7 @@ Page({
           addUrl: '/package-basic-data/pages/role/add/add',
           routeObjName: 'common',
           method: 'getRole',
-          valueKey:'roleId',
+          valueKey: 'roleId',
           title: 'roleName',
           chooseFlag: route.chooseFlag,
           contentList: [{
@@ -610,7 +610,7 @@ Page({
           addUrl: app.globalData.company.gradeCode == Constants.gradeCode.STD ? null : '/package-basic-data/pages/org/org',
           routeObjName: 'common',
           method: 'getOrg',
-          valueKey:'orgId',
+          valueKey: 'orgId',
           title: 'orgName',
           contentList: [{
             name: 'orgCode',
@@ -626,7 +626,7 @@ Page({
           addUrl: '/package-basic-data/pages/staff/add/add',
           routeObjName: 'common',
           method: 'getStaff',
-          valueKey:'staffId',
+          valueKey: 'staffId',
           title: 'staffName',
           contentList: [{
             name: 'staffCode',
@@ -647,7 +647,7 @@ Page({
         this.setData({
           routeObjName: 'common',
           method: 'getInitData',
-          valueKey:'dataId',
+          valueKey: 'dataId',
           title: 'dataValue',
           contentList: [{
             name: 'dataCode',
@@ -669,7 +669,7 @@ Page({
           routeObjName: 'common',
           pageFlag: false,
           method: 'getMac',
-          valueKey:'macId',
+          valueKey: 'macId',
           title: 'macName',
           contentList: [{
             name: 'macCode',
@@ -691,7 +691,7 @@ Page({
         this.setData({
           routeObjName: 'common',
           method: 'getInitData',
-          valueKey:'channelId',
+          valueKey: 'channelId',
           title: 'channelName',
           simpleFlag: true,
           placeholder: ['channelName']
@@ -752,7 +752,7 @@ Page({
           routeObjName: 'common',
           routeObjNamePop: 'warehouse',
           method: 'getWarehouseListBy',
-          valueKey:'whId',
+          valueKey: 'whId',
           title: 'whName',
           contentList: [{
             name: 'supervisor',
@@ -877,9 +877,15 @@ Page({
           valueKey: 'seriesId',
           pageFlag: false,
           popTitle: mixins.$t('add') + title,
-          title: 'serieName',
+          title: 'seriesName',
           simpleFlag: true,
-          placeholder: ['seriesName']
+          placeholder: ['seriesName'],
+        })
+        this.setData({
+          popContent: [
+            { code: 'seriesName', type: 'str', title: mixins.$t('seriesName'), required: true },
+            { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+          ],
         })
         break;
       // 计量单位 刘尧 2024.05.29
@@ -1032,15 +1038,15 @@ Page({
  * @author : 刘尧
  */
   handleSearchData(tableData) {
-    console.log('tte',this.data.addItem,this.data.tableData,this.data.valueKey);
+    console.log('tte', this.data.addItem, this.data.tableData, this.data.valueKey);
     let addItem = this.data.addItem
     let valueKey = this.data.valueKey
     let choosedData = this.data.choosedData
     tableData.forEach(item => {
-      if(addItem && valueKey){
-        if(item[valueKey] == addItem[valueKey]){
+      if (addItem && valueKey) {
+        if (item[valueKey] == addItem[valueKey]) {
           item.checked = true;
-          choosedData.push({...item});
+          choosedData.push({ ...item });
         }
       }
       // 判断数据中是否存在计量单位的小数位数字段
@@ -1050,7 +1056,7 @@ Page({
     })
     this.setData({
       tableData: tableData,
-      choosedData:choosedData
+      choosedData: choosedData
     })
   }
 })