whm
/
BookingHeChuanFront
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改问题

Browse Source
master
sunzehua 1 year ago
parent e8726290a7
commit 385cff6472
14 changed files with 312 additions and 215 deletions
Show Stats Download Patch File Download Diff File

0
public/iconfont.css → public/icon/iconfont.css
Unescape Escape View File

0
public/iconfont.ttf → public/icon/iconfont.ttf
Unescape Escape View File

0
public/iconfont.woff → public/icon/iconfont.woff
Unescape Escape View File

0
public/iconfont.woff2 → public/icon/iconfont.woff2
Unescape Escape View File

5
public/index.html
Unescape Escape View File

@ -95,8 +95,8 @@
<% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
<link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
<% } %>
<link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_qbc103sjo2g.css" />
<!-- <link rel="stylesheet" href="iconfont.css"> -->
<!-- <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_qbc103sjo2g.css" /> -->
<link rel="stylesheet" href="./icon/iconfont.css">
<!-- 1.8K仔百度收录 -->
<meta name="baidu-site-verification" content="code-QVfBYJ5laQ" />
</head>
@ -120,7 +120,6 @@
<% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.js) { %>
<script src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script>
<% } %>
<!-- <script src="iconfont.js"></script> -->
<!-- built files will be auto injected -->
</body>
</html>

BIN
public/logo(100x100).png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
public/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 74 KiB

16
src/api/modular/main/BookingLedger.js
Unescape Escape View File

@ -1183,3 +1183,19 @@ export function GetWebData(parameter) {
params: parameter
})
}
export function SaveServiceStatusByList(parameter) {
return axios({
url: '/BookingValueAdded/SaveServiceStatus',
method: 'post',
data: parameter
})
}
export function CancelServiceStatusByList(parameter) {
return axios({
url: '/BookingValueAdded/CancelServiceStatus',
method: 'post',
data: parameter
})
}

257
src/views/flowCenter/workflow/verificationForm.vue
Unescape Escape View File

