Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -150,16 +150,24 @@
       </el-table-column>
       <el-table-column class="table_td" label="接单时间" prop="createDate">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
-            <template slot-scope="scope">
-            <div class="record" @click="trainSee(scope.row)">
-              查看
-            </div>
-            <div class="adjustment" @click="feedback(scope.row)"
-              v-show="scope.row.tranType == '汽运'"
-            >
-              反馈
-            </div>
+     <el-table-column prop="seller" label="操作" width="300">
+          <template  slot-scope="scope">
+              <template v-if="
+                scope.row.tranType == '汽运' &&
+                scope.row.feedbackStatus != '已完成'
+              ">
+                <div class="record" @click="trainSee(scope.row)">查看</div>
+                <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+              </template>
+              <template v-else-if="
+                scope.row.tranType == '汽运' &&
+                scope.row.feedbackStatus == '已完成'
+              ">
+                <div class="record1" @click="trainSee(scope.row)">查看</div>
+              </template>
+               <template v-else>
+                <div class="record1">—— ——</div>
+              </template>
           </template>
         </el-table-column>
       </el-table>
@@ -515,12 +523,13 @@ export default {
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
 }
-.record,
+.record,.record1,
 .adjustment {
   display: inline-block;
   color: #5878e8;
   padding: 0 4px !important;
   position: relative;
+  font-size: 14px;
 }
 .record:after {
   position: absolute;
@@ -567,13 +576,13 @@ export default {
 .done {
   background: #50cad4;
 }
-.record, .adjustment {
-    display: inline-block;
-    color: #5878e8;
-    padding: 0 4px !important;
-    position: relative;
-    font-size: 14px;
-}
+// .record, .adjustment {
+//     display: inline-block;
+//     color: #5878e8;
+//     padding: 0 4px !important;
+//     position: relative;
+//     font-size: 14px;
+// }
 /deep/.el-pagination {
     text-align: center;
     white-space: nowrap;

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -161,9 +161,15 @@
                 <div class="record" @click="trainSee(scope.row)">查看</div>
                 <div class="adjustment" @click="feedback(scope.row)">反馈</div>
               </template>
-              <template v-else>
+              <template v-else-if="
+                scope.row.tranType == '汽运' &&
+                scope.row.feedbackStatus == '已完成'
+              ">
                 <div class="record1" @click="trainSee(scope.row)">查看</div>
               </template>
+               <template v-else>
+                <div class="record1">—— ——</div>
+              </template>
           </template>
         </el-table-column>
       </el-table>
@@ -281,12 +287,14 @@ export default {
     },
     //查看火运调度详细
     trainSee(row) {
-      this.$router.push({
-        path: 'tranManagementTransporFeedbackLook',
-        query: {
-          id: row.id,
-        },
-      })
+            if (row.tranType == '汽运') {
+        this.$router.push({
+          path: 'tranManagementReceivingloadingLook',
+          query: {
+            id: row.id,
+          },
+        })
+      } 
     },
     //反馈
     feedback(row) {