Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/collect/CollectOrderUpload.vue

@@ -2,8 +2,19 @@
   <div>
 
 
-    <el-tabs type="border-card" style="margin: 15px" @tab-click="handleTabClick">
-      <el-tab-pane label="未上传单" >
+    <el-tabs v-model="activeName" type="border-card" style="margin: 15px" @tab-click="handleTabClick">
+      <el-tab-pane label="上传失败" name="second3" >
+        <prescribePanel
+          ref="prescribePanel3"
+          style="margin: -15px"
+          :tagStatus="3"
+          :RowType="type"
+          :workPlaceCode="workPlaceCode"
+          :buttonType="3"
+          :status="3"
+        ></prescribePanel>
+      </el-tab-pane>
+      <el-tab-pane label="未上传单" name="second1" >
         <prescribePanel
           ref="prescribePanel1"
           style="margin: -15px"
@@ -14,7 +25,7 @@
           :status="1"
         ></prescribePanel>
       </el-tab-pane>
-      <el-tab-pane label="已上传单" name="second">
+      <el-tab-pane label="已上传单" name="second2">
         <prescribePanel
           ref="prescribePanel2"
           style="margin: -15px"
@@ -47,16 +58,26 @@ export default {
     return {
       type: 1,
       workPlaceCode: null,
+      activeName: 'second3'
+
     }
   },
   methods: {
-    handleTabClick(tab){
-      if (tab.name === 'second') {
+    handleTabClick(tab) {
+      if (tab.name === 'second1') {
+        if (this.$refs.prescribePanel1) {
+          this.$refs.prescribePanel1.getList();
+        }
+      } else if (tab.name === 'second2') {
         if (this.$refs.prescribePanel2) {
           this.$refs.prescribePanel2.getList();
         }
-      }else {
-        this.$refs.prescribePanel1.getList();
+
+      } else if (tab.name === 'second3') {
+        if (this.$refs.prescribePanel3) {
+          this.$refs.prescribePanel3.getList();
+        }
+
       }
     }
   },

src/views/collect/PanelOrderUpload.vue

@@ -594,7 +594,32 @@ export default {
     }
 
   },
-  created() {
+
+  // created() {
+  //   this.filterQuery.tagStatus = this.tagStatus
+  //   this.filterQuery.uploadStatus = String(this.status)
+  //   if (this.status == 2) {
+  //     this.filterQuery.uploadStatusName = '已上传'
+  //   }
+  //   if (this.$route.query.workplaceId != null) {
+  //     this.isLinkDisabled = true
+  //     this.filterQuery.workPlaceCode = this.$route.query.workplaceId
+  //     this.showType = 2
+  //   }
+  //   this.findWorkPlace(this, '')
+  //   getHead('prescribePanelUpload', '1').then((re) => {
+  //     // 处理返回的数据
+  //     this.tableObj = re.data
+  //     this.tableHeader = re.data.tableList
+  //     this.queryList = re.data.queryList
+  //     this.fromList = re.data.fromList
+  //     this.getList()
+  //
+  //   })
+  //
+  // }
+  // ,
+  mounted() {
     this.filterQuery.tagStatus = this.tagStatus
     this.filterQuery.uploadStatus = String(this.status)
     if (this.status == 2) {
@@ -615,8 +640,7 @@ export default {
       this.getList()
 
     })
-
-  }
+  },
 
 }
 </script>