Explorar el Código

优化修改显示控制代码

hubin hace 1 año
padre
commit
9a0b6a1681

+ 1 - 1
src/components/scWorkflow/nodes/addNode.vue

@@ -73,7 +73,7 @@ export default {
 					approveSelf: 0, //审批人与提交人为同一人时
 					directorMode: 0, //连续主管审批方式
 					childNode: this.modelValue,
-					typeOfApprover: '1', // 审批类型 1:人工审批 2:自动通过 3:自动拒绝
+					typeOfApprove: 1, // 审批类型 1:人工审批 2:自动通过 3:自动拒绝
 					actionUrl: undefined // 子表单, 到时候缓存后台需要的 'id:name'格式
 				}
 			} else if (type === 2) {

+ 2 - 2
src/components/scWorkflow/nodes/approver.vue

@@ -43,13 +43,13 @@
 				<el-main>
 					<el-form label-position="top" class="aForm">
 						<el-form-item label="审批类型" style="margin-bottom: 8px">
-							<el-radio-group v-model="form.typeOfApprover">
+							<el-radio-group v-model="form.typeOfApprove">
 								<el-radio v-for="v of approveTypeOptions" :key="v.value" :label="v.value">{{ v.label }}</el-radio>
 							</el-radio-group>
 						</el-form-item>
 					</el-form>
 					<!-- 人工审批 -->
-					<div v-show="form.typeOfApprover === '1'">
+					<div v-show="form.typeOfApprove === 1">
 						<div class="self-radio-group">
 							<el-radio-group v-model="radio1">
 								<el-radio-button v-for="v of approveType_1_options" :key="v.value" :label="v.value">{{ v.label }}</el-radio-button>

+ 3 - 3
src/components/scWorkflow/nodes/config.ts

@@ -2,15 +2,15 @@
 export const approveTypeOptions = [
 	{
 		label: '人工审批',
-		value: '1'
+		value: 1
 	},
 	{
 		label: '自动通过',
-		value: '2'
+		value: 2
 	},
 	{
 		label: '自动拒绝',
-		value: '3'
+		value: 3
 	}
 ]
 export const approveTypeOptions_config = approveTypeOptions.reduce((res: { [key: string]: any }, { label, value }) => {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 2
src/views/approve/components/approvedContent.vue


+ 6 - 0
src/views/flow/group/components/historyProcessList.vue

@@ -22,6 +22,12 @@
 						<Edit />
 					</el-icon>
 				</el-tooltip>
+				<el-divider direction="vertical"></el-divider>
+				<el-tooltip content="预览" placement="bottom" effect="light">
+					<el-icon class="ibt0">
+						<View />
+					</el-icon>
+				</el-tooltip>
 			</template>
 		</LeTable>
 	</el-dialog>

+ 2 - 2
src/views/flow/group/components/listGroup.vue

@@ -80,9 +80,9 @@
 									</div>
 									<div class="group_itemSeeable">{{ element.processKey }}</div>
 									<div class="group_itemOperations">
-										<el-space wrap>
+										<el-space v-if="element.processVersion > 1" wrap>
 											<el-tooltip effect="dark" content="版本控制" placement="top">
-												<el-icon :size="16" @click="historyEv(element)"><Download /></el-icon>
+												<el-icon :size="16" @click="historyEv(element)"><SetUp /></el-icon>
 											</el-tooltip>
 										</el-space>
 										<el-space wrap style="margin-left: 10px">

+ 1 - 2
src/views/flow/group/index.vue

@@ -29,10 +29,9 @@
 </template>
 <script lang="tsx" setup name="flow_group">
 import { ref } from 'vue'
-import { Plus, CircleCheck } from '@element-plus/icons-vue'
+import { CircleCheck } from '@element-plus/icons-vue'
 import SortGroup from './components/sortGroup'
 import ListGroup from './components/listGroup'
-import flowGroup from '@/api/flow/group'
 import router from '@/router'
 import useFlowStore from '@/store/modules/flow'
 const flowStore = useFlowStore()

+ 0 - 4
test.js

@@ -1,4 +0,0 @@
-const modelContent = "{\"key\":\"123\",\"name\":\"121\",\"nodeConfig\":{\"nodeName\":\"发起人\",\"type\":0,\"nodeRoleList\":[],\"childNode\":{\"nodeName\":\"审核人\",\"type\":1,\"setType\":4,\"nodeAssigneeList\":[],\"examineLevel\":1,\"directorLevel\":1,\"selectMode\":1,\"termAuto\":false,\"term\":0,\"termMode\":1,\"examineMode\":1,\"approveSelf\":0,\"directorMode\":0,\"typeOfApprover\":\"1\",\"extendConfig\":{\"formConfig\":[{\"label\":\"邮箱\",\"id\":1715156358510,\"opera\":\"0\"},{\"label\":\"手机号\",\"id\":1715156366206,\"opera\":\"2\"},{\"label\":\"人员\",\"id\":1715237919813,\"opera\":\"1\"},{\"label\":\"单选框\",\"id\":1715237925345,\"opera\":\"1\"}]},\"childNode\":{\"nodeName\":\"审核人1\",\"type\":1,\"setType\":2,\"nodeAssigneeList\":[],\"examineLevel\":1,\"directorLevel\":1,\"selectMode\":1,\"termAuto\":false,\"term\":0,\"termMode\":1,\"examineMode\":1,\"approveSelf\":0,\"directorMode\":0,\"childNode\":{\"nodeName\":\"抄送人\",\"type\":2,\"allowSelection\":true,\"nodeAssigneeList\":[{\"id\":\"0\",\"name\":\"CEO\"}]},\"typeOfApprover\":\"1\",\"extendConfig\":{\"formConfig\":[{\"label\":\"邮箱\",\"id\":1715156358510,\"opera\":\"0\"},{\"label\":\"手机号\",\"id\":1715156366206,\"opera\":\"2\"},{\"label\":\"人员\",\"id\":1715237919813,\"opera\":\"1\"},{\"label\":\"单选框\",\"id\":1715237925345,\"opera\":\"1\"}]}}}}}"
-
-const i = JSON.parse(modelContent)
-console.log(i);

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio