jsk

src/views/certificate/certificateManage/certificateInfo/index.vue

@@ -1085,7 +1085,7 @@
               })
             },
             openLog(row){
-              this.$router.push({ path: "/certificate/certificateManage/certificateLogList",query: {certificateInfoRowData:JSON.stringify(row)} });
+              this.$router.push({ path: "/certificate/certificateManage/certificateLogList",query:{certificateNo:row.certificateNo}});
             }
         }
     };

src/views/certificate/certificateManage/certificateInfo/logList.vue

@@ -122,7 +122,7 @@ export default {
     dicts: [],
     data() {
         return {
-            certificateInfoRowData:{},
+            certificateNo:"",
             // 遮罩层
             loading: false,
             // 选中数组
@@ -184,21 +184,19 @@ export default {
             },
         };
     },
-    created() {
+    mounted() {
-        if(this.$route.query.certificateInfoRowData){
+      console.log(this.$route.query.certificateNo)
-            this.certificateInfoRowData = JSON.parse(this.$route.query.certificateInfoRowData)
+      this.certificateNo = this.$route.query.certificateNo
-            console.log(this.certificateInfoRowData)
       this.getList()
-        }
       console.log(new Date(33000000))
     },
     watch:{
-        '$route.query.certificateInfoRowData':function(newId, oldId) {
+        '$route.query.certificateNo':function(newId, oldId) {
             if(newId){
-                this.certificateInfoRowData = JSON.parse(newId)
+                this.certificateNo = newId
                 this.getList()
             }else{
-                this.certificateInfoRowData={}
+                this.certificateNo=""
                 this.tableListData=[]
                 this.tableListData2=[]
             }
@@ -248,8 +246,10 @@ export default {
         },
         /** 查询列表 */
         getList() {
+          console.log(this.certificateNo)
             // this.loading = true;
             let param = {
+                "certificateNo":this.certificateNo,
                 "pageNum": this.queryParams.pageNum,
                 "pageSize": this.queryParams.pageSize,
             }
@@ -287,6 +287,7 @@ export default {
         getList2() {
             this.loading = true;
             let param = {
+                "certificateNo":this.certificateNo,
                 "pageNum": this.queryParams2.pageNum,
                 "pageSize": this.queryParams2.pageSize,
             }

src/views/certificate/certificateReturnManage/certificateAtake/index.vue

@@ -91,7 +91,7 @@
         <el-table-column label="签发日期" align="center" prop="issueDay" :show-overflow-tooltip="true"/>
         <el-table-column label="有效期至" align="center" prop="issueLifespan" :show-overflow-tooltip="true"/>
         <el-table-column label="设备编号" align="center" prop="deviceNo" :show-overflow-tooltip="true"/>
-        <el-table-column label="槽位编号" align="center" prop="soltNo" :show-overflow-tooltip="true"/>
+        <el-table-column label="槽位编号" align="center" prop="slotNo" :show-overflow-tooltip="true"/>
         <el-table-column label="当前状态" align="center" prop="stateName" :show-overflow-tooltip="true"/>
         <el-table-column label="是否电子标签" align="center" prop="isEleName" :show-overflow-tooltip="true"/>
       </el-table>
@@ -418,6 +418,14 @@
                 }
             },
             submitFormset: function() {
+                if(!this.baseForm.exitTime){
+                  this.$modal.msgError("请填写出入境时间");
+                  return;
+                }
+                if(!this.baseForm.entryTime){
+                   this.$modal.msgError("请填写出入境时间");
+                  return;
+                }
                 const params={"certificateNos":this.selectCertificateNos,"type":this.selectType,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
                 console.log("params",params);
                 getCertificateTakeAddPageApi(params).then(response => {
@@ -440,6 +448,18 @@
                 this.reset();
             },
             submitForm: function() {
+              if(!this.selectIdNumber){
+                this.$modal.msgError("请填写代领人信息");
+                return;
+              }
+              if(!this.baseForm.exitTime){
+                this.$modal.msgError("请填写出入境时间");
+                return;
+              }
+              if(!this.baseForm.entryTime){
+                 this.$modal.msgError("请填写出入境时间");
+                return;
+              }
                 const param={"certificateNos":this.selectCertificateNos,"type":this.selectType,"idNumber":this.selectIdNumber,"name":this.selectName,"exitTime":this.baseForm.exitTime,"entryTime":this.baseForm.entryTime};
                 console.log("param",param);
                 getCertificateTakeAddPageApi(param).then(response => {

src/views/certificate/certificateReturnManage/certificateTask/index.vue

@@ -91,7 +91,6 @@
         <!-- <el-table-column label="是否电子标签" align="center" prop="isEleName" :show-overflow-tooltip="true"/> -->
         <el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true"/>
         <el-table-column label="设备地址" align="center" prop="deviceAddr" :show-overflow-tooltip="true" width="150"/>
-        <el-table-column label="设备编号" align="center" prop="deviceNo" :show-overflow-tooltip="true"/>
         <el-table-column label="槽位编号" align="center" prop="slotNo" :show-overflow-tooltip="true"/>
         <!-- <el-table-column label="验证码" align="center" prop="verificationCode" :show-overflow-tooltip="true"></el-table-column> -->
         <el-table-column label="二维码" align="center" prop="verificationCode" :show-overflow-tooltip="true">