前端 运输样式及移库查看sdy

package-lock.json

@@ -1245,7 +1245,7 @@
         },
         "source-map": {
           "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
         }
       }
@@ -1381,7 +1381,7 @@
         },
         "source-map": {
           "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
         }
@@ -20831,7 +20831,7 @@
       }
     },
     "winsea-component-library": {
-      "version": "http://47.101.10.107:8081/repository/npm-hossted/winsea-component-library/-/winsea-component-library-1.0.1.tgz",
+      "version": "http://maven.zthymaoyi.com/nexus/repository/npm-hosted/winsea-component-library/-/winsea-component-library-1.0.1.tgz",
       "integrity": "sha512-qRQ4BPiIsFj6QqoJIBDiC+IniGkTBhrpyjXRhp/TWTG/s1igUjn9D4acCmkeCsFRgevvlkDfEme0Na8tmhmtDg==",
       "requires": {
         "ali-oss": "^6.5.1",
@@ -20880,7 +20880,7 @@
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "url-loader": {

src/api/V2/taskspost/index.js

@@ -25,4 +25,6 @@ export const API_GET_OUT_LIST = '/inOutWarehouseTask/selectInOutWarehouseTask'
 // 出入库任务-查看
 export const API_GET_OUT_EXAMINE = '/inOutWarehouseTask/getInOutWarehouseTask'
 // 出入库任务-删除
-export const API_POST_OUT_DEL = '/inOutWarehouseTask/api/deleteInOutWarehouseTask'
+export const API_POST_OUT_DEL = '/inOutWarehouseTask/api/deleteInOutWarehouseTask'
+//移库列表
+export const API_GET_OUT_MOVE = '/inOutWarehouseTask/selectInOutWarehouseTaskRelocation'                              

src/lang/zh.js

@@ -512,6 +512,7 @@
     // 任务管理
     taskManagement: '任务管理',
     moveWarehouseTask: '移库任务',
+    moveWarehouseTaskLook : '移库任务查看',
     tranManagementLook: '运输任务查看',
     tranManagementTransportAdd: '运输任务添加',
     tranManagementTransportEdit: '运输任务编辑',

src/model/tasksport/index.js

@@ -14,7 +14,8 @@ import {
     API_POST_OUT_PUT,
     API_GET_OUT_LIST,
     API_GET_OUT_EXAMINE,
-    API_POST_OUT_DEL
+    API_POST_OUT_DEL,
+    API_GET_OUT_MOVE
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -42,3 +43,5 @@ export const getoreditoutput = appRx.get(API_GET_OUT_LIST, errorCatcher, errorHa
 export const outexamine = appRx.get(API_GET_OUT_EXAMINE, errorCatcher, errorHandle, filter)
 //出入库任务-删除
 export const outdelete = appRx.post(API_POST_OUT_DEL, errorCatcher, errorHandle, filter)
+//移库列表
+export const moveList = appRx.get(API_GET_OUT_MOVE, errorCatcher, errorHandle, filter)

src/views/taskManagement/component/routers/route.js

@@ -87,6 +87,19 @@ const tranManagementRouter = {
         module: 'tranManagement.tranManagementDriver.moveWarehouseTask',
       }
     },
+    //移库查看
+    {
+      path: 'moveWarehouseTaskLook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/moveWarehouseTaskLook'),
+      name: 'moveWarehouseTaskLook',
+      meta: {
+        title: 'moveWarehouseTaskLook',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.moveWarehouseTaskLook',
+      },
+      hidden: true
+    },
     //出入库任务
     {
       path: 'tranManagementWarehouseInOutTask',

src/views/taskManagement/moveWarehouseTask.vue

@@ -2,6 +2,11 @@
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="20">
+      <template slot="right">
+        <ws-button class="but" type="primary" @click="handleAdd()"
+          >添加</ws-button
+        >
+      </template>
       <template slot="left">
         <ws-button class="but" type="primary" @click="handlestatus(1)">
           执行中</ws-button
@@ -10,9 +15,9 @@
         <ws-button class="but" @click="handlestatus('')">全部任务</ws-button>
       </template>
       <template slot="left">
-         <ws-input
+        <ws-input
           v-model="warehouseName"
-          placeholder="可按移库任务编号、发货库和收货库查找"
+          placeholder="可按合同编号或任务编号查找"
           clearable
           maxlength="500"
           type="input"
@@ -28,7 +33,7 @@
                 vertical-align: text-top;
                 position: relative;
                 top: 0px;
-                left: -8px;
+                left: -1px;
               "
               src="../../../public/img/sousuo.png"
               alt=""
@@ -41,28 +46,25 @@
         class="wenzi"
         :data="gainList.records"
         style="width: 100%; margin-top: 20px"
-        height="780"
+        height="650"
       >
-      
-     <el-table-column type="index" label="序号">
+        <el-table-column type="index" label="序号">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="contractNo" label="移库任务编号"> </el-table-column>
-        <el-table-column prop="taskNo" label="发货库" >
-            </el-table-column>
-        <el-table-column prop="warehouseName" class="table_td" label="收货库">
-            </el-table-column>
+        <el-table-column prop="moveTaskNo" label="移库任务编号" width="80"></el-table-column>
+        <el-table-column prop="sendWarehouse" label="发货库"> </el-table-column>
+        <el-table-column prop="receiveWarehouse" label="收货库"> </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-        <el-table-column prop="weight" label="出库量（吨）"> </el-table-column>
-        <el-table-column prop="weight" label="入库量（吨）"> </el-table-column>
-        <el-table-column prop="weight" label="退库量（吨）"> </el-table-column>
-        <el-table-column prop="weight" label="运输损耗（吨）"> </el-table-column>
-        <el-table-column prop="weight" label="发布者"> </el-table-column>
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="deliveryVolume" label="出库量（吨）"> </el-table-column>
+        <el-table-column prop="storageVolume" label="入库量（吨）"> </el-table-column>
+        <el-table-column prop="stockReturn" label="退库量（吨）"> </el-table-column>
+        <el-table-column prop="transportLoss" label="运输损耗（吨）"> </el-table-column>
+        <el-table-column prop="publisher" label="发布者"> </el-table-column>
+        <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -74,19 +76,22 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待执行'"
+                    v-if="scope.row.taskStatus == '待审核'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.taskStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span
+                    v-if="scope.row.taskStatus == '已完成'"
+                    class="done"
+                  ></span
+                  >{{ scope.row.taskStatus }}
                 </span>
               </template>
               <div>
-                <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
+                <p style="margin-top: 0; padding-left: 10px">操作历史</p>
                 <div v-for="(item, index) in historyList" class="flex">
                   <div class="vertical-text vertical-text-left">
                     {{ item.updateDate }}
@@ -114,21 +119,30 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="weight" label="发布时间"> </el-table-column>
-        
-        <el-table-column prop="seller" label="详情" width="240">
+        <el-table-column prop="establishDate" label="发布时间">
+        </el-table-column>
+        <el-table-column prop="seller" label="详情" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="nocomplete(scope.row)">
+            <ws-button class="completed" @click="see(scope.row)">
               查看
             </ws-button>
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
     </div>
   </div>
 </template>
 <script>
-import { gain, deltran } from '@/model/tasksport/index'
+import { getoreditoutput, outdelete,moveList } from '@/model/tasksport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -168,11 +182,16 @@ export default {
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
+      taskTypeKey : 3,
+      sendWarehouse : '',
+       receiveWarehouse : '',
+       moveTaskNo:'',
       // 提交类型
       submitType: true,
       size: 10,
       spanArr: [],
       warehouseName: '',
+      deptBudgetTotal: 0,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       historyList: [],
@@ -188,27 +207,38 @@ export default {
     this.getList()
     this.showType = this.isShow
   },
+  mounted(){
+    this.getList()
+  },
   methods: {
-    //添加
-    add() {
-      this.$router.push({ path: 'tranManagementTransportAdd' })
-    },
+   
     //查找
     lookUp() {
       this.currentPage = 1
       this.getList()
     },
     deleteclick(row) {
+      var text = ''
+      if (
+        (row.taskTypeKey == 3 && row.inOutType == '移库出库') ||
+        (row.taskTypeKey == 4 && row.inOutType == '销售出库')
+      ) {
+        text = '相同任务编号的任务将一并删除且不可恢复，是否确定删除？'
+      } else {
+        text = `运输任务删除后不可恢复，是否确定删除？`
+      }
       //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`运输任务删除后不可恢复，是否确定删除？`, {
+      this.$confirm(text, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
           console.log(row)
-          deltran({
+          outdelete({
             id: row.id,
+            relevanceId: row.relevanceId,
+            inOutFlag: row.inOutFlag,
           })
             .toPromise()
             .then((response) => {
@@ -220,48 +250,40 @@ export default {
         })
     },
     getList() {
-      gain({
+      moveList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
+        // searchType: this.searchType,
+        // moveTaskNo : this.moveTaskNo,
+        taskTypeKey : this.taskTypeKey,
+        // sendWarehouse : this.sendWarehouse,
+        // receiveWarehouse : this.receiveWarehouse,
+
       })
         .toPromise()
         .then((response) => {
+          console.log(response)
           this.gainList = response
+          this.currentPage = response.current
+          this.pageSize = response.size
+          this.deptBudgetTotal = response.total
         })
     },
     handlestatus(status) {
       this.searchType = status
       this.getList()
     },
-    //编辑
-    delivery(item) {
-      this.$router.push({
-        path: 'tranManagementTransportEdit',
-        query: {
-          id: item.id,
-        },
-      })
-    },
     //查看
-    warehousing(item) {
-      var free = 0
-      for (var i = 0; i < item.warehouseNumViewList.length; i++) {
-        free += Number(item.warehouseNumViewList[i].storage)
-      }
+    see(item) {
       this.$router.push({
-        path: 'tranManagementLook',
+        path: 'moveWarehouseTaskLook',
         query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-          capacity: item.capacity - free,
+          relevanceId: item.relevanceId,
         },
       })
     },
+
     getSpanArr(data) {
       let that = this
 
@@ -296,24 +318,12 @@ export default {
     //查看//传参
     nocomplete(row) {
       this.$router.push({
-        path: 'tranManagementLook',
+        path: 'inOutWarehouseTaskEdit',
         query: {
-          id: row.id,
+          relevanceId: row.relevanceId,
         },
       })
     },
-    //查看
-    handleLook() {
-      this.$router.push({ path: 'tranManagementLook' })
-    },
-    //添加
-    handleAdd() {
-      this.$router.push({ path: 'tranManagementTransportAdd' })
-    },
-    //编辑
-    handleEdit() {
-      this.$router.push({ path: 'tranManagementTransportEdit' })
-    },
     dateFormat(fmt, date) {
       let ret
       const opt = {
@@ -351,7 +361,7 @@ export default {
     },
     editClick(row) {
       var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
+      if (row.status == '待审核' || row.status == '已完成') {
         status = '执行中'
       } else if (row.status == '执行中') {
         status = '已完成'
@@ -508,14 +518,11 @@ export default {
   margin-top: 150px;
 }
 .findValue {
-  width: 50%;
+  width: 0%;
   margin-left: 25%;
 }
-/deep/.el-input--small .el-input__inner {
-  margin-left: -230px;
-  width: 300px;
-}
+
 .search {
-  margin-left: -100px;
+  margin-left: -250px;
 }
 </style>

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -0,0 +1,804 @@
+//移库查看
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">移库任务详情</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <ws-form
+      class="position"
+      ref="deptBudgetList"
+      :rules="rules"
+      :model="deptBudgetList"
+    >
+      <div class="small-title" style="font-size: 16px">任务详情</div>
+      <h3>移库任务编号</h3>
+      <ws-info-table>
+        <!--出货库-->
+        <div class="line">
+          <ws-form-item label="出货库" span="1" prop="sendWarehouse">
+            {{ deptBudgetList.sendWarehouse }}
+          </ws-form-item>
+        </div>
+        <!--出库经办人-->
+        <ws-form-item label="出库经办人" span="1" prop="agent">
+          {{ deptBudgetList.agent }}
+        </ws-form-item>
+        <!--出库重量（吨）-->
+        <ws-form-item label="出库重量（吨）" span="1" prop="deliveryVolume">
+          {{ deptBudgetList.deliveryVolume }}
+        </ws-form-item>
+        <!--预计出库日期-->
+        <ws-form-item label="预计出库日期" span="1" prop="predictDate">
+          {{ deptBudgetList.predictDate }}
+        </ws-form-item>
+        <div class="line">
+          <!--入货库-->
+          <ws-form-item label="入货库" span="1" prop="receiveWarehouse">
+            {{ deptBudgetList.receiveWarehouse }}
+          </ws-form-item>
+        </div>
+        <!--入库经办人-->
+        <ws-form-item label="入库经办人" span="1" prop="agent">
+          {{ deptBudgetList.agent }}
+        </ws-form-item>
+        <!--入库重量（吨）-->
+        <ws-form-item label="入库重量（吨）" span="1" prop="storageVolume">
+          {{ deptBudgetList.storageVolume }}
+        </ws-form-item>
+        <!--预计入库日期-->
+        <ws-form-item label="预计入库日期" span="1" prop="predictDate">
+          {{ deptBudgetList.predictDate }}
+        </ws-form-item>
+        <!--货物信息-->
+        <span style="line-height: 50px; margin-left: 16px; color: #8890b1"
+          >货物信息</span
+        >
+        <!-- <ws-form-item label="货物信息" span="1" prop="sendDetailedAddress">
+        </ws-form-item> -->
+        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
+        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
+        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
+        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
+        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
+        <el-input placeholder="请输入内容" :disabled="true"> </el-input>
+        <span style="line-height: 40px; margin-left: 16px; color: #8890b1"
+          >业务描述</span
+        >
+        <!--业务描述-->
+        <ws-input
+          v-model="deptBudgetList.remarks"
+          type="textarea"
+          row="3"
+          placeholder="请输入备注信息，不超过200字"
+          maxlength="200"
+        />
+      </ws-info-table>
+
+      <div class="small-title" style="font-size: 16px">实际流转数量</div>
+
+      <ws-info-table>
+        <!--累计出库量（吨）-->
+        <ws-form-item label="累计出库量（吨）" span="1" prop="driver">
+          <ws-input
+            v-model="deptBudgetList.driverPhone"
+            readonly
+            unselectable="on"
+            placeholder="请输入累计出库量"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!--累计入库量（吨）-->
+        <ws-form-item label="累计入库量（吨）" span="1" prop="driverPhone">
+          <ws-input
+            v-model="deptBudgetList.driverPhone"
+            readonly
+            unselectable="on"
+            placeholder="请输入累计入库量（吨）"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!--累计运输损耗（吨）-->
+        <ws-form-item label="累计运输损耗（吨）" span="1" prop="sendDateStart">
+          <ws-input
+            v-model="deptBudgetList.driverPhone"
+            readonly
+            unselectable="on"
+            placeholder="请输入累计运输损耗（吨）"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+        <!--累计退库量（吨）-->
+        <ws-form-item label="累计退库量（吨）" span="1" prop="stockReturnCount">
+          <ws-input
+            v-model="deptBudgetList.stockReturnCount"
+            readonly
+            unselectable="on"
+            placeholder="请输入累计退库量（吨）"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+      </ws-info-table>
+    </ws-form>
+
+    <!-- 提交 -->
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >提交</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { seeCat, dispatchCat, packList } from '@/model/transport/index'
+import { getstaff } from '@/model/warehouse/index'
+import WsUpload from '@/components/WsUpload'
+import mapDrag from '@/components/mapdrag/mapdrag'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    mapDrag,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      deptBudgetList: {
+        totalStorage: 0,
+      },
+      options_: regionData,
+      heightData: '600px',
+      zoom: 7,
+      selectedOptions: [],
+      center: [116.244694, 39.517344],
+      window: '',
+      radio: 1,
+      personCharge: [],
+      district: null,
+      driverList: [],
+      listDate: { country: '中国', level: 'country', city: '' },
+      citylist: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      tranType: 2,
+      rules: {
+        warehouseName: [
+          {
+            required: true,
+            message: '请输入仓库名称',
+            trigger: 'blur',
+          },
+          {
+            min: 2,
+            max: 20,
+            message: '仓库名长度不符合要求，请输入2-20字符之内',
+            trigger: 'blur',
+          },
+        ],
+      },
+      appendixIdsAdd: '',
+      size: 10,
+      value1: '',
+      unitList: [],
+      freightspace: [
+        // {
+        //   trainNo: '',
+        // },
+      ],
+      name: '',
+      list: [],
+      staffList: [],
+      options: [],
+      carModel: [],
+      tranCarInfoList: {},
+      arr: [],
+    }
+  },
+  mounted() {
+    this.deptBudgetList.id = this.$route.query.id
+    this.getList()
+  },
+  computed: {
+    totalStorage: function () {
+      var maxStorage = 0
+      for (var i = 0; i < this.freightspace.length; i++) {
+        maxStorage += Number(this.freightspace[i].maxStorage)
+      }
+      return maxStorage
+    },
+  },
+  methods: {
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        this.options = this.staffList
+      }
+    },
+    selectstaff(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.tranCarInfoList[0].driverPhone =
+            this.staffList[i].staffMobilePhone
+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+        }
+      }
+    },
+    marker: function (item) {
+      this.deptBudgetList.warehousePositioning =
+        item.lnglat.lat + ',' + item.lnglat.lng
+    },
+    selectedAddress(e) {
+      this.deptBudgetList.warehousePositioning =
+        e.center.lat + ',' + e.center.lng
+    },
+    confirmPositioncity() {
+      this.listDate.level = 'city'
+      this.listDate.country = this.name
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    add() {
+      this.freightspace.push({
+        trainNo: '',
+      })
+    },
+    del(index) {
+      if (this.freightspace.length > 1) {
+        this.freightspace.splice(index, 1)
+      }
+    },
+    //下拉司机姓名改变事件
+    selectdriver() {},
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.$router.push({ path: 'tranManagementTransporTationFire' })
+    },
+    // confirmPosition() {
+    //   this.draggable = false
+    // },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+    },
+    submit() {
+      for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+        if (!this.deptBudgetList.tranCarInfoList[i].driver) {
+          this.$message({
+            message: '姓名不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].driverPhone) {
+          this.$message({
+            message: '电话不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].sendDateStart) {
+          this.$message({
+            message: '发车日期不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].receiveDateEnd) {
+          this.$message({
+            message: '到站日期不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          new Date(
+            this.deptBudgetList.tranCarInfoList[i].sendDateStart
+          ).getTime() >
+          new Date(
+            this.deptBudgetList.tranCarInfoList[i].receiveDateEnd
+          ).getTime()
+        ) {
+          this.$message({
+            message: '发车时间不能大于到站时间！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].carModel) {
+          this.$message({
+            message: '车型不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      for (var j = 0; j < this.freightspace.length; j++) {
+        if (!this.freightspace[j].trainNo) {
+          this.$message({
+            message: '车厢号不能为空',
+            type: 'warning',
+          })
+          return
+        }
+      }
+
+      this.$confirm(`提交成功后，任务将下发给相关人员，是否确定提交?`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              for (var i = 0; i < this.freightspace.length; i++) {
+                var num = this.freightspace[i].trainNo
+                this.arr.push(num)
+              }
+              this.deptBudgetList.totalStorage = this.totalStorage
+              this.tranCarInfoList.driver = this.deptBudgetList.driver
+              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+              this.tranCarInfoList.sendDateStart =
+                this.deptBudgetList.sendDateStart
+              this.tranCarInfoList.receiveDateEnd =
+                this.deptBudgetList.receiveDateEnd
+              this.tranCarInfoList.carModel = this.deptBudgetList.carModel
+              this.tranCarInfoList.id =
+                this.deptBudgetList.tranCarInfoList[0].id
+              this.tranCarInfoList.tranType = this.tranType
+              this.tranCarInfoList.boxNo = this.arr.toString()
+              var tranCarInfo = {}
+              var tranList = [this.tranCarInfoList]
+              tranCarInfo.id = this.deptBudgetList.id
+              tranCarInfo.infoId = this.deptBudgetList.infoId
+              tranCarInfo.tranCarInfoList = tranList
+              // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
+              dispatchCat(tranCarInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('添加成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementTransporTationFire',
+                  })
+                })
+            } else {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+
+    getList() {
+      seeCat({ id: this.deptBudgetList.id })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+          if (response.tranCarInfoList[0].boxNo) {
+            this.list = response.tranCarInfoList[0].boxNo.split(',')
+            for (var i = 0; i < this.list.length; i++) {
+              var num = this.list[i]
+              this.freightspace.push({
+                trainNo: num,
+              })
+            }
+          }
+        })
+      //司机姓名下拉
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+          //  this.deptBudgetList.tranCarInfoList.driverPhone = response
+        })
+      //车型
+      packList({ constId: 'TRAN5' })
+        .toPromise()
+        .then((response) => {
+          this.carModel = response
+        })
+    },
+    handleExamine() {},
+    approve() {},
+    // returnsales() {
+    //   this.$router.push({ path: 'purchaseContract' })
+    // },
+    selectChapterTwo(e) {
+      for (var i = 0; i < this.ChapterTwoList.length; i++) {
+        if (this.ChapterTwoList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+        }
+      }
+    },
+    selectunitList(e) {
+      for (var i = 0; i < this.unitList.length; i++) {
+        if (this.unitList[i].constValue == e) {
+          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+        }
+      }
+    },
+    selectgrade(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+        }
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+        }
+      }
+    },
+    // 编辑
+    editClick(item, index) {
+      const map = JSON.parse(JSON.stringify(item))
+      if (Object.is(item.id, 1)) {
+        return
+      }
+      if (Object.is(this.unitList[index].flag, 'delete')) {
+        map.flag = 'check'
+        this.$set(this.unitList, index, map)
+      } else {
+        map.flag = 'delete'
+        this.$set(this.unitList, index, map)
+      }
+    },
+    // 删除
+    deleteClick(item, index) {
+      if (Object.is(item.constKey, 1)) {
+        return
+      }
+      if (!item.constValue) {
+        this.unitList.splice(index, 1)
+        return
+      }
+      delxiala({ id: this.unitList[index].id })
+        .toPromise()
+        .then((response) => {
+          this.getUnitList()
+          this.pleaseChoose = ''
+        })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+//蓝标
+.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;
+}
+
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+  width: 33.333%;
+  border: none;
+  height: 50px;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+  width: 30%;
+}
+
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+
+.center {
+  width: 90%;
+  margin: 0 auto;
+}
+.el-form-item__label {
+  text-align: center;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.readonly:after {
+  display: none;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+  width: 50%;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-bottom: 5px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+//输入框
+/deep/.el-input {
+  width: 14.6%;
+  margin-left: 10px;
+}
+/deep/.is-disabled .el-input__inner {
+  height: 40px;
+  background: #f5f7fa;
+  margin-left: 10px;
+}
+.line {
+  width: 100%;
+}
+//业务描述
+/deep/.el-textarea {
+  width: 90%;
+  margin-left: 24px;
+}
+</style>

src/views/taskManagement/tranManagementLook.vue

@@ -41,29 +41,23 @@
             {{ deptBudgetList.weight }}
           </ws-form-item>
         </ws-info-table>
+        <div class="address">
+          <ws-info-table>
+            <!-- 始发地 -->
+            <ws-form-item label="始发地" span="1" prop="netWeight">
+              {{ deptBudgetList.startPrivate }}/{{ deptBudgetList.startCity
+              }}{{ deptBudgetList.startArea
+              }}{{ deptBudgetList.startDetailedAddress }}
+            </ws-form-item>
+            <!--终到地-->
+            <ws-form-item label="终到地" span="1" prop="netWeight">
+              {{ deptBudgetList.endPrivate }}/{{ deptBudgetList.endCity
+              }}{{ deptBudgetList.endArea
+              }}{{ deptBudgetList.endDetailedAddress }}
+            </ws-form-item>
+          </ws-info-table>
+        </div>
         <div class="inspector">
-          <!-- 始发地 -->
-          <ws-form-item
-            class="address"
-            label="始发地"
-            span="1"
-            prop="netWeight"
-          >
-            {{ deptBudgetList.startPrivate }}/{{ deptBudgetList.startCity
-            }}{{ deptBudgetList.startArea
-            }}{{ deptBudgetList.startDetailedAddress }}
-          </ws-form-item>
-          <!--终到地-->
-          <ws-form-item
-            class="address"
-            label="终到地"
-            span="1"
-            prop="netWeight"
-          >
-            {{ deptBudgetList.endPrivate }}/{{ deptBudgetList.endCity
-            }}{{ deptBudgetList.endArea
-            }}{{ deptBudgetList.endDetailedAddress }}
-          </ws-form-item>
           <span class="zi">运输方式</span>
           <el-checkbox-group v-model="checkList">
             <el-checkbox disabled label="汽运"></el-checkbox>
@@ -72,73 +66,76 @@
           </el-checkbox-group>
         </div>
       </div>
-      <div v-for="(item, index) in deptBudgetList.tranProcessInfoList">
-        <div class="driver">运输阶段-{{ item.processNo }}{{ index + 1 }}</div>
-        <div class="neifor">
-          <ws-info-table class="el-table">
-            <!--运输方式-->
-            <ws-form-item label="运输方式" span="1" prop="tranType">
-              {{ item.tranType }}
-            </ws-form-item>
-            <!--发货日期-->
-            <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
-              {{ item.deliveryDateStart }}
-            </ws-form-item>
-            <!--最晚到货日期-->
-            <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-              {{ item.deliveryDateEnd }}
-            </ws-form-item>
-          </ws-info-table>
-          <!-- </div>
-      <div class="nei"> -->
-          <ws-info-table>
-            <!--发货日期-->
-            <ws-form-item label="发货地区" span="1" prop="waterContent">
-              {{ item.sendPrivate }}/{{ item.sendCity }}{{ item.sendArea }}
-            </ws-form-item>
-            <!--发货地详细地址-->
-            <ws-form-item
-              label="发货地详细地址"
-              span="1"
-              prop="sendDetailedAddress"
-            >
-              {{ item.sendDetailedAddress }}
-            </ws-form-item>
-            <!--发货人-->
-            <ws-form-item label="发货人" span="1" prop="sender">
-              {{ item.sender }}
-            </ws-form-item>
-            <!--发货人电话-->
-            <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-              {{ item.senderPhone }}
-            </ws-form-item>
-          </ws-info-table>
-        </div>
-        <div class="nei">
-          <ws-info-table>
-            <!--发货日期-->
-            <ws-form-item label="收货地区" span="1" prop="waterContent">
-              {{ item.receivePrivate }}/{{ item.receiveCity
-              }}{{ item.receiveArea }}
-            </ws-form-item>
-            <!--发货地详细地址-->
-            <ws-form-item
-              label="收货地详细地址"
-              span="1"
-              prop="receiveDetailedAddress"
-            >
-              {{ item.receiveDetailedAddress }}
-            </ws-form-item>
-            <!--发货人-->
-            <ws-form-item label="收货人" span="1" prop="receiver">
-              {{ item.receiver }}
-            </ws-form-item>
-            <!--发货人电话-->
-            <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-              {{ item.receiverPhone }}
-            </ws-form-item>
-          </ws-info-table>
-        </div>
+      <div
+        v-for="(item, index) in deptBudgetList.tranProcessInfoList"
+        :key="index"
+        class="datafor"
+      >
+        <div class="driver">运输阶段({{ item.processNo }}{{ index + 1 }})</div>
+        <!-- <div class="neifor"> -->
+        <ws-info-table class="el-table">
+          <!--运输方式-->
+          <ws-form-item label="运输方式" span="1" prop="tranType">
+            {{ item.tranType }}
+          </ws-form-item>
+          <!--发货日期-->
+          <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
+            {{ item.deliveryDateStart }}
+          </ws-form-item>
+          <!--最晚到货日期-->
+          <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+            {{ item.deliveryDateEnd }}
+          </ws-form-item>
+        </ws-info-table>
+        <!-- </div>-->
+        <ws-info-table>
+          <!--发货日期-->
+          <ws-form-item label="发货地区" span="1" prop="waterContent">
+            {{ item.sendPrivate }}/{{ item.sendCity }}{{ item.sendArea }}
+          </ws-form-item>
+          <!--发货地详细地址-->
+          <ws-form-item
+            label="发货地详细地址"
+            span="1"
+            prop="sendDetailedAddress"
+          >
+            {{ item.sendDetailedAddress }}
+          </ws-form-item>
+          <!--发货人-->
+          <ws-form-item label="发货人" span="1" prop="sender">
+            {{ item.sender }}
+          </ws-form-item>
+          <!--发货人电话-->
+          <ws-form-item label="发货人电话" span="1" prop="senderPhone">
+            {{ item.senderPhone }}
+          </ws-form-item>
+        </ws-info-table>
+
+        <!-- <div class="nei"> -->
+        <ws-info-table>
+          <!--发货日期-->
+          <ws-form-item label="收货地区" span="1" prop="waterContent">
+            {{ item.receivePrivate }}/{{ item.receiveCity
+            }}{{ item.receiveArea }}
+          </ws-form-item>
+          <!--发货地详细地址-->
+          <ws-form-item
+            label="收货地详细地址"
+            span="1"
+            prop="receiveDetailedAddress"
+          >
+            {{ item.receiveDetailedAddress }}
+          </ws-form-item>
+          <!--发货人-->
+          <ws-form-item label="收货人" span="1" prop="receiver">
+            {{ item.receiver }}
+          </ws-form-item>
+          <!--发货人电话-->
+          <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
+            {{ item.receiverPhone }}
+          </ws-form-item>
+        </ws-info-table>
+        <!-- </div> -->
       </div>
       <div style="text-align: right; padding: 10px">
         <el-button
@@ -287,6 +284,7 @@ export default {
 }
 .el-form {
   padding: 0 10%;
+  margin-top: 50px;
 }
 .el-button--primary {
   background-color: #5878e8;
@@ -299,73 +297,39 @@ export default {
   text-align: right;
   padding: 16px 20px;
 }
-.center {
-  position: relative;
-  top: 50px;
-  width: 40%;
-  height: 2000px;
-  margin: 0 auto;
-}
-/deep/.address.el-form-item {
+/deep/.address .ws-info-table .el-form-item {
   width: 100%;
+  border: none;
 }
-/deep/.el-form-item__label {
-  width: 160px;
-}
-//选填
-/deep/.el-form-item {
-  width: 50%;
+/deep/.address .el-form-item .el-form-item__content {
+  width: 30%;
 }
 .container {
   overflow: scroll;
   height: 120vh;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: center;
-}
+
 .deliverydate {
   display: inline-block;
   width: 10%;
 }
-.center {
-  margin-top: -60px;
-  width: 80%;
-}
-//仓位
-
-.position {
-  background: #afb5cb;
-  border-radius: 2px;
-  font-size: 12px;
-  color: #ffffff;
-  line-height: 20px;
-  display: inline-grid;
-  padding: 2px 4px;
-}
-// .position {
-//   width: 52px;
-//   height: 20px;
-//   background: #afb5cb;
-//   border-radius: 2px;
-//   font-size: 12px;
-//   font-family: PingFangSC-Medium, PingFang SC;
-//   color: #ffffff;
-//   line-height: 20px;
-// }
-//表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: left;
+  text-align: center;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
+  border: none;
+}
+
+.inspector {
+  margin-top: 10px;
 }
-//始终地
-.inspector .el-form-item__content {
-  text-align: left;
-  margin-left: 0px;
-  margin-top: -4px;
+.inspector .zi {
+  text-align: center;
+  margin-left: 22px;
+  color: #69708C;
+  font-size: 14px;
 }
 .small-title {
   position: relative;
@@ -383,41 +347,10 @@ export default {
   top: 13px;
   padding: 4px 2px;
 }
-//下面列表
-// .neifor {
-//   width: 80%;
-//   background-color: #f6f7fc;
-// }
-// /deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
-//   width: 35%;
-//   text-align: center;
-// }
-// /deep/.neifor .ws-info-table .el-form-item .el-form-item__content {
-//   width: 60%;
-//   background-color: #f6f7fc;
-// }
-
-// /deep/.neifor .el-input--small .el-input__inner{
-//   width: 100%;
-// }
-.inspector {
-  text-align: left;
-  margin-left: -350px;
-  // margin-top: 50px;
-  width: 700px;
-  margin-left: -100px;
-}
-.ws-info-table .el-form-item {
-  width: 300px;
-}
-//多选
 .el-checkbox-group {
-  margin-left: 160px;
+  margin-left: 120px;
   margin-top: -20px;
 }
-.zi {
-  margin-left: 100px;
-}
 //底部表格
 /deep/.nei {
   .ws-info-table {
@@ -451,4 +384,49 @@ export default {
     }
   }
 }
+.ws-info-table .el-form-item {
+  width: 25%;
+  height: 50px;
+  color: #69708c;
+  font-size: 14px;
+}
+/deep/.basicInformation .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+/deep/.inspector .el-form-item .el-form-item__label {
+  width: 30%;
+}
+.datafor {
+  border: 1px solid #d8dce6;
+  border-radius: 5px;
+  margin-top: 30px;
+  border-left: 5px solid #8890B1;
+}
+/deep/.datafor .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 5px;
+}
+/deep/.datafor .ws-info-table .el-form-item .el-form-item__label {
+  background: #fafbfc;
+  background: none;
+}
+/deep/.ws-info-table,
+/deep/.ws-info-table .el-form-item {
+  border: none;
+}
+/deep/.ws-info-table{
+  width: 99%;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+.driver {
+  margin-left: 20px;
+  height: 32px;
+  line-height: 30px;
+  font-size: 16px;
+  color: #69708c;
+}
 </style>

src/views/taskManagement/tranManagementTransport.vue

@@ -71,9 +71,10 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="taskNo" label="运输任务编号" width="80">
+        <el-table-column prop="taskNo" label="运输任务编号" width="160">
         </el-table-column>
-        <el-table-column prop="contractNo" label="合同编号"> </el-table-column>
+        <el-table-column prop="contractNo" label="合同编号" width="160">
+           </el-table-column>
         <el-table-column prop=" weight" class="table_td" label="货物（吨数）">
           <template slot-scope="scope">
             {{ scope.row.goodsName }}({{ scope.row.weight }})

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -38,7 +38,7 @@
         <el-form-item prop="taskType" label="任务类型" span="1">
           <el-select
             v-model="deptBudgetList.taskType"
-            placeholder=""
+            placeholder="请输入任务类型"
             class="typeselect"
             @change="selecttaskType"
           >
@@ -67,7 +67,7 @@
         <el-form-item prop="goodsName" label="货名" span="1">
           <el-select
             v-model="deptBudgetList.goodsName"
-            placeholder="货名"
+            placeholder="请输入货名"
             class="typeselect"
             @change="selectgoodsname"
           >
@@ -89,7 +89,7 @@
         </el-form-item>
       </ws-info-table>
       <ws-info-table class="el-table">
-        <div class="start-address">
+        <div class="start-address" style="width : 36%">
           <el-radio v-model="deptBudgetList.warehouseType" label="1"
             >常用仓库发货</el-radio
           >
@@ -116,7 +116,6 @@
             clearable
             size="large"
             placeholder="请选择始发地"
-            style="width: 200%"
             @change="handleChange"
           />
         </el-form-item>
@@ -134,16 +133,18 @@
           ></el-input>
         </el-form-item>
         <el-form-item
-          label="收获库点"
+          label="收货库点"
           span="1"
           prop="contractNo"
           class="start-address"
+          style="width: 36%"
         >
           <el-select
             v-model="deptBudgetList.receiveWarehouse"
             :disabled="warehouse"
-            placeholder="收货苦点"
+            placeholder="请输入收货库点"
             class="typeselect"
+            style="width: 100%"
           >
             <el-option
               v-for="item in warehouseList"
@@ -165,7 +166,6 @@
             clearable
             size="large"
             placeholder="请选择终到地"
-            style="width: 200%"
             @change="handleChange1"
           />
         </el-form-item>
@@ -182,8 +182,8 @@
             size="small"
           ></el-input>
         </el-form-item>
-        <div>
-          <span class="check-box">运输方式</span>
+        <div class="check-box">
+          <span class="check-box" >运输方式</span>
           <el-checkbox-group v-model="checkList" prop="tranType">
             <el-checkbox label="汽运"></el-checkbox>
             <el-checkbox label="火运"></el-checkbox>
@@ -196,15 +196,10 @@
         style="width: 100%"
         class="position"
         v-for="(item, index) in deptBudgetList.tranProcessInfoList"
+        :key="index"
       >
         <div class="driver">
-          运输阶段{{ index + 1 }} {{ item.processNo }}
-          <el-checkbox
-            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
-            v-model="item.endFlag"
-            label="1"
-            >最终阶段</el-checkbox
-          >
+          <span >运输阶段{{ index + 1 }} {{ item.processNo }}</span>
           <img
             width="22"
             height="22"
@@ -221,6 +216,19 @@
             src="../../../public/img/del.png"
             alt=""
           />
+          <span style="margin-left : 20px;font-size : 14px"  v-if="index == deptBudgetList.tranProcessInfoList.length - 1">最终阶段</span>
+          <el-checkbox
+            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
+            v-model="item.endFlag"
+            :label="1"
+            ></el-checkbox
+          >  
+          <el-checkbox
+            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
+            v-model="item.endFlag"
+            :label="2"
+            ></el-checkbox
+          >        
         </div>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
@@ -705,17 +713,44 @@ export default {
 <style lang="scss" scoped>
 .position {
   position: relative;
+  border: 1px solid #5473e8;
+  border-radius: 4px;
+  margin-top: 20px;
+  background: #f6f7fc;
+  border-left: 5px solid #5473e8;
+}
+/deep/.position .ws-info-table .el-form-item {
+  width: 25%;
+
+  height: 50px;
+}
+/deep/.position .el-select {
+  width: 100%;
+}
+/deep/.position .ws-info-table .el-form-item .el-form-item__label,
+/deep/.position .ws-info-table .el-form-item .el-form-item__content {
+  background: #f6f7fc;
+  font-size: 14px;
+  color: #8890b1;
 }
 .del,
 .add {
   cursor: pointer;
+  margin-left: 10px;
 }
 .el-checkbox-group {
   font-size: 0;
   float: right;
+  margin-left: 25px;
+
 }
-.check-box[data-v-5c5ac25d] {
+.check-box {
   float: left;
+  font-size: 14px;
+  color: #8890B1;
+}
+.el-checkbox__label{
+  color: #8890B1;
 }
 .el-form {
   padding: 0 10%;
@@ -750,77 +785,10 @@ export default {
 .el-form {
   margin-top: 50px;
 }
-.el-form-item.start-address.el-form-item--small {
-  width: 33.3%;
-}
+
 .el-col {
   background: #f6f7fc;
 }
-// /deep/.ws-info-table .el-form-item .el-form-item__content {
-//   padding: 0 25px;
-//   border-left: 1px solid #cdd2dc;
-//   background: #fafbfc;
-// }
-// /deep/.ws-info-table .el-form-item .el-form-item__label {
-//   width: 140px;
-//   text-align: center;
-//   background: #f0f2f6;
-//   // border: 1px solid #cdd2dc;
-// }
-// .button-container {
-//   display: flex;
-//   flex-wrap: nowrap;
-//   justify-content: space-between;
-//   align-items: center;
-//   background-color: #fff;
-//   width: 100%;
-//   height: 50px;
-//   padding: 0 10px;
-//   & > div {
-//     margin-left: 10px;
-//     display: flex;
-//     flex-wrap: nowrap;
-//     flex-direction: row;
-//     & > span {
-//       line-height: 50px;
-//     }
-//   }
-
-//   /deep/.auditFlow-box {
-//     position: unset;
-//     margin-left: 10px;
-//     &/deep/.auditFlow-icon {
-//       width: auto;
-//       padding-right: 30px;
-//     }
-//     &/deep/.auditFlow-main {
-//       position: absolute;
-//     }
-//   }
-// }
-// .box-app {
-//   display: inline-block;
-//   float: left;
-//   margin-left: 30px;
-//   line-height: 50px;
-// }
-// /deep/.el-dialog {
-//   .el-form-item {
-//     margin-bottom: 0 !important;
-//     .el-input--medium {
-//       textarea {
-//         min-height: 100px !important;
-//       }
-//     }
-//   }
-// }
-// .collapse-bottom {
-//   margin-bottom: 20px;
-// }
-// .input-main .textarea .el-textarea__inner {
-//   width: 100%;
-//   z-index: 1;
-// }
 .bg-left {
   padding-left: 30px;
 }
@@ -837,105 +805,13 @@ export default {
   margin-left: 11px;
   width: 93px;
 }
-// .wenzi {
-//   width: 900px;
-//   margin: 0 auto;
-// }
-// .wenzi h3 {
-//   display: inline-block;
-//   left: 10px;
-// }
-// .wenzi p {
-//   display: inline-block;
-// }
-// .center {
-//   width: 900px;
-//   margin: 0 auto;
-// }
-// .el-form-item__label {
-//   text-align: center;
-// }
-// .el-table {
-//   width: 1240px;
-// }
-// .ce {
-//   width: 900px;
-//   margin: 0 auto;
-// }
-// .driver {
-//   width: 120px;
-//   margin-top: 10px;
-//   font-weight: bold;
-// }
-
-// // 控制select为只读的时候显示样式
-// /deep/.ws-class-table-col {
-//   height: auto;
-//   padding: 0px 2px;
-//   /deep/.el-input__inner {
-//     padding: 0px 2px;
-//   }
-// }
-// .winseaview-view {
-//   padding: 0 0 20px;
-// }
-// .container {
-//   overflow: scroll;
-//   height: 93vh;
-// }
-// /deep/.ws-info-table .el-form-item .el-form-item__label {
-//   width: 80px;
-// }
-/deep/.ws-info-table .el-form-item {
-  width: 20%;
+.driver {
+  margin-top: 10px;
+  font-weight: bold;
+  margin-left: 20px;
+  color: #5473E8;
+  font-size: 16px;
 }
-// .el-textarea__inner {
-//   display: none;
-// }
-// .el-form {
-//   margin-top: 50px;
-// }
-// .readonly {
-//   width: 16%;
-// }
-// .el-cascader {
-//   width: 145px;
-// }
-// .forlist {
-//   width: 20%;
-// }
-// .el-form-item.forlist.is-success.el-form-item--small {
-//   width: 20%;
-// }
-// .el-form-item.forlist.el-form-item--small {
-//   width: 20%;
-// }
-// .el-form-item.readonly.is-success.el-form-item--small.showLableToopTip {
-//   width: 20%;
-// }
-// .el-form-item.el-car.el-form-item--small {
-//   width: 33.3%;
-// }
-// .el-checkbox-group{
-//   margin-left: 240px;
-//     margin-top: -17px;
-// }
-// /deep/.neifor {
-//   .ws-info-table {
-//     border: none;
-//   }
-//   .el-form-item {
-//     // width: 33.3333%;
-//     border: none;
-//     .el-form-item__label {
-//       background: transparent;
-//       border: none;
-//     }
-//     .el-form-item__content {
-//       border: none;
-//     }
-//   }
-// }
 /deep/.nei {
   .ws-info-table {
     border: none;
@@ -952,16 +828,33 @@ export default {
     }
   }
 }
-// .ws-info-table .el-form-item .el-form-item__label {
-//     width: min-content;
-// }
-// .el-select>.el-input {
-//     display: block;
-//     width: 190px;
-// }
-// .ws-info-table .el-form-item {
-//     width: 20%;
-//     border: none;
-//     background: transparent;
-// }
+//输入框标题
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background: #ffffff;
+  width: min-content;
+  font-size: 14px;
+  color: #8890b1;
+}
+//表单子项
+/deep/.ws-info-table .el-form-item {
+  width: 20%;
+  border: none;
+  height: 50px;
+}
+//输入框
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+  font-size: 14px;
+  color: #8890b1;
+}
+/deep/ .el-input--small .el-input__inner {
+  font-size: 14px;
+  color: #8890b1;
+}
+.el-form-item.start-address.el-form-item--small {
+  width: 31.9%;
+}
+.el-cascader {
+  width: 100%;
+}
 </style>

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -107,8 +107,7 @@
       >
         <div class="trucks">
           <div class="driver">
-            <span class="driver">货车信息-{{ index + 1 }}</span>
-            
+            <span class="driver">货车信息-{{ index + 1 }}</span>         
             <img
               width="22"
               height="22"
@@ -126,7 +125,6 @@
               alt=""
             />
           </div>
-
           <ws-info-table class="el-table">
             <!--车牌号-->
             <ws-form-item

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -12,9 +12,11 @@
       <!-- 接单开始 -->
       <template slot="right">
         <div>
-          <span style="display: inline-block; width: 300px; color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 300px; color: #8890b1"
+            >接单日期</span
+          >
         </div>
-         
+
         <!-- <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
@@ -36,7 +38,6 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-         
         >
         </el-date-picker>
         <ws-input
@@ -212,8 +213,8 @@ export default {
       searchKeyWord: '',
       contractType: 2,
       tranTypeKey: 2,
-      searchType: 1,
-      searchTypeOne : 1,
+      searchTypeFeedback: 1,
+      searchTypeOne: 1,
       // 提交类型
       submitType: true,
       size: 10,
@@ -268,28 +269,6 @@ export default {
     },
     //查看火运调度详细
     trainSee(row) {
-      // if (row.tranType == '汽运') {
-      //   this.$router.push({
-      //     path: 'tranManagementVehicleLook',
-      //     query: {
-      //       id: row.id,
-      //     },
-      //   })
-      // }else if(row.tranType == '火运'){
-      //    this.$router.push({
-      //     path: 'tranManagementTransporTrainDetails',
-      //     query: {
-      //       id: row.id,
-      //     },
-      //   })
-      // }else if(row.tranType == '船运'){
-      //   this.$router.push({
-      //     path: 'tranManagementShippingLook',
-      //     query: {
-      //       id: row.id,
-      //     },
-      //   })
-      // }
       this.$router.push({
         path: 'tranManagementTransporFeedbackLook',
         query: {
@@ -306,8 +285,8 @@ export default {
         },
       })
     },
-     statusquery(status){
-      this.searchTypeOne = status
+    statusquery(status) {
+      this.searchTypeFeedback = status
       this.getList()
     },
     dateFormat(fmt, date) {
@@ -349,7 +328,7 @@ export default {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         contractType: this.contractType,
-          searchTypeOne :this.searchTypeOne,
+        searchTypeFeedback: this.searchTypeFeedback,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
       })
@@ -402,7 +381,7 @@ export default {
       this.currentPage = 1
       this.getList()
     },
-     async exportlist() {
+    async exportlist() {
       const { data } = await export1(
         {
           compId: sessionStorage.getItem('ws-pf_compId'),

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -871,7 +871,6 @@ export default {
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;

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/',