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

src/views/engineerFeeSettlement/costPerDimension/index.vue

@@ -398,6 +398,30 @@ export default {
           }
         },
         {
+          name: 'el-input',
+          md: 6,
+          attributes: {
+            disabled: this.formEdit
+          },
+          formItemAttributes: {
+            label: '旧机回收达标',
+            prop: 'recoveryAmount',
+            rules: this.formData.categoryType === 'INSTALL_HOME' ? [...required] : []
+          }
+        },
+        {
+          name: 'el-input',
+          md: 6,
+          attributes: {
+            disabled: this.formEdit
+          },
+          formItemAttributes: {
+            label: '其它',
+            prop: 'otherAmount',
+            rules: []
+          }
+        },
+        {
           md: 6,
           name: 'slot-component',
           formItemAttributes: {