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

public/index.html

@@ -14,12 +14,12 @@
 
   <!-- 如果有安装 Google Chrome Frame 插件则强制为Chromium内核，否则强制本机支持的最高版本IE内核，作用于IE浏览器 -->
   <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
-  <link rel="manifest" href="<%= BASE_URL %>/manifest.json" />
-  <link rel="icon" href="<%= BASE_URL %>/winseaLogo.ico" />
+  <!-- <link rel="manifest" href="<%= BASE_URL %>/manifest.json" /> -->
+  <link rel="icon" href="<%= BASE_URL %>logo.ico">
   <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV]) { %>
       <link href="<%= htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV][i] %>" rel="stylesheet">
   <% } %>
-  <title>WinSea | 专注船舶管理服务</title>
+  <title>易粮易运</title>
   <% if (process.env.NODE_ENV === 'production') { %>
     <script>
     !(function(c,i,e,b){var h = i.createElement("script");var f = i.getElementsByTagName("script")[0];h.type = "text/javascript";h.crossorigin = true;h.onload = function(){try {c[b]||(c[b] = new c.wpkReporter({bid: 'qj3rmxes-10jz7agi',spa: true,  plugins: []}));c[b].installAll();} catch (e) {console.error('init wpkReporter fail', e);}};f.parentNode.insertBefore(h, f);h.src = e})(window, document, "https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js", "__wpk");

src/layout/index/sidebar/index.vue

@@ -39,7 +39,6 @@ export default {
     return {}
   },
   created() {
-    console.log(this.menu)
   },
   computed: {
     ...mapGetters(['website', 'menu', 'tag', 'keyCollapse', 'screen']),

src/layout/index/top/index.vue

@@ -406,35 +406,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.taskType {
-  width: 100%;
-  background-color: #fff;
-  margin-top: 2px;
-  margin-bottom: 10px;
-  // padding-bottom: 20px;
-  li {
-    float: left;
-    border: 1px solid #6ea0f3;
-    border-radius: 5px;
-    max-width: 190px;
-    padding: 0 5px;
-    text-align: center;
-    margin-top: 20px;
-    margin-left: 20px;
-    cursor: pointer;
-    font-size: 14px;
-    p {
-      margin: 8px 0px;
-      span {
-        color: #e74c3c;
-      }
-    }
-  }
-  li:hover {
-    background-color: #e4eeff;
-    color: #1d6ced;
-  }
-}
 .dayClass {
   font-size: 14px !important;
   span {

src/utils/getHasPermission.js

@@ -10,7 +10,6 @@ export function getHp (data) {
  */
 export function hasPermission (data) {
   let userPermissionList = Array.isArray(data) ? data : [data];
-  console.log(userPermissionList)
   // 当前用户的权限列表
   return userPermissionList.some(e => store.getters.roles.includes(e))
 }

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,32 +41,14 @@
                 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"
@@ -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: 60px;
+    box-sizing: border-box;
+}
+/deep/.el-col-12 {
+    width: 50%;
+    height: 60px;
+}
+.el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+    margin-left: 6px;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -1,58 +1,57 @@
 <!--出入库任务-->
 <template>
-   <div class="container">
-      <div class="nav">
-        <ws-button class="butt" type="primary" @click="handleAdd()"
+  <div class="container">
+    <div class="nav">
+      <ws-button
+        class="butt"
+        type="primary"
+        @click="handleAdd()"
         v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfoTask.add`
           "
-          ><img
-            width="13"
-            height="13"
-            style="
+      >
+        <img
+          width="13"
+          height="13"
+          style="
               vertical-align: text-top;
               position: relative;
               top: 2px;
               left: -4px;
             "
-            src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button
-        >
-        <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="
+          src="../../../public/img/header-add.png"
+          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>
+      <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> 
+          src="../../../public/img/sousuo.png"
+          alt
+        />
+      </ws-button>
+    </div>
     <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"
@@ -65,21 +64,14 @@
             <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
@@ -91,36 +83,24 @@
             >
               <template>
                 <span slot="reference">
-                  <span
-                    v-if="scope.row.taskStatus == '待审核'"
-                    class="executory"
-                  ></span>
-                  <span
-                    v-if="scope.row.taskStatus == '执行中'"
-                    class="inExecution"
-                  ></span>
-                  <span
-                    v-if="scope.row.taskStatus == '已完成'"
-                    class="done"
-                  ></span
-                  >{{ scope.row.taskStatus }}
+                  <span v-if="scope.row.taskStatus == '待审核'" class="executory"></span>
+                  <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
+                  <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>
+                  {{ scope.row.taskStatus }}
                 </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>
@@ -131,31 +111,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="
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfoTask.view`
-          ">
-              查看
-            </div>
+          "
+            >查看</div>
             <div
-            v-hasPermission="
+              v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfoTask.audit`
           "
               v-if="scope.row.taskStatus == '待审核'"
               class="adjustment"
               @click="delivery(scope.row)"
-            >
-              审核
-            </div>
+            >审核</div>
             <div
-            v-hasPermission="
+              v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfoTask.edit`
           "
               v-if="
@@ -164,11 +143,9 @@
               "
               class="record"
               @click="delivery(scope.row)"
-            >
-              编辑
-            </div>
+            >编辑</div>
             <div
-            v-hasPermission="
+              v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfoTask.delete`
           "
               v-if="
@@ -177,9 +154,7 @@
               "
               class="adjustment"
               @click="deleteclick(scope.row)"
-            >
-              删除
-            </div>
+            >删除</div>
           </template>
         </el-table-column>
       </el-table>
@@ -190,8 +165,7 @@
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
-      >
-      </el-pagination>
+      ></el-pagination>
     </div>
   </div>
 </template>
@@ -205,7 +179,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     vesselId(val) {
@@ -213,7 +187,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -231,7 +205,7 @@ export default {
       year: '',
       gainList: [],
       currentPage: 1,
-      primary:'1',
+      primary: '1',
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
@@ -247,11 +221,11 @@ export default {
       deptCircularPage: {},
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   activated() {
@@ -282,17 +256,17 @@ export default {
       this.$confirm(text, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           console.log(row)
           outdelete({
             id: row.id,
             relevanceId: row.relevanceId,
-            inOutFlag:row.inOutFlag
+            inOutFlag: row.inOutFlag
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.getList()
             })
         })
@@ -306,10 +280,10 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
+        searchKeyWord: this.searchKeyWord
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           console.log(response)
           this.gainList = response
           this.currentPage = response.current
@@ -322,9 +296,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
@@ -337,8 +311,8 @@ export default {
       this.$router.push({
         path: 'tranManagementWarehouseInOutTaskEdit',
         query: {
-          relevanceId: item.relevanceId,
-        },
+          relevanceId: item.relevanceId
+        }
       })
     },
 
@@ -378,8 +352,8 @@ export default {
       this.$router.push({
         path: 'inOutWarehouseTaskEdit',
         query: {
-          relevanceId: row.relevanceId,
-        },
+          relevanceId: row.relevanceId
+        }
       })
     },
     dateFormat(fmt, date) {
@@ -388,7 +362,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()          // 秒
         // 有其他格式化字符需求可以继续添加，必须转化成字符串
@@ -428,19 +402,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'))
             })
         })
@@ -458,7 +432,7 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id },
+        query: { id: row.id }
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -468,7 +442,7 @@ export default {
     history(row) {
       billoperatehis({ id: row.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.historyList = response
         })
     },
@@ -486,20 +460,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>
@@ -584,27 +557,29 @@ export default {
 .search {
   margin-left: -250px;
 }
-.butt{
- margin-left: 60px;
- margin-top: 20px;
+.butt {
+  margin-left: 6px;
+  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
-  
+.nav {
+  background: white;
+  height: 60px;
+  margin-top: -20px
 }
-.navv{
-  background: #FFFFFF;
+.navv {
+  background: #ffffff;
   border-radius: 4px;
   margin-top: -8px;
 }
@@ -613,9 +588,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/tranManagementDriverEdit.vue

@@ -810,7 +810,7 @@ export default {
       console.log(this.selectedOptions)
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementDriver' })
+      this.$router.go(-1)
     },
     // confirmPosition() {
     //   this.draggable = false
@@ -864,7 +864,7 @@ export default {
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
-              this.$router.push({ path: 'tranManagementDriver' })
+              this.$router.go(-1)
             })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/tranManagement/tranManagementShipping.vue

@@ -303,7 +303,7 @@ export default {
     // 派船
     shipping(row) {
       this.$router.push({
-        name: 'shippingDispatching',
+        name: 'shippingDispatchingcar',
         query: {
           id: row.id,
         },

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -22,52 +22,38 @@
         <div class="basicInformation">
           <div class="small-title">任务详情</div>
           <ws-info-table>
-            <!-- 任务编号 -->
-            <ws-form-item label="任务编号" span="1" prop="processNo">{{deptBudgetList.processNo}}</ws-form-item>
-            <!-- 货名 -->
+             <ws-form-item label="任务编号" span="1" prop="processNo">{{deptBudgetList.processNo}}</ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">{{deptBudgetList.goodsName}}</ws-form-item>
-            <!--重量（吨）-->
             <ws-form-item label="重量（吨）" span="1" prop="weight">{{deptBudgetList.weight}}</ws-form-item>
-            <!--发货地址-->
             <ws-form-item
               label="发货地址"
               span="1"
               prop="sendDetailedAddress"
-            >{{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}</ws-form-item>
-            <!--发货人-->
-            <ws-form-item label="发货人" span="1" prop="sender">{{deptBudgetList.sender}}</ws-form-item>
-
-            <!--发货人电话-->
+            >{{deptBudgetList.sendDetailedAddress}}</ws-form-item>
+           <ws-form-item label="发货人" span="1" prop="sender">{{deptBudgetList.sender}}</ws-form-item>
             <ws-form-item label="发货人电话" span="1" prop="senderPhone">{{deptBudgetList.senderPhone}}</ws-form-item>
-            <!--收货地址-->
             <ws-form-item
               label="收货地址"
               span="1"
               prop="receiveDetailedAddress"
-            >{{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}</ws-form-item>
-            <!--收货人-->
+            >{{deptBudgetList.receiveDetailedAddress}}</ws-form-item>
             <ws-form-item label="收货人" span="1" prop="receiver">{{deptBudgetList.receiver}}</ws-form-item>
-
-            <!--收货人电话-->
             <ws-form-item
               label="收货人电话"
               span="1"
               prop="receiverPhone"
             >{{deptBudgetList.receiverPhone}}</ws-form-item>
-            <!--发货日期-->
             <ws-form-item
               label="发货日期"
               span="1"
               prop="deliveryDateStart"
             >{{deptBudgetList.deliveryDateStart}}</ws-form-item>
-            <!--最晚发货日期-->
             <ws-form-item
               label="最晚到货日期"
               span="1"
               prop="deliveryDateEnd"
             >{{deptBudgetList.deliveryDateEnd}}</ws-form-item>
-            <!--合同编号-->
-            <ws-form-item label="合同编号" span="1" prop="contractNo">{{deptBudgetList.contractNo}}</ws-form-item>
+            <ws-form-item label="合同编号" span="1" prop="contractNo">{{deptBudgetList.contractNo}}</ws-form-item> 
           </ws-info-table>
           <div class="small-title">联络员及航次</div>
           <div
@@ -76,16 +62,14 @@
             :key="index"
           >
             <div class="zhong">
-              <ws-info-table>
-                -->
-                <!--姓名-->
-                <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"
@@ -95,8 +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"
@@ -104,40 +87,35 @@
                     maxlength="20"
                     size="small"
                   />
-                </ws-form-item>-->
-                <!--发船日期-->
-                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
+                </ws-form-item>
+                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="">
                   <ws-date-picker
                     v-model="item.sendDateStart"
                     type="date"
                     placeholder="请选择发货日期"
                     value-format="yyyy-MM-dd"
                   />
-                </ws-form-item>-->
-                <!--预计到港日-->
-                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
+                </ws-form-item>
+                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="">
                   <ws-date-picker
                     v-model="item.receiveDateEnd"
                     type="date"
                     placeholder="请选择发货日期"
                     value-format="yyyy-MM-dd"
                   />
-                </ws-form-item>-->
-                <!-- 船名 -->
-                <ws-form-item label="船名" span="1" prop="shipName" class="siji">
+                </ws-form-item>
+                <ws-form-item label="船名" span="1" prop="shipName" class="">
                   <ws-input
                     v-model="item.shipName"
                     placeholder="请输入船名"
                     maxlength="100"
                     size="small"
                   ></ws-input>
-                </ws-form-item>-->
-                <!-- 航次 -->
-                <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
+                </ws-form-item>
+                <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>
+                <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"
@@ -163,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">
@@ -180,7 +159,7 @@
                   alt
                 >X</span>
               </ws-info-table>
-            </div>-->
+            </div>
             <div>
               <el-button
                 class="add bg-bottom"
@@ -195,7 +174,7 @@
             </div>
           </div>
         </div>
-      </ws-form>
+      </ws-form> 
       <div style="text-align: right; padding: 10px">
         <el-button class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
       </div>
@@ -361,24 +340,24 @@ export default {
         .toPromise()
         .then(response => {
           this.deptBudgetList = response
-          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            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]
-              })
-            }
-          }
+          // for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          //   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]
+          //     })
+          //   }
+          // }
         })
     },
     //返回按钮
     revert() {
       this.freightspace = []
-      this.$router.push({ name: 'tranManagementShipping' })
+      this.$router.go(-1)
     },
     del(index) {
       if (this.freightspace.length > 1) {
@@ -526,9 +505,7 @@ export default {
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementShipping'
-                  })
+                  this.$router.go(-1)
                 })
             } else {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -711,6 +688,7 @@ export default {
   border-radius: 4px;
   /* border: 1px solid #d8dce6; */
   width: 1010px;
+  
 }
 /deep/.zi {
   width: 64px;
@@ -805,4 +783,12 @@ export default {
   background: #f6f7fc;
   border: 1px solid #d8dce6;
 }
+.bg-left {
+  padding-left: 30px;
+}
+.ys{
+  // margin-left: 300px;
+  width: 230px;
+  background: #5878e8;
+}
 </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.116: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/',