Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/engineerFeeSettlement/costPerDimension/index.vue

@@ -375,7 +375,7 @@ export default {
           render: (h, { props, onInput }) => {
             return (
               <el-input
-                value={Number(this.formData.baseAmount) + Number(this.formData.materialAmount) + Number(this.formData.appraiseAmount)}
+                value={Number(this.formData.baseAmount||0) + Number(this.formData.materialAmount||0) + Number(this.formData.appraiseAmount||0)}
                 disabled={true}
                 size="mini"
                 placeholder="请输入"