master
sunzehua 5 months ago
parent 2372dfa32d
commit 010ef40891

@ -11,8 +11,8 @@ VUE_APP_TYPE = 'gangjie'
# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
# 和川大简云测试
# VUE_APP_API_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:35100
VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
# 客户端测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@ -23,8 +23,8 @@ VUE_APP_TYPE = 'gangjie'
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
# 港捷
VUE_APP_API_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:5001
# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
# 客户端正式
# VUE_APP_API_BASE_URL=http://118.190.144.189:6001

@ -1,18 +1,18 @@
NODE_ENV=development
VUE_APP_PREVIEW=true
# VUE_APP_TYPE = 'customer'
# VUE_APP_TYPE = 'hechuan'
VUE_APP_TYPE = 'hechuan'
# VUE_APP_TYPE = 'yunyingduan'
VUE_APP_TYPE = 'gangjie'
# VUE_APP_TYPE = 'gangjie'
# 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan
# 和川大简云正式
# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
# 和川大简云测试
VUE_APP_API_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:35100
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
# 客户端测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:30813

@ -7,7 +7,7 @@
:class="`select-input-${type}`"
v-model="value"
show-search
:allowClear="true"
:allowClear="disabled ? false : true"
:filter-option="!this.openSearch ? filterOption : false"
:dropdownMatchSelectWidth="false"
:showArrow="!this.openSearch ? true : true"

@ -124,31 +124,6 @@
</a-form-model-item>
</a-col>
<a-col
v-if="!showFlag"
:xs="12"
:sm="12"
:md="12"
:lg="8"
:xl="4">
<a-form-model-item
class="pre-from-label"
label="船代"
prop="forwarder"
:labelCol="labelCol2"
:wrapperCol="wrapperCol2"
has-feedback>
<selectView
type="shipagency"
:defaultVal="orderDetails.forwarder"
searchApi="GetForwarderlist"
:searchQuery="{ KeyWord: '' }"
:showLabel="['name', 'showCode']"
:openSearch="true"
@change="getSelectViewRes"></selectView>
</a-form-model-item>
</a-col>
<a-col
v-else
:xs="12"
:sm="12"
:md="12"
@ -1667,11 +1642,6 @@ export default {
immediate: true,
handler(nD, oD) {
this.id = this.$route.query.id
if (process.env.VUE_APP_TYPE === 'gangjie') {
this.showFlag = true
} else {
this.showFlag = false
}
}
}
},

@ -153,7 +153,11 @@
</a-col>
<a-col :span="4">
<a-form-item label="船公司">
<a-select show-search placeholder="请选择船公司" v-model="form.carrierId" :show-arrow="false"
<a-select
show-search
placeholder="请选择船公司"
v-model="form.carrierId"
:show-arrow="false"
:filter-option="filterOption">
<a-select-option v-for="item in carrierList" :key="item.code" :value="item.code">
{{ item.cnName }} / {{ item.code }}
@ -170,25 +174,48 @@
<div>
<a-button type="primary" @click="handleAdd" style="margin-right: 10px;">新增</a-button>
<a-button type="primary" @click="handleOpenCopy" style="margin-right: 10px;">批量复制</a-button>
<a-button type="primary" :loading="sendLoading" @click="handleSendAll"
<a-button
type="primary"
:loading="sendLoading"
@click="handleSendAll"
style="margin-right: 10px;">批量发送</a-button>
</div>
<div>
<a-button type="primary" @click="FnGetData"></a-button>
<a-button style="margin-left: 8px" @click="init"></a-button>
<tableSort style="margin-left: 10px;" @columnChange="handleColumnChange" :columns="columns"
<tableSort
style="margin-left: 10px;"
@columnChange="handleColumnChange"
:columns="columns"
:columnsAll="columnsAll"></tableSort>
</div>
</div>
<vxe-grid :data="loadData" stripe resizable round ref="table" :columns="columns" :loading="loading"
style="height: 100%;" :checkbox_config="{ checkField: 'checked' }" :checkbox-config="{ highlight: true }"
:height="tableHeight" @cell-dblclick="handledbclick" @sort-change="tableSortChange"
@resizable-change="resizableChange" @checkbox-change="checkboxChangeEvent" empty-text="没有更多数据了!">
<vxe-grid
:data="loadData"
stripe
resizable
round
ref="table"
:columns="columns"
:loading="loading"
style="height: 100%;"
:checkbox_config="{ checkField: 'checked' }"
:checkbox-config="{ highlight: true }"
:height="tableHeight"
@cell-dblclick="handledbclick"
@sort-change="tableSortChange"
@resizable-change="resizableChange"
@checkbox-change="checkboxChangeEvent"
empty-text="没有更多数据了!">
<template #caozuo="{ row }">
<a-icon @click="handleEdit(row)" type="form" style="cursor: pointer;" :style="{ color: '#13c2c2' }" />
<a-popconfirm title="请确认删除?" ok-text="" cancel-text="" @confirm="e => {
confirm(e, row.id)
}
<a-popconfirm
title="请确认删除?"
ok-text="是"
cancel-text="否"
@confirm="e => {
confirm(e, row.id)
}
">
<a-icon type="delete" style="margin:0 8px;cursor: pointer;" :style="{ color: '#13c2c2' }" />
</a-popconfirm>
@ -203,18 +230,29 @@
<span>{{ row.shipRateTotalCurrency }} {{ row.shipRateTotalAmount }}</span>
</template>
<template #isRecvBC="{ row }">
<a-icon type="bulb" theme="filled" style="color: green;font-size: 16px;" :title="row.lstRecvBCDate"
<a-icon
type="bulb"
theme="filled"
style="color: green;font-size: 16px;"
:title="row.lstRecvBCDate"
v-if="row.isRecvBC" />
</template>
<template #isRecvBKCancel="{ row }">
<a-icon type="bulb" theme="filled" style="color: red;font-size: 16px;" :title="row.lstRecvBCDate"
<a-icon
type="bulb"
theme="filled"
style="color: red;font-size: 16px;"
:title="row.lstRecvBCDate"
v-if="row.isRecvBKCancel" />
</template>
<template #isShipperOwned="{ row }">
<a-icon v-if="row.isShipperOwned" type="check-circle" style="color: green;font-size: 16px;" theme="filled" />
</template>
<template #pager>
<vxe-pager :current-page="queryParam.pageNo" :page-size="queryParam.pageSize" :total="queryParam.totalResult"
<vxe-pager
:current-page="queryParam.pageNo"
:page-size="queryParam.pageSize"
:total="queryParam.totalResult"
:page-sizes="[10, 50, 100, 200, 500]"
:layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
@page-change="handlePageChange">
@ -227,7 +265,11 @@
<a-modal title="输入复制数量" :visible="copyflag" :footer="null" @cancel="copyflag = false">
<a-form :form="copyMoreForm" :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }" @submit="handleSubmitCopyMore">
<a-form-item label="数量">
<a-input-number style="width: 100%;" :min="1" :max="50" :precision="0"
<a-input-number
style="width: 100%;"
:min="1"
:max="50"
:precision="0"
v-decorator="['number', { rules: [{ required: true, message: '请输入数量' }], initialValue: 1 }]" />
</a-form-item>
<a-form-item :wrapper-col="{ span: 12, offset: 5 }">

@ -104,7 +104,12 @@ import {
//
queryParam: {},
//
columns: [{
columns: [
{
title: 'id',
dataIndex: 'id'
},
{
title: '公司名称',
dataIndex: 'name'
},

Loading…
Cancel
Save