huangfuli 3 years ago
parent
commit
b205f46127

+ 18 - 10
src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -154,17 +154,11 @@
         </el-table-column>
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
           <template slot-scope="scope">
-            <template
-              v-if="
-                scope.row.receivingStatus != '已完货'
-              "
-            >
+            <template v-if="scope.row.receivingStatus != '已完货'">
               <div class="record" @click="trainSee(scope.row)">查看</div>
               <div class="record" @click="trainSee(scope.row)">查看</div>
               <div class="adjustment" @click="feedback(scope.row)">反馈</div>
               <div class="adjustment" @click="feedback(scope.row)">反馈</div>
             </template>
             </template>
-            <template
-              v-else
-            >
+            <template v-else>
               <div class="record1" @click="trainSee(scope.row)">查看</div>
               <div class="record1" @click="trainSee(scope.row)">查看</div>
             </template>
             </template>
           </template>
           </template>
@@ -341,6 +335,13 @@ export default {
             id: row.id,
             id: row.id,
           },
           },
         })
         })
+      } else if (row.tranType == '船运') {
+        this.$router.push({
+          path: 'tranManagementUnShippingFeedbackLook',
+          query: {
+            id: row.id,
+          },
+        })
       }
       }
       if (row.tranType == '火运') {
       if (row.tranType == '火运') {
         this.$router.push({
         this.$router.push({
@@ -369,6 +370,13 @@ export default {
           id: row.id,
           id: row.id,
         },
         },
       })
       })
+      } else if (row.tranType == '船运') {
+        this.$router.push({
+          path: 'tranManagementUnShippingFeedback',
+          query: {
+            id: row.id,
+          },
+        })
       }
       }
     },
     },
     dateFormat(fmt, date) {
     dateFormat(fmt, date) {
@@ -484,9 +492,9 @@ export default {
           this.startDate = ''
           this.startDate = ''
           this.endDate = ''
           this.endDate = ''
         }
         }
-      }else{
+      } else {
         this.startDate = ''
         this.startDate = ''
-          this.endDate = ''
+        this.endDate = ''
       }
       }
       this.currentPage = 1
       this.currentPage = 1
       this.getList()
       this.getList()

+ 15 - 1
src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -271,7 +271,7 @@ export default {
         // }
         // }
       })
       })
     },
     },
-    //查看火运调度详细
+    //查看
     trainSee(row) {
     trainSee(row) {
       if (row.tranType == '汽运') {
       if (row.tranType == '汽运') {
         this.$router.push({
         this.$router.push({
@@ -287,6 +287,13 @@ export default {
             id: row.id,
             id: row.id,
           },
           },
         })
         })
+      } else if (row.tranType == '船运') {
+        this.$router.push({
+          path: 'tranManagementShippingFeedbackLook',
+          query: {
+            id: row.id,
+          },
+        })
       }
       }
     },
     },
     //反馈
     //反馈
@@ -305,6 +312,13 @@ export default {
             id: row.id,
             id: row.id,
           },
           },
         })
         })
+      } else if (row.tranType == '船运') {
+        this.$router.push({
+          path: 'tranManagementShippingFeedback',
+          query: {
+            id: row.id,
+          },
+        })
       }
       }
     },
     },
     // statusquery(status) {
     // statusquery(status) {