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

api/pages/ivt/saleOutBound.js

@@ -14,32 +14,35 @@ module.exports = {
     outboundInsert: 'outbound_insert',
     outboundUpdate: 'outbound_update',
     handleOutbound: 'handle_outbound',
-    getOutboundForUpdate:'get_outbound_for_update',
-    repeal:'repeal',
-    selectByCondDetail:'select_by_cond_detail', //总单带明细 
-    outboundInsertCollection:'outbound_insert_collection',
+    getOutboundForUpdate: 'get_outbound_for_update',
+    repeal: 'repeal',
+    selectByCondDetail: 'select_by_cond_detail', //总单带明细 
+    outboundInsertCollection: 'outbound_insert_collection',
     saleOrderOutboundCancel: 'sale_order_outbound_cancel',
   },
 
   routeUrl: {
-    saleOutBound: { 
-      docName:{key:'order_out' ,title:'销售单'},
-      add:{key:'add',url:'/package-sales/pages/sales-outbound/add/add'},
-      edit:{key:'edit',url:'/package-sales/pages/sales-outbound/add/add',idKey:'outId',formType:'detail'},
-      selectSourceSaleOrder:{
-        key:'selectSourceSaleOrder',url:'/package-base-select/pages/select-source-sale-order/select-source-sale-order'
+    saleOutBound: {
+      docName: { key: 'order_out', title: '销售单' },
+      add: { key: 'add', url: '/package-sales/pages/sales-outbound/add/add' },
+      edit: { key: 'edit', url: '/package-sales/pages/sales-outbound/add/add', idKey: 'outId', formType: 'detail' },
+      selectSourceSaleOrder: {
+        key: 'selectSourceSaleOrder', url: '/package-base-select/pages/select-source-sale-order/select-source-sale-order'
       },
-      
+
       selectCustomers: { key: 'selectCustomers', url: '/package-base-select/pages/select-customers/select-customers' },
-      openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  },
-      selectInventorySku:{ key: 'selectInventorySku', url: '/package-base-select/pages/select-data/select-data',type:'inventorySku'  },
-      invalid: { key: 'invalid', method: 'invalid', primaryKey: 'outId' , image:'btn-void.png'},
-      editInto: { key: 'editInto', method: 'editInto', primaryKey: 'outId', image: 'btn-edit.png'}, //编辑
-      salesOutbound:{ key: 'salesOutbound', method: 'toDetail', primaryKey: 'outId' , image:'btn-outbound-processing.png'},
-      printedBill:{ key: 'printedBill', method:'printedBill', formMode: 'index', idKey: 'outId',image:'btn-printing.png' },
-      saleOrderReturn: { key: 'saleOrderReturn', url: '/package-sales/pages/order-return/add/add' , image:'btn-sales-returns.png', tipMethod: 'isAllowedSaleOrderReturn'},
+      openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data', type: 'warehouse' },
+      selectInventorySku: { key: 'selectInventorySku', url: '/package-base-select/pages/select-data/select-data', type: 'inventorySku' },
+      invalid: { key: 'invalid', method: 'invalid', primaryKey: 'outId', image: 'btn-void.png' },
+      editInto: { key: 'editInto', method: 'editInto', primaryKey: 'outId', image: 'btn-edit.png' }, //编辑
+      salesOutbound: { key: 'salesOutbound', method: 'toDetail', primaryKey: 'outId', image: 'btn-outbound-processing.png' },
+      printedBill: { key: 'printedBill', method: 'printedBill', formMode: 'index', idKey: 'outId', image: 'btn-printing.png' },
+      saleOrderReturn: { key: 'saleOrderReturn', url: '/package-sales/pages/order-return/add/add', image: 'btn-sales-returns.png', tipMethod: 'isAllowedSaleOrderReturn' },
       cusReturnCollection: { key: 'cusReturnCollection', url: '/package-sales/pages/customer-collection/refund/refund', idKey: 'rpId', formMode: 'edit', image: 'btn-customer-refund.png' },
       cusCollection: { key: 'cusCollection', url: '/package-sales/pages/customer-collection/add/add', idKey: 'receivableId', formMode: 'edit', image: 'btn-customer-collection.png' },
+      detailCustomer: {
+        key: 'detailCustomer', url: '/package-basic-data/pages/customer-list/detail/detail'
+      },
     }
   }
 };

api/pages/ivt/saleOutBoundReturn.js

@@ -13,29 +13,32 @@ module.exports = {
     prefix: 'mdm-server/ivt/outbound_sale_return/',
     outboundInsert: 'outbound_insert', //新建
     saleReturnHandleOutbound: 'handle_outbound', //办理
-    saleReturnOutboundCancel: 'outbound_cancel' ,//撤销
+    saleReturnOutboundCancel: 'outbound_cancel',//撤销
     otherOutboundUpdate: 'outbound_update', //编辑
     repeal: 'repeal', //作废
     getOutReturnForUpdate: 'get_out_return_for_update', //作废
-    saleReturnOutboundCancel:'outbound_cancel',
-    outboundInsertRefund:'outbound_insert_refund',//新建销售退货 退款
-    getOutReturnForUpdateWx:'get_out_return_for_update_wx',//新建销售退货 退款
+    saleReturnOutboundCancel: 'outbound_cancel',
+    outboundInsertRefund: 'outbound_insert_refund',//新建销售退货 退款
+    getOutReturnForUpdateWx: 'get_out_return_for_update_wx',//新建销售退货 退款
   },
 
   routeUrl: {
-    saleOutBoundReturn: { 
-      add:{key:'add',url:'/package-sales/pages/order-return/add/add'},
-      edit:{key:'edit',url:'/package-sales/pages/order-return/add/add',idKey:'outId',formType:'detail'},
-      selectSourceSaleOrder:{
-        key:'selectSourceSaleOrder',url:'/package-base-select/pages/select-source-sale-out-order/select-source-sale-out-order' , primaryKey: 'cusId'
-      }, 
+    saleOutBoundReturn: {
+      add: { key: 'add', url: '/package-sales/pages/order-return/add/add' },
+      edit: { key: 'edit', url: '/package-sales/pages/order-return/add/add', idKey: 'outId', formType: 'detail' },
+      selectSourceSaleOrder: {
+        key: 'selectSourceSaleOrder', url: '/package-base-select/pages/select-source-sale-out-order/select-source-sale-out-order', primaryKey: 'cusId'
+      },
       selectCustomers: { key: 'selectCustomers', url: '/package-base-select/pages/select-customers/select-customers' },
-      openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  },
-      selectInventorySku:{ key: 'selectInventorySku', url: '/package-base-select/pages/select-data/select-data',type:'inventorySku'  },
-      invalid: { key: 'invalid', method: 'invalid', primaryKey: 'outId' , image:'btn-void.png'},
-      salesOutReturnBound:{ key: 'salesOutReturnBound', method: 'toDetail', primaryKey: 'outId' , image:'btn-outbound-processing.png'},
-      printedBill:{ key: 'printedBill', method:'printedBill', formMode: 'index', idKey: 'cusId',image:'btn-printing.png' },
-      editInto: { key: 'editInto', method: 'editInto', primaryKey: 'outId', image: 'btn-edit.png'}, //编辑
+      openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data', type: 'warehouse' },
+      selectInventorySku: { key: 'selectInventorySku', url: '/package-base-select/pages/select-data/select-data', type: 'inventorySku' },
+      invalid: { key: 'invalid', method: 'invalid', primaryKey: 'outId', image: 'btn-void.png' },
+      salesOutReturnBound: { key: 'salesOutReturnBound', method: 'toDetail', primaryKey: 'outId', image: 'btn-outbound-processing.png' },
+      printedBill: { key: 'printedBill', method: 'printedBill', formMode: 'index', idKey: 'cusId', image: 'btn-printing.png' },
+      editInto: { key: 'editInto', method: 'editInto', primaryKey: 'outId', image: 'btn-edit.png' }, //编辑
+      detailCustomer: {
+        key: 'detailCustomer', url: '/package-basic-data/pages/customer-list/detail/detail'
+      },
     }
   }
 };

api/pages/mst/staff.js

@@ -20,15 +20,15 @@ module.exports = {
             // 用name代替url,为了传递params,params和url不能一起使用
             add: { key: 'add', url: './add/add' },
             edit: { key: 'edit', url: './add/add' },
-            chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
+            chooseOrg: { key: 'chooseOrg', url: '/package-base-select/pages/select-data/select-data', type: 'org' },
             chooseRole: { key: 'chooseRole', url: '/package-base-select/pages/select-data/select-data', type: 'role', chooseFlag: true },
             // 功能权限
             staffRight: { key: 'staffRight', url: '/package-base-select/pages/select-staff-right/select-staff-right', image: 'btn-functional-permissions.png', valid: true },
             // 范围权限
             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 },
