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

api/pages/mst/customer.js

@@ -39,7 +39,7 @@ module.exports = {
       choosecusFrom: { key: 'choosecusFrom', url: '/package-base-select/pages/select-data/select-data', type: 'customerFrom' },
       chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
       chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
-      collection:{ key: 'collection', url: '/package-sales/pages/customer-collection/add/add', formMode: 'add',formType:'add', idKey: 'cusId', image:'btn-customer-collection.png' }, //跳转客户收款新建
+      collection:{ key: 'collection', url: '/package-sales/pages/customer-collection/add/add', formMode: 'sourceCus',formType:'add', idKey: 'cusId', image:'btn-customer-collection.png' }, //跳转客户收款新建
       collectionDetail:{ key: 'collectionDetail', url: '/package-sales/pages/customer-collection/detail/detail', formMode: 'edit',formType:'edit', idKey: 'cusId', image:'btn-customer-collection.png' }, //跳转客户收款详情
 
       refundDetail:{ key: 'refundDetail', url: '/package-sales/pages/customer-collection/refund-detail/refund-detail', formMode: 'edit',formType:'edit', idKey: 'cusId' }, //跳转客户收款详情

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

@@ -20,21 +20,21 @@ Component({
    * 组件的属性列表
    */
   properties: {
-      // 是否对比 两个内容是否一样 例：源仓库 源色号之类
-      isCompare: {
-        type: Boolean,
-        value: false
-      },
-      // 源code
-      sourceCode: {
-        type: String,
-        value: ''
-      },
-      // 目标code
-      compareCode: {
-        type: String,
-        value: ''
-      },
+    // 是否对比 两个内容是否一样 例：源仓库 源色号之类
+    isCompare: {
+      type: Boolean,
+      value: false
+    },
+    // 源code
+    sourceCode: {
+      type: String,
+      value: ''
+    },
+    // 目标code
+    compareCode: {
+      type: String,
+      value: ''
+    },
     // 是否开启校验,默认不开启
     validFlag: {
       type: Boolean,
@@ -44,7 +44,7 @@ Component({
       type: Boolean,
       value: false
     },
-   detailTipFlag: {
+    detailTipFlag: {
       type: Boolean,
       value: false
     },
@@ -443,7 +443,7 @@ Component({
       // 处理contentObj
       this.handleContentObj();
     },
-    detached: function () { 
+    detached: function () {
       // 在组件实例被从页面节点树移除时执行
       // 清空地址信息
       chooseLocation.setLocation(null);
@@ -466,7 +466,7 @@ Component({
    * 组件的方法列表
    */
   methods: {
-      /**
+    /**
      * @desc : tip点击事件
      * @date : 2024/5/24 15:49
      * @author : 王英杰
@@ -475,13 +475,13 @@ Component({
       this.handleTap()
       // this.triggerEvent("clickTip", {})
     },
-     /**
+    /**
      * @desc : 关闭tip
      * @date : 2024/5/24 15:49
      * @author : 王英杰
      */
     handleTap() {
-      if(this.data.totalTipFlag){
+      if (this.data.totalTipFlag) {
         let contentObj = this.data.contentObj
         Object.keys(contentObj).forEach(key => {
           // key 是对象的键名  
@@ -489,18 +489,18 @@ Component({
           // 检查它是否真的是一个数组  
           if (Array.isArray(array)) {
             array.forEach(item => {
-              if (item.tip&&this.selectComponent('#' + item.code)) {
+              if (item.tip && this.selectComponent('#' + item.code)) {
                 this.selectComponent('#' + item.code).setShowTipFlag(false)
               }
             });
           }
-        });  
-      } 
-      if(this.data.detailTipFlag){ 
+        });
+      }
+      if (this.data.detailTipFlag) {
         this.selectComponent('#dkPopup').handleTap()
-      }  
+      }
     },
-    
+
     /**
      * @desc   : 改变后是否弹出询问
      * @author : 周兴
@@ -945,7 +945,10 @@ Component({
       if (this.data.readonly) {
         return;
       }
-
+      // 明细 只读240320
+      if (item.item.readonly) {
+        return;
+      }
       // 明细 只读240320
       if (item.item.readonlyItem) {
         return;
@@ -1773,7 +1776,7 @@ Component({
               }
               // 客户欠款
               if (data['receivableResidue'] && data['receiptResidue']) {
-                data['cusDebt'] = data['receivableResidue'] - data['receiptResidue'] != 0 ? Number(data['receivableResidue'] - data['receiptResidue'] ).toFixed(2): 0.00
+                data['cusDebt'] = data['receivableResidue'] - data['receiptResidue'] != 0 ? Number(data['receivableResidue'] - data['receiptResidue']).toFixed(2) : 0.00
               }
               form.objInfo = data;
               _this.setData({
@@ -1838,13 +1841,17 @@ Component({
       // 只读
       if (this.data.readonly) {
         return;
-      }  
+      }
       let item = e.currentTarget.dataset;
       if (item.item.readonlyItem) {
         return;
       }
+      // 明细 只读240320
+      if (item.item.readonly) {
+        return;
+      }
       // 跳转新建地图实例
-      common.onClickWxchartAddress(); 
+      common.onClickWxchartAddress();
       this.setData({
         index: item.index,
         card: item.card
@@ -2140,10 +2147,10 @@ Component({
           item.priceStd = Number(item.priceStd ? item.priceStd : (item.priceStandard ? item.priceStandard : 0)) //标价
           item.amtStd = Number(item.priceStd * item.itemQty) //合计标价金额
           item.priceSale = Number(item.priceSale ? item.priceSale : item.priceStandard)
-          item.factPrice = Number(item.factPrice ? item.factPrice : item.priceSale) 
+          item.factPrice = Number(item.factPrice ? item.factPrice : item.priceSale)
           if (item.flgGift) { //赠品
             item.priceSale = Number(0)
-            item.factPrice = Number(0) 
+            item.factPrice = Number(0)
           }
           item.itemAmt = Number(item.priceSale) * Number(item.itemQty) //商品金额
           item.sumPrice = Number(item.priceSale) * Number(item.itemQty) //商品金额
@@ -2270,7 +2277,7 @@ Component({
           sumQuantity += Number(item.outingQty) //数量
           sumAmount += item.priceOut * item.outingQty //没有售价默认取标价
         })
-        
+
         //合计金额
         cardList[index].sumAmount = sumAmount
         cardList[index].sumQuantity = sumQuantity
@@ -2295,7 +2302,7 @@ Component({
       return form
     },
 
-     /**
+    /**
      * @desc : 设置商品明细金额相关信息 采购退货
      * @author : 于继渤
      * @date : 2024/1/19
@@ -2314,8 +2321,8 @@ Component({
           sumQuantity += Number(item.intoingQty) //数量
           item.intoingQty = Number(item.intoingQty) //数量
           sumAmount += item.priceInto * item.intoingQty //没有售价默认取标价
-          item.intoingQty = item.decimalPlaces ?  item.intoingQty.toFixed(item.decimalPlaces) : item.intoingQty
-          
+          item.intoingQty = item.decimalPlaces ? item.intoingQty.toFixed(item.decimalPlaces) : item.intoingQty
+
         })
         //合计金额
         cardList[index].sumAmount = sumAmount
@@ -2458,7 +2465,7 @@ Component({
      * @author : 于继渤
      * @date   : 2024/2/2 11:46
      */
-    openChoose(e){
+    openChoose(e) {
       let dataItem = JSON.parse(this.data.dataItem)
       dataItem[e.detail.key] = e.detail.id
       dataItem[e.detail.nameKey] = e.detail.name
@@ -2507,8 +2514,8 @@ Component({
       if (this.data.type == Constants.billType.sale) {
         if (key == "factPrice") {
           let popContent = this.data.popContent_sku
-          let priceOut_index =  popContent.findIndex(it => it.code  === 'factPrice') 
-          if (dataItem.flgGift) { 
+          let priceOut_index = popContent.findIndex(it => it.code === 'factPrice')
+          if (dataItem.flgGift) {
             // 是否弹出询问框
             Dialog.confirm({
               message: '此操作将去掉赠品标识',
@@ -2521,7 +2528,7 @@ Component({
               dataItem.factAmt = dataItem.factPrice * dataItem['itemQty']
               dataItem.sumPrice = dataItem.priceSale * dataItem['itemQty']
               this.setData({
-                popContent_sku:popContent,
+                popContent_sku: popContent,
                 dataItem: JSON.stringify(dataItem)
               })
             }).catch(() => {
@@ -2531,13 +2538,13 @@ Component({
                 dataItem: JSON.stringify(dataItem)
               })
               this.selectComponent('#dkPopup').updateValueByCode(key, dataItem.factPrice)
-            }) 
-          }else{
+            })
+          } else {
             dataItem.factPrice = e.detail.value
             dataItem.priceSale = e.detail.value
             dataItem.factAmt = dataItem.factPrice * dataItem['itemQty']
-            dataItem.sumPrice = dataItem.priceSale * dataItem['itemQty'] 
-          } 
+            dataItem.sumPrice = dataItem.priceSale * dataItem['itemQty']
+          }
         }
       }
       this.setData({
@@ -2594,12 +2601,12 @@ Component({
         form: form
       })
     },
-   /**
+    /**
      * @desc : 设置商品明细 采购退货
      * @author : 于继渤
      * @date : 2024/1/19
      */
-    setReturnGoodsAmount(data) { 
+    setReturnGoodsAmount(data) {
       let form = this.data.form
       if (form.goodsList && form.goodsList.length > 0) {
         form.goodsList.forEach(item => {
@@ -2617,7 +2624,7 @@ Component({
         form: form
       })
     },
-    
+
     /**
      * @desc   : 显示tip
      * @author : 周兴
@@ -2656,7 +2663,7 @@ Component({
     changeCheckBox(e) {
       if (e.detail.code == "flgGift") {
         let popContent = this.data.popContent_sku
-        let  priceOut_index = popContent.findIndex(it => it.code  === 'factPrice')  
+        let priceOut_index = popContent.findIndex(it => it.code === 'factPrice')
         let dataItem = JSON.parse(this.data.dataItem)
         if (e.detail.flag) {
           // 是否弹出询问框
@@ -2670,10 +2677,10 @@ Component({
             dataItem.priceSale = 0
             dataItem.factAmt = 0
             dataItem.factPrice = 0
-       
+
             popContent[priceOut_index].required = false //赠品的时候 取消掉 单价的必输属性
             this.setData({
-              popContent_sku:popContent,
+              popContent_sku: popContent,
               dataItem: JSON.stringify(dataItem)
             })
           }).catch(() => {
@@ -2687,7 +2694,7 @@ Component({
           dataItem.flgGift = e.detail.flag
           popContent[priceOut_index].required = true
           this.setData({
-            popContent_sku:popContent,
+            popContent_sku: popContent,
             dataItem: JSON.stringify(dataItem)
           })
         }
@@ -2706,7 +2713,7 @@ Component({
      * @author : 周兴
      * @date : 2024/6/24
      */
-    clickPreview(e){
+    clickPreview(e) {
       this.triggerEvent("clickPreview", {})
     },
     /**
@@ -2717,7 +2724,7 @@ Component({
     uploadError(e) {
       this.triggerEvent("uploadError", {})
     },
-   /**
+    /**
      * @desc : 上传附件
      * @author : 周兴
      * @date : 2024/3/27 16:16
@@ -2730,10 +2737,14 @@ Component({
           url: '/package-base-select/pages/cropper/cropper',
           events: {
             // 回调后
-            bindData: function (data) { 
+            bindData: function (data) {
               const {
                 file
-              } = {file:[{path:data}]};
+              } = {
+                file: [{
+                  path: data
+                }]
+              };
               // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
               let folder = app.globalData.company.cpCode + '/' + _this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
               let url = config.upload_url;
@@ -2775,11 +2786,11 @@ Component({
           success: function (res) {
             // 通过eventChannel向被打开页面传送数据
             res.eventChannel.emit('params', {
-              src: e.detail.file[0].path, 
+              src: e.detail.file[0].path,
             })
           }
         })
-      } else { 
+      } else {
         const {
           file
         } = e.detail;
@@ -2820,7 +2831,7 @@ Component({
           })
         })
       }
-  
+
 
 
     },

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

@@ -246,7 +246,7 @@
             <!--客户地址-->
             <van-field wx:if="{{item.type=='address'  && (item.show || item.show == undefined)}}" input-width="200rpx" input-class="dk-cell-value-class" required="{{item.required?true:false }}" input-align="left" data-key="address" type="textarea" value="{{ wxmlUtil.addressToIndexOf(form.address.address) }}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" data-type='address' catchtap="onClickWxchartAddress" readonly="{{true}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" errorMessage="{{item.errMsg}}">
               <view style="display: flex;" slot="right-icon"> 
-                <van-icon wx:if="{{ form.address.address}}" slot="right-icon" name="clear" color="#c8c9cc;"data-item="{{item}}" data-key="{{item.code}}" catchtap="clearAddress"></van-icon>
+                <van-icon wx:if="{{ !item.readonly && form.address.address}}" slot="right-icon" name="clear" color="#c8c9cc;"data-item="{{item}}" data-key="{{item.code}}" catchtap="clearAddress"></van-icon>
                 <van-icon custom-style="padding-left:10rpx" name="location"></van-icon>
               </view>
             </van-field>

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

@@ -91,7 +91,30 @@ Component({
 
             let datalist = []
             // 初始款项
-            if(typeName === 'initialPayment'){
+            if (typeName === 'initialPayment') {
+              let nmb = 0
+              let nmb_tenter = 0
+              list.forEach(item2 => {
+                let item = {
+                  id: item2.id,
+                  code: item2.kindCode,
+                  name: item2.kindName,
+                  checked: item2.id == this.properties.contentID ? true : false,
+                }
+                nmb_tenter++
+                if (item2.id == this.properties.contentID) {
+                  nmb = nmb_tenter
+                }
+                datalist.push(item)
+              })
+              this.setData({
+                radio: this.properties.contentID ? (nmb - 1) : '',
+                valueKey: 'id',
+                labelKey: 'name'
+              })
+            }
+            // 发票类型
+            if (typeName === 'receiptType') {
               let nmb = 0
               let nmb_tenter = 0
               list.forEach(item2 => {
@@ -422,6 +445,11 @@ Component({
         DataSourceCode = 'initialPayment'
         name = '初始款项'
       }
+      // 发票类型
+      if (typeName === 'receiptType') {
+        DataSourceCode = 'receiptType'
+        name = '发票类型'
+      }
       this.setData({
         DataSourceCode: DataSourceCode
       })

i18n/zh-CN.js

@@ -215,6 +215,7 @@ const ivt = {
   lastQty: '期末数量',
   last: '期末',
   purReturnPrice: '退货单价',
+  staffInfo: '员工信息',
 }
 
 //  首页
@@ -370,6 +371,7 @@ const basicData = {
 
   sourceCode: '来源编码',
   sourceName: '来源名称',
+  expenseOrderNumber : '支出单号',
 
 }
 
@@ -457,7 +459,7 @@ const accountsManage = {
   applicationObject: '申请对象',
   objectPhone: '申请电话',
   freezeDate: '冻结日期',
-  thawingDate: '解冻日期',
+  unfreezeDate: '解冻日期',
   freezeAll: '冻结状态-全部解冻',
   ufreezeAll: '冻结状态-全部冻结',
   freezeNo: '冻结单号',
@@ -719,6 +721,7 @@ const pur = {
   invoiceContent:'发票内容',
   invoicingParty:'开票方',
   totalInvoiceAmount:'发票总额',
+  autoUnfreezeDate:'自动解冻日期',
 }
 const otherAccounts = {
   amountReceivable: "应收金额",

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

@@ -32,7 +32,7 @@ Page({
     pullMenuList: [       
       {
         code: 'payableNo', 
-        title: mixins.$t('paymentOrderNo'),
+        title: mixins.$t('expenseOrderNumber'),
       },
       {
         code: 'supName',
@@ -43,12 +43,12 @@ Page({
         dataType: 'date'
       },
 
-      {
-        code: 'staffName',
-      },
-      {
-        code: 'orgName',
-      },
+      // {
+      //   code: 'staffName',
+      // },
+      // {
+      //   code: 'orgName',
+      // },
       { 
         code: 'flgValid',
         title: mixins.$t('flgValid'),

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

@@ -1230,7 +1230,7 @@ Page({
    * @date : 2024年5月29日
    * @author : 刘尧
    */
-  handleSearchData(tableData) {
+  handleSearchData(tableData) { 
     let addItem = this.data.addItem
     let valueKey = this.data.valueKey
     let choosedData = this.data.choosedData
@@ -1252,7 +1252,7 @@ Page({
         const targetData = this.data.contentList.filter(res => res.title === '供应商欠款')
         item[targetData[0].name] = item.payableResidue - item.paymentResidue
       }
-      if (this.data.routeObjName == 'supplier') {
+      if (!this.data.item.defaultSupplier && this.data.routeObjName == 'supplier') {
         // item.balance = item.paymentResidue - item.payableResidue     //bug 7524 跟采购订单保持一致
         item.payableResidue = item.payableResidue - item.paymentResidue
 

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

@@ -221,7 +221,12 @@ Page({
 			if (res.data.code == Constants.SUCESS_CODE) {
 				// 成功后跳转支付
 				this.toPay(res.data.data);
-			}
+			}else {
+        // 调转主页
+        wx.reLaunch({
+          url: '/pages/welcome/welcome',
+        })
+      }
 		})
 	},
 	/**

package-basic-data/pages/draw-bill/add/add.js

@@ -49,10 +49,10 @@ Page({
                     code: 'receiptType',
                     name: 'receiptTypeName',
                     title: mixins.$t("invoiceType"),
-                    type: 'choose',
-                    urlKey: 'receiptType',
+                    type: 'drop',
+                    dropType: 'receiptType',
                     required: true,
-                },
+                }, 
                 { //接收邮箱
                     code: 'cpEmail',
                     type: 'email',

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

@@ -31,18 +31,23 @@ Page({
                 title: mixins.$t('orderDate')
             },
             {
-                name: 'tradeAmount',
-                title: mixins.$t('paidInAmount'),
+                name: 'orderAmount',
+                title: mixins.$t('orderAmount'),
                 type: 'amount'
             },
             {
-                name: 'integralName',
+                name: 'integral',
                 title: mixins.$t('usingCloudCoins')
             },
             {
-                name: 'couponName',
+                name: 'discountName',
                 title: mixins.$t('useDiscountCoupons')
             },
+            {
+                name: 'tradeAmount',
+                title: mixins.$t('paidInAmount'),
+                type: 'amount'
+            },
 
         ],
         buttonSaveList: [{
@@ -94,7 +99,8 @@ Page({
         temp.forEach(it => {
             it.tradeTime = this.formatDateOnly(it.tradeTime)
             it.integralName = it.integral + "枚"
-            it.receiptStatusName = it.receiptStatusName?it.receiptStatusName:'未开票'
+            it.receiptStatusName = it.receiptStatusName ? it.receiptStatusName : '未开票'
+            it.discountName = it.discount != null ? it.discount + "折优惠卷" : "-"
         })
         this.setData({
             tableData: temp,

package-basic-data/pages/draw-bill/draw-bill.wxml

@@ -6,7 +6,7 @@
 
 <!-- 列表区 -->
 
-<dk-list id="dk-list" list="{{tableData}}" titleImageFlag="{{false}}" flgPoint="{{false}}"  chooseFlag="{{true}}"  title="tradeTypeName" status="receiptStatusName"  content="{{contentList}}"  bind:toDetail="toDetail" bind:toTitle="toTitle"   routeObjName="{{routeObjName}}"  bind:open="open" bind:choose="listChoose"></dk-list>
+<dk-list id="dk-list" list="{{tableData}}" titleImageFlag="{{false}}" flgPoint="{{false}}"  chooseFlag="{{true}}"  title="tradeType" status="receiptStatusName"  content="{{contentList}}"  bind:toDetail="toDetail" bind:toTitle="toTitle"   routeObjName="{{routeObjName}}"  bind:open="open" bind:choose="listChoose"></dk-list>
 
 <view style="height: 200rpx;" ></view>
 

package-basic-data/pages/historical-purchase-history/detail/detail.js

@@ -130,4 +130,25 @@ Page({
             okkey: true
         })
     },
+    /**
+   * @desc : 跳转到微信聊天界面
+   * @author : 周兴
+   * @date : 2024/4/9
+   */
+  handleWxService(e) {
+    // let url= Constants.WX_SERVICE
+    // wx.navigateTo({
+    //   url: '/pages/product/product',
+    //   success: function (res) {
+    //     res.eventChannel.emit('url', Constants.WX_SERVICE);
+    //   }
+    // })
+    wx.openCustomerServiceChat({
+      extInfo: {
+        url: Constants.WX_SERVICE
+      },
+      corpId: Constants.WX_CPID,
+      success(res) { }
+    })
+  },
 })

package-basic-data/pages/historical-purchase-history/detail/detail.wxml

@@ -12,6 +12,6 @@
 		</dk-form>
 
 		<!-- 新建按钮 -->
-		<dk-save-button btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" bind:open="saveButton"></dk-save-button>
+		<dk-save-button btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" catchtap="handleWxService" ></dk-save-button>
 	</view>
 </view>

package-basic-data/pages/historical-purchase-history/detail/detail.wxss

@@ -2,7 +2,7 @@
 
 .invoice-message {
 	font-family: PingFang HK;
-	font-size: 24px;
+	font-size: 20px;
 	font-weight: 600;
 	line-height: 33.6px;
 	text-align: center;

package-basic-data/pages/historical-purchase-history/historical-purchase-history.js

@@ -50,8 +50,8 @@ Page({
                 title: mixins.$t('orderDate')
             },
             {
-                name: 'tradeAmount',  
-                title: mixins.$t('paidInAmount'),
+                name: 'orderAmount',  
+                title: mixins.$t('orderAmount'),
                 type:'amount'
             },
             {
@@ -59,8 +59,13 @@ Page({
                 title: mixins.$t('usingCloudCoins')
             },
             {
-                name: 'couponName',  
+                name: 'discountName',  
                 title: mixins.$t('useDiscountCoupons')
+            }, 
+            {
+                name: 'tradeAmount',  
+                title: mixins.$t('paidInAmount'),
+                type:'amount'
             },
 
         ],
@@ -123,6 +128,7 @@ Page({
             it.tradeTime = this.formatDateOnly(it.tradeTime)
             it.integral = it.integral+"枚" 
             it.receiptStatusName = it.receiptStatusName?it.receiptStatusName:'未开票'
+            it.discountName = it.discount!=null? it.discount +"折优惠卷":"-"
         })
         this.setData({
             tableData: temp,

package-basic-data/pages/historical-purchase-history/historical-purchase-history.wxml

@@ -7,7 +7,7 @@
 
 <!-- 列表区 -->
 
-<dk-list id="dk-list" list="{{tableData}}" titleImageFlag="{{false}}" flgPoint="{{false}}"   title="tradeTypeName" status="receiptStatusName"  content="{{contentList}}"  bind:toDetail="toDetail" bind:toTitle="toTitle"   routeObjName="{{routeObjName}}"  bind:open="open" ></dk-list>
+<dk-list id="dk-list" list="{{tableData}}" titleImageFlag="{{false}}" flgPoint="{{false}}"   title="tradeType" status="receiptStatusName"  content="{{contentList}}"  bind:toDetail="toDetail" bind:toTitle="toTitle"   routeObjName="{{routeObjName}}"  bind:open="open" ></dk-list>
 
 <view style="height: 200rpx;" ></view>
 

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

@@ -121,29 +121,39 @@ Page({
         code: 'pricePurchase',
         type: 'number',
         title: mixins.$t("purchasePrice"),
+        max: 9999999,
+        maxFlag: true,
         required: true,
       }, { //零售价
         tip: mixins.$t("retailPricetip"),
         code: 'priceStandard',
         type: 'number',
         title: mixins.$t("retailPrice"),
+        max: 9999999,
+        maxFlag: true,
         required: true,
       }, { //批发价
         tip: mixins.$t("wholesalePricetip"),
         code: 'priceWholesale',
         type: 'number',
         title: mixins.$t("wholesalePrice"),
+        max: 9999999,
+        maxFlag: true,
         required: true,
       }, { //销售限价
         tip: mixins.$t("SaleSPriceLimittip"),
         code: 'priceLimited',
         type: 'number',
+        max: 9999999,
+        maxFlag: true,
         title: mixins.$t("SaleSPriceLimit"),
         required: true,
       }, { //其他价
         tip: mixins.$t("otherPriceLimittip"),
         code: 'priceOther',
         type: 'number',
+        max: 9999999,
+        maxFlag: true,
         title: mixins.$t("otherPriceLimit"),
         required: true,
       }, ],
@@ -182,7 +192,7 @@ Page({
       dataItem: JSON.stringify(dataItem)
     })
   },
-   
+
 
   /**
    * @desc : dk-form 里 str的点击回调 的输入回调
@@ -238,8 +248,8 @@ Page({
       formData: JSON.stringify(formData)
     })
   },
-  
-    /**
+
+  /**
    * @desc : dk-form 里 dk-number-input 的输入回调
    * @date : 2024/2/1 15:49
    * @author : 王英杰
@@ -247,7 +257,7 @@ Page({
   triggerBindBlur(e) {
     let code = e.detail.code
     let formData = JSON.parse(this.data.formData)
-    formData[code] = formData[code] ?formData[code]:0
+    formData[code] = formData[code] ? formData[code] : 0
     if (code == "packBox") { //包装 
       if (formData.intoQty || formData.packageBox) {
         //提示
@@ -356,12 +366,12 @@ Page({
         ]
       } else {
         let formDataJson = JSON.parse(this.data.formData)
-        if (formDataJson) {  
-          ['subUnitName', 'calculationFormula', 'packBox'].forEach(key => {  
-            if (formDataJson.hasOwnProperty(key)) {  
+        if (formDataJson) {
+          ['subUnitName', 'calculationFormula', 'packBox'].forEach(key => {
+            if (formDataJson.hasOwnProperty(key)) {
               delete formDataJson[key];
-            } 
-          });  
+            }
+          });
         }
         this.setData({
           formData: JSON.stringify(formDataJson)
@@ -379,7 +389,7 @@ Page({
           title: mixins.$t("subUnitId"),
           code: 'flgSubUnit',
         }, ]
-      } 
+      }
       // 解决 （商品档案，如果先点开期初库存，然后再点开辅助单位，那么包装数量就不会显示出来） 问题
       if (formData.flgOpeningInv) { //开了期初库存
         if (checkFlag) { //开了辅助单位
@@ -442,7 +452,7 @@ Page({
               type: 'textarea',
               title: mixins.$t("iinventoryBatchNumber"),
               required: checkFlag,
-              tip: mixins.$t('tipPop'), 
+              tip: mixins.$t('tipPop'),
             },
             { //期初数量
               code: 'intoQty',
@@ -450,7 +460,7 @@ Page({
               sign: "",
               digits: formData.decimalPlaces,
               title: mixins.$t("openingInventoryQty"),
-              required: checkFlag,    
+              required: checkFlag,
             },
             { //期初成本价
               code: 'priceInto',
@@ -461,7 +471,7 @@ Page({
           ]
         }
       }
-      
+
     } else if (code == "flgOpeningInv") { //期初库存标识
       if (checkFlag) {
         let formData = JSON.parse(this.data.formData)
@@ -534,7 +544,7 @@ Page({
               type: 'textarea',
               title: mixins.$t("iinventoryBatchNumber"),
               required: checkFlag,
-              tip: mixins.$t('tipPop'), 
+              tip: mixins.$t('tipPop'),
             },
             { //期初数量
               code: 'intoQty',
@@ -542,7 +552,7 @@ Page({
               sign: "",
               digits: formData.decimalPlaces,
               title: mixins.$t("openingInventoryQty"),
-              required: checkFlag,    
+              required: checkFlag,
             },
             { //期初成本价
               code: 'priceInto',
@@ -560,12 +570,12 @@ Page({
          * @data 2024.06.04
          */
         let formData = JSON.parse(this.data.formData)
-        if (formData) {  
-          ['packageBox', 'priceInto', 'intoQty', 'nonStdCode', 'whName', 'whId'].forEach(key => {  
-            if (formData.hasOwnProperty(key)) {  
+        if (formData) {
+          ['packageBox', 'priceInto', 'intoQty', 'nonStdCode', 'whName', 'whId'].forEach(key => {
+            if (formData.hasOwnProperty(key)) {
               delete formData[key];
-            } 
-          });  
+            }
+          });
         }
         this.setData({
           formData: JSON.stringify(formData)
@@ -587,30 +597,40 @@ Page({
           code: 'pricePurchase',
           type: 'number',
           title: mixins.$t("purchasePrice"),
+          max: 9999999,
+          maxFlag: true,
           required: checkFlag,
         }, { //零售价
           tip: mixins.$t("retailPricetip"),
           code: 'priceStandard',
           type: 'number',
           title: mixins.$t("retailPrice"),
+          max: 9999999,
+          maxFlag: true,
           required: checkFlag,
         }, { //批发价
           tip: mixins.$t("wholesalePricetip"),
           code: 'priceWholesale',
           type: 'number',
           title: mixins.$t("wholesalePrice"),
+          max: 9999999,
+          maxFlag: true,
           required: checkFlag,
         }, { //销售限价
           tip: mixins.$t("SaleSPriceLimittip"),
           code: 'priceLimited',
           type: 'number',
           title: mixins.$t("SaleSPriceLimit"),
+          max: 9999999,
+          maxFlag: true,
           required: checkFlag,
         }, { //其他价
           tip: mixins.$t("otherPriceLimittip"),
           code: 'priceOther',
           type: 'number',
           title: mixins.$t("otherPriceLimit"),
+          max: 9999999,
+          maxFlag: true,
           required: checkFlag,
         }, ]
       } else {
@@ -643,7 +663,7 @@ Page({
       handledata: false
     })
     let formData = JSON.parse(this.data.formData)
-    let data = this.data.chooseUnitData 
+    let data = this.data.chooseUnitData
     let Dialog_message = null
     let code = this.data.chooseDataCode
     if (code == "unitId") { //计量单位
@@ -665,7 +685,7 @@ Page({
       formData.piece = null
       Dialog_message = '更换包装单位将清空期初数量、包装数量'
     }
- 
+
     //提示
     Dialog.confirm({
       message: Dialog_message,
@@ -852,67 +872,72 @@ Page({
       return this.excute(this.data.service, this.data.service.update, this.data.params)
     } else { //新建接口
       let excute = this.excute(this.data.service, this.data.service.insert, this.data.params)
-      excute.then(res => {
-        // 增加包装；数字类型正整数，默认1
-        let formData = {}
-        let contentObj = this.data.contentObj
-        formData.flgPrice = true
-        formData.flgOpeningInv = false
-        formData.flgSubUnit = true
-
-        that.setData({
-          formData: JSON.stringify(formData),
-          loading: false,
-          contentObj: {
-            main: [{ //商品型号
-                code: 'skuModel',
-                type: 'textarea',
-                title: mixins.$t("skuModel"),
-                required: true,
-              }, { //商品名称
-                code: 'skuName',
-                type: 'textarea',
-                title: mixins.$t("skuName"),
-              }, {
-                code: 'skuImages',
-                name: mixins.$t("commodityPicture"), //商品图片
-                type: 'uploader',
-              },
+      excute.then(res => { 
+        if (res && res.data && res.data.code === Constants.SUCESS_CODE) {
+          // 增加包装；数字类型正整数，默认1
+          let formData = {}
+          let contentObj = this.data.contentObj
+          formData.flgPrice = true
+          formData.flgOpeningInv = false
+          formData.flgSubUnit = true 
+          formData.pricePurchase = 0
+          formData.priceStandard = 0
+          formData.priceWholesale = 0
+          formData.priceLimited = 0
+          formData.priceOther = 0
+          that.setData({
+            formData: JSON.stringify(formData),
+            loading: false,
+            contentObj: {
+              main: [{ //商品型号
+                  code: 'skuModel',
+                  type: 'textarea',
+                  title: mixins.$t("skuModel"),
+                  required: true,
+                }, { //商品名称
+                  code: 'skuName',
+                  type: 'textarea',
+                  title: mixins.$t("skuName"),
+                }, {
+                  code: 'skuImages',
+                  name: mixins.$t("commodityPicture"), //商品图片
+                  type: 'uploader',
+                },
 
-            ],
-            goods: [{ //商品品牌
-                code: 'brandId',
-                name: 'brandName',
-                title: mixins.$t("goodsBrand"),
-                type: 'choose',
-                urlKey: 'goodsBrand',
-                required: true,
-              },
-              { //商品种类
-                code: 'categoryId',
-                name: 'catName',
-                title: mixins.$t("goodsCategory"),
-                type: 'choose',
-                urlKey: 'goodsCategory',
-                required: true,
+              ],
+              goods: [{ //商品品牌
+                  code: 'brandId',
+                  name: 'brandName',
+                  title: mixins.$t("goodsBrand"),
+                  type: 'choose',
+                  urlKey: 'goodsBrand',
+                  required: true,
+                },
+                { //商品种类
+                  code: 'categoryId',
+                  name: 'catName',
+                  title: mixins.$t("goodsCategory"),
+                  type: 'choose',
+                  urlKey: 'goodsCategory',
+                  required: true,
 
-              }, { //商品系列
-                code: 'seriesId',
-                name: 'seriesName',
-                title: mixins.$t("goodsSeries"),
-                type: 'choose',
-                urlKey: 'goodsSeries',
+                }, { //商品系列
+                  code: 'seriesId',
+                  name: 'seriesName',
+                  title: mixins.$t("goodsSeries"),
+                  type: 'choose',
+                  urlKey: 'goodsSeries',
 
 
-              }, { //商品规格 
-                code: 'skuSpec',
-                name: 'skuSpec',
-                type: 'textarea',
-                required: true,
-                title: mixins.$t("sukSpec"),
-              }
-            ],
-            unit: [{ //基本单位
+                }, { //商品规格 
+                  code: 'skuSpec',
+                  name: 'skuSpec',
+                  type: 'textarea',
+                  required: true,
+                  title: mixins.$t("sukSpec"),
+                }
+              ],
+              unit: [{ //基本单位
                 code: 'unitId',
                 name: 'unitName',
                 title: mixins.$t("unit"),
@@ -924,56 +949,67 @@ Page({
                 type: 'switch',
                 title: mixins.$t("subUnitId"),
                 code: 'flgSubUnit',
-              } 
-            ],
-            warehouse: [{ //期初库存标识
-              type: 'switch',
-              title: mixins.$t("openingInv"),
-              code: 'flgOpeningInv',
-            }, ],
-            price: [{ //期初库存标识
-              type: 'switch',
-              title: mixins.$t("flgPrice"),
-              code: 'flgPrice',
-            }, { //采购价
-              tip: mixins.$t("purchasePricetip"),
-              code: 'pricePurchase',
-              type: 'number',
-              title: mixins.$t("purchasePrice"),
-              required: true,
-            }, { //零售价
-              tip: mixins.$t("retailPricetip"),
-              code: 'priceStandard',
-              type: 'number',
-              title: mixins.$t("retailPrice"),
-              required: true,
-            }, { //批发价
-              tip: mixins.$t("wholesalePricetip"),
-              code: 'priceWholesale',
-              type: 'number',
-              title: mixins.$t("wholesalePrice"),
-              required: true,
-            }, { //销售限价
-              tip: mixins.$t("SaleSPriceLimittip"),
-              code: 'priceLimited',
-              type: 'number',
-              title: mixins.$t("SaleSPriceLimit"),
-              required: true,
-            }, { //其他价
-              tip: mixins.$t("otherPriceLimittip"),
-              code: 'priceOther',
-              type: 'number',
-              title: mixins.$t("otherPriceLimit"),
-              required: true,
-            }, ],
+              }],
+              warehouse: [{ //期初库存标识
+                type: 'switch',
+                title: mixins.$t("openingInv"),
+                code: 'flgOpeningInv',
+              }, ],
+              price: [{ //期初库存标识
+                type: 'switch',
+                title: mixins.$t("flgPrice"),
+                code: 'flgPrice',
+              }, { //采购价
+                tip: mixins.$t("purchasePricetip"),
+                code: 'pricePurchase',
+                type: 'number',
+                title: mixins.$t("purchasePrice"),
+                max: 9999999,
+                maxFlag: true,
+                required: true,
+              }, { //零售价
+                tip: mixins.$t("retailPricetip"),
+                code: 'priceStandard',
+                type: 'number',
+                title: mixins.$t("retailPrice"),
+                max: 9999999,
+                maxFlag: true,
+                required: true,
+              }, { //批发价
+                tip: mixins.$t("wholesalePricetip"),
+                code: 'priceWholesale',
+                type: 'number',
+                title: mixins.$t("wholesalePrice"),
+                max: 9999999,
+                maxFlag: true,
+                required: true,
+              }, { //销售限价
+                tip: mixins.$t("SaleSPriceLimittip"),
+                code: 'priceLimited',
+                type: 'number',
+                title: mixins.$t("SaleSPriceLimit"),
+                max: 9999999,
+                maxFlag: true,
+                required: true,
+              }, { //其他价
+                tip: mixins.$t("otherPriceLimittip"),
+                code: 'priceOther',
+                type: 'number',
+                title: mixins.$t("otherPriceLimit"),
+                max: 9999999,
+                maxFlag: true,
+                required: true,
+              }, ],
+
+              other: [{
+                code: 'remarks',
+                type: 'textarea',
+                title: mixins.$t("remarks"),
+              }]
+            }
+          })
+        } 
 
-            other: [{
-              code: 'remarks',
-              type: 'textarea',
-              title: mixins.$t("remarks"),
-            }]
-          }
-        })
       })
       return excute;
     }
@@ -1085,7 +1121,7 @@ Page({
     // data.serviceCategories = (data.serviceCategories && data.serviceCategories.length > 0) ? data.serviceCategories.join(',') : undefined
     data.annexPaths = data.skuImages
     data.onlyCode = data.skuCode
-    
+
     let contentObj = this.data.contentObj
     // 我们要添加的新对象是  编码  新建的时候没有 编辑的时候添加 
     contentObj.main = [{ //唯一编码
@@ -1210,7 +1246,7 @@ Page({
     }
     if (data.flgOpeningInv) {
       if (data.flgSubUnit) { //开了辅助单位
-        data.packageBox  = data['box'] + data.subUnitName + data['piece'] + data.unitName
+        data.packageBox = data['box'] + data.subUnitName + data['piece'] + data.unitName
         contentObj.warehouse = [{ //期初库存标识
             type: 'switch',
             title: mixins.$t("openingInv"),
@@ -1321,30 +1357,40 @@ Page({
         code: 'pricePurchase',
         type: 'number',
         title: mixins.$t("purchasePrice"),
+        max: 9999999,
+        maxFlag: true,
         required: true,
       }, { //零售价
         tip: mixins.$t("retailPricetip"),
         code: 'priceStandard',
         type: 'number',
         title: mixins.$t("retailPrice"),
+        max: 9999999,
+        maxFlag: true,
         required: true,
       }, { //批发价
         tip: mixins.$t("wholesalePricetip"),
         code: 'priceWholesale',
         type: 'number',
         title: mixins.$t("wholesalePrice"),
+        max: 9999999,
+        maxFlag: true,
         required: true,
       }, { //销售限价
         tip: mixins.$t("SaleSPriceLimittip"),
         code: 'priceLimited',
         type: 'number',
         title: mixins.$t("SaleSPriceLimit"),
+        max: 9999999,
+        maxFlag: true,
         required: true,
       }, { //其他价
         tip: mixins.$t("otherPriceLimittip"),
         code: 'priceOther',
         type: 'number',
         title: mixins.$t("otherPriceLimit"),
+        max: 9999999,
+        maxFlag: true,
         required: true,
       }, ]
     } else {

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

@@ -44,6 +44,22 @@ Page({
   onShow() {
     this.showPowerModel()
     this.getSystemButtonLocation()
+    this.getHelpUserNumber()
+  },
+
+  /**
+  * @desc : 获取当前链接有多少人助力
+  * @date : 2024/7/31 13:49
+  * @author : 刘尧
+   */
+  getHelpUserNumber() {
+    const params = this.data.params
+    let service = app.globalData['couponReceiveService']
+    this.excute(service, 'get_receive_user_number', params).then(res => {
+        this.setData({
+          helpUserNumber: res.data.data
+        })
+    })
   },
   /**
 * @desc : 页面加载时获取返回按钮距上边距

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

@@ -63,6 +63,8 @@ Page({
   onShow() {
     // 积分
     this.getIntegral()
+    // 优惠劵
+    this.getCouponNumber()
   },
 
   /**
@@ -85,8 +87,6 @@ Page({
     this.getCouponTactic()
     // 获取用户头像
     this.getUser()
-    // 优惠劵
-    this.getCouponNumber()
   },
 
   /**

package-business-analysis/pages/profit-report/profit-report.wxml

@@ -4,18 +4,19 @@
 <!-- 顶部 -->
 <view bindtap="handleTap">
   <!-- 顶部筛选条件 -->
-  <view class="head" style="position: fixed;top:0; z-index: 95;">
+  <!-- <view class="head" style="position: fixed;top:0; z-index: 95;"> 20240808edit 刘尧 修复销售利润表显示问题
     <view style="overflow: hidden;position: absolute;width: 100%; z-index: 6666;">
-      <van-sticky scroll-top="0">
-        <dk-navbar titleFontColor="#000000" navbarTitle="销售利润" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight" />
-        <dk-dropdown-menu id="menu" model:value="{{searchForm}}" menuList="{{searchContent}}" bind:dkdropdowndateCommit="changeSearchContent" bind:search="getSaleProfit" flgSearchText="{{false}}">
-        </dk-dropdown-menu>
-      </van-sticky>
-      <!-- 顶部筛选条件 -->
-      <!-- <view class="head" style="position: fixed;top:0; z-index: 95;">
-  <view style="overflow: hidden;position: absolute;width: 100%; z-index: 6666;">-->
+      顶部筛选条件
+      <view class="head" style="position: fixed;top:0; z-index: 95;">
+  <view style="overflow: hidden;position: absolute;width: 100%; z-index: 6666;">
     </view>
-  </view>
+  </view> -->
+
+  <van-sticky scroll-top="0">
+    <dk-navbar titleFontColor="#000000" navbarTitle="销售利润" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight" />
+    <dk-dropdown-menu id="menu" model:value="{{searchForm}}" menuList="{{searchContent}}" bind:dkdropdowndateCommit="changeSearchContent" bind:search="getSaleProfit" flgSearchText="{{false}}">
+    </dk-dropdown-menu>
+  </van-sticky>
 
 
   <view class="func">

package-business-analysis/pages/profit-report/profit-report.wxss

@@ -159,7 +159,7 @@ page {
 .func {
   width: 100%;
   height: 440rpx;
-  margin-top: -100rpx;
+  /* margin-top: -100rpx;  20240808edit 刘尧 修复销售利润表显示问题*/
   /* background: #F8F9FD; */
   border-radius: 40rpx 40rpx 0 0;
 

package-inventory/pages/inventory-freeze/add/add.js

@@ -13,41 +13,66 @@ Page({
     routeObjName: 'freeze',
     //弹出pop
     popContent: [{
-      code: 'itemQty',
-      type: 'step',
-      title: mixins.$t('count'),
-      required: true
-    },
-    { code: 'packageBox', type: 'packageBox', title: mixins.$t("packageBox"), },
-    {
-      code: 'whId',
-      name: 'whName',
-      title: mixins.$t('warehouseId'),
-      type: 'choose',
-      urlKey: 'openingInventory'
-    },
-    { code: 'skuSpec', title: mixins.$t('goodSpec'), type: 'str', readonly: true, },
-    {
-      code: 'nonStdCode',
-      title: mixins.$t('goodsBatch'),
-      type: 'str',
-      tip: mixins.$t('tipPop'),
-    },
+        code: 'itemQty',
+        type: 'step',
+        title: mixins.$t('count'),
+        required: true
+      },
+      {
+        code: 'packageBox',
+        type: 'packageBox',
+        title: mixins.$t("packageBox"),
+      },
+      {
+        code: 'whId',
+        name: 'whName',
+        title: mixins.$t('warehouseId'),
+        type: 'choose',
+        urlKey: 'openingInventory'
+      },
+      {
+        code: 'skuSpec',
+        title: mixins.$t('goodSpec'),
+        type: 'str',
+        readonly: true,
+      },
+      {
+        code: 'nonStdCode',
+        title: mixins.$t('goodsBatch'),
+        type: 'str',
+        tip: mixins.$t('tipPop'),
+      },
     ],
 
-    cardList: [
+    cardList: [{
+        name: 'main',
+        title: mixins.$t('freezeInfo'), //'冻结信息'
+      },
+      {
+        name: 'items',
+        title: mixins.$t("goodsDetail"),
+        chooseGoodsFlag: true,
+        itemAmt: '',
+        displayNum: 2
+      },
       {
-        name: 'main', title: mixins.$t('freezeInfo'),//'冻结信息'
+        name: 'other',
+        title: mixins.$t("otherInfo")
       },
-      { name: 'items', title: mixins.$t("goodsDetail"), chooseGoodsFlag: true, itemAmt: '', displayNum: 2 },
-      { name: 'other', title: mixins.$t("otherInfo") },
     ],
     contentObj: {
-      main: [
-        { code: 'cusId', name: 'cusName', title: mixins.$t("applicationObject"), type: 'choose', required: true, urlKey: 'selectCustomers' },
+      main: [{
+          code: 'cusId',
+          name: 'cusName',
+          title: mixins.$t("applicationObject"),
+          type: 'choose',
+          required: true,
+          urlKey: 'selectCustomers'
+        },
         {
-          code: 'staffId', name: 'staffName',
-          title: mixins.$t("applyStaff"),//'申请员工',
+          code: 'staffId',
+          name: 'staffName',
+          title: mixins.$t("applyStaff"), //'申请员工',
           type: 'choose',
           required: true,
           urlKey: 'chooseStaff'
@@ -55,21 +80,37 @@ Page({
         {
           code: 'orgId',
           name: 'orgName',
-          title: mixins.$t("applyOrg"),//'申请部门',
+          title: mixins.$t("applyOrg"), //'申请部门',
           type: 'choose',
           required: true,
           urlKey: 'chooseOrg'
         },
+        {
+          code: 'autoUnfreezeDate',
+          type: 'date',
+          title: mixins.$t("autoUnfreezeDate"),
+          // required: true
+        },
       ],
       items: [],
-      other: [
-        { code: 'remarks', type: 'textarea', title: mixins.$t("remarks"), readonly: false },
-        { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
+      other: [{
+
+          code: 'remarks',
+          type: 'textarea',
+          title: mixins.$t("remarks"),
+          readonly: false
+        },
+        {
+          code: 'file',
+          type: 'uploader',
+          title: mixins.$t("uploader")
+        }
       ]
     },
-
+    minDate: new Date().getTime(),
     buttonSaveList: [{
-      code: 'save', title: mixins.$t("freeze")//'冻结' 
+      code: 'save',
+      title: mixins.$t("freeze") //'冻结' 
     }],
   },
   /**
@@ -93,10 +134,10 @@ Page({
 
   },
   /**
-     * @desc   : 设置只读
-     * @author : 于继渤
-     * @date   : 2024年3月12日
-     */
+   * @desc   : 设置只读
+   * @author : 于继渤
+   * @date   : 2024年3月12日
+   */
   setColumn() {
     let formData = JSON.parse(this.data.formData)
     let cardList = this.data.cardList
@@ -104,15 +145,35 @@ Page({
     let buttonSaveList = this.data.buttonSaveList
     cardList[1].color = '#E4002B'
     cardList[1].chooseGoodsFlag = false
-    contentObj.main = [
-      { code: 'cusName', title: '申请对象', type: 'str', readonly: true },
-      { code: 'staffName', title: '申请员工', type: 'str', readonly: true },
-      { code: 'orgName', title: '申请部门', type: 'str', readonly: true },
+    contentObj.main = [{
+        code: 'cusName',
+        title: '申请对象',
+        type: 'str',
+        readonly: true
+      },
+      {
+        code: 'staffName',
+        title: '申请员工',
+        type: 'str',
+        readonly: true
+      },
+      {
+        code: 'orgName',
+        title: '申请部门',
+        type: 'str',
+        readonly: true
+      },
     ]
     if (formData.freezeStatus == '冻结状态-部分解冻' || formData.freezeStatus == '冻结状态-全部解冻') {
-      buttonSaveList = [{ code: 'close', title: '关闭' }]
+      buttonSaveList = [{
+        code: 'close',
+        title: '关闭'
+      }]
     } else {
-      buttonSaveList = [{ code: 'save', title: '解冻' }]
+      buttonSaveList = [{
+        code: 'save',
+        title: '解冻'
+      }]
     }
 
     this.setData({
@@ -123,10 +184,10 @@ Page({
   },
 
   /**
-     * @desc   : 绑定数据-选择页面返回的逻辑处理
-     * @author : 姜永辉
-     * @date   : 2024年3月12日
-     */
+   * @desc   : 绑定数据-选择页面返回的逻辑处理
+   * @author : 姜永辉
+   * @date   : 2024年3月12日
+   */
   chooseData(e) {
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
@@ -156,10 +217,10 @@ Page({
     })
   },
   /**
-  * @desc : 设置保存参数
-  * @date : 2024/2/1 15:49
-  * @author : 于继渤
-  */
+   * @desc : 设置保存参数
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   setParams(params) {
     let itemIndex = 0
     let sumQuantity = Number(0)
@@ -186,10 +247,10 @@ Page({
     return params
   },
   /**
-    * @desc : 保存数据服务
-    * @date : 2024/2/1 15:49
-    * @author : 于继渤
-    */
+   * @desc : 保存数据服务
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   saveData() {
     return this.excute(this.data.service, this.data.service.insert, this.data.params).then(res => {
       if (res.data.code == 200) {
@@ -207,10 +268,10 @@ Page({
   },
 
   /**
-    * @desc : 查询商品明细
-    * @date : 2024/2/1 15:49
-    * @author : 于继渤
-    */
+   * @desc : 查询商品明细
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   getItemDetal(id) {
     return this.excute(this.data.service, this.data.service.getFreezeForUpdate + '/' + id, {}).then(res => {
       if (res.data.code == 200) {
@@ -233,43 +294,45 @@ Page({
             element.packageBox = element['box'] + element.subUnitName + element['piece'] + element.unitName
           }
         });
-         if(formData.freezeStatus == "冻结状态-全部冻结"){
-           this.setData({
-            noShowEdit:true
-           }) 
-         }
+        if (formData.freezeStatus == "冻结状态-全部冻结") {
+          this.setData({
+            noShowEdit: true
+          })
+        }
         this.setData({
           formData: JSON.stringify(formData)
         })
-
+        if (this.data.formMode == Constants.formMode.detail) { //详情
+          this.setColumn()
+        }
 
       }
     });
   },
   /**
-     * @desc :   编辑
-     * @date : 2024/2/1 15:49
-     * @author : 于继渤
-     */
+   * @desc :   编辑
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   toEdit() {
     let this_ = this
     wx.navigateTo({
       url: this_.data.route.add.url,
       events: {
         // 保存成功后刷新页面
-        refresh: function (data) {
-        }
+        refresh: function (data) {}
       },
       success: function (res) {
         res.eventChannel.emit('params', {
-          formMode: Constants.formMode.detailEdit, id: this_.data.id
+          formMode: Constants.formMode.detailEdit,
+          id: this_.data.id
         });
       }
     })
   },
   /**
- * 生命周期函数--监听页面加载
- */
+   * 生命周期函数--监听页面加载
+   */
   loadInit() {
     let formData = JSON.parse(this.data.formData)
     if (this.data.formMode == Constants.formMode.detail) { //详情
@@ -281,7 +344,6 @@ Page({
         noShowEdit: true
       })
       this.getItemDetal(this.data.id)
-      this.setColumn()
     } else if (this.data.formMode == Constants.formMode.detailEdit) {
       //编辑
       wx.setNavigationBarTitle({
@@ -296,8 +358,14 @@ Page({
       formData.orgId = app.globalData.user.orgId
       formData.staffName = app.globalData.user.staffName
       formData.orgName = app.globalData.user.orgName
+      // 设置送货日期 当前日期 加一天
+      // var currentDate = new Date();
+      // currentDate.setDate(currentDate.getDate() + 7);
+      // formData.autoUnfreezeDate = util.formatDayTime(currentDate)
+      // let dataTime = this.convertDateToMillisecondsTimestamp(formData.deliveryDate)
       this.setData({
         formData: JSON.stringify(formData),
+        // dataTime:dataTime
       })
     }
   }

package-inventory/pages/inventory-freeze/add/add.wxml

@@ -1,7 +1,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
 <dk-form-bill type="out" popType ="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel"  subCol="calculationFormula"  descCol="skuName"  quantityCol="itemQty"  contentObj="{{contentObj}}" titleTagCol="brandName" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}"
-bind:editItems="editItems" sumAmountColFlag="{{false}}"  iconCol="imagesUrl" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"detailTipFlag="{{true}}"bindtap="handleTap"
+bind:editItems="editItems" sumAmountColFlag="{{false}}"  iconCol="imagesUrl" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"detailTipFlag="{{true}}"bindtap="handleTap"dataTime="{{dataTime}}" minDate="{{minDate}}"
 >
 </dk-form-bill>
 <view style="height: 200rpx;"></view>

package-inventory/pages/inventory-freeze/inventory-freeze.js

@@ -57,7 +57,7 @@ Page({
       },
       {
         code: 'autoUnfreezeDateS',
-        title: mixins.$t('thawingDate'),//'解冻日期',
+        title: mixins.$t('unfreezeDate'),//'解冻日期',
         dataType: 'date'
       }, 
       {
@@ -80,14 +80,14 @@ Page({
     contentObj: {
       [mixins.$t('freezeAll')]: [
         { name: 'freezeNo', title: mixins.$t('freezeNo') },
-        { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t('applyThawing') },
-        { name: 'freezeDate', title: mixins.$t('thawingDate') },
+        { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t('staffInfo') },
+        { name: 'unfreezeDate', title: mixins.$t('unfreezeDate') },
         { name: 'remarks', title: mixins.$t('remarks') }
       ], 
       [mixins.$t('ufreezeAll')]: [
         { name: 'freezeNo', title: mixins.$t('freezeNo') },
-        { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t('applyThawing') },
-        { name: 'freezeDate', title: mixins.$t('thawingDate') },
+        { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t('staffInfo') },
+        { name: 'freezeDate', title: mixins.$t('freezeDate') },
         { name: 'remarks', title: mixins.$t('remarks') }
       ],
     },

package-inventory/pages/ivt-sum-report/detail/detail.js

@@ -254,6 +254,11 @@ Page({
         && Number(_this.data.item.params.factAmt) > 0) {
         // 成功后跳转支付
         this.toPay(res.data.data);
+      }else {
+        // 调转主页
+        wx.reLaunch({
+          url: '/pages/welcome/welcome',
+        })
       }
     })
   },

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

@@ -349,7 +349,7 @@ Page({
         return false
       }
       if (element.intoingQty > element.intoingQty_max) {
-        util.showToast("[" + element.skuCode + "]" + mixins.$t("maxCount") + element.intoingQty_max);
+        util.showToast("[" + element.skuModel + "]" + mixins.$t("maxCount") + element.intoingQty_max);
         return false
       }
     }

package-purchase/pages/purchase-order/add/add.js

@@ -165,13 +165,14 @@ Page({
     if (code == "whId") { //仓库
       formData.whId = data.id
       formData.whName = data.name
-      formData.goodsList.forEach(element => {
-        element.whId = data.id
-        element.whName = data.name
-      });
-
+      if( formData.goodsList){
+        formData.goodsList.forEach(element => {
+          element.whId = data.id
+          element.whName = data.name
+        });
+      } 
     }
-    if (code == "sourceNo") { //来源单 
+    if (code == "sourceNo") { //来源单  
       this.convertGoods(data.choooseItemList)
       // 刷新商品明细 显示 查看更多
       let card = this.data.cardList.filter(it => it.name == 'items');
@@ -197,21 +198,7 @@ Page({
     formData.fromNos = this.isArrayWithSingleNull(orderNoArray) ? [] : orderNoArray.join(',').split(',') //来源单号
     formData.fromIds = this.isArrayWithSingleNull(orderIdArray) ? [] : orderIdArray.join(',').split(',') //来源单id
     formData.fromNo = orderNoArray.join(',');
-    let cardList_ = this.data.cardList
-    cardList_.forEach(card => { //循环出商品总共价格
-      if (card.name === 'items') {
-        card.itemAmt = choooseItemList.sum("itemAmt") //售价金额合计 
-      }
-    })
-    let contentList_ = this.data.contentList
-    contentList_.forEach(card => { //循环出商品总共价格
-      if (card.code === 'amount') {
-        card.content = choooseItemList.sum("itemAmt")
-      }
-      if (card.code === 'goodsCount') {
-        card.quantity = choooseItemList.sum("itemQty")
-      }
-    })
+   
 
     choooseItemList.forEach(element => {
       element.chooseFlg = "biu" //辨别选品标识
@@ -219,6 +206,7 @@ Page({
       element.fromId = element.orderId
       element.fromItemId = element.itemId
       element.pricePur = element.pricePur ? element.pricePur : element.pricePurchase
+      element.itemAmt = Number( element.pricePur)*Number( element.itemQty)
       element.amtStd = Number(element.priceStd * element.itemQty) //标价金额
       element.priceDiscount = (Number(element.pricePurchase) / Number(element.priceStandard)) * 100;
       element.nonStdCode = element.nonStdCode ? element.nonStdCode : '' // 色号  批次号   
@@ -227,6 +215,21 @@ Page({
         element.packageBox = element['box'] + element.subUnitName + element['piece'] + element.unitName
       }
     });
+    let cardList_ = this.data.cardList
+    cardList_.forEach(card => { //循环出商品总共价格
+      if (card.name === 'items') {
+        card.itemAmt = choooseItemList.sum("itemAmt") //售价金额合计 
+      }
+    })
+    let contentList_ = this.data.contentList
+    contentList_.forEach(card => { //循环出商品总共价格
+      if (card.code === 'amount') {
+        card.content = choooseItemList.sum("itemAmt")
+      }
+      if (card.code === 'goodsCount') {
+        card.quantity = choooseItemList.sum("itemQty")
+      }
+    })
     formData.goodsList = choooseItemList
     this.setData({
       formData: JSON.stringify(formData),
@@ -312,7 +315,7 @@ Page({
         element.eidtFlag = true
       }
     });
-    if (!data.flgAutoHandle) {
+    if (!data.flgAutoHandle) { //没开参数
       this.setData({
         contentList: [{
           code: 'goodsCount',
@@ -326,8 +329,8 @@ Page({
           type: 'number'
         }],
       })
-    } else {
-      if (this.data.gradeCode == Constants.gradeCode.STD) {
+    } else { //开了参数
+      if (this.data.gradeCode == Constants.gradeCode.STD) { //标准版
         this.setData({
           contentList: [{
             code: 'goodsCount',
@@ -341,7 +344,7 @@ Page({
             type: 'number'
           }],
         })
-      } else {
+      } else { //专业版
         this.setData({
           contentList: [{
               code: 'flag',

package-purchase/pages/purchase-receipt/add/add.js

@@ -33,101 +33,102 @@ Page({
     }],
     btnFormData: null,
     popContent: [{
-      code: 'priceInto',
-      type: 'number',
-      title: mixins.$t("inboundPrice"),
-      required: true
-    },
+        code: 'priceInto',
+        type: 'number',
+        title: mixins.$t("inboundPrice"),
+        required: true
+      },
 
-    {
-      code: 'itemQty',
-      type: 'step',
-      title: mixins.$t("count"), //'数量',
-      required: true
-    },
-    {
-      code: 'packageBox',
-      type: 'packageBox',
-      title: mixins.$t("packageBox"),
-    },
-    // { code: 'intoingBox', type: 'step', title: mixins.$t("goodsBox"), required: true },
-    // { code: 'intoingPiece', type: 'step', title: mixins.$t("goodsPiece"), required: true },
-    {
-      code: 'whId',
-      name: 'whName',
-      title: mixins.$t("warehouseId"), //'仓库',
-      type: 'drop',
-      dropType: 'warehouse',
-      required: true
-    },
-    {
-      code: 'skuSpec',
-      title: mixins.$t("goodSpec"), //'规格',
-      type: 'str',
-      readonly: true,
-    }, 
-    {
-      code: 'nonStdCode',
-      title: mixins.$t("goodsBatch"), //'色号',
-      type: 'str',
-      tip: mixins.$t('tipPop'),
-    },
-    {
-      code: 'remarks',
-      title: mixins.$t("remarks"), //'备注',
-      type: 'textarea',
-    },
-    ],
-    cardList: [{
-      name: 'main',
-    }, {
-      name: 'wh'
-    }, {
-      name: 'relation'
-    },
-    {
-      name: 'items',
-      title: mixins.$t("goodsDetail"), //'商品明细',
-      controls: [{
-        card: 'relation',
-        code: 'sourceNo'
-      }],
-      info: '(' + mixins.$t("warehousingProcessing") + ')',
-      color: '#E4002B',
-      displayNum: 2,
-      controls: [{
-        card: 'relation',
-        code: 'sourceNo'
-      }], 
-    }, {
-      name: 'other',
-      title: mixins.$t("otherInfo"), // '其他信息'
-    }
-    ],
-    contentObj: {
-      main: [{
-        code: 'supId',
-        name: 'supplierName',
-        title: mixins.$t("supplier"), //'供应商',
-        type: 'choose',
-        required: true,
-        urlKey: 'chooseSupplier'
+      {
+        code: 'itemQty',
+        type: 'step',
+        title: mixins.$t("count"), //'数量',
+        required: true
       },
       {
-        code: 'staffId',
-        name: 'staffName',
-        title: mixins.$t("procureStaff"), //'采购人',
-        type: 'choose',
+        code: 'packageBox',
+        type: 'packageBox',
+        title: mixins.$t("packageBox"),
+      },
+      // { code: 'intoingBox', type: 'step', title: mixins.$t("goodsBox"), required: true },
+      // { code: 'intoingPiece', type: 'step', title: mixins.$t("goodsPiece"), required: true },
+      {
+        code: 'whId',
+        name: 'whName',
+        title: mixins.$t("warehouseId"), //'仓库',
+        type: 'drop',
+        dropType: 'warehouse',
+        required: true
+      },
+      {
+        code: 'skuSpec',
+        title: mixins.$t("goodSpec"), //'规格',
+        type: 'str',
+        readonly: true,
+      },
+      {
+        code: 'nonStdCode',
+        title: mixins.$t("goodsBatch"), //'色号',
+        type: 'str',
         required: true,
-        urlKey: 'chooseStaff'
+        tip: mixins.$t('tipPop'),
+      },
+      {
+        code: 'remarks',
+        title: mixins.$t("remarks"), //'备注',
+        type: 'textarea',
+      },
+    ],
+    cardList: [{
+        name: 'main',
       }, {
-        code: 'orgId',
-        name: 'orgName',
-        title: mixins.$t("procureOrg"), //'采购部门',
-        type: 'choose',
-        required: true,
-        urlKey: 'chooseOrg'
+        name: 'wh'
+      }, {
+        name: 'relation'
       },
+      {
+        name: 'items',
+        title: mixins.$t("goodsDetail"), //'商品明细',
+        controls: [{
+          card: 'relation',
+          code: 'sourceNo'
+        }],
+        info: '(' + mixins.$t("warehousingProcessing") + ')',
+        color: '#E4002B',
+        displayNum: 2,
+        controls: [{
+          card: 'relation',
+          code: 'sourceNo'
+        }],
+      }, {
+        name: 'other',
+        title: mixins.$t("otherInfo"), // '其他信息'
+      }
+    ],
+    contentObj: {
+      main: [{
+          code: 'supId',
+          name: 'supplierName',
+          title: mixins.$t("supplier"), //'供应商',
+          type: 'choose',
+          required: true,
+          urlKey: 'chooseSupplier'
+        },
+        {
+          code: 'staffId',
+          name: 'staffName',
+          title: mixins.$t("procureStaff"), //'采购人',
+          type: 'choose',
+          required: true,
+          urlKey: 'chooseStaff'
+        }, {
+          code: 'orgId',
+          name: 'orgName',
+          title: mixins.$t("procureOrg"), //'采购部门',
+          type: 'choose',
+          required: true,
+          urlKey: 'chooseOrg'
+        },
       ],
       wh: [{
         code: 'whId',
@@ -189,7 +190,7 @@ Page({
       })
       this.setData({
         contentList: contentList_,
-        cardList, 
+        cardList,
       })
       this.selectComponent('#' + this.data.formName).setchooseVisible(true)
     }
@@ -246,7 +247,7 @@ Page({
   setValuesByEdit(data) {
     { //是否可编辑逻辑
       if (data.fromId) { //有来源单据 
-        this.selectComponent('#' + this.data.formName).setchooseVisible(false)//隐藏选商品按钮
+        this.selectComponent('#' + this.data.formName).setchooseVisible(false) //隐藏选商品按钮
         if (this.data.flgHandleSetting) { //系统参数为自动办理
           if (this.data.nopay) { //未付款
             //大编辑
@@ -456,12 +457,15 @@ Page({
         element.chooseList = formData.goodsList
       }
     });
-    contentObj_["main"].forEach(res => {
-      if(res.code === 'supId'){
-        res.readonly = true
-        res.clear = false
-      }
-    })
+    if (this.data.freeVersionFlag) { //标准版需要吧   专业版反正是不需要
+      contentObj_["main"].forEach(res => {
+        if (res.code === 'supId') {
+          res.readonly = true
+          res.clear = false
+        }
+      })
+    }
+
     popContent_.forEach(element => {
       if (element && (element.code == "priceInto")) { //入库价
         element.readonly = true
@@ -666,7 +670,7 @@ Page({
   getData(e) {
     if (!e.idKey) {
       return
-    } 
+    }
     let param = {}
     let excute = this.excute(this.data.purchaseService, this.data.purchaseService.purSelectId + e.id, {});
     excute.then(res => {
@@ -674,8 +678,8 @@ Page({
         let formData = JSON.parse(this.data.formData)
         formData = res.data.data
         this.setData({
-          formData: JSON.stringify(formData), 
-        }) 
+          formData: JSON.stringify(formData),
+        })
         this.calculateTotal(res.data.data.purchaseItemResponseList)
         // 刷新商品明细 显示 查看更多
         let card = this.data.cardList.filter(it => it.name == 'items');
@@ -743,12 +747,12 @@ Page({
         cardList_
       })
     }
-    if(this.data.formMode == Constants.formMode.other){ //转入库进
+    if (this.data.formMode == Constants.formMode.other) { //转入库进
       this.selectComponent('#' + this.data.formName).setchooseVisible(false)
     }
   },
-  onLoad(){ 
-      
-   
+  onLoad() {
+
+
   },
 })

package-purchase/pages/purchase-receipt/add/add.wxml

@@ -5,7 +5,7 @@
 
  
 <dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" titleTagCol="brandName"  subCol="calculationFormula"  descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{(!intoStatusflag)?'intoQty':'intoingQty'}}" sumAmountCol="itemAmt"sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle=""   bind:clear = "clear" readonly = "{{readonly}}"   controlFlags ="{{controlFlags}}"
-bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods" table="{{table}}" detailTipFlag="{{true}}"bindtap="handleTap">
+bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods" table="{{table}}" detailTipFlag="{{true}}"bindtap="handleTap" validFlag="{{true}}">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

package-purchase/pages/supplier-list/detail/detail.wxml

@@ -22,7 +22,7 @@
         <image class="scan-image-icon" fit="fill" src="{{imageUrl+'/customer_detail_02.png'}}"></image>
       </view>
       <view style="padding-left: 10rpx;" catchtap="openTelPhone" data-item="{{item}}">
-        {{ (item.contactName ? item.contactName  : '') +(item.contactName && item.contactPhone ? '/':'')+ (item.contactPhone ? item.contactPhone : '') }}
+        {{ (item.contactName ? item.contactName : '') +(item.contactName && item.contactPhone ? '/':'')+ (item.contactPhone ? item.contactPhone : '') }}
       </view>
     </view>
     <view class="detail-top-color" style="display: flex;" wx:if="{{item.returnAddress}}">
@@ -47,7 +47,7 @@
             <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.purchaseAmount ? item.purchaseAmount : 0}}"></dk-cell>
           </view>
           <view class="oreder-summary-detail">
-            <text style="margin-right: 4px;">订单（{{item.purchaseQuantity}}单）</text> 
+            <text style="margin-right: 4px;">订单（{{item.purchaseQuantity}}单）</text>
             <dk-tip id="dk-tip1" Down="{{true}}" Right="{{true}}" tipContent='数据来源：采购订单' bind:clickTip="handleTap"></dk-tip>
           </view>
         </view>
@@ -56,7 +56,7 @@
             <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.inboundReturnAmount ? item.inboundReturnAmount : 0 }}"></dk-cell>
           </view>
           <view class="oreder-summary-detail">
-            <text style="margin-right: 4px;"> 退货（{{item.inboundReturnQuantity}}单）</text> 
+            <text style="margin-right: 4px;"> 退货（{{item.inboundReturnQuantity}}单）</text>
             <dk-tip id="dk-tip2" Down="{{true}}" Left="{{true}}" tipContent='数据来源：采购退货' bind:clickTip="handleTap"></dk-tip>
           </view>
         </view>
@@ -67,7 +67,7 @@
             <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.payment ? item.payment : 0}}"></dk-cell>
           </view>
           <view class="oreder-summary-detail">
-            <text style="margin-right: 4px;"> 付款总额</text> 
+            <text style="margin-right: 4px;"> 付款总额</text>
             <dk-tip id="dk-tip3" Up="{{true}}" Right="{{true}}" tipContent='数据来源：供应商付款\\退款\r\n计算公式：供应商付款-退款' bind:clickTip="handleTap"></dk-tip>
           </view>
         </view>
@@ -79,7 +79,7 @@
             </dk-cell>
           </view>
           <view class="oreder-summary-detail">
-            <text style="margin-right: 4px;"> 欠款</text> 
+            <text style="margin-right: 4px;"> 欠款</text>
             <dk-tip id="dk-tip4" Up="{{true}}" Left="{{true}}" tipContent='计算公式：(采购订单-退货)-(供应商付款-供应商退款)' bind:clickTip="handleTap"></dk-tip>
           </view>
         </view>
@@ -98,18 +98,20 @@
         </view>
         <view class="number" style="margin-left: 0; margin-right: 0;">
           <view class="order-summary">
-            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.inboundAmount ? item.inboundAmount : 0}}"></dk-cell>
+        
+            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.inboundNotAmount ? item.inboundNotAmount : 0}}"></dk-cell>
           </view>
           <view class="oreder-summary-detail">
-            已出库（{{item.inboundQuantity}}单）
+            入库中（{{item.inboundNotQuantity}}单）
+         
           </view>
         </view>
         <view class="number" style="margin-right: 0;">
           <view class="order-summary">
-            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.inboundNotAmount ? item.inboundNotAmount : 0}}"></dk-cell>
+            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#1B365D" fontWeight="600" title="" content="{{item.inboundAmount ? item.inboundAmount : 0}}"></dk-cell>
           </view>
           <view class="oreder-summary-detail">
-            出库中（{{item.inboundNotQuantity}}单）
+            已入库（{{item.inboundQuantity}}单）
           </view>
         </view>
       </view>
@@ -130,7 +132,7 @@
             </dk-cell>
           </view>
           <view class="oreder-summary-detail">
-            余额
+            欠款
           </view>
         </view>
 

package-sales/pages/customer-collection/add/add.js

@@ -539,13 +539,51 @@ Page({
       // 获取当前客户的账款信息
       this.getAccount(formData.cusId)
     }
-
+    if (this.data.formMode == "sourceCus") { //从客户列表跳转过来的 
+      let contentObj = this.data.contentObj
+      contentObj =  this.setContentObjReadonly(contentObj)    
+      this.setData({ 
+        contentObj:contentObj
+      })
+    }
 
     this.setData({
       formData: JSON.stringify(formData)
     })
 
   },
+
+/**
+   * 客户列表中 客户跟进，跟进任务和客户收款，跳转到新建界面都要把客户信息带过去，并且客户信息不能修改(bug 7605)
+   * @desc : 设置form （ContentObj）哪些可以输入 
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  setContentObjReadonly(Obj) {
+    let contentObj = Obj
+    if (this.data.formMode == "sourceCus") { //从客户列表跳转过来的
+      let cusName_index = contentObj.main.findIndex(it => it.code == "cusName")
+      let cusPhone_index = contentObj.main.findIndex(it => it.code == "cusPhone")
+      let addressFull_index = contentObj.main.findIndex(it => it.code == "addressFull")
+      let addressNo_index = contentObj.main.findIndex(it => it.code == "addressNo")
+      if (cusName_index >= 0) {
+        contentObj.main[cusName_index].readonly = true
+      }
+      if (cusPhone_index >= 0) {
+        contentObj.main[cusPhone_index].readonly = true
+      }
+      if (addressFull_index >= 0) {
+        contentObj.main[addressFull_index].readonly = true
+      }
+      if (addressNo_index >= 0) {
+        contentObj.main[addressNo_index].readonly = true
+      }
+       
+    }
+    return contentObj
+  },
+
+
 /**
    * @desc   : 手机号离焦事件
    * @author : 于继渤

pages/company/company.js

@@ -232,7 +232,6 @@ Page({
                     app.globalData.company_social = { ...app.globalData.company }
                     app.globalData.user_social = { ...app.globalData.user }
                 }
-                ('app.company', app.globalData);
                 // 记录登录的缓存
                 app.globalData.company = data.company
 

pages/home-page/home-page.js

@@ -632,8 +632,9 @@ Page({
     })
     // 本周本月数据
     this.tauchSwiper('swiperList');
-    // 查询广告数据
-    this.getAdvertisement();
+     // 查询广告数据
+     this.getAdvertisement();
+
     // options 中的 scene  todo.. 先不要删除日志
     if (options.scene) {
       // var scene = options.scene

pages/mine/mine.js

@@ -635,7 +635,12 @@ Page({
       }
       return this.excute(_this.data.oauthService, _this.data.oauthService.logout, params).then(res => {
         if (res.data.code === Constants.SUCESS_CODE) {
-          app.globalData = {}
+          // 不能清除整个globalData,切换公司会因为找不到globalData数据而报错
+          // app.globalData = {}
+          // 清除掉用户信息
+          delete app.globalData['user']
+          // 清除公司信息
+          delete app.globalData['company']
           // 调转主页
           wx.reLaunch({
             url: '../../pages/welcome/welcome',