Merge branch 'dev_data' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_data

src/views/modules/organize/deptofficer-add-or-update.vue

@@ -20,7 +20,7 @@
           <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000 style="width:75%"></el-input-number>
       </el-form-item>
       <el-form-item label="主显标识" prop="masterFlag">
-          <el-select v-model="dataForm.masterFlag" placeholder="主显标识" disabled style="width:75%">
+          <el-select v-model="dataForm.masterFlag" placeholder="主显标识" style="width:75%">
             <el-option v-for="item in masterFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
             </el-option>
           </el-select>

src/views/modules/organize/deptofficer-add.vue

@@ -20,7 +20,7 @@
           <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000 style="width:75%"></el-input-number>
       </el-form-item>
       <el-form-item label="主显标识" prop="masterFlag">
-          <el-select v-model="dataForm.masterFlag" placeholder="主显标识" disabled style="width:75%">
+          <el-select v-model="dataForm.masterFlag" placeholder="主显标识" style="width:75%">
             <el-option v-for="item in masterFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
             </el-option>
           </el-select>

src/views/modules/organize/metasysdept.vue

@@ -21,8 +21,13 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column prop="name" label="名称" header-align="center"></el-table-column>
-        <el-table-column prop="parentName" label="上级部门" header-align="center"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="name" label="名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentName" label="上级部门" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sort" label="排序" header-align="center" align="center" width="80"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">

src/views/modules/organize/metasysdeptManagement.vue

@@ -15,8 +15,13 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column prop="name" label="名称" header-align="center"></el-table-column>
-        <el-table-column prop="parentName" label="上级部门" header-align="center"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentName" label="上级部门" header-align="center" align="center"></el-table-column>
 
         <el-table-column prop="sort" label="排序" header-align="center" align="center" width="80"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">