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

api/pages/ivt/saleOutBound.js

@@ -23,6 +23,7 @@ module.exports = {
 
   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:{
@@ -35,7 +36,7 @@ module.exports = {
       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: 'cusId',image:'btn-printing.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' },

app.json

@@ -112,7 +112,9 @@
                 "pages/inventory-freeze/add/add",
                 "pages/inventory-check/inventory-check",
                 "pages/inventory-check/add/add",
-                "pages/inventory-check/detail/detail"
+                "pages/inventory-check/detail/detail",
+                "pages/cost-check/cost-check",
+                "pages/cost-check/add/add"
             ]
         },
         {

mixins/index.js

@@ -379,6 +379,7 @@ module.exports = {
   printedBill(row) {
     // 查询票据
     let docName = app.globalData['routeUrl'][this.data.routeObjName].docName
+    console.log('docName',docName,row);
     if (!docName || !row || !row.id) {
       return;
     }
@@ -419,7 +420,7 @@ module.exports = {
     wx.navigateTo({
       url: '/package-base-select/pages/web-view-select/web-view-select',
       success: function (res) {
-        res.eventChannel.emit('url', 'https://s.dev01.dkiboss.com:7000/wx-print?svc_code=' + app.globalData.company.svcCode + '&cp_id=' + app.globalData.user.cpId + '&doc=' + docName + '&layout_id=' + layoutId + '&data_id=' + dataId);
+        res.eventChannel.emit('url', 'https://s.dev01.dkiboss.com:7000/wx-print?svc_code=' + app.globalData.company.svcCode + '&cp_id=' + app.globalData.company.cpId + '&doc=' + docName + '&layout_id=' + layoutId + '&data_id=' + dataId);
       }
     })
   },

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

@@ -28,12 +28,13 @@ Page({
     buttonSaveList: [{ code: 'add', title: mixins.$t('add') }],
     contentSaveList: [{ code: 'need', title: mixins.$t('together'), type: 'count', color: '#1B365D', tail: mixins.$t('customers'), bill: 1, fontSize: '15px' }],
     // 查询条件-筛选
-    pullMenuList:
-      [
-        { code: 'cusFrom', pullType: 'mSelect', typeName: 'cusFrom' },
-        { code: 'followCount', dataType: 'number' },
-        { code: 'nextFollowTime', dataType: 'date' }
-      ],
+
+    pullMenuList: [
+      // { code: 'cusFrom', pullType: 'mSelect', typeName: 'cusFrom' },
+      { code: 'followCount', dataType: 'number' },
+      { code: 'nextFollowTime', dataType: 'date' }
+    ],
+
     // 列表区（脚部信息）
     footerInfo: [{
       // prefix: mixins.$t('followedUp'),

package-inventory/pages/cost-check/add/add.js

@@ -0,0 +1,66 @@
+// package-inventory/pages/cost-check/add/add.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

package-inventory/pages/cost-check/add/add.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

package-inventory/pages/cost-check/add/add.wxml

@@ -0,0 +1,2 @@
+<!--package-inventory/pages/cost-check/add/add.wxml-->
+<text>package-inventory/pages/cost-check/add/add.wxml</text>

package-inventory/pages/cost-check/add/add.wxss

@@ -0,0 +1 @@
+/* package-inventory/pages/cost-check/add/add.wxss */

package-inventory/pages/cost-check/cost-check.js

@@ -0,0 +1,66 @@
+// package-inventory/pages/cost-check/cost-check.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

package-inventory/pages/cost-check/cost-check.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

package-inventory/pages/cost-check/cost-check.wxml

@@ -0,0 +1,2 @@
+<!--package-inventory/pages/cost-check/cost-check.wxml-->
+<text>package-inventory/pages/cost-check/cost-check.wxml</text>

package-inventory/pages/cost-check/cost-check.wxss

@@ -0,0 +1 @@
+/* package-inventory/pages/cost-check/cost-check.wxss */

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

@@ -71,7 +71,7 @@ Page({
     }],
     // 列表区（内容）
     contentList: [
-      { name: 'outNo', title: '订单编号' },
+      { name: 'outNo', title: '退货单号' },
       { name: 'cusPhone', title: '客户电话' },
       { name: 'addressFull', title: '客户地址' },
       { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t('staffId') }], title: mixins.$t('storeInformation') }

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

@@ -195,6 +195,7 @@ Page({
     flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false,
     // 路由
     routeObjName: 'saleOutBound',
+    primaryKey:'outId',
     active: 0
   },
 

project.private.config.json

@@ -2,8 +2,9 @@
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "setting": {
         "compileHotReLoad": true,
-        "preloadBackgroundData": false
+        "preloadBackgroundData": false,
+        "bigPackageSizeSupport": true
     },
     "projectname": "iboss_wx_app",
-    "libVersion": "3.4.3"
+    "libVersion": "3.0.2"
 }