浏览代码

修复缺陷

jiawuxian 1 年之前
父节点
当前提交
f70fef3521

+ 3 - 1
src/utils/util.js

@@ -36,7 +36,9 @@ export function arabicToChinese(num) {
 
   let result = "";
   let unitIndex = 0;
-
+  if (num == 10) {
+    return "十";
+  }
   while (num > 0) {
     const digit = num % 10;
     const isTenDigit =

+ 1 - 0
src/views/resumption/ruleManager/dialog.select.point.vue

@@ -27,6 +27,7 @@
             <el-input
               v-model="search.key"
               maxlength="50"
+              clearable
               placeholder="请输入履职项或履职内容"
             ></el-input>
           </el-form-item>

+ 2 - 1
src/views/resumption/ruleManager/index.vue

@@ -20,7 +20,7 @@
       <el-col :span="24" :xs="24">
         <div class="main-right-box">
           <!--    搜索条件    -->
-          <div class="main-search-box" v-show="showSearch && rule">
+          <div class="main-search-box" v-show="rule">
             <div v-if="rule" style="padding-bottom: 10px; font-weight: 700">
               {{ rule.name }}
             </div>
@@ -30,6 +30,7 @@
               size="small"
               :inline="true"
               label-width="100px"
+              v-show="showSearch"
             >
               <el-form-item prop="itemName" label="履职项" label-width="60px">
                 <el-input

+ 2 - 1
src/views/safetycheck/ruleManager/dialog.select.point.vue

@@ -28,8 +28,9 @@
             <el-input
               v-model="search.key"
               maxlength="50"
+              clearable
               placeholder="请输入检查项或检查内容"
-              @changed="onKeyChanged"
+              @input="onKeyChanged"
             ></el-input>
           </el-form-item>
           <el-form-item prop="selectRuleId" label="检查手册">

+ 2 - 1
src/views/safetycheck/ruleManager/index.vue

@@ -21,7 +21,7 @@
       <el-col :span="24" :xs="24">
         <div class="main-right-box">
           <!--    搜索条件    -->
-          <div class="main-search-box" v-show="showSearch && rule">
+          <div class="main-search-box" v-show="rule">
             <div style="padding-bottom: 10px; font-weight: 700">
               {{ rule.name }}
             </div>
@@ -31,6 +31,7 @@
               size="small"
               :inline="true"
               label-width="100px"
+              v-show="showSearch"
             >
               <el-form-item prop="itemName" label="检查项" label-width="60px">
                 <el-input

+ 1 - 1
src/views/safetycheck/task/index.vue

@@ -339,7 +339,7 @@
               label="操作"
               fixed="right"
               align="center"
-              min-width="120px"
+              width="240px"
             >
               <template slot-scope="r">
                 <el-button