采购

api/pages/mac/income.js

@@ -20,6 +20,11 @@ module.exports = {
 			detail: {
 				key: 'detail', url: '/package-accounts-manage/pages/other-receipt/detail/detail'
 			}, 
+			chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-choose-staff/select-choose-staff' }, 
+			chooseOrg: { key: 'chooseOrg', url: '/package-base-select/pages/select-choose-org/select-choose-org' },
+			selectIncomeCategory: {
+				key: 'selectIncomeCategory', url: '/package-base-select/pages/select-income-category/select-income-category'
+			},
 		}
 	}
 }; 

app.json

@@ -209,7 +209,8 @@
                 "pages/select-choose-staff/select-choose-staff",
                 "pages/select-warehouse/select-warehouse",
                 "pages/select-account-category/select-account-category",
-                "pages/select-fund-account/select-fund-account"
+                "pages/select-fund-account/select-fund-account",
+                "pages/select-income-category/select-income-category"
             ]
         }
     ],

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

@@ -9,13 +9,14 @@ Page({
   data: {
     cardList: [
       { name: 'main' },
-      { name: 'bill', title: '应收', chooseFlag: true, chooseTitle: '选应收', urlKey: 'selectBill' },
+      { name: 'bill', title: '应收', chooseFlag: true, chooseTitle: '选类别', urlKey: 'selectIncomeCategory' },
       { name: 'file' }],
     contentObj: {
       main: [
         {
           code: 'accDate',
           name: 'accDate',
+          title:'收款日期',
           type: 'date',
           required: true,
         },
@@ -42,12 +43,10 @@ Page({
         },
 
       ],
-      bill: [
-        { code: 'cancelAmount', type: 'cancel', title: '核销应收', bill: 3, amount: 500 },
-        { code: 'receivableWaive', type: 'number', title: '待核销金额', readonly: true, },
-        { code: 'receiptResidue', type: 'number', title: '使用预存', },
-        { code: 'sumWaiveAmt', type: 'number', title: '优惠金额', },
-        { code: 'currentReceivableWaive', type: 'number', title: '本次核销', required: true },
+      bill: [ 
+        { code: 'receivableWaive', type: 'number', title: '收入类别', readonly: true,required: true  },
+        { code: 'receiptResidue', type: 'number', title: '收入金额',required: true  },
+      
       ],
       file: [{
         code: 'remarks', type: 'textarea', title: '备注'
@@ -69,7 +68,7 @@ Page({
       type: 'number'
     }],
     btnFormData: null,
-    routeObjName: 'receiptPayment'
+    routeObjName: 'income'
   },
 
   /**

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

@@ -9,7 +9,7 @@
  *******************************************************************************/
 const Constants = require('@/utils/Constants.js');
 const mixins = require('@/mixins/index.js')
-Page({
+Page({select-Income-category
   mixins: [mixins],
   /**
    * 页面的初始数据

package-base-select/pages/select-income-category/select-income-category.js

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

package-base-select/pages/select-income-category/select-income-category.json

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

package-base-select/pages/select-income-category/select-income-category.wxml

@@ -0,0 +1,2 @@
+<!--package-base-select/pages/select-Income-category/select-Income-category.wxml-->
+<text>package-base-select/pages/select-Income-category/select-Income-category.wxml</text>

package-base-select/pages/select-income-category/select-income-category.wxss

@@ -0,0 +1 @@
+/* package-base-select/pages/select-Income-category/select-Income-category.wxss */