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

api/pages/mac/otherPayable.js

@@ -14,7 +14,7 @@ module.exports = {
 	}, 
 	routeUrl: {
 		otherPayable: {
-			 
+			docName:{key:'other_payable' ,title:'其他支出单'},
 			add: { key: 'add', url: '/package-accounts-manage/pages/other-expenditure-orders/add/add' },
 			edit: { key: 'edit', url: '/package-accounts-manage/pages/other-expenditure-orders/detail/detail' }, 
 			chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
@@ -23,7 +23,7 @@ module.exports = {
 				key: 'selectIncomeCategory', url: '/package-base-select/pages/select-data/select-data',type:'dictionary',dictCode:'基础资料-支出',chooseFlag:true,repeatFlag:true
 			},
 			chooseSupplier: { key: 'chooseSupplier',url: '/package-base-select/pages/select-data/select-data',type:'supplier' }, 
-			
+			printedBill: { key: 'printedBill', method: 'printedBill', image:'btn-printing.png' },//打印
 		}
 	}
 }; 

api/pages/mac/otherReceivable.js

@@ -14,6 +14,7 @@ module.exports = {
 	}, 
 	routeUrl: {
 		otherReceivable: {
+			docName:{key:'other_receivable' ,title:'其他收入单'},
 			add: { key: 'add', url: '/package-accounts-manage/pages/other-receipt/add/add' },
 			edit: { key: 'edit', url: '/package-accounts-manage/pages/other-receipt/detail/detail' }, 
 			chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
@@ -21,7 +22,7 @@ module.exports = {
 			selectIncomeCategory: {
 				key: 'selectIncomeCategory', url: '/package-base-select/pages/select-data/select-data',type:'dictionary',dictCode:'基础资料-收入',chooseFlag:true,repeatFlag:true
 			},
-	 
+			printedBill: { key: 'printedBill', method: 'printedBill', image:'btn-printing.png' },//打印
 			
 		}
 	}

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

@@ -62,8 +62,8 @@ Page({
         name: 'customerRefundList',
         title:  mixins.$t('cusNotCollection'),//'取消收款',
       }, {
-        name: 'customerRefundList',
-        title: mixins.$t('ticketPirnt'),
+        name: 'printedBill',
+        title: mixins.$t('printedBill') //打印票据
       }
     ],
     selectlength: 5,

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

@@ -16,15 +16,17 @@ Page({
   data: {
     // 查询条件
     searchContent: [
-      { code: 'makeTime', title: mixins.$t('pastThirthtyDays'),
-       defaultValue: 5, searchType: Constants.searchType.date },
+      {
+        code: 'makeTime', 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: [       
+    pullMenuList: [
       {
-        code: 'receivableNo', 
+        code: 'receivableNo',
       },
       {
         code: 'cusName',
@@ -47,7 +49,7 @@ Page({
     ],
     // 列表区（内容）
     contentList: [
-      { name: 'receivableNo', title: mixins.$t('receiptOrderNo'),},//'收款单号' 
+      { name: 'receivableNo', title: mixins.$t('receiptOrderNo'), },//'收款单号' 
       {
         name: [{ name: 'orgName', title: '' },
         { name: 'staffName', title: '' },],
@@ -59,18 +61,18 @@ Page({
     buttonList: [
       {
         name: 'customerRefundList',
-        title:  mixins.$t('cusReturnCollection'),//客户退款
+        title: mixins.$t('cusReturnCollection'),//客户退款
       },
       {
         name: 'customerRefundList',
-        title:  mixins.$t('cusNotCollection'),//'取消收款',
+        title: mixins.$t('cusNotCollection'),//'取消收款',
       }, {
-        name: 'customerRefundList',
-        title: mixins.$t('ticketPirnt'),
+        name: 'printedBill',
+        title: mixins.$t('printedBill') //打印票据
       }
     ],
     selectlength: 5,
- 
+
     // 底部保存按钮
     buttonFootList: [{
       name: 'add',
@@ -78,7 +80,7 @@ Page({
     }],
     contentnFootList: [
       {
-        title:  mixins.$t('totalAmount'),
+        title: mixins.$t('totalAmount'),
         code: 'totalAmount',
         content: 0,
         type: 'number'
@@ -88,13 +90,13 @@ Page({
         bill: 1,
         quantity: 2
       }
-    ], 
+    ],
     btnFormData: null,
     // 路由
     routeObjName: 'otherReceivable',
     // 主键Id 
     primaryKey: 'receivableId',
-   
+
   },
 
   /**
@@ -104,7 +106,7 @@ Page({
   */
   setSearchParams(params) {
     //收付款类型-收款的查询参数
-  //  params.rpType = Constants.rpType.receipt
+    //  params.rpType = Constants.rpType.receipt
     return params;
   },
 
@@ -114,13 +116,13 @@ Page({
    * @author : 王英杰
    */
   getData(params) {
-    return this.excute(this.data.service, this.data.service.selectByCond, params);    
-  }, 
+    return this.excute(this.data.service, this.data.service.selectByCond, params);
+  },
   /**
      * @desc :   处理接口返回数据
      * @date : 2024年3月8日
      * @author : 王英杰
-     */ 
+     */
   handleSearchData(tableData) {
     if (tableData && tableData.length > 0) {
       tableData.forEach(res => {
@@ -132,5 +134,5 @@ Page({
       tableData: tableData
     })
   },
- 
+
 })

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

@@ -18,39 +18,39 @@ Page({
   data: {
 
     popbuttonList: [{
-        name: 'editPur',
-        title: mixins.$t('edit'),
-      }, {
-        name: 'purchaseCancellation',
-        title: mixins.$t('purchaseCancellation'),//采购作废 
-      }, //title:mixins.$t('followUp') 
-      {
-               
-        name: 'selectSourcePurchaseOrder',
-        title: mixins.$t('purReturnOutBound'), //采购退货
-        formMode: Constants.formMode.index,
-        formType: Constants.formMode.add,
-        idKey: 'purId',
+      name: 'editPur',
+      title: mixins.$t('edit'),
+    }, {
+      name: 'purchaseCancellation',
+      title: mixins.$t('purchaseCancellation'),//采购作废 
+    }, //title:mixins.$t('followUp') 
+    {
+
+      name: 'selectSourcePurchaseOrder',
+      title: mixins.$t('purReturnOutBound'), //采购退货
+      formMode: Constants.formMode.index,
+      formType: Constants.formMode.add,
+      idKey: 'purId',
+    },
+    {
+      name: 'transferToWarehouse',
+      title: mixins.$t('transferToWarehouse'),//转入库 
+      formMode: Constants.formMode.other,
+      other: {
+        idKey: 'purId'
       },
-        {
-         name: 'transferToWarehouse',
-        title: mixins.$t('transferToWarehouse'),//转入库 
-        formMode: Constants.formMode.other,
-        other: {
-          idKey: 'purId'
-        },
-      }, {
-        name: 'ticketPirnt',
-        title: mixins.$t('printTickets') //打印票据
-      },    
+    }, {
+      name: 'printedBill',
+      title: mixins.$t('printedBill') //打印票据
+    },
 
     ],
     // 弹出按钮
     buttonList: [{
-      name: 'merge', 
+      name: 'merge',
       title: mixins.$t('add'), //'新建'
     }],
-    contentList: [{ 
+    contentList: [{
       title: mixins.$t('totalAmount'), //'合计金额:',
       code: 'amount',
       content: 0,
@@ -65,37 +65,37 @@ Page({
     active: 0, //默认查询入库中
     // 查询条件
     searchContent: [{
-        code: 'makeTime', 
-        title: mixins.$t('pastThirthtyDays'), //近30天',
-        defaultValue: 5,
-        searchType: Constants.searchType.date
-      },
+      code: 'makeTime',
+      title: mixins.$t('pastThirthtyDays'), //近30天',
+      defaultValue: 5,
+      searchType: Constants.searchType.date
+    },
 
-      {
-        code: 'choose', 
-        title: mixins.$t('choose'), //'筛选',
-        searchType: Constants.searchType.pick
-      } 
+    {
+      code: 'choose',
+      title: mixins.$t('choose'), //'筛选',
+      searchType: Constants.searchType.pick
+    }
     ],
     // 查询条件-筛选
     pullMenuList: [{
-        code: 'intoStatus',
-        pullType: 'mSelect',
-        typeName: 'intoStatus'
-      },
-      {
-        code: 'supName',
-      },
-      {
-        code: 'staffName',
-      },
-      {
-        code: 'orgName',
-      },
-      {
-        code: 'makeTime',
-        dataType: 'date'
-      },
+      code: 'intoStatus',
+      pullType: 'mSelect',
+      typeName: 'intoStatus'
+    },
+    {
+      code: 'supName',
+    },
+    {
+      code: 'staffName',
+    },
+    {
+      code: 'orgName',
+    },
+    {
+      code: 'makeTime',
+      dataType: 'date'
+    },
       // {
       //   code: 'flgValid',
       //   title: mixins.$t('flgValid'),
@@ -103,11 +103,11 @@ Page({
       // },
     ],
 
-    tagList: [{ 
+    tagList: [{
       title: mixins.$t('all'), //"全部单据"
-    }, { 
+    }, {
       title: mixins.$t('staging'), //"暂存"
-    }, { 
+    }, {
       title: mixins.$t('deal'), //"成交"
     }],
     contentObj: {
@@ -121,17 +121,17 @@ Page({
         }, {
           name: 'staffName',
           title: ''
-        }], 
+        }],
         title: mixins.$t('purInfo') //采购信息
       }, {
         name: 'whName',
         title: mixins.$t('eiWhName') //预计入库仓库
       }, {
-        name: 'pickupDate', 
+        name: 'pickupDate',
         title: mixins.$t('erDate') //预计入库日期
-      }], 
+      }],
       [mixins.$t('warehousingProcessing')]: [{ //[mixins.$t("procurementSupplier")]
-        name: 'purNo', 
+        name: 'purNo',
         title: mixins.$t('saleOrderNo') //订单编号
       }, {
         name: [{
@@ -140,15 +140,15 @@ Page({
         }, {
           name: 'staffName',
           title: ''
-        }], 
+        }],
         title: mixins.$t('purInfo') //采购信息
       }, {
         name: 'whName',
         title: '预计入库仓库' //预计入库仓库
       }, {
-        name: 'pickupDate', 
+        name: 'pickupDate',
         title: mixins.$t('erDate') //预计入库日期
-      }], 
+      }],
       [mixins.$t('inStorage')]: [{ // 入库中 
         name: 'purNo',
         title: mixins.$t('saleOrderNo') //订单编号
@@ -159,13 +159,13 @@ Page({
         }, {
           name: 'staffName',
           title: ''
-        }], 
+        }],
         title: mixins.$t('purInfo') //采购信息
       }, {
-        name: 'whName', 
+        name: 'whName',
         title: mixins.$t('enterWhName') //入库仓库
       }, {
-        name: 'pickupDate', 
+        name: 'pickupDate',
         title: mixins.$t('enterWhDate') //入库日期
       }],
       [mixins.$t('received')]: [{ //[mixins.$t("procurementSupplier")]
@@ -178,19 +178,19 @@ Page({
         }, {
           name: 'staffName',
           title: ''
-        }], 
+        }],
         title: mixins.$t('purInfo') //采购信息
       }, {
-        name: 'whName', 
+        name: 'whName',
         title: mixins.$t('enterWhName') //入库仓库
       }, {
-        name: 'pickupDate', 
+        name: 'pickupDate',
         title: mixins.$t('enterWhDate') //入库日期
       }],
     },
     // 列表区（脚部金额）
     footerAmount: {
-      name: 'sumAmount', 
+      name: 'sumAmount',
       title: mixins.$t('sumTotalAmount') //'共计金额'
     },
     // 列表区（脚部信息）
@@ -204,7 +204,7 @@ Page({
     routeObjName: 'purchase',
     primaryKey: 'purId'
   },
- 
+
 
   /**
    * @desc : 作废
@@ -215,7 +215,7 @@ Page({
     let item = e
     let id = item.purId
     // 采购入库 
-  
+
     this.excute(this.data.service, this.data.service.invalid + id, null).then(res => {
       if (res.data.code == Constants.SUCESS_CODE) {
         // 重新查询
@@ -244,14 +244,14 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 王英杰
    */
-  editPur(e) {  
+  editPur(e) {
     let item = e
     let purId = item.purId
     wx.navigateTo({
       url: this.data.route.add.url,
       events: {
         // 回调后，在这里给页面赋值
-        bandData: function (e) {}
+        bandData: function (e) { }
       },
       success: function (res) {
         res.eventChannel.emit('params', {
@@ -305,11 +305,11 @@ Page({
     params.purType = Constants.documentType.purOrder //'单据类型-采购订单'
     return params;
   },
- /**
-   * @desc : 设置查询参数
-   * @date : 2024年3月8日
-   * @author : 王英杰
-   */
+  /**
+    * @desc : 设置查询参数
+    * @date : 2024年3月8日
+    * @author : 王英杰
+    */
   setSearchParams(params) {
     //收付款类型-收款的查询参数
     params.makeTime = null
@@ -319,7 +319,7 @@ Page({
    * @desc : 查询 入库单
    * @date : 2024年3月8日
    * @author : 王英杰
-   */ 
+   */
   getData(params) {
     return this.excute(this.data.service, this.data.service.selectByCond, params);
   },
@@ -329,7 +329,7 @@ Page({
    * @date : 2024年3月8日
    * @author : 王英杰
    */
-  handleSearchData() { 
+  handleSearchData() {
     let tableData = this.data.tableData
     tableData.forEach(res => {
       if (res.intoStatus == Constants.intoStatus.unInBound) { //处理状态
@@ -350,7 +350,7 @@ Page({
    */
   toDetail(e) {
     let purId = e.detail.item.purId
-    let displayedStatus = e.detail.item.displayedStatus 
+    let displayedStatus = e.detail.item.displayedStatus
     wx.navigateTo({ //STAGING  ==  暂存
       url: (displayedStatus == Constants.orderStatus.STAGING) ? this.data.route.add.url : this.data.route.detail.url,
       events: {