Merge branch 'preview' into test

epmet-oper-web/src/views/modules/customer/customize/menu-customer-add-or-update.vue

@@ -49,10 +49,10 @@ export default {
       iconList: [],
       iconListVisible: false,
       dataForm: {
-        id: '',
+        id: '', // 菜单id
         type: 0,
         name: '',
-        pid: '0',
+        pid: '0', // 菜单pid
         customerId:'',
         parentName: '',
         url: '',
@@ -91,16 +91,38 @@ export default {
 
     },
     // 获取信息
-    getInfo () {
+    async getInfo () {
-      this.$http.get(`/gov/access/govMenuCustomerRelation/${this.dataForm.id}`).then(({ data: res }) => {
+      let {data: epmetRelationResult} = await this.$http.get(`/gov/access/govMenuCustomerRelation/getCustomizedMenuInfo?menuId=${this.dataForm.id}&customerId=${this.dataForm.customerId}`)
-        if (res.code !== 0) {
+
-          return this.$message.error(res.msg)
+      if (epmetRelationResult.code !== 0) {
-        }
+        this.$message.error("网络错误")
-        this.dataForm = {
+        return
-          ...this.dataForm,
+      }
-          ...res.data
+
-        }
+      if (epmetRelationResult.data !== null) {
-      }).catch(() => {})
+        // 如果有该菜单的自定义信息
+        this.dataForm.type = epmetRelationResult.data.type
+        this.dataForm.name = epmetRelationResult.data.name
+        this.dataForm.pid = epmetRelationResult.data.pid
+        this.dataForm.parentName = epmetRelationResult.data.parentName
+        this.dataForm.url = epmetRelationResult.data.url
+        this.dataForm.useFlag = epmetRelationResult.data.useFlag
+        this.dataForm.sort = epmetRelationResult.data.sort
+        this.dataForm.icon = epmetRelationResult.data.icon
+      } else {
+        // 如果没有该菜单的自定义信息，
+        let { data: epmeMenuResult } = await this.$http.get(`/gov/access/menu/${this.dataForm.id}`)
+
+        this.dataForm.type = epmeMenuResult.data.type
+        this.dataForm.name = epmeMenuResult.data.name
+        this.dataForm.pid = epmeMenuResult.data.pid
+        this.dataForm.parentName = epmeMenuResult.data.parentName
+        this.dataForm.url = epmeMenuResult.data.url
+        this.dataForm.useFlag = 1
+        this.dataForm.sort = epmeMenuResult.data.sort
+        this.dataForm.icon = epmeMenuResult.data.icon
+      }
+
     },
     // 图标, 选中
     iconListCurrentChangeHandle (icon) {

epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue

@@ -33,6 +33,7 @@
 
 				<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 				<el-table-column prop="name" :label="$t('menu.name')" header-align="center" min-width="150"></el-table-column>
+                <el-table-column prop="originName" label="原名" header-align="center" min-width="150"></el-table-column>
 				<el-table-column prop="icon" :label="$t('menu.icon')" header-align="center" align="center">
 					<template slot-scope="scope">
 						<svg class="icon-svg" aria-hidden="true"><use :xlink:href="`#${scope.row.icon}`"></use></svg>
@@ -49,7 +50,7 @@
 
 				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
 					<template slot-scope="scope">
-						<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button type="text" size="small" @click="onAddOrUpdateClick(scope.row.id)">{{ $t('update') }}</el-button>
 						<el-button type="text" size="small" v-if="scope.row.useFlag == '0'" @click="open(scope.row.id)">{{ '开启' }}</el-button>
 						<el-button type="text" size="small" v-if="scope.row.useFlag == '1'" @click="close(scope.row.id)">{{ '关闭' }}</el-button>
 					</template>
@@ -298,13 +299,13 @@ export default {
 			});
 		},
 
-		open(id) {
+		open(menuId) {
 			let menuIds = [];
 			this.multipleSelection = [];
 			this.getData(this.dataList);
 
-			if (id != '') {
+			if (menuId != '') {
-				menuIds = [id];
+				menuIds = [menuId];
 			} else {
 				if (this.multipleSelection.length > 0) {
 					menuIds = this.multipleSelection;
@@ -314,8 +315,9 @@ export default {
 			}
 
 			let params = {
-				ids: menuIds,
+				menuIds: menuIds,
-				use: '1'
+				use: '1',
+        customerId: this.customerId
 			};
 			this.$http.post('/gov/access/govMenuCustomerRelation/useUpdate/', params).then(({ data: res }) => {
 				console.log(res);
@@ -325,13 +327,13 @@ export default {
 				}
 			});
 		},
-		close(id) {
+		close(menuId) {
 			let menuIds = [];
 			this.multipleSelection = [];
 			this.getData(this.dataList);
 
-			if (id != '') {
+			if (menuId != '') {
-				menuIds = [id];
+				menuIds = [menuId];
 			} else {
 				if (this.multipleSelection.length > 0) {
 					menuIds = this.multipleSelection;
@@ -340,8 +342,9 @@ export default {
 				}
 			}
 			let params = {
-				ids: menuIds,
+				menuIds: menuIds,
-				use: '0'
+				use: '0',
+        customerId: this.customerId
 			};
 			this.$http.post('/gov/access/govMenuCustomerRelation/useUpdate/', params).then(({ data: res }) => {
 				console.log(res);
@@ -407,7 +410,16 @@ export default {
 		// 取消
 		diaCancel() {
 			this.$emit('cancleBack');
-		}
+		},
+
+    onAddOrUpdateClick(menuId) {
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+            this.$refs.addOrUpdate.dataForm.customerId = this.customerId
+            this.$refs.addOrUpdate.dataForm.id = menuId
+            this.$refs.addOrUpdate.init()
+        })
+    }
 	}
 };
 </script>