Merge branch 'master' of http://36.137.93.232:3000/hf/byte-sailing-new

src/views/process/processConfig/index.vue

@@ -33,6 +33,7 @@
 				<template #slotName="{ item }">
 					{{ item.createTime }}
 				</template>
+				
 			</byTable>
 		</div>
 		<el-dialog
@@ -63,6 +64,46 @@
 				</el-button>
 			</template>
 		</el-dialog>
+		<!-- 版本切换模态框 -->
+		<el-dialog
+			title="版本切换"
+			v-model="versionVisible"
+			width="500"
+			v-loading="loading"
+		>
+			<el-form>
+				<el-form-item  label="流程名称">
+					<el-input
+						v-model="formData.flowName"
+						disabled
+						placeholder="请输入流程名称"
+					></el-input>
+				</el-form-item>
+				<el-form-item label="当前版本">
+					<el-select v-model="formData.version" placeholder="请选择">
+						<el-option
+							v-for="item in versionList"
+							:key="item.id"
+							:label="'v' + item.versionNumber"
+							:value="item.id"
+						></el-option>
+					</el-select>
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<el-button @click="versionVisible = false" size="large"
+					>取 消</el-button
+				>
+				<el-button
+					type="primary"
+					@click="changeVersion(formData.version)"
+					size="large"
+					:loading="submitLoading"
+				>
+					确 定
+				</el-button>
+			</template>
+		</el-dialog>
 	</div>
 </template>
     
@@ -84,6 +125,7 @@ const sourceList = ref({
 	},
 })
 let dialogVisible = ref(false)
+const versionVisible = ref(false)
 let modalType = ref('add')
 let rules = ref({
 	roleKey: [{ required: true, message: '请选择部门', trigger: 'blur' }],
@@ -118,7 +160,23 @@ const config = computed(() => {
 		{
 			attrs: {
 				label: '当前版本',
-				prop: 'versionNumber',
+			},
+			// 渲染 el-button，一般用在最后一列。
+			renderHTML(row) {
+				return [
+					{
+						attrs: {
+							label: 'v' + row.versionNumber,
+							type: 'primary',
+							text: true,
+						},
+						el: 'button',
+						click() {
+							getVersionList(row)
+						},
+					},
+					
+				]
 			},
 		},
 
@@ -149,6 +207,33 @@ const config = computed(() => {
 	]
 })
 
+let versionList = ref([])
+
+const getVersionList = (row) => {
+	formData.flowName = row.flowName
+	versionVisible.value = true
+	proxy.post('/flowDefinition/getVersionList',{
+		flowKey:row.flowKey,
+		tenantId:row.tenantId
+	}).then((message) => {
+		versionList.value = message
+		console.log(versionList)
+	})
+}
+const changeVersion = (id) => {
+	if(!id){
+		ElMessage.error('请选择版本')
+		return
+	}
+	proxy.post('/flowDefinition/updateVersion',{
+		id:id
+	}).then((message) => {
+		ElMessage.success('切换成功')
+		versionVisible.value = false
+		getList()
+	})
+}
+
 let formData = reactive({
 	data: {},
 })

src/views/process/processConfig/vueFlow.vue

@@ -274,7 +274,7 @@ const submitAll = () => {
 		console.log(element)
 		console.log(flowDefinitionNodeObj)
 		//是办理节点
-		if (element.shape != "start-btn" && element.shape != 'edge') {
+		if (element.shape != "start-btn" && element.shape != 'edge' && element.shape != 'end-btn'  ) {
 			
 			if (!flowDefinitionNodeObj.value[element.id]) {
 				ElMessage({
@@ -288,6 +288,11 @@ const submitAll = () => {
 				nodeType: 2,
 			})
 		}
+		if(element.shape == 'end-btn') {
+			submitFormData.flowDefinitionNodeList.push({
+				...flowDefinitionNodeObj.value[element.id],
+			})
+		}
 		if (element.shape == "start-btn") {
 			submitFormData.flowDefinitionNodeList.push({
 				nodeName: '开始',
@@ -813,6 +818,7 @@ const antvInit = () => {
 		x: 500,
 		y: 20,
 		label: '开始',
+		id:1,
 		attrs: {
 			
 		},

src/views/systemTenant/tenant/roleTenant/index.vue

@@ -11,12 +11,6 @@
       }"
       :action-list="[
         {
-          text: '权限配置',
-          plain: true,
-          action: () => openRoomModal(),
-          disabled: selection.data.length != 1,
-        },
-        {
           text: '添加角色',
           action: () => openModal(),
         },
@@ -68,13 +62,6 @@ const loading = ref(false);
 const config = computed(() => {
   return [
     {
-      type: "selection",
-      attrs: {
-        label: "多选",
-        prop: "remark",
-      },
-    },
-    {
       attrs: {
         label: "角色编码",
         prop: "roleKey",
@@ -101,6 +88,19 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
+          
+          {
+            attrs: {
+              label: "权限配置",
+              type: "primary",
+              text: true,
+            },
+            el: "button",
+            click() {
+              openRoomModal(row)
+              
+            },
+          },
           {
             attrs: {
               label: "修改",
@@ -241,8 +241,8 @@ const getSubset = (list, data) => {
   return data;
 };
 const tree = ref(null);
-const openRoomModal = () => {
-  proxy.get("/tenantRole/roleMenuTreeSelect/" + selection.value.data[0].roleId).then((res) => {
+const openRoomModal = (row) => {
+  proxy.get("/tenantRole/roleMenuTreeSelect/" + row.roleId).then((res) => {
     if (res.code == 200) {
       treeData.value = res.menus;
       let data = getSubset(res.menus, []);