LY sems 政府回执参数 u-table优化

master/src/main/java/com/ruoyi/project/sems/controller/TApproveController.java

@@ -22,7 +22,10 @@ import com.ruoyi.project.listener.yearSemsApprove.*;
 import com.ruoyi.project.sems.domain.*;
 import com.ruoyi.project.sems.mapper.TApproveMapper;
 import com.ruoyi.project.sems.service.*;
+import com.ruoyi.project.system.domain.SysConfig;
 import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysConfigMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
 import com.ruoyi.project.system.service.ISysUserService;
 import freemarker.template.Template;
 import org.activiti.engine.*;
@@ -88,6 +91,10 @@ public class TApproveController extends BaseController {
     private ITReportYlgdService tReportYlgdService;
     @Autowired
     private ITReportMonthService tReportMonthService;
+    @Resource
+    private SysConfigMapper configMapper;
+    @Resource
+    private SysUserMapper userMapper;
 
     /**
      * 查询特种设备申请列表
@@ -100,6 +107,20 @@ public class TApproveController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 根据参数键名查询政府回执
+     */
+    @GetMapping(value = "/getGovUserId")
+    public AjaxResult govUserId()
+    {
+        SysConfig config = new SysConfig();
+        config.setConfigKey("sems.approve.gov");
+        SysConfig retConfig = configMapper.selectConfig(config);
+        SysUser sysUser =  userMapper.selectUserByStaffId(retConfig.getConfigValue());
+        return AjaxResult.success(sysUser.getUserId());
+    }
+
+
     /**
      * 历史申请列表
      */

master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -177,7 +177,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserByStaffId" parameterType="String" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-
 		where u.staffid = #{staffid}
 	</select>
 

ui/src/api/sems/approve.js

@@ -35,6 +35,14 @@ export function getApprove(id) {
   })
 }
 
