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

src/views/taskManagement/tranManagementTransport.vue

@@ -2,31 +2,24 @@
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="12">
-    <template slot="left">
-        <ws-button class="but" type="primary" @click="handleAdd()"
-        v-hasPermission="
+      <template slot="left">
+        <ws-button
+          class="but"
+          type="primary"
+          @click="handleAdd()"
+          v-hasPermission="
            `transportationTask.transportation.transportationInfo.add`
           "
-          >添加</ws-button
-        >
+        >添加</ws-button>
+        <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="handlestatus(1)">执行中</ws-button>
+        <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="handlestatus(2)">已完成</ws-button>
+        <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @click="handlestatus('')">全部任务</ws-button>
       </template>
       <template slot="right">
         <span style="width: 134px; display: inline-block">起点：</span>
-        <el-input
-          label="起点"
-          placeholder="请输入起点"
-          clearable
-          maxlength="200"
-          type="input"
-        ></el-input>
+        <el-input label="起点" placeholder="请输入起点" clearable maxlength="200" type="input"></el-input>
         <span style="width: 134px; display: inline-block">终点：</span>
-        <el-input
-          label="终点"
-          placeholder="请输入终点"
-          clearable
-          maxlength="200"
-          type="input"
-        ></el-input>
+        <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input"></el-input>
         <el-input
           v-model="warehouseName"
           placeholder="可按合同编号或运输任务编号查找"
@@ -37,8 +30,8 @@
         ></el-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <div class="search">
-          <ws-button class="find" type="primary" @click="lookUp()"
-            ><img
+          <ws-button class="find" type="primary" @click="lookUp()">
+            <img
               width="16"
               height="16"
               style="
@@ -48,36 +41,18 @@
                 left: -8px;
               "
               src="../../../public/img/sousuo.png"
-              alt=""
-          /></ws-button>
+              alt
+            />
+          </ws-button>
         </div>
       </template>
-      
     </BaseHeaderLayout>
+
     <div>
-      <ws-button
-        class="but"
-        :type="primary == 1 ? 'primary' : ''"
-        @click="handlestatus(1)"
-      >
-        执行中</ws-button
-      >
-      <ws-button
-        class="but"
-        :type="primary == 2 ? 'primary' : ''"
-        @click="handlestatus(2)"
-        >已完成</ws-button
-      >
-      <ws-button
-        class="but"
-        :type="primary == 3 ? 'primary' : ''"
-        @click="handlestatus('')"
-        >全部任务</ws-button
-      >
       <el-table
         class="wenzi"
         :data="gainList.records"
-        style="width: 100%; margin-top: 20px"
+        style="width: 100%; "
         height="780"
       >
         <el-table-column type="index" label="序号">
@@ -86,34 +61,19 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="taskNo" label="运输任务编号" width="140">
-        </el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="160">
-        </el-table-column>
+        <el-table-column prop="taskNo" label="运输任务编号" width="140"></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 }})
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="tranType"
-          class="table_td"
-          label="运输方式"
-          width="120"
-        >
+          <template slot-scope="scope">{{ scope.row.goodsName }}({{ scope.row.weight }})</template>
         </el-table-column>
-        <el-table-column prop="" class="table_td" label="起点">
+        <el-table-column prop="tranType" class="table_td" label="运输方式" width="120"></el-table-column>
+        <el-table-column prop class="table_td" label="起点">
           <template slot-scope="scope">
             {{ scope.row.startPrivate }}{{ scope.row.startCity
             }}{{ scope.row.startArea }}{{ scope.row.startDetailedAddress }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="currentTransferAddress"
-          class="table_td"
-          label="当前中转"
-        >
-        </el-table-column>
+        <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转"></el-table-column>
         <el-table-column prop="end" class="table_td" label="终点">
           <template slot-scope="scope">
             {{ scope.row.endPrivate }}{{ scope.row.endCity
@@ -132,33 +92,24 @@
             >
               <template>
                 <span slot="reference">
-                  <span
-                    v-if="scope.row.status == '待执行'"
-                    class="executory"
-                  ></span>
-                  <span
-                    v-if="scope.row.status == '执行中'"
-                    class="inExecution"
-                  ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span v-if="scope.row.status == '待执行'" class="executory"></span>
+                  <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+                  <span v-if="scope.row.status == '已完成'" class="done"></span>
+                  {{ scope.row.status }}
                 </span>
               </template>
               <div>
                 <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 }}
-                  </div>
+                  <div class="vertical-text vertical-text-left">{{ item.updateDate }}</div>
                   <div>
                     <div class="vertical-circle"></div>
-                    <div
-                      v-if="index != historyList.length - 1"
-                      class="vertical-line"
-                    ></div>
+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
-                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                    {{ item.operateUser }}
+                    <br />
+                    {{ item.dealMsg }}
                   </div>
                 </div>
               </div>
@@ -169,7 +120,7 @@
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
               @click="editClick(scope.row)"
-              alt=""
+              alt
             />
           </template>
         </el-table-column>
@@ -181,25 +132,28 @@
             <ws-button class="putstorage" @click="delivery(scope.row)">
               编辑
             </ws-button>
-            <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button> -->
-            <div class="record" @click="nocomplete(scope.row)"
-            v-hasPermission="
+            <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button>-->
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="
            `transportationTask.transportation.transportationInfo.view`
-          ">
-              查看
-            </div>
-            <div class="record" @click="delivery(scope.row)"
-            v-hasPermission="
+          "
+            >查看</div>
+            <div
+              class="record"
+              @click="delivery(scope.row)"
+              v-hasPermission="
            `transportationTask.transportation.transportationInfo.edit`
-          ">
-              编辑
-            </div>
-            <div class="record" @click="deleteclick(scope.row)"
-            v-hasPermission="
+          "
+            >编辑</div>
+            <div
+              class="record"
+              @click="deleteclick(scope.row)"
+              v-hasPermission="
            `transportationTask.transportation.transportationInfo.delete`
-          ">
-              删除
-            </div>
+          "
+            >删除</div>
           </template>
         </el-table-column>
       </el-table>
@@ -216,7 +170,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     vesselId(val) {
@@ -224,7 +178,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -257,11 +211,11 @@ export default {
       deptCircularPage: {},
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   activated() {
@@ -283,15 +237,15 @@ export default {
       this.$confirm(`运输任务删除后不可恢复，是否确定删除？`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           console.log(row)
           deltran({
-            id: row.id,
+            id: row.id
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.getList()
             })
         })
@@ -305,10 +259,10 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
+        searchKeyWord: this.searchKeyWord
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.gainList = response
         })
     },
@@ -328,8 +282,8 @@ export default {
       this.$router.push({
         path: 'tranManagementTransportEdit',
         query: {
-          id: item.id,
-        },
+          id: item.id
+        }
       })
     },
     //查看
