merge fix

src/views/home/component/owner_serach.vue

@@ -187,11 +187,15 @@ export default {
       totalAmount: [
         {
           name: '5000万以下',
-          value: '5000,0' // 0 max 1 min
+          value: '0,4999' // 0 max 1 min
         },
         {
-          name: '5000万以上',
-          value: '50001,""'
+          name: '5000-9999万',
+          value: '5000,9999'
+        },
+        {
+          name: '1 亿以上',
+          value: '10000,-'
         }
       ],
       start: [
@@ -266,8 +270,9 @@ export default {
     },
     changeAmount () {
       const tmps = this.form.amount.split(',')
-      this.form.totalAmountMax = tmps[0]
-      this.form.totalAmountMin = tmps[1]
+      console.log(tmps)
+      this.form.totalAmountMin = tmps[0] === '-' ? '' : tmps[0]
+      this.form.totalAmountMax = tmps[1] === '-' ? '' : tmps[1]
     },
     getOrg () {
       const parentId = [1, 2].includes(this.user.info.viewStage) ? this.user.info.parentDeptId : this.user.info.deptId

src/views/home/component/params/params1.vue

@@ -5,7 +5,6 @@
       <el-button type='primary' @click='disabled = !disabled'>{{ disabled ? '编 辑' : '保 存' }}</el-button>
     </div>
     <div class='mt-10' style='width: 80%;'>
-      {{ form }}
       <el-form
           v-if='form'
           :model="form"
@@ -83,10 +82,10 @@
         </div>
         <div class='full-width  flex'>
           <el-form-item label="是否入库" style='flex:1'>
-            <el-input v-model="form.name"/>
+            <el-input v-model="form.isStorage"/>
           </el-form-item>
           <el-form-item label="是否开工" style='flex:1' class='ml-20'>
-            <el-input v-model="form.region"/>
+            <el-input v-model="form.isActualCommencement"/>
           </el-form-item>
         </div>
         <div class='full-width  flex'>
@@ -131,6 +130,14 @@ export default {
         this.form = val
       },
       immediate: true
+    },
+    disabled: {
+      handler (val) {
+        if (val) {
+          this.updata()
+        }
+      },
+      immediate: false
     }
   },
   data () {
@@ -138,6 +145,17 @@ export default {
       disabled: true,
       form: {}
     }
+  },
+  methods: {
+    updata () {
+      this.$api.project.proUpdate(this.detail).then(res => {
+        if (res.code === 200) {
+          this.$message.success(res.msg)
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    }
   }
 }
 </script>