合同调整

packageA/contract/add/type1/index.js

@@ -17,7 +17,7 @@ Page({
             placeholder: "",
             valueName: "title",
             checking: "base",
-            required: true
+            required: false
         }, {
             label: "经销商",
             error: false,
@@ -42,7 +42,7 @@ Page({
             checking: "base",
             required: true
         }, {
-            label: "整体折扣",
+            label: "折扣(%)",
             error: false,
             errMsg: "",
             hint: "请输入0-100整数!",
@@ -50,7 +50,7 @@ Page({
             value: "",
             placeholder: "请填写折扣(%)",
             valueName: "discountrate", //绑定的字段名称
-            required: true, //必填
+            required: false, //必填
             checking: `^([1-9]?\\d|100)$`, //0-100%
             slot: "discountrate"
         }, {

packageA/contract/add/type2/index.js

@@ -17,7 +17,7 @@ Page({
             placeholder: "",
             valueName: "title",
             checking: "base",
-            required: true
+            required: false
         }, {
             label: "经销商",
             error: false,

packageA/contract/add/type3/index.js

@@ -17,7 +17,7 @@ Page({
             placeholder: "",
             valueName: "title",
             checking: "base",
-            required: true
+            required: false
         }, {
             label: "选择客户",
             error: false,

packageA/contract/add/type4/index.js

@@ -17,7 +17,7 @@ Page({
             placeholder: "",
             valueName: "title",
             checking: "base",
-            required: true
+            required: false
         }, {
             label: "居间服务商",
             error: false,
@@ -64,6 +64,18 @@ Page({
             valueName: "sa_projectid",
             checking: "base",
             required: true
+        }, {
+            label: "佣金比例(%)",
+            error: false,
+            errMsg: "",
+            hint: "请输入0-100整数!",
+            type: "number",
+            value: "",
+            placeholder: "请填写佣金比例(%)",
+            valueName: "kickback", //绑定的字段名称
+            required: false, //必填
+            checking: `^([1-9]?\\d|100)$`, //0-100%
+            slot: "discountrate"
         }, {
             label: "有效期",
             error: false,

packageA/contract/add/type5/index.js

@@ -17,7 +17,7 @@ Page({
             placeholder: "",
             valueName: "title",
             checking: "base",
-            required: true
+            required: false
         }, {
             label: "选择客户",
             error: false,

packageA/contract/detail.js

@@ -16,6 +16,9 @@ Page({
         }, {
             icon: "icon-genjin",
             label: "反审核"
+        }, {
+            icon: "icon-genjin",
+            label: "终止"
         }, {
             icon: "icon-genjin",
             label: "跟进"
@@ -215,7 +218,7 @@ Page({
                     })
                     briefs.splice(5, 0, {
                         label: "佣金比例",
-                        value: data.kickback
+                        value: data.kickback + '%'
                     })
                     list1.splice(4, 0, {
                         label: "居间服务商",
@@ -227,7 +230,7 @@ Page({
                     })
                     list1.splice(8, 0, {
                         label: "佣金比例",
-                        value: data.kickback
+                        value: data.kickback + '%'
                     })
                     break;
                 case "工具使用(借出)协议":
@@ -324,6 +327,29 @@ Page({
         let data = this.data.detail,
             that = this;
         switch (detail.label) {
+            case "终止":
+                wx.showModal({
+                    title: '提示',
+                    content: `是否确定终止当前协议`,
+                    complete: (res) => {
+                        if (res.confirm) _Http.basic({
+                            "id": 20221212102802,
+                            "content": {
+                                "sa_contractid": that.data.sa_contractid
+                            }
+                        }).then(res => {
+                            console.log("提交报价单", res)
+                            wx.showToast({
+                                title: res.msg == '成功' ? "已终止" : res.msg,
+                                icon: "none"
+                            })
+                            if (res.msg == '成功') setTimeout(() => {
+                                that.getDetail();
+                            }, 300)
+                        })
+                    }
+                })
+                break;
             case "提交":
                 if (data.status != '新建') return wx.showToast({
                     title: '当前状态不可提交!',