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

api/pages/mst/customer.js

@@ -50,6 +50,7 @@ module.exports = {
       toReceiptDetail:{ key: 'toReceiptDetail', url: '/package-accounts-manage/pages/receipt/detail/detail', formMode: 'edit',formType:'edit', idKey: 'cusId' } ,//跳转收款单新建
       chooseInitialPaymentType: { key: 'chooseInitialPaymentType', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'初始款项' ,  },
       chooseMoneyAccount: { key: 'chooseMoneyAccount', url: '/package-base-select/pages/select-data/select-data',type:'moneyAccount',  },
+      orderDetail: { key: 'orderDetail', url: '/package-sales/pages/order-billing/detail/detail', formMode: 'other', idKey: 'orderId' },
     }
   }
 };

api/pages/mst/staff.js

@@ -28,7 +28,7 @@ module.exports = {
             staffPurview: { key: 'staffPurview', url: '/package-base-select/pages/select-staff-purview/select-staff-purview', image: 'btn-data-qua.png' },
             // 离职
             leaveOffice: { key: 'leaveOffice', method: 'leaveOffice', image: 'btn-resignation.png', question: true },
-            buy: { key: 'buy', url: '/package-basic-data/pages/activity/activity' }
+            buy: { key: 'buy', url: '/package-basic-data/pages/activity/activity?buyUser=true' ,}
         }
     }
 };

app.js

