LY 工作票

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -197,13 +197,8 @@ public class TJobticketController extends BaseController {
         }
         ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
         StringBuilder contentUserUnit = new StringBuilder();
-        List<SysDictData> book_user_unit = iSysDictTypeService.selectDictDataByType("book_user_unit");
         if (tJobticket.getUserUnit() != null) {
-            for (SysDictData p : book_user_unit) {
-                if (tJobticket.getUserUnit().toString().equals(p.getDictValue())) {
-                    contentUserUnit.append(p.getDictLabel());//用户单位
-                }
-            }
+                    contentUserUnit.append(tJobticket.getUserUnit());//用户单位
         }
         if (tJobticket.getUserMg() != null) {
             SysUser sysUser = sysUserService.selectUserById(tJobticket.getUserMg());
@@ -226,7 +221,6 @@ public class TJobticketController extends BaseController {
         int sameCount = 0;
         int nosanmeCount = 0;
         int noCount = 0;
-        List<SysDictData> book_user_unit = iSysDictTypeService.selectDictDataByType("book_user_unit");
         //批量插入时 需要查询数据库是否有重复数据 若果有 就不新增
         for (int i = 0; i < dto.size(); i++) {
             if (StringUtils.isEmpty(dto.get(i).getGczyxkzh()) && StringUtils.isEmpty(dto.get(i).getDhzyxkzh()) && StringUtils.isEmpty(dto.get(i).getXzkjxkzh()) && StringUtils.isEmpty(dto.get(i).getMbzyxkzh()) && StringUtils.isEmpty(dto.get(i).getWhgzxkzh())) {
@@ -241,11 +235,7 @@ public class TJobticketController extends BaseController {
             tJobticket.setContent(tInvoiceWorkcontent.getBookingworkticket().getWorkArea() + tInvoiceWorkcontent.getWorkDescription());
             //byc 联系人 用户主管+用户单位
             if (tInvoiceWorkcontent.getBookingworkticket().getUserUnit() != null) {
-                for (SysDictData p : book_user_unit) {
-                    if (tInvoiceWorkcontent.getBookingworkticket().getUserUnit().toString().equals(p.getDictValue())) {
-                        contentUserUnit.append(p.getDictLabel());//用户单位
-                    }
-                }
+                contentUserUnit.append(tInvoiceWorkcontent.getBookingworkticket().getUserUnit());//用户单位
             }
             if (tInvoiceWorkcontent.getBookingworkticket().getUserMg() != null) {
                 SysUser sysUser = sysUserService.selectUserById(tInvoiceWorkcontent.getBookingworkticket().getUserMg());
@@ -299,16 +289,9 @@ public class TJobticketController extends BaseController {
     public AjaxResult edit(@RequestBody TJobticket tJobticket) {
         ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
         StringBuilder contentUserUnit = new StringBuilder();
-        List<SysDictData> book_user_unit = iSysDictTypeService.selectDictDataByType("book_user_unit");
-
         if (tJobticket.getUserUnit() != null) {
-            for (SysDictData p : book_user_unit) {
-                if (tJobticket.getUserUnit().toString().equals(p.getDictValue())) {
-                    contentUserUnit.append(p.getDictLabel());//用户单位
-                }
+                    contentUserUnit.append(tJobticket.getUserUnit());//用户单位
             }
-
-        }
         if (tJobticket.getUserMg() != null) {
             SysUser sysUser = sysUserService.selectUserById(tJobticket.getUserMg());
             contentUserUnit.append(sysUser.getNickName());

ui/src/views/approve/myapprove/index.vue

@@ -20,6 +20,11 @@
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="cancelProcess(scope.row)"
+          >{{ $t('查看') }}</el-button>
           <el-button
             size="mini"
             type="text"

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

@@ -699,16 +699,7 @@
         <el-form-item :label="$t('签发时间')" prop="qfsj">
           <el-input v-model="postponeform.qfsj" :placeholder="$t('请输入') + $t('签发时间')"/>
         </el-form-item>
-        <el-form-item :label="$t('签发班组')" prop="qfbz">
-          <el-select v-model="postponeform.qfbz" :placeholder="$t('请选择') + $t('签发班组')">
-            <el-option
-              v-for="dict in qfbzOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+
         <el-form-item :label="$t('延期许可证号')" prop="yqxkzh">
           <el-input v-model="postponeform.yqxkzh" :placeholder="$t('请输入') + $t('延期许可证号')"/>
         </el-form-item>
@@ -932,9 +923,6 @@ export default {
     this.getDicts("PLANT_DIVIDE").then(response => {
       this.plantCodeOptions = response.data;
     });
-    this.getDicts("QFBZ").then(response => {
-      this.qfbzOptions = response.data;
-    });
     this.getDicts("XPXP").then(response => {
       this.xpxpOptions = response.data;
     });