zhongtianhaoyuan 4 tahun lalu
induk
melakukan
bd335925d1

+ 2 - 1
src/api/V2/transport/index.js

@@ -45,4 +45,5 @@ export const API_GET_AUTOMOBILE_ARRANGE = "/driverViewInfo/selectDriverDetail"
 export const API_POST_AUTOMOBILE_FEEDBACK = '/tranProcessInfo/api/insertTranCar'
 //更改反馈状态
 export const API_POST_AUTOMOBILE_STATE = '/tranProcessInfo/api/editFeedbackStatus'
-
+//状态
+export const API_POST_AUTOMOBILE_ALSOSTATE = '/tranProcessInfo/editStatus'

+ 3 - 0
src/model/transport/index.js

@@ -26,6 +26,7 @@ import {
     API_GET_AUTOMOBILE_NAME,
     API_POST_AUTOMOBILE_FEEDBACK,
     API_POST_AUTOMOBILE_STATE,
+    API_POST_AUTOMOBILE_ALSOSTATE
 
 } from '@/api/V2/transport'
 // 司机列表
@@ -74,4 +75,6 @@ export const arrange = appRx.get(API_GET_AUTOMOBILE_ARRANGE, errorCatcher, error
 export const feedback = appRx.post(API_POST_AUTOMOBILE_FEEDBACK, errorCatcher, errorHandle, filter)
 //更改反馈状态
 export const state = appRx.post(API_POST_AUTOMOBILE_STATE, errorCatcher, errorHandle, filter)
+//状态
+export const alsostate = appRx.post(API_POST_AUTOMOBILE_ALSOSTATE, errorCatcher, errorHandle, filter)
 

+ 54 - 17
src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -140,16 +140,17 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="trainSee(scope.row)">
-              查看
-            </ws-button>
-            <ws-button
-              class="putstorage"
+            <div class="record" @click="trainSee(scope.row)">查看</div>
+            <div
+              class="adjustment"
               @click="feedback(scope.row)"
-              v-show="scope.row.tranType == '汽运' && scope.row.feedbackStatus != '已完成'"
+              v-show="
+                scope.row.tranType == '汽运' &&
+                scope.row.feedbackStatus != '已完成'
+              "
             >
               反馈
-            </ws-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -272,13 +273,13 @@ export default {
       //       id: row.id,
       //     },
       //   })
-      // }  
-       this.$router.push({
-          path: 'tranManagementTransporFeedbackLook',
-          query: {
-            id: row.id,
-          },
-        })
+      // }
+      this.$router.push({
+        path: 'tranManagementTransporFeedbackLook',
+        query: {
+          id: row.id,
+        },
+      })
     },
     //反馈
     feedback(row) {
@@ -418,10 +419,46 @@ export default {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
+
+//操作按钮
+.record,
+.adjustment {
+  display: inline-block;
   color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+//状态样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
 }
 .putstorage.el-button--default,
 .deliverystorage.el-button--default {

+ 51 - 9
src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -132,12 +132,19 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="trainSee(scope.row)">
+             <div
+              class="record"
+              @click="trainSee(scope.row)"
+              
+            >
               查看
-            </ws-button>
-            <ws-button class="putstorage" @click="trainNumber(scope.row)">
+            </div>
+             <div
+              class="adjustment"
+              @click="trainNumber(scope.row)"
+            >
               车次
-            </ws-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -145,7 +152,7 @@
   </div>
 </template>
 <script>
-import { automobileList } from '@/model/transport/index'
+import { automobileList ,alsostate} from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -324,7 +331,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          editstatus({ id: row.id })
+         alsostate({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -413,10 +420,45 @@ export default {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
+//操作按钮
+.record,
+.adjustment {
+  display: inline-block;
   color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+//状态样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
 }
 .putstorage.el-button--default,
 .deliverystorage.el-button--default {

+ 52 - 16
src/views/tranManagement/tranManagementVehicle.vue

@@ -127,26 +127,27 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="nocomplete(scope.row)">
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              
+            >
               查看
-            </ws-button>
-            <ws-button class="putstorage" @click="warehousing(scope.row)">
-              派车
-            </ws-button>
+            </div>
+            <div
+              class="adjustment"
+              @click="warehousing(scope.row)"
+            >
+                派车
+            </div>
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="address" label="操作" width="200">
-          <template slot-scope="scope">
-            <div class="record" @click="record(scope.row)">记录</div>
-            <div class="adjustment" @click="loss(scope.row)">盘损</div>
-          </template>
-        </el-table-column> -->
       </el-table>
     </div>
   </div>
 </template>
 <script>
-import { automobileList } from '@/model/transport/index'
+import { automobileList,alsostate } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -339,7 +340,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          editstatus({ id: row.id })
+          alsostate({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -451,10 +452,45 @@ export default {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
+//操作按钮
+.record,
+.adjustment {
+  display: inline-block;
   color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+//状态样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
 }
 .putstorage.el-button--default,
 .deliverystorage.el-button--default {