绩效考核 还没做完

itdmWeb/src/views/module-iTDM/flowpath/ItdmRunFlowPathLogList.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="流程id">
-              <j-search-select-tag placeholder="请选择流程id" v-model="queryParam.flowPath" dict=",,"/>
+              <j-search-select-tag placeholder="请选择流程id" v-model="queryParam.runFlowPath" dict=",,"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -139,7 +139,17 @@
           {
             title:'流程id',
             align:"center",
-            dataIndex: 'flowPath_dictText'
+            dataIndex: 'runFlowPath_dictText'
+          },
+          {
+            title:'当前步骤id',
+            align:"center",
+            dataIndex: 'runFlowPathSetp'
+          },
+          {
+            title:'当前步骤名称',
+            align:"center",
+            dataIndex: 'runFlowPathSetpName'
           },
           {
             title:'描述',
@@ -152,14 +162,24 @@
             dataIndex: 'sort'
           },
           {
-            title:'当前步骤id',
+            title:'执行人',
             align:"center",
-            dataIndex: 'dqStep'
+            dataIndex: 'fqUser_dictText'
           },
           {
-            title:'执行人',
+            title:'下一个节点',
             align:"center",
-            dataIndex: 'fqUser_dictText'
+            dataIndex: 'xiaRunFlowPathSetp'
+          },
+          {
+            title:'下一个节点名称',
+            align:"center",
+            dataIndex: 'xiaRunFlowPathSetpName'
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type'
           },
           {
             title: '操作',
@@ -195,11 +215,15 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'sel_search',value:'flowPath',text:'流程id',dictTable:"", dictText:'', dictCode:''})
+        fieldList.push({type:'sel_search',value:'runFlowPath',text:'流程id',dictTable:"", dictText:'', dictCode:''})
+        fieldList.push({type:'string',value:'runFlowPathSetp',text:'当前步骤id',dictCode:''})
+        fieldList.push({type:'string',value:'runFlowPathSetpName',text:'当前步骤名称',dictCode:''})
         fieldList.push({type:'string',value:'miaoshu',text:'描述',dictCode:''})
         fieldList.push({type:'string',value:'sort',text:'顺序',dictCode:''})
-        fieldList.push({type:'string',value:'dqStep',text:'当前步骤id',dictCode:''})
         fieldList.push({type:'sel_user',value:'fqUser',text:'执行人'})
+        fieldList.push({type:'string',value:'xiaRunFlowPathSetp',text:'下一个节点',dictCode:''})
+        fieldList.push({type:'string',value:'xiaRunFlowPathSetpName',text:'下一个节点名称',dictCode:''})
+        fieldList.push({type:'string',value:'type',text:'类型',dictCode:''})
         this.superFieldList = fieldList
       }
     }

itdmWeb/src/views/module-iTDM/flowpath/modules/ItdmRunFlowPathLogForm.vue

@@ -4,8 +4,18 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="流程id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="flowPath">
-              <j-search-select-tag v-model="model.flowPath" dict=""  />
+            <a-form-model-item label="流程id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="runFlowPath">
+              <j-search-select-tag v-model="model.runFlowPath" dict=""  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="当前步骤id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="runFlowPathSetp">
+              <a-input v-model="model.runFlowPathSetp" placeholder="请输入当前步骤id"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="当前步骤名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="runFlowPathSetpName">
+              <a-input v-model="model.runFlowPathSetpName" placeholder="请输入当前步骤名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -19,13 +29,23 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="当前步骤id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dqStep">
-              <a-input v-model="model.dqStep" placeholder="请输入当前步骤id"  ></a-input>
+            <a-form-model-item label="执行人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fqUser">
+              <j-select-user-by-dep v-model="model.fqUser" :multi="true" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="下一个节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xiaRunFlowPathSetp">
+              <a-input v-model="model.xiaRunFlowPathSetp" placeholder="请输入下一个节点"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="执行人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fqUser">
-              <j-select-user-by-dep v-model="model.fqUser" :multi="true" />
+            <a-form-model-item label="下一个节点名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xiaRunFlowPathSetpName">
+              <a-input v-model="model.xiaRunFlowPathSetpName" placeholder="请输入下一个节点名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <a-input v-model="model.type" placeholder="请输入类型"  ></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>