1、修改订单校验

api/pages/mac/cusReceiptPayment.js

@@ -11,27 +11,27 @@ module.exports = {
 	cusReceiptPaymentService: {
 		// 前缀
 		prefix: 'mdm-server/mac/receipt/',
-		insertReceipt:'insert_receipt',
-		selectRpInfoById:'select_rp_info_by_id',
-		getRpForUpdate:'get_rp_for_update'
+		insertReceipt: 'insert_receipt',
+		selectRpInfoById: 'select_rp_info_by_id',
+		getRpForUpdate: 'get_rp_for_update'
 	},
 
 	routeUrl: {
 		cusReceiptPayment: {
+			docName:{key:'pay' ,title:'收付款单'},
 			// 收款单新建
 			add: { key: 'add', url: '/package-sales/pages/customer-collection/add/add' },
-			edit: { key: 'edit', url: '/package-sales/pages/customer-collection/add/add',idKey:'rpId' },
-			editRefund: { key: 'editRefund', url: '/package-sales/pages/customer-collection/refund/refund',idKey:'rpId',},
-			cusReturnCollection: { key: 'cusReturnCollection',url: '/package-sales/pages/customer-collection/refund/refund',idKey:'rpId',formMode:'edit',image:'btn-customer-refund.png' },
-      selectCustomers: { key: 'add', url: '/package-base-select/pages/select-customers/select-customers' },
-      refund:{ key: 'refund', url: '/package-sales/pages/customer-collection/refund/refund' }, 
-      selectCollectionConfirm:{key:'selectCollectionConfirm',url:'/package-base-select/pages/select-collection_confirm/select-collection_confirm'},
-      chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
+			edit: { key: 'edit', url: '/package-sales/pages/customer-collection/add/add', idKey: 'rpId' },
+			editRefund: { key: 'editRefund', url: '/package-sales/pages/customer-collection/refund/refund', idKey: 'rpId', },
+			cusReturnCollection: { key: 'cusReturnCollection', url: '/package-sales/pages/customer-collection/refund/refund', idKey: 'rpId', formMode: 'edit', image: 'btn-customer-refund.png' },
+			selectCustomers: { key: 'add', url: '/package-base-select/pages/select-customers/select-customers' },
+			refund: { key: 'refund', url: '/package-sales/pages/customer-collection/refund/refund' },
+			selectCollectionConfirm: { key: 'selectCollectionConfirm', url: '/package-base-select/pages/select-collection_confirm/select-collection_confirm' },
+			chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data', type: 'staff' },
 			staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add' },
-      chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
-      invalid: { key: 'invalid', method: 'invalid', primaryKey: 'rpId', image:'btn-void.png' },
-      ticketPirnt: { key: 'ticketPirnt', method: 'ticketPirnt', primaryKey: 'rpId', image:'btn-printing.png' },
-
+			chooseOrg: { key: 'chooseOrg', url: '/package-base-select/pages/select-data/select-data', type: 'org' },
+			invalid: { key: 'invalid', method: 'invalid', primaryKey: 'rpId', image: 'btn-void.png' },
+			printedBill: { key: 'printedBill', method: 'printedBill', image:'btn-printing.png' },//打印
 
 
 		}

mixins/index.js

@@ -556,7 +556,6 @@ module.exports = {
       // 非空校验
       if (this.data.formName) {
         const component = this.selectComponent('#' + this.data.formName);
-        console.log('tt', component);
         if (component && component.validData) {
           let valid = component.validData();
           console.log('valid',valid);

package-sales/pages/customer-collection/customer-collection.js

@@ -16,6 +16,7 @@ Page({
    */
   data: {
     customerEfundFlag: false,
+    primaryKey: 'rpId',
     // 查询条件
     searchContent: [{
       code: 'createtime',
@@ -99,11 +100,9 @@ Page({
     buttonList: [{
       name: 'cusReturnCollection',
       title: mixins.$t("cusReturnCollection")
-    }, { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
-    {
-      name: 'ticketPirnt',
-      title: mixins.$t("ticketPirnt")
-    }
+    }, 
+    { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
+    { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
     ],
   },
   /**

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

@@ -30,8 +30,8 @@ Page({
 
       ],
       items: [
-        { code: 'collectType', name: 'collectName', type: 'drop', required: true, dropType: 'collect' },
-        { code: 'collectAmount', type: 'number', title: mixins.$t("amountCollected"), required: true }
+        { code: 'collectType', name: 'collectName', type: 'drop', dropType: 'collect' },
+        { code: 'collectAmount', type: 'number', title: mixins.$t("amountCollected") }
       ],
       other: [
         { code: 'contractNo', type: 'textarea', title: mixins.$t("contractNumber"), readonly: false },