+
+// 查询特种设备申请详细
+export function getGovUserId() {
+  return request({
+    url: '/sems/approve/getGovUserId',
+    method: 'get'
+  })
+}
 // 查询特种设备申请详细
 export function getApproveInfo(id) {
   return request({

ui/src/views/ehs/jobticket/index.vue

@@ -218,43 +218,49 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-if="tableType == 1" v-loading="loading" :data="jobticketList"
+    <u-table v-if="tableType == 1" v-loading="loading" :data="jobticketList"
               :height="clientHeight" border :cell-style="myclass"
-              row-key="id"
+              row-id="id"
+             :treeConfig="{
+             children: 'children',
+
+             expandAll: true}"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
               :default-expand-all=true
+               use-virtual
+               showBodyOverflow="title"
               @sort-change="sortList"
     >
-      <el-table-column :label="$t('开票日期')" align="center" prop="kprq" width="125">
+      <u-table-column :label="$t('开票日期')" align="center" prop="kprq" :tree-node="true" width="125">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.kprq, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('新票/续票')" align="center" prop="xpxp" width="100" :formatter="xpxpFormat"/>
-      <el-table-column :label="$t('延期许可证号')" align="center" sortable="custom" prop="yqxkzh" width="120"
+      </u-table-column>
+      <u-table-column :label="$t('新票/续票')" align="center" prop="xpxp" width="100" :formatter="xpxpFormat"/>
+      <u-table-column :label="$t('延期许可证号')" align="center" sortable="custom" prop="yqxkzh" width="120"
                        :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('危害工作许可证号')" align="center" sortable="custom" prop="whgzxkzh" width="120"
+      <u-table-column :label="$t('危害工作许可证号')" align="center" sortable="custom" prop="whgzxkzh" width="120"
                        :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('动火作业许可证号')" align="center" sortable="custom" prop="dhzyxkzh" width="120"
+      <u-table-column :label="$t('动火作业许可证号')" align="center" sortable="custom" prop="dhzyxkzh" width="120"
                        :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('火票级别')" align="center" sortable="custom" prop="hpjb" :formatter="hpjbFormat"/>
-      <el-table-column :label="$t('限制空间许可证号')" align="center" sortable="custom" prop="xzkjxkzh" width="120"
+      <u-table-column :label="$t('火票级别')" align="center" sortable="custom" prop="hpjb" :formatter="hpjbFormat"/>
+      <u-table-column :label="$t('限制空间许可证号')" align="center" sortable="custom" prop="xzkjxkzh" width="120"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="盲板作业许可证号" align="center" sortable="custom" prop="mbzyxkzh" width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="高处作业许可证号" align="center" sortable="custom" prop="gczyxkzh" width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="高处作业级别" align="center" sortable="custom" prop="gczyjb" :formatter="gczyjbFormat"/>
-      <el-table-column :label="$t('工作内容')" align="center" prop="content" width="300" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('BYC负责单位/联系人')" align="center" prop="byclxr" width="100"
+      <u-table-column label="盲板作业许可证号" align="center" sortable="custom" prop="mbzyxkzh" width="120" :show-overflow-tooltip="true"/>
+      <u-table-column label="高处作业许可证号" align="center" sortable="custom" prop="gczyxkzh" width="120" :show-overflow-tooltip="true"/>
+      <u-table-column label="高处作业级别" align="center" sortable="custom" prop="gczyjb" :formatter="gczyjbFormat"/>
+      <u-table-column :label="$t('工作内容')" align="center" prop="content" width="300" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('BYC负责单位/联系人')" align="center" prop="byclxr" width="100"
                        :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('施工单位')" align="center" prop="sgdw" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('联系人')" align="center" prop="lxr" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('联系电话')" align="center" prop="lxdh" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('销票时间')" align="center" prop="xpsj" width="100">
+      <u-table-column :label="$t('施工单位')" align="center" prop="sgdw" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('联系人')" align="center" prop="lxr" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('联系电话')" align="center" prop="lxdh" width="100" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('销票时间')" align="center" prop="xpsj" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.xpsj, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('作业票状态')" align="center" prop="zypzt" width="200" :formatter="zypztFormat">
+      </u-table-column>
+      <u-table-column :label="$t('作业票状态')" align="center" prop="zypzt" width="200" :formatter="zypztFormat">
         <template slot-scope="scope" v-if="scope.row.zypzt != null">
           <el-dropdown placement="bottom" trigger="click">
             <span class="el-dropdown-link">
@@ -272,9 +278,9 @@
             </el-dropdown-menu>
           </el-dropdown>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('未撤销项编号')" align="center" prop="wcxxbh" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('未撤销状态')" align="center" prop="wcxzt" :formatter="wcxztFormat">
+      </u-table-column>
+      <u-table-column :label="$t('未撤销项编号')" align="center" prop="wcxxbh" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('未撤销状态')" align="center" prop="wcxzt" :formatter="wcxztFormat">
         <template slot-scope="scope" v-if="scope.row.wcxzt != null">
           <el-dropdown placement="bottom" trigger="click">
             <span class="el-dropdown-link">
@@ -288,16 +294,16 @@
             </el-dropdown-menu>
           </el-dropdown>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('撤销时间')" align="center" prop="cxsj" width="100">
+      </u-table-column>
+      <u-table-column :label="$t('撤销时间')" align="center" prop="cxsj" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.cxsj, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('票盒')" align="center" prop="tag" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('操作')" align="center" fixed="right" width="160"
-                       class-name="small-padding fixed-width">
+      </u-table-column>
+      <u-table-column :label="$t('票盒')" align="center" prop="tag" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('操作')" align="center" fixed="right" width="170"
+                       class-name="small-padding">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -325,42 +331,44 @@
           >{{ $t('延期') }}
           </el-button>
         </template>
-      </el-table-column>
-    </el-table>
-    <el-table v-else v-loading="loading" :data="jobticketList"
+      </u-table-column>
+    </u-table>
+    <u-table v-else v-loading="loading" :data="jobticketList"
               :height="clientHeight" border :cell-style="myclass"
               @sort-change="sortList"
+             use-virtual
+             showBodyOverflow="title"
     >
-      <el-table-column :label="$t('开票日期')" align="center" prop="kprq" width="125">
+      <u-table-column :label="$t('开票日期')" align="center" prop="kprq" width="125">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.kprq, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('新票/续票')" align="center" prop="xpxp" width="100" :formatter="xpxpFormat"/>
-      <el-table-column :label="$t('延期许可证号')" align="center" sortable="custom" prop="yqxkzh" width="120"
+      </u-table-column>
+      <u-table-column :label="$t('新票/续票')" align="center" prop="xpxp" width="100" :formatter="xpxpFormat"/>
+      <u-table-column :label="$t('延期许可证号')" align="center" sortable="custom" prop="yqxkzh" width="120"
                        :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('危害工作许可证号')" align="center" sortable="custom" prop="whgzxkzh" width="120"
+      <u-table-column :label="$t('危害工作许可证号')" align="center" sortable="custom" prop="whgzxkzh" width="120"
                        :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('动火作业许可证号')" align="center" sortable="custom" prop="dhzyxkzh" width="120"
+      <u-table-column :label="$t('动火作业许可证号')" align="center" sortable="custom" prop="dhzyxkzh" width="120"
                        :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('火票级别')" align="center" sortable="custom" prop="hpjb" :formatter="hpjbFormat"/>
-      <el-table-column :label="$t('限制空间许可证号')" align="center" sortable="custom" prop="xzkjxkzh" width="120"
+      <u-table-column :label="$t('火票级别')" align="center" sortable="custom" prop="hpjb" :formatter="hpjbFormat"/>
+      <u-table-column :label="$t('限制空间许可证号')" align="center" sortable="custom" prop="xzkjxkzh" width="120"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="盲板作业许可证号" align="center" sortable="custom" prop="mbzyxkzh" width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="高处作业许可证号" align="center" sortable="custom" prop="gczyxkzh" width="120" :show-overflow-tooltip="true"/>
-      <el-table-column label="高处作业级别" align="center" sortable="custom" prop="gczyjb" :formatter="gczyjbFormat"/>
-      <el-table-column :label="$t('工作内容')" align="center" prop="content" width="300" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('BYC负责单位/联系人')" align="center" prop="byclxr" width="100"
+      <u-table-column label="盲板作业许可证号" align="center" sortable="custom" prop="mbzyxkzh" width="120" :show-overflow-tooltip="true"/>
+      <u-table-column label="高处作业许可证号" align="center" sortable="custom" prop="gczyxkzh" width="120" :show-overflow-tooltip="true"/>
+      <u-table-column label="高处作业级别" align="center" sortable="custom" prop="gczyjb" :formatter="gczyjbFormat"/>
+      <u-table-column :label="$t('工作内容')" align="center" prop="content" width="300" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('BYC负责单位/联系人')" align="center" prop="byclxr" width="100"
                        :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('施工单位')" align="center" prop="sgdw" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('联系人')" align="center" prop="lxr" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('联系电话')" align="center" prop="lxdh" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('销票时间')" align="center" prop="xpsj" width="100">
+      <u-table-column :label="$t('施工单位')" align="center" prop="sgdw" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('联系人')" align="center" prop="lxr" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('联系电话')" align="center" prop="lxdh" width="100" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('销票时间')" align="center" prop="xpsj" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.xpsj, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('作业票状态')" align="center" prop="zypzt" width="200" :formatter="zypztFormat">
+      </u-table-column>
+      <u-table-column :label="$t('作业票状态')" align="center" prop="zypzt" width="200" :formatter="zypztFormat">
         <template slot-scope="scope" v-if="scope.row.zypzt != null">
           <el-dropdown placement="bottom" trigger="click">
             <span class="el-dropdown-link">
@@ -378,9 +386,9 @@
             </el-dropdown-menu>
           </el-dropdown>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('未撤销项编号')" align="center" prop="wcxxbh" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('未撤销状态')" align="center" prop="wcxzt" :formatter="wcxztFormat">
+      </u-table-column>
+      <u-table-column :label="$t('未撤销项编号')" align="center" prop="wcxxbh" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('未撤销状态')" align="center" prop="wcxzt" :formatter="wcxztFormat">
         <template slot-scope="scope" v-if="scope.row.wcxzt != null">
           <el-dropdown placement="bottom" trigger="click">
             <span class="el-dropdown-link">
@@ -394,16 +402,16 @@
             </el-dropdown-menu>
           </el-dropdown>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('撤销时间')" align="center" prop="cxsj" width="100">
+      </u-table-column>
+      <u-table-column :label="$t('撤销时间')" align="center" prop="cxsj" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.cxsj, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('票盒')" align="center" prop="tag" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('操作')" align="center" fixed="right" width="160"
-                       class-name="small-padding fixed-width">
+      </u-table-column>
+      <u-table-column :label="$t('票盒')" align="center" prop="tag" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('操作')" align="center" fixed="right" width="170"
+                       class-name="small-padding">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -431,8 +439,8 @@
           >{{ $t('延期') }}
           </el-button>
         </template>
-      </el-table-column>
-    </el-table>
+      </u-table-column>
+    </u-table>
     <pagination
       v-show="total>0"
       :total="total"
@@ -1068,16 +1076,16 @@ export default {
     //修改单元格样式的方法
     myclass({row, column, rowIndex, columnIndex}) {
       if (row.zypzt == 10) {
-        return "background-color:rgba(255, 68,68, 0.5);"
+        return {'background-color': 'rgba(255, 68,68, 0.5)'}
       }
       if (row.zypzt == 18 || row.zypzt == 14) {
-        return "background-color:rgba(21,180,51, 0.5);"
+        return {'background-color':'rgba(21,180,51, 0.5)'}
       }
       if (row.zypzt == 16) {
-        return "background-color:rgba(221,248,9, 0.5);"
+        return {'background-color':'rgba(221,248,9, 0.5)'}
       }
       if (row.zypzt == 20) {
-        return "background-color:rgba(163, 150,150, 0.5);"
+        return  {'background-color':'rgba(163, 150,150, 0.5)'}
       }
     },
     /** 查询工作票列表 */

ui/src/views/invoice/bookingworkticket/index.vue

@@ -144,45 +144,47 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="cancelQuery"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="bookingworkticketList" ref="multipleTable"
+    <u-table v-loading="loading" :data="bookingworkticketList" ref="multipleTable"
               :span-method="mergeMethod" @selection-change="handleSelectionChange" :height="clientHeight" border
-              :row-key="getRowKey">
-      <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
-      <el-table-column label="作业单位" align="center" prop="bookingworkticket.workUnit" width="80"
+             use-virtual
+             showBodyOverflow="title"
+              >
+      <u-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
+      <u-table-column label="作业单位" align="center" prop="bookingworkticket.workUnit" width="80"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="作业区域单元" align="center" prop="bookingworkticket.workArea" width="100"
+      <u-table-column label="作业区域单元" align="center" prop="bookingworkticket.workArea" width="100"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="楼层位置" align="center" prop="bookingworkticket.floorLocation" width="80"
+      <u-table-column label="楼层位置" align="center" prop="bookingworkticket.floorLocation" width="80"
                        :formatter="floorLocationFormat"/>
-      <el-table-column label="用户主管" align="center" prop="bookingworkticket.userMgName" width="60"
+      <u-table-column label="用户主管" align="center" prop="bookingworkticket.userMgName" width="60"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label=" 预约作业日期" align="center" prop="workStartTime" width="90">
+      <u-table-column label=" 预约作业日期" align="center" prop="workStartTime" width="90">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bookingworkticket.workStartTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('新票/续票')" align="center" prop="xpxp" width="60">
+      </u-table-column>
+      <u-table-column :label="$t('新票/续票')" align="center" prop="xpxp" width="60">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.xpxp == 10" size="small" type="success">新票</el-tag>
           <el-tag v-else-if="scope.row.xpxp == 12" size="small" type="info">续票</el-tag>
         </template>
-      </el-table-column>
-      <el-table-column label="作业类型" align="center" prop="workType" width="110" :formatter="workTypeFormat"/>
-      <el-table-column label="风险等级" align="center" prop="riskLevel" width="60" :formatter="riskLevelFormat"/>
-      <el-table-column label="作业内容描述" align="center" prop="workDescription" width="160" :show-overflow-tooltip="true"/>
-      <el-table-column label="作业人员数" align="center" prop="workPeopleNumber" width="70" :show-overflow-tooltip="true"/>
-      <el-table-column label="预计作业时间" align="center" prop="estimateWorktime" width="70" :show-overflow-tooltip="true"/>
-      <el-table-column label="联系人" align="center" prop="bookingworkticket.contact" width="80"
+      </u-table-column>
+      <u-table-column label="作业类型" align="center" prop="workType" width="120" :show-overflow-tooltip="true" :formatter="workTypeFormat"/>
+      <u-table-column label="风险等级" align="center" prop="riskLevel" width="60" :formatter="riskLevelFormat"/>
+      <u-table-column label="作业内容描述" align="center" prop="workDescription" width="160" :show-overflow-tooltip="true"/>
+      <u-table-column label="作业人员数" align="center" prop="workPeopleNumber" width="70" :show-overflow-tooltip="true"/>
+      <u-table-column label="预计作业时间" align="center" prop="estimateWorktime" width="70" :show-overflow-tooltip="true"/>
+      <u-table-column label="联系人" align="center" prop="bookingworkticket.contact" width="80"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="联系方式" align="center" prop="bookingworkticket.phonenumber" width="100"
+      <u-table-column label="联系方式" align="center" prop="bookingworkticket.phonenumber" width="100"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="bookingworkticket.createdate" width="90">
+      <u-table-column label="创建时间" align="center" prop="bookingworkticket.createdate" width="90">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bookingworkticket.createdate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="预约状态" align="center" prop="bookingworkticket.status" :formatter="statusFormat" />
-      <el-table-column label="票号" align="center" width="40" prop="reservationNumber">
+      </u-table-column>
+      <u-table-column label="预约状态" align="center" prop="bookingworkticket.status" :formatter="statusFormat" />
+      <u-table-column label="票号" align="center" width="40" prop="reservationNumber">
         <template slot-scope="scope">
           <span>  {{ scope.row.reservationNumber }}</span>
           <el-button
@@ -194,17 +196,17 @@
             v-hasPermi="['invoice:bookingworkticket:edit','invoice:bookingworkticket:query']"
           ></el-button>
         </template>
-      </el-table-column>
-      <el-table-column label="危害工作许可证号" align="center" prop="whgzxkzh" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="动火作业许可证号" align="center" prop="dhzyxkzh" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="火票级别" align="center" prop="hpjb" width="50" :formatter="hpjbFormat"/>
-      <el-table-column label="限制空间许可证号" align="center" prop="xzkjxkzh" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="盲板作业许可证号" align="center" prop="mbzyxkzh" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="高处作业许可证号" align="center" prop="gczyxkzh" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="高处作业级别" align="center" prop="gczyjb" width="50" :formatter="gczyjbFormat"/>
-      <el-table-column label="延期许可证号" align="center" prop="yqxkzh" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="票盒" align="center" prop="tag" width="60" :show-overflow-tooltip="true"/>
-      <el-table-column label="开票" align="center" fixed="right" width="90">
+      </u-table-column>
+      <u-table-column label="危害工作许可证号" align="center" prop="whgzxkzh" width="100" :show-overflow-tooltip="true"/>
+      <u-table-column label="动火作业许可证号" align="center" prop="dhzyxkzh" width="100" :show-overflow-tooltip="true"/>
+      <u-table-column label="火票级别" align="center" prop="hpjb" width="50" :formatter="hpjbFormat"/>
+      <u-table-column label="限制空间许可证号" align="center" prop="xzkjxkzh" width="100" :show-overflow-tooltip="true"/>
+      <u-table-column label="盲板作业许可证号" align="center" prop="mbzyxkzh" width="100" :show-overflow-tooltip="true"/>
+      <u-table-column label="高处作业许可证号" align="center" prop="gczyxkzh" width="100" :show-overflow-tooltip="true"/>
+      <u-table-column label="高处作业级别" align="center" prop="gczyjb" width="50" :formatter="gczyjbFormat"/>
+      <u-table-column label="延期许可证号" align="center" prop="yqxkzh" width="100" :show-overflow-tooltip="true"/>
+      <u-table-column label="票盒" align="center" prop="tag" width="60" :show-overflow-tooltip="true"/>
+      <u-table-column label="开票" align="center" fixed="right" width="90">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.addStatus == 1" size="small" type="success">已开票</el-tag>
           <el-button
@@ -216,8 +218,8 @@
           </el-button>
         </template>
 
-      </el-table-column>
-      <el-table-column label="续票预约" fixed="right" align="center" width="90">
+      </u-table-column>
+      <u-table-column label="续票预约" fixed="right" align="center" width="90">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.bookingworkticket.status== 3 && scope.row.whgzxkzh && !scope.row.dhzyxkzh && !scope.row.gczyxkzh && !scope.row.mbzyxkzh && !scope.row.xzkjxkzh"
@@ -227,8 +229,8 @@
           > <span>续票预约</span>
           </el-button>
         </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" width="100" class-name="small-padding ">
+      </u-table-column>
+      <u-table-column label="操作" align="center" fixed="right" width="100" class-name="small-padding ">
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
 <!--            v-if="scope.row.bookingworkticket.status== 3 && scope.row.xpxp == 10"-->
@@ -263,8 +265,8 @@
             </el-dropdown-menu>
           </el-dropdown>
         </template>
-      </el-table-column>
-    </el-table>
+      </u-table-column>
+    </u-table>
 
     <pagination
       v-show="total>0"
@@ -1456,11 +1458,11 @@ export default {
           }
         }
       });