@@ -345,8 +299,8 @@ export default {
           positionId: item.binNumberId,
           warehouseName: item.warehouseName,
           binNumber: item.binNumber,
-          capacity: item.capacity - free,
-        },
+          capacity: item.capacity - free
+        }
       })
     },
     getSpanArr(data) {
@@ -385,8 +339,8 @@ export default {
       this.$router.push({
         path: 'tranManagementLook',
         query: {
-          id: row.id,
-        },
+          id: row.id
+        }
       })
     },
     //查看
@@ -407,7 +361,7 @@ export default {
         'Y+': date.getFullYear().toString(), // 年
         'm+': (date.getMonth() + 1).toString(), // 月
         'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
+        'H+': date.getHours().toString() // 时
         // "M+": date.getMinutes().toString(),         // 分
         // "S+": date.getSeconds().toString()          // 秒
         // 有其他格式化字符需求可以继续添加，必须转化成字符串
@@ -447,19 +401,19 @@ export default {
       this.$confirm(`是否将状态改为${status}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           editstatus({ id: row.id })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$notify.success({
                 title: '成功',
-                message: '状态修改成功',
+                message: '状态修改成功'
               })
               this.getList()
             })
-            .catch((response) => {
+            .catch(response => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
             })
         })
@@ -477,7 +431,7 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id },
+        query: { id: row.id }
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -487,7 +441,7 @@ export default {
     history(row) {
       billoperatehis({ id: row.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.historyList = response
         })
     },
@@ -505,20 +459,19 @@ export default {
           searchType: this.searchType,
           searchKeyWord: this.searchKeyWord,
           startDate: this.startDate,
-          endDate: this.endDate,
+          endDate: this.endDate
         },
         {},
         { responseType: 'blob' }
       ).toPromise()
       downloadFile({
         res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
+        fileName: `${this.date.year +
+          (this.date.month ? `-${this.date.month}` : '')}_采购合同`,
+        type: 'xls'
       })
-    },
-  },
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -639,4 +592,18 @@ export default {
 .done {
   background: #50cad4;
 }
+/deep/.el-row {
+    -webkit-box-sizing: border-box;
+    height: 50px;
+    box-sizing: border-box;
+}
+/deep/.el-col-12 {
+    width: 50%;
+    height: 50px;
+}
+.el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+    margin-left: 6px;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -1,12 +1,16 @@
 <!--出入库任务-->
 <template>
-   <div class="container">
-      <div class="nav">
-        <ws-button class="butt" type="primary" @click="handleAdd()"
-        v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfoTask.add`
+  <div class="container">
+    <BaseHeaderLayout :leftSpan="14">
+      <template slot="left">
+        <ws-button
+          type="primary"
+          @click="handleAdd()"
+          v-hasPermission="
+            `warehouseManagement.warehouse.warehouseInfoTask.add`
           "
-          ><img
+        >
+          <img
             width="13"
             height="13"
             style="
@@ -16,48 +20,70 @@
               left: -4px;
             "
             src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button
+            alt
+          />添加
+        </ws-button>
+        <ws-button
+          class="but"
+          :type="primary == 1 ? 'primary' : ''"
+          @click="handlestatus(1)"
+          >待审核</ws-button
+        >
+        <ws-button
+          class="but"
+          :type="primary == 2 ? 'primary' : ''"
+          @click="handlestatus(2)"
+          >已驳回</ws-button
+        >
+        <ws-button
+          class="but"
+          :type="primary == 3 ? 'primary' : ''"
+          @click="handlestatus(3)"
+          >执行中</ws-button
+        >
+        <ws-button
+          class="but"
+          :type="primary == 4 ? 'primary' : ''"
+          @click="handlestatus(4)"
+          >已完成</ws-button
+        >
+        <ws-button
+          class="but"
+          :type="primary == 5 ? 'primary' : ''"
+          @click="handlestatus('')"
+          >全部任务</ws-button
         >
+      </template>
+      <template slot="right">
         <ws-input
           v-model="warehouseName"
           placeholder="可按合同编号或任务编号查找"
           clearable
           maxlength="500"
           type="input"
-          class="Value"
-        ></ws-input> 
-          <ws-button class="find" type="primary" @click="lookUp()"
-            ><img
-              width="16"
-              height="16"
-              style="
-                vertical-align: text-top;
-                position: relative;
-                top: 0px;
-                left: -1px;
-              "
-              src="../../../public/img/sousuo.png"
-              alt=""
-          /></ws-button> 
-      </div>
-    <div class="nav2" >
-       </div> 
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()">
+          <img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -1px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt
+          />
+        </ws-button>
+      </template>
+    </BaseHeaderLayout>
     <div class="navv">
-        <ws-button class="but" :type="primary == 1 ? 'primary' : ''"  @click="handlestatus(1)">
-          待审核</ws-button>
-          <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="handlestatus(2)">
-          已驳回</ws-button>
-        <ws-button class="but" :type="primary == 3 ? 'primary' : ''"  @click="handlestatus(3)">
-          执行中</ws-button
-        >
-        <ws-button class="but" :type="primary == 4 ? 'primary' : ''" @click="handlestatus(4)">已完成</ws-button>
-        <ws-button class="but" :type="primary == 5 ? 'primary' : ''" @click="handlestatus('')">全部任务</ws-button>
       <el-table
         class="wenzi"
         :data="gainList.records"
         style="width: 100%; margin-top: 20px"
-        height="650"
+        height="780"
       >
         <el-table-column type="index" label="序号">
           <template scope="scope">
@@ -65,21 +91,42 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="80">
-        </el-table-column>
-        <el-table-column prop="inOutTaskNo" label="任务编号"> </el-table-column>
-        <el-table-column prop="warehouseName" class="table_td" label="库房名">
-        </el-table-column>
-        <el-table-column prop="inOutType" class="table_td" label="出入库类型">
-        </el-table-column>
-        <el-table-column prop="goodsName" class="table_td" label="货名">
-        </el-table-column>
-        <el-table-column prop="weight" class="table_td" label="重量（吨）">
-        </el-table-column>
-        <el-table-column prop="predictDate" class="table_td" label="预计日期">
-        </el-table-column>
-        <el-table-column prop="publisher" class="table_td" label="发布者">
-        </el-table-column>
+        <el-table-column
+          prop="contractNo"
+          label="合同编号"
+          width="80"
+        ></el-table-column>
+        <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
+        <el-table-column
+          prop="warehouseName"
+          class="table_td"
+          label="库房名"
+        ></el-table-column>
+        <el-table-column
+          prop="inOutType"
+          class="table_td"
+          label="出入库类型"
+        ></el-table-column>
+        <el-table-column
+          prop="goodsName"
+          class="table_td"
+          label="货名"
+        ></el-table-column>
+        <el-table-column
+          prop="weight"
+          class="table_td"
+          label="重量（吨）"
+        ></el-table-column>
+        <el-table-column
+          prop="predictDate"
+          class="table_td"
+          label="预计日期"
+        ></el-table-column>
+        <el-table-column
+          prop="publisher"
+          class="table_td"
+          label="发布者"
+        ></el-table-column>
         <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
@@ -102,8 +149,8 @@
                   <span
                     v-if="scope.row.taskStatus == '已完成'"
                     class="done"
-                  ></span
-                  >{{ scope.row.taskStatus }}
+                  ></span>
+                  {{ scope.row.taskStatus }}
                 </span>
               </template>
               <div>
@@ -120,7 +167,9 @@
                     ></div>
                   </div>
                   <div class="vertical-text">
-                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                    {{ item.operateUser }}
+                    <br />
+                    {{ item.dealMsg }}
                   </div>
                 </div>
               </div>
@@ -131,23 +180,30 @@
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
               @click="editClick(scope.row)"
-              alt=""
+              alt
             />
           </template>
         </el-table-column>
-        <el-table-column prop="establishDate" class="table_td" label="创建时间">
-        </el-table-column>
+        <el-table-column
+          prop="establishDate"
+          class="table_td"
+          label="创建时间"
+        ></el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <div class="record" @click="nocomplete(scope.row)" v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfoTask.view`
-          ">
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.view`
+              "
+            >
               查看
             </div>
             <div
-            v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfoTask.audit`
-          "
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.audit`
+              "
               v-if="scope.row.taskStatus == '待审核'"
               class="adjustment"
               @click="delivery(scope.row)"
@@ -155,9 +211,9 @@
               审核
             </div>
             <div
-            v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfoTask.edit`
-          "
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.edit`
+              "
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
@@ -168,9 +224,9 @@
               编辑
             </div>
             <div
-            v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfoTask.delete`
-          "
+              v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.delete`
+              "
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
@@ -190,8 +246,7 @@
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
-      >
-      </el-pagination>
+      ></el-pagination>
     </div>
   </div>
 </template>
@@ -231,7 +286,7 @@ export default {
       year: '',
       gainList: [],
       currentPage: 1,
-      primary:'1',
+      primary: '1',
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
@@ -289,7 +344,7 @@ export default {
           outdelete({
             id: row.id,
             relevanceId: row.relevanceId,
-            inOutFlag:row.inOutFlag
+            inOutFlag: row.inOutFlag,
           })
             .toPromise()
             .then((response) => {
@@ -322,9 +377,9 @@ export default {
         this.primary = 1
       } else if (status == 2) {
         this.primary = 2
-      }else if (status == 3) {
+      } else if (status == 3) {
         this.primary = 3
-      }else if (status == 4) {
+      } else if (status == 4) {
         this.primary = 4
       } else {
         this.primary = 5
@@ -567,44 +622,35 @@ export default {
   background: #e9ecf7;
 }
 .el-row {
-  height: 80px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-.but {
-  margin-left: 55px;
-  margin-top: 30px;
+  height: 50px;
 }
+
 .findValue {
   width: 0%;
   margin-left: 25%;
 }
-
 .search {
   margin-left: -250px;
 }
-.butt{
- margin-left: 60px;
- margin-top: 20px;
-}
-.Value{
+.Value {
   width: 300px;
+  margin-left: 766px;
 }
 .el-pagination {
   margin-bottom: 20px;
   margin-left: 40%;
 }
-.winseaview-main{
- background: #E8ECF6;
-box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+.winseaview-main {
+  background: #e8ecf6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-.nav{
-  background: white
-  
-}
-.navv{
-  background: #FFFFFF;
+// .nav {
+//   background: white;
+//   height: 60px;
+//   margin-top: -20px;
+// }
+.navv {
+  background: #ffffff;
   border-radius: 4px;
   margin-top: -8px;
 }
@@ -613,9 +659,9 @@ box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 //   height: 5px;
 //   background-color: #e8eaf1;
 // }
-.nav2{
+.nav2 {
   height: 25px;
-  background: #E8ECF6;
+  background: #e8ecf6;
   margin-top: 15px;
 }
 .spans {

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -64,7 +64,7 @@
         </el-table-column>
         <el-table-column class="table_td" prop="processNo" label="运输任务编号">
         </el-table-column>
-        <el-table-column prop="tranType" label="运输方式" width="80">
+        <el-table-column prop="tranType" label="运输方式">
         </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
 
@@ -72,10 +72,10 @@
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
          
         </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send">
+        <el-table-column class="table_td" label="发货" prop="send" width="240">
           
         </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive">
+        <el-table-column class="table_td" label="收货" prop="receive" width="240">
           
         </el-table-column>
         <el-table-column class="table_td" label="运输周期" prop="tranCycle">
@@ -517,14 +517,12 @@ export default {
   background: #e9ecf7;
 }
 .el-row{
-    height: 150px;
+    height: 60px;
 }
 .base_header_layout .grid-content{
     margin-top: 80px;
 }
-.but{
-    margin-left: 6px;
-}
+
 .el-input--small .el-input__inner{
     margin-left: 20px;
 }

src/views/tranManagement/tranManagementShipping.vue

@@ -3,9 +3,9 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" @click="statusquery(1)"> 执行中</ws-button>
-        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
+        <ws-button class="but" :type="searchType == 1 ?'primary':''"  @click="statusquery(1)"> 执行中</ws-button>
+        <ws-button class="but" :type="searchType == 2 ?'primary':''"  @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" :type="searchType == undefined ?'primary':''"  @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
@@ -301,13 +301,13 @@ export default {
     },
 
     // 派船
-    shipping(row){
-        this.$router.push({
-           name: 'shippingDispatchingcar',
-           query:{
-                 id: row.id ,    
-           }
-           })
+    shipping(row) {
+      this.$router.push({
+        name: 'shippingDispatchingcar',
+        query: {
+          id: row.id,
+        },
+      })
     },
     dateFormat(fmt, date) {
       let ret
@@ -506,14 +506,12 @@ export default {
   background: #e9ecf7;
 }
 .el-row {
-  height: 150px;
+  height: 60px;
 }
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
-.but {
-  margin-left: 6px;
-}
+
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -62,13 +62,14 @@
             :key="index"
           >
             <div class="zhong">
-                <ws-form-item label="姓名" span="1" prop="driver" class="siji">
+                <ws-form-item label="姓名" span="1" prop="driver" class="ys">
                   <el-select
                     v-model="item.driver"
                     placeholder="请选择姓名"
                     filterable
                     :filter-method="dataFilter"
                     @change="selectstaff"
+                    class="ys"
                   >
                     <el-option
                       v-for="item in options"
@@ -78,7 +79,7 @@
                     />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
+                <ws-form-item label="电话" span="1" prop="driverPhone" class="zz">
                   <ws-input
                     :readonly="true"
                     v-model="item.driverPhone"
@@ -87,7 +88,7 @@
                     size="small"
                   />
                 </ws-form-item>
-                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
+                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="">
                   <ws-date-picker
                     v-model="item.sendDateStart"
                     type="date"
@@ -95,7 +96,7 @@
                     value-format="yyyy-MM-dd"
                   />
                 </ws-form-item>
-                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
+                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="">
                   <ws-date-picker
                     v-model="item.receiveDateEnd"
                     type="date"
@@ -103,7 +104,7 @@
                     value-format="yyyy-MM-dd"
                   />
                 </ws-form-item>
-                <ws-form-item label="船名" span="1" prop="shipName" class="siji">
+                <ws-form-item label="船名" span="1" prop="shipName" class="">
                   <ws-input
                     v-model="item.shipName"
                     placeholder="请输入船名"
@@ -111,10 +112,10 @@
                     size="small"
                   ></ws-input>
                 </ws-form-item>
-                <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
+                <ws-form-item label="航次" span="1" prop="shipNo" class="">
                   <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small"></ws-input>
                 </ws-form-item>
-                <ws-form-item label="类型" span="1" prop="shipType" class="siji">
+                <ws-form-item label="类型" span="1" prop="shipType" class="">
                   <ws-select v-model="item.shipType" placeholder="请输入" class="typeselect">
                     <ws-option
                       v-for="items in shipType"
@@ -140,6 +141,7 @@
               class="xia"
               v-for="(items, index) in freightspace"
               v-show="item.shipType=='散船'"
+              :key="index"
             >
               <ws-info-table>
                 <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity" class="bot">
@@ -157,7 +159,7 @@
                   alt
                 >X</span>
               </ws-info-table>
-            </div>-->
+            </div>
             <div>
               <el-button
                 class="add bg-bottom"
@@ -686,6 +688,7 @@ export default {
   border-radius: 4px;
   /* border: 1px solid #d8dce6; */
   width: 1010px;
+  
 }
 /deep/.zi {
   width: 64px;
@@ -783,4 +786,9 @@ export default {
 .bg-left {
   padding-left: 30px;
 }
+.ys{
+  // margin-left: 300px;
+  width: 230px;
+  background: #5878e8;
+}
 </style>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -6,7 +6,12 @@
         <h2 class="bg-left title">船运调度详情</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="revert()"
+        >
           <img
             width="6"
             height="10"
@@ -20,225 +25,141 @@
     <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <div class="basicInformation">
-          <h2>任务编号</h2>
+          <div class="small-title">任务详情</div>
           <ws-info-table>
             <!-- 任务编号 -->
             <ws-form-item label="任务编号" span="1" prop="processNo">
-              <!-- <ws-input
-              v-model="deptBudgetList.processNo" 
-              placeholder="请输入任务编号"
-              maxlength="20"
-              size="small"
-              />-->
-              {{deptBudgetList.processNo}}
+              {{ deptBudgetList.processNo }}
             </ws-form-item>
             <!-- 货名 -->
             <ws-form-item label="货名" span="1" prop="goodsName">
-              <!-- <ws-input
-              v-model="deptBudgetList.goodsName"
-              placeholder="请输入货名"
-              maxlength="20"
-              size="small"
-              />-->
-              {{deptBudgetList.goodsName}}
+              {{ deptBudgetList.goodsName }}
             </ws-form-item>
             <!--重量（吨）-->
-            <ws-form-item label="重量（吨）" span="1" prop="weight" class="readonly">
-              <!-- <ws-input
-              v-model="deptBudgetList.weight"
-              placeholder="请输入重重"
-              maxlength="100"
-              size="small"
-              />-->
-              {{deptBudgetList.weight}}
+            <ws-form-item
+              label="重量（吨）"
+              span="1"
+              prop="weight"
+              class="readonly"
+            >
+              {{ deptBudgetList.weight }}
             </ws-form-item>
 
             <!--发货地址-->
             <ws-form-item label="发货地址" span="1">
-              <!-- <ws-input
-              readonly="readonly"
-              v-model="deptBudgetList.sendDetailedAddress"
-              placeholder=""
-              maxlength="120"
-              size="small"
-              />-->
-              {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
+              {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
+              }}{{ deptBudgetList.sendArea }}
             </ws-form-item>
             <!--发货人-->
             <ws-form-item label="发货人" span="1" prop="sender">
-              <!-- <ws-input
-              v-model="deptBudgetList.sender"
-              placeholder="请输入发货人姓名"
-              maxlength="100"
-              size="small"
-              />-->
-              {{deptBudgetList.sender}}
+              {{ deptBudgetList.sender }}
             </ws-form-item>
 
             <!--发货人电话-->
             <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-              <!-- <ws-input
-              v-model="deptBudgetList.senderPhone"
-              placeholder="请输入发货人电话"
-              maxlength="100"
-              size="small"
-              />-->
-              {{deptBudgetList.senderPhone}}
+              {{ deptBudgetList.senderPhone }}
             </ws-form-item>
             <!--收货地址-->
-            <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
-              <!-- <el-cascader
-            v-model="deptBudgetList.receiveDetailedAddress"
-            clearable
-            size="large"
-            placeholder="请选择发货地址"
-            style="width: 200%"
-              />-->
-              {{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}
+            <ws-form-item
+              label="收货地址"
+              span="1"
+              prop="receiveDetailedAddress"
+            >
+              {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
+              }}{{ deptBudgetList.receiveArea }}
             </ws-form-item>
             <!--收货人-->
             <ws-form-item label="收货人" span="1" prop="receiver">
-              <!-- <ws-input
-              v-model="deptBudgetList.receiver"
-              placeholder="请输入发货人"
-              maxlength="100"
-              size="small"
-              />-->
-              {{deptBudgetList.receiver}}
+              {{ deptBudgetList.receiver }}
             </ws-form-item>
 
             <!--收货人电话-->
             <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-              <!-- <ws-input
-              v-model="deptBudgetList.receiverPhone"
-              placeholder="请输入收货人电话"
-              maxlength="100"
-              size="small"
-              />-->
-              {{deptBudgetList.receiverPhone}}
+              {{ deptBudgetList.receiverPhone }}
             </ws-form-item>
 
             <!--发船日期-->
             <ws-form-item label="发船日期" span="1" prop="deliveryDateStart">
-              <!-- <ws-input
-            v-model="deptBudgetList.deliveryDateStart"
-            placeholder=""
-            maxlength="20"
-            size="small"
-              />-->
-              {{deptBudgetList.deliveryDateStart}}
+              {{ deptBudgetList.deliveryDateStart }}
             </ws-form-item>
 
             <!--最晚发货日期-->
             <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-              <!-- <ws-input
-            v-model="deptBudgetList.deliveryDateEnd"
-            placeholder=""
-            maxlength="20"
-            size="small"
-              />-->
-              {{deptBudgetList.deliveryDateEnd}}
+              {{ deptBudgetList.deliveryDateEnd }}
             </ws-form-item>
             <!--合同编号-->
             <ws-form-item label="合同编号" span="1" prop="contractNo">
-              <!-- <ws-input
-            v-model="deptBudgetList.contractNo"
-            placeholder="请输入合同编号"
-            maxlength="20"
-            size="small"
-              />-->
-              {{deptBudgetList.contractNo}}
+              {{ deptBudgetList.contractNo }}
             </ws-form-item>
           </ws-info-table>
           <div class="small-title">联络员及航次</div>
-          <div class="aa">
-            <div class="small-title">航次信息</div>
-            <div
-              style="width: 100%"
-              class="flex position"
-              v-for="(item, index) in deptBudgetList.tranCarInfoList"
-            >
-              <ws-info-table>
-                <!-- 姓名 -->
-                <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-                  <!-- <ws-input
-                  v-model="item.driver"
-                  placeholder="请选择联络员"
-                  size="small"
-                  ></ws-input>-->
-                  {{item.driver}}
-                </ws-form-item>
-                <!-- 电话 -->
-                <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-                  <!-- <ws-input
-                  v-model="item.driverPhone"
-                  placeholder="联络员电话"
-                  size="small"
-                  ></ws-input>-->
-                  {{item.driverPhone}}
-                </ws-form-item>
-                <!--发船日期-->
-                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-                  <!-- <ws-input
-                  v-model="item.sendDateStart"
-                  placeholder="请选择日期"
-                  ></ws-input>-->
-                  {{item.sendDateStart}}
-                </ws-form-item>
-                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-                  <!-- <ws-input
-                  v-model="item.receiveDateEnd"
-                  placeholder="请选择日期"
-                  value-format="yyyy-MM-dd"
-                  size="small"
-                  />-->
-                  {{item.receiveDateEnd}}
-                </ws-form-item>
-                <!-- 船名 -->
-                <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-                  <!-- <ws-input 
-                  v-model="item.shipName"
-                  placeholder="请输入船名"
-                  maxlength="100"
-                  size="small"
-                  ></ws-input>-->
-                  {{item.shipName}}
-                </ws-form-item>
-                <!-- 航次 -->
-                <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-                  <!-- <ws-input 
-                  v-model="item.shipNo"
-                  placeholder="请选择航次"
-                  maxlength="100"
-                  size="small"
-                  ></ws-input>-->
-                  {{item.shipNo}}
-                </ws-form-item>
-                <!-- 类型 -->
-                <ws-form-item label="类型" span="1" prop="shipType" class="siji">
-                  <!-- <ws-input
-                  v-model="item.shipType"
-                  placeholder=""
-                  size="small"
-                  ></ws-input>-->
-                  {{item.shipType}}
-                </ws-form-item>
-                <ws-form-item
-                  label="数量"
-                  span="1"
-                  prop="boxNumber"
-                  class="siji"
-                  v-show="item.shipType=='集装箱'"
-                >
-                  <!-- <ws-input
-          v-model="item.boxNumber"
-          placeholder="请输入数量"
-          size="small"
-                  ></ws-input>-->
-                  {{item.boxNumber}}
-                </ws-form-item>
-              </ws-info-table>
-            </div>
+          <div
+            style="width: 100%"
+            class="flex position middle"
+            v-for="(item, index) in deptBudgetList.tranCarInfoList"
+          >
+        <div style="margin: 18px;color: #69708C;">航次信息</div>
+            <ws-info-table>
+              <!-- 姓名 -->
+              <ws-form-item label="姓名" span="1" prop="driver" class="siji">
+                {{ item.driver }}
+              </ws-form-item>
+              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- 电话 -->
+              <ws-form-item
+                label="电话"
+                span="1"
+                prop="driverPhone"
+                class="siji"
+              >
+                {{ item.driverPhone }}
+              </ws-form-item>
+              <el-divider direction="vertical" class="line"></el-divider>
+              <!--发船日期-->
+              <ws-form-item
+                label="发船日期"
+                span="1"
+                prop="sendDateStart"
+                class="siji"
+              >
+                {{ item.sendDateStart }}
+              </ws-form-item>
+              <el-divider direction="vertical" class="line"></el-divider>
+              <ws-form-item
+                label="预计到港日期"
+                span="1"
+                prop="receiveDateEnd"
+                class="siji"
+              >
+                {{ item.receiveDateEnd }}
+              </ws-form-item>
+              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- 船名 -->
+              <ws-form-item label="船名" span="1" prop="shipName" class="siji">
+                {{ item.shipName }}
+              </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
+              <!-- 航次 -->
+              <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
+                {{ item.shipNo }}
+              </ws-form-item>
+
+              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- 类型 -->
+              <ws-form-item label="类型" span="1" prop="shipType" class="siji">
+                {{ item.shipType }}
+              </ws-form-item>
+              <ws-form-item
+                label="数量"
+                span="1"
+                prop="boxNumber"
+                class="siji"
+                v-show="item.shipType == '集装箱'"
+              >
+                {{ item.boxNumber }}
+              </ws-form-item>
+               
+            </ws-info-table>
           </div>
           <div class="xia">
             <div
@@ -248,43 +169,34 @@
               :key="index"
             >
               <ws-info-table>
-                <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
-                  <!-- <ws-input
-          v-model="item.impurity"
-          placeholder="请输入仓位号"
-          size="small"
-                  ></ws-input>-->
-                  {{items.impurity}}
+                <ws-form-item
+                  :label="'仓位号-' + (index + 1)"
+                  span="1"
+                  prop="impurity"
+                  class="bot"
+                >
+                  {{ items.impurity }}
                 </ws-form-item>
                 <!-- 重量（吨） -->
-                <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
-                  <!-- <ws-input
-          v-model="item.positionWeight"
-          placeholder="请输入装仓重量"
-          size="small"
-                  ></ws-input>-->
-                  {{items.positionWeight}}
+                <ws-form-item
+                  label="重量(吨)"
+                  span="1"
+                  prop="positionWeight"
+                  class="bot"
+                >
+                  {{ items.positionWeight }}
                 </ws-form-item>
               </ws-info-table>
-              <!-- <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(index)"
-            src="../../../public/img/del.png"
-            alt=""
-              />-->
             </div>
           </div>
-          <!-- <el-button
-          class="add"
-          type="primary"
-          size="small"
-          @click="add()"
-          >添加仓位</el-button
-          >-->
           <div style="text-align: right; padding: 10px">
-            <el-button class="bg-bottom-up" type="primary" size="small" @click="returnsales()">关闭</el-button>
+            <el-button
+              class="bg-bottom-up"
+              type="primary"
+              size="small"
+              @click="returnsales()"
+              >关闭</el-button
+            >
           </div>
         </div>
       </ws-form>
@@ -301,7 +213,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination
+    Pagination,
   },
   watch: {
     // vesselId(val) {
@@ -309,7 +221,7 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    }
+    },
   },
   data() {
     return {
@@ -344,16 +256,16 @@ export default {
       tranCarInfoList: [],
       list: [],
       arr: [],
-      freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
+      freightspace: [],
       rules: {
         netWeight: [
           {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur'
-          }
-        ]
+            trigger: 'blur',
+          },
+        ],
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -361,21 +273,21 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM')
+        month: dayjs().format('MM'),
       },
       contractList: [],
       deptBudgetList: {
         warehouseInOutDetail: {},
-        tranCarInfoList: []
+        tranCarInfoList: [],
       },
       historyList: [],
 
       pickerBeginDateBefore: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           return time.getTime() > Date.now()
-        }
+        },
       },
-      accessoryTFs: false
+      accessoryTFs: false,
     }
   },
   mounted() {
@@ -392,26 +304,16 @@ export default {
     loaddata() {
       shippingLook({ id: this.$route.query.id })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.deptBudgetList = response
-          // this.deptBudgetList.driver = this.deptBudgetList.tranCarInfoList[0].driver
-          // this.deptBudgetList.driverPhone = this.deptBudgetList.tranCarInfoList[0].driverPhone
-          // this.deptBudgetList.sendDateStart = this.deptBudgetList.tranCarInfoList[0].sendDateStart
-          //   this.deptBudgetList.sendDateStart = this.deptBudgetList.tranCarInfoList[0].sendDateStart
-          //    this.deptBudgetList.receiveDateEnd = this.deptBudgetList.tranCarInfoList[0].receiveDateEnd
-          //   this.deptBudgetList.shipName = this.deptBudgetList.tranCarInfoList[0].shipName
-          //    this.deptBudgetList.shipNo = this.deptBudgetList.tranCarInfoList[0].shipNo
-          //     this.deptBudgetList.shipType = this.deptBudgetList.tranCarInfoList[0].shipType
-          //    this.deptBudgetList. boxNumber =this.deptBudgetList.tranCarInfoList[0].boxNumber
           for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            var num = this.deptBudgetList.tranCarInfoList[
-              i
-            ].positionWeight.split(',')
+            var num =
+              this.deptBudgetList.tranCarInfoList[i].positionWeight.split(',')
             for (var j = 0; j < num.length; j++) {
               var num2 = num[j].split('/')
               this.freightspace.push({
                 impurity: num2[i],
-                positionWeight: num2[num2.length - 1]
+                positionWeight: num2[num2.length - 1],
               })
             }
           }
@@ -423,17 +325,17 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         contractType: this.contractType,
-        tranTypeKey: this.tranTypeKey
+        tranTypeKey: this.tranTypeKey,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.warehouseList = response
         })
     },
     //返回按钮
     revert() {
       this.freightspace = []
-      this.$router.push({ path: 'tranManagementShipping' })
+      this.$router.go(-1)
     },
     del(index) {
       if (this.freightspace.length > 1) {
@@ -444,7 +346,7 @@ export default {
       this.freightspace.push({
         binNumber: '',
         maxStorage: '',
-        remark: ''
+        remark: '',
       })
     },
     //提交按钮
@@ -452,19 +354,18 @@ export default {
       this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate(valid => {
+          this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId = sessionStorage.getItem(
-                'ws-pf_compId'
-              )
+              this.deptBudgetList.compId =
+                sessionStorage.getItem('ws-pf_compId')
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 1
               addstorageputList(this.deptBudgetList)
                 .toPromise()
-                .then(response => {
+                .then((response) => {
                   this.$message.success('暂存成功')
                   this.$router.push({ path: 'warehouseManagementList' })
                 })
@@ -522,8 +423,8 @@ export default {
       }
     },
     approve() {},
-    listQuery() {}
-  }
+    listQuery() {},
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -695,23 +596,6 @@ export default {
     border: none;
   }
 }
-//联络员及航次样式
-.aa {
-  width: 100%;
-  height: 90px;
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-}
-// .xia{
-//   width:500px;
-//   // height: 46px;
-//   background: #F5F7FA;
-//   border-radius: 4px;
-//   // border: 1px solid #D8DCE6;
-//   margin-top: 10px;
-//   border: none;
-// }
 .xia {
   width: 700px;
   // height: 50px;
@@ -729,7 +613,7 @@ export default {
   line-height: 16px;
 }
 .position .siji {
-  width: 14.2%;
+  width: 13%;
 }
 .el-form {
   height: 1000px;
@@ -740,4 +624,14 @@ export default {
 /deep/.position .ws-info-table .el-form-item .el-form-item__label {
   background-color: #f5f7fa;
 }
+.middle {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+.line{
+  height: 26px;
+  margin-top: 6px;
+  left: -20px;
+}
 </style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -3,6 +3,11 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
+         <ws-button class="but"  :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
+          执行中</ws-button
+        >
+        <ws-button class="but"  :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but"  :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
@@ -45,11 +50,7 @@
       </template>
     </BaseHeaderLayout>
     <div class="container">
-       <ws-button class="but"  :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but"  :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but"  :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button>
+      
       <el-table
         class="wenzi"
         :data="tranManagementList.records"
@@ -62,17 +63,17 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" width="120">
+        <el-table-column prop="processNo" label="运输任务编号" >
         </el-table-column>
-        <el-table-column prop="tranType" label="运输方式" width="80">
+        <el-table-column prop="tranType" label="运输方式" >
         </el-table-column>
-        <el-table-column prop="goodsName" label="货名" width="80">
+        <el-table-column prop="goodsName" label="货名" >
         </el-table-column>
         <el-table-column prop="weight" label="重量（吨）" width="120">
         </el-table-column>
-        <el-table-column prop="send" label="发货" width="200">
+        <el-table-column prop="send" label="发货" width="240">
         </el-table-column>
-        <el-table-column prop="receive" label="收货" width="200">
+        <el-table-column prop="receive" label="收货" width="240">
         </el-table-column>
         <el-table-column prop="tranCycle" label="运输周期" width="160">
           <template scope="scope">
@@ -486,11 +487,6 @@ export default {
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
-//待完成三按钮
-.but {
-  margin-top: 10px;
-  margin-left: 110px;
-}
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -531,9 +531,7 @@ export default {
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
-.but {
-  margin-left: 6px;
-}
+
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -99,18 +99,22 @@
           <ws-form-item label="姓名：" span="1" prop="driver">
             {{ item.driver }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--电话-->
           <ws-form-item label="电话：" span="1" prop="driverPhone">
             {{ item.driverPhone }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--发车日期-->
           <ws-form-item label="发车日期：" span="1" prop="sendDateStart">
             {{ item.sendDateStart }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--到站日期-->
           <ws-form-item label="到站日期：" span="1" prop="receiveDateEnd">
             {{ item.receiveDateEnd }}
           </ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
           <!--车型-->
           <ws-form-item label="车型：" span="1" prop="carModel">
             {{ item.carModel }}
@@ -131,6 +135,7 @@
             >
               {{ items.trainNo }}
             </ws-form-item>
+               <el-divider direction="vertical" class="line" v-if="(index+1) % 5 != 0"></el-divider>
           </div>
         </ws-info-table>
       </div>
@@ -442,11 +447,7 @@ export default {
 .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;
@@ -640,18 +641,6 @@ export default {
   border: none;
   height: 50px;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
   font-size: 14px;
@@ -662,16 +651,21 @@ export default {
 }
 
 /deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
   border-radius: 4px;
-  border: 1px solid #d8dce6;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  color: #8890b1;
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #F5F7FA;
 }
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 18.7%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 30%;
@@ -689,8 +683,11 @@ export default {
 /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;
+border: none;
+}
+.line{
+  height: 26px;
+  margin-top: 14px;
+  left: -34px;
 }
 </style>

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -856,7 +856,6 @@ export default {
   color: #8890b1;
   line-height: 16px;
 }
-
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
   border-radius: 4px;

src/views/tranManagement/tranManagementVehicle.vue

@@ -186,7 +186,6 @@ export default {
       monetaryKey: null,
       // 表格显示数据
       tableDate: [],
-
       // 是否显示
       showType: true,
       // 年
@@ -530,9 +529,6 @@ export default {
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
-.but {
-  margin-left: 6px;
-}
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -105,21 +105,27 @@
           <ws-form-item label="姓名" span="1" prop="driver">
             {{ item.driver }}
           </ws-form-item>
+           <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item class="phone" label="电话" span="1" prop="driverPhone">
             {{ item.driverPhone }}
           </ws-form-item>
+           <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="车牌号" span="1" prop="carNo">
             {{ item.carNo }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="装车（吨）" span="1" prop="loadNetWeight">
             {{ item.loadNetWeight }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="卸车（吨）" span="1" prop="unloadNetWeight">
             {{ item.unloadNetWeight }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="损耗（吨）" span="1" prop="loss">
             {{ item.loss }}
           </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
           <ws-form-item label="合同" span="1" prop="unloadNetWeight" class="hetong">
           </ws-form-item>
         </ws-info-table>
@@ -425,7 +431,7 @@ export default {
   font-size: 14px;
 }
 /deep/.driver .ws-info-table .el-form-item {
-  width: 14.28%;
+  width: 13.1%;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
   width: 86px;
@@ -444,7 +450,7 @@ export default {
   margin-left: 15px;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__content {
-  border-right: 1px solid #8890b1;
+  // border-right: 1px solid #8890b1;
   background: #f6f7fb;
   font-size: 14px;
   color: #8890b1;
@@ -472,4 +478,9 @@ export default {
 /deep/.driver.ws-info-table .el-form-item .el-form-item__content{
   border:none
 }
+.line{
+ height: 26px;
+ margin-top: 6px;
+left: -36px;
+}
 </style>

src/views/warehouse/warehouseManagementList.vue

@@ -492,7 +492,7 @@ export default {
     },
     //任务
     handlTask(){
-      this.$router.push({path:'warehouseManagementPutOut'})
+      this.$router.push({ path: 'warehouseManagementPutOut' })
     },
     dateFormat(fmt, date) {
       let ret

vue.config.js

@@ -143,7 +143,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.119:8090/',
+        target: 'http://192.168.1.116:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',