Skip to content

J
jiedao-app-operator-master
Commit c2da1f00 authored by 我在何方's avatar 我在何方
Browse files
Options

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents a9fd9d64 ea3cb17d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 765 additions and 58 deletions
src/api/ecw/order.js
View file @ c2da1f00
...@@ -1007,3 +1007,11 @@ export function getWaitingShipmentCount(){ ...@@ -1007,3 +1007,11 @@ export function getWaitingShipmentCount(){
method: 'get' method: 'get'
}) })
} }
// 空运订单不可出
export function setCanNotShipment(orderId){
return request({
url: '/air/order/not/can/shipment/' + orderId,
method: 'put',
})
}
src/api/ecw/product.js
View file @ c2da1f00
...@@ -26,7 +26,14 @@ export function updateProduct(data) { ...@@ -26,7 +26,14 @@ export function updateProduct(data) {
data: data data: data
}) })
} }
// 获得空运产品的路线价格数量
export function countByProductIdAndTransportType(params){
return request({
url:'/ecw/product-price/countByProductIdAndTransportType',
method:'get',
params
})
}
// 删除产品 // 删除产品
export function deleteProduct(id) { export function deleteProduct(id) {
return request({ return request({
......
src/api/member/user.js
View file @ c2da1f00
...@@ -158,3 +158,11 @@ export function createAuditIdCard(data){ ...@@ -158,3 +158,11 @@ export function createAuditIdCard(data){
data data
}) })
} }
//会员详情
export function memberUserGet(params){
return request({
url:'/member/user/info',
method:'get',
params
})
}
src/assets/svg/contact_create.svg 0 → 100644
View file @ c2da1f00
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 735 849" fill="#409eff"><defs><style>.cls-1{fill:none;}</style></defs><title>资源 4</title><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><path d="M235,619c-2-5-3-14-3-19h0c2-103,89-187,193-187a193,193,0,0,1,136,57,15,15,0,0,0,11,4h0c13,0,20-16,11-26l-2-2a222,222,0,0,0-89-53,122,122,0,0,0,56-103c0-67-55-122-122-122a122,122,0,0,0-67,225,222,222,0,0,0-89,53,219,219,0,0,0-67,153c0,3,0,19,5,32s30,24,41,24H448a15,15,0,0,0,15-15h0a15,15,0,0,0-15-15H249s-11,0-14-6Zm97-329a93,93,0,0,1,93-93c50,0,92,42,92,92a93,93,0,1,1-185,1Zm0,0"/><polygon class="cls-1" points="22 96 735 96 725 849 12 849 22 96"/><path d="M614,0H154A102,102,0,0,0,52,102v95h0v3h1c2,12,11,20,23,20a24,24,0,0,0,23-20h0V125a77,77,0,0,1,77-77H592a77,77,0,0,1,77,77V687a77,77,0,0,1-77,77H176a77,77,0,0,1-77-77V606a24,24,0,0,0-47-1h0V711A102,102,0,0,0,154,814H614A102,102,0,0,0,716,711V102A102,102,0,0,0,614,0Zm0,0"/><path d="M26,299H128a26,26,0,1,0,0-51H26a26,26,0,1,0,0,51Z"/><path d="M154,532a26,26,0,0,0-26-26H26a26,26,0,1,0,0,51H128a26,26,0,0,0,26-26Z"/><path d="M52,363v84a24,24,0,0,0,47,0V363a24,24,0,0,0-47,0Z"/><path d="M309,314"/><rect x="456" y="559" width="175" height="30" rx="15" ry="15"/><rect x="456" y="559" width="175" height="30" rx="15" ry="15" transform="translate(1117 30) rotate(90)"/></g></g></svg>
src/assets/svg/contacts.svg 0 → 100644
View file @ c2da1f00
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 716 814" fill="#409eff"><defs><style>.cls-1{fill:none;}</style></defs><title>资源 5</title><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><path d="M614,0H154A102,102,0,0,0,52,102v95h0v3h1c2,12,11,20,23,20a24,24,0,0,0,23-20h0V125a77,77,0,0,1,77-77H592a77,77,0,0,1,77,77V687a77,77,0,0,1-77,77H176a77,77,0,0,1-77-77V606a24,24,0,0,0-47-1h0V711A102,102,0,0,0,154,814H614A102,102,0,0,0,716,711V102A102,102,0,0,0,614,0Zm0,0"/><path d="M26,299H128a26,26,0,1,0,0-51H26a26,26,0,1,0,0,51Z"/><path d="M154,532a26,26,0,0,0-26-26H26a26,26,0,1,0,0,51H128a26,26,0,0,0,26-26Z"/><path d="M52,363v84a24,24,0,0,0,47,0V363a24,24,0,0,0-47,0Z"/><path d="M309,314"/><path d="M289,218c-71,53-80,170-17,288S432,682,534,651c26-8,52-31,52-56,0-44-51-132-88-139-11-2-23,2-43,10l-6,3-5,2-15,7h-3l-3-4c-5-6-12-15-18-26l-2-3a302,302,0,0,1-22-44h0l12-5,7-3,7-3,5-3c14-6,22-11,26-16,26-28-26-166-68-174-25-5-56,4-79,19l-2,2Zm75,14c5,1,21,25,33,57,6,16,10,32,13,44v2a73,73,0,0,1,1,11v2h-3l-15,8-10,5-12,5-16,7h-4c-1-1-2,2-8,20,11,46,57,122,85,122h9l7-4,13-6,6-3,6-3h3l17-6h5c18,3,59,75,59,104,0,6-13,18-27,22-83,25-165-26-220-128s-49-201,7-242c15-11,37-18,53-15Zm0,0"/><rect class="cls-1" x="229" y="190" width="357" height="469.26"/></g></g></svg>
src/assets/svg/success.svg deleted 100644 → 0
View file @ a9fd9d64
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1697265053025" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4223" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M874.119618 149.859922A510.816461 510.816461 0 0 0 511.997 0.00208a509.910462 509.910462 0 0 0-362.119618 149.857842c-199.817789 199.679789-199.817789 524.581447 0 724.260236a509.969462 509.969462 0 0 0 362.119618 149.857842A508.872463 508.872463 0 0 0 874.119618 874.120158c199.836789-199.679789 199.836789-524.581447 0-724.260236zM814.94268 378.210681L470.999043 744.132295a15.359984 15.359984 0 0 1-5.887994 4.095996c-1.751998 1.180999-2.913997 2.362998-5.276994 2.913997a34.499964 34.499964 0 0 1-13.469986 2.914997 45.547952 45.547952 0 0 1-12.897986-2.303998l-4.095996-2.363997a45.291952 45.291952 0 0 1-7.009992-4.095996l-196.902793-193.789796a34.126964 34.126964 0 0 1-10.555989-25.186973c0-9.37399 3.583996-18.74698 9.98399-25.186974a36.429962 36.429962 0 0 1 50.372947 0l169.98382 167.423824L763.389735 330.220732a37.059961 37.059961 0 0 1 50.371947-1.732998 33.647965 33.647965 0 0 1 11.165988 25.186973 35.544963 35.544963 0 0 1-9.98399 24.575974v-0.04z m0 0" fill="#52C41A" p-id="4224"></path></svg>
\ No newline at end of file
src/i18n/languages/en_US.json
View file @ c2da1f00
...@@ -4347,5 +4347,6 @@ ...@@ -4347,5 +4347,6 @@
"下载状态": "Download status", "下载状态": "Download status",
"已下载": "Downloaded", "已下载": "Downloaded",
"待下载": "To be downloaded", "待下载": "To be downloaded",
"重试": "retry " "重试": "retry ",
"会员详情": "Member Details"
} }
src/views/bpm/task/copy.vue
View file @ c2da1f00
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column :label="$t('流程编号')" align="center" prop="instanceId" width="320"/> <el-table-column :label="$t('流程编号')" align="center" prop="instanceId" width="320"/>
<el-table-column :label="$t('业务编号')" align="center" prop="businessNo" />
<el-table-column :label="$t('流程名称')" align="center" prop="processName"/> <el-table-column :label="$t('流程名称')" align="center" prop="processName"/>
<!-- <el-table-column :label="$t('业务编号')" align="center" prop="processName"/> --> <!-- <el-table-column :label="$t('业务编号')" align="center" prop="processName"/> -->
<el-table-column :label="$t('流程分类')" align="center" prop="categoryId"> <el-table-column :label="$t('流程分类')" align="center" prop="categoryId">
......
src/views/ecw/box/shippingAir/nodePage/cusClearance.vue
View file @ c2da1f00
...@@ -275,6 +275,7 @@ export default { ...@@ -275,6 +275,7 @@ export default {
this.$set(this.cusClearanceObj, 'clClearTime', formatDate(clear.clClearTime)) this.$set(this.cusClearanceObj, 'clClearTime', formatDate(clear.clClearTime))
} }
this.orderdialogVisible = false this.orderdialogVisible = false
this.cusClearanceObj.clearanceOrderIdList.push(val.orderId)
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelectOrder = val this.multipleSelectOrder = val
...@@ -306,6 +307,7 @@ export default { ...@@ -306,6 +307,7 @@ export default {
this.$set(this.cusClearanceObj, 'clClearTime', null) this.$set(this.cusClearanceObj, 'clClearTime', null)
} }
this.orderdialogVisible = false this.orderdialogVisible = false
this.cusClearanceObj.clearanceOrderIdList = this.multipleSelectOrder.map((item) => item.orderId)
}, },
getClAgent(type) { getClAgent(type) {
const agentId = this.$attrs.shipmentObj.agentInfo.agentId const agentId = this.$attrs.shipmentObj.agentInfo.agentId
......
src/views/ecw/box/shippingAir/nodePage/preinstall.vue
View file @ c2da1f00
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<el-form-item :label="$t('特性')" prop="attrId"> <el-form-item :label="$t('特性')" prop="attrId">
<el-select v-model="queryParams.attrId" :placeholder="$t('特性')"> <el-select v-model="queryParams.attrId" :placeholder="$t('特性')">
<el-option v-for="item in attrIdList" :label="item" :value="item*1" :key="item"></el-option> <el-option v-for="item in attrIdList" :label="item.label" :value="item.value*1" :key="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum"> <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="color: bule" v-if="scope.row.mixStatus == 1">{{scope.row.warehouseInInfoVO.cartonsNum}}{{$t('(混箱)')}}</span> <span style="color: blue;" v-if="scope.row.mixStatus == 1">{{scope.row.warehouseInInfoVO.cartonsNum}}{{$t('(混箱)')}}</span>
<template v-else> <template v-else>
{{scope.row.warehouseInInfoVO.cartonsNum}} {{scope.row.warehouseInInfoVO.cartonsNum}}
</template> </template>
...@@ -514,7 +514,15 @@ export default { ...@@ -514,7 +514,15 @@ export default {
if(this.queryParams.shippingChannelId){ if(this.queryParams.shippingChannelId){
let attrs = this.channelList.find(item=>this.queryParams.shippingChannelId == item.channelId) let attrs = this.channelList.find(item=>this.queryParams.shippingChannelId == item.channelId)
if(attrs){ if(attrs){
data = attrs.attrId.split(',') let attrId = attrs.attrId.split(',')
attrId.forEach((item,index)=>{
data.push(
{
value: item,
label: attrs.attrNameList[index]
}
)
})
} }
} }
return data return data
......
src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
View file @ c2da1f00
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<el-table-column :label="$t('重量')" align="center" prop="weight" /> <el-table-column :label="$t('重量')" align="center" prop="weight" />
<el-table-column :label="$t('订单状态')" align="center" prop=""> <el-table-column :label="$t('订单状态')" align="center" prop="">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.rowstatusMsg}} {{scope.row.statusMsg}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('异常状态')" align="center" prop=""> <el-table-column :label="$t('异常状态')" align="center" prop="">
......
src/views/ecw/box/shippingAir/seaProcess.vue
View file @ c2da1f00
...@@ -220,13 +220,14 @@ export default { ...@@ -220,13 +220,14 @@ export default {
break; break;
// 卸柜 // 卸柜
case "unloading": case "unloading":
this.$set(this.dialogConfig, "fullscreen", true);
// 卸柜反审 // 卸柜反审
const unStatus = this.shipmentObj[node.keyName]; const unStatus = this.shipmentObj[node.keyName];
if ([186].includes(unStatus)) { if ([186].includes(unStatus)) {
this.currentComponent = `reviewWidget`; this.currentComponent = `reviewWidget`;
this.$set(this.dialogConfig, "width", "700px"); this.$set(this.dialogConfig, "width", "700px");
this.$set(this.dialogConfig, "title", this.$t("到仓反审")); this.$set(this.dialogConfig, "title", this.$t("到仓反审"));
}else{
this.$set(this.dialogConfig, "fullscreen", true);
} }
break; break;
} }
......
src/views/ecw/customer/index.vue
View file @ c2da1f00
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
>{{$t('设置海运非整柜客户')}}</el-button> >{{$t('设置海运非整柜客户')}}</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-has-permi="['ecw:customer:create-potential']" v-if="path === '/customer/customer'" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddPotential">{{$t('新增潜在客户')}}</el-button> <el-button v-has-permi="[selectAuthorityFn('ecw:customer:create-potential')]" v-if="path === '/customer/customer'" type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddPotential">{{$t('新增潜在客户')}}</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -649,6 +649,9 @@ export default { ...@@ -649,6 +649,9 @@ export default {
case '/customer/department-customers': case '/customer/department-customers':
i = 'dep-' i = 'dep-'
break; break;
case '/customer/potential':
i = 'pot-'
break;
} }
return i return i
}, },
...@@ -656,6 +659,7 @@ export default { ...@@ -656,6 +659,7 @@ export default {
return (val)=>{ return (val)=>{
let t = val.split(":") let t = val.split(":")
t[t.length - 1] = this.authorityFn + t[t.length - 1] t[t.length - 1] = this.authorityFn + t[t.length - 1]
console.log( t.join(":"))
return t.join(":") return t.join(":")
} }
} }
......
src/views/ecw/customer/indirectCustomer.vue
View file @ c2da1f00
...@@ -43,9 +43,8 @@ ...@@ -43,9 +43,8 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" > <el-table-column :label="$t('客户名称')" align="center" prop="name" >
<template v-slot="scope"> <template v-slot="scope">
<router-link :to="{path: '/customer/indirectInfo',query: {id: scope.row.id}}" class="link-type">
<span>{{ $l(scope.row,'name') }}</span> <span>{{ $l(scope.row,'name') }}</span>
</router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('联系方式')" prop="defaultContactPhone"> <el-table-column :label="$t('联系方式')" prop="defaultContactPhone">
...@@ -78,6 +77,9 @@ ...@@ -78,6 +77,9 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="{path: '/customer/indirectInfo',query: {id: scope.row.id}}" class="link-type">
<el-button v-has-permi="['ecw:customer:indirect:view']" size="mini" style="margin-right: 10px" type="text" >查看</el-button>
</router-link>
<el-button v-has-permi="['ecw:customer:indirect:perfect']" size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('完善')}}</el-button> <el-button v-has-permi="['ecw:customer:indirect:perfect']" size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('完善')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/ecw/customerCommissionInfo/index.vue
View file @ c2da1f00
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-form-item :label="$t('客户名称')" prop="customerId"> <el-form-item :label="$t('客户名称')" prop="customerId">
<div style="display: flex"> <div style="display: flex">
<el-input :disabled="true" :placeholder="$t('请输入选择客户')" v-model="customerName"></el-input> <el-input :disabled="true" :placeholder="$t('请输入选择客户')" v-model="customerName"></el-input>
<img v-if="$route.params.dictId == 0" style="width: 40px;height: 40px;margin-left: 40px;" src="@/assets/images/phonebook.png" class="phonebook" @click="customerNameShow= true" /> <img v-if="$route.params.dictId == 0" style="width: 40px;height: 40px;margin-left: 40px;" src="@/assets/svg/contacts.svg" class="phonebook" @click="customerNameShow= true" />
</div> </div>
<!-- <el-select--> <!-- <el-select-->
<!-- v-model="customerForm.name"--> <!-- v-model="customerForm.name"-->
......
src/views/ecw/customerConfirm/index.vue
View file @ c2da1f00
...@@ -80,9 +80,7 @@ ...@@ -80,9 +80,7 @@
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column :label="$t('客户编号')" align="center" prop="number" > <el-table-column :label="$t('客户编号')" align="center" prop="number" >
<template v-slot="{row}"> <template v-slot="{row}">
<router-link :to="'/customer/query/' + row.id">
{{row.number}} {{row.number}}
</router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" > <el-table-column :label="$t('客户名称')" align="center" prop="name" >
...@@ -125,6 +123,9 @@ ...@@ -125,6 +123,9 @@
<el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column> <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/customer/query/' + scope.row.id">
<el-button v-has-permi="['ecw:customer:treat-view']" size="mini" style="margin-right: 10px" type="text" >查看</el-button>
</router-link>
<el-button size="mini" type="text" @click="handleConfirmService(scope.row)" <el-button size="mini" type="text" @click="handleConfirmService(scope.row)"
v-hasPermi="['ecw:customer:treat-accept']">{{$t('确认接收')}}</el-button> v-hasPermi="['ecw:customer:treat-accept']">{{$t('确认接收')}}</el-button>
<el-button size="mini" type="text" @click="handOver(scope.row)" <el-button size="mini" type="text" @click="handOver(scope.row)"
......
src/views/ecw/customerToBeAssigned/index.vue
View file @ c2da1f00
...@@ -91,9 +91,7 @@ ...@@ -91,9 +91,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户编号')" align="center" prop="number" > <el-table-column :label="$t('客户编号')" align="center" prop="number" >
<template v-slot="{row}"> <template v-slot="{row}">
<router-link :to="'/customer/query/' + row.id">
{{row.number}} {{row.number}}
</router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" > <el-table-column :label="$t('客户名称')" align="center" prop="name" >
...@@ -131,6 +129,9 @@ ...@@ -131,6 +129,9 @@
<el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column> <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/customer/query/' + scope.row.id">
<el-button v-has-permi="['ecw:customer:distribution-view']" size="mini" style="margin-right: 10px" type="text" >查看</el-button>
</router-link>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['ecw:customer:distribution-update']">{{$t('编辑')}}</el-button> v-hasPermi="['ecw:customer:distribution-update']">{{$t('编辑')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
......
src/views/ecw/myCustomerService/index.vue
View file @ c2da1f00
...@@ -80,9 +80,7 @@ ...@@ -80,9 +80,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户编号')" align="center" prop="number" > <el-table-column :label="$t('客户编号')" align="center" prop="number" >
<template v-slot="{row}"> <template v-slot="{row}">
<router-link :to="'/customer/query/' + row.id">
{{row.number}} {{row.number}}
</router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" > <el-table-column :label="$t('客户名称')" align="center" prop="name" >
......
src/views/ecw/oceanCustomer/index.vue
View file @ c2da1f00
...@@ -85,9 +85,7 @@ ...@@ -85,9 +85,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户编号')" align="center" prop="number" > <el-table-column :label="$t('客户编号')" align="center" prop="number" >
<template v-slot="{row}"> <template v-slot="{row}">
<router-link :to="'/customer/query/' + row.id">
{{row.number}} {{row.number}}
</router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" > <el-table-column :label="$t('客户名称')" align="center" prop="name" >
...@@ -130,6 +128,9 @@ ...@@ -130,6 +128,9 @@
<el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column> <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/customer/query/' + scope.row.id">
<el-button v-has-permi="['ecw:customer:sea-view']" size="mini" style="margin-right: 10px" type="text" >查看</el-button>
</router-link>
<!-- <el-button size="mini" type="text" @click="distribution(scope.row)">{{$t('移交')}}</el-button>--> <!-- <el-button size="mini" type="text" @click="distribution(scope.row)">{{$t('移交')}}</el-button>-->
<el-button v-has-permi="['ecw:customer:sea-gain']" size="mini" type="text" @click="fishingFn(scope.row)">{{$t('捞取')}}</el-button> <el-button v-has-permi="['ecw:customer:sea-gain']" size="mini" type="text" @click="fishingFn(scope.row)">{{$t('捞取')}}</el-button>
</template> </template>
...@@ -362,7 +363,7 @@ export default { ...@@ -362,7 +363,7 @@ export default {
// this.open = true; // this.open = true;
// this.title = this.$t("添加客户"); // this.title = this.$t("添加客户");
}, },
/** 查看按钮操作 */ /** 查看按钮操作 */
handleView(row) { handleView(row) {
this.$router.push('/customer/query/' + row.id) this.$router.push('/customer/query/' + row.id)
}, },
......
src/views/ecw/offer/edit.vue
View file @ c2da1f00
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<el-form-item :label="$t('发货人')" prop="consignorId" > <el-form-item :label="$t('发货人')" prop="consignorId" >
<div class="contact"> <div class="contact">
<el-input v-model="form.consignorName" :placeholder="$t('选择或新建')" disabled style="width:120px"/> <el-input v-model="form.consignorName" :placeholder="$t('选择或新建')" disabled style="width:120px"/>
<img src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignor'" /> <img src="@/assets/svg/contacts.svg" class="phonebook" @click="contactChooseType='consignor'" />
<img src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='0'" /> <img src="@/assets/svg/contact_create.svg" class="phonebook" @click="quickCreateType='0'" />
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label="$t('发货人电话')" prop="consignorPhone"> <el-form-item :label="$t('发货人电话')" prop="consignorPhone">
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
<el-form-item :label="$t('收货人')" prop="consigneeId"> <el-form-item :label="$t('收货人')" prop="consigneeId">
<div class="contact"> <div class="contact">
<el-input v-model="form.consigneeName" :placeholder="$t('请选择或新建')" :disabled="true" style="width:120px"/> <el-input v-model="form.consigneeName" :placeholder="$t('请选择或新建')" :disabled="true" style="width:120px"/>
<img src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignee'" /> <img src="@/assets/svg/contacts.svg" class="phonebook" @click="contactChooseType='consignee'" />
<img src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='1'" /> <img src="@/assets/svg/contact_create.svg" class="phonebook" @click="quickCreateType='1'" />
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人电话')" prop="consigneePhone"> <el-form-item :label="$t('收货人电话')" prop="consigneePhone">
......
src/views/ecw/order/components/WarehouseDetail.vue
View file @ c2da1f00
...@@ -4,7 +4,14 @@ ...@@ -4,7 +4,14 @@
<el-button v-if="info.transportId==3" style="position:absolute;top:15px;left:340px" type="primary" @click="seePackLog">{{$t('查看打包历史')}}</el-button> <el-button v-if="info.transportId==3" style="position:absolute;top:15px;left:340px" type="primary" @click="seePackLog">{{$t('查看打包历史')}}</el-button>
<el-table v-if="warehouseItem && warehouseItem.orderWarehouseInBackItemDoList" :data="warehouseItem.orderWarehouseInBackItemDoList"> <el-table v-if="warehouseItem && warehouseItem.orderWarehouseInBackItemDoList" :data="warehouseItem.orderWarehouseInBackItemDoList">
<el-table-column type="index" :label="$t('序号')" /> <el-table-column type="index" :label="$t('序号')" />
<el-table-column :label="$t('箱数')" prop="cartonsNum" /> <el-table-column :label="$t('箱数')" prop="cartonsNum">
<template slot-scope="{row}">
<template v-if="row.orderWarehouseInDetailsVOList && row.orderWarehouseInDetailsVOList.length">
<WarehouseRecordDetail v-model="row.orderWarehouseInDetailsVOList" text readonly />
</template>
<template v-else>{{ row.cartonsNum }}</template>
</template>
</el-table-column>
<el-table-column :label="$t('入仓类型')" prop="cartonsNum"> <el-table-column :label="$t('入仓类型')" prop="cartonsNum">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="row.specificationType" /> <dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="row.specificationType" />
...@@ -60,8 +67,10 @@ import { DICT_TYPE } from '@/utils/dict' ...@@ -60,8 +67,10 @@ import { DICT_TYPE } from '@/utils/dict'
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
import WarehouseAreaSelect from "@/components/WarehouseAreaSelect" import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
import ImageDisplay from "@/views/ecw/order/components/imageDisplay.vue"; import ImageDisplay from "@/views/ecw/order/components/imageDisplay.vue";
import WarehouseRecordDetail from '@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue'
export default { export default {
components: { components: {
WarehouseRecordDetail,
ImageDisplay, ImageDisplay,
WarehouseAreaSelect WarehouseAreaSelect
}, },
......
src/views/ecw/order/edit.vue
View file @ c2da1f00
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> --> <!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
<div class="contact"> <div class="contact">
<el-input v-model="form.consignorName" placeholder="" :disabled2="inWarehouse"/> <el-input v-model="form.consignorName" placeholder="" :disabled2="inWarehouse"/>
<img v-if="!updateChannel" src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignor'" /> <img v-if="!updateChannel" src="@/assets/svg/contacts.svg" class="phonebook" @click="contactChooseType='consignor'" />
<img v-if="!updateChannel" src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='0'" /> <img v-if="!updateChannel" src="@/assets/svg/contact_create.svg" class="phonebook" @click="quickCreateType='0'" />
</div> </div>
</el-form-item> </el-form-item>
<!-- v1.7新增 --> <!-- v1.7新增 -->
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,8 @@
<!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> --> <!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
<div class="contact"> <div class="contact">
<el-input v-model="form.consigneeName" placeholder="" :disabled2="inWarehouse"/> <el-input v-model="form.consigneeName" placeholder="" :disabled2="inWarehouse"/>
<img v-if="!updateChannel" src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignee'" /> <img v-if="!updateChannel" src="@/assets/svg/contacts.svg" class="phonebook" @click="contactChooseType='consignee'" />
<img v-if="!updateChannel" src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='1'" /> <img v-if="!updateChannel" src="@/assets/svg/contact_create.svg" class="phonebook" @click="quickCreateType='1'" />
</div> </div>
</el-form-item> </el-form-item>
<!-- v1.7新增 --> <!-- v1.7新增 -->
......
src/views/ecw/order/exception/index.vue
View file @ c2da1f00
...@@ -172,7 +172,10 @@ ...@@ -172,7 +172,10 @@
<router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type"> <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
<span>{{ scope.row.orderNo }}</span> <span>{{ scope.row.orderNo }}</span>
</router-link> </router-link>
<span>{{specialNeedTag(scope.row.specialNeed)}}</span> <div style="display: flex;flex-wrap: wrap;" v-if="scope.row.specialNeed">
<el-button size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.specialNeed)" :key="index">{{item.symbol}}</el-button>
</div>
<!-- <span>{{specialNeedTag(scope.row.specialNeed)}}</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('唛头')" align="center" > <el-table-column :label="$t('唛头')" align="center" >
...@@ -420,6 +423,19 @@ export default { ...@@ -420,6 +423,19 @@ export default {
this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载')) this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
}) })
}, },
specialRendering(val){
console.log('val', val)
if(val !== undefined){
let i = val.split(',')
return this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
return i.indexOf(e.value) > -1
}).map(item => {
// 打字开头的用最后一个字，否则取第一个字
item.symbol = item.label[0] == '打' ? item.label[item.label.length-1]: item.label[0]
return item
})
}
},
} }
} }
</script> </script>
......
src/views/ecw/order/index.vue
View file @ c2da1f00
...@@ -268,7 +268,8 @@ ...@@ -268,7 +268,8 @@
'ecw:order:reduce', 'ecw:order:reduce',
'ecw:order:commission', 'ecw:order:commission',
'ecw:order:heavy', 'ecw:order:heavy',
'ecw:order:bulky' 'ecw:order:bulky',
'ecw:order:setCanNotShipment'
]" > ]" >
<el-button type="text">{{$t('操作')}}</el-button> <el-button type="text">{{$t('操作')}}</el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
...@@ -370,6 +371,11 @@ ...@@ -370,6 +371,11 @@
)"> )">
<el-dropdown-item @click.native="handleUpdate(scope.row, true)" v-hasPermi="['ecw:order:update_channel']">{{$t('变更出货渠道')}}</el-dropdown-item> <el-dropdown-item @click.native="handleUpdate(scope.row, true)" v-hasPermi="['ecw:order:update_channel']">{{$t('变更出货渠道')}}</el-dropdown-item>
</template> </template>
<!--不可出-->
<template v-if="include(scope.row.airShipment, [2,3,4])">
<el-dropdown-item @click.native="setCanNotShipment(scope.row)" v-hasPermi="['ecw:order:setCanNotShipment']">{{$t('不可出')}}</el-dropdown-item>
</template>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
...@@ -550,7 +556,7 @@ import { ...@@ -550,7 +556,7 @@ import {
exportCustomsDatas, exportCustomsDatas,
exportShippingDatas, exportShippingDatas,
exportShipFee, exportShipFee,
exportUnload, splitCancelApply, orderSplitRevoke, setCanShipment exportUnload, splitCancelApply, orderSplitRevoke, setCanShipment, setCanNotShipment
} from "@/api/ecw/order"; } from "@/api/ecw/order";
/* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */ /* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
import PrintTag from './components/PrintTag' import PrintTag from './components/PrintTag'
...@@ -992,6 +998,14 @@ export default { ...@@ -992,6 +998,14 @@ export default {
return false return false
} }
return true return true
},
// 设置空运订单不可出
async setCanNotShipment(order){
await this.$confirm(this.$t("确定设置订单{orderNo}不可出么？", {orderNo: order.orderNo}))
setCanNotShipment(order.orderId).then(res => {
this.$message(this.$t('操作成功'))
this.getList()
})
} }
} }
}; };
......
src/views/ecw/order/stocking/components/Package.vue
View file @ c2da1f00
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<el-dialog <el-dialog
:title="title + ' - ' + warehousing.orderNo" :title="title + ' - ' + warehousing.orderNo"
:visible.sync="visible" :visible.sync="visible"
width="1280px" width="90vw"
> >
<el-form ref="form" :model="form" :rules="formRules" label-width="80px"> <el-form ref="form" :model="form" :rules="formRules" label-width="80px">
<el-descriptions border :column="2"> <el-descriptions border :column="2">
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="长(cm)"> <el-table-column label="长(cm)" width="110px">
<template v-slot:header> <template v-slot:header>
<span>{{ $t('长') }}</span>(cm) <span>{{ $t('长') }}</span>(cm)
</template> </template>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="宽(cm)"> <el-table-column label="宽(cm)" width="110px">
<template v-slot:header> <template v-slot:header>
<span>{{ $t('宽') }}</span>(cm) <span>{{ $t('宽') }}</span>(cm)
</template> </template>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="高(cm)"> <el-table-column label="高(cm)" width="110px">
<template v-slot:header> <template v-slot:header>
<span>{{ $t('高') }}</span>(cm) <span>{{ $t('高') }}</span>(cm)
</template> </template>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="体积(m³)"> <el-table-column label="体积(m³)" width="110px">
<template v-slot:header> <template v-slot:header>
<span style="color: red">*</span> <span>{{ $t('体积') }}</span>(m³) <span style="color: red">*</span> <span>{{ $t('体积') }}</span>(m³)
</template> </template>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="重量(Kg)"> <el-table-column label="重量(Kg)" width="110px">
<template v-slot:header> <template v-slot:header>
<span style="color: red">*</span> <span>{{ $t('重量') }}</span>(Kg) <span style="color: red">*</span> <span>{{ $t('重量') }}</span>(Kg)
</template> </template>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('快递单号')"> <el-table-column :label="$t('快递单号')" width="150px">
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item> <el-form-item>
<el-input :disabled="$index < protectRowCount" v-model="form.table[$index].expressNo" placeholder=""></el-input> <el-input :disabled="$index < protectRowCount" v-model="form.table[$index].expressNo" placeholder=""></el-input>
...@@ -179,8 +179,16 @@ ...@@ -179,8 +179,16 @@
:is-editing="edit"></warehouse-area-select> :is-editing="edit"></warehouse-area-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('备注')">
<template v-slot="{r,c,$index}">
<el-form-item>
<el-input v-model="form.table[$index].remark" type="textarea" show-word-limit maxlength="100" placeholder=""></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="$t('操作')"> <el-table-column :label="$t('操作')">
<template v-slot="{ row, column, $index}"> <template v-slot="{ row, column, $index}">
<WarehouseRecordDetail v-model="form.table[$index].orderWarehouseInDetailsVOList" />
<el-popconfirm <el-popconfirm
v-if="$index >= protectRowCount" v-if="$index >= protectRowCount"
title="确定要删除该行记录吗？" title="确定要删除该行记录吗？"
...@@ -214,11 +222,13 @@ import {finishPacked, orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api ...@@ -214,11 +222,13 @@ import {finishPacked, orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api
import {getProductAttrList} from "@/api/ecw/productAttr" import {getProductAttrList} from "@/api/ecw/productAttr"
import {getProductTypeList} from "@/api/ecw/productType" import {getProductTypeList} from "@/api/ecw/productType"
import {addProduct} from "@/api/ecw/product" import {addProduct} from "@/api/ecw/product"
import WarehouseRecordDetail from "@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue";
export default { export default {
name: "Package", name: "Package",
components: { components: {
WarehouseRecordDetail,
ProductSelector, ProductSelector,
WarehouseAreaSelect, WarehouseAreaSelect,
WorkFlow WorkFlow
...@@ -497,12 +507,31 @@ export default { ...@@ -497,12 +507,31 @@ export default {
if (!valid1) { if (!valid1) {
return return
} }
// 复制数据副本，避免修改格式后原数据被影响
const table = JSON.parse(JSON.stringify(this.form.table))
table.forEach(({orderWarehouseInDetailsVOList}) => {
})
// 首次入仓、入仓补充 // 首次入仓、入仓补充
return finishPacked({ return finishPacked({
brand: this.form.brand, brand: this.form.brand,
orderId: this.warehousing.orderId, orderId: this.warehousing.orderId,
orderItemId: this.warehousing.orderItemId, orderItemId: this.warehousing.orderItemId,
orderWarehouseInItemDtoList: this.form.table.map(e => { orderWarehouseInItemDtoList: table.map(e => {
if(!e.orderWarehouseInDetailsVOList){
e.orderWarehouseInDetailsVOList = []
}
e.orderWarehouseInDetailsVOList = e.orderWarehouseInDetailsVOList.map(item => {
if(Array.isArray(item.prodAttrIds)){
item.prodAttrIds = item.prodAttrIds.join(',')
}
if(Array.isArray(item.usageIds)){
item.usageIds = item.usageIds.join(',')
}
return item
})
return { return {
...e, ...e,
boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3, boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
......
src/views/ecw/order/stockingList.vue
View file @ c2da1f00
...@@ -179,7 +179,8 @@ ...@@ -179,7 +179,8 @@
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="150px"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="$router.push('stocking?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:stockingList:stocking']">{{$t('备货')}}</el-button> <el-button type="text" @click="setCanNotShipment(scope.row)" v-hasPermi="['ecw:order:setCanNotShipment']">{{$t('不可出')}}</el-button>
<el-button type="text" @click="$router.push('stocking?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:stockingList:stocking']">{{$t('备货')}}</el-button>
<el-button type="text" @click="printTagOrderId=scope.row.orderId" v-hasPermi="['ecw:order:stockingList:print_tag']">{{$t('打印标签')}}</el-button> <el-button type="text" @click="printTagOrderId=scope.row.orderId" v-hasPermi="['ecw:order:stockingList:print_tag']">{{$t('打印标签')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -204,7 +205,7 @@ import { ...@@ -204,7 +205,7 @@ import {
exportReadyStock, exportReadyStock,
canShipmentPage, canShipmentPage,
orderSpecialNeed, orderSpecialNeed,
exportCanShipment exportCanShipment, setNotCanShipment, setCanNotShipment
} from "@/api/ecw/order"; } from "@/api/ecw/order";
import PrintTag from './components/PrintTag' import PrintTag from './components/PrintTag'
import PrintWarehouseReceipt from './components/PrintWarehouseReceipt' import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
...@@ -391,6 +392,14 @@ export default { ...@@ -391,6 +392,14 @@ export default {
this.getList() this.getList()
}) })
}, },
// 设置空运订单不可出
async setCanNotShipment(order){
await this.$confirm(this.$t("确定设置订单{orderNo}不可出么？", {orderNo: order.orderNo}))
setCanNotShipment(order.orderId).then(res => {
this.$message(this.$t('操作成功'))
this.getList()
})
}
} }
}; };
</script> </script>
......
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @ c2da1f00
...@@ -188,13 +188,13 @@ ...@@ -188,13 +188,13 @@
<el-table-column :label="$t('备注')"> <el-table-column :label="$t('备注')">
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item> <el-form-item>
<el-input v-model="form.table[$index].remark" type="textarea" show-word-limit maxlength="100" placeholder=""></el-input> <el-input v-model="form.table[$index].remark" type="textarea" show-word-limit maxlength="100" placeholder="" :disabled="$index < protectRowCount"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')"> <el-table-column :label="$t('操作')">
<template v-slot="{ row, column, $index}"> <template v-slot="{ row, column, $index}">
<WarehouseRecordDetail v-model="form.table[$index].orderWarehouseInDetailsVOList" /> <WarehouseRecordDetail v-model="form.table[$index].orderWarehouseInDetailsVOList" :readonly="$index < protectRowCount" />
<el-popconfirm <el-popconfirm
v-if="$index >= protectRowCount" v-if="$index >= protectRowCount"
title="确定要删除该行入仓记录吗？" title="确定要删除该行入仓记录吗？"
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
<el-card style="margin-top: 15px;"> <el-card style="margin-top: 15px;">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span style="font-size: 18px">{{$t('入仓影像')}}</span> <span style="font-size: 18px"><span style="color: red">*</span>{{$t('入仓影像')}}</span>
</div> </div>
<div> <div>
<image-and-video-upload <image-and-video-upload
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
<el-card style="margin-top: 15px;"> <el-card style="margin-top: 15px;">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span style="font-size: 18px">{{$t('入仓影像')}}</span> <span style="font-size: 18px"><span style="color: red">*</span>{{$t('入仓影像')}}</span>
</div> </div>
<div> <div>
<image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form1.pictureUrls" ></image-and-video-upload> <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form1.pictureUrls" ></image-and-video-upload>
......
src/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue
View file @ c2da1f00
<template> <template>
<div style="display: inline-block"> <div style="display: inline-block">
<el-button size="mini" type="primary" style="margin-right: 10px" @click="handleOpen">{{ title }}</el-button> <template v-if="text">
<el-button size="mini" type="text" style="margin-right: 10px" @click="handleOpen">{{ value.length }}（混箱）</el-button>
</template>
<template v-else>
<el-button size="mini" type="primary" style="margin-right: 10px" @click="handleOpen">{{ title }}</el-button>
</template>
<el-dialog <el-dialog
append-to-body append-to-body
:title="title" :title="title"
...@@ -48,6 +53,10 @@ export default { ...@@ -48,6 +53,10 @@ export default {
readonly: { readonly: {
type: Boolean, type: Boolean,
default: false default: false
},
text: {
type: Boolean,
default: false
} }
}, },
...@@ -73,7 +82,7 @@ export default { ...@@ -73,7 +82,7 @@ export default {
"cartonsNum": undefined, "cartonsNum": undefined,
"createTime": "", "createTime": "",
"expressNo": "", "expressNo": "",
"prodAttrIds": [], "prodAttrIds": '',
"prodId": undefined, "prodId": undefined,
"quantityAll": undefined, "quantityAll": undefined,
"specificationType": undefined, "specificationType": undefined,
...@@ -99,7 +108,7 @@ export default { ...@@ -99,7 +108,7 @@ export default {
"cartonsNum": undefined, "cartonsNum": undefined,
"createTime": "", "createTime": "",
"expressNo": "", "expressNo": "",
"prodAttrIds": [], "prodAttrIds": '',
"prodId": undefined, "prodId": undefined,
"quantityAll": undefined, "quantityAll": undefined,
"specificationType": undefined, "specificationType": undefined,
......
src/views/ecw/order/warehousing/components/WarehouseRecordDetailItem.vue
View file @ c2da1f00
...@@ -40,13 +40,16 @@ ...@@ -40,13 +40,16 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('用途')"> <el-form-item :label="$t('用途')">
<dict-selector <el-checkbox-group v-model="usageIds">
<el-checkbox v-for="item in getDictDatas(DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE)" :key="item.value" :label="item.value" :disabled="readonly">{{ $l(item, 'label') }}</el-checkbox>
</el-checkbox-group>
<!-- <dict-selector
v-model="usageIds" v-model="usageIds"
:type="DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE" :type="DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE"
multiple multiple
form-type="checkbox" form-type="checkbox"
:disabled="readonly" :disabled="readonly"
></dict-selector> ></dict-selector>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -101,7 +104,7 @@ ...@@ -101,7 +104,7 @@
import ProductSelector from "@/components/ProductSelector/index.vue" import ProductSelector from "@/components/ProductSelector/index.vue"
import { getProductBrank, getProductBrankPage } from '@/api/ecw/productBrank' import { getProductBrank, getProductBrankPage } from '@/api/ecw/productBrank'
import {getProductAttrList} from "@/api/ecw/productAttr" import {getProductAttrList} from "@/api/ecw/productAttr"
import { DICT_TYPE } from '@/utils/dict' import {DICT_TYPE, getDictDatas} from '@/utils/dict'
export default { export default {
name: "WarehouseRecordDetailItem", name: "WarehouseRecordDetailItem",
...@@ -141,10 +144,10 @@ export default { ...@@ -141,10 +144,10 @@ export default {
boxGauge3: '', boxGauge3: '',
} }
}, },
mounted() { async mounted() {
// 品牌回显 // 品牌回显
if (this.value.brand) { if (this.value.brand) {
getProductBrank(this.value.brand).then(r => { await getProductBrank(this.value.brand).then(r => {
this.brandList = [r.data] this.brandList = [r.data]
}) })
} }
...@@ -155,6 +158,7 @@ export default { ...@@ -155,6 +158,7 @@ export default {
if (this.value.usageIds) { if (this.value.usageIds) {
console.log('this.value.usageIds',this.value.usageIds) console.log('this.value.usageIds',this.value.usageIds)
await this.$nextTick()
this.usageIds = this.value.usageIds.split(',') || [] this.usageIds = this.value.usageIds.split(',') || []
} }
...@@ -168,6 +172,7 @@ export default { ...@@ -168,6 +172,7 @@ export default {
} }
}, },
methods: { methods: {
getDictDatas,
/** 获取产品属性列表 */ /** 获取产品属性列表 */
getAttrList() { getAttrList() {
getProductAttrList().then(response => { getProductAttrList().then(response => {
......
src/views/ecw/product/product-dialog.vue
View file @ c2da1f00
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
<script> <script>
import { import {
countByProductIdAndTransportType,
createProduct, createProduct,
deleteProduct, deleteProduct,
exportProductExcel, exportProductExcel,
...@@ -236,9 +237,14 @@ export default { ...@@ -236,9 +237,14 @@ export default {
}, },
methods: { methods: {
copyLine(row, bol){ copyLine(row, bol){
this.$emit( 'copyLine', row, bol) if(bol){
countByProductIdAndTransportType({productId:row.id}).then(r =>{
this.$emit( 'copyLine', {...row,priceLineCount:r.data}, bol)
})
}else {
this.$emit( 'copyLine', row, bol)
}
console.log(bol,'bol')
}, },
/** 获取产品属性列表 */ /** 获取产品属性列表 */
getAttrList() { getAttrList() {
......
src/views/member/user/index.vue
View file @ c2da1f00
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
<el-button v-has-permi="['member:id-card']" size="mini" type="text" @click="identityFn(scope.row , '1')">{{$t('身份证')}}</el-button> <el-button v-has-permi="['member:id-card']" size="mini" type="text" @click="identityFn(scope.row , '1')">{{$t('身份证')}}</el-button>
<el-button v-has-permi="['member:business-license']" size="mini" type="text" @click="identityFn(scope.row, '2')">{{$t('营业执照')}}</el-button> <el-button v-has-permi="['member:business-license']" size="mini" type="text" @click="identityFn(scope.row, '2')">{{$t('营业执照')}}</el-button>
<el-button v-has-permi="['member:delete']" size="mini" type="text" @click="deleteFn(scope.row)">{{$t('删 除')}}</el-button> <el-button v-has-permi="['member:delete']" size="mini" type="text" @click="deleteFn(scope.row)">{{$t('删 除')}}</el-button>
<el-button type="text" v-has-permi="['member:user:info']" size="mini" @click="$router.push('member/member-details/' + scope.row.id )" >{{ $t('查看') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/views/member/user/memberDetails.vue 0 → 100644
View file @ c2da1f00
This diff is collapsed.
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