Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend into develop

develop/@gms/gms-plugin-billexpand/src/actions/lincaoAddView.js

@@ -3,10 +3,15 @@ export default {
   execute: function (bill, param) {
     let name = GMS.$hideContainer.addComponent(lincaoView, {}, function (c) {
         const year = nros.getUser().loginDate.substring(0,4)
+        const unitCode = nros.getUser().loginUnit
         c.bill = bill.dom
-        c.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=130324&type=${param.param.type}&projectNum=1&year=${year}`
+        const projectNum = bill.dom.getMasterData().getData().billCode.value
+        c.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=${unitCode}&type=${param.param.type}&projectNum=${projectNum}&year=${year}`
         c.name = name
         c.modalShow = true;
       })
+    // } else {
+    //   GAMS.Common.messagePrompt('缺少参数')
+    // }
   }
 }
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/emcon.js

@@ -4723,13 +4723,13 @@ export default {
 				"info": {
 					"param": [],
 					"name": "GetMdOrgParentField",
-					"description": "1:根据MD_ORG表中的区划字段进行筛选,2:是否启用上级区划(也就是第一个参数的值1为启用，0为不启用),3:获取的字段名（最后返回的字段名）例子:GetMdOrgParentField('SFSJ','1','name')",
-					"title": "根据当前组织机构获取需要的区划级别字段",
+					"description": "1:MD_ORG表中的字段名",
+					"title": "传入MD_ORG表中的字段获取字段的值",
 					"return": 0
 				}
 			},
-			"description": "1:根据MD_ORG表中的区划字段进行筛选,2:是否启用上级区划(也就是第一个参数的值1为启用，0为不启用),3:获取的字段名（最后返回的字段名）例子:GetMdOrgParentField('SFSJ','1','name')",
-			"title": "根据当前组织机构获取需要的区划级别字段",
+			"description": "1:MD_ORG表中的字段名",
+			"title": "传入MD_ORG表中的字段获取字段的值",
 			"value": "GetMdOrgParentField"
 		},{
 			"discard": false,