Skip to content

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

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

parents 86f4dbf5 2f733409
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 68 deletions
.vs/VSWorkspaceState.json
View file @ b8ebf3c6
{
"ExpandedNodes": [
"",
"\\src"
"\\src",
"\\src\\views",
"\\src\\views\\ecw",
"\\src\\views\\ecw\\order"
],
"SelectedNode": "\\src\\main.js",
"PreviewInSolutionExplorer": false
}
\ No newline at end of file
.vs/slnx.sqlite
View file @ b8ebf3c6
No preview for this file type
src/components/ChooseContactDialog/index.vue
View file @ b8ebf3c6
......@@ -13,6 +13,12 @@
<div class="value">{{item.contactsName}}</div>
<el-tag v-if="item.isInOpenSea" type="danger" effect="dark">{{$t('公')}}</el-tag>
</div>
<!-- v1.7新增 -->
<div class="line">
<div class="label">{{$t('姓名(英文)')}}：</div>
<div class="value">{{item.contactsNameEn}}</div>
<el-tag v-if="item.isInOpenSea" type="danger" effect="dark">{{$t('公')}}</el-tag>
</div>
<div class="line">
<div class="label">{{$t('电话')}}：</div>
<div class="value">+{{item.areaCode}} {{item.phoneNew}}</div>
......@@ -25,6 +31,11 @@
<div class="label">{{$t('公司')}}：</div>
<div class="value">{{item.company}}</div>
</div>
<!-- v1.7新增 -->
<div class="line">
<div class="label">{{$t('公司(英文)')}}：</div>
<div class="value">{{item.companyEn}}</div>
</div>
</div>
</div>
</div>
......@@ -91,7 +102,7 @@ export default {
padding: 5px;
border-radius: 10px;
border: 5px solid transparent;
background: linear-gradient(white,white) padding-box,repeating-linear-gradient(-45deg, red 0, red 12.5%, transparent 0, transparent 25%, #58a 0, #58a 37.5%, transparent 0, transparent 50%) 0/5em 5em;
background: linear-gradient(white,white) padding-box,repeating-linear-gradient(-45deg, red 0, red 12.5%, transparent 0, transparent 25%, #58a 0, #58a 37.5%, transparent 0, transparent 50%) 0/5em 5em;
.item-box{
/* background: #fbfaf5; */
padding: 20px;
......
src/i18n/languages/en_US.json
View file @ b8ebf3c6
......@@ -3844,5 +3844,6 @@
"慢": "slow",
"CTN NO": "",
"请输入CTN NO": "请输入CTN NO",
"境内外类型": "Internal and external types"
"境内外类型": "Internal and external types",
"为保证入仓数据准确性，入仓请带上一份装箱单（品名，件数，毛重，尺寸方数，是否有牌）":"To ensure the accuracy of warehousing information, please bring a packing list with goods when entrying the warehouse. (Packing list should contain: Product name, Number of cartons, Gross weight, Measurements, Branded or not)"
}
src/views/ecw/order/detail.vue
View file @ b8ebf3c6
This diff is collapsed.
src/views/ecw/order/edit.vue
View file @ b8ebf3c6
......@@ -22,41 +22,63 @@
</el-form-item>
<div class="form-section">
<el-form-item :label="$t('发货人')" prop="consignorContactsId" >
<el-form-item :label="$t('发货人中文名称')" prop="consignorContactsId" >
<!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
<div class="contact">
<el-input v-model="form.consignorName" placeholder="" :disabled2="inWarehouse"/>
<img src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignor'" />
<img src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='0'" />
</div>
</el-form-item>
<!-- v1.7新增 -->
<el-form-item :label="$t('发货人英文名称')" prop="consignorContactsId" >
<!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
<div class="contact">
<el-input v-model="form.consignorNameEn" placeholder="" :disabled2="inWarehouse"/>
</div>
</el-form-item>
<el-form-item :label="$t('发货人电话')" prop="consignorPhone">
<area-code-selector v-model="form.consignorCountryCode" class="w-200 mr-10" disabled />
<el-input v-model="form.consignorPhone" class="w-200" disabled />
</el-form-item>
<el-form-item :label="$t('发货人公司')" prop="consignorPhone">
<el-form-item :label="$t('发货人公司中文名称')" prop="consignorPhone">
<el-input v-model="form.consignorCompany" :disabled2="inWarehouse" />
</el-form-item>
<!-- v1.7新增 -->
<el-form-item :label="$t('发货人公司英文名称')" prop="consignorPhone">
<el-input v-model="form.consignorCompanyEn" :disabled2="inWarehouse" />
</el-form-item>
<el-form-item label="Email" prop="consignorPhone">
<el-input v-model="form.consignorEmail" :disabled2="inWarehouse" />
</el-form-item>
</div>
<div class="form-section">
<el-form-item :label="$t('收货人')" prop="consigneeContactsId">
<el-form-item :label="$t('收货人中文名称')" prop="consigneeContactsId">
<!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
<div class="contact">
<el-input v-model="form.consigneeName" placeholder="" :disabled2="inWarehouse"/>
<img src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignee'" />
<img src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='1'" />
</div>
</el-form-item>
<!-- v1.7新增 -->
<el-form-item :label="$t('收货人英文名称')" prop="consigneeContactsId">
<!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
<div class="contact">
<el-input v-model="form.consigneeNameEn" placeholder="" :disabled2="inWarehouse"/>
</div>
</el-form-item>
<el-form-item :label="$t('收货人电话')" prop="consigneePhone">
<area-code-selector v-model="form.consigneeCountryCode" class="w-200 mr-10" disabled/>
<el-input v-model="form.consigneePhone" class="w-200" disabled/>
</el-form-item>
<el-form-item :label="$t('收货人公司')" prop="consigneePhone">
<el-form-item :label="$t('收货人公司中文名称')" prop="consigneePhone">
<el-input v-model="form.consigneeCompany" :disabled2="inWarehouse" />
</el-form-item>
<!-- v1.7新增 -->
<el-form-item :label="$t('收货人公司英文名称')" prop="consigneePhone">
<el-input v-model="form.consigneeCompanyEn" :disabled2="inWarehouse" />
</el-form-item>
<el-form-item label="Email" prop="consigneePhone">
<el-input v-model="form.consigneeEmail" :disabled2="inWarehouse"/>
</el-form-item>
......@@ -227,7 +249,7 @@
</el-table-column>
<el-table-column :label="$t('商品特性')" width="250px">
<template slot-scope="{row}">
<el-checkbox-group v-model="row.prodAttrArr" @change="onProductAttrChange(row, $event)" :disabled="!canAddProduct || !productEditable">
<el-checkbox-group v-model="row.prodAttrArr" @change="onProductAttrChange(row, $event)" :disabled="row.prodAttrArr.indexOf(4)!=-1||!canAddProduct || !productEditable">
<el-checkbox v-for="item in productAttrList" :label="item.id" :key="item.id">{{$l(item, 'attrName')}}</el-checkbox>
</el-checkbox-group>
</template>
......@@ -794,7 +816,7 @@ export default {
if(transportId == 1 || transportId == 2){
this.$set(this.form, 'channelId', null)
}
this.getOpenedRouterList()
},
'form.channelId'(){
......@@ -890,8 +912,8 @@ export default {
this.initing = false
})
}
},
methods: {
onTableMounted(e){
......@@ -902,7 +924,7 @@ export default {
this.form = Object.assign({}, {...res.data}, {orderItemVOList: []})
/* this.form.orderItemVOList = []; */
this.form.type = this.form.type ? this.form.type.split(',').filter(item => item != '') : []
this.form.packageTypeArr = this.form.packageType ? this.form.packageType.split(',').filter(item => item != '') : []
if(res.data.consignorVO){
......@@ -924,7 +946,7 @@ export default {
this.$set(this.form, 'consigneeName', res.data.consigneeVO.name)
this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone)
}
if(this.form.channelId == 0){
delete this.form.channelId
}
......@@ -942,7 +964,7 @@ export default {
if(this.form.drawee == 3){
this.customDraweeList.forEach(item => {
item.value = this.form.customDraweeVOList.find(it => it.name == item.name)?.value || item.value
})
})
}
// 如果已完成入仓，则需要监听必填内容，发生更改后需要填写审批表单
......@@ -951,7 +973,7 @@ export default {
item.prodAttrArr = item.prodAttrIds.split(',').filter(item => item != '').map(attrId => +attrId)
this.form.orderItemVOList.push({...item})
})
if(this.inWarehouse){
Object.keys(this.rules).forEach(field => {
console.log("watch", field)
......@@ -1112,10 +1134,21 @@ export default {
});
}
}
let isInclude = false
this.form.orderItemVOList.map(item => {
//如果商品特性包含不接受货物，不能创建订单或修改订单
if(item.prodAttrArr.indexOf(4)!=-1){
isInclude = true
}
item.prodAttrIds = item.prodAttrArr.join(',')
})
if(isInclude){
return this.$notify({
title: this.$t('提示'),
message: this.$t("订单包含不接受货物，请检查"),
type: 'warning'
});
}
this.transportList.map(item => {
if(item._enabled){
item.lineIds = Array.from(item.lineIdSet).join(',')
......
src/views/ecw/order/prepayDeal.vue
View file @ b8ebf3c6
......@@ -11,7 +11,7 @@
{{orderData.orderNo || ''}}
</el-form-item>
</el-row>
<div v-if="shopData">
<div v-if="shopData&&orderExceptionData.orderExceptionType!='goods_add_exception'">
<el-row>
<el-form-item :label="$t('产品名称')+':'" >
{{shopData.prodTitleZh || ''}}
......@@ -96,7 +96,7 @@
<span>{{orderExceptionData.orderExceptionDetails}}</span>
</el-form-item>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'||orderExceptionData.orderExceptionType=='goods_add_exception'">
<el-form-item :label="$t('收费参数')+':'">
<span>{{orderData.sumNum||0}}{{$t('箱')}} {{orderData.wvolume||0}}m³ {{orderData.vweight||0}}Kg {{orderData.sumQuantity||0}}{{$t('个')}}</span>
</el-form-item>
......@@ -333,6 +333,46 @@
</el-select>
</el-form-item>
</el-row>
<!-- v1.7新增商品异常 -->
<div v-show="shopData&&orderExceptionData.orderExceptionType=='goods_add_exception'&&handlerParams.orderExceptionHandlerResult=='goods_exists'">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item :label="$t('新增品名中文')+':'" >
{{shopData.prodTitleZh || ''}}
</el-form-item>
</el-col>
<el-form-item label="中文品名"
:rules="{
required: true, message: $t('请选择产品'), trigger: 'blur'
}"
class="mb-0 mr-0"
>
<product-selector
@hook:mounted="onTableMounted"
v-model="handlerParams.productId"
/>
</el-form-item>
</el-row>
<el-row :gutter="24">
<el-col :span="6">
<el-form-item :label="$t('新增品名英文')+':'">
{{shopData.prodTitleEn || ''}}
</el-form-item>
</el-col>
<el-form-item label="英文品名"
:rules="{
required: true, message: $t('请选择产品'), trigger: 'blur'
}"
class="mb-0 mr-0"
>
<product-selector
lang="En"
@hook:mounted="onTableMounted"
v-model="handlerParams.productId"
/>
</el-form-item>
</el-row>
</div>
<el-row v-if="orderExceptionData.orderExceptionType=='not_customer_service_exception'&&handlerParams.orderExceptionHandlerResult=='allocate'">
<el-form-item :label="$t('移交客户经理')+':'" required>
<el-select v-model="handlerParams.customerService" :placeholder="$t('请选择客户经理')" clearable>
......@@ -362,7 +402,7 @@
</el-select>
</el-form-item>
</el-row>
<el-row :span="8" v-if="orderExceptionData.orderExceptionType!='not_customer_service_exception'">
<el-row :span="8" v-if="orderExceptionData.orderExceptionType!='not_customer_service_exception'&&orderExceptionData.orderExceptionType!='goods_add_exception'">
<el-form-item :label="$t('备注')+':'" size="medium">
<el-input style="width: 500px;" type="textarea" v-model="handlerParams.orderExceptionHandlerRemark" />
</el-form-item>
......@@ -444,10 +484,11 @@
import {listServiceUser} from "@/api/system/user";
import {cancelProcessInstance} from '@/api/bpm/processInstance'
import {getCustomer} from '@/api/ecw/customer'
import ProductSelector from '@/components/ProductSelector'
export default {
name: "PrepayDeal",
components: {
FileUpload, WorkFlow,FilePreview
FileUpload, WorkFlow,FilePreview,ProductSelector
},
data() {
return {
......@@ -528,11 +569,18 @@
},
shopData(){
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
}
return this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId)
}
}
},
methods: {
onTableMounted(e){
// console.warn('onTableMounted', e)
},
/** 查询列表 */
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
......@@ -547,6 +595,7 @@
// that.orderExceptionData.orderExceptionType = 'order_other_exception'
// that.orderExceptionData.orderExceptionType = 'order_miss_exception'
// that.orderExceptionData.orderExceptionType = 'not_customer_service_exception'
// that.orderExceptionData.orderExceptionType = 'goods_add_exception'
that.loading = false;
that.orderId = response.data.orderId
that.getOrderData()
......@@ -627,6 +676,9 @@
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)
}
this.$redirect('/order/pending?id=' + this.orderData.orderId)
})
},
......@@ -731,4 +783,7 @@
.filelist span{
color: #1E98D7;
}
.red{
color: red;
}
</style>
src/views/ecw/order/success.vue
View file @ b8ebf3c6
......@@ -17,6 +17,8 @@
</div>
<div class="line">{{$t('仓库地址')}}：{{order.logisticsInfoDto.startAddressZh}}</div>
<div class="line">{{$t('仓库电话')}}： {{order.logisticsInfoDto.startTell}}</div>
<!-- v1.7新增 -->
<div class="line">{{$t('为保证入仓数据准确性，入仓请带上一份装箱单（品名，件数，毛重，尺寸方数，是否有牌）')}}</div>
<div class="line"></div>
<div class="line">{{$t('您的订单已提交，谢谢您选择捷道物流！')}}</div>
</el-col>
......
src/views/ecw/product/index.vue
View file @ b8ebf3c6
......@@ -375,6 +375,12 @@ export default {
this.getList()
},
created() {
console.log(111)
//新增商品异常跳转商品修改
if(this.$route.query.prodId){
console.log(this.$route.query.prodId)
this.handleUpdate({id:this.$route.query.prodId})
}
let typeId = this.$route.query.typeId;
if (typeId) {
this.queryParams.typeId = parseInt(typeId);
......@@ -382,6 +388,7 @@ export default {
this.getAttrList();
this.getTypeList();
this.getList();
},
methods: {
/** 获取产品属性列表 */
......@@ -487,6 +494,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
// this.reset();
console.log(row);
const id = row.id;
getProduct(id).then(response => {
this.form = {...response.data,couponIds:[]};
......
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