前端sdy

src/views/taskManagement/tranManagementTransport.vue

@@ -1,8 +1,16 @@
 <!--运输任务-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="15">
-      <template slot="left">
+    <BaseHeaderLayout :leftSpan="12">
+    <template slot="left">
+        <ws-button class="but" type="primary" @click="handleAdd()"
+        v-hasPermission="
+           `transportationTask.transportation.transportationInfo.add`
+          "
+          >添加</ws-button
+        >
+      </template>
+      <template slot="right">
         <span style="width: 134px; display: inline-block">起点：</span>
         <el-input
           label="起点"
@@ -44,14 +52,7 @@
           /></ws-button>
         </div>
       </template>
-      <template slot="right">
-        <ws-button class="but" type="primary" @click="handleAdd()"
-        v-hasPermission="
-           `transportationTask.transportation.transportationInfo.add`
-          "
-          >添加</ws-button
-        >
-      </template>
+      
     </BaseHeaderLayout>
     <div>
       <ws-button
@@ -588,11 +589,12 @@ export default {
   text-align: center;
 }
 .findValue.el-input {
-  width: 50%;
+  width: 100%;
   margin: 0;
 }
 .el-input {
   margin: 0 10px;
+  width: 70%;
 }
 /deep/.search .el-button--small {
   padding: 0;

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

@@ -75,7 +75,7 @@ const tranManagementRouter = {
     },
     //船运调度详情
     {
-      path: 'shippingDispatching/view',
+      path: 'tshippingDispatching/view',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShippingLook'),
       name: 'tshippingDispatchingview',
@@ -312,4 +312,4 @@ const tranManagementRouter = {
     },
   ],
 };
-export default tranManagementRouter;
+export default tranManagementRouter;  

src/views/tranManagement/tranManagementDriver.vue

@@ -2,10 +2,10 @@
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="12">
-      <template slot="right">
+      <template slot="left">
         <ws-button type="primary" @click="handleAdd()">添加</ws-button>
       </template>
-      <template slot="left">
+      <template slot="right">
         <span style="display: inline-block; width: 60px; color: #8890b1"
           >城市</span
         >
@@ -26,7 +26,6 @@
           type="input"
           class="findValue"
         ></ws-input>
-
         <ws-button type="primary" @click="handleLook()">
           <img
             width="14"
@@ -323,26 +322,6 @@
       <p>查看附件</p>
       <img width="100" height="100" :src="accessurl" alt="" />
     </WinseaContentModal>
-    <!-- <WinseaContentModal
-      v-model="accessoryTFs"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose"
-    >
-      <el-upload
-        class="upload-demo"
-        action="https://jsonplaceholder.typicode.com/posts/"
-        :file-list="fileList"
-        list-type="picture"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      >
-        <el-button size="small" type="primary">点击上传</el-button>
-        <template #tip>
-          <div class="el-upload__tip">
-            只能上传 jpg/png 文件，且不超过 500kb
-          </div>
-        </template>
-      </el-upload>
-    </WinseaContentModal> -->
   </div>
 </template>
 <script>
@@ -353,7 +332,6 @@ import {
   disableDriver,
 } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
-// provinceAndCityData省市二级
 import { provinceAndCityData, CodeToText } from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -1,4 +1,4 @@
-//收获反馈
+//收货反馈
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="13">
@@ -12,10 +12,10 @@
       <!-- 接单开始 -->
       <template slot="right">
        <div>
-          <span style="display: inline-block; width: 239px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
         </div>
         <el-date-picker
-          v-model="deptBudgetList.inOutDate"
+          v-model="inOutDate"
           type="daterange"
           align="right"
           unlink-panels
@@ -225,6 +225,7 @@ export default {
       deptBudgetList: {},
       historyList: [],
       value2:'',
+      inOutDate:[],
       pickerOptions:[],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -245,6 +246,9 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         feedbackFlag: this.feedbackFlag,
+         startDate: this.startDate ,
+        endDate:this.endDate,
+        searchKeyWord : this.searchKeyWord
         
       })
         .toPromise()
