Merge branch 'develop-raojiaguan' into 'develop'

林草参数提交

See merge request GFP/RBC/rbc-frontend!205

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

@@ -4,10 +4,21 @@ export default {
     let name = GMS.$hideContainer.addComponent(lincaoView, {}, function (c) {
         const year = nros.getUser().loginDate.substring(0,4)
         const unitCode = nros.getUser().loginUnit
+        let orgParam ={
+            orgCodes:[unitCode],
+            pagination: true,
+            queryDataStructure: 'ALL',
+        }
+       let sjcode;
+       GMS.$http
+       .post('/org/data/get', orgParam)
+          .then((res) => {
+            sjcode=res.data.sjcode
+       })
         c.bill = bill.dom
         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.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=130324&type=jhltlx&projectNum=1&year=2021`
+        c.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=${sjcode}&type=${param.param.type}&projectNum=${projectNum}&year=${year}`
+        // c.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=130324&type=jhltlx&projectNum=1&year=2021`
         c.name = name
         c.modalShow = true;
       })