-
+            leaveOffice: { key: 'leaveOffice', method: 'leaveOffice', image: 'btn-resignation.png', question: true },
+            buy: { key: 'buy', url: '/package-basic-data/pages/activity/activity' }
         }
     }
 };

api/pages/sale/order.js

@@ -39,7 +39,10 @@ module.exports = {
       chooseChannel: { key: 'chooseChannel', url: '/package-base-select/pages/select-data/select-data', type: 'saleChannel'},
       choosecusFrom: { key: 'choosecusFrom', url: '/package-base-select/pages/select-data/select-data', type: 'customerFrom' },
       collection:{ key: 'collection', url: '/package-sales/pages/customer-collection/add/add', formMode: 'add', idKey: 'cusId',image:'btn-customer-collection.png',formType:'add' }, //跳转客户收款
-      printedBill:{ key: 'printedBill', method:'printedBill', formMode: 'index', idKey: 'cusId',image:'btn-printing.png' }
+      printedBill:{ key: 'printedBill', method:'printedBill', formMode: 'index', idKey: 'cusId',image:'btn-printing.png' },
+      detailCustomer: {
+        key: 'detailCustomer', url: '/package-basic-data/pages/customer-list/detail/detail'
+      },
     }
 
   }

components/dkbase/dk-cell/dk-cell.js

