Merge remote-tracking branch 'origin/master'

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

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false">
     <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
+    <!-- <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -17,24 +17,24 @@
           </a-col>
         </a-row>
       </a-form>
-    </div>
+    </div> -->
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
       <a-button type="primary" icon="download" @click="handleExportXls('流程步骤表')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      </a-dropdown> -->
     </div>
 
     <!-- table区域-begin -->
@@ -88,11 +88,11 @@
               <a-menu-item>
                 <a @click="handleDetail(record)">详情</a>
               </a-menu-item>
-              <a-menu-item>
+              <!-- <a-menu-item>
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
                 </a-popconfirm>
-              </a-menu-item>
+              </a-menu-item> -->
             </a-menu>
           </a-dropdown>
         </span>
@@ -134,11 +134,11 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'流程id',
-            align:"center",
-            dataIndex: 'flowPathId_dictText'
-          },
+          // {
+          //   title:'流程id',
+          //   align:"center",
+          //   dataIndex: 'flowPathId_dictText'
+          // },
           {
             title:'步骤名称',
             align:"center",
@@ -199,7 +199,7 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'sel_search',value:'flowPathId',text:'流程id',dictTable:"", dictText:'', dictCode:''})
+        // fieldList.push({type:'sel_search',value:'flowPathId',text:'流程id',dictTable:"", dictText:'', dictCode:''})
         fieldList.push({type:'string',value:'name',text:'步骤名称',dictCode:''})
         fieldList.push({type:'sel_user',value:'userIds',text:'所属用户'})
         fieldList.push({type:'string',value:'roleId',text:'所属角色',dictCode:"sys_role,role_name,id"})

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

@@ -3,14 +3,14 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="流程id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="flowPathId">
               <j-search-select-tag v-model="model.flowPathId" :dictOptions='flowPathOptions' />
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-model-item label="步骤名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入步骤名称"  ></a-input>
+              <a-input v-model="model.name" placeholder="请输入步骤名称" disabled ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -25,7 +25,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="步骤顺序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
-              <a-input v-model="model.sort" placeholder="请输入步骤顺序"  ></a-input>
+              <a-input v-model="model.sort" placeholder="请输入步骤顺序"  disabled></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>