LY js bugfix

master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceUserUnitController.java

@@ -85,12 +85,11 @@ public class TInvoiceUserUnitController extends BaseController
         List<SysUser> sysUserList = new ArrayList<SysUser>();
         List<TInvoiceUserUnit> tInvoiceUserUnitList = tInvoiceUserUnitService.selectTInvoiceUserUnitByUnit(unit);
         for (TInvoiceUserUnit t : tInvoiceUserUnitList) {
-
             SysUser sysUser = sysUserService.selectUserById(Long.parseLong(t.getUserIds()));
-            sysUserList.add(sysUser);
+            if (sysUser != null) {
+                sysUserList.add(sysUser);
+            }
         }
-
-
         return AjaxResult.success(sysUserList);
     }
 

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

@@ -265,17 +265,17 @@
         <template slot-scope="scope" v-if="scope.row.zypzt != null">
           <el-dropdown placement="bottom" trigger="click">
             <span class="el-dropdown-link">
-              <span style=" font-size: 13px" v-if="scope.row.zypzt==10">{{ "作业票未销" }}</span>
-               <span style=" font-size: 13px" v-if="scope.row.zypzt==18">{{ "作业票收回，作业票关闭" }}</span>
-                <span style="font-size: 13px" v-if="scope.row.zypzt==16">{{ "作业票延期" }}</span>
-                 <span style="font-size: 13px" v-if="scope.row.zypzt==20">{{ "作业票作废" }}</span>
+              <span style=" font-size: 13px" v-if="scope.row.zypzt==10">作业票未销</span>
+               <span style=" font-size: 13px" v-if="scope.row.zypzt==18">作业票收回，作业票关闭</span>
+                <span style="font-size: 13px" v-if="scope.row.zypzt==16">作业票延期</span>
+                 <span style="font-size: 13px" v-if="scope.row.zypzt==20">作业票作废</span>
               <i class="el-icon-caret-bottom"></i>
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item @click.native="statusChange(10, scope.row)">{{ $t('作业票未销') }}</el-dropdown-item>
-              <el-dropdown-item @click.native="statusChange(18, scope.row)">{{ $t('作业票关闭，作业票收回') }}</el-dropdown-item>
-              <el-dropdown-item @click.native="statusChange(16, scope.row)">{{ $t('作业票延期') }}</el-dropdown-item>
-              <el-dropdown-item @click.native="statusChange(20, scope.row)">{{ $t('作业票作废') }}</el-dropdown-item>
+              <el-dropdown-item @click.native="statusChange(10, scope.row)">作业票未销</el-dropdown-item>
+              <el-dropdown-item @click.native="statusChange(18, scope.row)">作业票关闭，作业票收回</el-dropdown-item>
+              <el-dropdown-item @click.native="statusChange(16, scope.row)">作业票延期</el-dropdown-item>
+              <el-dropdown-item @click.native="statusChange(20, scope.row)">作业票作废</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -285,13 +285,13 @@
         <template slot-scope="scope" v-if="scope.row.wcxzt != null">
           <el-dropdown placement="bottom" trigger="click">
             <span class="el-dropdown-link">
-              <span style=" font-size: 13px" v-if="scope.row.wcxzt==10">{{ "有" }}</span>
-               <span style=" font-size: 13px" v-if="scope.row.wcxzt==12">{{ "无" }}</span>
+              <span style=" font-size: 13px" v-if="scope.row.wcxzt==10">有</span>
+               <span style=" font-size: 13px" v-if="scope.row.wcxzt==12">无</span>
               <i class="el-icon-caret-bottom"></i>
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item @click.native="wcxztYOU(0, scope.row)">{{ $t('有') }}</el-dropdown-item>
-              <el-dropdown-item @click.native="wcxztWU(0, scope.row)">{{ $t('无') }}</el-dropdown-item>
+              <el-dropdown-item @click.native="wcxztYOU(0, scope.row)">有</el-dropdown-item>
+              <el-dropdown-item @click.native="wcxztWU(0, scope.row)">无</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -394,13 +394,13 @@
         <template slot-scope="scope" v-if="scope.row.wcxzt != null">
           <el-dropdown placement="bottom" trigger="click">
             <span class="el-dropdown-link">
-              <span style=" font-size: 13px" v-if="scope.row.wcxzt==10">{{ "有" }}</span>
-               <span style=" font-size: 13px" v-if="scope.row.wcxzt==12">{{ "无" }}</span>
+              <span style=" font-size: 13px" v-if="scope.row.wcxzt==10">有</span>
+               <span style=" font-size: 13px" v-if="scope.row.wcxzt==12">无</span>
               <i class="el-icon-caret-bottom"></i>
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item @click.native="wcxztYOU(0, scope.row)">{{ $t('有') }}</el-dropdown-item>
-              <el-dropdown-item @click.native="wcxztWU(0, scope.row)">{{ $t('无') }}</el-dropdown-item>
+              <el-dropdown-item @click.native="wcxztYOU(0, scope.row)">有</el-dropdown-item>
+              <el-dropdown-item @click.native="wcxztWU(0, scope.row)">无</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>