bug修改

package-basic-data/pages/customer-reception/add/add.js

@@ -30,7 +30,8 @@ Page({
         { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
         { code: 'remarks', type: 'textarea', rows: '5', required: true, showWordLimit: true, title: mixins.$t('followData') },
         { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
-        { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', }
+        { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', },
+        { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
       ]
     },
     table: Constants.tables.cusFollow,
@@ -119,6 +120,14 @@ Page({
     })
     console.log('onRadioFollowUp', e.detail)
   },
+  /**
+  * @desc : 跳转购物车
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  toShopping(){
+
+  },
 
   /**
   * @desc : 设置跟进form 字段
@@ -134,7 +143,8 @@ Page({
       { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },
       { code: 'remarks', type: 'textarea', rows: '5', required: true, showWordLimit: true, title: mixins.$t('followData') },
       { code: 'nextFollowTime', type: 'dateTime', required: true, title: mixins.$t('nextFollowTime') },
-      { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', }
+      { code: 'stayTimeLen', name: 'stayTimeLenName', required: true, title: mixins.$t('stayTimeLen'), dropType: 'storeRetentionTime', type: 'drop', },
+      { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
     ]
     let radioFollowUpTwolist = [
       { code: 'intention', name: 'intentionName', type: 'drop', required: true, dropType: 'customerIntention', title: mixins.$t('intention') },

package-basic-data/pages/customer-reception/add/add.wxml

@@ -28,11 +28,13 @@
 <dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:changePhoneblur="changePhoneblur" bind:chooseData="chooseData" table="{{table}}">
 </dk-form>
 
+<view style="height: 200rpx;"></view>
 <!-- 购物车 -->
-<view catchtap="toPay" data-item="{{form}}" style="position:fixed;z-index: 10;bottom: 250rpx;right: 50rpx;">
-  <image style="height:51px;width: 51px;" src="/static/image/Group.png" />
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
+  <view bind:tap="toShopping" class="btn-add-class">
+    <van-icon name="cart-o" color="#FFFFFF" size="60rpx" />
+  </view>
 </view>
 
-
 <!--  保存 -->
 <dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="save"></dk-save-button>

package-basic-data/pages/customer-reception/add/add.wxss

@@ -15,4 +15,13 @@
   background:white;
    padding-left: 7vw;
    border-radius: 15rpx;
+}
+.btn-add-class {
+	background: #1B365D;
+	border-radius: 50%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	padding: 20rpx;
+	box-shadow: 0px 17px 22px 0px #1B365D33;
 }

package-basic-data/pages/role/add/add.js

@@ -55,14 +55,7 @@ Page({
   },
 
 
-  /**
-    * @desc   : 处理数据
-    * @author : 于继渤
-    * @date   : 2024/1/26 11:46
-    */
-  handleData(data) {
-    
-  },
+
 
 
 
@@ -85,12 +78,12 @@ Page({
   */
   saveData() {
     if (this.data.formMode == Constants.formMode.edit && this.data.formType !== Constants.formMode.add) {
-
       return this.excute(this.data.service, this.data.service.update, this.data.params);
     } else {
       let params = this.data.params
       params.roleId = null
       params.roleCode = null
+      params.flgValid = true
       return this.excute(this.data.service, this.data.service.insert, params);
     }
 

package-basic-data/pages/role/role.js

@@ -18,6 +18,14 @@ Page({
     ],
     buttonSaveList:[{code:'add',title:'新建角色',width:'120rpx',color:'#1B365D'}],
     contentSaveList:[],
+      // 查询条件
+      searchContent: [{
+        code: 'flgValid', title: mixins.$t('allValidInvalid'), searchType: Constants.searchType.switch,
+  
+        list: [
+          { code: 1, title: mixins.$t('valid'), value: true },
+          { code: 2, title: mixins.$t('invalid'), value: false }]
+      }],
     // 路由
     routeObjName: 'role',
     tableData: [],
@@ -29,19 +37,7 @@ Page({
     * @author : 于继渤
     */
   deactivateEnable(e) {
-    let item = e.detail.item
-    let method = item.flgValid ? this.data.service.disable : this.data.service.enable;
-    return this.excute(this.data.service, method, item.roleId).then(res => {
-      if (res.data.code == 200) {
-        wx.showToast({
-          title: '操作成功',
-          image: '/static/image/success.png',
-          duration: 1000
-        })
-        //查询列表
-        this.searchData()
-      }
-    });
+    this.handleMoreDataIsValid(this.data.service, e.detail.item, 'roleId')
   },
 
   /**
@@ -123,6 +119,12 @@ Page({
   },
   onShow(){
     if(this.data.refreshDataFlag){
+      this.setData({
+        pageInfo:{
+          currentPage:1,
+          pageSize:5
+        }
+      })
       this.searchData()
     }
   }

package-sales/pages/order-billing/order-billing.js

@@ -23,39 +23,7 @@ Page({
       { code: 'createtime', title: mixins.$t("pastThirthtyDays"), defaultValue: 5, searchType: Constants.searchType.date },
       { code: 'staff', title: mixins.$t("staffId"), dropType: 'staff' },
       {
-        code: 'orderStatus', title: '审批状态', searchType: Constants.searchType.switch,
-        list: [
-          {
-            checked: true,
-            text: "异常",
-            value: "审-异常"
-          },
-          {
-            checked: true,
-            text: "待审",
-            value: "审-待审"
-          },
-          {
-            checked: true,
-            text: "审批中",
-            value: "审-审中"
-          },
-          {
-            checked: true,
-            text: "通过",
-            value: "审-通过"
-          },
-          {
-            checked: true,
-            text: "拒绝",
-            value: "审-拒绝"
-          },
-          {
-            checked: false,
-            text: "冲正",
-            value: "订单状态-冲正"
-          }
-        ]
+        code: 'orderStatus', title: '审批状态', searchType: Constants.searchType.switch
       },
       {
         code: 'choose', title: mixins.$t("choose"), searchType: Constants.searchType.pick

package-sales/pages/order-return/add/add.js

@@ -145,15 +145,7 @@ Page({
     //选择源单
     if (code == 'fromNo') {
       if (item.itemList && item.itemList.length > 0) {
-        //处理商品明细
-        // item.itemList.forEach(res => {
-        //   res.priceOut = res.sale
-        // })
         formData.goodsList = item.itemList
-
-
-
-
         formData.fromNo = item.fromNo
         this.calculateAmount(formData)
       }