待办任务更改文字

fhKeeper/formulahousekeeper/timesheet/src/main.js

@@ -20,7 +20,7 @@ import $ from 'jquery'
 
 import './day.js' // 加载 dayjs 初始化配置
 
-import Viewer from 'v-viewer'
+import Viewer from 'v-viewer' // 图片预览
 import 'viewerjs/dist/viewer.css'
 Vue.use(Viewer)
 Viewer.setDefaults({

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -60,6 +60,8 @@ import simpleReport from './views/simplereport/list';
 // 任务管理
 import tasks from './views/task/list';
 
+// 请假
+
 Vue.use(Router)
 
 export const fixedRouter = [

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -377,15 +377,13 @@
               </template>
             </el-table-column>
             <el-table-column prop="remark" label="备注" width="300">
-              <template slot-scope="scope">
+              <template slot-scope="scope"> 
                 <el-input size="small" v-if="!flg" v-model="scope.row.remark"></el-input>
                 <span v-else>{{scope.row.remark}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="pic" label="报销单据" width="300">
               <template slot-scope="scope">
-                <!-- <el-input size="small" v-if="!flg" v-model="scope.row.remark"></el-input>
-                <span v-else>{{scope.row.remark}}</span> -->
                 <div v-if="!flg">
                   <div @click="abl(scope.$index)" style="height: 35px;overflow: hidden;">
                     <el-upload :class="!scope.row.pic ? 'upload-demo' : 'upload-demo icl'" :file-list="scope.row.pic" :before-remove="beforeRemoves" :http-request="fileonLoads" limit="1" name="multipartFile">
@@ -401,7 +399,7 @@
                     </viewer>
                     </div>
                   </span>
-                  <span v-else>暂无</span>    
+                  <span v-else>暂无单据</span>    
                 </div>
               </template>
             </el-table-column>
@@ -1084,7 +1082,7 @@ export default {
         // this.$refs.imgsa.click()
         // console.log(location.protocol, location.host)
         // console.log(location.protocol + '//' + location.host + imgs)
-      }
+      },
   },
 };
 </script>

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -26,7 +26,7 @@
         <div style="display: flex;width: 100%;">
             <div class="classification">
                 <div>
-                    <p :class="idx == 1 ? 'on' : ''" @click="switchs(1)">我负责的</p>
+                    <p :class="idx == 1 ? 'on' : ''" @click="switchs(1)">我执行的</p>
                     <p :class="idx == 2 ? 'on' : ''" @click="switchs(2)">我创建的</p>
                 </div>
             </div>
@@ -53,7 +53,7 @@
                             <el-link type="primary" :href="'#/projectInside/'+scope.row.projectId">{{scope.row.projectName}}</el-link>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="executorName" label="负责人" sortable width="200">
+                    <el-table-column prop="executorName" label="执行人" sortable width="200">
                         <template slot-scope="scope">
                             <el-link type="primary" @click="showUser(scope.row.executorId)">{{scope.row.executorName}}</el-link>
                         </template>