....

src/views/deviceAdmin/addOrUpdateUnit.vue

@@ -48,18 +48,19 @@
           required: true, message: '单元不能为空', trigger: 'blur'
         }">
         <el-input v-model="pigpenName.value" style="width: 127px; margin-right: 5px"></el-input>
-        <el-button @click.prevent="removePigpenName(pigpenName)" :disabled="form.id">删除</el-button>
+        <el-button @click.prevent="removePigpenName(pigpenName)" :disabled="form.id !== 0">删除</el-button>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button size="mini" plain @click="visible = false">取 消</el-button>
-      <el-button size="mini" type="warning" @click="addPigpenName" :disabled="form.id">新增域名</el-button>
+      <el-button size="mini" type="warning" @click="addPigpenName" :disabled="form.id !== 0">新增单元</el-button>
       <el-button size="mini" type="success" @click="onSubmit">确 定</el-button>
     </div>
   </el-dialog>
 </template>
 <script>
 import {mapState} from 'vuex'
+import utils from '../../utils/index';
 export default {
   data() {
     return {
@@ -157,7 +158,6 @@ export default {
           this.form.parentId = row.parentId
           this.form.stage = row.stage
           this.form.pigpenNames[0].value = row.pigpenName
-          console.log(this.form);
         }
       }).catch(() => {})
     },
@@ -174,7 +174,8 @@ export default {
               'stage': this.form.stage,
               'pigpenName': pigpenNames.join(','),
               'parentId': this.form.parentId,
-              'type': 2
+              'type': 2,
+              'creatTime': utils.timeDate(new Date().getTime())
             })
           }).then(({data}) => {
             if (data && data.code === 0) {

src/views/deviceAdmin/houseManage.vue

@@ -140,9 +140,9 @@ export default {
       pigpenList: [ // 猪舍List
       ],
       searchForm: {
-        registerTime: '',
+        registerTime: [],
         stage: '',
-        pigpenId: ''
+        pigpenName: ''
       },
       pageSize: 20, // 表格显示条数
       totalPages: 0, // 共 n 条数据
@@ -159,6 +159,10 @@ export default {
     ...mapState(['baseUrl'])
   },
   methods: {
+    // 清空条件查询的 el-form
+    resetForm(form) {
+      this.$refs[form].resetFields()
+    },
     // 初始化
     init() {
       this.$http({
@@ -167,7 +171,11 @@ export default {
         params: this.$http.adornParams({
           'page': this.pageIndex,
           'limit': this.pageSize,
-          'farmCode': '330703010000422'
+          'farmCode': '330703010000422',
+          'registerStartTime': this.searchForm.registerTime[0] || undefined,
+          'registerEndTime': this.searchForm.registerTime[1] || undefined,
+          'stage': this.searchForm.stage || undefined,
+          'pigpenName': this.searchForm.pigpenName || undefined
         }, false)
       }).then(({data}) => {
         if (data.code === 0) {