2022.3.24完成

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

@@ -36,7 +36,7 @@
                 </el-form-item>
                 <!-- 分类条目 -->
                 <el-form-item style="float:right;"  v-if="user.company.packageProject == 1 && (user.role == 1||user.role == 2||user.role == 5)">
-                    <el-link type="primary" :underline="false" @click="showClfDialog = true">分类</el-link>
+                    <el-link type="primary" :underline="false" @click="showClfDialog = true">分类管理</el-link>
                 </el-form-item>
                 <!-- 项目成本基线条目 -->
                 <el-form-item style="float:right;"  v-if="user.company.packageProject == 1 && (user.role == 1||user.role == 2||user.role == 5)">
@@ -426,7 +426,7 @@
             </div>
         </el-dialog>
         <!-- 分类条目配置 -->
-        <el-dialog title="分类条目配置" show-header="false" v-if="showClfDialog" :visible.sync="showClfDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
+        <el-dialog title="项目分类条目管理" show-header="false" v-if="showClfDialog" :visible.sync="showClfDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-table :data="baseClfList" highlight-current-row  height="400" style="width: 100%;">
             <el-table-column type="index" width="60" label="序号">
                 <template slot-scope="scope" >
@@ -444,13 +444,13 @@
             </el-table>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="showClfDialog = false" >关闭</el-button>
-                <el-button type="primary" @click="addNewClf()" >新增成本项</el-button>
+                <el-button type="primary" @click="addNewClf()" >新增分类项</el-button>
             </div>
         </el-dialog>
         <!-- 新增/编辑 分类条目 -->
         <el-dialog title="新增/修改分类条目" v-if="addClfDialog" :visible.sync="addClfDialog" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-form ref="form2" :model="addClf" :rules="rules" label-width="100px">
-                <el-form-item label="成本项名称" prop="name">
+                <el-form-item label="分类名称" prop="name">
                     <el-input v-model="addClf.name" placeholder="请输入名称" clearable></el-input>
                 </el-form-item>
             </el-form>

fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -26,7 +26,7 @@
       </div>
       <div class="head_select">
         <span>{{(this.radio1 == "按人员查看" ? "人员" : "项目")}}</span>
-      <el-select v-model="valuex" placeholder="请选择" size="small" style="margin-left:9px;width:200px" @change="optupdata()">
+      <el-select clearable v-model="valuex" placeholder="请选择" size="small" style="margin-left:9px;width:200px" @change="optupdata()">
         <el-option
           v-for="item in screenList"
           :key="item.id"
@@ -91,6 +91,7 @@ export default {
       },
       // 人员/项目切换
       selChange(){
+        this.valuex = null
         console.log("切换按钮");
         if (this.radio1 == "按人员查看") {
           this.reqpar1 = 0
@@ -108,7 +109,6 @@ export default {
           // this.isDataLoaded = false
         }
         // console.log(this.valuex1);
-        this.valuex = ''
         
         
       },