2022.7.27

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

@@ -209,23 +209,24 @@
         <!-- 合同金额修改记录 -->
         <el-dialog title="合同金额修改记录" v-if="contractRecordDialog" :visible.sync="contractRecordDialog" :close-on-click-modal="false" customClass="customWidth" width="900px">
             <el-table :data="contractRecordData" height="400px" :loading="contractRecordLoading">
-                <el-table-column label="操作人" prop="name" min-width="60">
+                <el-table-column label="操作人" prop="name" min-width="90">
                     <template slot-scope="scope">
-                        <span>{{users.filter(item => item.id == scope.row.editUserId)[0].name}}</span>
+                        <!-- <span>{{users.filter(item => item.id == scope.row.editUserId)[0].name}}</span> -->
+                        <span>{{filterUserContract(scope.row.editUserId)}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="修改时间" prop="date" min-width="120">
+                <el-table-column label="修改时间" prop="date" min-width="180">
                     <template slot-scope="scope">
                         <span>{{scope.row.updateDate[0] + '-' + scope.row.updateDate[1] + '-' + scope.row.updateDate[2] + '\u3000' + scope.row.updateDate[3] + ':' + scope.row.updateDate[4] + ':' + scope.row.updateDate[5]}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="修改情况" prop="record" min-width="120">
+                <el-table-column label="修改情况" prop="record" min-width="180">
                     <template slot-scope="scope">
                         <span>{{scope.row.oldContractAmount - scope.row.newContractAmount > 0 ? '减少' : '增加'}}</span>
                         <span>{{scope.row.oldContractAmount - scope.row.newContractAmount > 0 ? (scope.row.oldContractAmount - scope.row.newContractAmount).toFixed(2) : (scope.row.newContractAmount - scope.row.oldContractAmount).toFixed(2)}}元</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="修改原因" prop="reason" min-width="180"></el-table-column>
+                <el-table-column label="修改原因" prop="reason" min-width="270"></el-table-column>
             </el-table>
         </el-dialog>
 
@@ -239,11 +240,14 @@
                 <el-form-item label="项目名称" prop="name">
                     <el-input v-model="addForm.name"  placeholder="请输入项目名称" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="项目描述" prop="name">
-                    <el-input type="textarea" :rows="2" v-model="addForm.projectDesc" maxlength="50" show-word-limit  placeholder="请输入项目描述" clearable></el-input>
+                <el-form-item label="项目描述" prop="projectDesc">
+                    <el-input type="textarea" :rows="2" v-model="addForm.projectDesc" maxlength="4000" show-word-limit  placeholder="请输入项目描述" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="级别" >
-                    <el-select v-model="addForm.level"  placeholder="请选择级别" style="width:32%;" >
+                    <el-select v-model="addForm.level"  placeholder="请选择级别" style="width:32%;" v-if="user.timeType.projectLevelState == 1">
+                        <el-option v-for="item in levelList" :key="item.id" :label="item.projectLevelName" :value="item.id"></el-option>
+                    </el-select>
+                    <el-select v-model="addForm.level"  placeholder="请选择级别" style="width:32%;" v-else>
                         <el-option v-for="item in importanceList" :key="item.id" :label="item.label" :value="item.id"></el-option>
                     </el-select>
                     <span style="margin-left:50px;margin-right:10px;">合同金额</span>
@@ -530,9 +534,8 @@
                 contractData: {},
                 contractRecordDialog: false,
                 contractRecordLoading: false,
-                contractRecordData: [
-                    {name:'张三',date:'2022-07-26',record:'1000.00 改为 2000.00',text:'测试'}
-                ]
+                contractRecordData: [],
+                levelList: []
             };
         },
         filters: {
@@ -552,6 +555,14 @@
             }
         },
         methods: {
+            filterUserContract(uid){
+                let user = this.users.filter(item => item.id == uid)
+                if(user.length > 0){
+                    return user[0].name
+                }else{
+                    return '-'
+                }
+            },
             // 修改合同金额：参数
             //      oldContractAmount   原合同金额（看你要不要）
             //      contractAmount      修改后金额
@@ -615,10 +626,11 @@
                 this.http.post('/contract-modify-record/list',{
                     projectId: this.project.id
                 },res => {
-                    this.contractRecordLoading = false
                     if(res.code == 'ok'){
                         this.contractRecordData = res.data
+                        this.contractRecordLoading = false
                     }else {
+                        this.contractRecordLoading = false
                         this.$message({
                             message: res.msg,
                             type: 'error'
@@ -708,7 +720,26 @@
                     }
                 }
             },
-            
+            getProjectLevel(){
+                this.http.post('/project-level/list', {},
+                res => {
+                    if (res.code == "ok") {
+                        this.levelList = res.data
+                        // this.$set(this, 'levelList', res.data)
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            },
             // 获取部门列表
             getDepartment() {
                 this.http.post("/department/listAllMemb", {},
@@ -1579,6 +1610,7 @@
             this.getProgressData();
             this.userssHu()
             this.yanjiuzx()
+            this.getProjectLevel()
         }
     };
 </script>