金额格式化

packageA/invoice/detail.js

@@ -1,4 +1,9 @@
-const _Http = getApp().globalData.http;
+const _Http = getApp().globalData.http,
+    currency = require("../../utils/currency"),
+    CNY = num => currency(num, {
+        symbol: "￥",
+        precision: 2
+    }).format();
 
 Page({
     loading: true,
@@ -56,7 +61,7 @@ Page({
             value: item.billno
         }, {
             label: "发票限额",
-            value: item.quota
+            value: CNY(item.quota)
         }, {
             label: "是否手工单",
             value: item.byhand ? '是' : '否'

packageA/invoice/update.js

@@ -5,6 +5,59 @@ Page({
         showAll: false,
         disabled: true,
         form: [{
+            label: "发票种类",
+            error: false,
+            errMsg: "",
+            type: "radio",
+            radioList: [{
+                    name: 's/专用发票',
+                    id: 's'
+                },
+                {
+                    name: 'p/普通发票(电票)',
+                    id: 'p'
+                },
+            ],
+            value: "s",
+            valueName: "invoiceline",
+            required: false,
+        }, {
+            label: "发票限额",
+            error: false,
+            errMsg: "",
+            type: "number",//digit
+            value: "",
+            placeholder: "发票限额",
+            valueName: "quota",
+            required: false
+        }, {
+            label: "发票复核人",
+            error: false,
+            errMsg: "",
+            type: "text",
+            value: "",
+            placeholder: "发票复核人",
+            valueName: "invoicechecker",
+            required: false
+        }, {
+            label: "发票收款人",
+            error: false,
+            errMsg: "",
+            type: "text",
+            value: "",
+            placeholder: "发票收款人",
+            valueName: "invoicepayee",
+            required: false
+        }, {
+            label: "发票开票员",
+            error: false,
+            errMsg: "",
+            type: "text",
+            value: "",
+            placeholder: "发票开票员",
+            valueName: "invoiceclerk",
+            required: false
+        }, {
             label: "备注",
             error: false,
             errMsg: "",
@@ -101,7 +154,7 @@ Page({
             })
         } else if (detail.temporary.item.label == "开票经销商") {
             detail.form[0].value = detail.data.value;
-            detail.form.splice(1, detail.form.length == 2 ? 0 : 1, {
+            detail.form.splice(1, detail.form[1].label == '发票种类' ? 0 : 1, {
                 label: "开票抬头",
                 error: false,
                 errMsg: "",
@@ -135,9 +188,9 @@ Page({
     },
     submit() {
         let data = this.selectComponent("#Form").submit();
-        let content = this.data.content;
-        data.sys_enterpriseid && (content.sys_enterpriseid = data.sys_enterpriseid[1][0]);
-        content.remarks = data.remarks;
+        let content = Object.assign(this.data.content, data);
+        content.sys_enterpriseid && (content.sys_enterpriseid = data.sys_enterpriseid[1][0]);
+        delete(content.principal)
         wx.showModal({
             title: '提示',
             content: '是否确定创建开票申请单?',