Merge branch 'develop' into develop-zhouyi

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;
       })

develop/@gms/gms-plugin-billexpand/src/control/linkShowDetail.vue

@@ -30,12 +30,17 @@ export default {
       if(this.define.config.defineId && this.define.config.defineId.split('.').length>1){
         configId =  this.define.config.defineId.split('.')[1];
       }
-      if(this.define.config.defineName && this.define.config.defineName.split('.').length>1){
+      let defineName = '';
+      if(this.define.config.viewName){//跳转界面
+        defineName = this.define.config.viewName;
+      }else if(this.define.config.defineName && this.define.config.defineName.split('.').length>1){
         configDefineName =  this.define.config.defineName.split('.')[1];
+        defineName = this.context.dataObject.getValue(configDefineName)+ '_E';
+      }else{
+        defineName = this.context.dataObject.getValue(configDefineName)+ '_E';
       }
-      let defineName = this.context.dataObject.getValue(configDefineName);
       let id = this.context.dataObject.getValue(configId);
-      let a = "/showBillForm/" + defineName + '_E/' + id;
+      let a = "/showBillForm/" + defineName + '/' + id;
       let routeData = GMS.routerManager.getRouter().resolve({
         path: a,
         query:{

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

@@ -122,6 +122,12 @@ export default {
 					"ref": "BillClassVO.attributes",
 					"disableReload": false,
 					"title": "单据定义"
+				},{
+					"isRequired": true,
+					"ref": "bill",
+					"type": "metaData",
+					"title": "跳转页面",
+					"key": "viewName"
 				}]
 			},
 			"value": "linkShowDetail",
@@ -1439,6 +1445,31 @@ export default {
 			"title": "自定义删除"
 		},
 		{
+			"value": "GH_djTransfer",
+			"discard": false,
+			"path": "工会",
+			"extends": {
+				"paramDes": [
+					{
+						"isRequired": true,
+						"ref": "bill",
+						"type": "metaData",
+						"title": "单据billDefine",
+						"key": "billDefine"
+					},
+					{
+						"isRequired": true,
+						"ref": "columnField",
+						"type": "field",
+						"title": "单据id",
+						"key": "billId"
+					}
+				]
+			},
+			"description": "年中调整",
+			"title": "年中调整"
+		},
+		{
 			"value": "DEQKD_batchEditorAction",
 			"discard": false,
 			"path": "工会",

develop/@gms/gms-plugin-billexpand/src/formula/GeneralImportFile.js

@@ -25,7 +25,8 @@ const formulaObject = {
 'MdFilterByStartsWithFieldValue','MdFilterInfiniteValue','MdFilterOneToMulti',
 'MdYWHDDXFilter','SubTableIsContainValue','SubTableOneToOneFilter','TakeOutBaseDataOne',
 'UpdateAccount','UpdateBillMoneyFunction','UpdateBillReferenceRelationshipFunction','UpdateBorrowMoneyState',
-'UpdateImageInfoRefState','UpdatePaymentState','UpdateRalationBillValueFunction','MdStringMultiFilter','GetYqddBaseDataWithGroupField','ConvertMicrometer','UpdateBillMoneyByDifferenceFunction','UpdateBillMoneyByJKDFunction'].forEach((name) => {
+'UpdateImageInfoRefState','UpdatePaymentState','UpdateRalationBillValueFunction','MdStringMultiFilter','GetYqddBaseDataWithGroupField',
+'ConvertMicrometer','UpdateBillMoneyByDifferenceFunction','UpdateBillMoneyByJKDFunction','GenerateMdData','UpdateJKDSHJE'].forEach((name) => {
     formulaObject[name] = gen()
 })
 export default formulaObject
\ No newline at end of file

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

@@ -73,9 +73,10 @@ import refreshTransactionStatus from "./query-actions/payments/refreshTransactio
 import throughQuery from "./query-actions/throughQuery";
 import queryDeleteBill from "./query-actions/queryDeleteBill";
 import openNewPageDetail from "./query-actions/openNewPageDetail";
+import DEQKD_batchEditorAction from "./query-actions/DEQKD_batchEditorAction";
 import GH_cfBalance from "./query-actions/labourUnion/gh_cfBalance.js"
 import GH_cfProject from "./query-actions/labourUnion/gh_cfProject.js"
-import DEQKD_batchEditorAction from "./query-actions/DEQKD_batchEditorAction";
+import GH_djTransfer from "./query-actions/labourUnion/gh_djTransfer.js"
 //control
 import applyDetail from './control/applyDetail';
 import linkShowDetail from './control/linkShowDetail';
@@ -222,7 +223,12 @@ export default {
         lincaoReadView,
         openNewPageDetail,
         GH_cfBalance,
+        GH_djTransfer,
         GH_cfProject,
+        GH_agreeAction,
+        GH_rejectAction,
+        GH_submitAction,
+        GH_retrieveAction,
         DEQKD_batchEditorAction
     },
     billAction: {
@@ -270,7 +276,8 @@ export default {
         GH_agreeAction,
         GH_rejectAction,
         GH_submitAction,
-        GH_retrieveAction
+        GH_retrieveAction,
+        DEQKD_batchEditorAction
     },
     billControl: {
         applyDetail,

develop/@gms/gms-plugin-billexpand/src/query-actions/labourUnion/gh_djTransfer.js

+import axios from 'axios'
+export default {
+    execute(context, param) {
+        if (!param.billId || !param.billDefine) {
+          context.dom.$Message.info("请配置查询单据参数");
+          return;
+        }
+        if (context.selects && context.selects.length == 0) {
+          context.dom.$Message.info("请勾择需要结转的数据");
+          return;
+        }
+        let billDefine = param.billDefine
+          .replace(/_E/gi, "")
+          .replace(/_R/gi, "")
+          .replace(/_A/gi, "");
+        let list = context.selects.map(v=>{
+          v.billDefine = billDefine;
+          v.billId = v[param.billId];
+          return v
+        })
+        this.generateVoucher(list, context);
+      },
+      generateVoucher(list, context) {
+        window.GMS.$http
+          .post("/rbczgh/modifyBudget",list)
+          .then((res) => {
+            if(res.data.code == 0){
+              context.dom.$Modal.warning({
+                title: "信息提示",
+                content: res.data.msg,
+                onOk: () => {
+                  GMS.vbus.$emit("custom-query-refresh");
+                  GMS.vbus.$emit("tab-count-refresh");
+                },
+              });
+            }else{
+              context.dom.$Modal.error({
+                title: "信息提示",
+                content: res.data.msg,
+                onOk: () => {},
+              });
+            }
+          });
+      }
+}
\ No newline at end of file