Skip to content

J
jiedao-app-operator-master
Commit 5168ec76 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 3385fc43 2d65a378
Show whitespace changes
Inline Side-by-side
Showing with 181 additions and 69 deletions
src/api/ecw/box.js
View file @ 5168ec76
......@@ -49,6 +49,7 @@ export function exportboxExcel(query) {
url: "/shipment/box/export-excel",
method: "get",
params: query,
timeout: 5 * 60000,
responseType: "blob",
});
}
......
src/api/ecw/order.js
View file @ 5168ec76
......@@ -557,6 +557,7 @@ export function orderExportSearch(params){
return request({
url: '/ecw/order/export/search',
method: 'GET',
timeout: 5 * 60000,
responseType: 'arraybuffer',
params
})
......@@ -568,6 +569,7 @@ export function orderExportMySearch(params){
url: '/ecw/order/export/my/search',
responseType: 'arraybuffer',
method: 'GET',
timeout: 5 * 60000,
params
})
}
......@@ -578,6 +580,7 @@ export function orderExportDeptSearch(params){
url: '/ecw/order/export/dept/search',
method: 'GET',
responseType: 'arraybuffer',
timeout: 5 * 60000,
params
})
}
......@@ -588,6 +591,7 @@ export function exportAbnormal(params){
url: '/ecw/order/export/export-exception',
method: 'get',
params: params,
timeout: 5 * 60000,
responseType: 'blob'
})
}
......@@ -599,6 +603,7 @@ export function exportHeavyOrder(params){
url: '/ecw/order/export/export-heavyOrder',
method: 'get',
params: params,
timeout: 5 * 60000,
responseType: 'blob'
})
}
......@@ -609,6 +614,7 @@ export function exportReturnOrder(params){
url: '/ecw/order/export/export-returnOrder',
method: 'get',
params: params,
timeout: 5 * 60000,
responseType: 'blob'
})
}
......@@ -619,6 +625,7 @@ export function exportSaleRepay(params){
url: '/ecw/order/export/export-saleRepay',
method: 'get',
params: params,
timeout: 5 * 60000,
responseType: 'blob'
})
}
......@@ -630,6 +637,7 @@ export function exportCustomsDatas(params){
url: '/ecw/order/export/export-customDatas',
method: 'get',
params: params,
timeout: 5 * 60000,
responseType: 'blob'
})
}
......@@ -641,6 +649,7 @@ export function exportShippingDatas(params){
url: '/ecw/order/export/export-shipDatas',
method: 'get',
params: params,
timeout: 5 * 60000,
responseType: 'blob'
})
}
......@@ -652,6 +661,7 @@ export function exportShipFee(params){
url: '/ecw/order/export/export-shipFee',
method: 'get',
params: params,
timeout: 5 * 60000,
responseType: 'blob'
})
}
......@@ -663,6 +673,7 @@ export function exportUnload(params){
url: '/ecw/order/export/export-excel',
method: 'get',
params: params,
timeout: 5 * 60000,
responseType: 'blob'
})
}
......@@ -672,7 +683,8 @@ export function operateLogPage(params){
return request({
url: '/ecw/order-operate-log/page',
method: 'get',
params: params
params: params,
timeout: 5 * 60000
})
}
......
src/api/system/operatelog.js
View file @ 5168ec76
......@@ -5,7 +5,8 @@ export function listOperateLog(query) {
return request({
url: '/system/operate-log/page',
method: 'get',
params: query
params: query,
timeout: 5*6000,
})
}
......@@ -15,6 +16,8 @@ export function exportOperateLog(query) {
url: '/system/operate-log/export',
method: 'get',
params: query,
timeout: 5*6000,
responseType: 'blob'
})
}
src/components/ProductSelector/index.vue
View file @ 5168ec76
......@@ -39,6 +39,11 @@ export default {
determined: {
type: Boolean,
default: false
},
// 是否显示已有商品，不传默认
status: {
type: [String, Number],
default: null
}
},
data(){
......@@ -90,7 +95,8 @@ export default {
remoteMethod(keyword){
let params = {
pageSize: keyword ? 100000 : 10,
filter: !this.determined
filter: !this.determined,
status:this.status
}
if(this.productType){
params.typeId = this.productType
......
src/components/UserSelector/index.vue
View file @ 5168ec76
......@@ -17,11 +17,15 @@
</template>
<script>
import {getCustomerContactsSelect, getCustomerContacts} from '@/api/ecw/customerContacts'
import {listSimpleUsers} from '@/api/system/user'
import {listServiceUser, listSimpleUsers} from '@/api/system/user'
export default {
props:{
value: [String, Number],
clearable: Boolean
clearable: Boolean,
manage:{
type:Boolean,
default:false
}
},
data(){
return {
......@@ -44,9 +48,18 @@ export default {
}
},
created(){
if(this.manage){
// 客户经理
listServiceUser().then(r=>{
this.list = r.data;
})
}else {
// 全部客户
listSimpleUsers().then(res => {
this.list = res.data
})
}
// this.init()
},
methods:{
......
src/views/ecw/box/indexFutureBox.vue
View file @ 5168ec76
......@@ -338,10 +338,11 @@ export default {
//在仓 = 已入仓-已封柜
//this.$set(this.form, 'warehousingNumber', Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
//},
/* 2023-05-06 微信群@郑屹反馈确认，由接口计算，前端无需处理
'form.loadingNumber'(){
//在仓 = 已入仓-已封柜
this.$set(this.form, 'warehousingNumber', Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
}
}*/
},
methods: {
getVolume(){
......@@ -354,10 +355,13 @@ export default {
}
let data = {
transportId: this.form.transportType,
channelId: this.form.shippingChannelId,
departureId: this.form.startWarehouseId,
objectiveId: this.form.destWarehouseId
}
// 空运才需要渠道
if(data.transportId == 4){
data.channelId = this.form.shippingChannelId
}
// 获得已封柜方数
getBoxedVolume(data).then(res => {
this.$set(this.form, 'loadingNumber', res.data || 0)
......
src/views/ecw/box/indexSea.vue
View file @ 5168ec76
......@@ -297,7 +297,7 @@ export default {
this.DICT_TYPE.ECW_TRANSPORT_TYPE
).filter((item) => item.value == "1" || item.value == "2");
getWarehouseList().then((res) => (this.warehouseList = res.data));
getCabinetPage(null).then((response) => {
getCabinetPage({status:0}).then((response) => {
this.cabinetList = response.data.list;
});
this.getList();
......
src/views/ecw/box/indexSeaAir.vue
View file @ 5168ec76
......@@ -301,7 +301,7 @@ export default {
this.DICT_TYPE.ECW_TRANSPORT_TYPE
).filter((item) => item.value == "4");
getWarehouseList().then((res) => (this.warehouseList = res.data));
getCabinetPage(null).then((response) => {
getCabinetPage({status:0}).then((response) => {
this.cabinetList = response.data.list;
});
this.getList();
......
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
View file @ 5168ec76
......@@ -319,15 +319,9 @@
</el-row>
<!-- 关联订单弹窗 -->
<el-dialog :title="relationOrderListDialog.title" :visible.sync="relationOrderListDialog.visible" width="30%" append-to-body>
<el-tree
:data="relationOrderListDialog.data"
node-key="id"
default-expand-all
:expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ data.order.orderNo }}</span>
</span>
</el-tree>
<el-card>
<div v-html="relationOrderListDialog.data"></div>
</el-card>
<el-row style="margin-top: 10px;text-align: center;">
<el-button type="primary" @click="relationOrderListDialog.visible = false">{{$t('关闭窗口')}}</el-button>
</el-row>
......@@ -526,7 +520,7 @@ export default {
getAllRelateOrderList({orderId:item.orderId,orderNo:item.orderNo}).then(res=>{
this.relationOrderListDialog.title = item.orderNo+'关联订单'
this.relationOrderListDialog.visible = true
this.relationOrderListDialog.data = [res.data]
this.relationOrderListDialog.data = res.msg.replace(/\n/g,'<br>')
})
},
......
src/views/ecw/box/shippingSea/nodePage/review.vue
View file @ 5168ec76
......@@ -4,6 +4,7 @@
<el-form-item :label="$t('申请理由')">
<el-input v-model="reviewObj.applyReason" type="textarea" rows="2" :placeholder="$t('请输入申请理由')" :disabled="isReview"></el-input>
</el-form-item>
<span v-if="voKey=='preInstallBackInfo'" style="color: red;margin-left: 120px;">{{$t('请注意，预装反审后，全部提单需重新制作')}}</span>
</el-form>
<el-row class="operate-button">
<el-button type="success" @click="onSubmit" v-show="!isReview">{{$t('发起申请')}}</el-button>
......
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
View file @ 5168ec76
......@@ -178,7 +178,7 @@ export default {
list.push({
...oItem,
warehouseInInfo,
// multiSpecification: item.multiSpecification,
multiSpecification: item.multiSpecification,
positionNo: oItem.positionNo,
tallyStatus: item.tallyStatus,
tallyTime: item.tallyTime,
......
src/views/ecw/box/shippingSea/seaProcess.vue
View file @ 5168ec76
......@@ -105,6 +105,7 @@ export default {
currNode: {},
// 数据
processData: this.seaBaseData,
errorMsg: this.$t('请先完成上一步')
};
},
created() {},
......@@ -137,7 +138,7 @@ export default {
return;
}
if (currIndex > this.currIndex) {
this.$message.error(this.$t("请先完成上一步"));
this.$message.error(this.errorMsg);
return;
}
this.currNode = node;
......@@ -247,6 +248,7 @@ export default {
(type === "departure" && val.shippingHasAbnormal) ||
(type === "arrival" && val.arrivalHasAbnormal)
) {
this.errorMsg = this.$t('请先处理完出货异常，再进行操作')
continue;
}
// 报关
......
src/views/ecw/channel/index.vue
View file @ 5168ec76
......@@ -126,7 +126,7 @@
import { createChannel, updateChannel, deleteChannel, getChannel, getChannelPage, exportChannelExcel } from "@/api/ecw/channel";
export default {
name: "Channel",
name: "EcwChannelIndex",
components: {
},
data() {
......@@ -163,6 +163,9 @@ export default {
created() {
this.getList();
},
activated() {
this.getList();
},
methods: {
/** 查询列表 */
getList() {
......
src/views/ecw/customer/query.vue
View file @ 5168ec76
......@@ -15,7 +15,8 @@
<el-card style="margin-top: 15px;">
<el-descriptions :column="4" border>
<el-descriptions-item :label="$t('客户编号')">{{ customer.number }}</el-descriptions-item>
<el-descriptions-item :label="$t('客户名称')">{{ $l( customer, 'name') }}</el-descriptions-item>
<el-descriptions-item :label="$t('客户名称')">{{ customer.name}}</el-descriptions-item>
<el-descriptions-item :label="$t('客户英文名称')">{{customer.nameEn }}</el-descriptions-item>
<el-descriptions-item :label="$t('结算方式')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_BALANCE, customer.balance) }}</el-descriptions-item>
<el-descriptions-item :label="$t('客户生日')">{{ parseTime(customer.birthday, '{y}-{m}-{d}') }}</el-descriptions-item>
<el-descriptions-item :label="$t('出货渠道')">
......@@ -38,6 +39,7 @@
<el-descriptions-item :label="$t('推介人')">{{ customer.promoterName }}</el-descriptions-item>
<el-descriptions-item :label="$t('客户经理')">{{customerService }}</el-descriptions-item>
<el-descriptions-item :label="$t('公司名称')">{{ customer.company }}</el-descriptions-item>
<el-descriptions-item :label="$t('公司英文名称')">{{ customer.companyEn }}</el-descriptions-item>
<el-descriptions-item :label="$t('联系地址')">{{ customer.address }}</el-descriptions-item>
<el-descriptions-item :label="$t('创建时间')">{{ parseTime(customer.createTime) }}</el-descriptions-item>
<el-descriptions-item :label="$t('创建人')">{{ customer.founderName }}</el-descriptions-item>
......@@ -48,7 +50,8 @@
<el-image v-show="!!customer.picture" :src="customer.picture" style="width: 100px;height: 100px"></el-image>
</el-descriptions-item>
<el-descriptions-item :label="$t('备注')">{{ customer.remarks }}</el-descriptions-item>
<el-descriptions-item :label="$t('新老客户')">{{ customer.isNew ?$t('新客户') : $t('老客户') }}</el-descriptions-item>
<el-descriptions-item :label="$t('业绩类型')">{{ customer.isNew ?$t('新客户') : $t('老客户') }}</el-descriptions-item>
<el-descriptions-item :label="$t('付款人姓名')">{{ customer.payerName }}</el-descriptions-item>
<el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')" :label="$t('身份证姓名')">{{ customer.carName }}</el-descriptions-item>
<el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')" :label="$t('身份证号码')">{{ customer.carNo }}</el-descriptions-item>
<!-- <el-descriptions-item :label="$t('信用等级')">{{ customer }}</el-descriptions-item>-->
......@@ -77,9 +80,12 @@
prop="name"
:label="$t('联系人')"
>
<template v-slot="{row}">
{{$l(row, 'name')}}
</template>
</el-table-column>
<el-table-column
prop="nameEn"
:label="$t('联系人英文名称')"
>
</el-table-column>
<el-table-column
prop="phoneNew"
......@@ -168,7 +174,7 @@
@change="changeDate"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
type="datetimerange"
range-separator="-"
:start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
......
src/views/ecw/deptTarget/allAchievement.vue
View file @ 5168ec76
......@@ -73,6 +73,7 @@
<dict-tag :type="DICT_TYPE.CUSTOMER_ESOURCE_TYPE" :value="scope.row.customerType"/>
</template>
</el-table-column>
<el-table-column :label="$t('业绩类型')" align="center" prop="achieveType"/>
<el-table-column :label="$t('报价单号')" align="center" width="180">
<template slot-scope="scope">
<span>{{scope.row.number}}</span>
......@@ -130,7 +131,7 @@
import {listServiceUser} from "@/api/system/user";
export default {
name: "DeptTarget",
name: "EcwDepttargetAllachievement",
components: {},
data() {
return {
......@@ -219,6 +220,10 @@
}
}
},
activated() {
this.getChannelList();
this.getList();
},
created() {
this.getChannelList();
this.getList();
......
src/views/ecw/deptTarget/index.vue
View file @ 5168ec76
......@@ -154,7 +154,7 @@
import { parseTime } from '@/utils/ruoyi';
export default {
name: "DeptTarget",
name: "EcwDepttargetIndex",
components: {},
data() {
return {
......@@ -266,6 +266,10 @@ import { parseTime } from '@/utils/ruoyi';
this.getChannelList();
this.getList();
},
activated() {
this.getChannelList();
this.getList();
},
methods: {
/** 查询部门列表 */
getDeptList(){
......
src/views/ecw/deptTarget/myAchievement.vue
View file @ 5168ec76
......@@ -71,6 +71,7 @@
<dict-tag :type="DICT_TYPE.CUSTOMER_ESOURCE_TYPE" :value="scope.row.customerType"/>
</template>
</el-table-column>
<el-table-column :label="$t('业绩类型')" align="center" prop="achieveType"/>
<el-table-column :label="$t('报价单号')" align="center" width="180">
<template slot-scope="scope">
<span>{{scope.row.number}}</span>
......@@ -126,7 +127,7 @@
import {listServiceUser} from "@/api/system/user";
export default {
name: "DeptTarget",
name: "EcwDepttargetMyachievement",
components: {},
data() {
return {
......@@ -215,6 +216,10 @@
}
}
},
activated() {
this.getChannelList();
this.getList();
},
created() {
this.getChannelList();
this.getList();
......
src/views/ecw/deptTarget/myDeptAchievement.vue
View file @ 5168ec76
......@@ -70,6 +70,7 @@
<dict-tag :type="DICT_TYPE.CUSTOMER_ESOURCE_TYPE" :value="scope.row.customerType"/>
</template>
</el-table-column>
<el-table-column :label="$t('业绩类型')" align="center" prop="achieveType"/>
<el-table-column :label="$t('报价单号')" align="center" width="180">
<template slot-scope="scope">
<span>{{scope.row.number}}</span>
......@@ -126,7 +127,7 @@
import {listServiceUser} from "@/api/system/user";
export default {
name: "DeptTarget",
name: "EcwDepttargetMydeptachievement",
components: {},
data() {
return {
......
src/views/ecw/deptTarget/myDeptTarget.vue
View file @ 5168ec76
......@@ -155,7 +155,7 @@
import { parseTime } from '@/utils/ruoyi';
export default {
name: "DeptTarget",
name: "EcwDepttargetMydepttarget",
components: {},
data() {
return {
......@@ -267,13 +267,17 @@ import { parseTime } from '@/utils/ruoyi';
this.getChannelList();
this.getList();
},
activated() {
this.getChannelList();
this.getList();
},
methods: {
/** 查询部门列表 */
getDeptList(){
this.loading = true;
myListDept(this.queryParams).then(response => {
this.deptList = this.handleTree(response.data, "id");
console.log("this.deptList:"+JSON.stringify(this.deptList));
// console.log("this.deptList:"+JSON.stringify(this.deptList));
this.deptList.forEach((item) => {
this.normalizer(item);
// this.deptData.push(item);
......
src/views/ecw/order/addAssociatedOrder.vue
View file @ 5168ec76
......@@ -42,10 +42,7 @@
{{parseTime(row.rucangTime)}}
</template>
</el-table-column>
<el-table-column :label="$t('状态')">
<template v-slot:default="scope">
<dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
</template>
<el-table-column :label="$t('状态')" prop="statusMsg">
</el-table-column>
<el-table-column :label="$t('操作')">
<template v-slot:default="scope">
......
src/views/ecw/order/associatedOrder.vue
View file @ 5168ec76
......@@ -54,7 +54,7 @@
</el-table-column>
<el-table-column :label="$t('状态')" prop="status" >
<template v-slot:default="scope">
<dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
{{scope.row.orderBackVO.statusMsg}}
</template>
</el-table-column>
<el-table-column :label="$t('操作人')" prop="creator">
......
src/views/ecw/order/detail.vue
View file @ 5168ec76
......@@ -305,7 +305,7 @@
</el-tab-pane>
<!-- 这个地方v-hasPermi不生效，所以换checkPermi函数检查 -->
<el-tab-pane :label="$t('操作日志')" name="five" v-if="checkPermi(['ecw:order:logs'])">
<el-table :data="logs">
<el-table :data="logs" v-loading="logsLoading">
<el-table-column :label="$t('时间')" width="150">
<template slot-scope="{row}">{{ parseTime(row.createTime) }}</template>
</el-table-column>
......@@ -460,7 +460,7 @@ export default {
showWarehouseInItemId: null, // 当前显示的入仓
showFeeDetailDialog: null, // 是否显示费用详情弹层
feeDetail: null, // 费用详情
logsLoading: false, // 日志加载中
logs: [], // 操作日志
activeNames: [],//显示隐藏订单基本信息
showText:this.$t('显示更多')
......@@ -668,8 +668,11 @@ export default {
},
// 加载操作日志
loadLogs(){
this.logsLoading = true
operateLogPage({orderId: this.orderId, page: 1, rows: 10000}).then(res => {
this.logs = res.data.list
}).finally(() => {
this.logsLoading = false
})
},
downloadPackingList(){
......
src/views/ecw/order/exception/index.vue
View file @ 5168ec76
......@@ -197,6 +197,7 @@
<el-button v-else-if="scope.row.orderExceptionType=='order_bulky_cargo_exception'" v-hasPermi="['ecw:exception:bulkyCargo']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_pick_up_exception'" v-hasPermi="['ecw:exception:pickUp']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='not_customer_service_exception'" v-hasPermi="['ecw:exception:notCustomer']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='goods_add_exception'" v-hasPermi="['ecw:exception:goodsAddException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
</template>
</el-table-column>
</el-table>
......
src/views/ecw/order/index.vue
View file @ 5168ec76
......@@ -64,7 +64,7 @@
<dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType" clearable/>
</el-form-item>
<el-form-item :label="$t('客户经理')" >
<user-selector v-model="queryParams.salesmanId" clearable @change="handleQuery"/>
<user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"/>
</el-form-item>
<el-form-item :label="$t('订单状态')" prop="status">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"
......@@ -330,9 +330,7 @@
<!-- 合单日志，提货日志 -->
<template v-if="(
scope.row.status > 2 &&
exclude(scope.row.status + '-' + scope.row.shipmentState, ['17-391', '18-392', '15-332', '15-330']) &&
exclude(scope.row.status + '-' + scope.row.inWarehouseState, ['16-202'])
scope.row.status > 2
)">
<el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo" v-hasPermi="['ecw:order:merge_log']">{{$t('合单日志')}}</el-dropdown-item>
<el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo" v-hasPermi="['ecw:order:split_log']">{{$t('提货日志')}}</el-dropdown-item>
......
src/views/ecw/order/mutexOrder.vue
View file @ 5168ec76
......@@ -54,7 +54,7 @@
</el-table-column>
<el-table-column :label="$t('状态')" prop="status" >
<template v-slot:default="scope">
<dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
{{scope.row.orderBackVO.statusMsg}}
</template>
</el-table-column>
<el-table-column :label="$t('操作人')">
......
src/views/ecw/order/notMutexOrder.vue
View file @ 5168ec76
......@@ -42,10 +42,7 @@
{{parseTime(row.rucangTime)}}
</template>
</el-table-column>
<el-table-column :label="$t('状态')">
<template v-slot:default="scope">
<dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
</template>
<el-table-column :label="$t('状态')" prop="statusMsg" >
</el-table-column>
<el-table-column :label="$t('操作')">
<template v-slot:default="scope">
......
src/views/ecw/order/pending.vue
View file @ 5168ec76
......@@ -127,6 +127,7 @@
<el-button v-else-if="scope.row.orderExceptionType=='order_bulky_cargo_exception'" v-hasPermi="['ecw:exception:bulkyCargo']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='order_pick_up_exception'" v-hasPermi="['ecw:exception:pickUp']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='not_customer_service_exception'" v-hasPermi="['ecw:exception:notCustomer']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='goods_add_exception'" v-hasPermi="['ecw:exception:goodsAddException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
</template>
</el-table-column>
</el-table>
......
src/views/ecw/order/prepayDeal.vue
View file @ 5168ec76
......@@ -326,7 +326,7 @@
</el-row>
<el-row v-else-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'">
<el-form-item :label="$t('处理结果')+':'" required>
<el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable>
<el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable @change="handlerResultChange">
<template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
<el-option :disabled="dict.value=='pending'" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
</template>
......@@ -348,8 +348,10 @@
class="mb-0 mr-0"
>
<product-selector
:status="0"
@hook:mounted="onTableMounted"
v-model="handlerParams.productId"
v-model="productId2"
@change = "onProductChange($event)"
/>
</el-form-item>
</el-row>
......@@ -367,8 +369,9 @@
>
<product-selector
lang="En"
@hook:mounted="onTableMounted"
v-model="handlerParams.productId"
:status="0"
v-model="productId1"
@change = "onProductChange($event)"
/>
</el-form-item>
</el-row>
......@@ -522,6 +525,8 @@
region:'',
customerData:{},//归属客户
customerServiceList:[],//客户经理
productId1:null,
productId2:null
};
},
created() {
......@@ -571,6 +576,8 @@
if(this.orderExceptionData.orderItemId && this.orderData && this.orderData.orderItemVOList){
if(this.orderExceptionData.orderExceptionType=='goods_add_exception'&&!this.handlerParams.productId){
this.handlerParams.productId = this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId).prodId
// this.productId1 = this.handlerParams.productId
// this.productId2 = this.handlerParams.productId
}
console.log(this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId))
return this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId)
......@@ -661,6 +668,13 @@
}
return this.$t('无')
},
//新增异常处理结果切换
handlerResultChange(){
// if(this.orderExceptionData.orderExceptionType=='goods_add_exception'){
// this.productId1 = this.handlerParams.productId
// this.productId2 = this.handlerParams.productId
// }
},
submitForm(){
if(!this.handlerParams.orderExceptionHandlerResult){
this.$modal.msgError(this.$t('请选择处理结果'));
......@@ -673,12 +687,20 @@
// }
this.handlerParams.files = Array.isArray(this.handlerParams.fileList) ? this.handlerParams.fileList.join(',') : this.handlerParams.fileList
}
handlerExceptionByExceptionId(this.handlerParams).then(res=>{
this.$modal.msgSuccess(this.$t('提交成功'));
if(this.orderExceptionData.orderExceptionType=='goods_add_exception'&&this.handlerParams.orderExceptionHandlerResult=='goods_absent'){
this.$redirect('/product/product-list?prodId=' + this.handlerParams.productId)
return
}
if(this.orderExceptionData.orderExceptionType=='goods_add_exception'&&this.handlerParams.orderExceptionHandlerResult=='goods_exists'){
if(this.productId1){
this.handlerParams.productId = this.productId1
}else{
this.$modal.msgError(this.$t('请选择产品'));
return
}
}
handlerExceptionByExceptionId(this.handlerParams).then(res=>{
this.$modal.msgSuccess(this.$t('提交成功'));
this.$redirect('/order/pending?id=' + this.orderData.orderId)
})
},
......@@ -740,6 +762,15 @@
onClickClosePreview(val){
this.IsPreview = val // 由组件内部传入的关闭数据赋值关闭
},
onProductChange(product){
if(!product){
this.productId1 = null
this.productId2 = null
return false
}
this.productId1 = product.id
this.productId2 = product.id
},
}
};
</script>
......
src/views/ecw/order/warehousing/index.vue
View file @ 5168ec76
......@@ -43,7 +43,7 @@
:label="$t('入库货物属性')">
<template v-slot="{row}">
<template v-if="row.warehouseInInfoVO">
{{$t('品牌')}}：{{ [$t('无牌'), $t('有牌'), $t('中性')][row.feeType] }}<br>
{{$t('品牌')}}：{{ row.brandName }}<br>
{{$t('箱数')}}：{{ row.warehouseInInfoVO.cartonsNum }}<br>
{{$t('体积')}}：{{ row.warehouseInInfoVO.volume }}m³<br>
{{$t('重量')}}：{{ row.warehouseInInfoVO.weight }}Kg
......
src/views/ecw/product/index.vue
View file @ 5168ec76
......@@ -159,6 +159,13 @@
</el-form-item>
<el-form-item prop="auditStatus" :label="$t('是否审核')">
<template slot-scope="scope">
<el-select v-model="form.auditStatus">
<el-option v-for="auditStatusItem in auditStatusDictDatas" :key="auditStatusItem.id" :label="$l(auditStatusItem, 'label')" :value="parseInt(auditStatusItem.value)" />
</el-select>
</template>
</el-form-item>
<el-form-item :label="$t('商品编码')" prop="productCode">
<el-input v-model="form.productCode" :placeholder="$t('请输入商品编码')" />
</el-form-item>
......@@ -328,6 +335,7 @@ export default {
packagingList: getDictDatas(DICT_TYPE.ECW_PACKAGING_TYPE),
locationList: getDictDatas(DICT_TYPE.ECW_CONTAINER_LOCATION),
preferentialList:[],
exceptionProductId:0//新增商品异常传的id
};
},
......@@ -372,13 +380,17 @@ export default {
if(this.$route.query.typeId != this.queryParams.typeId){
this.queryParams.typeId = +this.$route.query.typeId || null
}
//新增商品异常跳转商品修改
if(this.$route.query.prodId){
this.exceptionProductId = this.$route.query.prodId
this.handleUpdate({id:this.$route.query.prodId})
}
this.getList()
},
created() {
console.log(111)
//新增商品异常跳转商品修改
if(this.$route.query.prodId){
console.log(this.$route.query.prodId)
this.exceptionProductId = this.$route.query.prodId
this.handleUpdate({id:this.$route.query.prodId})
}
let typeId = this.$route.query.typeId;
......@@ -499,7 +511,7 @@ export default {
const id = row.id;
getProduct(id).then(response => {
this.form = {...response.data,couponIds:[]};
let attrArray = this.form.attrId.split(',');
let attrArray = this.form.attrId?this.form.attrId.split(','):[];
for (let index in attrArray) {
let value = attrArray[index];
attrArray[index] = parseInt(value);
......@@ -528,9 +540,17 @@ export default {
this.form.attrId = this.form.attrArray.join(',');
// 修改的提交
if (this.form.id != null) {
if(this.exceptionProductId){
this.form.productId = this.exceptionProductId
this.form.status = 0
}
updateProduct(this.form).then(response => {
this.$modal.msgSuccess(this.$t("修改成功"));
this.open = false;
if(this.exceptionProductId){
this.exceptionProductId = null
this.$router.replace({ path: '/product/product-list'})
}
this.getList();
});
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment