Selaa lähdekoodia

reactor:流程调整;

zhangchong 1 vuosi sitten
vanhempi
commit
f9954301da

+ 1 - 0
src/components/LogicFlow/PropertySetting/task.vue

@@ -171,6 +171,7 @@ const remoteMethod = (query: string) => {
     });
   }
 };
+
 // 获取可用组织
 const getOrgListFn = () => {
 		getCanUseOrg().then((res: any) => {

+ 0 - 4
src/components/ProcessApproval/index.vue

@@ -195,7 +195,6 @@
 								@change="selectHandlers"
 								value-key="id"
 								clearable
-                :multiple-limit="multipleLimit"
                 collapse-tags
                 collapse-tags-tooltip
 							>
@@ -437,9 +436,6 @@ const formComponents = ref<string>(); // 表单组件
 const communicationModeOptions = ref<EmptyArrayType>([]); // 沟通方式
 const timeTypeOptions = ref<EmptyArrayType>([]); // 延期申请单位
 const orderRedoReasonOptions = ref<EmptyArrayType>([]); // 重办理由
-const multipleLimit = computed(() => { // 办理人多选限制
-  return handelArr.includes(state.processType) ?   0 :   1;
-});
 const handleResult = (res: any) => {
 	state.nextStepOptions = res.result.steps; //处理人选择内容
 	state.handleId = res.result.id; //流程ID

+ 1 - 1
src/views/system/businessTag/component/Business-tag-add.vue

@@ -16,7 +16,7 @@
 					</el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="isClassify">
             <el-form-item label="分类名称" prop="classify" :rules="[{ required: false, message: '请选择分类名称', trigger: 'change' }]">
-              <el-select v-model="state.ruleForm.type" placeholder="请选择分类名称" class="w100" @change="selectType">
+              <el-select v-model="state.ruleForm.classify" placeholder="请选择分类名称" class="w100" @change="selectType">
                 <el-option v-for="item in classifyList" :value="item.key" :key="item.key" :label="item.value" />
               </el-select>
             </el-form-item>

+ 7 - 11
src/views/system/businessTag/index.vue

@@ -31,21 +31,17 @@
       <!-- 表格 -->
       <el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"  />
-        <el-table-column prop="settingName" label="参数名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="code" label="参数" show-overflow-tooltip width="130"></el-table-column>
-        <el-table-column prop="settingValue" label="参数值" show-overflow-tooltip>
-          <template #default="{ row }">
-            <span v-if="row.settingValue">{{ row.settingValue.join('|') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="remark" label="参数说明" show-overflow-tooltip width="300"></el-table-column>
-        <el-table-column prop="creator.name" label="创建人" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="afterBegin" label="创建时间" show-overflow-tooltip width="170">
+        <el-table-column prop="name" label="标签名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="type" label="标签类型" show-overflow-tooltip width="130"></el-table-column>
+        <el-table-column prop="businessType" label="业务类型" show-overflow-tooltip width="300"></el-table-column>
+        <el-table-column prop="classify" label="分类名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="creationTime" label="创建时间" show-overflow-tooltip width="170">
           <template #default="{ row }">
             <span>{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="sort" label="排序" show-overflow-tooltip width="60"></el-table-column>
+        <el-table-column prop="creatorName" label="创建人" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="creatorOrgName" label="创建人部门" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="200" fixed="right" align="center">
           <template #default="{ row }">
             <el-button link type="primary" @click="updateBusinessTah(row)" v-auth="'system:systemBusinessTag:edit'" title="修改参数"> 修改 </el-button>