重庆需求整改

src/views/cost/csotSettlement/component/finishAndDetails.vue

@@ -156,6 +156,7 @@ export default {
                 { t_prop: 'trimDay', t_label: '调整天数', t_slot: 't_ipt' },
                 { t_prop: 'realDays', t_label: '实际结算天数' },
                 { t_prop: 'realCosts', t_label: '实际结算金额（元）' },
+                { t_prop: 'remark', t_label: '领料申请备注' },
                 // { t_prop: '', t_label: '已入账金额（元）' },
                 // { t_prop: '', t_label: '本次结算金额（元）' },
             ],

src/views/cost/csotSettlement/component/other-cost.vue

@@ -7,6 +7,7 @@
             </el-col>
             <el-col :span="14" class="title">
                 其他费用
+              <span class="additional">(如需费用减免可输入负数)</span>
                 <el-button
                     type="text"
                     v-if="pageContent === '完工结算'"
@@ -149,7 +150,8 @@ export default {
                             this.activeIndexCostRemark = ''
                         }
                         const regex_2 =
-                            /^(?!\s*$)(?:(?:[1-9][0-9]{0,7}|100000000)(\.[0-9]{1,2})?|0(\.[0-9]{1,2})?)$/
+                            // /^(?!\s*$)(?:(?:[1-9][0-9]{0,7}|100000000)(\.[0-9]{1,2})?|0(\.[0-9]{1,2})?)$/
+                            /^(?!\s*$)(?:(?:-?[1-9][0-9]{0,7}|-?100000000)(\.[0-9]{1,2})?|0(\.[0-9]{1,2})?)$/
 
                         if (!regex_2.test(e.addCost)) {
                             this.$modal.msgError(
@@ -219,6 +221,12 @@ export default {
         letter-spacing: 4px;
     }
 }
+.additional{
+  font-size: 12px;
+  margin-right: 20px;
+  color: #7e7e7e;
+  letter-spacing: 1px;
+}
 
 ::v-deep .active {
     .el-input__inner:focus {