@@ -435,6 +439,13 @@ export default {
         })
     },
     find() {
+     if (this.inOutDate.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      } else {
+        this.startDate = ''
+        this.endDate = ''
+      }
       this.currentPage = 1
       this.getList()
     },
@@ -520,7 +531,7 @@ export default {
 }
 .el-range-editor--small.el-input__inner {
     height: 32px;
-    margin-left: -20%;
+    margin: 0 10px;
 }
 //状态样式
 .executory,

src/views/tranManagement/tranManagementShipping.vue

@@ -3,26 +3,25 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" @click="statusquery(1)">
-          执行中</ws-button
-        >
+        <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>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
         <div>
-        <span style="display: inline-block; width: 239px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 60px; color: #8890b1"
+            >接单日期</span
+          >
         </div>
         <el-date-picker
-          v-model="deptBudgetList.inOutDate"
+          v-model="inOutDate"
           type="daterange"
           align="right"
           unlink-panels
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-
         >
         </el-date-picker>
         <ws-input
@@ -47,7 +46,6 @@
             src="../../../public/img/sousuo.png"
             alt=""
         /></ws-button>
-       
       </template>
     </BaseHeaderLayout>
     <div>
@@ -57,28 +55,24 @@
         style="width: 100%; margin-top: 20px"
         height="780"
       >
-        <el-table-column type="index" label="序号" width="80" >
+        <el-table-column type="index" label="序号" width="80">
         </el-table-column>
         <el-table-column class="table_td" prop="processNo" label="运输任务编号">
         </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
-
         </el-table-column>
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
-         
         </el-table-column>
         <el-table-column class="table_td" label="发货" prop="send">
-          
         </el-table-column>
         <el-table-column class="table_td" label="收货" prop="receive">
-          
         </el-table-column>
         <el-table-column class="table_td" label="运输周期" prop="tranCycle">
-         <template scope="scope">
-               {{scope.row.deliveryDateStart}} ~ {{scope.row.deliveryDateEnd}}
-             </template>
+          <template scope="scope">
+            {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
+          </template>
         </el-table-column>
-      <el-table-column prop="status" label="状态">
+        <el-table-column prop="status" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -97,13 +91,20 @@
                     v-if="scope.row.processStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.processStatus == '已完成'" class="done"></span
+                  <span
+                    v-if="scope.row.processStatus == '已完成'"
+                    class="done"
+                  ></span
                   >{{ scope.row.processStatus }}
                 </span>
               </template>
               <div>
                 <p style="margin-top: 0; padding-left: 10px">历史记录</p>
-                <div v-for="(item, index) in historyList" class="flex" :key="index">
+                <div
+                  v-for="(item, index) in historyList"
+                  class="flex"
+                  :key="index"
+                >
                   <div class="vertical-text vertical-text-left">
                     {{ item.updateDate }}
                   </div>
@@ -129,17 +130,13 @@
               alt=""
             />
           </template>
-      </el-table-column>
-      <el-table-column class="table_td" label="接单日期" prop="receivingDate">
+        </el-table-column>
+        <el-table-column class="table_td" label="接单日期" prop="receivingDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <div class="record" @click="handleLook(scope.row)">
-              查看
-            </div>
-            <div class="adjustment" @click="shipping(scope.row)">
-              船次
-            </div>
+            <div class="record" @click="handleLook(scope.row)">查看</div>
+            <div class="adjustment" @click="shipping(scope.row)">船次</div>
           </template>
         </el-table-column>
       </el-table>
@@ -157,11 +154,7 @@
   </div>
 </template>
 <script>
-import {
-  getList,
-  shippingList,
-  alsostate,
-} from '@/model/transport/index'
+import { getList, shippingList, alsostate } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -194,19 +187,18 @@ export default {
       showType: true,
       // 年
       year: '',
-      pickerOptions:{
-        
-      },
+      pickerOptions: {},
       value2: '',
-      deptBudgetTotal:0,
+      deptBudgetTotal: 0,
       currentPage: 1,
-      tranTypeKey:3,
+      tranTypeKey: 3,
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
-      
+      inOutDate: [],
+
       // 提交类型
       submitType: true,
       size: 10,
@@ -233,28 +225,27 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    getList(){
-      console.log(123456)
+    getList() {
       shippingList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage:this.currentPage,
-        pageSize:this.pageSize,
-        contractType:this.contractType,
-        tranTypeKey: this.tranTypeKey, 
-        searchType:this.searchType,
-
-      })
-      .toPromise()
-      .then((response)=>{
-        this.warehouseList = response
-        this.deptCircularPage.currentPage = response.current
-        this.deptCircularPage.pageSize = response.size
-        this.deptBudgetTotal = response.total
-        
-        
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        contractType: this.contractType,
+        tranTypeKey: this.tranTypeKey,
+        searchType: this.searchType,
+        startDate: this.startDate,
+        endDate: this.endDate,
+        searchKeyWord: this.searchKeyWord,
       })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = response
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+        })
     },
