Merge branch 'master' of http://222.71.165.188:3000/yunxi/ningxiaWeb

jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue

@@ -394,7 +394,6 @@ export default {
         this.zhipanData.staffsName = this.dataForm.staffsName
         this.zhipanData.orderClientStatusId = '520192868833300805' //待服务
         this.zhipanData.orderStaffsStatusId = '520192930493763909' //未到达
-        this.zhipanData.receiveTime = new Date()
         let _data = this.zhipanData
         console.log(_data)
         // console.log('--------------------');
@@ -413,6 +412,7 @@ export default {
             onClose: () => {
               this.detailVisible = true
               this.$emit('refresh', true)
+              this.$router.push('/recycleorder')
             }
           })
         }).catch(() => {
@@ -420,10 +420,9 @@ export default {
           // this.continueBtnLoading = false
         })
       } else {
-        // todo 
+        // console.log('请至少选择一个回收员');
-        console.log('请至少选择一个回收员');
+        alert('请至少选择一个回收员')
       }
-
     },
   },
 

jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue

@@ -182,7 +182,7 @@
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
-    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="initData()" />
     <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
       @close="toFormDetailVisible = false" />
     <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@@ -490,6 +490,7 @@ export default {
     },
     initData() {
       this.listLoading = true;
+      this.detailVisible = false;
       let _query = {
         ...this.listQuery,
         ...this.query,