-      this.$nextTick(() => {
-        this.$refs.multipleTable.doLayout();
-
-        // table加ref="multipleTable" 表格不会错位 不对齐
-      });
+      // this.$nextTick(() => {
+      //   this.$refs.multipleTable.doLayout();
+      //
+      //   // table加ref="multipleTable" 表格不会错位 不对齐
+      // });
       return {
         merge: spanArr
       };

ui/src/views/sems/approve/tapprove-add.vue

@@ -509,7 +509,7 @@
 
 <script>
   import {getToken} from "@/utils/auth";
-  import {addApprove, getApprove} from "@/api/sems/approve";
+  import {addApprove, getApprove,getGovUserId} from "@/api/sems/approve";
   import {listPostUser} from "@/api/system/user";
 
   export default {
@@ -617,27 +617,35 @@
         // postCode: 'wxjl'
       }).then(response => {
         this.wxjlOption = response;
-      });
-      listPostUser({
-        // postCode: 'gyjl'
-      }).then(response => {
         this.gyjlOption = response;
-      });
-      listPostUser({
-        // postCode: 'gyzj'
-      }).then(response => {
         this.gyzjOption = response;
-      });
-      listPostUser({
-        // postCode: 'wxzj'
-      }).then(response => {
         this.wxzjOption = response;
-      });
-      listPostUser({
-        // postCode: 'sems'
-      }).then(response => {
         this.zfOption = response;
+        getGovUserId().then(response => {
+          this.dataForm.zf = response.data;
+        });
       });
+      // listPostUser({
+      //   // postCode: 'gyjl'
+      // }).then(response => {
+      //   this.gyjlOption = response;
+      // });
+      // listPostUser({
+      //   // postCode: 'gyzj'
+      // }).then(response => {
+      //   this.gyzjOption = response;
+      // });
+      // listPostUser({
+      //   // postCode: 'wxzj'
+      // }).then(response => {
+      //   this.wxzjOption = response;
+      // });
+      // listPostUser({
+      //   // postCode: 'sems'
+      // }).then(response => {
+      //   this.zfOption = response;
+      // });
+
       console.log(type)
       this.getDicts("spec_approve_type").then(response => {
         this.approveOption = response.data;

ui/src/views/system/user/index.vue

@@ -601,9 +601,7 @@ export default {
     this.getDicts("sys_user_hometype").then(response => {
       this.homeTypeOptions = response.data;
     });
-    this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg;
-    });
+
   },
   methods: {
     /** 查询用户列表 */