Merge branch 'VERSIONS-AnQuanJianCha' into leb-web-dev

src/views/safetyCheck/components/checkItem.vue

@@ -83,15 +83,12 @@
             </el-table-column>
             <el-table-column label="检查人" prop="checkUserName" width="150" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span
-                  v-if="scope.row.checkStatus == 0&&scope.row.checkDraftVo">{{scope.row.checkDraftVo.checkUserName}}</span>
-                <span v-else>{{scope.row.checkUserName}}</span>
+                <span>{{scope.row.checkStatus == 1?scope.row.checkUserName:'-'}}</span>
               </template>
             </el-table-column>
             <el-table-column label="检查时间" prop="createTime" width="180" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span v-if="scope.row.checkStatus == 0&&scope.row.checkDraftVo">{{ parseTime(scope.row.checkDraftVo.checkTime,'{y}-{m}-{d} {h}:{i}') }}</span>
-                <span v-else>{{ parseTime(scope.row.checkTime,'{y}-{m}-{d} {h}:{i}') }}</span>
+                <span>{{ scope.row.checkStatus == 1?parseTime(scope.row.checkTime,'{y}-{m}-{d} {h}:{i}'):'-' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="状态" prop="checkStatus" width="150" show-overflow-tooltip>

src/views/systemManagement/organizationalStructure/index.vue

@@ -110,7 +110,7 @@
           <el-input v-model="treeForm.deptName" maxlength="15" @blur="editBlur(treeForm.deptName)" placeholder="请输入部门名称"/>
         </el-form-item>
         <el-form-item label="部门简称" prop="deptShortName" label-width="90px">
-          <el-input v-model="treeForm.deptShortName" maxlength="15" placeholder="请输入部门简称"/>
+          <el-input v-model="treeForm.deptShortName" maxlength="6" placeholder="请输入部门简称"/>
         </el-form-item>
         <el-form-item label="状态" prop="state" label-width="90px" v-if="treeForm.parentId != 0">
           <el-radio-group v-model="treeForm.state" style="margin:4px 0 0 10px;">
@@ -154,7 +154,7 @@
                 <el-input v-model="item.deptName" maxlength="15" @blur="addBlur(item.deptName,index)" placeholder="请输入部门名称"/>
               </el-form-item>
               <el-form-item label="部门简称" :prop="'teaCherDpetList.' + index + '.deptShortName'" :rules="rules.deptShortName" label-width="90px">
-                <el-input v-model="item.deptShortName" maxlength="15" placeholder="请输入部门简称"/>
+                <el-input v-model="item.deptShortName" maxlength="6" placeholder="请输入部门简称"/>
               </el-form-item>
               <el-form-item label="状态" :prop="'teaCherDpetList.' + index + '.state'" :rules="rules.state" label-width="90px">
                 <el-radio-group v-model="item.state" style="margin:4px 0 0 10px;">