Merge remote-tracking branch 'origin/develop' into develop-fengjiansheng

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

@@ -2,9 +2,10 @@ import ImageViewModal from '../../../../@rbc/invoice/src/components/image-view-m
 export default {
   execute: function (bill, param) {
     const curbill = bill.dom || bill
-    GMS.$hideContainer.addComponent(ImageViewModal, {}, function (c) {
+    const name = GMS.$hideContainer.addComponent(ImageViewModal, {}, function (c) {
       c.imageTableName = param.param.tableName
       c.bill = curbill
+      c.componentName = name
     })
   }
 }
\ No newline at end of file

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

+import lincaoView from '../control/lincaoView.vue'
+export default {
+  execute: function (bill, param) {
+    // if (param.param.ipAddress && param.param.layerIds && bill.dom.billdata.JBR) {
+      GMS.$hideContainer.addComponent(lincaoView, {}, function (c) {
+          debugger
+        c.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=${nros.getUser().loginUnit}&layerIds=${param.param.layerIds}&projectNum=${bill.dom.billdata.JBR}`
+        c.modalShow = true;
+      })
+    // } else {
+    //   GAMS.Common.messagePrompt('缺少参数')
+    // }
+  }
+}
\ No newline at end of file

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

@@ -2,9 +2,10 @@
 import InvoiceModal from '../components-control/invoice-modal.vue'
 export default {
   execute: function (bill, param) {
-    GMS.$hideContainer.addComponent(InvoiceModal, {}, function (c) {
+    const name = GMS.$hideContainer.addComponent(InvoiceModal, {}, function (c) {
       c.bill = bill.dom
       c.invoiceName = param.param.invoiceName
+      c.componentName = name
     })
   }
 }
\ No newline at end of file

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

@@ -24,7 +24,6 @@ export default {
       });
     },
     updateFieldAction(bill, param) {
-      debugger
       let _actions = param.param.actions;
       let define = param.define;
       let postData = {

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

+/*
+ * @Author: rao JiaGuan
+ * @Date: 2022年3月24日11:15:52
+ * @LastEditors: rao JiaGuan
+ * @Description: 林草项目状态修改扩展
+ */
+export default {
+    execute: function(bill, param) {
+      let msg;
+      if(param.param.clickMessage){
+        msg =  param.param.clickMessage
+      }
+      GMS.$hideContainer.$Modal.confirm({ 
+        title: "信息提示",
+        content: msg,
+        onOk: () => {
+            this.updateFieldAction(bill, param);
+        },
+        onCancel: () => {                       
+          GMS.$hideContainer.$Message["error"]({
+            content: "已取消",
+          });
+        },
+      });
+    },
+    updateFieldAction(bill, param) {
+      let _actions = param.param.actions;
+      let define = param.define;
+      let postData = {
+        data: bill.getBuillData(),
+      };
+      let url = `/gms/bill/executed/${define}/${_actions}?transmission=total`;
+      GMS.$http
+        .post(url, postData, {
+          headers: {
+            post: {
+              "Content-Type": "application/json",
+            },
+          },
+        })
+        .then((res) => {
+          if (res.status == 200 && res.data.code == 0) {
+            const masterName = bill.billdata.billTable.masterName;
+            let successMessage;
+            if(param.param.successMessage){
+              successMessage =  param.param.successMessage
+            }
+            GMS.vbus.$Message.success(successMessage);
+            // 刷新页面
+            GMS.vbus.$emit("custom-query-refresh");
+            GMS.vbus.$emit("tab-count-refresh");
+            GMS.vbus.$emit("submitSuccess");
+          } else if (res.data.code == -1 && res.data.message) {
+            let stringOne = res.data.message.split(":")[1];
+            let stringResult = stringOne.split(";")[0];
+            GMS.vbus.$Message.error(stringResult);
+          } else {
+            res.data.message && GMS.vbus.$Message.error(res.data.message);
+          }
+        });
+    },
+  };
+  
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/components-control/invoice-modal.vue

@@ -16,6 +16,7 @@ export default {
       modalVisible: true,
       bill: null,
       invoiceName: '',
+      componentName: null,
     }
   },
   methods: {
@@ -54,6 +55,7 @@ export default {
             }
             this.bill.refreshSubDataRow(subBillName)
           })
+          this.componentName && GMS.$hideContainer.remove(this.componentName)
         })
       }
       

develop/@gms/gms-plugin-billexpand/src/components-control/typesBill.vue

@@ -79,8 +79,14 @@ export default {
         this.init = true;
       });
     },
-    loadFinishFun(bill) {
-      console.log('billState', bill.getMasterData().getValue('billState'))
+    loadFinishFun(bill, err) {
+      if (err) {
+        this.$Message.error(err)
+        setTimeout(() => {
+          this.close()
+        }, 0);
+        return
+      }
       const workflowState = bill.getMasterData().getValue('billState')
       let readArr = this.templateName.endsWith('_A')?[92]:[90,92];//如果是审批界面话，90能编辑
 			if (this.state != 'readOnly' && readArr.includes(workflowState)) {

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

+<template>
+  <div>
+
+        <el-dialog
+        :visible.sync="dialogVisible"
+        width="80%"
+        v-dialogDrag
+        :close-on-click-modal="false"
+       :close-on-press-escape="false"
+        >
+        <iframe :src="url"></iframe>
+        </el-dialog>
+
+  </div>
+</template>
+<script>
+export default {
+  props: {},
+  data() {
+    return {
+      dialogVisible:true,
+      url:"",
+    };
+  },
+  watch: {
+  },
+  methods: {
+    eventListener(message){
+
+    }
+  },
+  mounted() {
+      windows.addEventListener('message',eventListener)
+  },
+};
+</script>
+<style scoped lang="less"></style>

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

@@ -1312,6 +1312,41 @@ export default {
 		},
 		{
 			"discard": false,
+			"path": "一体化/通用",
+			"extends": {
+				"param": [
+					{
+						"icon": "#iconbianji",
+						"selectType": "card",
+						"componentName": "successMessage",
+						"type": "string",
+						"title": "成功后提醒语",
+						"key": "successMessage"
+					},
+					{
+						"icon": "#iconbianji",
+						"selectType": "card",
+						"componentName": "clickMessage",
+						"type": "string",
+						"title": "点击后提示语",
+						"key": "clickMessage"
+					},
+					{
+						"ref": "gams2.bill",
+						"type": "select",
+						"title": "执行动作",
+						"key": "actions",
+						"innerRef": "actions"
+					},
+				]
+			},
+			"description": "",
+			"title": "修改状态通用扩展[updateStateLincaoActionExtend]",
+			"value": "updateStateLincaoActionExtend",
+			"btnDisable": "false"
+		},
+		{
+			"discard": false,
 			"path": "资产/通用",
 			"extends": {
 				"param": [{
@@ -1515,6 +1550,27 @@ export default {
 		},
 		{
 			"discard": false,
+			"path": "林草报销/专用",
+			"extends": {
+				"param": [{
+					"isRequired": false,
+					"title": "请求路径ip地址",
+					"key": "ipAddress",
+					"type": "String",
+				},{
+					"isRequired": false,
+					"title": "layerIds",
+					"key": "layerIds",
+					"type": "String",
+				}]
+			},
+			"description": "",
+			"title": "林草新增视图关联[lincaoAddView]",
+			"value": "lincaoAddView",
+			"alwaysUse":true
+		},
+		{
+			"discard": false,
 			"path": "资产/通用",
 			"extends": {
 				"param": [{

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

@@ -10,6 +10,7 @@ import showDetailSPAction from './actions/showDetailSPAction';
 import editAction from './actions/editAction';
 import updatebillStateAction from './actions/updatebillStateAction';
 import updateStateLincaoAction from './actions/updateStateLincaoAction';
+import updateStateLincaoActionExtend from './actions/updateStateLincaoActionExtend';
 import draftSearchAction from './actions/draftSearchAction';
 import draftSaveAction from './actions/draftSaveAction';
 import copyBillAction from './actions/copyBillAction';
@@ -38,6 +39,7 @@ import CW_imageView from './actions/imageView'
 import relateInvoiceAction from './actions/relateInvoiceAction.js'
 import deleteInvoiceAction from './actions/deleteInvoiceAction.js'
 import saveActionBXD from './actions/saveActionBXD';
+import lincaoAddView from './actions/lincaoAddView';
 //queryAction
 import leafletGenerationAction from './query-actions/leafletGenerationAction.js'
 import leafletGenerationTYAction from './query-actions/leafletGenerationTYAction.js'
@@ -220,7 +222,8 @@ export default {
         throughQuery,
         deleteInvoiceAction,
         simpleAdvanceDeleteAction,
-        queryDeleteBill
+        queryDeleteBill,
+        lincaoAddView
     },
     billAction: {
         printMultiAction,
@@ -235,6 +238,7 @@ export default {
         editAction,
         updatebillStateAction,
         updateStateLincaoAction,
+        updateStateLincaoActionExtend,
         draftSearchAction,
         draftSaveAction,
         draftFixBugAction,

develop/@gms/gms-plugin-billexpand/src/query-actions/imagemanage/viewImage.js

@@ -8,9 +8,10 @@ export default {
     const imageId = context.selects[0][param.imageId]
     const yearFlag = context.selects[0][param.yearFlag]
     
-    GMS.$hideContainer.addComponent(ImageViewModal, {}, function (c) {
+    const name = GMS.$hideContainer.addComponent(ImageViewModal, {}, function (c) {
       c.yearFlag = yearFlag
       c.imageId = imageId
+      c.componentName = name
     })
   }
 }
\ No newline at end of file

develop/@rbc/invoice/src/components/image-view-modal/image-view-modal.vue

@@ -52,6 +52,7 @@ export default {
       currentImgIndex: 0,
       imgUrlSet: new Set(),
       imageTableName: null,
+      componentName: null,
     };
   },
   watch: {
@@ -64,6 +65,7 @@ export default {
         this.bill = null
         this.imageId = null
         this.yearFlags = []
+        this.componentName && GMS.$hideContainer.remove(this.componentName)
       }
     },
     imageId(id) {