@@ -99,6 +99,13 @@ Component({
       value:false
     },
     /**
+     * 内容的中删除线
+     */
+    contentLine:{
+      type:Boolean,
+      value:false
+    },
+    /**
      * 标题的颜色
      */
     titleColor:{

components/dkbase/dk-cell/dk-cell.wxml

@@ -1,4 +1,4 @@
-<view id="totalView" class="total_class" style="--height--:{{errorMessage?('calc(' + height +' + 30rpx)' ):height}};--left--:{{left}};--center--:{{center?center:(title?'left':'center')}}">
+<view id="totalView" class="total_class" style="--height--:{{errorMessage?('calc(' + height +' + 30rpx)' ):height}};--left--:{{left}};--center--:{{center?center:(title?'left':'center')}};--line--:{{contentLine?'line-through':'none'}};">
   <view class="title_class" wx:if="{{title}}" style="--titleColor--:{{titleColor==''?contentColor:titleColor}};--fontSize--:{{fontSize + 'px'}};--fontWeight--:{{fontWeight}};--titleWidth--:{{titleWid?titleWid:''}}">{{title}} </view>
 
   <!--placeholder-->
@@ -6,15 +6,15 @@
   <!--错误提示信息-->
   <view wx:if="{{errorMessage}}" class="{{contentRight?'content_class':'content_left_class'}} errMsg_class" style="--contentColor--:{{placeholderColor}};--fontSize--:{{(contentFontSize==0?fontSize:contentFontSize) + 'px'}};--titleWidth--:{{titleWid?titleWid :titleWidth + 'px'}};--fontWeight--:{{contentFontWeight==''?fontWeight:contentFontWeight}};--spaceWidth--:{{title?spaceWidth:''}}">{{errorMessage}}</view>
   <view wx:if="{{displayValue}}" class="{{contentRight?'content_class':'content_left_class'}}" style="--contentColor--:{{contentColor}};--fontSize--:{{(contentFontSize==0?fontSize:contentFontSize) + 'px'}};--titleWidth--:{{titleWid?titleWid :titleWidth + 'px'}};--fontWeight--:{{contentFontWeight==''?fontWeight:contentFontWeight}};--spaceWidth--:{{title?spaceWidth:''}};--center-:{{center}}"> 
-    <view wx:if="{{tail}}" style="display: flex;">
+    <!-- <view wx:if="{{tail}}" style="display: flex;">
       <view wx:if="{{amount && displayValue}}" class="sign-class" style="--fontSize--:{{signSize?signSize:((fontSize - 5 ) + 'px')}};--color--:{{contentColor}};--line--:{{tailLine?'line-through':'none'}};">{{percentSignFlag ? '' :car}}</view>
       <view class="sign-class-tail" style="--fontSize--:{{signSize?signSize:((fontSize - 5 ) + 'px')}};--color--:{{tailColor==''?contentColor:tailColor}};--line--:{{tailLine?'line-through':'none'}};--tailFontWeight--:{{tailFontWeight==''?fontWeight:tailFontWeight}}">
         {{tail}}
       </view>
-    </view>
+    </view> -->
     <view wx:if="{{amount && displayValue}}" class="sign-class" style="--fontSize--:{{signSize?signSize:((fontSize - 5 ) + 'px')}};--color--:{{contentColor}}">{{percentSignFlag ? '' :car}}</view>{{displayValue}}
     <view wx:if="{{decimalFlag && decimalValue}}" class="sign-class" style="--fontSize--:{{signSize?signSize:((fontSize - 5 ) + 'px')}};--color--:{{contentColor}}">{{decimalValue}}</view>
-
+    <view wx:if="{{tail}}" class="sign-class-tail" style="--fontSize--:{{signSize?signSize:((fontSize - 5 ) + 'px')}};--color--:{{tailColor==''?contentColor:tailColor}};--line--:{{tailLine?'line-through':'none'}};--tailFontWeight--:{{tailFontWeight==''?fontWeight:tailFontWeight}}">{{tail}}</view>
   </view>
 
 </view>

components/dkbase/dk-cell/dk-cell.wxss

@@ -6,6 +6,7 @@
   display: flex;
   text-align: var(--center--);
   justify-content: var(--center--);
+  text-decoration:var(--line--);
 }
 .title_class{
   font-size: var(--fontSize--);

components/dkbase/dk-popup/dk-popup.wxml

@@ -14,8 +14,10 @@
         <dk-text fontWeight="normal" value="{{form[descCol]}}"></dk-text>
       </view>
       <view style="display: flex;padding-top: 5rpx;">
-        <view class="price-pop-class">
-          <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#FF7B1A" fontWeight="bold" title="{{priceTitle}}" tail="{{form[priceTailCol]}}" content="{{form[priceCol]}}"tailLine="{{true}}" ></dk-cell>
+        <view class="price-pop-class" style="display: flex;">
+          <!-- <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#FF7B1A" fontWeight="bold" title="{{priceTitle}}" tail="{{form[priceTailCol]}}" content="{{form[priceCol]}}" tailLine="{{true}}" ></dk-cell> -->
+          <dk-cell wx:if="{{form[priceTailCol] != form[priceCol]}}" height="46rpx" left="0" fontSize="12" contentColor="#FF7B1A" fontWeight="bold" title="{{priceTitle}}" contentLine="{{true}}" content="{{form[priceTailCol]}}" ></dk-cell>
+          <dk-cell height="46rpx" style="margin-left: 20rpx;" left="0" fontSize="14" contentColor="#FF7B1A" fontWeight="bold" title="{{priceTitle}}" content="{{form[priceCol]}}"  ></dk-cell>
         </view>
       </view>
       <view wx:if="{{form[subCol]}}" style="padding-right: 30rpx;float: right;">

i18n/zh-CN.js

@@ -238,6 +238,7 @@ const home = {
   wechatScan: '使用微信扫码',
   waitAddCom: '等待加入企业中...',
   selectCompany: '请选择进入企业',
+  buyUser:'购买授权',
 }
 
 //  基础数据

mixins/index.js

@@ -266,9 +266,10 @@ module.exports = {
     let name;
     let item;
     if (typeof e === 'object') {
-      if(e && e.currentTarget){
-      name = e.currentTarget.dataset.name;
-      item = e.currentTarget.dataset.item;}
+      if (e && e.currentTarget) {
+        name = e.currentTarget.dataset.name;
+        item = e.currentTarget.dataset.item;
+      }
       // 那可能是在detail中
       if (!name && e.detail) {
         name = e.detail.name;
@@ -318,8 +319,16 @@ module.exports = {
           events: {
             // 保存成功后刷新页面
             refresh: function (data) {
-              // 刷新一览界面
-              _this.searchData();
+              console.log('data', data);
+              if (data.backFlag) {
+                // 刷新一览界面
+                wx.reLaunch({
+                  url: '/pages/welcome/welcome?' + name + '=true',
+                })
+              } else {
+                // 刷新一览界面
+                _this.searchData();
+              }
             }
           },
           success: function (res) {
@@ -498,7 +507,6 @@ module.exports = {
               events: {
                 // 回调后
                 refresh: function (data) {
-                  console.log('dddfffffddd', data);
                   // 回退
                   if (data.backFlag) {
                     const eventChannel = that.getOpenerEventChannel();
@@ -775,7 +783,6 @@ module.exports = {
             _this.setData({
               loading: false
             })
-            console.log('bbbbd', closeFlag);
             if (closeFlag) {
               const eventChannel = _this.getOpenerEventChannel();
               eventChannel.emit('refresh', {

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

@@ -94,16 +94,17 @@ Page({
    */
   saveButton(e) {
     let formData = JSON.parse(this.data.formData)
-    console.log(formData.itemList)
-    if (this.data.item == Constants.billType.sale) {
-
-    }
+    console.log(formData.itemList) 
     formData.itemList.forEach(res => {
       if (this.data.item == Constants.billType.saleOut) {
         res['priceOut'] = res.itemPrice
         res['outingQty'] = res.itemQty
         res['outingAmt'] = res.itemAmt
       }
+      if (this.data.item == Constants.billType.sale) {
+        res['priceSale'] = res.itemPrice 
+        res['sumPrice'] = res.itemAmt
+      }
       res['brandName'] =  res['supName']+"(外协)"
     })
 

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

@@ -20,13 +20,13 @@ Page({
     gradeCode: app.globalData.company.gradeCode,
     firstFlag: true,
     orderBy: [{
-      "text": "可售量升序",
-      "value": 1
-    },
-    {
-      "text": "可售量降序",
-      "value": 2
-    }
+        "text": "可售量升序",
+        "value": 1
+      },
+      {
+        "text": "可售量降序",
+        "value": 2
+      }
     ],
     routeObjName: 'goodsSku',
     dataItem: null,
@@ -39,36 +39,36 @@ Page({
     brandId: null,
     active: 0,
     popContent: [{
-      code: 'itemQty',
-      type: 'negativeStep',
-      title: '数量',
-      required: true
-    },
-    {
-      code: 'whId',
-      name: 'whName',
-      title: '仓库',
-      type: 'choose',
-      urlKey: 'chooseWh'
-    },
-    {
-      code: 'skuSpec',
-      title: '规格',
-      type: 'str',
-      readonly: true,
-      dropType: ''
-    },
-    {
-      code: 'brandName',
-      title: mixins.$t('brandName'),
-      type: 'str',
-      readonly: true,
-    },
-    {
-      code: 'nonStdCode',
-      title: '色号',
-      type: 'str',
-    },
+        code: 'itemQty',
+        type: 'negativeStep',
+        title: '数量',
+        required: true
+      },
+      {
+        code: 'whId',
+        name: 'whName',
+        title: '仓库',
+        type: 'choose',
+        urlKey: 'chooseWh'
+      },
+      {
+        code: 'skuSpec',
+        title: '规格',
+        type: 'str',
+        readonly: true,
+        dropType: ''
+      },
+      {
+        code: 'brandName',
+        title: mixins.$t('brandName'),
+        type: 'str',
+        readonly: true,
+      },
+      {
+        code: 'nonStdCode',
+        title: '色号',
+        type: 'str',
+      },
     ],
     popContentBox: [],
     popupTopObj: [{
@@ -132,8 +132,7 @@ Page({
       }]
       this.setData({
         buttonList: buttonList,
-        contentList: [
-          {
+        contentList: [{
             code: 'amount',
             content: 0,
             type: 'number',
@@ -151,59 +150,59 @@ Page({
     if (this.data.item == Constants.billType.sale) {
       this.setData({
         popContent: [{
-          code: 'itemQty',
-          type: 'step',
-          title: mixins.$t("count"),
-          required: true
-        },
-        {
-          code: 'packageBox',
-          type: 'packageBox',
-          title: mixins.$t("packageBox"), 
-        },
+            code: 'itemQty',
+            type: 'step',
+            title: mixins.$t("count"),
+            required: true
+          },
+          {
+            code: 'packageBox',
+            type: 'packageBox',
+            title: mixins.$t("packageBox"),
+          },
 
-        {
-          code: 'priceSale',
-          type: 'number',
-          title: mixins.$t("priceSale"),
-          required: true,
-          center: 'right'
-        },
-        // {
-        //   code: 'whId',
-        //   name: 'whName',
-        //   title: mixins.$t("warehouseId"),
-        //   type: 'choose',
-        //   urlKey: 'openingInventory',
-        // },
-        {
-          code: 'whId',
-          name: 'whName',
-          title: mixins.$t("warehouseId"),
-          type: 'choose',
-          urlKey: 'chooseWh'
-        },
-        {
-          code: 'brandName',
-          title: mixins.$t('brandName'),
-          type: 'str',
-          readonly: true,
-        },
-        {
-          code: 'nonStdCode',
-          title: mixins.$t("goodsBatch"),
-          type: 'str',
-        },
-        {
-          code: 'flgGift',
-          title: mixins.$t("flgGift"),
-          type: 'checkbox',
-        },
-        {
-          code: 'usePlace',
-          title: mixins.$t("usePlace"),
-          type: 'str',
-        },
+          {
+            code: 'priceSale',
+            type: 'number',
+            title: mixins.$t("priceSale"),
+            required: true,
+            center: 'right'
+          },
+          // {
+          //   code: 'whId',
+          //   name: 'whName',
+          //   title: mixins.$t("warehouseId"),
+          //   type: 'choose',
+          //   urlKey: 'openingInventory',
+          // },
+          {
+            code: 'whId',
+            name: 'whName',
+            title: mixins.$t("warehouseId"),
+            type: 'choose',
+            urlKey: 'chooseWh'
+          },
+          {
+            code: 'brandName',
+            title: mixins.$t('brandName'),
+            type: 'str',
+            readonly: true,
+          },
+          {
+            code: 'nonStdCode',
+            title: mixins.$t("goodsBatch"),
+            type: 'str',
+          },
+          {
+            code: 'flgGift',
+            title: mixins.$t("flgGift"),
+            type: 'checkbox',
+          },
+          {
+            code: 'usePlace',
+            title: mixins.$t("usePlace"),
+            type: 'str',
+          },
         ]
       })
     }
@@ -211,48 +210,48 @@ Page({
     if (this.data.item == Constants.billType.inventory) {
       this.setData({
         popContent: [{
-          code: 'itemQty',
-          type: 'step',
-          title: mixins.$t("count"),
-          required: true
-        },
-        {
-          code: 'packageBox',
-          type: 'packageBox',
-          title: mixins.$t("packageBox"),
-        },
-        {
-          code: 'priceOut',
-          type: 'number',
-          title: mixins.$t("priceSale"),
-          required: true,
-          readonly: false
-        },
+            code: 'itemQty',
+            type: 'step',
+            title: mixins.$t("count"),
+            required: true
+          },
+          {
+            code: 'packageBox',
+            type: 'packageBox',
+            title: mixins.$t("packageBox"),
+          },
+          {
+            code: 'priceOut',
+            type: 'number',
+            title: mixins.$t("priceSale"),
+            required: true,
+            readonly: false
+          },
 
-        {
-          code: 'whName',
-          readonly: true,
-          title: mixins.$t("warehouseId"),
-          type: 'str'
-        },
-        {
-          code: 'brandName',
-          title: mixins.$t('brandName'),
-          type: 'str',
-          readonly: true,
-        },
-        {
-          code: 'nonStdCode',
-          readonly: true,
-          title: mixins.$t("goodsBatch"),
-          type: 'str',
-          tip: mixins.$t('tipPop'),
-        },
-        {
-          code: 'usePlace',
-          title: mixins.$t("usePlace"),
-          type: 'str',
-        },
+          {
+            code: 'whName',
+            readonly: true,
+            title: mixins.$t("warehouseId"),
+            type: 'str'
+          },
+          {
+            code: 'brandName',
+            title: mixins.$t('brandName'),
+            type: 'str',
+            readonly: true,
+          },
+          {
+            code: 'nonStdCode',
+            readonly: true,
+            title: mixins.$t("goodsBatch"),
+            type: 'str',
+            tip: mixins.$t('tipPop'),
+          },
+          {
+            code: 'usePlace',
+            title: mixins.$t("usePlace"),
+            type: 'str',
+          },
         ]
       })
     }
@@ -262,61 +261,60 @@ Page({
       this.setData({
 
         popContent: [{
-          code: 'itemQty',
-          type: 'step',
-          title: mixins.$t("count"),
-          required: true
-        },
-        {
-          code: 'packageBox',
-          type: 'packageBox',
-          title: mixins.$t("packageBox"),
-        },
+            code: 'itemQty',
+            type: 'step',
+            title: mixins.$t("count"),
+            required: true
+          },
+          {
+            code: 'packageBox',
+            type: 'packageBox',
+            title: mixins.$t("packageBox"),
+          },
 
-        {
-          code: 'priceOut',
-          type: 'number',
-          title: mixins.$t("priceSale"),
-          required: true,
-          readonly: false,
-          center: 'right'
-        },
-        {
-          code: 'whId',
-          name: 'whName',
-          title: mixins.$t("warehouseId"),
-          type: 'choose',
-          urlKey: 'chooseWh'
-        },
-        {
-          code: 'brandName',
-          title: mixins.$t('brandName'),
-          type: 'str',
-          readonly: true,
-        },
-        {
-          code: 'nonStdCode',
-          title: mixins.$t("goodsBatch"),
-          type: 'str',
-        },
-        {
-          code: 'usePlace',
-          title: mixins.$t("usePlace"),
-          type: 'str',
-        },
-        {
-          code: 'flgGift',
-          title: mixins.$t("flgGift"),
-          type: 'checkbox',
-        },
+          {
+            code: 'priceOut',
+            type: 'number',
+            title: mixins.$t("priceSale"),
+            required: true,
+            readonly: false,
+            center: 'right'
+          },
+          {
+            code: 'whId',
+            name: 'whName',
+            title: mixins.$t("warehouseId"),
+            type: 'choose',
+            urlKey: 'chooseWh'
+          },
+          {
+            code: 'brandName',
+            title: mixins.$t('brandName'),
+            type: 'str',
+            readonly: true,
+          },
+          {
+            code: 'nonStdCode',
+            title: mixins.$t("goodsBatch"),
+            type: 'str',
+          },
+          {
+            code: 'usePlace',
+            title: mixins.$t("usePlace"),
+            type: 'str',
+          },
+          {
+            code: 'flgGift',
+            title: mixins.$t("flgGift"),
+            type: 'checkbox',
+          },
         ]
       })
     }
     //销售退货
     if (this.data.item == Constants.billType.saleOutReturn) {
       this.setData({
-        contentList: [
-          {
+        contentList: [{
             code: 'amount',
             content: 0,
             type: 'number',
@@ -329,43 +327,43 @@ Page({
           }
         ],
         popContent: [{
-          code: 'itemQty',
-          type: 'step',
-          title: mixins.$t("count"),
-          required: true
-        },
-        {
-          code: 'packageBox',
-          type: 'packageBox',
-          title: mixins.$t("packageBox"),
-        },
-        {
-          code: 'priceOut',
-          type: 'number',
-          title: mixins.$t("priceSale"),
-          required: true,
-          readonly: false,
-          center: 'right'
-        },
-        {
-          code: 'whId',
-          name: 'whName',
-          choosePopupType: '',
-          title: mixins.$t("warehouseId"),
-          type: 'choose',
-          urlKey: 'openingInventory',
-        },
-        {
-          code: 'brandName',
-          title: mixins.$t('brandName'),
-          type: 'str',
-          readonly: true,
-        },
-        {
-          code: 'nonStdCode',
-          title: mixins.$t("goodsBatch"),
-          type: 'str',
-        },
+            code: 'itemQty',
+            type: 'step',
+            title: mixins.$t("count"),
+            required: true
+          },
+          {
+            code: 'packageBox',
+            type: 'packageBox',
+            title: mixins.$t("packageBox"),
+          },
+          {
+            code: 'priceOut',
+            type: 'number',
+            title: mixins.$t("priceSale"),
+            required: true,
+            readonly: false,
+            center: 'right'
+          },
+          {
+            code: 'whId',
+            name: 'whName',
+            choosePopupType: '',
+            title: mixins.$t("warehouseId"),
+            type: 'choose',
+            urlKey: 'openingInventory',
+          },
+          {
+            code: 'brandName',
+            title: mixins.$t('brandName'),
+            type: 'str',
+            readonly: true,
+          },
+          {
+            code: 'nonStdCode',
+            title: mixins.$t("goodsBatch"),
+            type: 'str',
+          },
         ]
       })
     }
@@ -373,43 +371,43 @@ Page({
     if (this.data.item == Constants.billType.purReturn) {
       this.setData({
         popContent: [{
-          code: 'itemQty',
-          type: 'step',
-          title: mixins.$t("count"),
-          required: true
-        },
-        {
-          code: 'packageBox',
-          type: 'packageBox',
-          title: mixins.$t("packageBox"),
-        },
-        {
-          code: 'priceStandard',
-          type: 'number',
-          title: mixins.$t("purReturnPrice"),
-          required: true,
-          readonly: true,
-          center: 'right'
-        },
-        {
-          code: 'whId',
-          name: 'whName',
-          choosePopupType: '',
-          title: mixins.$t("warehouseId"),
-          type: 'choose',
-          urlKey: 'selectInventorySku',
-        },
-        {
-          code: 'brandName',
-          title: mixins.$t('brandName'), 
-          type: 'str',
-          readonly:true,
-      },
-        {
-          code: 'nonStdCode',
-          title: mixins.$t("goodsBatch"),
-          type: 'str',
-        },
+            code: 'itemQty',
+            type: 'step',
+            title: mixins.$t("count"),
+            required: true
+          },
+          {
+            code: 'packageBox',
+            type: 'packageBox',
+            title: mixins.$t("packageBox"),
+          },
+          {
+            code: 'priceStandard',
+            type: 'number',
+            title: mixins.$t("purReturnPrice"),
+            required: true,
+            readonly: true,
+            center: 'right'
+          },
+          {
+            code: 'whId',
+            name: 'whName',
+            choosePopupType: '',
+            title: mixins.$t("warehouseId"),
+            type: 'choose',
+            urlKey: 'selectInventorySku',
+          },
+          {
+            code: 'brandName',
+            title: mixins.$t('brandName'),
+            type: 'str',
+            readonly: true,
+          },
+          {
+            code: 'nonStdCode',
+            title: mixins.$t("goodsBatch"),
+            type: 'str',
+          },
         ]
       })
     }
@@ -751,15 +749,18 @@ Page({
         this.data.item == Constants.billType.inventory
       ) { //销售退货
         item = this.priceSystem(item, 'priceOut') //根据价格体系取值
-        item.priceOut = item.priceStandard ? item.priceStandard : 0 //标价
+        item.priceOut = item.priceStandard ? item.priceStandard : 0 //标价 //销售出库的inventory 
         if (this.data.gradeCode == 'STD') {
-          item.priceOut = 0
+          item.priceOut = 0 
         }
         item.sumPrice = item.priceOut * item.itemQty
       }
       if (this.data.item == Constants.billType.purReturn) { //采购退货 
         item.sumPrice = item.priceStandard ? item.priceStandard * item.itemQty : 0
       }
+      if(this.data.item == Constants.billType.sale){
+        item = this.priceSystem(item, 'priceSale') //根据价格体系取值
+      }
     }
 
     //选了辅助计量单位 正好 包装也有值 那么直接给出公式
@@ -835,17 +836,17 @@ Page({
       this.data.item == Constants.billType.inventory) {
       this.setData({
         popContentBox: [{
-          code: 'box',
-          type: 'step',
-          title: dataItem.subUnitName,
-          required: true
-        },
-        {
-          code: 'piece',
-          type: 'step',
-          title: dataItem.unitName,
-          required: true
-        },
+            code: 'box',
+            type: 'step',
+            title: dataItem.subUnitName,
+            required: true
+          },
+          {
+            code: 'piece',
+            type: 'step',
+            title: dataItem.unitName,
+            required: true
+          },
         ],
 
       })
@@ -855,10 +856,10 @@ Page({
     })
   },
   /**
- * @desc   : 修改str 文本变化
- * @author : 王英杰
- * @date   : 2024/2/2 11:46
- */
+   * @desc   : 修改str 文本变化
+   * @author : 王英杰
+   * @date   : 2024/2/2 11:46
+   */
   changeField(e) {
     console.log("changeField", e);
     let dataItem = JSON.parse(this.data.dataItem)
@@ -1039,6 +1040,9 @@ Page({
         return
       }
     }
+    if (this.data.billType == Constants.billType.inventory){ //解决 销售订单的出库 没有价格问题  受销售出库的 选择库存限制
+      item.priceSale = item.priceOut
+    } 
     choosedGoodsList.push(item)
     this.setData({
       choosedGoodsList: choosedGoodsList
@@ -1063,7 +1067,7 @@ Page({
       Dialog.alert({
         title: '提示',
         message: '销售价格不能低于销售限价',
-      }).then(() => { })
+      }).then(() => {})
       return false
     }
     return true
@@ -1111,7 +1115,7 @@ Page({
         url: chooseRoute,
         events: {
           // 回调后
-          bindData: function (data) { }
+          bindData: function (data) {}
         },
         success: function (res) {
           let data = {
@@ -1181,7 +1185,9 @@ Page({
    * @author : 姜永辉
    */
   getGoodsBrandNoPage() {
-    return this.excute(this.data.commonService, this.data.commonService.getGoodsBrandNoPage, { flgValid: true }).then(res => {
+    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-basic-data/pages/activity/activity.js

@@ -16,6 +16,10 @@ Page({
      * 页面的初始数据
      */
     data: {
+        // 是否加载完毕
+        loadFlag:false,
+        // 是否显示vip
+        showVip:false,
         // 升级标识
         upgradeFlag: false,
         gradeCode: null,
@@ -369,6 +373,12 @@ Page({
             params.buyEndDate = summaryInfo.userEndDate
             params.endDate = app.globalData.company.endDate
             params.wxMaxNum = summaryInfo.wxMaxNum
+            
+            if(this.data.showVip && this.data.chooseVipFlag){
+                params.vip = true;
+            }else if(!this.data.showVip && app.globalData.company.vip){
+                params.vip = true;
+            }
             if(this.data.chooseVipFlag){
                 params.vip = true;
             }
@@ -412,6 +422,9 @@ Page({
                     })
                 }
             }
+            this.setData({
+                loadFlag:true
+            })
         });
     },
     /**
@@ -477,6 +490,16 @@ Page({
                 // 重新统计，到期续费或者第一次购买用户
                 summaryInfo.reCountFlag = true;
                 summaryInfo.wxMaxNum = summaryInfo.wxMaxNumSocial
+                this.setData({
+                    showVip:true
+                })
+            }else{
+                // 如果没有购买，需要显示
+                if(!app.globalData.company.vip){
+                    this.setData({
+                        showVip:true
+                    })
+                }
             }
             summaryInfo.buyBeginDate = new Date().toDateStr();
             console.log('summaryInfo', summaryInfo.userEndDate, endDate, months);

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

@@ -1,136 +1,139 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <van-dialog id="van-dialog" />
 <loading wx:if="{{loading}}"></loading>
-<!--公司信息-->
-<view class="detail-top" data-item="{{item}}" bind:tap="toDetail">
-	<image class="scan-image" fit="fill" src="{{imageUrl+'/detail_sale_order.png'}}"></image>
-	<view style="display: flex;margin:20rpx 20rpx">
-		<!-- 头像 -->
-		<open-data type="userAvatarUrl" class='wx-avatar'></open-data>
-		<view style="margin-left: 30rpx;">
-			<view class="cp-class">{{companyName}} <dk-tag style="margin-left: 20rpx;" type="primary" padding="0 10rpx" height="30rpx" color="linear-gradient(77.62deg, #CAA977 12.58%, #FFDA7A 85.49%),conic-gradient(from 154.5deg at 29.17% -8.33%, #FFE8BA -0.56deg, rgba(255, 230, 165, 0) 0.26deg, rgba(227, 184, 73, 0.34) 17.37deg, rgba(240, 187, 253, 0.23) 347.83deg, rgba(186, 234, 255, 0.38) 353.78deg, #FFE8BA 359.44deg, rgba(255, 230, 165, 0) 360.26deg);" textColor="#1B365D" radius="10rpx" fontSize="9px" value="{{gradeCode == 'STD'?$t['std']:$t['pro']}}" catchtap="expandCard" data-item="{{card}}" data-index="{{cardIndex}}"></dk-tag>
+<view wx:if="{{loadFlag}}">
+	<!--公司信息-->
+	<view class="detail-top" data-item="{{item}}" bind:tap="toDetail">
+		<image class="scan-image" fit="fill" src="{{imageUrl+'/detail_sale_order.png'}}"></image>
+		<view style="display: flex;margin:20rpx 20rpx">
+			<!-- 头像 -->
+			<open-data type="userAvatarUrl" class='wx-avatar'></open-data>
+			<view style="margin-left: 30rpx;">
+				<view class="cp-class">{{companyName}} <dk-tag style="margin-left: 20rpx;" type="primary" padding="0 10rpx" height="30rpx" color="linear-gradient(77.62deg, #CAA977 12.58%, #FFDA7A 85.49%),conic-gradient(from 154.5deg at 29.17% -8.33%, #FFE8BA -0.56deg, rgba(255, 230, 165, 0) 0.26deg, rgba(227, 184, 73, 0.34) 17.37deg, rgba(240, 187, 253, 0.23) 347.83deg, rgba(186, 234, 255, 0.38) 353.78deg, #FFE8BA 359.44deg, rgba(255, 230, 165, 0) 360.26deg);" textColor="#1B365D" radius="10rpx" fontSize="9px" value="{{gradeCode == 'STD'?$t['std']:$t['pro']}}" catchtap="expandCard" data-item="{{card}}" data-index="{{cardIndex}}"></dk-tag>
+				</view>
+				<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>
-			<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>
 	</view>
-</view>
 
-<!--活动（专业版）-->
-<view class="func" wx:if="{{gradeCode != 'STD'}}">
-	<view style="display:flex;flex-wrap: wrap;">
-		<view class="{{(curentAdItem && curentAdItem.itemId == item.itemId)?'func-card-selected':'func-card'}}" wx:for="{{activityTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}" catchtap="chooseAdItem">
-			<!-- 标题 -->
-			<view class="card-title">{{item.activityItemName}}
-			</view>
-			<!-- 价格-->
-			<dk-cell fontSize="16" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.stdPrice}}"></dk-cell>
-			<!-- 描述-->
-			<view class="card-desc">{{item.activityItemDescribe}}
+	<!--活动（专业版）-->
+	<view class="func" wx:if="{{gradeCode != 'STD'}}">
+		<view style="display:flex;flex-wrap: wrap;">
+			<view class="{{(curentAdItem && curentAdItem.itemId == item.itemId)?'func-card-selected':'func-card'}}" wx:for="{{activityTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}" catchtap="chooseAdItem">
+				<!-- 标题 -->
+				<view class="card-title">{{item.activityItemName}}
+				</view>
+				<!-- 价格-->
+				<dk-cell fontSize="16" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.stdPrice}}"></dk-cell>
+				<!-- 描述-->
+				<view class="card-desc">{{item.activityItemDescribe}}
+				</view>
 			</view>
 		</view>
 	</view>
-</view>
 
-<!--活动（标准版）-->
-<view class="func" wx:if="{{gradeCode == 'STD'}}">
-	<view style="display:flex;flex-wrap: wrap;">
-		<view class="func-card-std" wx:for="{{activityTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}">
-			<!-- 标题 -->
-			<view class="card-title-std">{{item.activityItemName}}
+	<!--活动（标准版）-->
+	<view class="func" wx:if="{{gradeCode == 'STD'}}">
+		<view style="display:flex;flex-wrap: wrap;">
+			<view class="func-card-std" wx:for="{{activityTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}">
+				<!-- 标题 -->
+				<view class="card-title-std">{{item.activityItemName}}
+				</view>
+				<!-- 价格-->
+				<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
+				<!-- 授权-->
+				<view class="card-desc-std">
+					<view>{{$t['userAuthorize']}}</view>
+					<van-stepper integer="{{true}}" value="{{ summaryInfo.wxMaxNum}}" min="1" bind:change="changeUserSTD" />
+				</view>
 			</view>
-			<!-- 价格-->
-			<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
-			<!-- 授权-->
-			<view class="card-desc-std">
-				<view>{{$t['userAuthorize']}}</view>
-				<van-stepper integer="{{true}}" value="{{ summaryInfo.wxMaxNum}}" min="1" bind:change="changeUserSTD" />
-			</view>
-		</view>
 
-		<!--VIP报表-->
-		<view class="{{chooseVipFlag?'func-card-vip-std-selected':'func-card-vip-std'}}"  wx:for="{{vipTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}" catchtap="chooseVipItem">
-			<!-- 标题 -->
-			<view class="card-title-std">{{item.activityItemName}}
-			</view>
-			<!-- 价格-->
-			<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
-			<!-- 描述-->
-			<view class="card-desc">{{item.activityItemDescribe}}
+			<!--VIP报表-->
+			<view wx:if="{{showVip}}" class="{{chooseVipFlag?'func-card-vip-std-selected':'func-card-vip-std'}}" wx:for="{{vipTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}" catchtap="chooseVipItem">
+				<!-- 标题 -->
+				<view class="card-title-std">{{item.activityItemName}}
+				</view>
+				<!-- 价格-->
+				<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
+				<!-- 描述-->
+				<view class="card-desc">{{item.activityItemDescribe}}
+				</view>
 			</view>
 		</view>
 	</view>
-</view>
 
-<!--用户数-->
-<view class="card-class" wx:if="{{gradeCode != 'STD'}}">
-	<!--用户数量-->
-	<van-cell border="{{ false }}" title-class="cell_title">
-		<view slot="title" style="display: flex;">
-			<view>用户数量</view>
-			<view style="font-size: 10px;">(包含手机和电脑授权)</view>
-		</view>
-		<van-stepper value="{{staffCount.maxNum}}" integer="{{true}}" min="0" max="{{1000}}" data-type="all" bind:change="changeStaffCount" />
-	</van-cell>
-	<van-cell border="{{ false }}" title="额外购买授权">
-	</van-cell>
-	<!--手机用户数-->
-	<van-cell border="{{ false }}" title-class="cell_title">
-		<view slot="title" style="display: flex;">
-			<view>手机端授权</view>
-			<view wx:if="{{curentAdItem && curentAdItem.wxPrice}}" style="display: flex;font-size: 10px;">
-				（<dk-cell fontSize="10" left="5rpx" height="50rpx" contentColor="#e00808" content="{{curentAdItem.wxPrice}}"></dk-cell>/个）
+	<!--用户数-->
+	<view class="card-class" wx:if="{{gradeCode != 'STD'}}">
+		<!--用户数量-->
+		<van-cell border="{{ false }}" title-class="cell_title">
+			<view slot="title" style="display: flex;">
+				<view>用户数量</view>
+				<view style="font-size: 10px;">(包含手机和电脑授权)</view>
 			</view>
-		</view>
-		<van-stepper value="{{staffCount.wxMaxNum}}" integer="{{true}}" min="0" max="{{1000}}" data-type="wx" bind:change="changeStaffCount" />
-	</van-cell>
-	<!--电脑用户数-->
-	<van-cell border="{{ false }}" title-class="cell_title">
-		<view slot="title" style="display: flex;">
-			<view>电脑端授权</view>
-			<view wx:if="{{curentAdItem && curentAdItem.webPrice}}" style="display: flex;font-size: 10px;">
-				（<dk-cell fontSize="10" left="5rpx" height="50rpx" contentColor="#e00808" content="{{ curentAdItem.webPrice }}"></dk-cell>/个）
+			<van-stepper value="{{staffCount.maxNum}}" integer="{{true}}" min="0" max="{{1000}}" data-type="all" bind:change="changeStaffCount" />
+		</van-cell>
+		<van-cell border="{{ false }}" title="额外购买授权">
+		</van-cell>
+		<!--手机用户数-->
+		<van-cell border="{{ false }}" title-class="cell_title">
+			<view slot="title" style="display: flex;">
+				<view>手机端授权</view>
+				<view wx:if="{{curentAdItem && curentAdItem.wxPrice}}" style="display: flex;font-size: 10px;">
+					（<dk-cell fontSize="10" left="5rpx" height="50rpx" contentColor="#e00808" content="{{curentAdItem.wxPrice}}"></dk-cell>/个）
+				</view>
 			</view>
-		</view>
-		<van-stepper value="{{staffCount.webMaxNum}}" integer="{{true}}" min="0" max="{{1000}}" data-type="web" bind:change="changeStaffCount" />
-	</van-cell>
-</view>
+			<van-stepper value="{{staffCount.wxMaxNum}}" integer="{{true}}" min="0" max="{{1000}}" data-type="wx" bind:change="changeStaffCount" />
+		</van-cell>
+		<!--电脑用户数-->
+		<van-cell border="{{ false }}" title-class="cell_title">
+			<view slot="title" style="display: flex;">
+				<view>电脑端授权</view>
+				<view wx:if="{{curentAdItem && curentAdItem.webPrice}}" style="display: flex;font-size: 10px;">
+					（<dk-cell fontSize="10" left="5rpx" height="50rpx" contentColor="#e00808" content="{{ curentAdItem.webPrice }}"></dk-cell>/个）
+				</view>
+			</view>
+			<van-stepper value="{{staffCount.webMaxNum}}" integer="{{true}}" min="0" max="{{1000}}" data-type="web" bind:change="changeStaffCount" />
+		</van-cell>
+	</view>
 
-<!--合计（专业版）-->
-<view class="summary-class" wx:if="{{gradeCode != 'STD'}}">
-	<view class="summary-item-class">订单详情：</view>
-	<view class="summary-item-class">{{summaryInfo.amountInfo}}</view>
-	<view class="summary-item-class">截止日期：{{summaryInfo.endDate}}</view>
-	<view class="summary-item-class" wx:if="{{staffCount.maxNum || staffCount.webMaxNum || staffCount.wxMaxNum}}">{{summaryInfo.staffInfo}}</view>
-	<view class="summary-item-class" style="display: flex;justify-content: flex-end;" wx:if="{{staffCount.maxNum || staffCount.webMaxNum || staffCount.wxMaxNum}}">
-		折合<dk-cell fontSize="14" left="5rpx" fontWeight="bold" height="45rpx" contentColor="#FF7B1A" content="{{summaryInfo.priceInfo}}"></dk-cell>/天/授权</view>
-</view>
+	<!--合计（专业版）-->
+	<view class="summary-class" wx:if="{{gradeCode != 'STD'}}">
+		<view class="summary-item-class">订单详情：</view>
+		<view class="summary-item-class">{{summaryInfo.amountInfo}}</view>
+		<view class="summary-item-class">截止日期：{{summaryInfo.endDate}}</view>
+		<view class="summary-item-class" wx:if="{{staffCount.maxNum || staffCount.webMaxNum || staffCount.wxMaxNum}}">{{summaryInfo.staffInfo}}</view>
+		<view class="summary-item-class" style="display: flex;justify-content: flex-end;" wx:if="{{staffCount.maxNum || staffCount.webMaxNum || staffCount.wxMaxNum}}">
+			折合<dk-cell fontSize="14" left="5rpx" fontWeight="bold" height="45rpx" contentColor="#FF7B1A" content="{{summaryInfo.priceInfo}}"></dk-cell>/天/授权</view>
+	</view>
 
-<!--合计（标准版）-->
-<view class="summary-class" wx:if="{{gradeCode == 'STD'}}">
-	<view class="summary-item-class">订单详情：</view>
-	<view class="summary-item-class">{{summaryInfo.amountInfo}}</view>
-	<view class="summary-item-class" style="display: flex;" >截止日期：<view style="color:#FF7B1A">{{summaryInfo.userEndDate}}</view></view>
-	<view class="summary-item-class" style="display: flex;justify-content: flex-end;" wx:if="{{summaryInfo.wxMaxNum}}">
-		折合<dk-cell fontSize="14" left="5rpx" fontWeight="bold" height="45rpx" contentColor="#FF7B1A" content="{{summaryInfo.priceInfo}}"></dk-cell>/天/授权</view>
-</view>
+	<!--合计（标准版）-->
+	<view class="summary-class" wx:if="{{gradeCode == 'STD'}}">
+		<view class="summary-item-class">订单详情：</view>
+		<view class="summary-item-class">{{summaryInfo.amountInfo}}</view>
+		<view class="summary-item-class" style="display: flex;">截止日期：<view style="color:#FF7B1A">{{summaryInfo.userEndDate}}</view>
+		</view>
+		<view class="summary-item-class" style="display: flex;justify-content: flex-end;" wx:if="{{summaryInfo.wxMaxNum}}">
+			折合<dk-cell fontSize="14" left="5rpx" fontWeight="bold" height="45rpx" contentColor="#FF7B1A" content="{{summaryInfo.priceInfo}}"></dk-cell>/天/授权</view>
+	</view>
 
-<!--注册须知-->
-<view class="notice-class" wx:if="{{gradeCode != 'STD'}}">
-	<view class="notice-item-class" style="font-size: 16px;font-weight: bold;">{{noticeInfo.title}}</view>
-	<view class="notice-item-class">{{noticeInfo.cpName}}</view>
-	<view class="notice-item-class">{{noticeInfo.contact}}</view>
-	<view class="notice-item-class">{{noticeInfo.cpSize}}</view>
-	<view class="notice-item-class" style="display: flex;">
-		<van-checkbox shape="square" value="{{readFlag}}" label-class="checkbox-class" bind:change="handleChangeCheckbox">我已阅读并同意</van-checkbox>
-		<view style="color: #CE9965;">《注册须知》</view>
-		<view style="color: #CE9965;">《免责条款》</view>
+	<!--注册须知-->
+	<view class="notice-class" wx:if="{{gradeCode != 'STD'}}">
+		<view class="notice-item-class" style="font-size: 16px;font-weight: bold;">{{noticeInfo.title}}</view>
+		<view class="notice-item-class">{{noticeInfo.cpName}}</view>
+		<view class="notice-item-class">{{noticeInfo.contact}}</view>
+		<view class="notice-item-class">{{noticeInfo.cpSize}}</view>
+		<view class="notice-item-class" style="display: flex;">
+			<van-checkbox shape="square" value="{{readFlag}}" label-class="checkbox-class" bind:change="handleChangeCheckbox">我已阅读并同意</van-checkbox>
+			<view style="color: #CE9965;">《注册须知》</view>
+			<view style="color: #CE9965;">《免责条款》</view>
+		</view>
 	</view>
-</view>
 
-<view style="height: 200rpx;"></view>
+	<view style="height: 200rpx;"></view>
+</view>
 
 <!--  保存 -->
 <dk-save-button btnAutoWidthFlag="{{true}}" buttonList="{{buttonSaveList}}" bind:open="handleSave"></dk-save-button>

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

@@ -18,12 +18,16 @@ Page({
   data: {
     // 查询条件
     searchContent: [],
-    totallength: 0, //视图下方提醒数量
     // 底部保存按钮
-    buttonFootList: [{
-      name: 'add',
-      title: mixins.$t('add')
-    }],
+    buttonFootList: [
+      {
+        code: 'buy',
+        title: mixins.$t('buyUser')
+      },
+      {
+        code: 'add',
+        title: mixins.$t('add')
+      }],
     contentnFootList: [
 
     ],
@@ -138,14 +142,14 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 姜永辉
    */
-  leaveOffice(e) { 
-    let item = e 
+  leaveOffice(e) {
+    let item = e
     let params = {
       staffId: item.staffId,
       flgValid: false,
       wxUserId: item.wxUserId,
       hrStatus: 2 // 离职2 在职1
-    } 
+    }
     this.excute(this.data.service, this.data.service.leaveOffice, params).then(res => {
       if (res.data.code == Constants.SUCESS_CODE) {
         // 重新查询

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

@@ -2,7 +2,7 @@
  * Copyright(c) 2022 dongke All rights reserved. / Confidential
  * 类的信息：
  *		1.程序名称：
- *		2.订单开单
+ *		2.订单开单 
  * 编辑履历：
  *		作者				日期					版本				修改内容
  *		于继渤		        2022-0-12	            1.00		   	    
@@ -251,6 +251,22 @@ Page({
       buttonList: buttonList
     })
   },
+
+    /**
+  * @desc :   跳转客户详情
+  * @date :   2024年5月27日
+  * @author : 姜永辉
+  */
+ toTitle(e) {
+  let cusId = e.detail.item.cusId
+  wx.navigateTo({
+    url: this.data.route.detailCustomer.url,
+    success: function (res) {
+      // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+      res.eventChannel.emit('params', { id: cusId, formMode: Constants.formMode.edit })
+    }
+  })
+},
   /**
    * @desc :   处理接口返回数据
    * @date : 2024年3月8日

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

@@ -17,13 +17,13 @@ Page({
    * 页面的初始数据 
    */
   data: {
-      // 系统参数
+    // 系统参数
     flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false,
-    tagList: [{ title: mixins.$t("all"), code: '' }, { title: mixins.$t("inBoundingIntoStatusName"), code: mixins.$t("outBoundingOutStatus")  }, { title: mixins.$t("inBoundedIntoStatusName"), code: mixins.$t("outBoundedOutStatus")  }],
+    tagList: [{ title: mixins.$t("all"), code: '' }, { title: mixins.$t("inBoundingIntoStatusName"), code: mixins.$t("outBoundingOutStatus") }, { title: mixins.$t("inBoundedIntoStatusName"), code: mixins.$t("outBoundedOutStatus") }],
     // 查询条件
     searchContent: [{
       code: 'makeTime',
-      title:  mixins.$t('pastThirthtyDays'),
+      title: mixins.$t('pastThirthtyDays'),
       defaultValue: 5,
       searchType: Constants.searchType.date
     }, {
@@ -34,25 +34,25 @@ Page({
 
     // 查询条件-筛选
     pullMenuList: [{
-      code: 'orderNo', 
-    },{
-      code: 'cusName', 
+      code: 'orderNo',
     }, {
-      code: 'cusPhone', 
+      code: 'cusName',
     }, {
-      code: 'addressFull', 
-      title: mixins.$t('address') 
+      code: 'cusPhone',
+    }, {
+      code: 'addressFull',
+      title: mixins.$t('address')
     },
-     {
-      code: 'staffName', 
+    {
+      code: 'staffName',
     }, {
-      code: 'orgName', 
+      code: 'orgName',
     },
     // 筛选新增作废选项 刘尧 2024.5.30
     {
       code: 'viewVoidedDocuments',
       dataType: 'checkbox'
-    },  ],
+    },],
 
 
 
@@ -79,7 +79,7 @@ Page({
     buttonSaveList: [{ code: 'add', title: mixins.$t("add") }],
     contentSaveList: [{ code: 'need', title: mixins.$t("totalAmount"), type: 'str' }, { code: 'amount', content: 0, type: 'number' }],
     contentObj: {
-   
+
     },
 
     // 弹出按钮
@@ -100,11 +100,11 @@ Page({
     routeObjName: 'saleOutBoundReturn',
     active: 0
   },
-    /**
-   * @desc :   三个小点打开
-   * @date : 2024年3月8日
-   * @author : 于继渤 
-   */
+  /**
+ * @desc :   三个小点打开
+ * @date : 2024年3月8日
+ * @author : 于继渤 
+ */
   toPoint(e) {
     let item = e.detail.item
     let buttonList = null
@@ -112,8 +112,8 @@ Page({
       buttonList = [{
         name: 'printedBill',
         title: mixins.$t("printedBill")
-      }, ] //打印
-    } else { 
+      },] //打印
+    } else {
       // 弹出按钮
       buttonList = [
         {
@@ -138,14 +138,14 @@ Page({
  * @date : 2024/2/1 15:49
  * @author : 于继渤
  */
-onChangeTabs(e) {
-  let code = e.detail.detail.code
-  console.log(e)
-  this.setData({
-    outStatus: code,
-  })
-  this.searchData()
-},
+  onChangeTabs(e) {
+    let code = e.detail.detail.code
+    console.log(e)
+    this.setData({
+      outStatus: code,
+    })
+    this.searchData()
+  },
   /**
 * @desc : 设置查询参数
 * @date : 2024/2/1 15:49
@@ -156,7 +156,7 @@ onChangeTabs(e) {
     params.outTypeList = [Constants.outType.intoReturn]
     params.outStatus = this.data.outStatus == 'all' ? '' : this.data.outStatus
     if (this.data.flgHandleSetting) {
-      params.outStatus = mixins.$t("outBoundedOutStatus") 
+      params.outStatus = mixins.$t("outBoundedOutStatus")
     }
     params.cusId = this.data.id ? this.data.id : null
     // 筛选新增作废选项 模块不查询废除数据 刘尧 2024.5.30
@@ -174,7 +174,7 @@ onChangeTabs(e) {
       url: this.data.route.add.url,
       success: function (res) {
         // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
-        res.eventChannel.emit('params', { id: item.outId, formMode: Constants.formMode.other,formType: Constants.formMode.edit, item: item })
+        res.eventChannel.emit('params', { id: item.outId, formMode: Constants.formMode.other, formType: Constants.formMode.edit, item: item })
       }
     })
   },
@@ -193,8 +193,8 @@ onChangeTabs(e) {
           image: '/static/image/success.png',
           duration: 1000
         })
-         // 查询
-         this.searchData();
+        // 查询
+        this.searchData();
       }
       this.setData({
         loading: false
@@ -231,20 +231,37 @@ onChangeTabs(e) {
     tableData.forEach(res => {
       outAmt += res.sumOutAmt
       outQty += res.sumOutQty
-      res.inStatusName = (res.outStatus == Constants.outStatus.outBounded)?mixins.$t('received'):mixins.$t('inStorage')
+      res.inStatusName = (res.outStatus == Constants.outStatus.outBounded) ? mixins.$t('received') : mixins.$t('inStorage')
     })
     contentSaveList[1].content = outAmt
     contentSaveList[1].bill = tableData.length
     contentSaveList[1].quantity = outQty
     this.setData({
       contentSaveList: contentSaveList,
-      tableData:tableData
+      tableData: tableData
     })
 
   },
+
+  /**
+  * @desc :   跳转客户详情
+  * @date :   2024年5月27日
+  * @author : 姜永辉
+  */
+  toTitle(e) {
+    let cusId = e.detail.item.cusId
+    wx.navigateTo({
+      url: this.data.route.detailCustomer.url,
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', { id: cusId, formMode: Constants.formMode.edit })
+      }
+    })
+  },
+
   toDetail(e) {
-    
-    let outId = e.outId ? e.outId  :e.detail.item.outId
+
+    let outId = e.outId ? e.outId : e.detail.item.outId
     wx.navigateTo({
       url: this.data.route.edit.url,
       success: function (res) {

package-sales/pages/sales-outbound/sales-outbound.js

@@ -195,7 +195,7 @@ Page({
     flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false,
     // 路由
     routeObjName: 'saleOutBound',
-    primaryKey:'outId',
+    primaryKey: 'outId',
     active: 0
   },
 
@@ -206,9 +206,9 @@ Page({
    */
   toPoint(e) {
     let item = e.detail.item
-    let buttonList = null 
+    let buttonList = null
     if (!item.flgValid) { //作废
-      buttonList= [    {
+      buttonList = [{
         name: 'printedBill',
         title: mixins.$t('printedBill') //打印票据
       },]
@@ -216,67 +216,67 @@ Page({
       //除了已入库 不显示销售退货
       if (item.outStatus == Constants.outStatus.outBounded) { //"出库状态-已出库"
         buttonList = [{
-            name: 'editInto',
-            title: mixins.$t('edit')
-          },
-          {
-            name: 'salesOutbound',
-            title: mixins.$t("handleWithdrawal")
-          },
-          {
-            name: 'saleOrderReturn',
-            title: mixins.$t("saleReturn"),
-            formMode: Constants.formMode.other,
-            other: {
-              idKey: 'outId'
-            },
-            formType: 'toSaleOut'
-          }, //退货 
-          {
-            name: 'cusCollection',
-            formType: Constants.formMode.add,
-            title: mixins.$t("cusCollection")
-          }, {
-            name: 'cusReturnCollection',
-            formType: Constants.formMode.add,
-            title: mixins.$t("cusReturnCollection")
-          },
-          {
-            name: 'invalid',
-            title: mixins.$t("invaidOrder")
-          }, //作废
-          {
-            name: 'printedBill',
-            title: mixins.$t('printedBill') //打印票据
+          name: 'editInto',
+          title: mixins.$t('edit')
+        },
+        {
+          name: 'salesOutbound',
+          title: mixins.$t("handleWithdrawal")
+        },
+        {
+          name: 'saleOrderReturn',
+          title: mixins.$t("saleReturn"),
+          formMode: Constants.formMode.other,
+          other: {
+            idKey: 'outId'
           },
+          formType: 'toSaleOut'
+        }, //退货 
+        {
+          name: 'cusCollection',
+          formType: Constants.formMode.add,
+          title: mixins.$t("cusCollection")
+        }, {
+          name: 'cusReturnCollection',
+          formType: Constants.formMode.add,
+          title: mixins.$t("cusReturnCollection")
+        },
+        {
+          name: 'invalid',
+          title: mixins.$t("invaidOrder")
+        }, //作废
+        {
+          name: 'printedBill',
+          title: mixins.$t('printedBill') //打印票据
+        },
         ]
       } else {
         // 弹出按钮
         buttonList = [{
-            name: 'editInto',
-            title: mixins.$t('edit')
-          }, {
-            name: 'salesOutbound',
-            title: mixins.$t("outProcessing")
-          },
-          {
-            name: 'cusCollection',
-            formType: Constants.formMode.add,
-            title: mixins.$t("cusCollection")
-          },
-          {
-            name: 'cusReturnCollection',
-            formType: Constants.formMode.add,
-            title: mixins.$t("cusReturnCollection")
-          },
-          {
-            name: 'invalid',
-            title: mixins.$t("invaidOrder")
-          }, //作废 
-          {
-            name: 'printedBill',
-            title: mixins.$t('printedBill') //打印票据
-          },
+          name: 'editInto',
+          title: mixins.$t('edit')
+        }, {
+          name: 'salesOutbound',
+          title: mixins.$t("outProcessing")
+        },
+        {
+          name: 'cusCollection',
+          formType: Constants.formMode.add,
+          title: mixins.$t("cusCollection")
+        },
+        {
+          name: 'cusReturnCollection',
+          formType: Constants.formMode.add,
+          title: mixins.$t("cusReturnCollection")
+        },
+        {
+          name: 'invalid',
+          title: mixins.$t("invaidOrder")
+        }, //作废 
+        {
+          name: 'printedBill',
+          title: mixins.$t('printedBill') //打印票据
+        },
         ]
       }
       //6460 标-免费版-销售出库-一览-三个点再加一个客户收款  除了标准版 其他的删除客户收款
@@ -290,8 +290,8 @@ Page({
           }
         }
       }
- 
-    
+
+
     }
 
     this.setData({
@@ -420,7 +420,7 @@ Page({
    */
   calculateTotalAmount() {
     let tableData = this.data.tableData
-    console.log('tableData',tableData);
+    console.log('tableData', tableData);
     let contentSaveList = this.data.contentSaveList
     let outAmt = Number(0)
     let outQty = Number(0)
@@ -438,6 +438,22 @@ Page({
   },
 
   /**
+  * @desc :   跳转客户详情
+  * @date :   2024年5月27日
+  * @author : 姜永辉
+  */
+  toTitle(e) {
+    let cusId = e.detail.item.cusId
+    wx.navigateTo({
+      url: this.data.route.detailCustomer.url,
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', { id: cusId, formMode: Constants.formMode.edit })
+      }
+    })
+  },
+
+  /**
    * @desc :   跳转明细
    * @date :   2024年5月27日
    * @author : 周兴

pages/home-page/home-page.js

@@ -460,7 +460,13 @@ Page({
           res.eventChannel.emit('params', { formType: openid, formMode: Constants.formMode.index })
         }
       })
-
+    }else if(options.buy){
+      wx.navigateTo({
+        url: '/package-basic-data/pages/staff/staff',
+        success: function (res) {
+          res.eventChannel.emit('params', { formMode: Constants.formMode.index })
+        }
+      })
     }
 
     // 获取功能卡片模块高度 以便设置水印蒙版高度

pages/welcome/welcome.js

@@ -35,6 +35,12 @@ Page({
                 scene: scene,
             })
         }
+        // 从员工一览购买授权过来
+        if(options.buy){
+            this.setData({
+                buy: options.buy,
+            })
+        }
 
         // 小程序推送消息传过来的值
         if (options.loginType) {
@@ -187,8 +193,7 @@ Page({
             {
                 'appCode': Constants.APP_CODE,
                 'cpId': app.globalData.company.cpId,
-                'userId': app.globalData.user.userId,
-                'vip':app.globalData.company.vip
+                'userId': app.globalData.user.userId
             }).then(res => {
                 if (res.data.code === Constants.SUCESS_CODE) {
                     // 员工
@@ -201,13 +206,13 @@ Page({
                                 let diffs = new Date(userEndDate).dayDiff(new Date(new Date().toDateStr()))
                                 // 说明已经到期，跳转到
                                 if (diffs < 0) {
-                                    // util.showToast('用户已到期，到期日期【' + userEndDate + '】')
-                                    // setTimeout(() => {
-                                    //     wx.reLaunch({
-                                    //         url: '../../pages/login/login',
-                                    //     })
-                                    // }, 2000)
-                                    // return;
+                                    util.showToast('用户已到期，到期日期【' + userEndDate + '】')
+                                    setTimeout(() => {
+                                        wx.reLaunch({
+                                            url: '../../pages/login/login',
+                                        })
+                                    }, 2000)
+                                    return;
                                 }
                             }
                         }
@@ -227,6 +232,10 @@ Page({
                             wx.reLaunch({
                                 url: '../../pages/home-page/home-page?scene=' + this.data.scene,
                             })
+                        } else if (this.data.buy) {
+                            wx.reLaunch({
+                                url: '../../pages/home-page/home-page?buy=' + this.data.buy,
+                            })
                         } else {
                             wx.reLaunch({
                                 url: '../../pages/home-page/home-page',