@@ -132,7 +132,6 @@ const updateManager = wx.getUpdateManager()
 
 App({
   onLaunch() {
-    console.log("onLaunch");
     // LangUtils.setTabBarLang();
 
     //自动定时检测是否有新版本
@@ -218,7 +217,6 @@ try {
   let routeUrl = {};
   let name = null;
   apiList.forEach(m => {
-    // console.log('values',m,Object.values(m),Object.keys(m)[0],m['routeUrl']);
     app.globalData[Object.keys(m)[0]] = Object.assign(Object.values(m)[0], baseMethod.baseService)
     // // 如果没有路由，就建一个路由
     // if (!m['routeUrl']) {
@@ -236,16 +234,13 @@ try {
     }
     if (name && name != 'common') { 
       routeUrl[name] = m['routeUrl'][name];
-      // console.log('routeUrl',m,routeUrl,name,m['routeUrl'][name]);
     }
   })
   app.globalData['routeUrl'] = routeUrl;
   // 输出结果
-  console.log('文件列表：', apiList, baseMethod, routeUrl);
   // 国际化的初始化
   LangUtils.initLang();
   let langSrc = LangUtils.getLangSrc()
-  console.log('langSrc', langSrc);
   app.globalData['lang'] = { ...langSrc.items };
 } catch (error) {
   console.error('读取文件夹失败：', error);

components/dkbase/dk-collapse-item-more/dk-collapse-item-more.js

@@ -52,7 +52,6 @@ Component({
       });
     },
     onCheckedItem(e) {
-      console.log(e)
       let _that = this
       let index = e.currentTarget.dataset.index
       let list = _that.data.list
@@ -75,7 +74,6 @@ Component({
 
       }
       list[index].checked = list[index].checked
-      console.log('list', list)
       _that.setData({
         list: list
       })

components/dkbase/dk-collapse-item/dk-collapse-item.js

@@ -48,7 +48,6 @@ Component({
     },
 
     onCheckedItem(e) {
-      console.log(e)
       let _that = this
       let index = e.currentTarget.dataset.index
       let list =_that.data.list
@@ -62,7 +61,6 @@ Component({
         })
       }
       list[index].checked = list[index].checked
-      console.log('list',list)
       _that.setData({
         list: list
       })

components/dkbase/dk-drag-to-sort/dk-drag-to-sort.js

@@ -30,7 +30,6 @@ Component({
           const _query = this.createSelectorQuery()
           const query = wx.createSelectorQuery()
           _query.select('.drag-and-drop-list').boundingClientRect().exec(res => {
-              console.log('_query_res', res)
           })
           query.select('#scroller').fields({
               size: true,
@@ -38,7 +37,6 @@ Component({
               properties: ['scrollX', 'scrollY'],
               context: true,
             }).exec(res => {
-              console.log('query_res', res)
           })
       },
       noticeChildInited(index) { // 如果index不为undefined，着仅更新index指定的子元素，否则认为更新全部元素

components/dkbase/dk-dropdown-date/dk-dropdown-date.js

@@ -72,7 +72,6 @@ Component({
           if (item.value + '' === this.data.defaultValue + '') {
             dateDefault.value = item.value
             dateDefault.text = item.text
-            console.log('item', item)
             if (item.value + '' == '1') {
               date = [util.formatTime(new Date()).substring(0, 10), util.formatTime(new Date()).substring(0, 10)]
             }

components/dkbase/dk-dropdown-switch/dk-dropdown-switch.js

@@ -64,7 +64,6 @@ Component({
           values.push(item.value)
         }
       }
-      console.log()
       this.triggerEvent('commit', {
         values: values.join(','),
         valueList:values,

components/dkbase/dk-form-more-items/dk-form-more-items.js

@@ -204,7 +204,6 @@ Component({
      */
     show: function () {
       const location = chooseLocation.getLocation();
-      // console.log('loc', location);
       let form = this.data.form
       if (location) {
         form['address'] = location;
@@ -295,7 +294,6 @@ Component({
               if (cardList[cardIndex].urlParam) {
                 item[cardList[cardIndex].urlParam] = cardList[cardIndex].urlParamValue
               }
-              console.log("choose-首付款", form, item);
               res.eventChannel.emit('params', { item: item, route: route })
             }
           })
@@ -394,14 +392,12 @@ Component({
           events: {
             // 回调后
             bindData: function (data) {
-              console.log('rr', data);
               let form = _this.data.form
               let objIdCol = _this.data.objIdCol;
               // 赋值对象Id
               if (objIdCol && data[objIdCol]) {
                 form[objIdCol] = data[objIdCol]
               }
-              console.log('ddd', form);
               form.objInfo = data;
               _this.setData({
                 form: form,
@@ -441,7 +437,6 @@ Component({
           success: function (res) {
             // 通过eventChannel向被打开页面传送数据
             let item = {}
-            console.log('re', _this.data.routeObjName, _this.data.routeUrl);
             let route = _this.data.routeUrl[_this.data.routeObjName];
             res.eventChannel.emit('params', { item: item, route: route['chooseSupplier'] })
           }
@@ -610,7 +605,6 @@ Component({
                   that.setData({
                     form: form
                   })
-                  console.log('form', form)
                   that.triggerEvent("chooseData", { code: item.key, data: data, index: item.index })
                   // 如果需要联动控制选商品按钮
                   if (item.item.controlChooseFlag) {
@@ -660,7 +654,6 @@ Component({
               // 如果必须输入，就要进行判断
               if (item.required && form[this.data.itemName] && form[this.data.itemName].length > 0) {
                 form[this.data.itemName].forEach(t => {
-                  console.log('tt', t, item.code);
                   if (!t[item.code]) {
                     t[item.code + '_errMsg'] = title + '不为空'
                     flag = false;
@@ -772,7 +765,7 @@ Component({
       let folder = app.globalData.company.cpCode + '/' + this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
       let url = config.upload_url;
       url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
-      file.forEach(res => {
+      file.forEach((res,index) => {
         // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
         wx.uploadFile({
           url: url,
@@ -917,7 +910,6 @@ Component({
         form: form,
         contentObj: contentObj
       })
-      console.log("changeNumber组件", form);
       this.triggerEvent("changeNumber", { code: key, data: e.detail.value })
     },
     /**
@@ -1008,7 +1000,6 @@ Component({
  * @date   : 2024/1/26 11:46
  */
     onChange(e) {
-      console.log("onChange", e);
       // 只读
       if (this.data.readonly) {
         return;
@@ -1079,7 +1070,6 @@ Component({
       if (item.readonlyItem) {
         return;
       }
-      console.log('eee',this.data.readonly,key,name ,form);
       // 明细
       if (card == 'items') {
         form[this.data.itemName][key] = undefined

components/dkbase/dk-form/dk-form.js

@@ -165,7 +165,6 @@ Component({
      */
     open(e) {
       let item = e.currentTarget.dataset;
-      console.log('item', item)
       if (item.item.readonly) {
         return
       }
@@ -176,7 +175,6 @@ Component({
         index: item.index,
         card: item.card
       })
-      console.log('ee', e);
       // 单选
       if (item.item.type == 'drop') {
         this.setData({
@@ -190,7 +188,6 @@ Component({
         })
       } else if (item.item.type == 'choose' || item.item.type == 'chooseAndStr') {
         let that = this
-        console.log(item, this.data.routeObjName, this.data.routeUrl);
         that.setData({
           changeObj: item.item.changeObj,
         })
@@ -216,7 +213,6 @@ Component({
                     if (changeObj[key]['visible']) {
                       changeObj[key]['visible'].forEach(it => {
                         let index = contentObj[card].findIndex(t => t.code == it)
-                        console.log('index', index);
                         if (contentObj[card][index]) {
                           contentObj[card][index].hide = false
                         }
@@ -226,7 +222,6 @@ Component({
                     if (changeObj[key]['hide']) {
                       changeObj[key]['hide'].forEach(it => {
                         let index = contentObj[card].findIndex(t => t.code == it)
-                        console.log('index', index);
                         if (contentObj[card][index]) {
                           contentObj[card][index].hide = true
                         }
@@ -246,7 +241,6 @@ Component({
                 }
               },
               success: function (res) {
-                console.log('item', that.data.form)
                 let data = {
                   item: {
                     data: item.item.datalist || []
@@ -295,7 +289,6 @@ Component({
               item.errMsg = undefined
             }
             // 电话校验
-            console.log(item.type, item.required, form[item.code]);
             if (item.type == 'phone' && item.required && form[item.code]) {
               // 联系电话格式错误
               var myreg = Constants.Mobile_Phone_Number_Regular_Expression
@@ -324,7 +317,6 @@ Component({
         if (changeObj[key]['visible']) {
           changeObj[key]['visible'].forEach(it => {
             let index = contentObj[card].findIndex(t => t.code == it)
-            console.log('index', index);
             if (contentObj[card][index]) {
               contentObj[card][index].hide = false
             }
@@ -334,7 +326,6 @@ Component({
         if (changeObj[key]['hide']) {
           changeObj[key]['hide'].forEach(it => {
             let index = contentObj[card].findIndex(t => t.code == it)
-            console.log('index', index);
             if (contentObj[card][index]) {
               contentObj[card][index].hide = true
             }
@@ -351,7 +342,6 @@ Component({
      * @date   : 2024/1/26 11:46
      */
     chooseData(e) {
-      console.log("chooseData-dkform", e.detail);
       let contentObj = this.data.contentObj;
       let form = this.data.form
       if (e.detail.ids) {
@@ -379,7 +369,6 @@ Component({
         if (changeObj[key]['visible']) {
           changeObj[key]['visible'].forEach(it => {
             let index = contentObj[card].findIndex(t => t.code == it)
-            console.log('index', index);
             if (contentObj[card][index]) {
               contentObj[card][index].hide = false
             }
@@ -389,7 +378,6 @@ Component({
         if (changeObj[key]['hide']) {
           changeObj[key]['hide'].forEach(it => {
             let index = contentObj[card].findIndex(t => t.code == it)
-            console.log('index', index);
             if (contentObj[card][index]) {
               contentObj[card][index].hide = true
             }
@@ -531,7 +519,6 @@ Component({
      * @date   : 2024/2/2 11:46
      */
     clearField(e) {
-      console.log('eee', e);
       let ds = e.currentTarget.dataset
       let key = ds.key
       let form = this.data.form
@@ -866,7 +853,7 @@ Component({
       let folder = app.globalData.company.cpCode + '/' + this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
       let url = config.upload_url;
       url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
-      file.forEach(res => {
+      file.forEach((res,index) => {
         // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
         wx.uploadFile({
           url: url,

components/dkbase/dk-guide/dk-guide.js

@@ -32,7 +32,6 @@ Component({
   },
   lifetimes: {
     attached: function () {
-      console.log(this.properties);
       const { step } = this.properties;
       let { guideList, stepName } = this.data;
       guideList = step.guideList;
@@ -64,7 +63,6 @@ Component({
   methods: {
     // 展示新手提示
     viewTips(data, scrollTop) {
-      console.log('view',data, scrollTop);
       let {
         systemInfo,
         tipWidth,
@@ -75,7 +73,6 @@ Component({
         guideStyle,
       } = this.data;
       if (data) {
-        console.log('b',systemInfo,data,scrollTop,data.top);
         // 如果dom宽度大于或者等于窗口宽度,需要重新调整dom展示宽度
         let newWidth = systemInfo.windowWidth - 20;
         if (data.width >= newWidth) {
@@ -121,7 +118,6 @@ Component({
         if(guideList[index].fixed){
           guideStyle += ";position:fixed";
         }
-        console.log(arrowTop, tipPosition, guideList, guideStyle);
         this.setData({
           arrowTop,
           tipPosition,
@@ -152,9 +148,7 @@ Component({
     // 获取dom信息
     getDomInfo() {
       const { guideList, index } = this.data;
-      console.log(guideList, index);
       const { el } = guideList[index];
-      console.log(el);
       //   const query = wx.createSelectorQuery().in(this.$root);
       let query = wx.createSelectorQuery();
  
@@ -163,7 +157,6 @@ Component({
         query.selectViewport().scrollOffset();
         var _this = this;
         query.exec(function (res) {
-          console.log("打印demo的元素的信息", res);
           let data = res[0]; // #the-id节点的上边界坐标
           // data.height = data.height?data.height:'88rpx'
           // data.width= data.width?data.width:'100%'

components/dkbase/dk-list-report/dk-list-report.js

@@ -281,7 +281,6 @@ Component({
      * @date   : 2024/1/26 11:46
      */
     clickButton(e) {
-      console.log('点击按钮', e, this.data.item)
       let item = this.data.item;
       item = Object.assign(item, { button: e.currentTarget.dataset.item })
       let obj = {

components/dkbase/dk-list/dk-list.js

@@ -275,7 +275,6 @@ Component({
      * @date   : 2024/1/26 11:46
      */
     toDetail(e) {
-      console.log('toDetail',e);
       // 相当于勾选
       if (this.data.chooseFlag) {
         this.chooseData(e);
@@ -318,7 +317,6 @@ Component({
      * @date   : 2024/1/26 11:46
      */
     clickButton(e) {
-      console.log('点击按钮', e, this.data.item, e.currentTarget.dataset.item)
       let item = this.data.item;
       let button = e.currentTarget.dataset.item;
       let flag = true;

components/dkbase/dk-multi-owner/dk-multi-owner.js

@@ -116,7 +116,6 @@ const util = require('@/utils/util.js')
           }
         }
       }
-      console.log('this.data.inputBlurChange', this.data.inputBlurChange)
       this.calculationScale(list, commissionCode, switchCode)
       // 选择条数
       _this.setData({
@@ -133,7 +132,6 @@ const util = require('@/utils/util.js')
       var _this = this
       var list = _this.data.list
       var index = e.target.dataset.index
-      console.log('onChangeSwitch', e, list)
       //如果没有选中就不能触发这个主从的勾选
       if (!list[index].checked) {
         return;
@@ -201,7 +199,6 @@ const util = require('@/utils/util.js')
       * @author : 于继渤
       */
     inputBlurChange(e) {
-      console.log('inputBlurChange', e)
       let value = null
       let index = e.currentTarget.dataset.index
       let id = e.currentTarget.dataset.id
@@ -238,22 +235,15 @@ const util = require('@/utils/util.js')
         inputBlurChange: true
       })
 
-
-      console.log('idKey', idKey)
-      console.log('commissionCode', commissionCode)
       let number = Number(100 - value.toFixed(2))
       let showListTemp = []
       list.forEach(it => {
         if (id != it[idKey] && it.checked) {
-          console.log('it', it)
           showListTemp.push(it)
         }
       })
-      console.log('showListTemp', showListTemp)
-      console.log('number', number)
       let allocationRatio = (number / showListTemp.length).toFixed(2)
       let allocationRatioTotal = 0
-      console.log('allocationRatio', allocationRatio)
       //数据取余2为0
       if (number % showListTemp.length == 0) {
         //循环将计算好的百分比放入数据中
@@ -263,7 +253,6 @@ const util = require('@/utils/util.js')
         list.forEach(item1 => {
           showListTemp.forEach(item2 => {
             if (item1[idKey] == item2[idKey]) {
-              console.log('item2', item2)
               item1[commissionCode] = Number(item2[commissionCode]).toFixed(2)
             }
           })
@@ -275,7 +264,6 @@ const util = require('@/utils/util.js')
         let showListTemp2 = [...showListTemp]
         let endList = showListTemp2.splice(-1)
         for (let i = 0; i < showListTemp2.length; i++) {
-          console.log('showListTemp[i]', showListTemp2[i])
           allocationRatioTotal = allocationRatioTotal + Number(allocationRatio)
           showListTemp2[i][commissionCode] = Number(allocationRatio).toFixed(2)
         }

components/dkbase/dk-number-input/dk-number-input.js

@@ -256,7 +256,6 @@ Component({
 
       let minFlag = this.data.minFlag
       let min = this.data.min
-      // console.log('tttt',inputValue,maxFlag,minFlag,min);
 
       // 如果输入后让数据变成非数字，那么就要还原成之前的数据
       if (isNaN(e.detail)) {
@@ -274,7 +273,6 @@ Component({
       // 如果输入的是小数点，那么需要判断是否已经有小数点
       if (e.detail.endsWith('.')) {
         // 说明有多个小数点
-        // console.log('zzz',values,this.data.inputValue,(this.data.inputValue + '').indexOf('.'));
         if (values && values.length > 2) {
           flag = false;
           if ((this.data.inputValue + '').indexOf('.') >= 0) {
@@ -322,7 +320,6 @@ Component({
         } else {
           value = detailValue
         }
-        console.log('valu', detailValue, value, this.data.max, this.data.min,this.data.maxFlag,this.data.minFlag);
         if (e.detail == '-') {
           value = e.detail
         }
@@ -373,7 +370,6 @@ Component({
     */
     handleData() {
       let value = this.data.inputValue;
-      console.log('handleDataValue', value);
       if (value == null || value == '') {
         this.setData({
           clearFlag: true

components/dkbase/dk-number-phone-input/dk-number-phone-input.js

@@ -147,14 +147,12 @@ Component({
     },
 
     clickFieldInput(e) {
-      console.log('clickFieldInput', e)
       this.triggerEvent('clickFieldInput', e)
     },
     /**
      * 联系电话 拨打
      */
     onClickphone(e) {
-      console.log('eee', e);
       let icon = e.target.dataset.icon
       // 打电话
       if (icon == 'phone') {

components/dkbase/dk-popup/dk-popup.js

@@ -9,6 +9,18 @@
  *******************************************************************************/
 const util = require('@/utils/util.js')
 const app = getApp();
+// 防抖函数 - 2024/6/28 于继渤
+function debounce(func, wait) {
+  let timeout;
+  return function() {
+    const context = this;
+    const args = arguments;
+    clearTimeout(timeout);
+    timeout = setTimeout(() => {
+      func.apply(context, args);
+    }, wait);
+  };
+}
 Component({
   /**
    * 组件的属性列表
@@ -137,13 +149,11 @@ Component({
     value: {
       type: String,
       observer: function (newVal) {
-        // console.log("newVal-结果集", newVal);
         if (newVal) {
           this.setData({
             form: JSON.parse(newVal) || {},
             formSocail: JSON.parse(newVal) || {}
           })
-          console.log('form',newVal);
         }
       }
     }
@@ -251,12 +261,11 @@ Component({
       let contentObj = this.data.contentObj;
       contentObj.forEach(item => {
         let title = this.$t(item.title ? item.title : item.code)
-        console.log('title', title, form[item.code])
         if (item.negativeNumber && form[item.code]>=0) { //和底下校验 负数 对冲 符合条件把 错误消息清空
           item.errMsg = '' 
-        }
+        } 
         // 如果必须输入，就要进行判断
-        if (item.required && !form[item.code] && form[item.code] != 0) {
+        if (item.required && !form[item.code] && form[item.code] != 0 || item.required  && form[item.code] == "") {
           item.errMsg = title + '不为空'
           flag = false;
         } 
@@ -280,7 +289,6 @@ Component({
       if (item.readonly) {
         return
       }
-      console.log("openPackageBox-pop组件", e);
       // 如果处理id，name还需要赋值其他，需要在页面事件中自行处理
       this.triggerEvent("openPackageBox", {
         item: e.detail.item
@@ -292,7 +300,6 @@ Component({
      * @date   : 2024/1/26 11:46
      */
     openDkNumberInput(e) { 
-      console.log("openDkNumberInput-pop组件", e); 
       this.triggerEvent("openDkNumberInput", {
         key: e.currentTarget.dataset.key
       })
@@ -323,8 +330,6 @@ Component({
         }
       } else if (item.item.type == 'choose') {
         // 跳转链接
-        console.log('this.data.routeUrl', this.data.routeUrl)
-        console.log('this.data.routeObjName', this.data.routeObjName)
         if (item.item.urlKey) {
           let route = this.data.routeUrl[this.data.routeObjName][item.item.urlKey]
           let url = route.url
@@ -338,8 +343,6 @@ Component({
                 bindData: function (data) {
                   let key = e.currentTarget.dataset.item.code
                   let name = e.currentTarget.dataset.item.name
-                  console.log('key', key, data)
-                  console.log('name', name)
                   let form = that.data.form
                   form[key] = data.data.id
                   form[name] = data.data.name
@@ -354,7 +357,6 @@ Component({
                     }
                   }
                   if (item.item.name == 'supervisor') {  //仓库主管
-                    console.log(data)
                     form['contactPhone'] = data.data.staffPhone
                   }
 
@@ -389,7 +391,6 @@ Component({
                   }
                 }
                 data['route'] = route
-                console.log('打开下拉',)
                 // 通过eventChannel向被打开页面传送数据
                 res.eventChannel.emit('params', data)
               }
@@ -473,7 +474,6 @@ Component({
      * @date   : 2024/2/2 11:46
      */
     blurNumberField(e) {
-      console.log('blurNumberField',e);
       this.triggerEvent("blurNumberField", {
         index2: e.detail.index2,
         value: e.detail.inputValue,
@@ -487,8 +487,6 @@ Component({
      * @date   : 2024/2/2 11:46
      */
     changeNumberField(e) {
-      console.log("changeNumberField", e);
-
       let ds = e.currentTarget.dataset
       let key = ds.key
       let item = ds.item
@@ -527,7 +525,6 @@ Component({
       }
       let checkFlag = e.currentTarget.dataset.value
       let form = this.data.form
-      console.log('改变选择框内容', item)
       //提示信息标识
       // if (item.tipFlag && !checkFlag) {
         // let contentObj = this.data.contentObj.filter(res => {
@@ -535,7 +532,6 @@ Component({
         // })
 
         // //处理价格为0
-        // console.log('改变选择框内容', !checkFlag)
         // // 是否弹出询问框
         // Dialog.confirm({
         //   message: '是否勾选赠品标识',
@@ -552,7 +548,6 @@ Component({
       // 外部计算时不进行赋值
       if(!item.outSetFlag){
         form[key] = !checkFlag
-        console.log('form',form,checkFlag);
         this.setData({
           form: form,
         })
@@ -568,7 +563,6 @@ Component({
     * @date   : 2024/6/18 11:46
     */
     setFlgGift(code,checkFlag, key) {
-      console.log('setFlgGift', code,key, checkFlag)
       let form = this.data.form
       form[key] = checkFlag
       this.setData({
@@ -618,7 +612,6 @@ Component({
     * @date   : 2024/2/2 11:46
     */
     setFormIsNull() {
-      console.log('form清楚数据指定', this.data.form)
       let form = this.data.form
       form['catName'] = ''
       form['remark'] = ''
@@ -670,8 +663,8 @@ Component({
    */
   lifetimes: {
     attached: function () {
-      console.log('fffd', this.data.form, this.data.contentObj);
-
+      // 防抖
+      this.commit = debounce(this.commit, 400); 
     },
     detached: function () {
       // 在组件实例被从页面节点树移除时执行

components/dkbase/dk-save-button/dk-save-button.js

@@ -112,8 +112,6 @@ Component({
      */
     submit(e) {
       let item = e.currentTarget.dataset.item
-      console.log('item', item);
-      console.log(e)
       this.triggerEvent("open", { name: item.code, customUrl: item.customUrl })
     },
   }

components/dkbase/dk-side-pull-menu/dk-side-pull-menu.js

@@ -77,13 +77,10 @@ Component({
             count++
           }
         })
-      console.log('count', count)
       this.setData({
         searchFormNumber: count
       })
     }
-
-
   },
 
 

components/dkbase/dk-stepper/dk-stepper.js

@@ -51,7 +51,6 @@ Component({
      * @author 刘尧
      */
     changeStep(e) {
-      console.log('e', e);
       this.setData({
         dataValue: e.detail.inputValue,
       })
@@ -83,7 +82,6 @@ Component({
     handlePlus() {
       let dataValue = this.data.dataValue
       let max = this.data.max
-      console.log('max', max, dataValue);
       dataValue = dataValue + this.data.step
       if (dataValue <= max) {
         this.setData({

components/dkbase/dk-tabs/dk-tabs.js

@@ -45,7 +45,6 @@ Component({
         event.detail.code  = this.data.list[event.detail.index].code
       }
      
-      console.log('当前激活的标签改变时触发',event)
       this.triggerEvent('onChange', event)
     }
   }

components/dkbase/dk-tree-form-more/dk-tree-form-more.js

@@ -93,7 +93,6 @@ Component({
       }
       treeList[i].selected = false;
     }
-    console.log('ddd',treeList);
     this.setData({
       tree: treeList
     })
@@ -102,16 +101,13 @@ Component({
     //停用启用方法
 
     onSwipeBind(e) {
-      console.log('onSwipeBind', e);
       this.triggerEvent('onSwipe', e);
     },
     subonSwipeBind_(e) {
-      console.log('subonSwipeBind_', e);
       this.triggerEvent('onSwipe', e.detail);
     },
 
     // onSwipeBind_(e) {
-    //   console.log('onSwipeBind_', e)
     //   this.triggerEvent('onSwipe_', e);
     // },
     //设置控件信息
@@ -171,7 +167,6 @@ Component({
       return;
     },
     onchange(e) {
-      console.log("onchange", e)
       const { treeList } = this.data;
       const { itemListKey } = this.data;
       const { idKey } = this.data;
@@ -183,7 +178,6 @@ Component({
       })
     },
     change(e) {
-      console.log("change", e)
       const id = e.detail;
       const { treeList } = this.data;
       const { itemListKey } = this.data;
@@ -213,7 +207,6 @@ Component({
       this.triggerEvent('clickName', { id: e.detail.id, name: e.detail.name, item: e.detail.item });
     },
     click(e) {
-      console.log("click")
       const t = this.selectAllComponents('#treeSelect');
       t.forEach(item => {
         item.click(e);

components/dkbase/dk-tree-form/dk-tree-form.js

@@ -106,7 +106,6 @@ Component({
             return;
         },
         onchange(e) {
-            console.log("onchange",e)
             const { treeList } = this.data;
             const { itemListKey } = this.data;
             const { idKey } = this.data;
@@ -118,7 +117,6 @@ Component({
             })
         },
         change(e) {
-            console.log("change",e)
             const id = e.detail;
             const { treeList } = this.data;
             const { itemListKey } = this.data;
@@ -133,7 +131,6 @@ Component({
           const { idKey } = this.data;
           const { nameKey } = this.data; 
           const { itemListKey } = this.data; 
-            console.log('dffd',this.data.isLastClickFlag);
           if(this.data.isLastClickFlag){ //开启只点击末级  
             if(e.currentTarget.dataset.item[itemListKey]){ //还有子list 说明就不是末级
               return
@@ -144,11 +141,9 @@ Component({
         },
         //点击控件里的控件 回调
         subclickName(e){
-             
             this.triggerEvent('clickName', {id:e.detail.id,name:e.detail.name} );
         },
         click(e) {
-            console.log("click")
             const t = this.selectAllComponents('#treeSelect');
             t.forEach(item => {
                 item.click(e);

components/dkbase/dk-tree/dk-tree.js

@@ -98,7 +98,6 @@ Component({
             return;
         },
         onchange(e) {
-            console.log("onchange",e)
             const { treeList } = this.data;
             const { itemListKey } = this.data;
             const { idKey } = this.data;
@@ -110,7 +109,6 @@ Component({
             })
         },
         change(e) {
-            console.log("change",e)
             const id = e.detail;
             const { treeList } = this.data;
             const { itemListKey } = this.data;
@@ -133,7 +131,6 @@ Component({
             this.triggerEvent('clickName', {id:e.detail.id,name:e.detail.name} );
         },
         click(e) {
-            console.log("click")
             const t = this.selectAllComponents('#treeSelect');
             t.forEach(item => {
                 item.click(e);

components/dkbusiness/dk-dropdown-menu/dk-dropdown-menu.js

@@ -195,7 +195,6 @@ Component({
             }
           }
         }
-        console.log('menuList', menuList, e.detail);
 
         this.setData({
           form: form,
@@ -240,7 +239,6 @@ Component({
         form = this.data.form
         form.searchText = undefined
       }
-      console.log('form', form);
       this.setData({
         form: form,
         value: JSON.stringify(form)
@@ -266,8 +264,6 @@ Component({
           menuList[this.data.index].title = dateDefault.text
         }
       }
-      console.log('menuList', menuList, e.detail);
-
       this.setData({
         form: form,
         value: JSON.stringify(form),

components/dkbusiness/dk-label-multiple-select/dk-label-multiple-select.js

@@ -30,7 +30,6 @@ Component({
       default: true,
       observer: function (newVal) {
         let show = this.properties.show
-        console.log('122236', show);
         if (show) {
           let stowList = this.data.stowList;
           let moreList = this.data.moreList;
@@ -282,7 +281,6 @@ Component({
           let datalist = []
           if (typeName === 'moneyAccount') {
             list.forEach(item2 => {
-              console.log('item2', item2);
               let item = {
                 id: item2.macCode,
                 name: item2.macName,

components/dkbusiness/dk-muti-dropdown-item/dk-muti-dropdown-item.js

@@ -319,7 +319,6 @@ Component({
       let typeName = this.data.typeName
       let docName = this.data.docName
       let name = ''
-      // console.log('typeName', typeName);
       // 部门
       if (typeName === 'org') {
         DataSourceCode = 'org'

components/dkbusiness/dk-single-dropdown-item/dk-single-dropdown-item.js

@@ -482,7 +482,6 @@ Component({
           // datalist: datalist,
           show: false
         })
-        console.log('ttt34', item, this.data.valueKey);
         this.triggerEvent('commit', {
           value: item[this.data.valueKey],
           text: item[this.data.labelKey],

dist/uploader/index.js

@@ -96,7 +96,6 @@ VantComponent({
             if (!res) {
                 return;
             }
-            console.log('mmmmmm');
             if (isPromise(res)) {
                 res.then((data) => this.onAfterRead(data || file));
             }

i18n/zh-CN.js

@@ -20,6 +20,7 @@ const button = {
   resignation: '在职',
   leaveOffice: '离职',
   login: '登录',
+  user: '用户',
   flgCanWxLogin: '手机登录',
   flgCanPcLogin: '电脑登录',
   userAuthorize:'用户授权',
@@ -75,7 +76,7 @@ const mac = {
   receiptOrderNo: '收款单号',
   sumAmtReceivableHandle: '核销应收',
   sumAmtPayableHandle: '核销应付',
-  thisRefund: '本次退款',
+  thisRefund: '本次金额',
   refund: '退款',
   receivableSelect: '选应收',
   paymentSelect: '选应付',
@@ -594,6 +595,8 @@ const goodsSku = {
   purchasePrice: '采购价',
   retailPrice: '零售价',
   salePrice: '售价',
+  saleAmt: '销售金额',
+  addOutsourcedGoods: '添加外协商品',
   wholesalePrice: '批发价',
   referencePrice: '参考价',
   SaleSPriceLimit: '销售限价',

mixins/index.js

@@ -192,7 +192,6 @@ module.exports = {
         //     noMore: true
         //   })
         // }
-        // console.log('ttt', list.length);
         if (e == 'more') {
           // 如果返回数据小于页数，就不能再继续翻页了
           if (list.length == 0 || list.length < this.data.pageInfo.pageSize) {
@@ -212,7 +211,6 @@ module.exports = {
         this.setData({
           tableData: tableData
         })
-        console.log('table', this.data.tableData, tableData, this.data.noMore);
         // 如果页面需要后续处理，再进行处理
         if (this.handleSearchData) {
           this.handleSearchData(tableData);
@@ -282,7 +280,6 @@ module.exports = {
       if (item) {
         e.detail.item = item;
       }
-      console.log('e', e);
       if (e.detail.item) {
         let button = {
           formMode: Constants.formMode.edit
@@ -331,7 +328,6 @@ module.exports = {
         return;
       }
       // 如果有链接，就跳转
-      console.log('url', routeUrl);
       if (routeUrl.url) {
         let url = routeUrl.url
         //保存按钮自定义跳转URL
@@ -358,7 +354,6 @@ module.exports = {
           events: {
             // 保存成功后刷新页面
             refresh: function (data) {
-              console.log('data', data);
               if (data.backFlag) {
                 // 刷新一览界面
                 wx.reLaunch({
@@ -372,7 +367,6 @@ module.exports = {
           },
           success: function (res) {
             let data = {}
-            console.log('success', item)
             if (item && item.button && item.button.idKey) {
               data['id'] = item[item.button.idKey]
             }
@@ -432,7 +426,6 @@ module.exports = {
   printedBill(row) {
     // 查询票据
     let docName = app.globalData['routeUrl'][this.data.routeObjName].docName
-    console.log('docName', docName, row);
     if (!docName || !row || !row.id) {
       return;
     }
@@ -491,7 +484,6 @@ module.exports = {
     setTimeout(() => {
       // 校验
       this._validData().then(res => {
-        console.log('_validData', res);
         if (!res) {
           return;
         }
@@ -552,7 +544,6 @@ module.exports = {
                     eventChannel.emit('refresh', {
                       id: 1
                     })
-                    console.log("好像是这里3");
                     wx.navigateBack({
                       delta: 1
                     })
@@ -604,7 +595,6 @@ module.exports = {
         if (this.handleData) {
           this.handleData();
         }
-        console.log('this.data.formMode', this.data.formMode, this.data.navigateBackFlag, this.data.backFlag);
         //是否返回上一页
         if (!this.data.navigateBackFlag) {
           // 非新建页面回到上一个页面
@@ -709,7 +699,6 @@ module.exports = {
         const component = this.selectComponent('#' + this.data.formName);
         if (component && component.validData) {
           let valid = component.validData();
-          console.log('valid', valid);
           if (!valid) {
             resolve(false);
           }
@@ -808,7 +797,6 @@ module.exports = {
       paymentSn: e.tradeNo,
     }
     return this.excute(wechatPayService, wechatPayService.unifiedOrder, params).then(res => {
-      console.log("toPay", res);
       if (res.data.code === Constants.SUCESS_CODE) {
         var appid = res.data.data.appId
         var timeStamp = res.data.data.timeStamp
@@ -825,7 +813,6 @@ module.exports = {
           'signType': 'MD5',
           'paySign': paySign,
           'success': function (res) {
-            console.log('success', res);
             wx.showToast({
               title: '支付成功',
               image: '/static/image/success.png',
@@ -840,21 +827,17 @@ module.exports = {
                 id: 1,
                 backFlag: true
               })
-              console.log("好像是这里4");
               wx.navigateBack({
                 delta: 1
               })
             }
           },
           'fail': function (res) {
-            console.log('fail', res);
             _this.setData({
               loading: false
             })
           },
           'complete': function (res) {
-            // console.log(res);
-            console.log('complete', res);
           }
         });
       }
@@ -867,7 +850,6 @@ module.exports = {
  */
   export() {
     let exportCols = this.data.exportCols;
-    console.log('eee', exportCols);
     if (!exportCols) {
       return;
     }
@@ -903,7 +885,6 @@ module.exports = {
     this.setData({
       loading: true
     })
-    console.log('url', url);
     let _this = this;
     wx.request({
       url: url,
@@ -927,7 +908,6 @@ module.exports = {
       },
       fail: function (err) {
         // reject(err);
-        console.log(error);
         _this.setData({
           loading: false
         })
@@ -943,10 +923,8 @@ module.exports = {
     wx.downloadFile({
       url: url,
       success: function (resd) {
-        console.log('resd', resd);
         if (resd.statusCode == Constants.SUCESS_CODE) {
           const filePath = resd.tempFilePath
-          console.log('filePath', filePath);
           // 说明有值
           if (filePath) {
             that.setData({
@@ -1068,7 +1046,6 @@ module.exports = {
    */
   handleLoadData() {
     let formMode = this.data.formMode;
-    console.log("handleLoadData", formMode);
     formMode = formMode ? formMode : Constants.formMode.index
     let noMore = false;
     // 列表
@@ -1083,7 +1060,6 @@ module.exports = {
       // 编辑
     } else if (formMode == Constants.formMode.edit) {
       let id = this.data.id;
-      console.log("handleLoadData-id", this.data);
       if (id) {
         // 调用明细
         this._detail(id);
@@ -1169,7 +1145,6 @@ module.exports = {
    * @date : 2024/1/22
    */
   onShow() {
-    console.log('t1'); 
     // 新建后关闭新建后刷新页面 
     if (this.data.refreshByAdd) {
       this.searchData();
@@ -1262,7 +1237,6 @@ module.exports = {
           })
         }
         if (data.formItem) {
-          console.log(data.formItem)
           _this.setData({
             formItem: data.formItem
           })
@@ -1325,7 +1299,6 @@ module.exports = {
     var currentPage = pages[pages.length - 1];
     if (!currentPage) return;
     let route = currentPage.route;
-    console.log('formData', formData);
     if (formData && formData != '{}') {
       // 记录缓存
       app.globalData[route] = formData;

package-accounts-manage/pages/acc-verification/acc-verification.js

@@ -153,7 +153,6 @@ Page({
   handleSearchData(tableData) {
     let temp = tableData
     let contentnFootList = this.data.contentnFootList
-    console.log(tableData);
     temp.forEach(it => {
       it.makeTime = it.makeTime.substring(0, 10)
       it.sumAmtReceivableHandle = it.sumAmtReceivableHandle != null ? Number(it.sumAmtReceivableHandle).toFixed(2) : '0.00'
@@ -216,7 +215,6 @@ Page({
   editOrder(e) {
     let item = e
     let id = item.rpId
-    console.log(item.rpType,);
     // 收款
     if (item.rpType == Constants.rpType.receipt) {
       wx.navigateTo({

package-accounts-manage/pages/acc-verification/add/add.js

@@ -136,7 +136,6 @@ Page({
   * @date   : 2024/1/26 11:46
   */
   chooseData(e) {
-    console.log('eee1', e);
     let item = e.detail.data
     let code = e.detail.code
     let formData = JSON.parse(this.data.formData)
@@ -184,11 +183,9 @@ Page({
       formData['staffId'] = item.staffMain.staffId
       formData['staffName'] = item.staffMain.staffName
       formData['staffList'] = item.staffList
-      console.log(item.staffList)
     }
     ///设置主从业务部门
     if (code == 'org') {
-      console.log('item', item)
       formData.org = item.orgItem
       formData['orgId'] = item.orgMain.orgId
       formData['orgName'] = item.orgMain.orgName
@@ -234,7 +231,6 @@ Page({
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
     let data = e.detail.data
-    console.log(e)
       // 优惠金额
       if (code == "sumWaiveAmt") {
         formData.sumWaiveAmt = data
@@ -347,7 +343,6 @@ Page({
     //   msgError = '本次核销金额和本次收款不能同时为0'
     // }
     // 预存+本次收款 + 优惠》= 本次核销
-    console.log('formData',formData)
     if (Number(formData.sumAmtRec)
       + Number(formData.receiptResidue)
       + Number(formData.sumWaiveAmt)

package-accounts-manage/pages/daily-reconciliation-statement/daily-reconciliation-statement.js

@@ -82,7 +82,6 @@ Page({
   handleSearchData(tableData) {
     let temp = tableData
     let contentnFootList = this.data.contentnFootList
-    console.log(tableData);
     temp.forEach(it => {
       it.makeTime = it.makeTime.substring(0, 10)
       it.sumAmtReceivableHandle = it.sumAmtReceivableHandle != null ? Number(it.sumAmtReceivableHandle).toFixed(2) : '0.00'

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

@@ -96,7 +96,6 @@ Page({
    * @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

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

@@ -130,7 +130,6 @@ Page({
       events: {
         // 回调后，在这里给页面赋值
         bandData: function (e) {
-          console.log("toDetail", e);
         }
       },
       success: function (res) {

package-accounts-manage/pages/funds-transfer/add/add.js

@@ -100,7 +100,6 @@ Page({
    * @author : 王英杰
    */
   changeItemNumberField(e){
-    console.log("esad",e);
     let formData = JSON.parse(this.data.formData)
     let sumNub = 0 
     formData.itemList.forEach(element => {
@@ -157,7 +156,6 @@ Page({
    * @author : 王英杰
    */
   setValuesByEdit(data) {
-    console.log("setValuesByEdit", data);
     let formData = JSON.parse(this.data.formData)
     formData = data.data
     formData.accountDate = data.data.accDate
@@ -174,7 +172,6 @@ Page({
    * @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

package-accounts-manage/pages/funds-transfer/detail/detail.js

@@ -75,7 +75,6 @@ Page({
    * @author : 王英杰
    */
   setValuesByEdit(data) {
-    console.log("setValuesByEdit", data);
     let formData = JSON.parse(this.data.formData)
     formData = data.data
     formData.accountDate = data.data.accDate

package-accounts-manage/pages/other-expenditure-orders/add/add.js

@@ -140,7 +140,6 @@ Page({
    * @author : 王英杰
    */
   setValuesByEdit(data) {
-    console.log("setValuesByEdit", data);
     let formData = JSON.parse(this.data.formData)
     let cardList = this.data.cardList
     formData = data.data
@@ -190,7 +189,6 @@ Page({
    * @date   : 2024年3月12日
    */
   chooseData(e) {
-    console.log("t", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
     let cardList_ = this.data.cardList
     let code = e.detail.code

package-accounts-manage/pages/other-expenditure-orders/detail/detail.js

@@ -157,7 +157,6 @@ Page({
   * @author : 王英杰
   */
  setValuesByEdit(data) {
-  console.log("setValuesByEdit", data);
   let  formData = JSON.parse(this.data.formData)
   let cardList = this.data.cardList
   formData = data.data

package-accounts-manage/pages/other-receipt/add/add.js

@@ -192,7 +192,6 @@ Page({
    * @date   : 2024年3月12日
    */
   chooseData(e) {
-    console.log("t", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
     let cardList_ = this.data.cardList
     let code = e.detail.code
@@ -338,8 +337,6 @@ Page({
     params.itemList = itemList //商品明细 
     params.sumAmtReceivable = itemNumber
     params.sumAmtRec = formData.sumAmount 
-    console.log("setParams", params);
-    return params
   },
 
   /**

package-accounts-manage/pages/other-receipt/detail/detail.js

@@ -150,7 +150,6 @@ Page({
    * @author : 王英杰
    */
   setValuesByEdit(data) {
-    console.log("setValuesByEdit", data);
     let formData = JSON.parse(this.data.formData)
     formData = data.data
     data.dataItem.forEach(element => {

package-accounts-manage/pages/other-receipt/other-receipt.js

@@ -163,7 +163,6 @@ Page({
    * @author : 王英杰
    */
   toPoint(e) {
-    console.log("aiqingshishenme", e);
     let item = e.detail.item
     if (item.flgValid) {
       this.setData({

package-accounts-manage/pages/payment-order/add-return/add-return.js

@@ -169,7 +169,6 @@ Page({
       * @date   : 2024年3月12日
       */
   chooseData(e) {
-    console.log("chooseData", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
     let cardList_ = this.data.cardList
     let contentObj = this.data.contentObj
@@ -256,12 +255,10 @@ Page({
     let contentObj = this.data.contentObj
     let objInfo = e.detail.data.objInfo
     let supId = e.detail.data.supId
-    console.log("chooseObjTypeData", e, this.data.formData);
     let params = {
       objectId: supId,
     }
     this.excute(this.data.accountService, this.data.accountService.getPayableAccountItem, params).then(res => {
-      console.log("chooseObjTypeData-res", res);
       formData.cancelAmount = true
       formData.sumWaiveAmt = 0
       formData.payableList = res.data.data
@@ -313,7 +310,6 @@ Page({
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
     let data = -1 * Math.abs(e.detail.data)
-    console.log("changeNumber", code, data, formData);
     // 本次退款金额
     if (code == "sumAmtPay") {
       formData.sumAmtPay = data
@@ -367,7 +363,6 @@ Page({
    * @author : 姜永辉
    */
   setForm(formData, contentObj, payableResidue, paymentResidue, bill) {
-    console.log("app.globalData.user", app.globalData.user);
     if (payableResidue == null) {
       payableResidue = 0
     }
@@ -467,7 +462,6 @@ Page({
   setParams(params) {
     let formData = JSON.parse(this.data.formData)
     if (Number(formData.sumAmtPay) != 0) {
-      console.log("setParams", params);
       return params
     }
     //收付款类型-收款的查询参数

package-accounts-manage/pages/payment-order/add/add.js

@@ -196,7 +196,6 @@ Page({
       * @date   : 2024年3月12日
       */
   chooseData(e) {
-    console.log("chooseData", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
     let cardList_ = this.data.cardList
     let contentObj = this.data.contentObj
@@ -244,7 +243,6 @@ Page({
     let contentObj = this.data.contentObj
     let objInfo = e.detail.data.objInfo
     let supId = e.detail.data.supId
-    console.log("chooseObjTypeData", e, this.data.formData);
     let params = {
       objectId: supId,
     }
@@ -305,7 +303,6 @@ Page({
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
     let data = e.detail.data
-    console.log("changeNumber", code, data, formData);
     // 本次付款金额
     if (code == "sumAmtPay") {
       formData.sumAmtPay = data
@@ -358,7 +355,6 @@ Page({
    * @author : 姜永辉
    */
   setForm(formData, contentObj, payableResidue, paymentResidue, bill) {
-    console.log("app.globalData.user", app.globalData.user);
     if (payableResidue == null) {
       payableResidue = 0
     }

package-accounts-manage/pages/payment-order/detail/detail.js

@@ -105,7 +105,6 @@ Page({
   * @author : 姜永辉
   */
   setValuesByEdit(data) {
-    console.log("setValuesByEdit", data, this.data.item);
     let contentObj = this.data.contentObj
     let formData = { ...this.data.item }
     let form = {}

package-accounts-manage/pages/receipt/add-return/add-return.js

@@ -249,7 +249,6 @@ Page({
    */
   chooseObjTypeData(e) {
     let _this = this
-    console.log("chooseObjTypeData", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
     let contentObj = this.data.contentObj
     let objInfo = e.detail.data.objInfo

package-accounts-manage/pages/receipt/add/add.js

@@ -235,7 +235,6 @@ Page({
    */
   chooseObjTypeData(e) {
     let _this = this
-    console.log("chooseObjTypeData", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
     let contentObj = this.data.contentObj
     let objInfo = e.detail.data.objInfo

package-accounts-manage/pages/receipt/detail/detail.js

@@ -103,7 +103,6 @@ Page({
   * @author : 姜永辉
   */
   setValuesByEdit(data) {
-    console.log("setValuesByEdit", data, this.data.item);
     let contentObj = this.data.contentObj
     let formData = { ...this.data.item }
     let form = {}

package-accounts-manage/pages/receipt/receipt.js

@@ -151,7 +151,6 @@ Page({
   handleSearchData(tableData) {
     let temp = tableData
     let contentnFootList = this.data.contentnFootList
-    console.log(tableData);
     temp.forEach(it => {
       it.makeTime = it.makeTime.substring(0, 10)
       it.sumAmtReceivableHandle = it.sumAmtReceivableHandle != null ? Number(it.sumAmtReceivableHandle).toFixed(2) : '0.00'
@@ -212,7 +211,6 @@ Page({
   editOrder(e) {
     let item = e
     let id = item.rpId
-    console.log(item.rpType,);
     // 收款
     if (item.rpType == Constants.rpType.receipt) {
       wx.navigateTo({

package-accounts-manage/pages/select-account/select-account.js

@@ -15,7 +15,6 @@ Page({
     tableData: []
   },
   toChecked(e) {
-    console.log(e)
     let index = e.currentTarget.dataset.index
     let tableData = this.data.tableData
     tableData.forEach(res => {

package-base-select/pages/select-choose-coordination/select-choose-coordination.js

@@ -38,6 +38,11 @@ Page({
           title: mixins.$t("skuName"),
         },
         {
+          code: 'costPrice', 
+          type: 'number',
+          title: mixins.$t("costPrice")
+        },
+        {
           code: 'itemQty',
           required: true,
           type: 'number',
@@ -50,17 +55,12 @@ Page({
           required: true,
           type: 'number',
           title: mixins.$t("salePrice")
-        },
-        {
-          code: 'costPrice', 
-          type: 'number',
-          title: mixins.$t("costPrice")
-        },
+        }, 
         {
           code: 'itemAmt',
           readonly: true,
           type: 'number',
-          title: mixins.$t("amount")
+          title: mixins.$t("saleAmt")
         },
         {
           code: 'remarks',
@@ -72,7 +72,6 @@ Page({
 
   },
   chooseData(e) {
-    console.log(e)
   },
   /**
    * @desc : number输入事件
@@ -108,7 +107,6 @@ Page({
    */
   saveData() {
     let formData = JSON.parse(this.data.formData)
-    console.log(formData.itemList) 
     formData.itemList.forEach(res => {
       if (this.data.item == Constants.billType.saleOut) {
         res['priceOut'] = res.itemPrice
@@ -119,7 +117,8 @@ Page({
         res['priceSale'] = res.itemPrice 
         res['sumPrice'] = res.itemAmt
         res['priceStd'] = 0
-      }
+        res['costAmt'] = Number( res['costPrice']) * Number(res['itemQty']  )
+      } 
       res['brandName'] =  res['supName']+"(外协)"
     }) 
     const eventChannel = this.getOpenerEventChannel();
@@ -139,7 +138,6 @@ Page({
   loadInit(options) {
     // let formData = JSON.parse(this.data.formData)
     // let itemList = JSON.parse(formData.itemList)
-    // console.log('itemList',itemList)
     // itemList[0]['itemQty'] = 1
     // itemList[0]['itemSale'] = 1
     // itemList[0]['itemAmt'] = 0

package-base-select/pages/select-choose-coordination/select-choose-coordination.wxml

@@ -5,7 +5,7 @@
 
 
 
-<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objIdCol=""  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}"  bind:chooseData="chooseData" bind:changeItemNumberField ="changeItemNumberField" readonly="{{false}}" bind:changeNumber="changeNumber" bind:delItem= "delItem"  >
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" objIdCol=""  cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}"  bind:chooseData="chooseData" bind:changeItemNumberField ="changeItemNumberField" readonly="{{false}}" bind:changeNumber="changeNumber" bind:delItem= "delItem" itemBtn= "{{$t['addOutsourcedGoods']}}"  >
 </dk-form-more-items>     
 <view style="height: 200rpx;"></view>
 

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

@@ -85,7 +85,6 @@ Page({
           min: -99999999
         })
     }
-    console.log('ffdd', this.negative, this.data.min, formType);
   },
   /**
    * @desc :  处理接口返回数据
@@ -471,26 +470,26 @@ Page({
       params.sumAmtReceivable = itemNumber //合计应收
       params.sumAmtRec = form.sumAmount
     } else if (this.data.formType == 8) { //订单开单收款 
+      // let formData = JSON.parse(this.data.formData)
+      let formData = this.data.form
+      params = formData
+      params.sumAmtRec = Number(params.sumAmtRec)
+      let itemIndex = Number(1)
       tableData.forEach(item => {
         itemList.push({
+          itemIndex: itemIndex++,
           amtRec: item.sumAmount,
           balance: item.balance,
           macCode: item.macCode,
           macId: item.macId,
           macName: item.macName,
         })
-      }) 
-    //客户收款保存参数
-    params.sumAmtRec = Number(itemList.sum('amtRec'))
-    params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
-    // 240521 最佳客户信息
-    params.cusName = form.objInfo.cusName
-    params.cusPhone = form.objInfo.cusPhone
-    params.addressArea = form.addressArea
-    params.addressFull = form.addressFull
-    params.addressGcj02 = form.addressGcj02
-    params.addressName = form.addressName
-    params.addressNo = form.addressNo  
+      })
+      params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
+      params.receiptList = itemList
+      params.sumAmount = this.data.sumAmountSocial
+      delete params['sumAmtPay']
+      delete params['sumAmtRec']
     } else if (this.data.formType == 9) { //其他支出
       let formData = JSON.parse(this.data.formData)
       //收付款类型-收款的查询参数
@@ -618,9 +617,9 @@ Page({
       params.itemListRecPayItemVO = itemListRecPayItemVO
     }
 
-    // if (this.data.formType !== 8) { 订单开单变成客户收款了 也就不限制了
-      params.itemList = itemList
-    // }
+      if (this.data.formType !== 8) {  
+       params.itemList = itemList
+      }
     return params
   },
 
@@ -656,7 +655,7 @@ Page({
       return this.excute(this.data.otherReceivableService, this.data.otherReceivableService.insert, this.data.params)
     } else if (this.data.formType == 8) {
       if (this.data.form.updateFlag) {
-        return this.excute(this.data.receiptPaymentService, this.data.receiptPaymentService.insertReceipt, this.data.params);
+        return this.excute(this.data.orderService, this.data.orderService.update, this.data.params);
       } else {
         return this.excute(this.data.orderService, this.data.orderService.insert, this.data.params);
       }
@@ -799,6 +798,13 @@ Page({
         })
         // this.calculationScale(tableData)
       }
+      if (settlementTypeListLength.length ==0) {
+        let form = this.data.form
+        form.sumAmount = this.data.sumAmt
+        this.setData({
+          form:form
+        })
+      }
       this.setData({
         tableData: tableData,
         settlementTypeListLength: settlementTypeListLength.length //已选数量
@@ -829,7 +835,6 @@ Page({
     } else { //数据取余2不为0
       //获取最后选中checkbox数组中最后一个元素
       let endList = tableData.splice(-1)
-      console.log('endList', endList)
       for (let i = 0; i < tableData.length; i++) {
         allocationRatioTotal = Number(allocationRatioTotal + Number(sumAmountIndexItem))
         tableData[i]['sumAmount'] = Number(sumAmountIndexItem).toFixed(2)

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

@@ -32,7 +32,6 @@ Page({
  * @author : 于继渤
  */
   handleSearchData(tableData) {
-    console.log(tableData);
     if (tableData && tableData.length > 0) {
       tableData.forEach(item => {
         item.receivableResidue = item.receivableResidue ? Number(item.receivableResidue) : 0
@@ -51,7 +50,6 @@ Page({
    * @date : 2024/2/21 12:16
    */
   chooseData(e) {
-    console.log('ff', e);
     let index = e.currentTarget.dataset.index
     let tableData = this.data.tableData
     tableData.forEach(res => {
@@ -95,7 +93,6 @@ Page({
     // 接收父页面传递的参数
     const eventChannel = this.getOpenerEventChannel()
     eventChannel.on('params', function (data) {
-      console.log('params', data)
       if (data) {
         this_.setData({
           urlKeyParam: data.data

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

@@ -112,11 +112,9 @@ Page({
    * @date : 2024/3/25 15:16
    */
   chooseData(e) {
-    console.log('eerere', e);
     let list = e.detail.list;
     let item = e.detail.item;
     let valueKey = this.data.valueKey;
-    console.log('valueKey', valueKey);
     if (!valueKey) {
       this.setData({
         choosedData: list
@@ -218,7 +216,6 @@ Page({
   _toDetail(item) {
     // 读取传入的单据类型
     let route = this.data.chooseRoute
-    console.log('dddf', route);
     let data = {}
     switch (route.type) {
       // 部门
@@ -399,7 +396,6 @@ Page({
     }
     //跟据色号公司skuid判断库存
     if (chooseType == Constants.chooseType.inventorySku) {
-      console.log('globalData', app.globalData)
 
       params.skuId = this.data.item.skuId
       params.nonStdCode = this.data.item.nonStdCode
@@ -437,7 +433,6 @@ Page({
    * @author : 周兴
    */
   getData(params) {
-    console.log('this.data.routeObjName', this.data.method)
     let service = app.globalData[this.data.routeObjName + 'Service'];
     return this.excute(service, service[this.data.method], params);
   },
@@ -578,7 +573,6 @@ Page({
     var query = wx.createSelectorQuery();
     query.select('#stickyView').boundingClientRect(function (rect) {
       var height = rect.height; // 获取元素的高度
-      console.log('元素的高度: ' + height + 'px');
       _this.setData({
         heightList: height + 20
       })
@@ -1098,7 +1092,6 @@ Page({
     let choosedData = this.data.choosedData
     tableData.forEach(item => {
       if (addItem && valueKey) {
-        console.log('item', item);
         if (item[valueKey] == addItem[valueKey]) {
           item.checked = true;
           choosedData.push({ ...item });
@@ -1109,7 +1102,6 @@ Page({
         item.decimalPlacesStr = '小数：' + item.decimalPlaces
       }
     })
-    console.log('tableData', tableData);
     this.setData({
       tableData: tableData,
       choosedData: choosedData

package-base-select/pages/select-functional-permissions/select-functional-permissions.js

@@ -23,7 +23,6 @@ Page({
  * @author : 于继渤
  */
   onChangeSwitch(e) {
-    console.log(e)
     let formData = this.data.formData
     let tableData = this.data.tableData
     formData.checked = e.detail
@@ -222,7 +221,6 @@ Page({
     })
     //功能权限跳转编辑
     let  list = tableDataWXPTemp.concat(tableDataWEBTemp)
-    console.log('list',list)
     if (this.data.formType == Constants.formMode.edit || this.data.formType == Constants.formMode.add) {
       //调用接口修改权限
       let formData = this.data.formData

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

@@ -121,7 +121,6 @@ Page({
    * @author : 姜永辉
    */
   popupChangeCheckBox(e) {
-    console.log('popupChangeCheckBox', e);
     let dataItem = JSON.parse(this.data.dataItem)
     if (e.detail.flag) {
       // 是否弹出询问框
@@ -172,7 +171,6 @@ Page({
       billType: this.data.item
     })
     //销售选品
-    console.log(this.data.item)
     this.getDefChannel() //获取默认渠道
     if (this.data.item == Constants.billType.sale || this.data.item == Constants.billType.saleOut || this.data.item == Constants.billType.saleOutReturn) {
       let buttonList = this.data.buttonList
@@ -515,7 +513,6 @@ Page({
     let key = e.detail.key
     let value = e.detail.value
     let dataItem = JSON.parse(this.data.dataItemChangePrice)
-    console.log('value', value);
     dataItem[key] = value
     this.setData({
       dataItemChangePrice: JSON.stringify(dataItem)
@@ -527,7 +524,6 @@ Page({
     * @date   : 2024/2/2 11:46
     */
    blurNumPriceberField(e) {
-    console.log("blurNumberField", e);
     let dataItem = JSON.parse(this.data.dataItemChangePrice)
     let key = e.detail.key
     dataItem[key] = e.detail.value
@@ -569,7 +565,6 @@ Page({
    * @author : 于继渤
    */
   openChooseItemInfo(e) {
-    console.log(e)
     let item = e.currentTarget.dataset.item
     let index = e.currentTarget.dataset.index
     let popChangePrice =  [{
@@ -618,7 +613,6 @@ Page({
    * @author : 于继渤
    */
   changeSidebar(e) {
-    console.log(e.detail)
     let index = e.detail
     let typeList = this.data.typeList
     this.setData({
@@ -709,7 +703,6 @@ Page({
    * @author : 于继渤
    */
   getData(params) {
-    console.log('fff', this.data.item);
     if (this.data.item == Constants.billType.sale) {
       return this.excute(this.data.commonService, this.data.commonService.getGoodsForOrderByPage, params);
     } else if (this.data.item == Constants.billType.out || this.data.item == Constants.billType.purReturn || this.data.item == Constants.billType.inventory) {
@@ -768,7 +761,6 @@ Page({
         tableData.forEach(item => {
           if (item.skuImages && item.skuImages.value) {
             item.skuImages.value = JSON.parse(item.skuImages.value)
-            console.log('item.skuImages.value', item.skuImages.value[0].url)
             item['imagesUrl'] = item.skuImages.value.length > 0 ? item.skuImages.value[0].url : null
           }
         })
@@ -824,7 +816,6 @@ Page({
    * @author : 于继渤
    */
   delChoosedGoodsItem(e) {
-    console.log('delChoosedGoodsItem', e)
     let index = e.currentTarget.dataset.index
     let choosedGoodsList = this.data.choosedGoodsList
     choosedGoodsList.splice(index, 1)
@@ -854,23 +845,18 @@ Page({
    * @author : 于继渤
    */
   openAddItemInfo(e) {
-    console.log('openAddItemInfo', e)
     let item = e.currentTarget.dataset.item
     item.itemQty = 1 //打开 popur 数量默认为1
     // item.nonStdCode = "-" //不要在这赋值色号 想赋值去查询回来处理的方法去赋值
     if (this.data.item == Constants.billType.saleOut || this.data.item == Constants.billType.saleOutReturn || this.data.item == Constants.billType.out) { //跟进仓库批次号cpid 查询库存
-      console.log('globalData', app.globalData)
       item.nonStdCode = item.nonStdCode ? item.nonStdCode : '-'
       item.priceOut = item.priceStandard
-      console.log(app.globalData)
       this.getInventory({
         skuId: item.skuId,
         cpId: app.globalData.company.cpId,
         nonStdCode: item.nonStdCode,
       }).then(it => {
         if (it.length > 0) {
-          console.log('invId', it[0].invId)
-          console.log('invQty', it[0].invQty)
           item.invId = it[0].invId
           item.invQty = it[0].invQty
           item.usableQty = it[0].usableQty
@@ -881,7 +867,6 @@ Page({
         }
 
       })
-      console.log('item', item)
     } else {
       item.invQty = 0
       item.usableQty = 0
@@ -995,7 +980,6 @@ Page({
    * @date   : 2024/1/26 11:46
    */
   openPackageBox(e) {
-    console.log("openPackageBox-", e);
     let dataItem = JSON.parse(this.data.dataItem)
     //采购入库 销售退货  销售出库
     if (this.data.item == Constants.billType.sale ||
@@ -1033,7 +1017,6 @@ Page({
    * @date   : 2024/2/2 11:46
    */
   changeField(e) {
-    console.log("changeField", e);
     let dataItem = JSON.parse(this.data.dataItem)
     dataItem[e.detail.key] = e.detail.name
     this.setData({
@@ -1046,7 +1029,6 @@ Page({
    * @date   : 2024/2/2 11:46
    */
   blurNumberField(e) {
-    console.log("blurNumberField", e);
     let key = e.detail.key //pop里 修改项的 code
     let dataItem = JSON.parse(this.data.dataItem)
     // 采购订单
@@ -1091,7 +1073,6 @@ Page({
    * @author : 于继渤
    */
   changeStep(e) {
-    console.log("changeStep", e);
     let dataItem = JSON.parse(this.data.dataItem)
     let key = e.detail.key
     let value = e.detail.value
@@ -1149,7 +1130,6 @@ Page({
     return new Promise((resolve, reject) => {
       this.excute(this.data.commonService, this.data.commonService.getInventory, params).then(res => {
         if (res.data.code == 200) {
-          console.log(res.data.data)
           resolve(res.data.data)
 
         }
@@ -1227,7 +1207,6 @@ Page({
     this.setData({
       choosedGoodsList: choosedGoodsList
     })
-    console.log("choosedGoodsList", choosedGoodsList);
     //销售订单需要计算底部按钮
     if (this.data.item == Constants.billType.sale || this.data.item == Constants.billType.saleOut || this.data.item == Constants.billType.saleOutReturn|| this.data.item == Constants.billType.inventory ) {
       this.calculateParameters()
@@ -1368,7 +1347,6 @@ Page({
     return this.excute(this.data.commonService, this.data.commonService.getGoodsBrandNoPage, {
       flgValid: true
     }).then(res => {
-      console.log('getGoodsBrandNoPage', res.data.data)
       this.setData({
         typeList: this.data.typeList.concat(res.data.data)
       })

package-base-select/pages/select-goods/select-goods.wxml

@@ -419,4 +419,4 @@
 </dk-single-dropdown-item>
 
 <!-- 修改已选商品金额 和单价 -->
-<dk-popup type="basic" title="修改价格" value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}" bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField"></dk-popup>
+<dk-popup type="basic" title="修改价格" value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}" bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField"stepperDecimal="decimalPlaces"></dk-popup>

package-base-select/pages/select-master-slave/select-master-slave.js

@@ -119,7 +119,6 @@ Page({
     let item = e.detail
     let idKey = this.data.idKey
     let nameKey = this.data.nameKey
-     console.log("toMulti",e.detail);
      let ids = []
      let names = []
      e.detail.list.forEach(item => { 

package-base-select/pages/select-product-types/select-product-types.js

@@ -37,7 +37,6 @@ Page({
         // 1 先过滤出数据
         let childs = tableDataSocial.filter(it => it.catName.indexOf(searchText) >= 0);
         let returnTable = []
-        console.log('childs',childs);
         // 如果查到，需要查出其父级
         if (childs && childs.length > 0) {
           let filters = null;
@@ -77,7 +76,6 @@ Page({
   * @author : 于继渤
   */ 
   clickName(e) {
-    console.log("clickName回调", e)
     const eventChannel = this.getOpenerEventChannel();
     eventChannel.emit('bindData', { data: { id: e.detail.id, name: e.detail.name } })
     wx.navigateBack({

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

@@ -18,7 +18,6 @@ Page({
      * @author : 于继渤
      */
   onChangeSwitch(e) {
-    console.log(e)
     let formData = this.data.formData
     let tableData = this.data.tableData
     formData.checked = e.detail
@@ -45,13 +44,11 @@ Page({
      * @author : 于继渤
      */
   onCheckedItem(e) {
-    console.log(e)
     let _that = this
     let index = e.currentTarget.dataset.index
     let tableData = _that.data.tableData
     tableData[index].checked = !tableData[index].checked
     if (tableData[index].children && tableData[index].children.length > 0) {
-      console.log('list[index].children', tableData[index].children)
       tableData[index].children.forEach(res => {
         res.checked = tableData[index].checked
       })
@@ -195,7 +192,6 @@ Page({
     const eventChannel = this.getOpenerEventChannel()
     eventChannel.on('params', function (data) {
       let formData = that.data.formData
-      console.log(data)
       formData.roleName = data.item ?  data.item.roleName : data.roleName
       formData.roleId= data.item ?  data.item.roleId : data.roleId
       that.setData({

package-base-select/pages/select-source-purchase-order/select-source-purchase-order.js

@@ -42,7 +42,6 @@ Page({
    * @author : 于继渤
    */
   onListItemChange(e) {
-    console.log(e)
     let tableData = this.data.tableData
     let index = e.currentTarget.dataset.index
     tableData.forEach(item=>{
@@ -74,7 +73,6 @@ Page({
     let tableData = this.data.tableData
     let index = e.currentTarget.dataset.index
     let index_ = e.currentTarget.dataset.index_
-    console.log(index, index_)
     tableData.forEach(item=>{
       item.checked = false
       item.inboundItemList.forEach(it => {
@@ -96,7 +94,6 @@ Page({
     * @author : 于继渤
     */
   onCheckboxChange(e) {
-    console.log(e.detail.checked)
     let checked = e.detail.checked
     let tableData = this.data.tableData
     tableData.forEach(res => {

package-base-select/pages/select-source-sale-order/select-source-sale-order.js

@@ -97,8 +97,6 @@ Page({
     let tableData = this.data.tableData
     let index = e.currentTarget.dataset.index
     let index_ = e.currentTarget.dataset.index_
-    console.log(index, index_)
-
     tableData[index].orderItemResponseList[index_].checked = e.detail
     let itemlist = tableData[index].orderItemResponseList
     let allChecked = true
@@ -127,7 +125,6 @@ Page({
     * @author : 于继渤
     */
   onCheckboxChange(e) {
-    console.log(e.detail.checked)
     let checked = e.detail.checked
     let tableData = this.data.tableData
     tableData.forEach(res => {
@@ -226,7 +223,6 @@ Page({
           const element = res.orderItemResponseList[indext];
           if (element.checked) {
             flg = true
-            console.log(cusId, res.cusId, addressFull, res.addressFull);
             if ((cusId != '' && cusId != res.cusId)
               || (addressFull != '' && addressFull != res.addressFull)) {
               util.showToast('不同客户，不同地址订单不能同时出库');

package-base-select/pages/select-source-sale-order/select-source-sale-order.wxss

@@ -1,8 +1,7 @@
 .fontSizeStyle {
   font-size: 15px;
 }
-
-
+ 
 
 
 .choose-item {
@@ -61,7 +60,9 @@
   border-radius: 15rpx;
   box-shadow: 2px 2px 5px #bbb7b7;
 }
-
+.van-checkbox__icon{
+  border: 1px solid var(--checkbox-border-color,rgb(141, 139, 139)) !important;
+}
 .top-class-2 {
   flex-direction: column;
   justify-content: center;

package-base-select/pages/select-source-sale-out-order/select-source-sale-out-order.js

@@ -89,25 +89,26 @@ setSearchParams(params) {
     let tableData = this.data.tableData
     let index = e.currentTarget.dataset.index
     let index_ = e.currentTarget.dataset.index_
-    console.log(index, index_)
-    tableData.forEach(res=>{
-      res.checked =  false
-      // res.goodsList.forEach(item=>{
-      //   item.checked = false
-      // })
-    })
-    tableData.forEach(item=>{
-      item.checked = false
-      item.goodsList.forEach(it => {
-        it.checked = false
-      })
-    })
+    for (let i = 0; i < tableData.length; i++) {
+        if(i != index){
+          tableData[i].checked = false
+          tableData[i].goodsList.forEach(it => {
+            it.checked = false
+          })
+        }
+    }
     tableData[index].goodsList[index_].checked =  e.detail
-
+    let checkedList =  tableData[index].goodsList.filter(res=>{
+      return res.checked
+    })
+    if(checkedList.length == tableData[index].goodsList.length){
+      tableData[index].checked = true
+    }else{
+      tableData[index].checked = false
+    }
     this.setData({
       tableData: tableData
     })
-
     this.calculateTotal()
   },
 
@@ -117,7 +118,6 @@ setSearchParams(params) {
     * @author : 于继渤
     */
   onCheckboxChange(e) {
-    console.log(e.detail.checked)
     let checked = e.detail.checked
     let tableData = this.data.tableData
     tableData.forEach(res => {

package-base-select/pages/select-source-sale-out-order/select-source-sale-out-order.wxss

@@ -3,7 +3,9 @@
 }
 
 
-
+.van-checkbox__icon{
+  border: 1px solid var(--checkbox-border-color,rgb(141, 139, 139)) !important;
+}
 
 .choose-item {
   display: flex;

package-base-select/pages/select-staff-purview/select-staff-purview.js

@@ -93,7 +93,6 @@ Page({
         tableData: util.convertToChildren(tableData),
         flgNolimit: (tableData != null && tableData.length > 0) ? tableData[0].flgNolimit : false
       })
-      console.log(this.data.tableData,"tableData");
       return
     }
     let item = this.data.typeList[this.data.sideKey];
@@ -102,7 +101,6 @@ Page({
       tableData.forEach(it => {
         it.menuName = it.channelName
       })
-      console.log('tableData', tableData);
       this.setData({
         tableData: tableData,
         flgNolimit: (tableData != null && tableData.children) ? tableData[0].flgNolimit : false
@@ -113,7 +111,6 @@ Page({
       tableData.forEach(it => {
         it.menuName = it.staffName
       })
-      console.log(tableData[0],tableData != null && tableData.length > 0,"制单员");
       this.setData({
         tableData: tableData,
         flgNolimit: (tableData != null && tableData.length > 0) ? tableData[0].flgNolimit : false

package-base-select/pages/web-view-select/web-view-select.js

@@ -30,7 +30,6 @@ Page({
         that.setData({
           url: data + '&uuid=' + uuid
         })
-        console.log('data', that.data.url);
 
         var timesRun = 0;
         var interval = setInterval(function () {
@@ -50,13 +49,11 @@ Page({
    * @param {*} url 
    */
   downloadFile(url) {
-    console.log('url', url);
     let that = this
     wx.downloadFile({
       url: url,
       fileType: 'pdf',
       success: function (resd) {
-        console.log('resd', resd);
         if(resd.statusCode == 200){
           const filePath = resd.tempFilePath
           // 说明有值

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

@@ -107,7 +107,6 @@ Page({
      * @date : 2024/5/17
      */
     handleChangeCheckbox(e) {
-        console.log('ee', e);
         this.setData({
             readFlag: e.detail
         })
@@ -196,7 +195,6 @@ Page({
             // vip报表
             if (this.data.chooseVipFlag && vipTable && vipTable.length > 0) {
                 let vipItem = vipTable[0]
-                console.log('vipItem.wxPrice', vipItem.wxPrice);
                 summaryInfo.amountInfo += ' + ' + vipItem.wxPrice + '(元/VIP) ';
                 summaryInfo.amountInfo = '( ' + summaryInfo.amountInfo + ' ) ';
                 amount += vipItem.wxPrice;
@@ -300,7 +298,7 @@ Page({
         } else {
             // 判断数量是否超出续约授权
             if (currentUserCount.wxNum > summaryInfo.wxMaxNum || currentUserCount.webNum > summaryInfo.webMaxNum) {
-                let staffInfo = [{ wxMaxNum: this.data.wxMaxNum, webMaxNum: this.data.webMaxNum, title: '当前授权', wxTitle: '手机授权', webTitle: (app.globalData.company.gradeCode == Constants.gradeCode.STD) ?'':'电脑授权', code: 'current',userTitle: '当前用户'  }, { wxMaxNum: summaryInfo.wxMaxNum, webMaxNum: summaryInfo.webMaxNum, title: '续费授权', wxTitle: '手机授权', webTitle: '电脑授权', code: 'renew' }]
+                let staffInfo = [{ wxMaxNum: this.data.wxMaxNum, webMaxNum: this.data.webMaxNum, title: '当前授权', wxTitle: '手机授权', webTitle: (app.globalData.company.gradeCode == Constants.gradeCode.STD) ? '' : '电脑授权', code: 'current', userTitle: '当前用户' }, { wxMaxNum: summaryInfo.wxMaxNum, webMaxNum: summaryInfo.webMaxNum, title: '续费授权', wxTitle: '手机授权', webTitle: '电脑授权', code: 'renew' }]
                 this.save({ saveFlag: false, url: '/package-basic-data/pages/activity/detail/detail?staffInfo=' + JSON.stringify(staffInfo) });
             } else {
                 this.save({});
@@ -363,7 +361,6 @@ Page({
         let summaryInfo = this.data.summaryInfo
         let curentAdItem = this.data.curentAdItem
         let cpEndDate = this.data.cpEndDate
-        console.log('summaryInfo', summaryInfo);
         if (!summaryInfo || !cpEndDate) return;
         params.endDate = summaryInfo.endDate
         params.userEndDate = summaryInfo.userEndDate
@@ -422,7 +419,6 @@ Page({
             if (res.data.code == Constants.SUCESS_CODE) {
                 if (res.data && res.data.data) {
                     let currentUserCount = res.data.data;
-                    console.log('currentUserCount', currentUserCount);
                     this.setData({
                         currentUserCount: currentUserCount,
                         //服务器的时间 
@@ -514,7 +510,6 @@ Page({
                 }
             }
             summaryInfo.buyBeginDate = this.data.currentDate.toDateStr();
-            console.log('summaryInfo', summaryInfo.userEndDate, endDate, months);
 
             this.setData({
                 summaryInfo: summaryInfo
@@ -527,7 +522,6 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-        console.log('options', options, app.globalData);
         // 升级
         if (options && options.upgrade) {
             wx.setNavigationBarTitle({
@@ -538,9 +532,17 @@ Page({
                 upgradeFlag: true
             })
         } else {
-            wx.setNavigationBarTitle({
-                title: mixins.$t('reNew'),
-            })
+            // 购买授权 和续费
+            if (options.buyUser) {
+                wx.setNavigationBarTitle({
+                    title: mixins.$t('buyUser'),
+                })
+            } else {
+                wx.setNavigationBarTitle({
+                    title: mixins.$t('reNew'),
+                })
+            }
+
             this.setData({
                 gradeCode: app.globalData.company.gradeCode
             })

package-basic-data/pages/activity/activity.wxml

@@ -14,7 +14,7 @@
 				<view class="staff-class">{{cpManager + (cpPhone?(' | ' + cpPhone):'')}}</view>
 				<view class="end-date-class" wx:if="{{gradeCode != 'STD' && !upgradeFlag}}">{{$t['cpEndDate'] + '：' + cpEndDate}}</view>
 				<view class="staff-count-class" wx:if="{{gradeCode != 'STD'}}">{{'手机端授权：' + wxMaxNum + '个，电脑端授权' + (webMaxNum?webMaxNum:0) + '个' }}</view>
-				<view class="staff-count-class" wx:if="{{gradeCode == 'STD'}}">{{'手机端授权：' + wxMaxNum + '个(额外购买)'}}</view>
+				<view class="staff-count-class" wx:if="{{gradeCode == 'STD'}}">{{'手机端授权：' + (wxMaxNum + 1) + '个(含1个免费授权)'}}</view>
 			</view>
 		</view>
 	</view>

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

@@ -103,7 +103,6 @@ Page({
     })
     if (dictCode == mixins.$t('warehouseSys')) {//仓库档案
       //设置新建编辑字段
-      console.log('dictCode', dictCode)
       if (dataItem) {
         popContent =
           [
@@ -141,7 +140,6 @@ Page({
       }
 
       routeObjNameGoTo = 'warehouse'
-      console.log('popContent', popContent)
     } else if (dictCode == mixins.$t('saleChannelSys')) {
       //设置新建编辑字段
       if (dataItem) {
@@ -365,7 +363,6 @@ Page({
     } else {
       // 专业版需要判断是否有账户
       this.excute(this.data.service, this.data.service.countByCondMoneyAccount + '/' + dataId, {}).then(res => {
-        console.log(res, service)
         if (res.data.code == 200) {
           if (res.data.data > 0 && item.flgValid) {
             //提示信息
@@ -512,7 +509,6 @@ Page({
   getDataKind() {
     // 读取系统字典
     let sidebarList = app.globalData.dataKindList.filter(it => it.kindType == Constants.kindType.basicData)
-    console.log('gradeCode', this.data.gradeCode);
     if (this.data.gradeCode == Constants.gradeCode.STD) {
       sidebarList = sidebarList.filter(it => (it.kindCode == '基础资料-仓库' || it.kindCode == '基础资料-账户' ||
         it.kindCode == '基础资料-入库' ||  it.kindCode == '基础资料-出库' || it.kindCode == '基础资料-渠道'))
@@ -624,7 +620,6 @@ Page({
       });
     } else { //新建
       this.isFlgDefaultSave(service).then(it => {
-        console.log(it, params)
         if (!it && params.flgDefault) {
           //存在默认
           Dialog.confirm({
@@ -687,7 +682,6 @@ Page({
       message: '已存在默认，是否要新作默认',
     }).then(() => {
       this.excute(service, service.update, params).then(res => {
-        console.log(res)
         if (res.data.code === Constants.SUCESS_CODE) {
           wx.showToast({
             title: '保存成功',
@@ -699,7 +693,6 @@ Page({
         }
       })
     }).catch(() => {
-      console.log('setFormNull')
       //清除组件数据
       this.setData({
         dataItem: null

package-basic-data/pages/beginner-guide/beginner-guide.js

@@ -59,7 +59,6 @@ Page({
     let stepsItems = this.data.stepsItems
     let stepsText = this.data.stepsText
     let index = e.currentTarget.dataset.index
-    console.log(e.currentTarget.dataset.index)
     steps.forEach(res => {
       res.status = 0
     })
@@ -233,8 +232,6 @@ Page({
    */
   openBeginnerGuide(e) {
     let item = e.currentTarget.dataset.item
-    console.log('演示教程', item)
-
 
     this.setData({
       loading: true

package-basic-data/pages/customer-follow-up/customer-follow-up.js

@@ -131,7 +131,6 @@ Page({
      * @author : 于继渤
      */
   setValuesByEdit(data) {
-    console.log(data)
     let radioFollowUp = '1'
     if (data.followStatus == '跟进状态-跟进') {
       radioFollowUp = '1'

package-basic-data/pages/customer-list/detail/detail.js

@@ -35,6 +35,7 @@ Page({
     activeCard: null,
     // 主键Id
     primaryKey: 'cusId',
+ 
     // 是否标准版
     flgStd: app.globalData.company.gradeCode == Constants.gradeCode.STD ? true : false,
   },
@@ -46,7 +47,6 @@ Page({
   handleExpandItem(e) {
     let type = e.currentTarget.dataset.type
     let index = e.currentTarget.dataset.index
-    console.log('type', type);
     // 销售退货
     if (type == 'order-return') {
       let orderOutReturnList = this.data.orderOutReturnList;
@@ -63,7 +63,6 @@ Page({
       })
     }
     else if (type == 'order') {
-      console.log(type,this.data.orderList);
       // 销售訂單
       let orderList = this.data.orderList;
       orderList[index].showOrderDetailFlag = !orderList[index].showOrderDetailFlag
@@ -105,7 +104,6 @@ Page({
         this.setData({
           loading: false
         })
-        console.log('getCusFollowList', res.data.data)
         let list = res.data.data
         let followList = []
         for (let i = 0; i < list.length; i++) {
@@ -447,6 +445,33 @@ Page({
       }
     })
   },
+
+/**
+   * @desc : 跳转查看销售订单源单
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  toOrderDetail(e){
+    let item = e.currentTarget.dataset.item
+    this.setData({
+      selectflag: true
+    })
+    let route = this.data.route
+    let that = this
+    wx.navigateTo({
+      url: route.orderDetail.url,
+      events: {
+        // 保存成功后刷新页面
+        refresh: function (data) {
+        
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', { id: item.orderId, item:item, formMode: Constants.formMode.other,formReturnMode:'customer' })
+      }
+    })
+  },
   /**
    * @desc : 初始加载
    * @date : 2024/5/24 15:49

package-basic-data/pages/customer-list/detail/detail.wxml

@@ -77,9 +77,10 @@
 
       <view class="number" style="margin-left: 0; margin-right: 0;">
         <view class="order-summary">
-          <!--标准版（应收 - 收款）-->
-          <dk-cell wx:if="{{gradeCode == 'STD'}}" center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{(item.orderAmount - item.receiptResidue > 0) ? (item.orderAmount - item.receiptResidue) : 0}}">
+          <!--标准版 客户欠款 = 订单金额+退货金额-收款金额-->
+          <dk-cell wx:if="{{gradeCode == 'STD'}}" center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{((item.orderAmount?item.orderAmount:0) - (item.receiptResidue?item.receiptResidue:0) + (item.outboundReturnAmount ? item.outboundReturnAmount : 0 ) > 0) ? ((item.orderAmount?item.orderAmount:0) - (item.receiptResidue?item.receiptResidue:0) + (item.outboundReturnAmount ? item.outboundReturnAmount : 0 )) : 0}}">
           </dk-cell>
+          <!--专业版（应收 - 收款） -->
           <dk-cell wx:else center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.receivableResidue ? item.receivableResidue : 0}}">
           </dk-cell>
         </view>
@@ -212,8 +213,15 @@
             <view class="dk-card-outer-class">
               <view class="dk-card-class">
                 <view style="display:flex;padding: 2vw;">
-                  <image style="width:20px;height:20px;" src="{{imageUrl + 'customer_detail_icon_04.png'}}"> </image>
-                  <view style="font-weight:bold;font-size: 13px;white-space:nowrap;align-self:center;margin-left: 20rpx;">{{item.orderNo}}
+                  <view style="display: flex;width: 70%;">
+                    <image style="width:20px;height:20px;" src="{{imageUrl + 'customer_detail_icon_04.png'}}"> </image>
+                    <view style="font-weight:bold;font-size: 13px;white-space:nowrap;align-self:center;margin-left: 20rpx;">{{item.orderNo}}
+                    </view>
+                  </view>
+
+                  <view style="color: #00A7B5;font-size: 13px;align-items:center;display: flex;justify-content: flex-end;width: 30%;" bindtap="toOrderDetail" data-item="{{item}}">
+                    <view>查看原单 </view>
+                    <van-icon name="arrow" />
                   </view>
                 </view>
                 <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
@@ -308,8 +316,8 @@
                   <image style="width:20px;height:20px;" src="{{imageUrl + 'customer_detail_icon_04.png'}}"> </image>
                   <view style="font-weight:bold;font-size: 13px;white-space:nowrap;align-self:center;margin-left: 20rpx;">{{item.outNo}}
                   </view>
-                  <view  class="status-class" >
-                    <view class="status-detail-class"  > {{item.outStatusName}}
+                  <view class="status-class">
+                    <view class="status-detail-class"> {{item.outStatusName}}
                     </view>
                   </view>
                 </view>

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

@@ -172,7 +172,6 @@ Page({
       radioFollowUp: detail,
       formData: null
     })
-    console.log('onRadioFollowUp', e.detail)
   },
   /**
   * @desc : 跳转购物车
@@ -195,8 +194,6 @@ Page({
    * @author : 于继渤
    */
   setValuesByEdit(data) {
-    console.log(data)
-
     if (data.followStatus == '跟进状态-接待') {
       this.setData({
         radioFollowUp: '2'

package-basic-data/pages/customer-reception/measure-to/measure-to.js

@@ -108,7 +108,6 @@ Page({
  * @author : 于继渤
  */
   deleteItem(e) {
-    console.log(e)
     let measureRoomList = this.data.measureRoomList
     let index = e.currentTarget.dataset.index
     measureRoomList.splice(index, 1)
@@ -150,7 +149,6 @@ Page({
     }
     params.measureRoomList = this.data.measureRoomList
     params.flgAgainMeasure = this.data.params.flgAgainMeasure ? this.data.params.flgAgainMeasure : false
-    console.log('params', params)
     return params
   },
 
@@ -290,7 +288,6 @@ Page({
   toEdit() {
     let item = JSON.parse(this.data.formData)
     let url = this.data.route.toFollowStatus3.url
-    console.log(item)
     let _this = this;
     wx.navigateTo({
       url: url,

package-basic-data/pages/org/choose-org/choose-org.js

@@ -79,7 +79,6 @@ Page({
     })
     const myComponent = this.selectComponent('#treeSelect');
     myComponent.setDataFromPage(this.data.tableData);
-    console.log('tableData', tableData);
   },
   /**
    * @desc : 过滤数据
@@ -102,7 +101,6 @@ Page({
         // 1 先过滤出数据
         let childs = tableDataSocial.filter(it => it.orgName.indexOf(searchText) >= 0);
         let returnTable = []
-        console.log('childs',childs);
         // 如果查到，需要查出其父级
         if (childs && childs.length > 0) {
           let filters = null;

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

@@ -181,7 +181,6 @@ Page({
    * @date   : 2024/1/26 11:46
    */
   editItems(data) {
-    console.log('data', data);
     let params = {
       ...this.data.params,
       ...data.detail.form
@@ -207,7 +206,6 @@ Page({
       });
       params.warehouseList = warehouseList
     }
-    console.log("save", params);
     if (this.data.editFlag) {
       this.excute(this.data.service, this.data.service.update, params, true).then(res => {
         if (res.data.code === Constants.SUCESS_CODE) {

package-basic-data/pages/org/sub-org-choose/sub-org-choose.js

@@ -170,7 +170,6 @@ Page({
    * @date   : 2024/1/26 11:46
    */
   editItems(data) {
-    console.log('data', data);
     let params = {
       ...this.data.params,
       ...data.detail.form
@@ -196,7 +195,6 @@ Page({
       });
       params.warehouseList = warehouseList
     }
-    console.log("save", params);
     if (this.data.editFlag) {
       this.excute(this.data.service, this.data.service.update, params, true).then(res => {
         if (res.data.code === Constants.SUCESS_CODE) {
@@ -236,7 +234,6 @@ Page({
       url: this.data.route.toAdd.url,
       events: {
         bindData: function (e) {
-          console.log('e', e);
           addForm.parentOrgName = e.data.name
           addForm.parentId = e.data.id
           that.setData({

package-basic-data/pages/print-layout/print-layout.js

@@ -34,7 +34,6 @@ Page({
         let layoutId = e.currentTarget.dataset.item.layoutId;
         let docName = this.data.docName;
         let dataId = this.data.dataId;
-        console.log('tttt',app.globalData.company);
         let url = config.image_url.replace('/file','');
         wx.navigateTo({
             url: '/package-base-select/pages/web-view-select/web-view-select',

package-basic-data/pages/product-attribute/product-attribute.js

@@ -54,11 +54,11 @@ Page({
           code: 'supplierIds', formMode: 'index', idKey: 'roleId', chooseType: true, name: 'supplierNames',
           title: mixins.$t('supplier'), type: 'choose', required: true, dropType: 'supplier', required: true,
         },
-        { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+        { code: 'remarks', type: 'textarea', title: mixins.$t('remarks'), required: false }
       ],
     sideKey: 0,
     pageFlag: false,
-    navigateBackFlag:true,
+    navigateBackFlag: true,
   },
 
   /**
@@ -100,7 +100,6 @@ Page({
       } else {
         this.excute(goodService, goodService.getGoods, { brandId: item.brandId }).then(res => {
           if (res.data.code == Constants.SUCESS_CODE) {
-            console.log('ree', res.data);
             if (res.data && res.data.data && res.data.data.length > 0) {
               //提示信息
               Dialog.confirm({
@@ -152,24 +151,24 @@ Page({
     let data = e.detail.form
     this.setData({
       formData: JSON.stringify(data)
-    }) 
+    })
     //执行保存编辑操作
     this.save({})
   },
 
-   /**
-   * @desc : 保存数据服务--校验
-   * @date : 2024/2/1 15:49
-   * @author : 王英杰
-   */
+  /**
+  * @desc : 保存数据服务--校验
+  * @date : 2024/2/1 15:49
+  * @author : 王英杰
+  */
   validData() {
-    let formData = JSON.parse(this.data.formData) 
+    let formData = JSON.parse(this.data.formData)
     //  //商品种类
-    if (this.data.formDataName == mixins.$t('goodsCategorySys') 
-      && formData.catId == formData.parentId){
-        util.showToast('父级不能和该种类相同');
-        this.selectComponent('#popup').setLoading(false);
-        return false
+    if (this.data.formDataName == mixins.$t('goodsCategorySys')
+      && formData.catId != null && formData.catId == formData.parentId) {
+      util.showToast('父级不能和该种类相同');
+      this.selectComponent('#popup').setLoading(false);
+      return false
     }
     return true
   },
@@ -182,7 +181,6 @@ Page({
   onSwipeBind(e) {
     let swipeFlag = true
     let item = e.detail.currentTarget.dataset.item
-    console.log(e)
     // return
     let flgValidList = []
     if (item && item.children && item.children.length > 0) {
@@ -190,7 +188,6 @@ Page({
         return res.flgValid == true
       })
     }
-    console.log('flgValidList', flgValidList, item.children)
     if (!item.children || (flgValidList.length == (item.children && item.children.length)) || flgValidList.length == 0) {
       this.handleMoreDataIsValid(this.data.goodsCategoryService, item, 'catId')
 
@@ -233,26 +230,23 @@ Page({
       return this.excute(service, service.update, params);
     } else { //新建 TODO
       return this.excute(service, service.insert, params).then(result => {
-        console.log('insert_result', result);
         if (result && result.data && result.data.code === Constants.SUCESS_CODE) {
           wx.showToast({
             title: '保存成功',
             image: '/static/image/success.png',
             duration: 2000
           })
-          // console.log('dataItem', this.data.dataItem)
           this.setData({
             dataItem: null
           })
           // 商品种类
           if (this.data.formDataName == mixins.$t('goodsCategorySys')) {
-            console.log('dddttt', this.data.dataItem);
           }
           //清除组件数据
           this.selectComponent('#popup').setFormNull()
           // 执行查询方法
           this.searchData()
-        }else{
+        } else {
           this.selectComponent('#popup').setLoading(false);
         }
       });;
@@ -263,9 +257,9 @@ Page({
    * @author : 刘尧
    * @date : 2022/5/28 17:28
    */
-  handleData(){
+  handleData() {
     this.setData({
-      showPop:false
+      showPop: false
     })
   },
   /**
@@ -314,7 +308,7 @@ Page({
   toAdd() {
     this.setPopContent();
     this.setData({
-      dataItem: JSON.stringify({decimalPlaces: 0}),
+      dataItem: JSON.stringify({ decimalPlaces: 0 }),
       formData: null,
       showPop: true,
     })
@@ -407,7 +401,7 @@ Page({
               { code: 'brandCode', type: 'str', title: mixins.$t('brandCode'), required: false, readonly: true, },
               { code: 'brandName', type: 'str', title: mixins.$t('brandName'), required: true },
               // { code: 'shortName', type: 'str', title: mixins.$t('abbreviation'), required: false },
-              { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+              { code: 'remarks', type: 'textarea', title: mixins.$t('remarks'), required: false }
             ]
         } else {
           popContent =
@@ -417,7 +411,7 @@ Page({
               // { code: 'shortName', type: 'str', title: mixins.$t('abbreviation'), required: false },
               { code: 'supplierIds', name: 'supplierNames', title: 'supplier', type: 'choose', required: true, dropType: 'supplier', required: true, urlKey: 'selectProductAttributeSuppliers', code: 'supplierIds', formMode: 'index', idKey: 'roleId', title: mixins.$t('supplier') },
 
-              { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+              { code: 'remarks', type: 'textarea', title: mixins.$t('remarks'), required: false }
             ]
         }
 
@@ -437,7 +431,7 @@ Page({
               { code: 'brandName', type: 'str', title: mixins.$t('brandName'), required: true },
               // { code: 'shortName', type: 'str', title: mixins.$t('abbreviation'), required: false },
               { code: 'supplierIds', name: 'supplierNames', title: 'supplier', type: 'choose', required: true, dropType: 'supplier', required: true, urlKey: 'selectProductAttributeSuppliers', code: 'supplierIds', formMode: 'index', idKey: 'roleId', title: mixins.$t('supplier') },
-              { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+              { code: 'remarks', type: 'textarea', title: mixins.$t('remarks'), required: false }
             ]
         }
       }
@@ -449,17 +443,17 @@ Page({
         popContent =
           [
             { code: 'catCode', type: 'str', title: mixins.$t('catCode'), required: false, readonly: true },
-            { code: 'parentId', name: 'parentName', title: mixins.$t('parent'), type: 'choose', required: false, urlKey: 'selectProductTypes', notClear: true,clear:true },
+            { code: 'parentId', name: 'parentName', title: mixins.$t('parent'), type: 'choose', required: false, urlKey: 'selectProductTypes', notClear: true, clear: true },
             { code: 'catName', type: 'str', title: mixins.$t('catName'), required: true },
-            { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+            { code: 'remarks', type: 'textarea', title: mixins.$t('remarks'), required: false }
           ]
       } else {
         popContent =
           [
             // { code: 'catCode', type: 'str', title: mixins.$t('catCode'), required: false, readonly: true, },
-            { code: 'parentId', name: 'parentName', title: mixins.$t('parent'), type: 'choose', required: false, urlKey: 'selectProductTypes', notClear: true,clear:true },
+            { code: 'parentId', name: 'parentName', title: mixins.$t('parent'), type: 'choose', required: false, urlKey: 'selectProductTypes', notClear: true, clear: true },
             { code: 'catName', type: 'str', title: mixins.$t('catName'), required: true },
-            { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+            { code: 'remarks', type: 'textarea', title: mixins.$t('remarks'), required: false }
           ]
       }
 
@@ -471,14 +465,14 @@ Page({
           [
             { code: 'seriesCode', type: 'str', title: mixins.$t('seriesCode'), required: false, readonly: true, },
             { code: 'seriesName', type: 'str', title: mixins.$t('seriesName'), required: true },
-            { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+            { code: 'remarks', type: 'textarea', title: mixins.$t('remarks'), required: false }
           ]
       } else {
         popContent =
           [
             // { code: 'seriesCode', type: 'str', title: mixins.$t('seriesCode'), required: false, readonly: true, },
             { code: 'seriesName', type: 'str', title: mixins.$t('seriesName'), required: true },
-            { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+            { code: 'remarks', type: 'textarea', title: mixins.$t('remarks'), required: false }
           ]
       }
 
@@ -491,7 +485,7 @@ Page({
             { code: 'unitCode', type: 'str', title: mixins.$t('unitCode'), required: false, readonly: true, },
             { code: 'unitName', type: 'str', title: mixins.$t('unitName'), required: true },
             { code: 'decimalPlaces', max: 6, min: 0, type: 'number', sign: "", digits: 0, title: mixins.$t('decimalPlaces'), required: true, formatThousandth: false },
-            { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+            { code: 'remarks', type: 'textarea', title: mixins.$t('remarks'), required: false }
           ]
       } else {
         popContent =
@@ -499,7 +493,7 @@ Page({
             // { code: 'unitCode', type: 'str', title: mixins.$t('unitCode'), required: false, readonly: true, },
             { code: 'unitName', type: 'str', title: mixins.$t('unitName'), required: true },
             { code: 'decimalPlaces', max: 6, min: 0, type: 'number', sign: "", digits: 0, title: mixins.$t('decimalPlaces'), required: true, formatThousandth: false },
-            { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
+            { code: 'remarks', type: 'textarea', title: mixins.$t('remarks'), required: false }
           ]
       }
 

package-basic-data/pages/product-attribute/product-types/product-types.js

@@ -15,7 +15,6 @@ Page({
     tableData: []
   },
   toChecked(e) {
-    console.log(e)
     let index = e.currentTarget.dataset.index
     let tableData = this.data.tableData
     tableData.forEach(res => {

package-basic-data/pages/product-attribute/supplier-list/supplier-list.js

@@ -15,7 +15,6 @@ Page({
     tableData: []
   },
   toChecked(e) {
-    console.log(e)
     let index = e.currentTarget.dataset.index
     let tableData = this.data.tableData
     tableData.forEach(res => {

package-basic-data/pages/product-file/add/add.js

@@ -188,7 +188,6 @@ Page({
    * @author : 王英杰
    */
   openStr(e) {
-    console.log("openStr", e);
     let code = e.detail.code
     if (code == "packageBox") { //点击包装数量
       let formData = JSON.parse(this.data.formData)
@@ -242,7 +241,6 @@ Page({
    * @author : 王英杰
    */
   changeNumberField(e) {
-    console.log("changeNumberField", e);
     let code = e.detail.code
     let formData = JSON.parse(this.data.formData)
     if (code == "packBox") { //包装 
@@ -299,8 +297,6 @@ Page({
    * @author : 王英杰
    */
   onSwitchChange(e) {
-    console.log("Switch", e);
-
     let code = e.detail.code
     let checkFlag = !e.detail.checkFlag
     let contentObj = this.data.contentObj
@@ -545,7 +541,6 @@ Page({
     })
   },
   onShow() {
-    console.log("onShow");
     this.dialogShowChooseData();
   },
   /**
@@ -598,8 +593,6 @@ Page({
    * @author : 王英杰
    */
   chooseData(e) {
-
-    console.log("chooseData", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
     let data = e.detail.data.data
@@ -767,7 +760,6 @@ Page({
    * @author : 王英杰
    */
   saveData() {
-    console.log("参数", this.data.params);
     let that = this
     if (this.data.formMode == Constants.formMode.edit) { //编辑接口
       return this.excute(this.data.service, this.data.service.update, this.data.params)
@@ -845,29 +837,7 @@ Page({
                 type: 'switch',
                 title: mixins.$t("subUnitId"),
                 code: 'flgSubUnit',
-              }, { //包装单位
-                code: 'subUnitId',
-                name: 'subUnitName',
-                title: mixins.$t("packageUnit"),
-                type: 'choose',
-                urlKey: 'unit',
-                required: true,
-                readonly: true,
-              }, { //包装
-                code: 'packBox',
-                title: mixins.$t("package"),
-                type: 'number',
-                sign: "",
-                digits: 0,
-                required: true,
-                readonly: true,
-              },
-              {
-                code: 'calculationFormula',
-                type: 'textarea',
-                title: mixins.$t("calculationFormula"),
-                readonly: true,
-              }
+              } 
             ],
             warehouse: [{ //期初库存标识
               type: 'switch',
@@ -927,7 +897,6 @@ Page({
    * @author : 姜永辉
    */
   handleSaveData() {
-    console.log('eee', this.data.formType, this.data.formType == Constants.formType.shopping);
     //购物车跳转来的,新建完毕直接回到选择界面
     if (this.data.formType == Constants.formType.shopping) {
       // var pages = getCurrentPages();
@@ -959,6 +928,8 @@ Page({
         });
       }, 200)
     }
+
+
   },
   /**
    * @desc : 页面加载数据方法
@@ -983,7 +954,6 @@ Page({
     } else {
       // 增加包装；数字类型正整数，默认1
       let formData = JSON.parse(this.data.formData) || {}
-      console.log('eeee', formData, this.data.formData, this.data.formType);
       formData.flgPrice = true
       formData.flgOpeningInv = false
       formData.flgSubUnit = false
@@ -1013,7 +983,6 @@ Page({
         title: mixins.$t('addGoodsSuk'),
       })
     }
-    console.log('dddddd', this.data.formType);
   },
   /**
    * @desc : 给表单赋值

package-basic-data/pages/product-file/metering-unit/metering-unit.js

@@ -36,7 +36,6 @@ Page({
      * @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

package-basic-data/pages/product-file/product-series/product-series.js

@@ -37,7 +37,6 @@ Page({
      * @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

package-basic-data/pages/product-file/product-types/product-types.js

@@ -22,7 +22,7 @@ Page({
     formDataName: mixins.$t('goodsCategory'),
     popContent:
     [
-      { code: 'catCode', type: 'str', title: mixins.$t('catCode'), required: false, readonly: true, },
+      // { code: 'catCode', type: 'str', title: mixins.$t('catCode'), required: false, readonly: true, },
       { code: 'parentId', name: 'parentName', title: mixins.$t('parent'), type: 'choose',   dropType: 'supplier',  urlKey: 'selectProductTypes', },
       { code: 'catName', type: 'str', title: mixins.$t('catName'), required: true },
       { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }

package-basic-data/pages/register/company-param-setting/company-param-setting.js

@@ -43,7 +43,6 @@ Page({
     let item = tableData[findex]
     item.children[index].settingValue = e.detail
     tableData[findex] = item
-    console.log("changeField", e, tableData, index);
     this.setData({
       tableData: tableData
     })
@@ -55,7 +54,6 @@ Page({
   * @date   : 2024/2/2 11:46
   */
   onChangeSwitch(e) {
-    console.log("onChangeSwitch", e);
     let ds = e.currentTarget.dataset
     let findex = ds.findex
     let index = ds.index
@@ -63,7 +61,6 @@ Page({
     let item = tableData[findex]
     item.children[index].settingValue = e.detail
     tableData[findex] = item
-    console.log("onChangeSwitch",  tableData, index);
     this.setData({
       tableData: tableData
     })
@@ -75,13 +72,11 @@ Page({
    * @author : 姜永辉
    */
   onCheckedItem(e) {
-    console.log(e)
     let _that = this
     let index = e.currentTarget.dataset.index
     let tableData = _that.data.tableData
     tableData[index].checked = !tableData[index].checked
     if (tableData[index].children && tableData[index].children.length > 0) {
-      console.log('list[index].children', tableData[index].children)
       tableData[index].children.forEach(res => {
         res.checked = tableData[index].checked
       })
@@ -150,7 +145,6 @@ Page({
     * @author : 姜永辉
     */
   setParams(params) {
-    console.log("setParams", params, this.data.tableData);
     // 修改之后的 值 
     let tableData = this.data.tableData
     let item = {}

package-basic-data/pages/register/company-register/company-register.js

@@ -77,7 +77,6 @@ Page({
     // 计算截止日期
     let months = item.validLong + item.extraLong
     let endDate = app.globalData.company.endDate
-    console.log('buyBeginDate', this.data.buyBeginDate);
     endDate = new Date(this.data.buyBeginDate).addMonths(months)
     summaryInfo.endDate = endDate.toDateStr();
     this.setData({
@@ -146,11 +145,9 @@ Page({
     summaryInfo.staffInfo = '可配置手机端授权' + wxNum + '个；电脑端授权' + webNum + '个（包含当前用户）'
     summaryInfo.webMaxNum = webNum
     summaryInfo.wxMaxNum = wxNum
-    console.log('buyBeginDate', this.data.buyBeginDate);
     let buyBeginDate = new Date(this.data.buyBeginDate);
     summaryInfo.buyBeginDate = buyBeginDate.toDateStr();
     summaryInfo.extendDays = new Date(summaryInfo.endDate).dayDiff(buyBeginDate);
-    console.log('eee', summaryInfo.amount, webNum + wxNum, summaryInfo.extendDays);
     // 计算一授权一天的单价
     let price = (summaryInfo.amount / (webNum + wxNum) / summaryInfo.extendDays).toFixed(2);
     summaryInfo.priceInfo = price
@@ -280,7 +277,6 @@ Page({
   },
 
   handleData(val) {
-    console.log("handleData-创建商户");
 
     // // 调转主页
     // wx.reLaunch({

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

@@ -32,11 +32,9 @@ Page({
    */
   chooseData(e) {
     let data = e.detail.data
-    console.log('chooseData', e)
     let formData = JSON.parse(this.data.formData)
     let contentObj = this.data.contentObj
     if (data.showFlag == 'selectFunctionalPermissions') {
-      console.log(data.showFlag,contentObj.main)
       formData.roleFunList = data.list
       if(this.data.formMode == Constants.formMode.edit){
         contentObj.main[3].placeholder = mixins.$t('setUp')
@@ -72,7 +70,6 @@ Page({
    */
   handleData(){
     let formData = JSON.parse(this.data.formData)
-    console.log('handleData')
     let contentObj = this.data.contentObj
     if(this.data.formMode == Constants.formMode.edit){
       contentObj.main[3].placeholder = mixins.$t('notSet')
@@ -270,7 +267,6 @@ Page({
       // let that = this
       // const eventChannel = this.getOpenerEventChannel()
       // eventChannel.on('params', function (data) {
-      //   console.log(data)
       //   if(data.item){
       //     that.setData({
       //       formData:JSON.stringify(data.item)

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

@@ -50,7 +50,6 @@ Page({
 * @author : 姜永辉
 */
   chooseData(e) {
-    console.log("chooseData", e);
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
     let data = e.detail.data.data
@@ -91,9 +90,7 @@ Page({
     params.roleIds = (params.roleIds && params.roleIds.length > 0) ? params.roleIds.split(',') : []
     if (this.data.gradeCode != Constants.gradeCode.PRO) {
       params.roleIds = [app.globalData.user.roleIds[0]]
-      console.log('roleName', app.globalData.user);
     }
-    console.log('params', params);
     // 专业版
     if (this.data.gradeCode == Constants.gradeCode.PRO) {
       params.flgCanLogin = (formData.flgCanPcLogin || formData.flgCanWxLogin)
@@ -152,7 +149,6 @@ Page({
    * @author : 姜永辉
    */
   setValuesByEdit(data) {
-    console.log(data, "setValuesByEdit");
     data.roleIds = (data.roleIds && data.roleIds.length > 0) ? data.roleIds.join(',') : undefined
     data.roleName = data.roleNames
     // 专业版

package-basic-data/pages/staff/detail/detail.js

@@ -68,7 +68,6 @@ Page({
    * @author : 姜永辉
    */
   handleSearchData(tableData) {
-    console.log("扫码页面的值:handleSearchData", tableData);
     if (tableData != null && tableData.length > 0) {
       let data = tableData[0] 
       data.staffPhone = data.userPhone
@@ -89,7 +88,6 @@ Page({
   setSearchParams(params) {
     // openid
     params.userWxid = this.data.formType
-    console.log("扫码页面的值setSearchParams", params);
     return params
   },
 

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

@@ -36,7 +36,7 @@ Page({
     tagList: [
       // { title: mixins.$t('all') },
       { title: mixins.$t('resignation') },
-      { title: mixins.$t('login') },
+      { title: mixins.$t('user') },
       { title: mixins.$t('leaveOffice') }
     ],
     // 列表区（内容）
@@ -66,8 +66,10 @@ Page({
   */
   onChangeTabs(e) {
     let index = e.detail.detail.index
+    let switchFlag =  index == 2?true:false
     this.setData({
       active: index,
+      switchFlag:switchFlag
     })
     // 默认查询
     this.searchData();

package-basic-data/pages/staff/staff.wxml

@@ -15,7 +15,7 @@
 
 
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" title="staffName" status="hrStatusName" content="{{contentList}}" bind:toDetail="toDetail" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
+<dk-list list="{{tableData}}" title="staffName" status="hrStatusName" content="{{contentList}}" bind:toDetail="toDetail" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open" switchFlag="{{switchFlag}}"flgValidOnFlag="{{false}}"></dk-list>
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}</van-divider>
 <!--留白-->
 <view style="height: 200rpx;"></view> 

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

@@ -29,7 +29,6 @@ Page({
    * @date   : 2024/1/26 11:46
    */
   chooseData(e) {
-    console.log('eee1', e, this.data.formData);
   },
     /**
    * 生命周期函数--监听页面加载
@@ -39,7 +38,6 @@ Page({
     const eventChannel = this.getOpenerEventChannel()
     let _this = this;
     eventChannel.on('choose', function (data) {
-      console.log('生命周期函数',data)
       // 设置商品明细
       _this.selectComponent('#' + _this.data.formName).setGoods(data);
     })

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

@@ -85,13 +85,10 @@ Page({
     })
   },
   toTitle(e) {
-    console.log('t1', e);
   },
   toStatus(e) {
-    console.log('t2', e);
   },
   toPoint(e) {
-    console.log('t3', e);
     this.setData({
       showShare: true
     })
@@ -111,7 +108,6 @@ Page({
    * @author : 周兴
    */
   openValidData(item, name) {
-    console.log('item', item, name, item.customerId);
     if (!item.customerId) {
       wx.showToast({
         title: '无此联系人,或陌生接待',
@@ -128,7 +124,6 @@ Page({
   //  * @author : 周兴
   //  */
   // getData(params) {
-  //   console.log('e3',this.data.btnFormData);
   //   return this.excute(this.data.service,this.data.service.selectByCond,params);
   // },
 
@@ -136,7 +131,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    console.log('ttt', util.convertToChildren(this.data.testData));
   },
   /**
    * 生命周期函数--监听页面显示

package-business-analysis/pages/collection-analysis/collection-analysis.js

@@ -215,7 +215,6 @@ Page({
         })
       }
       let data = e.detail.date
-      console.log(e)
       this.setData({
         month: data,
         createTimeType: e.detail.dateDefault

package-business-analysis/pages/cus-rec-pay-report/cus-rec-pay-report.js

@@ -73,7 +73,6 @@ Page({
    * @author : 姜永辉
    */
   handleSearchData(tableData) {
-    console.log('tableData', tableData);
     // 取出前三个元素  
     let firstThree = tableData.slice(0, 3)
     const titleData = {}