Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/check/index.vue

@@ -23,7 +23,6 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="90px"
             >
               <el-row>
                 <el-form-item prop="checkType" label="任务类型">
@@ -117,8 +116,6 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
                 <el-form-item prop="planStatus" label="任务状态">
                   <el-select
                     prop="planStatus"
@@ -147,44 +144,47 @@
                 </el-form-item>
               </el-row>
               <el-row>
-                <el-form-item>
-                  <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    size="mini"
-                    @click="getList"
-                    >搜索</el-button
-                  >
-                  <el-button
-                    icon="el-icon-refresh"
-                    size="mini"
-                    @click="resetQuery"
-                    >重置</el-button
-                  ><el-button
-                    type="primary"
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAdd()"
-                    v-hasPermi="['core:checkplan:add']"
-                    >新增任务</el-button
-                  >
-                </el-form-item>
               </el-row>
             </el-form>
-
-            <!-- 按纽   
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5"> </el-col>
+        <el-row :gutter="10" >
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="getList"
+            >搜索</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetQuery"
+            >重置</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd()"
+              v-hasPermi="['core:checkplan:add']"
+            >新增任务</el-button
+            >
+          </el-col>
           <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
             :columns="columns"
           ></right-toolbar>
-        </el-row> -->
+        </el-row>
           </div>
           <el-table
             border
-            height="700"
+            height="596"
             size="small"
             v-loading="loading"
             :data="pageData"
@@ -202,12 +202,15 @@
             <el-table-column
               prop="planName"
               label="任务名称"
+              width="180"
+              :show-overflow-tooltip="true"
               v-if="columns[1].visible"
             ></el-table-column>
 
             <el-table-column
               prop="checkType"
               label="任务类型"
+              :show-overflow-tooltip="true"
               v-if="columns[2].visible"
             >
               <template slot-scope="r"
@@ -217,23 +220,25 @@
             <el-table-column
               prop="planCreateOrgName"
               label="创建机构"
+              :show-overflow-tooltip="true"
               v-if="columns[3].visible"
             >
             </el-table-column>
             <el-table-column
               prop="planOfOrgName"
               label="行社名称"
+              :show-overflow-tooltip="true"
               v-if="columns[4].visible"
             >
             </el-table-column>
 
-            <el-table-column prop="execOrgType" label="检查主体">
+            <el-table-column prop="execOrgType" :show-overflow-tooltip="true" label="检查主体">
               <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
               </template>
             </el-table-column>
 
-            <el-table-column prop="checkOrgType" label="受检机构" width="120px">
+            <el-table-column prop="checkOrgType" :show-overflow-tooltip="true" label="受检机构" width="120px">
               <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
               </template>
@@ -241,6 +246,7 @@
 
             <el-table-column
               prop="roleNames"
+              :show-overflow-tooltip="true"
               label="检查人员"
               v-if="columns[6].visible"
             >
@@ -253,7 +259,6 @@
             <el-table-column
               prop="planCycle"
               label="任务周期"
-              width="80px"
               v-if="columns[6].visible"
             >
               <template slot-scope="r"
@@ -271,7 +276,6 @@
             <el-table-column
               prop="planStatus"
               label="任务状态"
-              width="80px"
               v-if="columns[6].visible"
             >
               <template slot-scope="r"
@@ -298,7 +302,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" min-width="200">
+            <el-table-column label="操作" width="200">
               <template slot-scope="r">
                 <el-button
                   v-if="eqOrg(r.row)"
@@ -416,7 +420,7 @@ export default {
         execOrgType: null,
         checkOrgType: null,
         planStatus: null,
-        pageSize: 10,
+        pageSize: 20,
         pageNum: 1,
         checkSub: false,
         orgId: null,