2023.11.11

src/views/common/rewardTask.vue

@@ -71,7 +71,7 @@
             </el-radio-group>            
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
+          <el-form-item label="截止时间" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
             <el-date-picker
               v-model="formData.expire_time"
               type="datetime"
@@ -84,8 +84,8 @@
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns1"
                 :key="item.value"
@@ -95,8 +95,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns2"
                 :key="item.value"
@@ -106,8 +106,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns3"
                 :key="item.value"

src/views/common/rewardTaskAmend.vue

@@ -71,7 +71,7 @@
             </el-radio-group>            
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
+          <el-form-item label="截止时间" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
             <el-date-picker
               v-model="formData.expire_time"
               type="datetime"
@@ -84,8 +84,8 @@
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns1"
                 :key="item.value"
@@ -95,8 +95,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns2"
                 :key="item.value"
@@ -106,8 +106,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns3"
                 :key="item.value"

src/views/common/temporaryTask.vue

@@ -49,7 +49,7 @@
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
+          <el-form-item label="截止时间" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
             <el-date-picker
               v-model="formData.expire_time"
               type="datetime"
@@ -62,8 +62,8 @@
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns1"
                 :key="item.value"
@@ -73,8 +73,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns2"
                 :key="item.value"
@@ -84,8 +84,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns3"
                 :key="item.value"

src/views/common/temporaryTaskAmend.vue

@@ -65,7 +65,7 @@
             </el-radio-group>            
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
+          <el-form-item label="截止时间" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
             <el-date-picker
               v-model="formData.expire_time"
               type="datetime"
@@ -78,8 +78,8 @@
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns1"
                 :key="item.value"
@@ -89,8 +89,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns2"
                 :key="item.value"
@@ -100,8 +100,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns3"
                 :key="item.value"

src/views/setting/set_role.vue

@@ -45,7 +45,7 @@
                       <el-button type="primary" @click="add_employee_show = true">添加</el-button>
                     </template>
 
-                    <div class="gap-right-8 fr" style="display:inline-block; width:180px;" v-if="item_info.code == 'dept_manager'">
+                    <div class="gap-right-8 fr" style="display:inline-block; width:240px;" v-if="item_info.code == 'dept_manager'">
                       <el-input maxlength="20" placeholder="搜索员工姓名" ref="search-bar" v-model="keyword" class="input-with-select" @keyup.enter.native="onFilterChanged">
                         <el-button slot="append" icon="el-icon-search" @click="onFilterChanged"></el-button>
                       </el-input>
@@ -1276,6 +1276,7 @@ export default {
       // 根据选择人员权限来显示不同的权限数据范围
       this.jurisdiction = data.code == 'employee' ? this.dataAccessListEmployee : this.dataAccessList;
       this.item_info = data;
+      this.keyword='';
       this.table_list = [];
       if (data.code != 'employee') {
         this.get_table_list();

src/views/statistics_new/dept_rank.vue

@@ -140,7 +140,7 @@
       </center>
     </div>
     <!-- 导出弹窗 -->
-    <el-dialog :modal-append-to-body="false" title="导出排名" :visible.sync="dialogVisible" width="730px">
+    <el-dialog :modal-append-to-body="false" title="导出排名" top="5%" :visible.sync="dialogVisible" width="730px">
       <div style="font-size:15px;margin-top:20px;">系统将按以下已选条件导出对应的排名报表</div>
       <el-form :inline="true">
         <div class="picker_er">
@@ -171,11 +171,11 @@
             <el-option label="A分" :value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item style="margin-left:20px">
+<!--        <el-form-item style="margin-left:20px">
           <el-select v-model="newTaskFormType" style="width:110px;" filterable placeholder="请选择">
             <el-option v-for="item in pullrow" :key="item.id" :label="item.value" :value="item.id"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item v-show="newTaskFormType == 1" class="inquireRule">
           <el-cascader
@@ -741,7 +741,7 @@ export default {
   }
 }
 /deep/ .el-dialog {
-  top: 21%;
+  top: 0%;
 }
 .picker_er {
   margin-top: 20px;

src/views/statistics_new/integral_statistics.vue

@@ -26,7 +26,10 @@
         <el-table-column label="部门">
           <template slot-scope="scope">
             <div class="flex-box-ce" v-if="scope.row.dept_list.length>0">
-              <span v-for="item in scope.row.dept_list" :key="item" style="padding-right: 6px;"><WWOpenData type="departmentName" :openid="item.depart_id"></WWOpenData></span>
+              <span v-for="item in scope.row.dept_list" :key="item" v-if="item.depart_id!=1" style="padding-right: 6px;">
+                <WWOpenData type="departmentName" :openid="item.depart_id"></WWOpenData>
+              </span>
+              <span v-else class="fontColorB">--</span>
             </div>
             <span v-else class="fontColorB">--</span>
           </template>

src/views/statistics_new/lotteryTicket_statistics.vue

@@ -40,9 +40,15 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="performance" label="部门" align="left">
+        <el-table-column label="部门">
           <template slot-scope="scope">
-            <span v-for="(item,index) in scope.row.depart_name" :key="index"><WWOpenData type="departmentName" :openid="item"></WWOpenData><span v-if="(scope.row.depart_name.length-index)>1">,</span></span>
+            <div class="flex-box-ce" v-if="scope.row.depart_name.length>0">
+              <span v-for="item in scope.row.depart_name" :key="item" v-if="item!=1" style="padding-right: 6px;">
+                <WWOpenData type="departmentName" :openid="item"></WWOpenData>
+              </span>
+              <span v-else class="fontColorB">--</span>
+            </div>
+            <span v-else class="fontColorB">--</span>
           </template>
         </el-table-column>
         <el-table-column prop="a" label="奖票数量" align="left">

src/views/statistics_new/manager_statistics.vue

@@ -49,7 +49,10 @@
             <el-table-column label="部门">
               <template slot-scope="scope">
                 <div class="flex-box-ce" v-if="scope.row.dept.length>0">
-                  <span v-for="item in scope.row.dept" :key="item" style="padding-right: 6px;"><WWOpenData type="departmentName" :openid="item"></WWOpenData></span>
+                  <span v-for="item in scope.row.dept" :key="item" v-if="item!=1" style="padding-right: 6px;">
+                    <WWOpenData type="departmentName" :openid="item"></WWOpenData>
+                  </span>
+                  <span v-else class="fontColorB">--</span>
                 </div>
                 <span v-else class="fontColorB">--</span>
               </template>
@@ -125,6 +128,17 @@
                 </span>
               </template>
             </el-table-column>
+            <el-table-column label="部门">
+              <template slot-scope="scope">
+                <div class="flex-box-ce" v-if="scope.row.dept.length>0">
+                  <span v-for="item in scope.row.dept" :key="item" v-if="item!=1" style="padding-right: 6px;">
+                    <WWOpenData type="departmentName" :openid="item"></WWOpenData>
+                  </span>
+                  <span v-else class="fontColorB">--</span>
+                </div>
+                <span v-else class="fontColorB">--</span>
+              </template>
+            </el-table-column>
             <el-table-column label="管理范围(人)" prop="scope_count"></el-table-column>
             <el-table-column label="人均奖分(次)" prop="reward_count"></el-table-column>
             <el-table-column label="人均扣分(次)" prop="deduct_count"></el-table-column>