Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

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'

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)
 

src/views/contractManagement/salesContract.vue

@@ -8,9 +8,6 @@
         <ws-button
           type="primary"
           @click="handleAdd()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
           ><img
             width="13"
             height="13"
@@ -72,9 +69,6 @@
           class="find"
           type="primary"
           @click="find()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
           ><img
             width="16"
             height="16"

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -877,16 +877,11 @@ export default {
   border-top: 0px;
 }
 .ws-info-table .el-form-item .el-form-item__content {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+border: none;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+ border: none;
+ height: 50px;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
@@ -932,6 +927,7 @@ export default {
   background: #F6F7FC;
 border-radius: 4px;
 border: 1px solid #D8DCE6;
+margin-top: 20px;
 }
 .catNos{
   width: 100%;

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -707,16 +707,11 @@ export default {
   border-top: 0px;
 }
 .ws-info-table .el-form-item .el-form-item__content {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+border: none;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+border: none;
+height: 50px;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
@@ -762,6 +757,7 @@ export default {
   background: #F6F7FC;
 border-radius: 4px;
 border: 1px solid #D8DCE6;
+margin-top: 20px;
 }
 .catNos{
   width: 100%;
@@ -773,4 +769,5 @@ border: 1px solid #D8DCE6;
 .catNosCor{
   color: #5473E8;
 }
+
 </style>

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 {

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 {

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -653,17 +653,10 @@ export default {
   border-left: 0px;
   border-top: 0px;
 }
-.ws-info-table .el-form-item .el-form-item__content {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
-}
+
 /deep/.ws-info-table .el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+  border: none;
+  height: 50px;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
@@ -718,4 +711,5 @@ border: 0px solid #D8DCE6;
   border-bottom: none;
   border-top: none;
 }
+
 </style>

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -28,7 +28,7 @@
       :rules="rules"
       :model="deptBudgetList"
     >
-      <div class="small-title" style="font-size: 16px;">任务详情</div>
+      <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
         <ws-form-item label="任务编号" span="1" prop="processNo">
@@ -88,7 +88,7 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
       </ws-info-table>
-      <div class="small-title" style="font-size: 16px;">联络员及车皮信息</div>
+      <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div
         class="liaison"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
@@ -161,14 +161,14 @@
             </ws-select>
           </ws-form-item>
         </ws-info-table>
-        <ws-info-table>
+         <ws-info-table>
           <div
             style="width: 100%"
-            class="flex position "
+            class="flex position carnum"
             v-for="(item1, index) in freightspace"
             :key="index"
           >
-            <!--车厢号-->
+          <!--车厢号-->
             <ws-form-item
               :label="'车厢号-' + (index + 1)"
               span="1"
@@ -191,9 +191,9 @@
               >
             </ws-form-item>
           </div>
-        </ws-info-table>
-        
+        </ws-info-table> 
       </div>
+      
       <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img
           width="22"
@@ -752,7 +752,7 @@ export default {
 }
 
 .center {
-  width: 900px;
+  width: 90%;
   margin: 0 auto;
 }
 .el-form-item {
@@ -856,10 +856,8 @@ export default {
   border-top: 0px;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+  border: none;
+  height: 50px;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
@@ -899,10 +897,11 @@ export default {
   border: 0px solid #d8dce6;
   background: #f5f7fa;
 }
-/deep/.liaison .flex {
-  display: contents;
-}
+// /deep/.liaison .flex {
+//   display: contents;
+// }
 /deep/.liaison {
+  display: contents;
   background: #f5f7fa;
   border-radius: 4px;
   border: 0px solid #d8dce6;
@@ -930,8 +929,14 @@ export default {
   height: 20px;
   line-height: 18px;
 }
-/deep/.carNos{
-  margin-top: 20px;
+/deep/.carnum {
+     display: contents;
+}
+/deep/.carnum .ws-info-table .el-form-item {
+  width: 20%;
+}
+/deep/.liaison .carnum .ws-info-table .el-form-item {
+  border-radius: 10px;
+right: 20px;
 }
-
 </style>

src/views/tranManagement/tranManagementVehicle.vue

@@ -128,26 +128,27 @@
         <el-table-column prop="receivingDate" label="接单时间"> </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'
@@ -340,7 +341,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          editstatus({ id: row.id })
+          alsostate({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -452,10 +453,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 {

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -24,27 +24,15 @@
     <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
         <div class="basicInformation">
-          <h2>任务编号</h2>
+          <div class="small-title" style="font-size: 16px">任务详情</div>
           <ws-info-table>
             <!-- 任务编号 -->
             <ws-form-item label="任务编号" span="1" prop="processNo">
-              <ws-input
-                :disabled="readonly"
-                v-model="deptBudgetList.processNo"
-                placeholder="请输入任务编号"
-                maxlength="20"
-                size="small"
-              />
+              {{ deptBudgetList.processNo }}
             </ws-form-item>
             <!-- 货名 -->
             <ws-form-item label="货名" span="1">
-              <ws-input
-                :disabled="readonly"
-                v-model="deptBudgetList.goodsName"
-                placeholder="请输入货名"
-                maxlength="20"
-                size="small"
-              />
+              {{ deptBudgetList.goodsName }}
             </ws-form-item>
             <!--重量（吨）-->
             <ws-form-item
@@ -53,13 +41,7 @@
               prop="tare"
               class="readonly"
             >
-              <ws-input
-                :disabled="readonly"
-                v-model="deptBudgetList.weight"
-                placeholder="请输入重重"
-                maxlength="100"
-                size="small"
-              />
+              {{ deptBudgetList.weight }}
             </ws-form-item>
 
             <!--发货地址-->
@@ -70,24 +52,12 @@
             </ws-form-item>
             <!--发货人-->
             <ws-form-item label="发货人" span="1" prop="agent">
-              <ws-input
-                :disabled="readonly"
-                v-model="deptBudgetList.sender"
-                placeholder="请输入发货人姓名"
-                maxlength="100"
-                size="small"
-              />
+              {{ deptBudgetList.sender }}
             </ws-form-item>
 
             <!--发货人电话-->
             <ws-form-item label="发货人电话" span="1" prop="agent">
-              <ws-input
-                :disabled="readonly"
-                v-model="deptBudgetList.senderPhone"
-                placeholder="请输入发货人电话"
-                maxlength="100"
-                size="small"
-              />
+              {{ deptBudgetList.senderPhone }}
             </ws-form-item>
             <!--收货地址-->
             <ws-form-item label="收货地址" span="1" prop="netWeight">
@@ -97,24 +67,12 @@
             </ws-form-item>
             <!--收货人-->
             <ws-form-item label="收货人" span="1" prop="receiver">
-              <ws-input
-                :disabled="readonly"
-                v-model="deptBudgetList.receiver"
-                placeholder="请输入收货人"
-                maxlength="100"
-                size="small"
-              />
+              {{ deptBudgetList.receiver }}
             </ws-form-item>
 
             <!--收货人电话-->
             <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-              <ws-input
-                :disabled="readonly"
-                v-model="deptBudgetList.receiverPhone"
-                placeholder="请输入收货人电话"
-                maxlength="100"
-                size="small"
-              />
+              {{ deptBudgetList.receiverPhone }}
             </ws-form-item>
             <!--发货日期-->
             <ws-form-item
@@ -136,32 +94,35 @@
             </ws-form-item>
             <!--合同编号-->
             <ws-form-item label="合同编号" span="1" prop="contractNo">
-              <ws-input
-                :disabled="readonly"
-                v-model="deptBudgetList.contractNo"
-                placeholder="请输入合同编号"
-                maxlength="100"
-                size="small"
-              />
+              {{ deptBudgetList.contractNo }}
             </ws-form-item>
           </ws-info-table>
 
-          <div class="small-title">派车</div>
+          <div class="small-title" style="font-size: 16px">派车</div>
 
           <div
-            class="driver position"
+            class="driver position liaison"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
           >
             <ws-info-table>
+              <div class="catNos">
+                司机-{{ index + 1 }}
+                <span class="noservice" v-show="item.status == '未送达'">{{
+                  item.status
+                }}</span>
+                <span class="service" v-show="item.status == '已送达'">{{
+                  item.status
+                }}</span>
+              </div>
               <!--司机-->
               <ws-form-item
-                :label="'司机-' + (index + 1)"
+                label="姓名："
                 span="1"
                 prop="driverName"
                 class="siji"
               >
                 <el-select
-                  :disabled="item.disabled"
+                  v-show="!item.temporaryDriverFlag"
                   v-model="item.driver"
                   placeholder="请选择司机"
                   class="typeselect"
@@ -178,16 +139,23 @@
                     :value="items.driverName"
                   />
                 </el-select>
+                <span
+                  v-show="
+                    item.temporaryDriverFlag == 0 ||
+                    item.temporaryDriverFlag == 1
+                  "
+                  >{{ item.driver }}</span
+                >
               </ws-form-item>
               <!--司机电话-->
               <ws-form-item
-                label="司机电话"
+                label="司机电话："
                 span="1"
                 prop="impurity"
                 class="siji"
               >
                 <el-select
-                  :disabled="item.disabled"
+                  v-show="!item.temporaryDriverFlag"
                   v-model="item.driverPhone"
                   placeholder="请选择司机电话"
                   class="typeselect"
@@ -204,9 +172,16 @@
                     :value="items.driverPhone"
                   />
                 </el-select>
+                <span
+                  v-show="
+                    item.temporaryDriverFlag == 0 ||
+                    item.temporaryDriverFlag == 1
+                  "
+                  >{{ item.driverPhone }}</span
+                >
               </ws-form-item>
               <!--车牌号-->
-              <ws-form-item label="车牌号" span="1" prop="carNo" class="siji">
+              <ws-form-item label="车牌号：" span="1" prop="carNo" class="siji">
                 <ws-input
                   :disabled="readonly"
                   v-model="item.carNo"
@@ -216,7 +191,12 @@
                 />
               </ws-form-item>
               <!--车型-->
-              <ws-form-item label="车型" span="1" prop="carModel" class="siji">
+              <ws-form-item
+                label="车型："
+                span="1"
+                prop="carModel"
+                class="siji"
+              >
                 <ws-input
                   :disabled="readonly"
                   v-model="item.carModel"
@@ -226,7 +206,12 @@
                 />
               </ws-form-item>
               <!--车长-->
-              <ws-form-item label="车长" span="1" prop="carLength" class="siji">
+              <ws-form-item
+                label="车长："
+                span="1"
+                prop="carLength"
+                class="siji"
+              >
                 <ws-input
                   :disabled="readonly"
                   v-model="item.carLength"
@@ -237,7 +222,7 @@
               </ws-form-item>
               <!--载重吨-->
               <ws-form-item
-                label="载重（吨）"
+                label="载重（吨）："
                 span="1"
                 prop="loadWeight"
                 class="siji zaizhong"
@@ -251,20 +236,30 @@
                 />
               </ws-form-item>
             </ws-info-table>
-            <img
+            <span
+              v-show="!item.temporaryDriverFlag"
               width="22"
               height="22"
               class="del"
               @click="del(index)"
               src="../../../public/img/del.png"
               alt=""
-            />
+              >×</span
+            >
           </div>
-          <div style="text-align: right">
+          <div style="text-align: right; color: #8890b1; font-size: 16px">
             合计{{ total }}/{{ deptBudgetList.weight }}
           </div>
-          <el-button class="add" type="primary" size="small" @click="add()"
-            >添加司机</el-button
+          <el-button class="add" type="primary" size="small" @click="add()">
+             <img
+                width="22"
+                height="22"
+                @click="add"
+                src="../../../public/img/add.png"
+                alt=""
+              />
+             <div class="spans">添加司机</div>
+            </el-button
           >
           <div style="text-align: right; padding: 10px">
             <el-button
@@ -272,7 +267,7 @@
               type="primary"
               size="small"
               @click="submit()"
-              >提交</el-button
+            >提交</el-button
             >
           </div>
         </div>
@@ -281,7 +276,6 @@
   </div>
 </template>
 <script>
-import { pullDown, addstorageputList } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import {
@@ -371,11 +365,12 @@ export default {
       this.$router.push({ path: 'tranManagementVehicle' })
     },
     del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
+      if (this.deptBudgetList.tranCarInfoList.length > 1) {
+        this.deptBudgetList.tranCarInfoList.splice(index, 1)
       }
     },
     add() {
+      console.log(this.deptBudgetList.tranCarInfoList, 'sasasasas')
       this.deptBudgetList.tranCarInfoList.push({
         driverName: '',
         driverPhone: '',
@@ -437,7 +432,7 @@ export default {
             }
           }
           this.deptBudgetList = response
-          console.log(this.deptBudgetList)
+          console.log(this.deptBudgetList.tranCarInfoList, '集合')
           if (this.deptBudgetList.tranCarInfoList.length == 0) {
             this.deptBudgetList.tranCarInfoList = [
               {
@@ -526,20 +521,6 @@ export default {
         }
       }
     },
-    // fujian(row) {
-    //   if (
-    //     row.receiveAttachmentPath === null ||
-    //     row.receiveAttachmentPath === ''
-    //   ) {
-    //     EventBus.$emit(
-    //       'warning',
-    //       this.$t('system.noticeCircular.NoInformation')
-    //     )
-    //   } else {
-    //     this.accessoryTFs = true
-    //   }
-    //   this.appendixIdss = row.receiveAttachmentPath
-    // },
     approve() {},
     listQuery() {},
   },
@@ -555,6 +536,7 @@ export default {
   .el-form-item {
     width: 33.3333%;
     border: none;
+    height: 50px;
     .el-form-item__label {
       background: transparent;
       border: none;
@@ -592,7 +574,7 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  width: 80%;
+  width: 90%;
   margin: 0 auto;
 }
 
@@ -630,13 +612,108 @@ export default {
 //减号
 .del {
   position: absolute;
-  right: -28px;
-  top: 29%;
+  // right: -38px;
+  top: 9px;
+  cursor: pointer;
+  right: 0;
+  display: inline-block;
+  font-size: 20px;
+  width: 20px;
+  height: 10px;
+  line-height: 0px;
 }
 .driver .el-form-item {
   width: 16.63%;
 }
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  color: #8890b1;
+  font-size: 14px;
+}
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
   width: 72px;
 }
+/deep/.liaison .ws-info-table .el-form-item {
+  width: 16.66%;
+  color: #8890b1;
+  font-size: 14px;
+}
+/deep/.ws-info-table .el-form-item {
+ border: none;
+ height: 50px;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+  width: 40%;
+  border: 0px solid #d8dce6;
+  background: #f5f7fa;
+  text-align: center;
+}
+/deep/.liaison {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 0px solid #d8dce6;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+  background: #f5f7fa;
+}
+.catNos {
+  width: 100%;
+  height: 30px;
+  margin-top: 10px;
+  margin-left: 20px;
+  font-size: 14px;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
+  // border: 0px solid #d8dce6;
+  border-radius: 0px;
+  border-left: none;
+  border-bottom: none;
+  border-top: none;
+}
+/deep/.liaison .ws-info-table{
+  background: #F6F7FC;
+border-radius: 4px;
+border: 1px solid #D8DCE6;
+margin-top: 20px;
+}
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
+//添加司机
+.add {
+  width: 100px;
+  height: 34px;
+  background: #f6f7fb;
+  border-radius: 17px;
+  color: #5473e8;
+  font-size: 14px;
+  border: none;
+}
+.add img {
+  display: inline-block;
+  margin-top: 3px;
+  margin-left: -12px;
+}
+.add .spans {
+  display: table-caption;
+  width: 56px;
+  height: 20px;
+  line-height: 18px;
+}
 </style>

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -23,74 +23,30 @@
     </el-row>
 
     <ws-form ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
-      <div class="small-title">任务详情</div>
+        <div class="small-title" style="font-size: 16px;">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
         <ws-form-item label="任务编号" span="1" prop="processNo">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.processNo"
-            placeholder="请输入任务编号"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.processNo }}
         </ws-form-item>
         <!--货名-->
         <ws-form-item label="货名" span="1" prop="goodsName">
-          <!-- <el-select
-            v-model="deptBudgetList.goodsName"
-            placeholder="请选择货名"
-            filterable
-            :filter-method="dataFilter"
-            @change="selectstaff"
-          >
-            <el-option
-              v-for="item in personCharge"
-              :key="item.value"
-              :label="item.staffName"
-              :value="item.staffName"
-            /> -->
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.goodsName"
-            placeholder="请输入货名"
-            maxlength="20"
-            size="small"
-          />
-          <!-- </el-select> -->
+          {{ deptBudgetList.goodsName }}
         </ws-form-item>
         <!--重量（吨）-->
         <ws-form-item label="重量（吨）" span="1" prop="weight">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.weight"
-            placeholder="请输入重量（吨）"
-            maxlength="100"
-            size="small"
-          />
+          {{ deptBudgetList.weight }}
         </ws-form-item>
 
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
-          <!-- <ws-input
-            v-model="deptBudgetList.sendDetailedAddress"
-            placeholder=""
-            maxlength="100"
-            size="small"
-          /> -->
           {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
           }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
 
         <!--发货人-->
         <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.sender"
-            placeholder="请输入发货人"
-            maxlength="100"
-            size="small"
-          />
+          {{ deptBudgetList.sender }}
         </ws-form-item>
 
         <!--发货人电话-->
@@ -100,143 +56,70 @@
           prop="senderPhone"
           class="readonly"
         >
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.senderPhone"
-            placeholder="请输入发货人电话"
-            maxlength="100"
-            size="small"
-          />
+          {{ deptBudgetList.senderPhone }}
         </ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
-          <!-- <ws-input
-            v-model="deptBudgetList.receiveDetailedAddress"
-            placeholder="请输入仓库名"
-            maxlength="20"
-            size="small"
-          /> -->
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
           }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
         <!--收货人-->
         <ws-form-item label="收货人" span="1" prop="receiver">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.receiver"
-            placeholder="请输入仓库名"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.receiver }}
         </ws-form-item>
         <!--收货人电话-->
         <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.receiverPhone"
-            placeholder="请输入仓库名"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.receiverPhone }}
         </ws-form-item>
         <!--发货日期-->
         <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.deliveryDateStart"
-            placeholder="请输入仓库名"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.deliveryDateStart }}
         </ws-form-item>
         <!--最晚到货日期-->
         <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.deliveryDateEnd"
-            placeholder="请输入仓库名"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
         <!--合同编号-->
         <ws-form-item label="合同编号" span="1" prop="contractNo">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.contractNo"
-            placeholder="请输入合同编号"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.contractNo }}
         </ws-form-item>
       </ws-info-table>
-      <div class="small-title">派车</div>
+        <div class="small-title" style="font-size: 16px;">派车</div>
       <div
         style="width: 100%"
         class="driver"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
       >
         <ws-info-table>
-          <span class="not" v-if="item.statusFlag == 3">{{ item.status }}</span>
-          <span class="already" v-if="item.statusFlag == 1">{{
-            item.status
-          }}</span>
+          <div class="catNos">
+            司机-{{ index + 1 }}
+            <span class="noservice" v-show="item.status == '未送达'">{{
+              item.status
+            }}</span>
+            <span class="service" v-show="item.status == '已送达'">{{
+              item.status
+            }}</span>
+          </div>
           <!--姓名-->
           <ws-form-item label="姓名" span="1" prop="driver">
-            <ws-input
-              :disabled="disabled"
-              v-model="item.driver"
-              placeholder="请输入姓名"
-              maxlength="20"
-              size="small"
-            />
+            {{ item.driver }}
           </ws-form-item>
           <ws-form-item class="phone" label="电话" span="1" prop="driverPhone">
-            <ws-input
-              :disabled="disabled"
-              v-model="item.driverPhone"
-              placeholder="请输入电话"
-              maxlength="20"
-              size="small"
-            />
+            {{ item.driverPhone }}
           </ws-form-item>
           <ws-form-item label="车牌号" span="1" prop="carNo">
-            <ws-input
-              :disabled="disabled"
-              v-model="item.carNo"
-              placeholder="请输入车牌号"
-              maxlength="20"
-              size="small"
-            />
+            {{ item.carNo }}
           </ws-form-item>
           <ws-form-item label="装车（吨）" span="1" prop="loadNetWeight">
-            <ws-input
-              :disabled="disabled"
-              v-model="deptBudgetList.loadNetWeight"
-              placeholder="未装车"
-              maxlength="20"
-              size="small"
-            />
+            {{ item.loadNetWeight }}
           </ws-form-item>
           <ws-form-item label="卸车（吨）" span="1" prop="unloadNetWeight">
-            <ws-input
-              :disabled="disabled"
-              v-model="item.unloadNetWeight"
-              placeholder="未卸车"
-              maxlength="20"
-              size="small"
-            />
+            {{ item.unloadNetWeight }}
           </ws-form-item>
           <ws-form-item label="损耗（吨）" span="1" prop="loss">
-            <ws-input
-              :disabled="disabled"
-              v-model="item.loss"
-              placeholder="未损耗"
-              maxlength="20"
-              size="small"
-            />
+            {{ item.loss }}
           </ws-form-item>
-          <ws-form-item label="合同" span="1" prop="unloadNetWeight">
+          <ws-form-item label="合同" span="1" prop="unloadNetWeight" class="hetong">
           </ws-form-item>
         </ws-info-table>
       </div>
@@ -413,6 +296,21 @@ export default {
     }
   }
 }
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
 .title {
   position: relative;
   padding-left: 10px;
@@ -440,13 +338,7 @@ export default {
   text-align: right;
   padding: 16px 20px;
 }
-.center {
-  position: relative;
-  top: 50px;
-  width: 40%;
-  height: 2000px;
-  margin: 0 auto;
-}
+
 /deep/.ws-info-table .el-form-item {
   width: 33.33%;
 }
@@ -468,24 +360,11 @@ export default {
   display: inline-block;
   width: 10%;
 }
-.center {
-  margin-top: -60px;
-  width: 80%;
-}
-//仓位
 
-.position {
-  border-radius: 2px;
-  font-size: 12px;
-  line-height: 20px;
-  display: inline-grid;
-  padding: 2px 4px;
-}
 //表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: left;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #000;
   line-height: 16px;
@@ -499,55 +378,40 @@ export default {
   position: absolute;
   content: '';
   display: block;
-  background: #5473e8;
   width: 4px;
   height: 14px;
   left: 0px;
   top: 13px;
   padding: 4px 2px;
 }
-// 下面列表
-.neifor {
-  width: 90%;
-  background-color: #f6f7fc;
-}
-/deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
-  width: 35%;
-  text-align: center;
-}
-
-/deep/.neifor .el-input--small .el-input__inner {
-  width: 100%;
-}
 // .ws-info-table[data-v-850a44a6] .el-form-item {
 //     width: 16.66%;
 // }
-.xia {
-  width: 16%;
-}
+
 //去边框
-/deep/.el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-}
+/deep/.el-form-item,
 /deep/.ws-info-table {
-  border-left: 0px;
-  border-top: 0px;
+  border: none;
 }
-.ws-info-table .el-form-item .el-form-item__content {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+  border: none;
+  height: 50px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+    color: #8890B1;
+  font-size: 14px;
 }
 .driver {
   position: relative;
+  background: #f6f7fb;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
 }
 .not,
 .already {
@@ -555,14 +419,57 @@ export default {
   left: -45px;
   top: 10px;
 }
-
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background: #fff;
+  color: #8890B1;
+  font-size: 14px;
+}
 /deep/.driver .ws-info-table .el-form-item {
-  width: 14%;
+  width: 14.28%;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
   width: 86px;
+  text-align: center;
+  background: #f6f7fb;
+  font-size: 14px;
+  color: #8890b1;
 }
+
 /deep/.driver .ws-info-table .el-form-item.phone .el-form-item__label {
   width: 50px;
 }
+/deep/.catNos {
+  width: 100%;
+  margin-top: 10px;
+  margin-left: 15px;
+}
+/deep/.driver .ws-info-table .el-form-item .el-form-item__content {
+  border-right: 1px solid #8890b1;
+  background: #f6f7fb;
+  font-size: 14px;
+  color: #8890b1;
+}
+/deep/.hetong .ws-info-table .el-form-item .el-form-item__content{
+  border: none;
+}
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
+/deep/.driver.ws-info-table .el-form-item .el-form-item__content{
+  border:none
+}
 </style>

src/views/warehouse/warehouseManagementAdd.vue

@@ -601,6 +601,9 @@ export default {
                 this.deptBudgetList.warehousePositionInfoList =
                   this.freightspace
                 this.deptBudgetList.totalStorage = this.totalStorage
+                if(this.radio == 2){
+                  this.deptBudgetList.warehousetype ==2
+                }
 
                 increase(this.deptBudgetList)
                   .toPromise()

vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.115:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',