前端孟祥旭

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

@@ -41,8 +41,6 @@
               alt=""
           /></ws-button> 
       </div>
-    <div class="nav2" >
-       </div> 
     <div class="navv">
         <ws-button class="but" :type="primary == 1 ? 'primary' : ''"  @click="handlestatus(1)">
           待审核</ws-button>
@@ -590,6 +588,7 @@ export default {
 }
 .Value{
   width: 300px;
+  margin-left: 69%;
 }
 .el-pagination {
   margin-bottom: 20px;

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

@@ -163,6 +163,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 +181,7 @@
                   alt
                 >X</span>
               </ws-info-table>
-            </div>-->
+            </div>
             <div>
               <el-button
                 class="add bg-bottom"

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