修改问题

master
sunzehua 6 months ago
parent 60836551ce
commit 111cf0da26

12
.env

@ -2,8 +2,8 @@ NODE_ENV=production
VUE_APP_PREVIEW=true VUE_APP_PREVIEW=true
# VUE_APP_TYPE = 'customer' # VUE_APP_TYPE = 'customer'
# VUE_APP_TYPE = 'hechuan' # VUE_APP_TYPE = 'hechuan'
VUE_APP_TYPE = 'yunyingduan' # VUE_APP_TYPE = 'yunyingduan'
# VUE_APP_TYPE = 'gangjie' VUE_APP_TYPE = 'gangjie'
# 打包部署的三个端 客户端customer 和川端hechuan 运营端djy # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy
# 和川大简云正式 # 和川大简云正式
@ -19,12 +19,12 @@ VUE_APP_TYPE = 'yunyingduan'
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30813 # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30813
# 运营端测试 # 运营端测试
VUE_APP_API_BASE_URL=http://60.209.125.238:30814 # VUE_APP_API_BASE_URL=http://60.209.125.238:30814
VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814 # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
# 港捷 # 港捷
# VUE_APP_API_BASE_URL=http://118.190.144.189:5001 VUE_APP_API_BASE_URL=http://118.190.144.189:5001
# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
# 客户端正式 # 客户端正式
# VUE_APP_API_BASE_URL=http://118.190.144.189:6001 # VUE_APP_API_BASE_URL=http://118.190.144.189:6001

@ -1,7 +1,7 @@
NODE_ENV=development NODE_ENV=development
VUE_APP_PREVIEW=true VUE_APP_PREVIEW=true
# VUE_APP_TYPE = 'customer' VUE_APP_TYPE = 'customer'
VUE_APP_TYPE = 'hechuan' # VUE_APP_TYPE = 'hechuan'
# VUE_APP_TYPE = 'yunyingduan' # VUE_APP_TYPE = 'yunyingduan'
# VUE_APP_TYPE = 'gangjie' # VUE_APP_TYPE = 'gangjie'
# 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan
@ -11,8 +11,8 @@ VUE_APP_TYPE = 'hechuan'
# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
# 和川大简云测试 # 和川大简云测试
VUE_APP_API_BASE_URL=http://60.209.125.238:35100 # VUE_APP_API_BASE_URL=http://60.209.125.238:35100
VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
# 客户端测试 # 客户端测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:30813 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@ -34,5 +34,5 @@ VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6002
# 客户端正式 # 客户端正式
# VUE_APP_API_BASE_URL=http://118.190.144.189:6001 VUE_APP_API_BASE_URL=http://118.190.144.189:6001
# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001 VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:6001

@ -1640,3 +1640,11 @@ export function GetTenantUserByRole(parameter) {
params: parameter params: parameter
}) })
} }
export function QueryShipInfoEMC(parameter) {
return axios({
url: '/BookingCustomerOrder/QueryShipInfoEMC',
method: 'get',
params: parameter
})
}

@ -20,7 +20,7 @@
<div <div
class="s-tool-column-item" class="s-tool-column-item"
v-for="item in columnsSetting" v-for="item in columnsSetting"
:key="`${item.title}tableColumnSetting`" :key="`${item.field}tableColumnSetting`"
v-show="item.show && item.type!=='checkbox' && item.field!=='caozuo'"> v-show="item.show && item.type!=='checkbox' && item.field!=='caozuo'">
<div class="s-tool-column-handle"> <div class="s-tool-column-handle">
<a-icon type="more" /> <a-icon type="more" />

File diff suppressed because it is too large Load Diff

