1

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -100,6 +100,15 @@
           <ws-info-table>
             <div class="catNos" v-show="item.temporaryDriverFlag == 0">
               司机-{{ index + 1 }}
+              <span class="noservice" v-show="item.status == '未装车'">{{
+                  item.status
+                }}</span>
+                <span class="service" v-show="item.status == '已装车'">{{
+                  item.status
+                }}</span>
+                 <span class="serviced" v-show="item.status == '已送达'">{{
+                  item.status
+                }}</span>
             </div>
             <div
               class="catNos catNosCor"
@@ -186,6 +195,16 @@
                 size="small"
               />
             </ws-form-item>
+            <!--装车日期-->
+            <el-form-item label="装车日期:" span="1" prop="sendDateStart" >
+            <ws-date-picker
+              v-model="item.sendDateStart"
+              type="date"
+              style="width: 150px;"
+              placeholder="请选择日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <!-- slot-scope="scope" -->
@@ -244,6 +263,13 @@
       </div>
       <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+        <!--阶段状态-->
+         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+          未完货
+        </span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+          deptBudgetList.feedbackStatus
+        }}</span>
       </div>
       <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img width="22" height="22" src="../../../public/img/add.png" alt="" />
@@ -736,7 +762,7 @@ export default {
     margin-left: 10px;
     &/deep/.auditFlow-icon {
       width: auto;
-      padding-right: 30px;
+      padding-right: 5px;
     }
     &/deep/.auditFlow-main {
       position: absolute;
@@ -770,7 +796,7 @@ export default {
   padding-left: 30px;
 }
 .bg-right {
-  padding-right: 10px;
+  padding-right: 2px;
   text-align: right;
 }
 .bg-bottom {
@@ -1003,6 +1029,14 @@ export default {
   margin-top: 6px;
   left: 2px;
 }
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content{
   padding: 0px;
 }

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -101,6 +101,15 @@
           <ws-info-table>
             <div class="catNos" v-show="item.temporaryDriverFlag == 0">
               司机-{{ index + 1 }}
+               <span class="noservice" v-show="item.status == '未装车'">{{
+                  item.status
+                }}</span>
+                <span class="service" v-show="item.status == '已装车'">{{
+                  item.status
+                }}</span>
+                 <span class="serviced" v-show="item.status == '已送达'">{{
+                  item.status
+                }}</span>
             </div>
             <div
               class="catNos catNosCor"
@@ -125,6 +134,10 @@
             <ws-form-item label="装车净重(吨):" span="1" prop="loadNetWeight">
               {{ item.loadNetWeight }}
             </ws-form-item>
+             <!--装车日期-->
+            <el-form-item label="装车日期:" span="1" prop="sendDateStart" >
+              {{ item.sendDateStart }}
+          </el-form-item>
             <!--磅单-->
             <ws-form-item label="磅单:" span="1" prop="loadPoundImg">
               <template>
@@ -189,6 +202,13 @@
       </div>
       <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+         <!--阶段状态-->
+         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+          未完货
+        </span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+          deptBudgetList.feedbackStatus
+        }}</span>
       </div>
     </ws-form>
     <!-- 提交 -->
@@ -808,4 +828,12 @@ export default {
   color: #5473e8;
   line-height: 24px;
 }
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
 </style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -106,7 +106,7 @@
                     class="inExecution"
                   ></span>
                   <span
-                    v-if="scope.row.feedbackStatus == '已完成'"
+                    v-if="scope.row.feedbackStatus == '已完货'"
                     class="done"
                   ></span
                   >{{ scope.row.feedbackStatus }}
@@ -151,24 +151,17 @@
           <template slot-scope="scope">
             <template
               v-if="
-                scope.row.tranType == '汽运' &&
-                scope.row.feedbackStatus != '已完成'
+                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 == '已完成'
-              "
+              v-else
             >
               <div class="record1" @click="trainSee(scope.row)">查看</div>
             </template>
-            <template v-else>
-              <div class="record1">—— ——</div>
-            </template>
           </template>
         </el-table-column>
       </el-table>
@@ -230,7 +223,7 @@ export default {
       searchTypeOne: 1,
       taskTypeList: [
         { value: '执行中', type: 1 },
-        { value: '已完成', type: 2 },
+        { value: '已完货', type: 2 },
         { value: '全部任务', type: 3 },
       ],
       // 提交类型
@@ -370,10 +363,10 @@ export default {
     },
     editClick(row) {
       var feedbackStatus = ''
-      if (row.feedbackStatus == '待执行' || row.feedbackStatus == '已完成') {
+      if (row.feedbackStatus == '待执行' || row.feedbackStatus == '已完货') {
         feedbackStatus = '执行中'
       } else if (row.feedbackStatus == '执行中') {
-        feedbackStatus = '已完成'
+        feedbackStatus = '已完货'
       }
       //cancelButtonClass: "btn-custom-cancel"
       this.$confirm(`是否将状态改为${feedbackStatus}`, {