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

# Conflicts:
#	package-sales/pages/sales-outbound/sales-outbound.js

config/config.js

@@ -3,7 +3,7 @@ const profiles = 'dev';
 const configListObj = {
   // 北京东科企信软件有限公司 本地开发
   dev: {
-    server_add: 'http://192.168.0.57',     server_port: '7001',
+    server_add: 'http://192.168.0.55',     server_port: '7001',
     upload_url:'https://s.dev01.dkiboss.com:7000/api/mdm-server/file/upload',
     image_url:'https://s.dev01.dkiboss.com:7000/file',
     corpid: 'ww796c5d1684937b2f', //企业微信corpid

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

@@ -44,11 +44,11 @@ Page({
     // 可售包装 
     if (item.flgSubUnit) {
       item['freezeBox'] = parseInt(item.freezeQty / item.packBox)
-      item['freezePiece'] = Number(item.freezeQty % item.packBox)
+      item['freezePiece'] = parseFloat(Number(item.freezeQty % item.packBox)).toFixed(item.decimalPlace)
       item.packageBoxFreeze = item['freezeBox'] + item.subUnitName + item['freezePiece'] + item.unitName
 
       item['usableBox'] = parseInt(item.usableQty / item.packBox)
-      item['usablePiece'] = Number(item.usableQty % item.packBox)
+      item['usablePiece'] = parseFloat(Number(item.usableQty % item.packBox)).toFixed(item.decimalPlace) 
       item.packageBoxUsable = item['usableBox'] + item.subUnitName + item['usablePiece'] + item.unitName
     }
 

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

@@ -77,7 +77,7 @@ Page({
         "skuSpec": "商品规格",
         "whName": "仓库名称",
         "invQty": "库存数量",
-        "outingQty": "出库中数量",
+        // "outingQty": "出库中数量",
         "freezeQty": "冻结数量",
         "usableQty": "可用数量",
         "remarks": "备注",
@@ -199,8 +199,8 @@ Page({
       })
       // 可售包装 
       if (item.flgSubUnit) {
-        item['box'] = parseInt(item.invQty / item.packBox)
-        item['piece'] = Number(item.invQty % item.packBox)
+        item['box'] = parseInt(item.invQty / item.packBox) 
+        item['piece'] = parseFloat( Number(item.invQty % item.packBox)).toFixed(item.decimalPlaces)
         item.packageBox = item['box'] + item.subUnitName + item['piece'] + item.unitName
         list.push({
           title: mixins.$t('packageIvtBox'),

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

@@ -154,7 +154,12 @@ onChangeTabs(e) {
           image: '/static/image/success.png',
           duration: 1000
         })
+         // 查询
+         this.searchData();
       }
+      this.setData({
+        loading: false
+      })
     })
   },
   /**

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

@@ -39,6 +39,73 @@ Page({
     }],
     // 列表区（内容）
     contentList: [{
+      name: 'outNo',
+      title: mixins.$t("outOrderNo")
+    },
+    {
+      name: 'cusPhone',
+      title: mixins.$t("cusPhone")
+    },
+    {
+      name: 'addressFull',
+      title: mixins.$t("adddressFull")
+    },
+    {
+      name: [{
+        name: 'orgName',
+        title: ''
+      }, {
+        name: 'staffName',
+        title: mixins.$t("staffId")
+      }],
+      title: mixins.$t("storeInformation")
+    }
+    ],
+    // 查询条件
+    searchContent: [{
+      code: 'createtime',
+      title: mixins.$t("pastThirthtyDays"),
+      defaultValue: 5,
+      searchType: Constants.searchType.date
+    },
+    {
+      code: 'staff',
+      title: mixins.$t("staffId"),
+      dropType: 'staff'
+    },
+    {
+      code: 'org',
+      title: mixins.$t("orgId"),
+      dropType: 'org'
+    },
+    {
+      code: 'choose',
+      title: mixins.$t("choose"),
+      searchType: Constants.searchType.pick
+    }
+    ],
+    // 查询条件-筛选
+    pullMenuList: [{
+      code: 'outStatus',
+      pullType: 'mSelect',
+      typeName: 'outStatus'
+    },
+    {
+      code: 'receiveStatus',
+      pullType: 'mSelect',
+      typeName: 'receiveStatus'
+    },
+    {
+      code: 'delivery_Time',
+      dataType: 'date'
+    },
+    {
+      code: 'viewVoidedDocuments',
+      dataType: 'checkbox'
+    },
+    ],
+    contentObj: {
+      '待出库': [{
         name: 'outNo',
         title: mixins.$t("outOrderNo")
       },
@@ -60,119 +127,52 @@ Page({
         }],
         title: mixins.$t("storeInformation")
       }
-    ],
-    // 查询条件
-    searchContent: [{
-        code: 'createtime',
-        title: mixins.$t("pastThirthtyDays"),
-        defaultValue: 5,
-        searchType: Constants.searchType.date
+      ],
+      '出库中': [{
+        name: 'outNo',
+        title: mixins.$t("outOrderNo")
       },
       {
-        code: 'staff',
-        title: mixins.$t("staffId"),
-        dropType: 'staff'
+        name: 'cusPhone',
+        title: mixins.$t("cusPhone")
       },
       {
-        code: 'org',
-        title: mixins.$t("orgId"),
-        dropType: 'org'
+        name: 'addressFull',
+        title: mixins.$t("adddressFull")
       },
       {
-        code: 'choose',
-        title: mixins.$t("choose"),
-        searchType: Constants.searchType.pick
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: mixins.$t("staffId")
+        }],
+        title: mixins.$t("storeInformation")
       }
-    ],
-    // 查询条件-筛选
-    pullMenuList: [{
-        code: 'outStatus',
-        pullType: 'mSelect',
-        typeName: 'outStatus'
+      ],
+      '已出库': [{
+        name: 'outNo',
+        title: mixins.$t("outOrderNo")
       },
       {
-        code: 'receiveStatus',
-        pullType: 'mSelect',
-        typeName: 'receiveStatus'
+        name: 'cusPhone',
+        title: mixins.$t("cusPhone")
       },
       {
-        code: 'delivery_Time',
-        dataType: 'date'
+        name: 'addressFull',
+        title: mixins.$t("adddressFull")
       },
       {
-        code: 'viewVoidedDocuments',
-        dataType: 'checkbox'
-      },
-    ],
-    contentObj: {
-      '待出库': [{
-          name: 'outNo',
-          title: mixins.$t("outOrderNo")
-        },
-        {
-          name: 'cusPhone',
-          title: mixins.$t("cusPhone")
-        },
-        {
-          name: 'addressFull',
-          title: mixins.$t("adddressFull")
-        },
-        {
-          name: [{
-            name: 'orgName',
-            title: ''
-          }, {
-            name: 'staffName',
-            title: mixins.$t("staffId")
-          }],
-          title: mixins.$t("storeInformation")
-        }
-      ],
-      '出库中': [{
-          name: 'outNo',
-          title: mixins.$t("outOrderNo")
-        },
-        {
-          name: 'cusPhone',
-          title: mixins.$t("cusPhone")
-        },
-        {
-          name: 'addressFull',
-          title: mixins.$t("adddressFull")
-        },
-        {
-          name: [{
-            name: 'orgName',
-            title: ''
-          }, {
-            name: 'staffName',
-            title: mixins.$t("staffId")
-          }],
-          title: mixins.$t("storeInformation")
-        }
-      ],
-      '已出库': [{
-          name: 'outNo',
-          title: mixins.$t("outOrderNo")
-        },
-        {
-          name: 'cusPhone',
-          title: mixins.$t("cusPhone")
-        },
-        {
-          name: 'addressFull',
-          title: mixins.$t("adddressFull")
-        },
-        {
-          name: [{
-            name: 'orgName',
-            title: ''
-          }, {
-            name: 'staffName',
-            title: mixins.$t("staffId")
-          }],
-          title: mixins.$t("storeInformation")
-        }
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: mixins.$t("staffId")
+        }],
+        title: mixins.$t("storeInformation")
+      }
       ],
     },
     buttonSaveList: [{
@@ -205,7 +205,7 @@ Page({
    */
   toPoint(e) {
     let item = e.detail.item
-    let buttonList = null
+    let buttonList = null 
     if (!item.flgValid) { //作废
       buttonList= [    {
         name: 'printedBill',
@@ -289,6 +289,8 @@ Page({
           }
         }
       }
+ 
+    
     }
 
     this.setData({
@@ -346,7 +348,12 @@ Page({
           image: '/static/image/success.png',
           duration: 1000
         })
+        // 查询
+        this.searchData();
       }
+      this.setData({
+        loading: false
+      })
     })
   },
 

project.private.config.json

@@ -5,5 +5,5 @@
         "preloadBackgroundData": false
     },
     "projectname": "iboss_wx_app",
-    "libVersion": "3.4.3"
+    "libVersion": "3.4.2"
 }