修改了脖环bug

src/views/deviceManagement/neckRing/index.vue

@@ -41,10 +41,10 @@
               <a @click="clickQuantity(row)" style="text-decoration: underline;color: #0000FF;">{{row.count}}</a>
             </template>
           </el-table-column>
-          <el-table-column label="类型" min-width="60px" align="center" prop="genre">
+          <el-table-column label="类型" min-width="60px" align="center">
             <template slot-scope="{row}">
               <span v-if="row.genre == 0">售卖</span>
-              <span v-if="row.genre == 1">返厂</span>
+              <span v-else-if="row.genre == 1">返厂</span>
               <span v-else>置换</span>
             </template>
           </el-table-column>

src/views/deviceManagement/receiver/index.vue

@@ -32,7 +32,7 @@
               <span v-else>1</span>
             </template>
           </el-table-column>
-          <el-table-column label="接收器ID" min-width="60px" align="center" prop="id" />
+          <el-table-column label="接收器ID" min-width="60px" align="center" prop="card" />
           <el-table-column label="接收器编号" min-width="60px" align="center" prop="code" />
           <el-table-column label="牧场名称" min-width="60px" align="center" prop="pasturename" />
           <el-table-column label="牧场编号" min-width="60px" align="center" prop="pasturecode" />
@@ -324,6 +324,7 @@
                 this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
                 this.edit.dialogFormVisible = false
                 this.getList1()
+                this.getSimCardList()
               }else{
                 this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
               }

src/views/deviceManagement/simCard/index.vue

@@ -286,16 +286,39 @@
         }, 3000)
         this.$refs['temp'].validate(valid => {
           if (valid) {
-            console.log(this.edit.temp,'this.edit.temp')
+            let purchasedate = ''
+            if(this.edit.temp.purchasedate !== ''){
+              purchasedate =parseTime(this.edit.temp.purchasedate, '{y}-{m}-{d}')
+            }else{
+              purchasedate = ''
+            }
+            let activatedate = ''
+            if(this.edit.temp.activatedate !== ''){
+              activatedate =parseTime(this.edit.temp.activatedate, '{y}-{m}-{d}')
+            }else{
+              activatedate = ''
+            }
+            let topupdate = ''
+            if(this.edit.temp.topupdate !== ''){
+              topupdate =parseTime(this.edit.temp.topupdate, '{y}-{m}-{d} {h}:{i}:{s}')
+            }else{
+              topupdate = ''
+            }
+            let enddate = ''
+            if(this.edit.temp.enddate !== ''){
+              enddate = parseTime(this.edit.temp.enddate, '{y}-{m}-{d}')
+            }else{
+              enddate = ''
+            }
             let data = {
               status:this.edit.temp.status,
               card:this.edit.temp.card,
               company:this.edit.temp.company,
               barid:this.edit.temp.barid,
-              purchasedate:parseTime(this.edit.temp.purchasedate, '{y}-{m}-{d}'),
-              activatedate:parseTime(this.edit.temp.activatedate, '{y}-{m}-{d}'),
-              topupdate:parseTime(this.edit.temp.topupdate, '{y}-{m}-{d} {h}:{i}:{s}'),
-              enddate:parseTime(this.edit.temp.enddate, '{y}-{m}-{d}'),
+              purchasedate:purchasedate,
+              activatedate:activatedate,
+              topupdate:topupdate,
+              enddate:enddate,
               receiverid:this.edit.temp.receiverid
             }
             let url = 'sim/add'
@@ -329,15 +352,39 @@
         this.$refs['temp'].validate(valid => {
           if (valid) {
             console.log(this.edit.temp,'this.edit.temp')
+            let purchasedate = ''
+            if(this.edit.temp.purchasedate !== ''){
+              purchasedate =parseTime(this.edit.temp.purchasedate, '{y}-{m}-{d}')
+            }else{
+              purchasedate = ''
+            }
+            let activatedate = ''
+            if(this.edit.temp.activatedate !== ''){
+              activatedate =parseTime(this.edit.temp.activatedate, '{y}-{m}-{d}')
+            }else{
+              activatedate = ''
+            }
+            let topupdate = ''
+            if(this.edit.temp.topupdate !== ''){
+              topupdate =parseTime(this.edit.temp.topupdate, '{y}-{m}-{d} {h}:{i}:{s}')
+            }else{
+              topupdate = ''
+            }
+            let enddate = ''
+            if(this.edit.temp.enddate !== ''){
+              enddate = parseTime(this.edit.temp.enddate, '{y}-{m}-{d}')
+            }else{
+              enddate = ''
+            }
             let data = {
               status:this.edit.temp.status,
               card:this.edit.temp.card,
               barid:this.edit.temp.barid,
               company:this.edit.temp.company,
-              purchasedate:parseTime(this.edit.temp.purchasedate, '{y}-{m}-{d}'),
-              activatedate:parseTime(this.edit.temp.activatedate, '{y}-{m}-{d}'),
-              topupdate:parseTime(this.edit.temp.topupdate, '{y}-{m}-{d} {h}:{i}:{s}'),
-              enddate:parseTime(this.edit.temp.enddate, '{y}-{m}-{d}'),
+              purchasedate:purchasedate,
+              activatedate:activatedate,
+              topupdate:topupdate,
+              enddate:enddate,
               receiverid:this.edit.temp.receiverid,
               id:this.edit.temp.id,
             }