-    statusquery(state){
+    statusquery(state) {
       this.searchType = state
       this.getList()
     },
@@ -288,62 +279,35 @@ export default {
           this.spanArr.push(1)
           this.pos = 0
         } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
-        }
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            查找到符合条件的数据时每次要把之前存储的数据 + 1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
         }
       })
     },
-    //查看//传参
-    // nocomplete(row) {
-    //   this.$router.push({
-    //     path: 'tranManagementVehicleLook',
-        // query: {
-        //   baseId: row.warehouseId,
-        //   positionId: row.binNumberId,
-        //   warehouseName: row.warehouseName,
-        //   binNumber: row.binNumber,
-    //     // },
-    //   })
-    // },
-    
-    
     //查看
     handleLook(row) {
-      this.$router.push({ 
-        name: 'tranManagementShippingLook',
+      this.$router.push({
+        name: 'tshippingDispatchingview',
         query: { id: row.id },
-         })
+      })
     },
 
     // 派船
-    shipping(row){
-        this.$router.push({
-           name: 'tranManagementShippingArrangemen',
-           query:{
-                 id: row.id , 
-              // infoId:row.infoId,
-              // processId:row.processId,
-              //  driver:row.driver,
-              //  driverType:row.driver,
-              //  driverPhone:row.driverPhone,
-              //  shipNo:row.shipNo,
-              //   loadWeight:row.loadWeight,
-              //   shipName:row.shipName,
-              //   shipType:row.shipType,
-              //   boxNumber:row.boxNumber,
-              //    positionWeight:row.positionWeight,
-              //    sendDateStart:row.sendDateStart,
-              //     receiveDateEnd:row.receiveDateEnd,      
-           }
-           })
+    shipping(row) {
+      this.$router.push({
+        name: 'shippingDispatching',
+        query: {
+          id: row.id,
+        },
+      })
     },
     dateFormat(fmt, date) {
       let ret
@@ -450,33 +414,16 @@ export default {
         })
     },
     find() {
+      if (this.inOutDate.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      } else {
+        this.startDate = ''
+        this.endDate = ''
+      }
       this.currentPage = 1
       this.getList()
     },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
-    },
-    total(){},
   },
 }
 </script>
