前端

src/api/common/index.js

@@ -58,6 +58,8 @@ export const API_GET_PROGRESS_PERCENTAGE = '/tbInitializationData/query/getProgr
 // 是否弹出 true/false
 export const API_GET_IS_SHOW_DIALOG = '/tbInitializationData/query/getVesselList'
 
+// 获取运输结算统计信息
+export const API_GET_INFO ='/tranSettlementReport/getInfo'
 
 // 通过手机号获取公司
 export const API_GET_COMP = '/commonUser/getCompList'

src/model/indexRx.js

@@ -51,7 +51,7 @@ import {
 } from '@/api/index'
 import { API_POST_REGISTER } from '@/api/V2/operation'
 import { API_GET_SUMMARY_FINANCEPARAMETER } from '@/api/V2/finance'
-import { API_GET_START_INIT_DB, API_GET_PROGRESS_PERCENTAGE, API_GET_IS_SHOW_DIALOG } from '@/api/common'
+import { API_GET_START_INIT_DB, API_GET_PROGRESS_PERCENTAGE, API_GET_IS_SHOW_DIALOG,API_GET_INFO } from '@/api/common'
 import {
   API_GET_EXPORT_PROCUREMENT,
   API_GET_EXPORT_INQUIRYSHEET,
@@ -147,7 +147,7 @@ export const sendRegisterCode = appRx.post(API_POST_SENDREGISTERCODE)
 export const saveFiles = appRx.post(API_POST_SAVEFILES, errorCatcher, errorHandle, filter)
 
 export const testWinsea = appRx.get('/pb/company/query/companyInfoByDomainName', errorCatcher, errorHandle, filter)
-
+export const gettaskInfo= appRx.get(API_GET_INFO, errorCatcher, errorHandle, filter)
 
 export const findVesselSysVersion = appRx.get(API_GET_FINDVESSELSYSVERSION, errorCatcher, errorHandle, filter)
 export const getAccountLoginHistoryCount = appRx.get(API_GET_ACCOUNTLOGINHISTORYCOUNT, errorCatcher, errorHandle, filter)

src/views/newTask/listPage.vue

@@ -166,6 +166,7 @@ import {
   noticeTasks,
   noticeReminds,
   noticeOverdues,
+  gettaskInfo
 } from '@/model/indexRx'
 import { EventBus, formatDate, dayjs } from 'base-core-lib'
 import * as utils from '@/views/workNotification/utils/index.js'
@@ -384,12 +385,33 @@ export default {
     goPath (data) {
       if (data.businessCode === 'PURCHASE-MA-APPL-REMIND') {
         this.$router.push({ name: 'sparepartMa' })
+      }
+      if (data.businessType === 'TRANSPORTATION') {
+        var url=''
+        if(data.businessCode=='TRANSPORTATION-SETTLEMENT-REPORT'){
+          gettaskInfo({id:data.businessId}).toPromise().then((res)=>{
+            console.log(res.tranType)
+            if(res.tranType=='汽运'){
+              url = 'autoSettlementList'
+            }
+            if(res.tranType=='火运'){
+              url = 'huoyunList'
+            }
+            if(res.tranType=='船运'){
+              url = 'shippingList'
+            }
+            console.log(url)
+            this.$router.push({ name: url })
+          })
+        }
       } else {
         const url = utils.code2Url(
           data.businessType,
           data.businessCode,
           data.noticeTaskStatus,
-          this.typeShow
+          this.typeShow,
+          data.messageContent,
+          data.businessId
         )
         console.log(url)
         if (!url) {

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -342,7 +342,7 @@
 			</div>
 		</div>
 		<!-- 提交 -->
-		<div style="text-align: right; padding: 10px" class="center">
+		<div style="text-align: center; padding: 10px">
 			<el-button class="bg-bottom" type="primary" size="small" @click="submit()">提交</el-button>
 		</div>
 	</div>
@@ -1738,15 +1738,6 @@
 		left: 0;
 	}
 
-	.el-form {
-		padding: 0 15%;
-		display: flex;
-		flex-wrap: wrap;
-		margin-left: -50px;
-		margin-top: 15px;
-		width: 110%;
-	}
-
 	.el-button--primary {
 		background-color: #5878e8;
 		border-color: #5878e8;
@@ -1825,23 +1816,9 @@
 	.huom {
 		width: 100%;
 	}
-
-	.el-form {
-		font-size: 14px;
-		font-family: PingFangSC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #8890b1;
-		line-height: 16px;
-	}
-
 	.a {
 		margin-left: -32px;
 	}
-
-	.el-radio-group {
-		margin-left: 251px;
-	}
-
 	.ding {
 		height: 23px;
 		background: #e8ecf6;
@@ -1850,6 +1827,7 @@
 	.el-radio-group {
 		font-size: 0;
 		margin-top: 20px;
+		margin-left: 251px;
 	}
 
 	/deep/.el-form {
@@ -1861,6 +1839,11 @@
 		flex-wrap: wrap;
 		margin-left: 130px;
 		margin-top: 15px;
-		width: 110%;
+		width: 100%;
+		font-size: 14px;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #8890b1;
+		line-height: 16px;
 	}
 </style>

src/views/warehouse/tranManagementWarehouseInOutTask.vue

@@ -222,7 +222,8 @@
 import {
   getwarehousetask,
   postcheckorupdate,
-  getstaff
+  getstaff,
+  getsponsible,
 } from '@/model/warehouse/index'
 import { getoreditoutput, outdelete, movestates } from '@/model/tasksport/index'
 import { downloadFile } from '@/utils/batchDown'
@@ -255,6 +256,7 @@ export default {
       tableDate: [],
       options:[],
       staffList:[],
+      list:[],
       // 是否显示
       showType: true,
       // 年
@@ -371,13 +373,25 @@ export default {
     },
     getList() {
       console.log(this.$route)
-      getwarehousetask({
+      var stringList=''
+        var arr=[]
+         getsponsible({
+            compId: localStorage.getItem('ws-pf_compId')
+          }).toPromise()
+          .then((response) => {
+
+            this.list = response
+            for (let i = 0; i < this.list.length; i++) {
+            arr.push(this.list[i].warehouseName)
+          }
+          console.log(arr)
+           getwarehousetask({
         compId: localStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
-        stringList:this.$route.query.stringList.toString()
+        stringList:arr.toString()
       })
         .toPromise()
         .then((response) => {
@@ -389,6 +403,11 @@ export default {
           this.pageSize = response.size
           this.deptBudgetTotal = response.total
         })
+            // console.log(response)
+          })
+          
+          
+     
     },
     //编辑
     delivery(item) {
@@ -522,7 +541,7 @@ export default {
     editClick1(row) {
       console.log(row)
      row.editstatus=true
-     var arr=JSON.parse(this.$route.query.warehouseBaseInfoList)
+     var arr=this.list
      for (let i = 0; i < arr.length; i++) {
        if(arr[i].warehouseName==row.warehouseName){
 console.log(arr[i])

src/views/warehouse/warehouseManagementList.vue

@@ -836,8 +836,8 @@
         this.$router.push({
           path: 'tranManagementWarehouseInOutTask',
           query: {
-            stringList: arr,
-            warehouseBaseInfoList: JSON.stringify(this.list)
+            // stringList: arr,
+            // warehouseBaseInfoList: JSON.stringify(this.list)
           }
         })
         // this.$router.push({ path: 'tranManagementWarehouseInOutTask',query:{warehouseBaseInfoList:JSON.stringify(this.list)} })

src/views/workNotification/components/MessageItem.vue

@@ -129,7 +129,8 @@ export default {
       const url = utils.code2Url(
         this.info.businessType,
         this.info.businessCode,
-        this.info.acceptanceType
+        this.info.acceptanceType,
+        this.info.messageContent
       )
       if (!url) {
         EventBus.$emit('error', this.$t('workNotification.noRelatedType'))

src/views/workNotification/components/WorkNotificationItem.vue

@@ -158,6 +158,7 @@ export default {
       }
     },
     checkType () {
+      console.log(this.info)
       return utils.code2Url(this.info.businessType, this.info.businessCode, this.info.acceptanceType);
     },
   }

src/views/workNotification/utils/index.js

@@ -1,8 +1,9 @@
 import HandleType from '../types/handleType'
 
+import { gettaskInfo } from '@/model/indexRx'
 // 根据业务类型和业务码获取对应url
-export function code2Url (type, code, state) {
-  console.log(type,code)
+export function code2Url (type, code, state,status,message,businessId) {
+  console.log(type,code, state,message)
   switch (type) {
     // 判断 出入库
     case 'INOUTTASK':
@@ -26,17 +27,41 @@ export function code2Url (type, code, state) {
       return warehouseReceiptRegulation(code, state)
     case 'ROLE':
       return stock(code, state)
-    case 'TRANSPORTATION':
-      return trantask(code,state)
+    case 'TRANSPORTATIONTASK':
+      return trantask(code,state,message)
+    case 'WAREHOUSE':
+      return warehousetask(code,state)
     default:
       return ''
   }
 }
 // 运输任务
-export function trantask(code, state){
+export function trantask(code, state,message){
   let url = ''
   switch (code) {
-    case 'TRANSPORTATION-SETTLEMENT-REPORT':
+    case 'TRANTASK-APPROVE':
+
+      if(message.indexOf('汽运')!=-1){
+        url = 'vehicleDispatching'
+        break
+      }
+      if(message.indexOf('火运')!=-1){
+        url = 'fireDispatching'
+        break
+      }
+      if(message.indexOf('船运')!=-1){
+        url = 'shippingDispatching'
+        break
+      }
+  }
+   return url
+}
+export function warehousetask(code, state){
+  let url = ''
+  switch (code) {
+    
+    // 出入库任务
+    case 'INOUTTASK-TASK-APPROVE':
       url = 'tranManagementWarehouseInOutTask'
       break
   }