各科

src/views/system/AttendanceRuleList.vue

@@ -38,10 +38,10 @@
 
 
     <div>
-      <a-upload style="margin-right: 20px;" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+      <a-upload style="margin-right: 20px;" v-if="isColse"  name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import" >导入</a-button>
       </a-upload>
-      <a-button type="primary" icon="download" @click="handleExportXls('员工排班信息')" >导出</a-button>
+      <a-button type="primary" v-if="isColse" icon="download" @click="handleExportXls('员工排班信息')" >导出</a-button>
       <a-button @click="handleAddts()" type="primary" icon="plus" v-has="'UserShift:add'" v-if="isColse" style="margin-left: 20px;">调整</a-button>
       <a-tabs default-active-key="2" @change="callback">
         <a-tab-pane key="2" tab="按班次上下班">
@@ -68,7 +68,7 @@
             <span v-for='(d,i) in tpdata' style="margin-left: -5px;" :slot="d" slot-scope="text, record, index">
               <span >
                 <a-tag color="blue" v-if="text=='休'">{{text.substring(0,1)}}</a-tag>
-                <a-tag color="red" v-if="text=='法'">{{text.substring(0,1)}}</a-tag>
+                <a-tag color="red" v-if="text=='法'">{{text.substring(0,1)}}</a-tag> 
                 <a-tag color="#87d068" v-if="text!=''&&text!=null&&text!='法'&&text!='休'">{{text.substring(0,1)}}</a-tag>
               </span>
             </span>

src/views/system/UserList.vue

@@ -418,7 +418,7 @@ import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
           {
             title: '试用期结束时间',
             align: "center",
-            width: 120,
+            width: 135,
             dataIndex: 'trialEndDate',
             sorter: true
           },

src/views/system/modules/UserContractModal.vue

@@ -76,7 +76,7 @@
           realname: {
             rules: [{
               required: true,
-              message: '请输入员工名称!'
+              message: '请输入员工名称'
             }, {
               validator: this.validateRealname
             }]
@@ -84,7 +84,7 @@
           deptname: {
             rules: [{
               required: true,
-              message: '请输入部门名称!'
+              message: '请输入部门名称'
             }, ]
           },
           type: {

src/views/system/modules/UserModal.vue

@@ -444,7 +444,7 @@
           phone: {
             rules: [{
               required: true,
-              message: '请输入手机号!'
+              message: '请输入手机号'
             }, {
               validator: this.validatePhone
             }]
@@ -664,7 +664,7 @@
       const isLtM=file.size / 1024 / 1024>10
       if(isLtM){
         this.isupload=false;
-        this.$message.warning('文件不能超过10mb!');
+        this.$message.warning('文件不能超过10mb');
         return false;
       }
       },
@@ -694,7 +694,7 @@
       },
       onSearchs() {
         if (this.userDepartModel.departIdList == null || this.userDepartModel.departIdList.length < 1) {
-          this.$message.warning('请先选择部门!');
+          this.$message.warning('请先选择部门');
           return;
         }
         this.selectedRowKeys.push(this.zwCode);
@@ -1295,7 +1295,7 @@
                 /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/).test(value)) {
               this.getBirth(value)
             } else {
-              callback("请输入正确格式的身份证号码!");
+              callback("请输入正确格式的身份证号码");
             }
           }
           callback()
@@ -1322,7 +1322,7 @@
               cEndDate:this.cEndDate
             })
          }else if(date==null){
-           callback("请输入入职日期!")
+           callback("请输入入职日期")
          }
         callback()
          }
@@ -1412,11 +1412,11 @@
               if (res.success) {
                 callback()
               } else {
-                callback("手机号已存在!")
+                callback("手机号已存在")
               }
             })
           } else {
-            callback("请输入正确格式的手机号码!");
+            callback("请输入正确格式的手机号码");
           }
         }
         }
@@ -1456,7 +1456,7 @@
               }) */
               callback()
           } else {
-            callback("请输入正确格式的邮箱!")
+            callback("请输入正确格式的邮箱")
           }
         }
       },