no message

src/biz/enterpriseInfo.ts

@@ -2,7 +2,7 @@
  * 企业信息汇总
  * */
  
-import { EnterpriseFaRenInfoUpdateConfig, EnterpriseInfomationUpdateConfig, EnterpriseServiceUpdateConfig } from "../config/eccParam/enterprise";
+import { EnterpriseFaRenInfoUpdateConfig, EnterpriseInfomationUpdateConfig, EnterpriseServiceUpdateConfig} from "../config/eccParam/enterprise";
 import { OPERATIONALDATATYPE, TABLEID, TABLENAME } from "../config/enum/dbEnum";
 import * as enumConfig from "../config/enum/enum";
 import { EnterpriseBaseResConfig, EnterpriseFaRenInfoResConfig, EnterpriseInfomationResConfig, EnterpriseLeaseInfoResConfig, EnterpriseQualificationInfoResConfig } from "../config/splitResult/enterprise";
@@ -48,6 +48,40 @@ export async function enterpriseLogin(phone:string, pwd:string) {
     return {dataInfo:userInfo};
 }
 
+/**
+ * 小程序登录改为邮箱认证--todo
+ */
+// export async function enterpriseLogin(email:string, code:string) {
+//     // let dbInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业基础信息表, {uscc}, ["eId"]);
+
+//     let filesList = ["userName", "eId", "code", "uId",  "email"];
+//     let enterpriseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {email}, filesList);
+
+//     if (!enterpriseInfo || !enterpriseInfo.eId) {
+//         throw new BizError(ERRORENUM.账号或密码错误);
+//     }
+//     if (enterpriseInfo.code != code) {
+//         throw new BizError(ERRORENUM.账号或密码错误);
+//     }
+
+//     let updateUserInfo = {
+//         token : getToken(enterpriseInfo.uId),
+//         tokenMs : getMySqlMs()
+//     };
+//     await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.企业用户表, updateUserInfo, {uId:enterpriseInfo.uId});
+    
+
+//     let userInfo = {
+//         userId:enterpriseInfo.uId,
+//         userName:enterpriseInfo.userName,
+//         phemailone:enterpriseInfo.email,
+//         token:updateUserInfo.token,
+//     };
+
+//     return {dataInfo:userInfo};
+// }
+
+
 export async function enterpriseLogout(uId) {
     let filesList = ["userName", "eId", "pwd", "uId"];
     let enterpriseInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.企业用户表, {uId}, filesList);

src/biz/qualification.ts

@@ -159,8 +159,15 @@ export async function enterpriseIPRInfo(eId:string) {
 export async function enterpriseIPRByType(eId:string, iprType:number) {
     let filesList = ["iprId", "year","number", "iprType","selectedValue","iprName", "iprUrl"];
     let selecParam:any = {eId};
-    if (iprType == enumConfig.IPRTYPECLIENT.其他) {
-        selecParam.iprType = {"%notIn%":[enumConfig.IPRTYPECLIENT.软件著作, enumConfig.IPRTYPECLIENT.海外专利, enumConfig.IPRTYPECLIENT.发明专利]};
+    // if (iprType == enumConfig.IPRTYPECLIENT.其他) {
+    //     selecParam.iprType = {"%notIn%":[enumConfig.IPRTYPECLIENT.软件著作, enumConfig.IPRTYPECLIENT.海外专利, enumConfig.IPRTYPECLIENT.发明专利]};
+    // } else {
+    //     selecParam.iprType = iprType;
+    // }
+    if (iprType == enumConfig.IPRTYPECLIENT.专利) {
+        selecParam.iprType = { "%in%": [enumConfig.IPRTYPECLIENT.发明专利, enumConfig.IPRTYPECLIENT.海外专利] };
+    } else if (iprType == enumConfig.IPRTYPECLIENT.其他) {
+        selecParam.iprType = { "%notIn%": [enumConfig.IPRTYPECLIENT.软件著作权, enumConfig.IPRTYPECLIENT.发明专利, enumConfig.IPRTYPECLIENT.海外专利] };
     } else {
         selecParam.iprType = iprType;
     }

src/config/enum/enum.ts

@@ -52,6 +52,15 @@ export enum FUHUASTATE {
     迁出= 4
 }
 
+/**
+ * 迁出类型
+ */
+export enum EMIGRATIONTYPE {
+    毕业迁出 = 1,
+    到期退租,
+    违约退租
+}
+
 
 /**
  * 上市情况
@@ -160,7 +169,7 @@ export enum QUARTER {
  * 知识产权类型
  */
 export enum INTELLECTUALPROPERTYRIGHT {
-    软件著作 = 1,
+    软件著作权 = 1,
     发明专利,
     海外专利,
     植物新品种,
@@ -173,9 +182,10 @@ export enum INTELLECTUALPROPERTYRIGHT {
  */
 export enum IPRTYPECLIENT {
     其他 = 0, 
-    软件著作 = 1,
+    软件著作权 = 1,
     发明专利,
     海外专利,
+    专利
 }
 
 /**
@@ -185,4 +195,12 @@ export enum IPRTYPECLIENTQT {
     植物新品种 = 4,
     集成电路布图
     
+}
+
+/**
+ * 知识产权类型专利 前端用
+ */
+export enum IPRTYPECLIENTZL {
+    发明专利 = 2,
+    海外专利,  
 }
\ No newline at end of file

src/routers/public.ts

@@ -19,6 +19,7 @@ const config = {
     "/public/intellectualpropertyright":enumConfig.INTELLECTUALPROPERTYRIGHT,// 新增知识产权类型
     "/public/iprtypeclient":enumConfig.IPRTYPECLIENT,// 新增知识产权类型
     "/public/iprtypeclientqt":enumConfig.IPRTYPECLIENTQT,// 新增知识产权类型
+    "/public/iprtypeclientzl":enumConfig.IPRTYPECLIENTZL,// 新增知识产权专利
     
 }