Browse Source

feature: 调整合同、联系人的必填项

liuyaqi 2 years ago
parent
commit
3faeec4ba6

+ 3 - 3
opms_parent/app/model/cust/cust_customer_contact.go

@@ -20,10 +20,10 @@ type CustCustomerContactSeq struct {
 	CustId         int    `p:"custId"     json:"custId"      v:"required#客户ID不能为空" `                    // 关联客户
 	CuctName       string `p:"cuctName"     json:"cuctName"  v:"required#联系人名字不能为空"`                    // 姓名
 	CuctGender     string `p:"cuctGender"    json:"cuctGender"  v:"required|in:10,20#性别不能为空|填写错误"`      // 性别(10男20女)
-	Telephone      string `p:"telephone"    json:"telephone"  v:"required|phone#手机号不能为空|手机号格式错误"`       // 电话
-	Wechat         string `p:"wechat"    json:"wechat"  v:"required#微信不能为空"`                            // 微信
+	Telephone      string `p:"telephone"    json:"telephone"  v:"phone#手机号格式错误"`       // 电话
+	Wechat         string `p:"wechat"    json:"wechat"`                            // 微信
 	Email          string `p:"email"    json:"email" v:"email#邮箱格式错误"`                                  // 邮箱
-	Dept           string `p:"dept"            json:"dept"  v:"required#部门不能为空"`                        // 部门
+	Dept           string `p:"dept"            json:"dept"`                        // 部门
 	Postion        string `p:"postion"    json:"postion"   v:"required#岗位不能为空" `                        // 职位
 	OfficeLocation string `p:"officeLocation" json:"officeLocation"`                                    // 办公地点
 	IsDecision     string `p:"isDecision"     json:"isDecision" v:"required|in:10,20#是否关键决策人不能为空|填写错误"` // 关键决策人(10是20否)

+ 1 - 1
opms_parent/schema/contract.sql

@@ -17,7 +17,7 @@ CREATE TABLE `ctr_contract` (
     `invoice_amount` decimal(24, 6) NOT NULL COMMENT '已开票金额',
     `collected_amount` decimal(24, 6) NOT NULL COMMENT '已回款金额',
     `contract_start_time` datetime NOT NULL COMMENT '合同开始时间',
-    `contract_end_time` datetime NOT NULL COMMENT '合同结束时间',
+    `contract_end_time` datetime COMMENT '合同结束时间',
     `incharge_id` int(11) COMMENT '负责人ID',
     `incharge_name` varchar(90) COMMENT '负责人(销售工程师)',
     `signatory_id` int(11) DEFAULT NULL COMMENT '公司签约人ID',

+ 1 - 0
opms_parent/schema/tmp.sql

@@ -22,3 +22,4 @@ alter table ctr_contract  add  `product_line` varchar(4) NOT NULL COMMENT '产
 
 alter table cust_customer drop column  cust_dist_code;
 alter table cust_customer drop column  cust_location;
+alter table ctr_contract modify `contract_end_time` datetime COMMENT '合同结束时间'