2022.8.9 合同金额修改

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

@@ -103,9 +103,9 @@
           </el-select>
 
           <!-- 待审核筛选切换 -->
-          <el-radio-group v-model="stateKey" size="small" v-if="ins == 10" style="margin-left:10px;margin-top:-3.33px" @change="getAuditRateList">
-            <el-radio-button :label="0">部门待审核</el-radio-button>
+          <el-radio-group v-model="stateKey" size="small" v-if="ins == 10 && user.timeType.reportWorkflow == 1" style="margin-left:10px;margin-top:-3.33px" @change="getAuditRateList">
             <el-radio-button :label="1">项目待审核</el-radio-button>
+            <el-radio-button :label="0">部门待审核</el-radio-button>
           </el-radio-group>
           <!-- 项目阶段筛选 -->
           <el-select v-if="ins == 5" multiple v-model="stageNames" @visible-change="visibleSelcts" @clear="visibleSelcts(false)" clearable size="small" filterable collapse-tags placeholder="请选择阶段" style="margin-left:10px;">
@@ -781,7 +781,7 @@ export default {
       groupSize: 20,
       groupTotal: 0,
 
-      stateKey: 0,
+      stateKey: 1,
 
       outputValueList: [],
       outputValueTitle: []

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

@@ -249,31 +249,31 @@
 
         <!-- 合同金额修改记录 -->
         <el-dialog title="合同金额修改记录" v-if="contractRecordDialog" :visible.sync="contractRecordDialog" :close-on-click-modal="false" customClass="customWidth" width="1000px">
-            <el-table :data="contractRecordData" height="400px" :loading="contractRecordLoading">
-                <el-table-column label="操作人" prop="name" min-width="150">
+            <el-table :data="contractRecordData" height="500px" :loading="contractRecordLoading" :default-sort="{prop: 'date', order: 'descending'}">
+                <el-table-column label="操作人" prop="name" min-width="100">
                     <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="120">
                     <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>{{tempDateContract(scope.row.updateDate)}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="原金额" prop="oldContractAmount" min-width="180">
+                <el-table-column label="原金额" prop="oldContractAmount" min-width="120">
                     <template slot-scope="scope">
                         <span>{{scope.row.oldContractAmount.toFixed(2)}} 元</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="修改情况" prop="record" min-width="180">
+                <el-table-column label="修改情况" prop="record" min-width="120">
                     <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="300"></el-table-column>
+                <el-table-column label="修改原因" prop="reason" min-width="200"></el-table-column>
             </el-table>
         </el-dialog>
 

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

@@ -430,11 +430,20 @@
                         <el-option v-for="item in importanceList" :key="item.id" :label="item.label" :value="item.id"></el-option>
                     </el-select>
                 <!-- 增加合同金额字段 -->
-                        <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')" :disabled="title == '新增项目' ? false : true"></el-input><span style="margin-left:10px;">元</span>
+                        <!-- <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%;" @blur="contractAmountChange(addForm.contractAmount)"
+                        placeholder="整数" clearable  @keyup.native="restrictNumber('contractAmount')" :disabled="title == '新增项目' ? false : false"></el-input><span style="margin-left:10px;">元</span> -->
+                </el-form-item>
                 <!-- 增加合同金额字段 -->
+                <el-form-item  label="合同金额" v-if="user.company.packageProject==1">
+                    <el-input id="contractAmount" v-model="addForm.contractAmount" style="width:32%;" @input="contractAmountChange(addForm.contractAmount)" placeholder="整数" clearable  @keyup.native="restrictNumber('contractAmount')"></el-input><span style="margin-left:10px;position:absolute;">元</span>
+                    <template v-if="title == '修改项目'">
+                        <span style="margin-left:63px;margin-right:10px;">修改原因</span>
+                        <el-input v-model="addForm.changeContractReason" style="width:33%" clearable placeholder="合同金额修改原因" :disabled="!contractAmountReasonShow"></el-input>
+                    </template>
                 </el-form-item>
+
+
                 <el-form-item label="开始日期" prop="planStartDate"  >
                     <el-date-picker v-model="addForm.planStartDate" 
                      :editable="false" style="width:32%;" 
@@ -1135,6 +1144,8 @@ a {
                 levelList: [],  // 项目级别
                 departmentList: [],
                 deptId: [],
+                contractAmountOld: 0,
+                contractAmountReasonShow: false
             };
         },
         // 过滤器
@@ -2928,8 +2939,20 @@ a {
                 }
             },
 
+            // 合同金额发生改变，需弹出修改原因的输入框
+            contractAmountChange(value){
+                
+                if(this.contractAmountOld != value){
+                    this.contractAmountReasonShow = true
+                }else{
+                    this.contractAmountReasonShow = false
+                    this.addForm.changeContractReason = ''
+                }
+            },
+
             //显示新增界面
             handleAdd(i, item) {
+                this.contractAmountReasonShow = false
                 if(i == -1) {
                     this.title = "新增项目";
                     this.addForm = {
@@ -3020,8 +3043,10 @@ a {
                         projectMainId: item.projectMainId,
                         creatorId: item.creatorId,
                         outputValue: item.outputValue,
-                        deptId: array.reverse()
+                        deptId: array.reverse(),
+                        changeContractReason: ''
                     }
+                    this.contractAmountOld = item.contractAmount ? item.contractAmount : 0
                     console.log(this.addForm, '数据')
 
                     // 判断公司id是否等于936
@@ -3255,6 +3280,9 @@ a {
                         if(this.addForm.contractAmount != null) {
                             formData.append("contractAmount", this.addForm.contractAmount);
                         }
+                        if(this.contractAmountReasonShow){
+                            formData.append("changeContractReason", this.addForm.changeContractReason);
+                        }
                         if (this.projectBaseCostData != null) {
                             formData.append("projectBaseCostData", JSON.stringify(this.projectBaseCostData));
                             //计算总预算成本
@@ -3272,7 +3300,7 @@ a {
                             formData.append("chosenLeaders", JSON.stringify(this.chosenLeaders));
                         }
                         if (this.user.timeType.outputValueStatus == 1){
-                            formData.append("outputValue",this.addForm.outputValue)
+                            formData.append("outputValue",this.addForm.outputValue ? this.addForm.outputValue : 0)
                         }
                         var listId = []
                         var listName = []