@@ -558,22 +505,22 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-.el-row{
-    height: 150px;
+.el-row {
+  height: 150px;
 }
-.base_header_layout .grid-content{
-    margin-top: 80px;
+.base_header_layout .grid-content {
+  margin-top: 80px;
 }
-.but{
-    margin-top: 150px;
-    margin-left: 110px;
-    }
-.el-input--small .el-input__inner{
-    margin-left: 20px;
+.but {
+  margin-top: 150px;
+  margin-left: 110px;
+}
+.el-input--small .el-input__inner {
+  margin-left: 20px;
 }
 .el-range-editor--small.el-input__inner {
-    height: 32px;
-    margin-left: -20%;
+  height: 32px;
+  margin: 0 10px;
 }
 //执行样式
 .executory,
@@ -596,7 +543,8 @@ export default {
 .done {
   background: #50cad4;
 }
-.record, .adjustment{
+.record,
+.adjustment {
   display: inline-block;
   color: #5878e8;
   padding: 0 4px !important;

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -12,7 +12,7 @@
           >
         </div>
         <el-date-picker
-          v-model="deptBudgetList.inOutDate"
+          v-model="inOutDate"
           type="daterange"
           align="right"
           unlink-panels
@@ -205,6 +205,7 @@ export default {
       size: 10,
       primary:'1',
       spanArr: [],
+      inOutDate:[],
       warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -323,6 +324,9 @@ export default {
         feedbackFlag: this.feedbackFlag,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
+         startDate:this.startDate,
+        endDate:this.endDate,
+        searchKeyWord : this.searchKeyWord,
       })
         .toPromise()
         .then((response) => {
@@ -370,6 +374,13 @@ export default {
       }
     },
     find() {
+     if (this.inOutDate.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      } else {
+        this.startDate = ''
+        this.endDate = ''
+      }
       this.currentPage = 1
       this.getList()
     }
@@ -465,7 +476,7 @@ export default {
 //待完成三按钮
 .but {
   margin-top: 10px;
-  margin-left: 10px;
+  margin-left: 110px;
 }
 .el-input--small .el-input__inner {
   margin-left: 20px;

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -217,7 +217,6 @@ export default {
       pageSize: 10,
       searchTypeText: '未完成',
       searchKeyWord: '',
-      contractType: 2,
       tranTypeKey: 2,
       // 提交类型
       submitType: true,
@@ -336,7 +335,6 @@ export default {
     getList() {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
         searchType: this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
@@ -419,7 +417,7 @@ export default {
         })
     },
     find() {
-      if (this.inOutDate) {
+      if (this.inOutDate.length > 0) {
         this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
         this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
       } else {

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -260,7 +260,7 @@ export default {
       this.deptBudgetList = {}
       this.freightspace = []
       this.selectedOptions = ''
-      this.$router.push({ path: 'tranManagementTransporTationFire' })
+      this.$router.go(-1)
     },
     // confirmPosition() {
     //   this.draggable = false

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -47,12 +47,10 @@
           {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
           }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
-
         <!--发货人-->
         <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
           {{ deptBudgetList.sender }}
         </ws-form-item>
-
         <!--发货人电话-->
         <ws-form-item
           label="发货人电话"

src/views/tranManagement/tranManagementVehicle.vue

@@ -12,17 +12,16 @@
       <!-- 接单开始 -->
       <template slot="right">
         <div>
-          <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
         </div>
         <el-date-picker
-          v-model="deptBudgetList.inOutDate"
+          v-model="inOutDate"
           type="daterange"
           align="right"
           unlink-panels
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-
         >
         </el-date-picker>
         <ws-input
@@ -193,6 +192,7 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
+      inOutDate:[],
       tranTypeKey: '1',
       warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -319,6 +319,9 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
+        startDate: this.startDate ,
+       endDate: this.endDate ,
+       searchKeyWord :this.searchKeyWord,
         tranTypeKey: this.tranTypeKey,
       })
         .toPromise()
@@ -396,32 +399,16 @@ export default {
         })
     },
     find() {
+       if (this.inOutDate.length > 0) {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      } else {
+        this.startDate = ''
+        this.endDate = ''
+      }
       this.currentPage = 1
       this.getList()
-    },
-    // async exportlist() {
-    //   const { data } = await export1(
-    //     {
-    //       compId: sessionStorage.getItem('ws-pf_compId'),
-    //       contractType: this.contractType,
-    //       currentPage: this.currentPage,
-    //       pageSize: this.pageSize,
-    //       searchType: this.searchType,
-    //       searchKeyWord: this.searchKeyWord,
-    //       startDate: this.startDate,
-    //       endDate: this.endDate,
-    //     },
-    //     {},
-    //     { responseType: 'blob' }
-    //   ).toPromise()
-    //   downloadFile({
-    //     res: data,
-    //     fileName: `${
-    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
-    //     }_采购合同`,
-    //     type: 'xls',
-    //   })
-    // },
+    }
   },
 }
 </script>
@@ -539,7 +526,7 @@ export default {
 }
 .el-range-editor--small.el-input__inner {
   height: 32px;
-  margin-left: -20%;
+  margin:0 10px;
   
 }
 </style>

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.115: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/',