修改bug

src/utils/util.js

@@ -1,56 +1,36 @@
-export function arabicToChinese(num) {
-  const units = [
-    "",
-    "十",
-    "百",
-    "千",
-    "万",
-    "十万",
-    "百万",
-    "千万",
-    "亿",
-    "十亿",
-    "百亿",
-    "千亿",
-    "万亿",
-    "十万亿",
-    "百万亿",
-    "千万亿",
-  ];
-  const digits = ["", "一", "二", "三", "四", "五", "六", "七", "八", "九"];
-  const tenDigits = [
-    "十",
-    "二十",
-    "三十",
-    "四十",
-    "五十",
-    "六十",
-    "七十",
-    "八十",
-    "九十",
-  ];
+export function arabicToChinese(value) {
+  const digitMap = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
+  const unitMap = ['', '十', '百', '千', '万', '亿'];
+  let chineseNumber = '';
+  let digits = value.toString().split('');
+  let hasZero = false;
+  let lastUnit = '';
 
-  if (num === 0) {
-    return "零";
-  }
+  for (let i = digits.length - 1; i >= 0; i--) {
+    let digit = digits[i];
+    let unit = unitMap[digits.length - i - 1];
 
-  let result = "";
-  let unitIndex = 0;
-  if (num == 10) {
-    return "十";
+    if (digit === '0') {
+      if ((unit === '十' || unit === '百') && i > 0 && digits[i - 1] !== '0') {
+        // 如果是十位或百位上的零，并且后面跟着非零数字，则保留零
+        chineseNumber = digitMap[digit] + chineseNumber;
+      }
+      hasZero = true;
+    } else {
+      chineseNumber = digitMap[digit] + unit + chineseNumber;
+      if (unit === '十' && hasZero && lastUnit === '百') {
+        // 如果是十位并且之前有零，并且上一个单位是“百”，则在十位后插入零
+        chineseNumber = '零' + chineseNumber;
+      }
+      hasZero = false;
+    }
+    lastUnit = unit;
   }
-  while (num > 0) {
-    const digit = num % 10;
-    const isTenDigit =
-      unitIndex > 0 && digit === 1 && result.length > 0 && result[0] !== "零";
-    const unit = isTenDigit ? tenDigits[unitIndex - 1] : units[unitIndex];
-    const digitChinese = digit === 1 && isTenDigit ? "" : digits[digit];
-
-    result = digitChinese + unit + result;
 
-    num = Math.floor(num / 10);
-    unitIndex++;
-  }
+  // 去除开头的“零”
+  chineseNumber = chineseNumber.replace(/^零+/, '');
 
-  return result;
+  return chineseNumber || '零';
 }
+
+

src/views/core/drill/drillDictionaryBranch/index.vue

@@ -122,6 +122,20 @@
               </template>
             </el-table-column>
             <el-table-column
+              label="地区"
+              align="center"
+              width="100"
+              prop="affiliatedArea"
+            />
+
+            <el-table-column
+              label="行社"
+              align="center"
+              width="200"
+              prop="affiliatedBank"
+            />
+
+            <el-table-column
               label="机构名称"
               align="center"
               width="250"

src/views/core/edu/task/dialog.newTask.vue

@@ -182,7 +182,7 @@ export default {
         trainingStartDateTime: [{required: true, message: "请选择培训开始时间"}],
         trainingEndDateTime: [{required: true, message: "请选择培训结束时间"}],
         note: [{required: true, message: "请输入培训总结"}],
-        site: [{required: true, message: "请输入地点"}],
+       /* site: [{required: true, message: "请输入地点"}],*/
         imageList: [{required: true, message: "请上传培训图片"}],
         // fileList: [{required: true, message: "请上传培训文件"}],
       },

src/views/core/outIn/approve/dialog.approve.letter.detail.vue

@@ -40,7 +40,7 @@
         </el-row>
         <el-table border size="small" :data="formData.userInfos" height="300">
           <el-table-column label="序号"  align="center"  type="index" width="70" />
-          <el-table-column label="所属单位" width="100" align="center" prop="companyName" />
+          <el-table-column label="申请单位" width="100" align="center" prop="companyName" />
           <el-table-column label="出入人员" width="100" align="center" prop="userName" />
           <el-table-column label="证件类型" width="100" align="center" prop="idType">
             <template slot-scope="scope">

src/views/core/outIn/approve/dialog.approve.letter.vue

@@ -70,7 +70,7 @@
           </el-row>
           <el-table border size="small" :data="formData.userInfos" height="300">
                   <el-table-column label="序号"  align="center"  type="index" width="70" />
-                  <el-table-column label="所属单位" width="100" align="center" prop="companyName" />
+                  <el-table-column label="申请单位" width="100" align="center" prop="companyName" />
                   <el-table-column label="出入人员" width="100" align="center" prop="userName" />
                   <el-table-column label="证件类型" width="100" align="center" prop="idType">
                     <template slot-scope="scope">

src/views/core/outIn/letter/dialog.addletter.vue

@@ -118,7 +118,7 @@
 
           <el-table border size="small" :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
             <el-table-column label="序号"  align="center"  type="index" width="70" />
-            <el-table-column label="所属单位" width="100" align="center" prop="companyName" />
+            <el-table-column label="申请单位" width="100" align="center" prop="companyName" />
             <el-table-column label="出入人员" width="100" align="center" prop="userName" />
             <el-table-column label="证件类型" width="100" align="center" prop="idType">
               <template slot-scope="scope">
@@ -163,8 +163,8 @@
           :rules="userInfoRules"
           label-width="140px"
         >
-          <el-form-item label="所属单位" prop="companyName">
-            <el-input v-model="userInfo.companyName" maxlength="20" placeholder="请输入所属单位" />
+          <el-form-item label="申请单位" prop="companyName">
+            <el-input v-model="userInfo.companyName" maxlength="20" placeholder="请输入申请单位" />
           </el-form-item>
           <el-form-item label="出入人员" prop="userName">
             <el-input v-model="userInfo.userName" maxlength="10" placeholder="请输入出入人员" />
@@ -242,7 +242,7 @@ export default {
       },
       userInfoRules: {
         userName: [{ required: true, message: "请输入出入人员" }],
-        companyName: [{ required: true, message: "请输入所属单位" }],
+        companyName: [{ required: true, message: "请输入申请单位" }],
         idType: [{ required: true, message: "请选择证件类型" }],
         idCard: [{ required: true, message: "请输入证件号码" }],
         //imgFile: [{ required: true, message: "请上传证件图片" }],

src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -114,7 +114,7 @@
         </el-row>
         <el-table border size="small" :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
           <el-table-column label="序号"  align="center"  type="index" width="70" />
-          <el-table-column label="所属单位" width="150" align="center" prop="companyName" />
+          <el-table-column label="申请单位" width="150" align="center" prop="companyName" />
           <el-table-column label="出入人员" width="100" align="center" prop="userName" />
           <el-table-column label="证件类型" width="100" align="center" prop="idType">
             <template slot-scope="scope">

src/views/core/outIn/outInLog/dialog.outIn.detail.vue

@@ -33,7 +33,7 @@
           <el-descriptions-item label="有效天数">{{
             formData.effectiveDays
           }}</el-descriptions-item>
-          <el-descriptions-item label="所属单位">{{
+          <el-descriptions-item label="申请单位">{{
             formData.companyName
           }}</el-descriptions-item>
           <el-descriptions-item label="出入人员">{{

src/views/core/outIn/outInLog/index.vue

@@ -106,7 +106,7 @@
             :data="outInRecrodList"
           >
             <el-table-column
-              label="所属单位"
+              label="申请单位"
               prop="companyName"
               align="center"
               width="180"

src/views/resumption/ruleManager/index.vue

@@ -450,13 +450,24 @@ export default {
       return "";
     },
     spanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex < 3) {
-        if (row.rowSpan > 0) {
-          return [row.rowSpan, 1];
-        } else {
-          return [0, 0];
+      if(this.rule && this.rule.orgId == this.orgId && this.rule.status == 0){
+        if (columnIndex < 3) {
+          if (row.rowSpan > 0) {
+            return [row.rowSpan, 1];
+          } else {
+            return [0, 0];
+          }
+        }
+      }else{
+        if (columnIndex < 2) {
+          if (row.rowSpan > 0) {
+            return [row.rowSpan, 1];
+          } else {
+            return [0, 0];
+          }
         }
       }
+
     },
   },
 };

src/views/safetycheck/task/index.vue

@@ -36,9 +36,8 @@
                   v-model="queryParams.title"
                   placeholder="请输入任务名称"
                   clearable
-                  @keyup.enter.native="handleQuery"
+
                   :maxlength="50"
-                  @input="inputTitle"
                 />
               </el-form-item>
               <el-form-item label="检查人员" prop="roleId">

src/views/system/smsSendLog/index.vue

@@ -144,7 +144,7 @@
             <el-table-column label="内容" align="center" prop="contentData"/>
             <el-table-column label="发送结果" align="center" prop="result">
               <template slot-scope="scope">
-                {{ scope.row.result=='0'?'成功':'失败' }}
+                {{ scope.row.result== '0' ?'成功':'失败' }}
               </template>
             </el-table-column>
             <el-table-column label="短信内容" align="center" prop="reqDetail" show-overflow-tooltip/>

src/views/system/workTimeSet/workTime.vue

@@ -67,6 +67,17 @@
                   />
                 </el-select>
               </el-form-item>
+                <el-form-item label="值班打卡" prop="isDuty">
+                  <el-select v-model="queryParams.isDuty" clearable placeholder="请选择">
+
+                    <el-option
+                      v-for="item in dutys"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+              </el-form-item>
               <el-form-item label="未配置作息" prop="noWorkTime">
                 <el-switch
                   v-model="queryParams.noWorkTime"
@@ -247,6 +258,13 @@ export default {
   components: { DataRangePicker, OrgTree, DialogEdit, DialogAdd,DialogDetail },
   data() {
     return {
+      dutys:[{
+        value: 1,
+        label: '是'
+      }, {
+        value: 0,
+        label: '否'
+      }],
       nowTime: null,
       // 遮罩层
       loading: false,
@@ -278,6 +296,7 @@ export default {
         isEnable: null,
         pageNum: 1,
         pageSize: 10,
+        isDuty: null,
         orgType:null,
         range: [sDate, eDate],
         noWorkTime:false,