2022.7.27

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

@@ -209,24 +209,30 @@
         <!-- 合同金额修改记录 -->
         <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="90">
+                <el-table-column label="操作人" prop="name" min-width="70">
                     <template slot-scope="scope">
                         <!-- <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="180">
+                <el-table-column label="修改时间" prop="date" min-width="140">
                     <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>
+                        <!-- <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> -->
+                        <span>{{tempDateContract(scope.row.updateDate)}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="修改情况" prop="record" min-width="180">
+                <el-table-column label="原金额" prop="oldContractAmount" min-width="140">
+                    <template slot-scope="scope">
+                        <span>{{scope.row.oldContractAmount.toFixed(2)}} 元</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="修改情况" prop="record" min-width="140">
                     <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>
+                        <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="270"></el-table-column>
+                <el-table-column label="修改原因" prop="reason" min-width="210"></el-table-column>
             </el-table>
         </el-dialog>
 
@@ -563,6 +569,16 @@
                     return '-'
                 }
             },
+            tempDateContract(date){
+                let yyyy = date[0]
+                let mm = date[1] < 10 ? '0' + date[1] : date[1]
+                let dd = date[2] < 10 ? '0' + date[2] : date[2]
+                let dh = date[3] < 10 ? '0' + date[3] : date[3]
+                let dm = date[4] < 10 ? '0' + date[4] : date[4]
+                let ds = date[5] < 10 ? '0' + date[5] : date[5]
+                let datestr = yyyy + '-' + mm + '-' + dd + '\u3000' + dh + ':' + dm + ':' + ds
+                return datestr
+            },
             // 修改合同金额：参数
             //      oldContractAmount   原合同金额（看你要不要）
             //      contractAmount      修改后金额

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

@@ -380,7 +380,7 @@
                 <!-- 增加合同金额字段 -->
                         <span style="margin-left:63px;margin-right:10px;" v-if="user.company.packageProject==1">合同金额</span>
                         <el-input id="contractAmount" v-model="addForm.contractAmount" style="width:33%;"
-                        placeholder="整数" clearable  @keyup.native="restrictNumber('contractAmount')" ></el-input><span style="margin-left:10px;">元</span>
+                        placeholder="整数" clearable  @keyup.native="restrictNumber('contractAmount')" :disabled="true"></el-input><span style="margin-left:10px;">元</span>
                 <!-- 增加合同金额字段 -->
                 </el-form-item>
                 <el-form-item label="开始日期" prop="planStartDate"  >