@ -18,12 +18,14 @@
:wrapperCol="wrapperCol"
has-feedback
>
<a-select placeholder="审核结果"
v-model="verificationFinally" @change="e => conditionChange(e)">
<a-select
placeholder="审核结果"
v-model="verificationFinally"
@change="e => conditionChange(e)">
<a-select-option
v-for="(condition,index) in conditions "
:key="index"
:value="condition.id">{{ condition.name }}</a-select-option>
v-for="(condition,index) in conditions "
:key="index"
:value="condition.id">{{ condition.name }}</a-select-option>
</a-select>
</a-form-item>
</a-col>
@ -37,7 +39,8 @@
<a-input placeholder="审核意见" v-model="verificationOpinion" />
</a-form-item>
</a-col>
<a-form-item v-if="!!nextMakerName &&verificationFinally=='1'"
<a-form-item
v-if="!!nextMakerName &&verificationFinally=='1'"
label="下一步审核人员"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@ -54,29 +57,29 @@
</div>
</x-card>
<a-tabs :default-active-key="defaultActive" @change="callback">
<a-tab-pane key="1" tab="表单信息" :force-Render="true">
<a-form :form="form">
<a-form-item v-show="webId == 'kfp'" v-if="frmType == 0">
<k-form-build :value="jsonData" ref='kfp'/>
</a-form-item>
<a-form-item v-else >
<component :is="webId" ref="cfp"></component>
</a-form-item>
</a-form>
</a-tab-pane>
<a-tab-pane key="2" tab="流程信息" :force-Render="true">
<a-card :bordered="false">
<vfd ref="vfd" style="background-color: white;" :needShow="false" :activityId="activityId" :fieldNames="fieldNames"></vfd>
</a-card>
</a-tab-pane>
<a-tab-pane key="3" tab="流转信息" :force-Render="true">
<a-table
:columns="columns"
:data-source="hisList"
>
</a-table>
</a-tab-pane>
</a-tabs>
<a-tab-pane key="1" tab="表单信息" :force-Render="true">
<a-form :form="form">
<a-form-item v-show="webId == 'kfp'" v-if="frmType == 0">
<k-form-build :value="jsonData" ref="kfp"/>
</a-form-item>
<a-form-item v-else >
<component :is="webId" ref="cfp"></component>
</a-form-item>
</a-form>
</a-tab-pane>
<a-tab-pane key="2" tab="流程信息" :force-Render="true">
<a-card :bordered="false">
<vfd ref="vfd" style="background-color: white;" :needShow="false" :activityId="activityId" :fieldNames="fieldNames"></vfd>
</a-card>
</a-tab-pane>
<a-tab-pane key="3" tab="流转信息" :force-Render="true">
<a-table
:columns="columns"
:data-source="hisList"
>
</a-table>
</a-tab-pane>
</a-tabs>
</a-spin>
<user-list-form ref="userListForm" @ok="handleOk"/>
<role-list-form ref="roleListForm" @ok="handleOk"/>
@ -84,18 +87,17 @@
</template>
<script>
import { vfd,XCard } from '@/components'
import { vfd, XCard } from '@/components'
import 'k-form-design/styles/k-form-design.less'
import userListForm from '@/views/system/user/userListForm'
import roleListForm from '@/views/system/role/roleListForm'
import { flowinstanceVerification,getFlowinstance } from '@/api/modular/flowCenter/flowinstanceManage'
//批量引用
import { flowinstanceVerification, getFlowinstance } from '@/api/modular/flowCenter/flowinstanceManage'
// 批量引用
const ctx = require.context('@/views/flowCenter/custom/', true, /\.vue$/)
const routes = {};
ctx.keys().forEach(key=>{
const name = key.split("/")[1].split(".")[0];
ctx.keys().forEach(key => {
const name = key.split('/')[1].split('.')[0];
routes[name] = ctx(key).default || ctx(key);
});
export default {
components: {
@ -115,30 +117,30 @@
xs: { span: 24 },
sm: { span: 15 }
},
defaultActive:1,
defaultActive: 1,
visible: false,
confirmLoading: false,
formLoading: true,
jsonData:{},
frmData:{},
frmContentData:[],
frmType:0,
fieldNames:[],
nextNodeDesignates:[],
nextMakerName:'',
webId:null,
nextNodeDesignateType:null,
customName:null,
schemeContent:null,
activityId:null,
schemeId:null,
frmId:null,
jsonData: {},
frmData: {},
frmContentData: [],
frmType: 0,
fieldNames: [],
nextNodeDesignates: [],
nextMakerName: '',
webId: null,
nextNodeDesignateType: null,
customName: null,
schemeContent: null,
activityId: null,
schemeId: null,
frmId: null,
form: this.$form.createForm(this),
verificationFinally:"1",
verificationOpinion:null,
flowInstanceId:null,
conditions:[{id:'1',name:'同意'},
{id:'2',name:'不同意'},{id:'3',name:'驳回'}],
verificationFinally: '1',
verificationOpinion: null,
flowInstanceId: null,
conditions: [{ id: '1', name: '同意' },
{ id: '2', name: '不同意' }, { id: '3', name: '驳回' }],
// 表头
columns: [
{
@ -154,18 +156,18 @@
dataIndex: 'createdUserName'
}
],
hisList:[]
hisList: []
}
},
methods: {
// 初始化方法
// 初始化方法
edit (record) {
this.customName = record.customName
this.frmType = record.frmType
this.schemeContent=record.schemeContent
const queryParam={};
queryParam.id=record.id
this.flowInstanceId=record.id
this.schemeContent = record.schemeContent
const queryParam = {};
queryParam.id = record.id
this.flowInstanceId = record.id
this.frmId = record.frmId
this.schemeId = record.id
this.activityId = record.activityId
@ -176,9 +178,8 @@
return
}
this.webId = res.data.webId
if(record.frmType == 0)
{
this.webId='kfp'
if (record.frmType == 0) {
this.webId = 'kfp'
}
record.nextNodeDesignateType = res.data.nextNodeDesignateType
record.nextNodeDesignates = res.data.nextNodeDesignates
@ -187,160 +188,130 @@
this.formLoading = false
this.nextNodeDesignateType = record.nextNodeDesignateType
this.hisList = res.data.hisList
switch(this.nextNodeDesignateType)
{
case "ALL_USER":
this.nextMakerName="所有人"
switch (this.nextNodeDesignateType) {
case 'ALL_USER':
this.nextMakerName = '所有人'
break
default:
this.nextMakerName=record.nextMakerName
this.nextMakerName = record.nextMakerName
break
}
this.jsonData =record.frmContent?JSON.parse(record.frmContent): {};
this.jsonData = record.frmContent ? JSON.parse(record.frmContent) : {};
this.frmData = JSON.parse(record.frmData);
this.frmContentData = record.frmContentData.split(",");
this.frmContentData = record.frmContentData.split(',');
setTimeout(() => {
this.importData()
this.fieldNames=JSON.parse(record.frmContentParse)
this.fieldNames = JSON.parse(record.frmContentParse)
}, 100)
})
})
},
conditionChange (e) {
const that = this;
this.condition = e;
},
importData(){
if(this.defaultActive == 2)
{
if(!!this.schemeContent)
{
if(!!this.$refs.vfd)
{
importData() {
if (this.defaultActive == 2) {
if (this.schemeContent) {
if (this.$refs.vfd) {
this.$refs.vfd.loadFlow(this.schemeContent)
}
else
{
} else {
setTimeout(() => {
this.$refs.vfd.loadFlow(this.schemeContent);
this.$refs.vfd.loadFlow(this.schemeContent);
}, 100)
}
}
else{
} else {
this.$refs.vfd.clear()
}
}
else if(this.defaultActive == 1)
{
if(!!this.$refs.vfd)
{
} else if (this.defaultActive == 1) {
if (this.$refs.vfd) {
this.$refs.vfd.clear()
}
if(this.webId=='kfp')
{
if (!!this.$refs.kfp)
{
if (this.webId == 'kfp') {
if (this.$refs.kfp) {
this.$refs.kfp.setData(this.frmData);
this.$refs.kfp.disable(this.frmContentData);
}
else
{
} else {
setTimeout(() => {
this.$refs.kfp.setData(this.frmData);
this.$refs.kfp.disable(this.frmContentData);
this.$refs.kfp.setData(this.frmData);
this.$refs.kfp.disable(this.frmContentData);
}, 100)
}
}
else
{
if (!!this.$refs.cfp)
{
} else {
if (this.$refs.cfp) {
this.$refs.cfp.setData(this.frmData);
this.$refs.cfp.disable(this.frmContentData);
}
else
{
this.$refs.cfp.disable(this.frmContentData);
} else {
setTimeout(() => {
this.$refs.cfp.setData(this.frmData);
this.$refs.cfp.disable(this.frmContentData);
this.$refs.cfp.setData(this.frmData);
this.$refs.cfp.disable(this.frmContentData);
}, 100)
}
}
}
else{
if(!!this.$refs.vfd)
{
} else {
if (this.$refs.vfd) {
this.$refs.vfd.clear()
}
}
},
setUser()
{
if(this.nextNodeDesignateType=="RUNTIME_SPECIAL_USER")
{
setUser() {
if (this.nextNodeDesignateType == 'RUNTIME_SPECIAL_USER') {
this.$refs.userListForm.userList();
}
else if(this.nextNodeDesignateType=="RUNTIME_SPECIAL_ROLE")
{
} else if (this.nextNodeDesignateType == 'RUNTIME_SPECIAL_ROLE') {
this.$refs.roleListForm.roleList();
}
}
},
//确认回调
// 确认回调
handleOk(record) {
const that = this;
if(!!record)
{
const nodeDesignateData=[];
const nodeDesignateName=[];
if (record) {
const nodeDesignateData = [];
const nodeDesignateName = [];
record.forEach(item => {
nodeDesignateData.push(item.id.toString());
nodeDesignateName.push(item.name);
});
if(nodeDesignateName.length>0)
{
if (nodeDesignateName.length > 0) {
that.nextMakerName = nodeDesignateName.join(',');
that.nextNodeDesignates = nodeDesignateData;
}
}
}
},
callback(key)
{
callback(key) {
this.defaultActive = key
setTimeout(() => {
this.importData()
this.importData()
}, 100)
},
handleSubmit () {
const that = this
const input = {}
const input = {}
that.confirmLoading = true
input.flowInstanceId = that.flowInstanceId
input.verificationFinally = that.verificationFinally
input.verificationOpinion = that.verificationOpinion
input.nodeRejectStep = that.nodeRejectStep
input.nodeRejectType = that.nodeRejectType
input.nodeDesignateType=that.nextNodeDesignateType
input.nodeDesignates=that.nextNodeDesignates
input.nodeDesignateType = that.nextNodeDesignateType
input.nodeDesignates = that.nextNodeDesignates
flowinstanceVerification(input).then((res) => {
if (res.success) {
this.$message.success('审核成功')
this.$emit('ok')
this.handleCancel()
if(this.webId=='kfp')
{
if (this.webId == 'kfp') {
this.$refs['kfp'].reset()
}
}
} else {
this.$message.error('审核失败：' + res.message)
}
})
})
that.confirmLoading = false
},
handleCancel () {
this.form.resetFields()
this.visible = false
if(!!this.$refs.vfd)
{
if (this.$refs.vfd) {
this.$refs.vfd.clear()
}
}

2
src/views/main/BookingCustomerLedger/detail/index.vue
Unescape Escape View File

@ -469,7 +469,7 @@ import selectView from '../../BookingLedger/detail/components/selectView'
import datePickerView from '../../BookingLedger/detail/components/datePickerView'
import autoView from '../../BookingLedger/detail/components/autoView'
import textareaView from '../../BookingLedger/detail/components/textareaView'
import { UploadTempFile, BookingCustomerOrderGetFile } from '@/api/modular/system/fileManage'
import { BookingCustomerOrderGetFile } from '@/api/modular/system/fileManage'
import {
BookingCustomerOrderSave, BookingTemplateAdd, BookingCustomerOrderGet,
BookingCustomerOrderDelete, BookingCustomerOrderSubmit,

223
src/views/main/BookingLedger/list/index.vue
Unescape Escape View File

@ -208,6 +208,22 @@
<template #ygtETD="{ row }">
<div class="etd" v-if="row.ygtETD">{{ row.ygtETD.substring(0, 10) }}</div>
</template>
<template #fangdan="{ row }">
<a-spin :spinning="row.serviceLoad">
<div style="font-size:16px;cursor: pointer;">
<a-icon
title="已放单"
type="plus-circle"
style="margin-right:15px;color:rgb(38 129 58);"
@click="handleSaveService(row)" />
<a-icon
title="取消已放单"
type="minus-circle"
style="color:rgb(255, 32, 2);"
@click="handleCancelService(row)" />
</div>
</a-spin>
</template>
<template #atd="{ row, rowIndex }">
<a-spin :spinning="row.atdLoading">
<a-icon
@ -254,9 +270,14 @@
:key="bindex">
<a-popover placement="topLeft" v-if="btn.staTime">
<div slot="content">{{ btn.staTime }}</div>
<span @click="handleGetWebDataYZ(row,btn.staCode)" :class="{ active: btn.isChecked }">{{ enmuBookingBtn(btn.staCode) }}</span>
<span @click="handleGetWebDataYZ(row, btn.staCode)" :class="{ active: btn.isChecked }">{{
enmuBookingBtn(btn.staCode) }}</span>
</a-popover>
<span style="cursor: pointer;" @click="handleGetWebDataYZ(row,btn.staCode)" :class="{ active: btn.isChecked }" v-else>{{ enmuBookingBtn(btn.staCode) }}</span>
<span
style="cursor: pointer;"
@click="handleGetWebDataYZ(row, btn.staCode)"
:class="{ active: btn.isChecked }"
v-else>{{ enmuBookingBtn(btn.staCode) }}</span>
<i
class="iconfont icon-xiaoyoujiantou"
:class="{ hide: bindex === row.bookstatus.length - 1 }"></i>
@ -274,8 +295,8 @@
<div slot="content">
<div>
<span class="txfcSpan" style="width: 120px;">箱号</span>
<span @click="handleGetWebData(row,'YARD')" class="txfcSpan">提箱</span>
<span @click="handleGetWebData(row,'YARD')" class="txfcSpan">返场</span>
<span @click="handleGetWebData(row, 'YARD')" class="txfcSpan">提箱</span>
<span @click="handleGetWebData(row, 'YARD')" class="txfcSpan">返场</span>
</div>
<div v-for="(item, index) in row.statuslogs1" :key="index">
<span class="txfcSpan" style="width: 120px;">{{ item.cntrno }}</span>
@ -283,8 +304,10 @@
<span class="txfcSpan">{{ item.fcopTime }}</span>
</div>
</div>
<div @click="handleGetWebData(row,'YARD')" :class="{ active: row.statuslogs1[0].txopTime }">提箱</div>
<div @click="handleGetWebData(row,'YARD')" :class="{ active: row.statuslogs1[0].fcopTime }">返场</div>
<div @click="handleGetWebData(row, 'YARD')" :class="{ active: row.statuslogs1[0].txopTime }">提箱
</div>
<div @click="handleGetWebData(row, 'YARD')" :class="{ active: row.statuslogs1[0].fcopTime }">返场
</div>
</a-popover>
</a-spin>
</div>
@ -306,7 +329,8 @@
<template slot="content">
<p>
比对方式:
<span>{{ row.lstShipOrderCompareMode ? row.lstShipOrderCompareMode == 'MANUAL' ? '手动': '自动' : '' }}</span>
<span>{{ row.lstShipOrderCompareMode ? row.lstShipOrderCompareMode == 'MANUAL' ? '手动' : '自动' : ''
}}</span>
<span>-{{ row.lstShipOrderCompareRltName }}</span>
</p>
<p>
@ -361,7 +385,12 @@
</div>
</div>
</a-popover>
<a-icon v-if="row.lstDraftCompareRlt" title="查看比对结果" class="TablelstShipOrderCompareRltRedo" @click="handleFormatContrast(row)" type="diff" />
<a-icon
v-if="row.lstDraftCompareRlt"
title="查看比对结果"
class="TablelstShipOrderCompareRltRedo"
@click="handleFormatContrast(row)"
type="diff" />
</div>
</template>
<template #goodsStatusList="{ row }">
@ -608,8 +637,11 @@
</template>
<div style="display: flex;">
<div style="width:55%">
<div >
<div v-if="formatSheet.total>0" style="display: flex;justify-content: space-between;" class="TaskShippingOrderCompareP">
<div>
<div
v-if="formatSheet.total > 0"
style="display: flex;justify-content: space-between;"
class="TaskShippingOrderCompareP">
<div>
{{ formatSheet.compareTime }}
<span v-if="formatSheet.isExistsDiff">
@ -619,19 +651,27 @@
</span>
</div>
<div>显示全部
<a-switch :checked="formatFlag" @change="formatFlag=!formatFlag" /></div>
<a-switch :checked="formatFlag" @change="formatFlag = !formatFlag" />
</div>
</div>
<div style="display: flex;align-items: flex-start;" v-else >
<a-icon style="color: rgb(82,196,26);font-size: 50px;margin-top: 5px;" type="check-circle" theme="filled" />
<div style="display: flex;align-items: flex-start;" v-else>
<a-icon
style="color: rgb(82,196,26);font-size: 50px;margin-top: 5px;"
type="check-circle"
theme="filled" />
<div style="margin-left: 20px;">
<div style="font-weight: bold;font-size: 22px;">格式单比对(正常)</div>
<div style="font-weight: bold;">提单号:{{ formatSheet.mBlNo }}</div>
<div style="font-weight: bold;">{{ formatSheet.compareTime }}</div>
</div>
<div style="margin:5px 0px 0px 40px">显示全部
<a-switch :checked="formatFlag" @change="formatFlag=!formatFlag" /></div>
<a-switch :checked="formatFlag" @change="formatFlag = !formatFlag" />
</div>
</div>
<div v-if="!formatFlag && formatSheet.total>0" class="TaskShippingOrderCompareMainBox" style="height: 600px;">
<div
v-if="!formatFlag && formatSheet.total > 0"
class="TaskShippingOrderCompareMainBox"
style="height: 600px;">
<div class="TaskShippingOrderCompareMain">
<div class="TaskShippingOrderCompareMainHeader">
<div>
@ -646,7 +686,10 @@
style="display: flex;margin-top: 15px;"
v-show="item.pCode != 'ContaList' && item.isDiff">
<p style="padding-top: 4px;" v-if="item.msg">
<a-icon style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;" type="close-circle" theme="filled" />
<a-icon
style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;"
type="close-circle"
theme="filled" />
</p>
<p v-if="item.isDiff" style="width: 90px;margin-right: 20px;">{{ item.fieldName }}:</p>
<div v-if="item.isDiff" style="width:60%">
@ -673,12 +716,14 @@
<div
v-for="(item, index) in formatSheet.showDetailList"
:key="index"
v-show="(item.pCode == 'ContaList' && item.isDiff) || item.fieldName=='箱号'"
style="display: flex;margin-top: 15px;align-items: flex-start;"
>
<div v-if="item.fieldName=='箱号' && formatSheet.isShowCntall">箱号:{{ item.primaryKey }}</div>
v-show="(item.pCode == 'ContaList' && item.isDiff) || item.fieldName == '箱号'"
style="display: flex;margin-top: 15px;align-items: flex-start;">
<div v-if="item.fieldName == '箱号' && formatSheet.isShowCntall">箱号:{{ item.primaryKey }}</div>
<p style="padding-top: 4px;" v-if="item.msg && item.isDiff">
<a-icon style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;" type="close-circle" theme="filled" />
<a-icon
style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;"
type="close-circle"
theme="filled" />
</p>
<p v-if="item.isDiff" style="width: 90px;margin-right: 20px;">{{ item.fieldName }}:</p>
<div v-if="item.isDiff" style="width:60%">
@ -696,7 +741,7 @@
</div>
</div>
</div>
<div v-if="!formatFlag && formatSheet.total==0"></div>
<div v-if="!formatFlag && formatSheet.total == 0"></div>
<div v-if="formatFlag" class="TaskShippingOrderCompareMainBox" style="height: 600px;">
<div class="TaskShippingOrderCompareMain">
<div class="TaskShippingOrderCompareMainHeader">
@ -712,10 +757,16 @@
style="display: flex;margin-top: 15px;"
v-show="item.pCode != 'ContaList'">
<p style="padding-top: 4px;" v-if="item.msg">
<a-icon style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;" type="close-circle" theme="filled" />
<a-icon
style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;"
type="close-circle"
theme="filled" />
</p>
<p style="padding-top: 4px;" v-else>
<a-icon style="color: rgb(0,153,68);font-size: 18px;margin-right: 35px;" type="check-circle" theme="filled" />
<a-icon
style="color: rgb(0,153,68);font-size: 18px;margin-right: 35px;"
type="check-circle"
theme="filled" />
</p>
<p style="width: 90px;margin-right: 20px;">{{ item.fieldName }}:</p>
<div style="width:60%">
@ -745,15 +796,20 @@
v-for="(item, index) in formatSheet.showDetailList"
:key="index"
v-show="item.pCode == 'ContaList'"
style="display: flex;margin-top: 15px;align-items: flex-start;"
>
<div v-if="item.fieldName=='箱号'">箱号:{{ item.primaryKey }}</div>
style="display: flex;margin-top: 15px;align-items: flex-start;">
<div v-if="item.fieldName == '箱号'">箱号:{{ item.primaryKey }}</div>
<div style="display: flex;align-items: flex-start;" v-else>
<p style="padding-top: 4px;" v-if="item.msg">
<a-icon style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;" type="close-circle" theme="filled" />
<a-icon
style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;"
type="close-circle"
theme="filled" />
</p>
<p style="padding-top: 4px;" v-else>
<a-icon style="color: rgb(0,153,68);font-size: 18px;margin-right: 35px;" type="check-circle" theme="filled" />
<a-icon
style="color: rgb(0,153,68);font-size: 18px;margin-right: 35px;"
type="check-circle"
theme="filled" />
</p>
<p style="width: 90px;margin-right: 20px;flex-shrink:0">{{ item.fieldName }}:</p>
<div style="width:60%">
@ -1149,7 +1205,9 @@ import {
GetDraftCompareResultInfo,
BookingOrderDownload,
GetShippingOrderCompareResult,
GetWebData
GetWebData,
CancelServiceStatusByList,
SaveServiceStatusByList
} from '@/api/modular/main/BookingLedger'
import initData from './modules/initData'
@ -1421,12 +1479,12 @@ export default {
}
if (item.bsstatusname) {
if (this.statusDIct) {
this.statusDIct.forEach(ite => {
if (ite.name == item.bsstatusname) {
item.bsstatusnameColor = ite.remark
}
})
}
this.statusDIct.forEach(ite => {
if (ite.name == item.bsstatusname) {
item.bsstatusnameColor = ite.remark
}
})
}
}
item.bookstatus = bookstatus
item.refshYzitemLoad = false
@ -1442,9 +1500,10 @@ export default {
item.rowCustno = false
item.rowDzMark = false
item.atdLoading = false
item.serviceLoad = false
if (!item.shenQingXiangShi) {
item.shenQingXiangShi = ''
}
item.shenQingXiangShi = ''
}
let hasGoods = 0
item.goodsStatusList.map((gitem, gindex) => {
if (gitem.finishTime || gitem.remark) {
@ -1513,6 +1572,46 @@ export default {
handleImportBcMore() {
this.$refs.importBcMore.open()
},
handleSaveService(row) {
const data = {
bookingId: row.id,
statusCodes: [{ 'statusCode': 'YFD' }]
}
row.serviceLoad = true
SaveServiceStatusByList(data).then(res => {
if (res.code === 200) {
this.$message.success(res.data.msg)
PageDataByBooking({ id: row.id }).then(ress => {
const itme = ress.data.items[0]
row.bsstatusname = itme.bsstatusname
row.serviceLoad = false
})
} else {
this.$message.error(res.data.msg)
row.serviceLoad = false
}
})
},
handleCancelService(row) {
const data = {
bookingId: row.id,
statusCodes: [{ 'statusCode': 'YFD' }]
}
row.serviceLoad = true
CancelServiceStatusByList(data).then(res => {
if (res.code === 200) {
this.$message.success(res.data.msg)
PageDataByBooking({ id: row.id }).then(ress => {
const itme = ress.data.items[0]
row.bsstatusname = itme.bsstatusname
row.serviceLoad = false
})
} else {
this.$message.error(res.data.msg)
row.serviceLoad = false
}
})
},
onresize() {
window.onresize = () => {
this.screenWidth = document.body.clientWidth
@ -1984,24 +2083,24 @@ export default {
this.spinning = true
GetShippingOrderCompareResult({ bookingId: row.id }).then(res => {
if (res.success) {
if (!res.data.succ) {
if (!res.data.succ) {
this.spinning = false
this.$message.success(res.data.msg)
} else {
if (res.data.extra) {
this.TaskShippingOrderCompareData = res.data.extra
this.TaskShippingOrderCompareData.total = res.data.total
this.TaskShippingOrderCompareVisible = true
this.spinning = false
this.$message.success(res.data.msg)
} else {
if (res.data.extra) {
this.TaskShippingOrderCompareData = res.data.extra
this.TaskShippingOrderCompareData.total = res.data.total
this.TaskShippingOrderCompareVisible = true
this.spinning = false
} else {
this.$message.success(res.data.msg)
this.spinning = false
}
this.$message.success(res.data.msg)
this.spinning = false
}
} else {
this.spinning = false
this.$message.error(res.data.msg)
}
} else {
this.spinning = false
this.$message.error(res.data.msg)
}
})
},
customSortMethod() { },
@ -2456,18 +2555,19 @@ export default {
})
}
if (item.bsstatusname) {
if (this.statusDIct) {
this.statusDIct.forEach(ite => {
if (ite.name == item.bsstatusname) {
item.bsstatusnameColor = ite.remark
}
})
}
if (this.statusDIct) {
this.statusDIct.forEach(ite => {
if (ite.name == item.bsstatusname) {
item.bsstatusnameColor = ite.remark
}
})
}
}
item.bookstatus = bookstatus
item.refshYzitemLoad = false
item.webDataLoad = false
item.atdLoading = false
item.serviceLoad = false
item.rowDzMark = false
item.rowCzMark = false
item.rowCustno = false
@ -3945,9 +4045,11 @@ export default {
font-size: 100px;
}
}
/deep/ .padUrl .ant-spin-container{
/deep/ .padUrl .ant-spin-container {
height: 100%;
}
/deep/ .content-table .vxe-body--column .vxe-cell div {
color: #000;
}
@ -3969,6 +4071,7 @@ export default {
border-bottom: 1px solid #000;
padding: 5px;
background: #0000000e;
.TaskShippingOrderCompareSpan {
font-weight: bolder;
color: red;

8
src/views/main/BookingLedger/list/modules/initData.js
Unescape Escape View File

@ -500,6 +500,14 @@ export default {
showHeaderOverflow: true,
slots: { default: 'IsZZFX' }
},
{
field: 'fangdan',
label: 'fangdan',
width: 70,
title: '放单',
showHeaderOverflow: true,
slots: { default: 'fangdan' }
},
{ field: 'startETA', label: 'startETA', width: 120, title: '起始港ETA', showHeaderOverflow: true, sortable: true },
{ field: 'startATA', label: 'startATA', width: 120, title: '起始港ATA', showHeaderOverflow: true, sortable: true }
],

8
src/views/main/PrinttemplateRightOld/addForm.vue
Unescape Escape View File

@ -44,7 +44,7 @@
<script>
import {
BookingTemplateAddPrinttemplateRight,
SysUserPage,
// SysUserPage,
BookingPrintTemplateGetPrintTemplateList
} from '@/api/modular/main/PrinttemplateRight'
export default {
@ -75,9 +75,9 @@ export default {
}
},
mounted() {
SysUserPage().then(res => {
this.UserList = res.data.rows
})
// SysUserPage().then(res => {
// this.UserList = res.data.rows
// })
BookingPrintTemplateGetPrintTemplateList().then(res => {
this.TemplateList = res.data.rows
})

8
src/views/main/PrinttemplateRightOld/editForm.vue
Unescape Escape View File

@ -44,7 +44,7 @@
<script>
import {
BookingTemplateAddPrinttemplateRight,
SysUserPage,
// SysUserPage,
BookingPrintTemplateGetPrintTemplateList
} from '@/api/modular/main/PrinttemplateRight'
export default {
@ -75,9 +75,9 @@ export default {
}
},
mounted() {
SysUserPage().then(res => {
this.UserList = res.data.rows
})
// SysUserPage().then(res => {
// this.UserList = res.data.rows
// })
BookingPrintTemplateGetPrintTemplateList().then(res => {
this.TemplateList = res.data.rows
})

Write Preview
Loading…
Cancel
Save