@ -4,23 +4,15 @@
<a-button :loading="autioLoading" @click="handleAccept" v-if="details.bsstatus !== '已审核'" type="primary"></a-button> <a-button :loading="autioLoading" @click="handleAccept" v-if="details.bsstatus !== '已审核'" type="primary"></a-button>
<a-button :loading="autioLoading" type="primary" v-if="details.bsstatus == '待审核'" @click="handleAutio"></a-button> <a-button :loading="autioLoading" type="primary" v-if="details.bsstatus == '待审核'" @click="handleAutio"></a-button>
<a-button :loading="sendLoading" type="primary" @click="handleSendApi">API</a-button> <a-button :loading="sendLoading" type="primary" @click="handleSendApi">API</a-button>
<span>订单状态:{{ details.bsstatus }}</span>
<span v-if="details.bookingno" style="margin: 0 10px;">:</span> <span v-if="details.bookingno" style="margin: 0 10px;">:</span>
<span v-if="details.bookingno">{{ details.bookingno }}</span> <span v-if="details.bookingno">{{ details.bookingno }}</span>
</div> </div>
<a-spin :spinning="loading"> <a-spin :spinning="loading">
<div class="box"> <div class="box">
<a-form-model size="small" ref="basicFrom" :selfUpdate="true" :model="details" :rules="rules"> <a-form-model size="small" ref="basicFrom" :selfUpdate="true" :model="details" :rules="rules">
<div v-if="details.carrierid !== 'EMC'" >
<a-row> <a-row>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="订单状态"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback>
<span>{{ details.bsstatus }}</span>
</a-form-model-item>
</a-col>
<a-col :span="'4-8'"> <a-col :span="'4-8'">
<a-form-model-item <a-form-model-item
class="from-label" class="from-label"
@ -120,6 +112,17 @@
<span>{{ details.destination }}</span> <span>{{ details.destination }}</span>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="销售代码"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="blfrt">
<span>{{ details.saleCode }}</span>
</a-form-model-item>
</a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="'4-8'"> <a-col :span="'4-8'">
@ -180,6 +183,175 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
</div>
<div v-if="details.carrierid == 'EMC'" >
<a-row>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="收货地"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="placereceiptid">
{{ details.placereceipt }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="起运港"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="portloadid">
{{ details.portload }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="卸货港"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="portdischargeid">
{{ details.portdischarge }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="目的地"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="destinationid">
{{ details.destination }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="合约号"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback>
{{ details.contractType }} {{ details.contractno }}
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="订舱账号"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="bookingAccount">
{{ details.bookingAccount }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="船名"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback>
{{ details.vessel }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="航次"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback>
{{ details.voyno }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="航线"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback>
{{ details.lanecode }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="开船日期"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="etd">
{{ details.etd }}
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="运送方式"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="serviceType">
{{ details.serviceType }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="运输形态"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="serviceMode">
{{ details.serviceMode }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="订舱网点"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="bookingAddr">
{{ details.bookingAddr }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="提单签发地"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="billSignLoc">
{{ details.billSignLoc }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="提单数量"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="billCount">
{{ details.billCount }}
</a-form-model-item>
</a-col>
</a-row>
<a-row> <a-row>
<a-col :span="'4-8'"> <a-col :span="'4-8'">
<a-form-model-item <a-form-model-item
@ -188,11 +360,23 @@
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
has-feedback has-feedback
prop="blfrt"> prop="saleCode">
<span>{{ details.saleCode }}</span> {{ details.saleCode }}
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">
<a-form-model-item
class="from-label"
label="是否接收订舱通知"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="acceptNotify">
<a-checkbox v-model="details.acceptNotify" disabled></a-checkbox>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
</div>
<a-row> <a-row>
<a-col :span="24"> <a-col :span="24">
<a-form-model-item <a-form-model-item
@ -215,6 +399,107 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
<div v-if="details.carrierid == 'EMC'" >
<a-row :gutter="100" style="padding-left:60px">
<a-col :span="12">
<div class="row-title">发货人</div>
<div>
<a-input disabled size="small" v-model="details.shipperName" />
</div>
<div style="margin-top:10px">
<a-select disabled size="small" v-model="details.shipperSex" style="width: 13%">
<a-select-option value="Mr.">MS</a-select-option>
<a-select-option value="Ms.">MR</a-select-option>
</a-select>
<a-input disabled size="small" style="width:13%;margin:0 1%" v-model="details.shipperLastName" />
<a-input disabled size="small" style="width:13%;" v-model="details.shipperFirstName" />
<a-input
size="small"
disabled
style="width:14%;margin:0 1%"
v-model="details.shipperPhoneCountryCode" />
<a-input disabled size="small" style="width:14%;" v-model="details.shipperPhoneCode" />
<a-input disabled size="small" style="width:14%;margin:0 1%" v-model="details.shipperPhone" />
<a-input disabled size="small" style="width:13%;" v-model="details.shipperPhoneExtension" />
</div>
<div style="margin:10px 0">
<a-input size="small" disabled v-model="details.shipperInnerCode" />
</div>
<div>
<a-input size="small" disabled v-model="details.shipperEmail" />
</div>
</a-col>
<a-col :span="12">
<div class="row-title">货物代理人</div>
<div>
<a-input disabled size="small" v-model="details.bookingName" />
</div>
<div style="margin-top:10px">
<a-select disabled size="small" v-model="details.bookingSex" style="width: 13%">
<a-select-option value="Mr.">MS</a-select-option>
<a-select-option value="Ms.">MR</a-select-option>
</a-select>
<a-input disabled size="small" style="width:13%;margin:0 1%" v-model="details.bookingLastName" />
<a-input disabled size="small" style="width:13%;" v-model="details.bookingFirstName" />
<a-input
size="small"
disabled
style="width:14%;margin:0 1%"
v-model="details.bookingPhoneCountryCode" />
<a-input disabled size="small" style="width:14%;" v-model="details.bookingPhoneCode" />
<a-input disabled size="small" style="width:14%;margin:0 1%" v-model="details.bookingPhone" />
<a-input disabled size="small" style="width:13%;" v-model="details.bookingPhoneExtension" />
</div>
<div style="margin:10px 0">
<a-input disabled size="small" v-model="details.bookingInnerCode" />
</div>
<div>
<a-input disabled size="small" v-model="details.bookingEmail" />
</div>
</a-col>
</a-row>
<a-row :gutter="100" style="padding-left:60px;margin-top:20px">
<a-col :span="12">
<div class="row-title">收货人</div>
<div>
<a-input disabled size="small" v-model="details.consigneeName" />
</div>
</a-col>
<a-col :span="12">
<div class="row-title">通知人</div>
<div>
<a-input disabled size="small" v-model="details.notifypartName" />
</div>
</a-col>
</a-row>
<a-row style="margin-top:10px">
<a-col :span="18">
<a-form-model-item
class="from-label"
label="订舱品名"
:labelCol="{ span: 2 }"
:wrapperCol="{ span: 22 }"
has-feedback
prop="description">
{{ details.description }}
</a-form-model-item>
</a-col>
</a-row>
<a-row >
<a-col :span="18">
<a-form-model-item
class="from-label"
label="订舱备注"
:labelCol="{ span: 2 }"
:wrapperCol="{ span: 22 }"
has-feedback
prop="czRemark">
{{ details.czRemark }}
</a-form-model-item>
</a-col>
</a-row>
</div>
<div v-if="details.carrierid !== 'EMC'" >
<a-row :gutter="30"> <a-row :gutter="30">
<a-col :span="8"> <a-col :span="8">
<a-form-model-item has-feedback prop="shipper" class="sender-label" style="overflow: hidden"> <a-form-model-item has-feedback prop="shipper" class="sender-label" style="overflow: hidden">
@ -299,6 +584,8 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
</div>
<a-row> <a-row>
<a-col style="display: flex;margin-top: 20px;" :span="8"> <a-col style="display: flex;margin-top: 20px;" :span="8">
<vxe-table border ref="xTable" style="width: 480px;" :data="details.ctnList"> <vxe-table border ref="xTable" style="width: 480px;" :data="details.ctnList">

@ -1520,6 +1520,7 @@ export default {
}) })
if (!this.bookingDetails.contractno) { if (!this.bookingDetails.contractno) {
this.$message.error('保存失败,运费协议号未填写') this.$message.error('保存失败,运费协议号未填写')
console.log(this.bookingDetails)
return false return false
} }
if (!basicFrom && mailingFrom && cargoFrom) { if (!basicFrom && mailingFrom && cargoFrom) {

@ -683,6 +683,10 @@ export default {
// remarksFrom = valid // remarksFrom = valid
// }) // })
console.log(this.editDetails) console.log(this.editDetails)
if (!this.editDetails.contractno) {
this.$message.error('保存失败,运费协议号未填写')
return false
}
if (!basicFrom || !mailingFrom || !cargoFrom) { if (!basicFrom || !mailingFrom || !cargoFrom) {
this.$message.error('保存失败,请检查必填项') this.$message.error('保存失败,请检查必填项')
return false return false

@ -1165,44 +1165,36 @@
</template> </template>
</a-modal> </a-modal>
<a-modal <a-modal
width="1100px" width="820px"
:maskClosable="false" :maskClosable="false"
v-model="editingModalVisible" v-model="editingModalVisible"
title="批量编辑" title="批量编辑"
@ok="editingHandleOk" @ok="editingHandleOk"
@cancel="editingHandleCancel" @cancel="editingHandleCancel">
>
<div class="trace-box"> <div class="trace-box">
<div style="margin-bottom:10px;font-weight:bold;padding-left:48px">
<a-icon type="info-circle" theme="filled" style="font-size:15px;color: orange;;margin-right:10px" />
批量修改默认只处理输入框已填写的内容需要修改为空值请选择选中置空</div>
<a-form :form="editingForm"> <a-form :form="editingForm">
<a-checkbox-group v-model="checkedList" >
<a-row :gutter="26"> <a-row :gutter="26">
<a-col :span="12" class="book-model-box"> <a-col :span="12" class="book-model-box">
<a-form-item <a-form-item
label="船名" label="船名"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
> has-feedback>
<a-select <a-select
placeholder="请选择船名" placeholder="请选择船名"
v-decorator="['vessel']" v-decorator="['vessel']"
show-search show-search
@focus="vesselSearch" @focus="vesselSearch"
@search="vesselSearch" @search="vesselSearch"
style="width: 82%;margin-right: 10px"
@blur="vesselBlur" @blur="vesselBlur"
:default-active-first-option="false" :default-active-first-option="false"
:show-arrow="false" :show-arrow="false"
:filter-option="false" :filter-option="false"
:not-found-content="null" :not-found-content="null">
>
<a-select-option v-for="item in vesselData" :key="item.vessel" :value="item.vessel"> <a-select-option v-for="item in vesselData" :key="item.vessel" :value="item.vessel">
{{ item.vessel }} {{ item.vessel }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-checkbox value="vessel" style="margin-right: 5px" @change="handleEmpty($event,'vessel')" />置空
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12" class="book-model-box"> <a-col :span="12" class="book-model-box">
@ -1210,15 +1202,12 @@
label="开船日期" label="开船日期"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
prop="etd" has-feedback>
>
<a-date-picker <a-date-picker
v-decorator="['etd']" v-decorator="['etd', { rules: [{ required: true, message: '请选择开船日期!' }] }]"
style="width: 82%;margin-right: 10px" :style="{ width: '100%' }"
placeholder="请选择开船日期" placeholder="请选择开船日期"
valueFormat="YYYY-MM-DD" valueFormat="YYYY-MM-DD" />
/>
<!-- <a-checkbox value="etd" style="margin-right: 5px" @change="handleEmpty('etd')"/>置空 -->
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12" class="book-model-box"> <a-col :span="12" class="book-model-box">
@ -1226,9 +1215,8 @@
label="内部航次" label="内部航次"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
> has-feedback>
<a-input v-decorator="['voynoinner']" style="width: 82%;margin-right: 10px" /> <a-input v-decorator="['voynoinner']" />
<a-checkbox value="voynoinner" style="margin-right: 5px" @change="handleEmpty($event,'voynoinner')"/>置空
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -1237,9 +1225,8 @@
label="海关航次" label="海关航次"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
> has-feedback>
<a-input style="width: 82%;margin-right: 10px" v-decorator="['voyno']" /> <a-input v-decorator="['voyno']" />
<a-checkbox value="voyno" style="margin-right: 5px" @change="handleEmpty($event,'voyno')"/>置空
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12" class="book-model-box"> <a-col :span="12" class="book-model-box">
@ -1247,7 +1234,7 @@
label="卸货港" label="卸货港"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
> has-feedback>
<a-select <a-select
placeholder="请选择卸货港" placeholder="请选择卸货港"
v-decorator="['portDischarge']" v-decorator="['portDischarge']"
@ -1256,16 +1243,13 @@
@search="portDischargeSearch" @search="portDischargeSearch"
@change="portDischargeChange" @change="portDischargeChange"
:default-active-first-option="false" :default-active-first-option="false"
style="width: 82%;margin-right: 10px"
:show-arrow="false" :show-arrow="false"
:filter-option="false" :filter-option="false"
:not-found-content="null" :not-found-content="null">
>
<a-select-option v-for="item in portDischargeData" :key="item.code" :value="item.enName"> <a-select-option v-for="item in portDischargeData" :key="item.code" :value="item.enName">
{{ item.enName }} {{ item.enName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-checkbox value="portDischarge" style="margin-right: 5px" @change="handleEmpty($event,'portDischarge')"/>置空
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12" class="book-model-box"> <a-col :span="12" class="book-model-box">
@ -1273,9 +1257,8 @@
label="卸货代码" label="卸货代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
> has-feedback>
<a-input style="width: 82%;margin-right: 10px" v-decorator="['portDischargeId']" /> <a-input v-decorator="['portDischargeId']" />
<a-checkbox value="portDischargeId" style="margin-right: 5px" @change="handleEmpty($event,'portDischargeId')"/>置空
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12" class="book-model-box"> <a-col :span="12" class="book-model-box">
@ -1283,7 +1266,7 @@
label="目的港" label="目的港"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
> has-feedback>
<a-select <a-select
placeholder="请选择目的港" placeholder="请选择目的港"
v-decorator="['destination']" v-decorator="['destination']"
@ -1294,14 +1277,11 @@
:default-active-first-option="false" :default-active-first-option="false"
:show-arrow="false" :show-arrow="false"
:filter-option="false" :filter-option="false"
style="width: 82%;margin-right: 10px" :not-found-content="null">
:not-found-content="null"
>
<a-select-option v-for="item in destinationData" :key="item.code" :value="item.enName"> <a-select-option v-for="item in destinationData" :key="item.code" :value="item.enName">
{{ item.enName }} {{ item.enName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-checkbox value="destination" style="margin-right: 5px" @change="handleEmpty($event,'destination')"/>置空
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12" class="book-model-box"> <a-col :span="12" class="book-model-box">
@ -1309,9 +1289,8 @@
label="目的代码" label="目的代码"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
> has-feedback>
<a-input style="width: 82%;margin-right: 10px" v-decorator="['destinationid']" /> <a-input v-decorator="['destinationid']" />
<a-checkbox value="destinationid" style="margin-right: 5px" @change="handleEmpty($event,'destinationid')"/>置空
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12" class="book-model-box"> <a-col :span="12" class="book-model-box">
@ -1319,16 +1298,14 @@
label="截港时间" label="截港时间"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
> has-feedback>
<a-date-picker <a-date-picker
show-time show-time
v-decorator="['closingdate']" v-decorator="['closingdate']"
style="width: 82%;margin-right: 10px" :style="{ width: '100%' }"
placeholder="请选择截港时间" placeholder="请选择截港时间"
valueFormat="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH" format="YYYY-MM-DD HH" />
/>
<a-checkbox value="closingdate" style="margin-right: 5px" @change="handleEmpty($event,'closingdate')"/>置空
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12" class="book-model-box"> <a-col :span="12" class="book-model-box">
@ -1336,20 +1313,17 @@
label="截单时间" label="截单时间"
:labelCol="{ xs: { span: 24 }, sm: { span: 5 } }" :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
:wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }" :wrapperCol="{ xs: { span: 24 }, sm: { span: 18 } }"
> has-feedback>
<a-date-picker <a-date-picker
show-time show-time
v-decorator="['closedocdate']" v-decorator="['closedocdate']"
style="width: 82%;margin-right: 10px" :style="{ width: '100%' }"
placeholder="请选择截单时间" placeholder="请选择截单时间"
valueFormat="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH" format="YYYY-MM-DD HH" />
/>
<a-checkbox value="closedocdate" style="margin-right: 5px" @change="handleEmpty($event,'closedocdate')"/>置空
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
</a-checkbox-group>
</a-form> </a-form>
</div> </div>
</a-modal> </a-modal>

@ -17,6 +17,7 @@
<div <div
:class="{ 'line-bootm': index != form.bookingSlotSaleInfoList.length - 1 }" :class="{ 'line-bootm': index != form.bookingSlotSaleInfoList.length - 1 }"
v-for="(item, index) in form.bookingSlotSaleInfoList" v-for="(item, index) in form.bookingSlotSaleInfoList"
v-show="item.customerid!=0"
:key="index"> :key="index">
<a-row> <a-row>
<a-col :span="6"> <a-col :span="6">
@ -80,8 +81,52 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="6">
<a-form-item label="操作">
<a-select
show-search
v-model="item.opid"
:default-active-first-option="false"
:show-arrow="false"
allowClear
size="small"
:filter-option="false"
:not-found-content="null"
@search="SearchUser($event, 2)"
@change="e => {
ChangeUser(e, 'op', 2,index)
}
">
<a-select-option v-for="item in UserList2" :key="item.id" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="6">
<a-form-item label="单证">
<a-select
show-search
v-model="item.docid"
size="small"
allowClear
:default-active-first-option="false"
:show-arrow="false"
:filter-option="false"
:not-found-content="null"
@search="SearchUser($event, 3)"
@change="e => {
ChangeUser(e, 'doc', 3,index)
}
">
<a-select-option v-for="item in UserList3" :key="item.id" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-model-item label="SHIPPER"> <a-form-model-item label="SHIPPER">
<a-input v-model="item.shipper" size="small" /> <a-input v-model="item.shipper" size="small" />
@ -97,6 +142,8 @@
<a-input-number style="width: 90%" :precision="2" v-model="item.sellinG_PRICE" size="small" /> <a-input-number style="width: 90%" :precision="2" v-model="item.sellinG_PRICE" size="small" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="6"> <a-col :span="6">
<a-form-model-item label="销售日期"> <a-form-model-item label="销售日期">
<a-date-picker size="small" v-model="item.salE_TIME" /> <a-date-picker size="small" v-model="item.salE_TIME" />
@ -316,50 +363,7 @@
<a-input v-model="form.sloT_NO" /> <a-input v-model="form.sloT_NO" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="6">
<a-form-item label="操作">
<a-select
show-search
v-model="form.opid"
:default-active-first-option="false"
:show-arrow="false"
allowClear
:filter-option="false"
:not-found-content="null"
@search="SearchUser($event, 2)"
@change="e => {
ChangeUser(e, 'op', 2)
}
">
<a-select-option v-for="item in UserList2" :key="item.id" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="6">
<a-form-item label="单证">
<a-select
show-search
v-model="form.docid"
allowClear
:default-active-first-option="false"
:show-arrow="false"
:filter-option="false"
:not-found-content="null"
@search="SearchUser($event, 3)"
@change="e => {
ChangeUser(e, 'doc', 3)
}
">
<a-select-option v-for="item in UserList3" :key="item.id" :value="item.id">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
</a-row> </a-row>
<div class="title">截止时间</div> <div class="title">截止时间</div>
<a-row> <a-row>
@ -592,7 +596,7 @@ export default {
UserList1: [], UserList1: [],
UserList: [], UserList: [],
UserList2: [], UserList2: [],
UserListAll:[], UserListAll: [],
UserList3: [], UserList3: [],
id: 0, id: 0,
oldBook: [], oldBook: [],
@ -885,6 +889,12 @@ export default {
if (item.custserviceid) { if (item.custserviceid) {
item.custserviceid = Number(item.custserviceid) item.custserviceid = Number(item.custserviceid)
} }
if (item.docid) {
item.docid = Number(item.docid)
}
if (item.opid) {
item.opid = Number(item.opid)
}
if (item.saleid) { if (item.saleid) {
item.saleid = Number(item.saleid) item.saleid = Number(item.saleid)
} }
@ -947,14 +957,14 @@ export default {
if (type === 2) { if (type === 2) {
this.UserList2.forEach(item => { this.UserList2.forEach(item => {
if (item.id == e) { if (item.id == e) {
this.form[Tname] = item.name this.form.bookingSlotSaleInfoList[index][Tname] = item.name
} }
}) })
} }
if (type === 3) { if (type === 3) {
this.UserList3.forEach(item => { this.UserList3.forEach(item => {
if (item.id == e) { if (item.id == e) {
this.form[Tname] = item.name this.form.bookingSlotSaleInfoList[index][Tname] = item.name
} }
}) })
} }
@ -965,6 +975,12 @@ export default {
if (type === 1) { if (type === 1) {
this.UserList1 = JSON.parse(JSON.stringify(this.UserListAll)) this.UserList1 = JSON.parse(JSON.stringify(this.UserListAll))
} }
if (type === 2) {
this.UserList2 = JSON.parse(JSON.stringify(this.UserListAll))
}
if (type === 3) {
this.UserList3 = JSON.parse(JSON.stringify(this.UserListAll))
}
} }
this.$forceUpdate() this.$forceUpdate()
}, },

@ -5,8 +5,8 @@
<a-form :model="form" :label-col="{ span: 7 }" :wrapper-col="{ span: 17 }"> <a-form :model="form" :label-col="{ span: 7 }" :wrapper-col="{ span: 17 }">
<a-row> <a-row>
<a-col :span="4"> <a-col :span="4">
<a-form-item label="订单编号"> <a-form-item label="舱位提单号">
<a-input v-model="form.SLOT_BOOKING_NO" allow-clear placeholder="请输入订单编号" /> <a-input v-model="form.SLOT_BOOKING_NO" allow-clear placeholder="请输入舱位提单号" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="4">
@ -393,11 +393,17 @@ export default {
slots: { default: 'labelList' } slots: { default: 'labelList' }
}, },
{ {
title: '订舱编号', title: '舱位提单号',
align: 'center', align: 'center',
width: '160', width: '160',
field: 'sloT_BOOKING_NO' field: 'sloT_BOOKING_NO'
}, },
{
title: '订舱编号',
align: 'center',
width: '150',
field: 'sloT_NO'
},
{ {
title: '船名/航次', title: '船名/航次',
align: 'center', align: 'center',
@ -462,6 +468,18 @@ export default {
width: '100', width: '100',
field: 'custservice' field: 'custservice'
}, },
{
title: '操作',
align: 'center',
width: '80',
field: 'op'
},
{
title: '单证',
align: 'center',
width: '80',
field: 'doc'
},
{ {
title: '销售', title: '销售',
align: 'center', align: 'center',
@ -691,11 +709,17 @@ export default {
slots: { default: 'labelList' } slots: { default: 'labelList' }
}, },
{ {
title: '订舱编号', title: '舱位提单号',
align: 'center', align: 'center',
width: '160', width: '160',
field: 'sloT_BOOKING_NO' field: 'sloT_BOOKING_NO'
}, },
{
title: '订舱编号',
align: 'center',
width: '150',
field: 'sloT_NO'
},
{ {
title: '船名/航次', title: '船名/航次',
align: 'center', align: 'center',
@ -760,6 +784,18 @@ export default {
width: '100', width: '100',
field: 'custservice' field: 'custservice'
}, },
{
title: '操作',
align: 'center',
width: '80',
field: 'op'
},
{
title: '单证',
align: 'center',
width: '80',
field: 'doc'
},
{ {
title: '销售', title: '销售',
align: 'center', align: 'center',
@ -1124,7 +1160,7 @@ export default {
}) })
}, },
spanMethod({ row, _rowIndex, column, visibleData }) { spanMethod({ row, _rowIndex, column, visibleData }) {
const arr = ['salE_TIME', 'sellinG_PRICE', 'goodsname', 'shipper', 'sale', 'custservice', 'customername'] const arr = ['salE_TIME', 'sellinG_PRICE', 'goodsname', 'shipper', 'sale', 'op', 'doc', 'custservice', 'customername']
if ((!arr.includes(column.property)) || column.type === 'checkbox' || column.field === 'caozuo') { if ((!arr.includes(column.property)) || column.type === 'checkbox' || column.field === 'caozuo') {
const prevRow = visibleData[_rowIndex - 1]; const prevRow = visibleData[_rowIndex - 1];
let nextRow = visibleData[_rowIndex + 1]; let nextRow = visibleData[_rowIndex + 1];

@ -136,8 +136,9 @@
:show-arrow="false" :show-arrow="false"
:filter-option="false" :filter-option="false"
:not-found-content="null" :not-found-content="null"
:disabled="custserviceidFlag"
allowClear allowClear
style="width: 90%;margin-right: 10px;" style="width: 70%;"
@search="SearchUser($event, 1)" @search="SearchUser($event, 1)"
size="small" size="small"
@change="e => { @change="e => {
@ -148,7 +149,8 @@
{{ item1.name }} {{ item1.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-checkbox v-model="editform.isSetCUSTSERVICE"></a-checkbox> <span style="margin: 0 10px;" >修改:</span>
<a-checkbox @change="custserviceidFlag=!custserviceidFlag" v-model="editform.isSetCUSTSERVICE"></a-checkbox>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@ -159,8 +161,9 @@
:default-active-first-option="false" :default-active-first-option="false"
:show-arrow="false" :show-arrow="false"
:filter-option="false" :filter-option="false"
:disabled="saleidFlag"
:not-found-content="null" :not-found-content="null"
style="width: 90%;margin-right: 10px;" style="width: 70%;"
allowClear allowClear
@search="SearchUser($event, 2)" @search="SearchUser($event, 2)"
size="small" size="small"
@ -172,7 +175,8 @@
{{ item1.name }} {{ item1.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-checkbox v-model="editform.isSetSALE"></a-checkbox> <span style="margin: 0 10px;" >修改:</span>
<a-checkbox @change="saleidFlag=!saleidFlag" v-model="editform.isSetSALE"></a-checkbox>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
@ -184,7 +188,8 @@
v-model="editform.opid" v-model="editform.opid"
:default-active-first-option="false" :default-active-first-option="false"
:show-arrow="false" :show-arrow="false"
style="width: 90%;margin-right: 10px;" :disabled="opidFlag"
style="width: 70%;"
:filter-option="false" :filter-option="false"
:not-found-content="null" :not-found-content="null"
allowClear allowClear
@ -198,7 +203,8 @@
{{ item1.name }} {{ item1.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-checkbox v-model="editform.isSetOP"></a-checkbox> <span style="margin: 0 10px;" >修改:</span>
<a-checkbox @change="opidFlag=!opidFlag" v-model="editform.isSetOP"></a-checkbox>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@ -210,9 +216,10 @@
:show-arrow="false" :show-arrow="false"
:filter-option="false" :filter-option="false"
:not-found-content="null" :not-found-content="null"
:disabled="docidFlag"
allowClear allowClear
@search="SearchUser($event, 4)" @search="SearchUser($event, 4)"
style="width: 90%;margin-right: 10px;" style="width: 70%;"
size="small" size="small"
@change="e => { @change="e => {
ChangeUser(e, 'doc', 4) ChangeUser(e, 'doc', 4)
@ -222,7 +229,8 @@
{{ item1.name }} {{ item1.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-checkbox v-model="editform.isSetDOC"></a-checkbox> <span style="margin: 0 10px;" >修改:</span>
<a-checkbox @change="docidFlag=!docidFlag" v-model="editform.isSetDOC"></a-checkbox>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</a-row> </a-row>
@ -403,6 +411,10 @@ export default {
advanced: false, advanced: false,
loading: false, loading: false,
settingFlag: false, settingFlag: false,
custserviceidFlag: true,
saleidFlag: true,
docidFlag: true,
opidFlag: true,
editform: {}, editform: {},
setVisible: false, setVisible: false,
setVisible1: false, setVisible1: false,

Loading…
Cancel
Save