Browse Source

系统优化

ljb 10 months ago
parent
commit
165f3b81b9

+ 1 - 0
src/views/RD-system-manage/list.vue

@@ -50,6 +50,7 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          style="width: 240px !important"
         >
         </el-date-picker>
       </template>

+ 5 - 3
src/views/basic-resource/comp-basic-info/ky-asset-list.vue

@@ -63,6 +63,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd"
+          style="width: 240px !important;"
         >
         </el-date-picker>
       </template>
@@ -70,9 +71,10 @@
       <!-- 使用寿命 -->
       <template slot="sysmSearch">
         <div style="display: flex; align-items: center;">
-          <avue-input-number v-model="params.startSysm" :min="0"></avue-input-number>
-          <span style="width: 70px; text-align: center;">至</span>
-          <avue-input-number v-model="params.endSysm" :min="0"></avue-input-number>
+          <span>使用寿命:</span>
+          <avue-input-number v-model="params.startSysm" :min="0" style="width: 100px !important;"></avue-input-number>
+          <span style="width: 20px; text-align: center;">至</span>
+          <avue-input-number v-model="params.endSysm" :min="0" style="width: 100px !important;"></avue-input-number>
         </div>
       </template>
       

+ 6 - 0
src/views/basic-resource/comp-basic-info/technician-roster.vue

@@ -77,6 +77,7 @@ import UploadExcelDialog from "@/components/upload-excel-dialog";
 import moment from "moment";
 import {getToken} from "@/util/auth";
 import {downloadXls} from "@/util/util";
+import { isAlphanumericCombination } from "@/util/regex";
 
 
 export default window.$crudCommon({
@@ -121,6 +122,9 @@ export default window.$crudCommon({
       if (!this.form.number && !this.form.identityCard) {
         this.$message.warning("工号和身份证号必须填写一项!");
         return false;
+      } else if (this.form.number && !isAlphanumericCombination(this.form.number)) {
+        this.$message.warning("工号必须是英文字母加数字组合!");
+        return false;
       }
       return true;
     },
@@ -198,6 +202,8 @@ export default window.$crudCommon({
   res: ({ data }) => {
     data.records = data.records.map(item => {
       item.gender = item.gender ? String(item.gender) : '';
+      item.birthday = item.birthday ? moment(item.birthday).format('yyyy-MM-DD') : '';
+      item.hireDate = item.birthday ? moment(item.hireDate).format('yyyy-MM-DD') : '';
       return item;
     });
     return data;