Skip to content

J
jiedao-app-operator-master
Commit 66c95057 authored by 黄卓's avatar 黄卓
Browse files
Options

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

parents 761a5cd6 3d72f0af
Hide whitespace changes
Inline Side-by-side
Showing with 724 additions and 48 deletions
src/api/ecw/order.js
View file @ 66c95057
......@@ -1007,3 +1007,11 @@ export function getWaitingShipmentCount(){
method: 'get'
})
}
// 空运订单不可出
export function setCanNotShipment(orderId){
return request({
url: '/air/order/not/can/shipment/' + orderId,
method: 'put',
})
}
src/api/member/user.js
View file @ 66c95057
......@@ -158,3 +158,11 @@ export function createAuditIdCard(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 @ 66c95057
<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 @ 66c95057
<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 @ 761a5cd6
<?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 @ 66c95057
......@@ -4347,5 +4347,6 @@
"下载状态": "Download status",
"已下载": "Downloaded",
"待下载": "To be downloaded",
"重试": "retry "
"重试": "retry ",
"会员详情": "Member Details"
}
src/views/bpm/task/copy.vue
View file @ 66c95057
......@@ -27,6 +27,7 @@
<!-- 列表 -->
<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="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="categoryId">
......
src/views/ecw/box/shippingAir/nodePage/cusClearance.vue
View file @ 66c95057
......@@ -275,6 +275,7 @@ export default {
this.$set(this.cusClearanceObj, 'clClearTime', formatDate(clear.clClearTime))
}
this.orderdialogVisible = false
this.cusClearanceObj.clearanceOrderIdList.push(val.orderId)
},
handleSelectionChange(val) {
this.multipleSelectOrder = val
......@@ -306,6 +307,7 @@ export default {
this.$set(this.cusClearanceObj, 'clClearTime', null)
}
this.orderdialogVisible = false
this.cusClearanceObj.clearanceOrderIdList = this.multipleSelectOrder.map((item) => item.orderId)
},
getClAgent(type) {
const agentId = this.$attrs.shipmentObj.agentInfo.agentId
......
src/views/ecw/box/shippingAir/nodePage/preinstall.vue
View file @ 66c95057
......@@ -54,7 +54,7 @@
<el-form-item :label="$t('特性')" prop="attrId">
<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-form-item>
......@@ -288,7 +288,7 @@
</el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum">
<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>
{{scope.row.warehouseInInfoVO.cartonsNum}}
</template>
......@@ -514,7 +514,15 @@ export default {
if(this.queryParams.shippingChannelId){
let attrs = this.channelList.find(item=>this.queryParams.shippingChannelId == item.channelId)
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
......
src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
View file @ 66c95057
......@@ -82,7 +82,7 @@
<el-table-column :label="$t('重量')" align="center" prop="weight" />
<el-table-column :label="$t('订单状态')" align="center" prop="">
<template slot-scope="scope">
{{scope.rowstatusMsg}}
{{scope.row.statusMsg}}
</template>
</el-table-column>
<el-table-column :label="$t('异常状态')" align="center" prop="">
......
src/views/ecw/box/shippingAir/seaProcess.vue
View file @ 66c95057
......@@ -220,13 +220,14 @@ export default {
break;
// 卸柜
case "unloading":
this.$set(this.dialogConfig, "fullscreen", true);
// 卸柜反审
const unStatus = this.shipmentObj[node.keyName];
if ([186].includes(unStatus)) {
this.currentComponent = `reviewWidget`;
this.$set(this.dialogConfig, "width", "700px");
this.$set(this.dialogConfig, "title", this.$t("到仓反审"));
}else{
this.$set(this.dialogConfig, "fullscreen", true);
}
break;
}
......
src/views/ecw/customer/index.vue
View file @ 66c95057
......@@ -96,7 +96,7 @@
>{{$t('设置海运非整柜客户')}}</el-button>
</el-col>
<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>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -649,6 +649,9 @@ export default {
case '/customer/department-customers':
i = 'dep-'
break;
case '/customer/potential':
i = 'pot-'
break;
}
return i
},
......@@ -656,6 +659,7 @@ export default {
return (val)=>{
let t = val.split(":")
t[t.length - 1] = this.authorityFn + t[t.length - 1]
console.log( t.join(":"))
return t.join(":")
}
}
......
src/views/ecw/customer/indirectCustomer.vue
View file @ 66c95057
......@@ -43,9 +43,8 @@
</el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" >
<template v-slot="scope">
<router-link :to="{path: '/customer/indirectInfo',query: {id: scope.row.id}}" class="link-type">
<span>{{ $l(scope.row,'name') }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column :label="$t('联系方式')" prop="defaultContactPhone">
......@@ -78,6 +77,9 @@
</el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<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>
</template>
</el-table-column>
......
src/views/ecw/customerCommissionInfo/index.vue
View file @ 66c95057
......@@ -8,7 +8,7 @@
<el-form-item :label="$t('客户名称')" prop="customerId">
<div style="display: flex">
<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>
<!-- <el-select-->
<!-- v-model="customerForm.name"-->
......
src/views/ecw/customerConfirm/index.vue
View file @ 66c95057
......@@ -80,9 +80,7 @@
<el-table v-loading="loading" :data="list">
<el-table-column :label="$t('客户编号')" align="center" prop="number" >
<template v-slot="{row}">
<router-link :to="'/customer/query/' + row.id">
{{row.number}}
</router-link>
</template>
</el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" >
......@@ -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" class-name="small-padding fixed-width">
<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)"
v-hasPermi="['ecw:customer:treat-accept']">{{$t('确认接收')}}</el-button>
<el-button size="mini" type="text" @click="handOver(scope.row)"
......
src/views/ecw/customerToBeAssigned/index.vue
View file @ 66c95057
......@@ -91,9 +91,7 @@
</el-table-column>
<el-table-column :label="$t('客户编号')" align="center" prop="number" >
<template v-slot="{row}">
<router-link :to="'/customer/query/' + row.id">
{{row.number}}
</router-link>
</template>
</el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" >
......@@ -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" class-name="small-padding fixed-width">
<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)"
v-hasPermi="['ecw:customer:distribution-update']">{{$t('编辑')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
......
src/views/ecw/myCustomerService/index.vue
View file @ 66c95057
......@@ -80,9 +80,7 @@
</el-table-column>
<el-table-column :label="$t('客户编号')" align="center" prop="number" >
<template v-slot="{row}">
<router-link :to="'/customer/query/' + row.id">
{{row.number}}
</router-link>
</template>
</el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" >
......
src/views/ecw/oceanCustomer/index.vue
View file @ 66c95057
......@@ -85,9 +85,7 @@
</el-table-column>
<el-table-column :label="$t('客户编号')" align="center" prop="number" >
<template v-slot="{row}">
<router-link :to="'/customer/query/' + row.id">
{{row.number}}
</router-link>
</template>
</el-table-column>
<el-table-column :label="$t('客户名称')" align="center" prop="name" >
......@@ -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" class-name="small-padding fixed-width">
<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 v-has-permi="['ecw:customer:sea-gain']" size="mini" type="text" @click="fishingFn(scope.row)">{{$t('捞取')}}</el-button>
</template>
......@@ -362,7 +363,7 @@ export default {
// this.open = true;
// this.title = this.$t("添加客户");
},
/** 查看按钮操作 */
/** 查看按钮操作 */
handleView(row) {
this.$router.push('/customer/query/' + row.id)
},
......
src/views/ecw/offer/edit.vue
View file @ 66c95057
......@@ -22,8 +22,8 @@
<el-form-item :label="$t('发货人')" prop="consignorId" >
<div class="contact">
<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/images/new_customer.png" class="phonebook" @click="quickCreateType='0'" />
<img src="@/assets/svg/contacts.svg" class="phonebook" @click="contactChooseType='consignor'" />
<img src="@/assets/svg/contact_create.svg" class="phonebook" @click="quickCreateType='0'" />
</div>
</el-form-item>
<el-form-item :label="$t('发货人电话')" prop="consignorPhone">
......@@ -41,8 +41,8 @@
<el-form-item :label="$t('收货人')" prop="consigneeId">
<div class="contact">
<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/images/new_customer.png" class="phonebook" @click="quickCreateType='1'" />
<img src="@/assets/svg/contacts.svg" class="phonebook" @click="contactChooseType='consignee'" />
<img src="@/assets/svg/contact_create.svg" class="phonebook" @click="quickCreateType='1'" />
</div>
</el-form-item>
<el-form-item :label="$t('收货人电话')" prop="consigneePhone">
......
src/views/ecw/order/edit.vue
View file @ 66c95057
......@@ -26,8 +26,8 @@
<!-- <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 v-if="!updateChannel" src="@/assets/images/phonebook.png" 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/contacts.svg" class="phonebook" @click="contactChooseType='consignor'" />
<img v-if="!updateChannel" src="@/assets/svg/contact_create.svg" class="phonebook" @click="quickCreateType='0'" />
</div>
</el-form-item>
<!-- v1.7新增 -->
......@@ -57,8 +57,8 @@
<!-- <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 v-if="!updateChannel" src="@/assets/images/phonebook.png" 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/contacts.svg" class="phonebook" @click="contactChooseType='consignee'" />
<img v-if="!updateChannel" src="@/assets/svg/contact_create.svg" class="phonebook" @click="quickCreateType='1'" />
</div>
</el-form-item>
<!-- v1.7新增 -->
......
src/views/ecw/order/exception/index.vue
View file @ 66c95057
......@@ -172,7 +172,10 @@
<router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
<span>{{ scope.row.orderNo }}</span>
</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>
</el-table-column>
<el-table-column :label="$t('唛头')" align="center" >
......@@ -420,6 +423,19 @@ export default {
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>
......
src/views/ecw/order/index.vue
View file @ 66c95057
......@@ -268,7 +268,8 @@
'ecw:order:reduce',
'ecw:order:commission',
'ecw:order:heavy',
'ecw:order:bulky'
'ecw:order:bulky',
'ecw:order:setCanNotShipment'
]" >
<el-button type="text">{{$t('操作')}}</el-button>
<el-dropdown-menu slot="dropdown">
......@@ -370,6 +371,11 @@
)">
<el-dropdown-item @click.native="handleUpdate(scope.row, true)" v-hasPermi="['ecw:order:update_channel']">{{$t('变更出货渠道')}}</el-dropdown-item>
</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>
......@@ -550,7 +556,7 @@ import {
exportCustomsDatas,
exportShippingDatas,
exportShipFee,
exportUnload, splitCancelApply, orderSplitRevoke, setCanShipment
exportUnload, splitCancelApply, orderSplitRevoke, setCanShipment, setCanNotShipment
} from "@/api/ecw/order";
/* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
import PrintTag from './components/PrintTag'
......@@ -992,6 +998,14 @@ export default {
return false
}
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 @ 66c95057
......@@ -2,7 +2,7 @@
<el-dialog
:title="title + ' - ' + warehousing.orderNo"
:visible.sync="visible"
width="1280px"
width="90vw"
>
<el-form ref="form" :model="form" :rules="formRules" label-width="80px">
<el-descriptions border :column="2">
......@@ -101,7 +101,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="长(cm)">
<el-table-column label="长(cm)" width="110px">
<template v-slot:header>
<span>{{ $t('长') }}</span>(cm)
</template>
......@@ -111,7 +111,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="宽(cm)">
<el-table-column label="宽(cm)" width="110px">
<template v-slot:header>
<span>{{ $t('宽') }}</span>(cm)
</template>
......@@ -121,7 +121,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="高(cm)">
<el-table-column label="高(cm)" width="110px">
<template v-slot:header>
<span>{{ $t('高') }}</span>(cm)
</template>
......@@ -131,7 +131,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="体积(m³)">
<el-table-column label="体积(m³)" width="110px">
<template v-slot:header>
<span style="color: red">*</span> <span>{{ $t('体积') }}</span>(m³)
</template>
......@@ -141,7 +141,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="重量(Kg)">
<el-table-column label="重量(Kg)" width="110px">
<template v-slot:header>
<span style="color: red">*</span> <span>{{ $t('重量') }}</span>(Kg)
</template>
......@@ -160,7 +160,7 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="$t('快递单号')">
<el-table-column :label="$t('快递单号')" width="150px">
<template v-slot="{r,c,$index}">
<el-form-item>
<el-input :disabled="$index < protectRowCount" v-model="form.table[$index].expressNo" placeholder=""></el-input>
......@@ -179,8 +179,16 @@
:is-editing="edit"></warehouse-area-select>
</template>
</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('操作')">
<template v-slot="{ row, column, $index}">
<WarehouseRecordDetail v-model="form.table[$index].orderWarehouseInDetailsVOList" />
<el-popconfirm
v-if="$index >= protectRowCount"
title="确定要删除该行记录吗？"
......@@ -214,11 +222,13 @@ import {finishPacked, orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api
import {getProductAttrList} from "@/api/ecw/productAttr"
import {getProductTypeList} from "@/api/ecw/productType"
import {addProduct} from "@/api/ecw/product"
import WarehouseRecordDetail from "@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue";
export default {
name: "Package",
components: {
WarehouseRecordDetail,
ProductSelector,
WarehouseAreaSelect,
WorkFlow
......@@ -497,12 +507,31 @@ export default {
if (!valid1) {
return
}
// 复制数据副本，避免修改格式后原数据被影响
const table = JSON.parse(JSON.stringify(this.form.table))
table.forEach(({orderWarehouseInDetailsVOList}) => {
})
// 首次入仓、入仓补充
return finishPacked({
brand: this.form.brand,
orderId: this.warehousing.orderId,
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 {
...e,
boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
......
src/views/ecw/order/stockingList.vue
View file @ 66c95057
......@@ -179,7 +179,8 @@
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="150px">
<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>
</template>
</el-table-column>
......@@ -204,7 +205,7 @@ import {
exportReadyStock,
canShipmentPage,
orderSpecialNeed,
exportCanShipment
exportCanShipment, setNotCanShipment, setCanNotShipment
} from "@/api/ecw/order";
import PrintTag from './components/PrintTag'
import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
......@@ -391,6 +392,14 @@ export default {
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>
......
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @ 66c95057
......@@ -188,13 +188,13 @@
<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-input v-model="form.table[$index].remark" type="textarea" show-word-limit maxlength="100" placeholder="" :disabled="$index < protectRowCount"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="$t('操作')">
<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
v-if="$index >= protectRowCount"
title="确定要删除该行入仓记录吗？"
......
src/views/ecw/order/warehousing/components/WarehouseRecordDetailItem.vue
View file @ 66c95057
......@@ -40,13 +40,16 @@
</el-col>
<el-col :span="12">
<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"
:type="DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE"
multiple
form-type="checkbox"
:disabled="readonly"
></dict-selector>
></dict-selector>-->
</el-form-item>
</el-col>
</el-row>
......@@ -101,7 +104,7 @@
import ProductSelector from "@/components/ProductSelector/index.vue"
import { getProductBrank, getProductBrankPage } from '@/api/ecw/productBrank'
import {getProductAttrList} from "@/api/ecw/productAttr"
import { DICT_TYPE } from '@/utils/dict'
import {DICT_TYPE, getDictDatas} from '@/utils/dict'
export default {
name: "WarehouseRecordDetailItem",
......@@ -141,10 +144,10 @@ export default {
boxGauge3: '',
}
},
mounted() {
async mounted() {
// 品牌回显
if (this.value.brand) {
getProductBrank(this.value.brand).then(r => {
await getProductBrank(this.value.brand).then(r => {
this.brandList = [r.data]
})
}
......@@ -155,6 +158,7 @@ export default {
if (this.value.usageIds) {
console.log('this.value.usageIds',this.value.usageIds)
await this.$nextTick()
this.usageIds = this.value.usageIds.split(',') || []
}
......@@ -168,6 +172,7 @@ export default {
}
},
methods: {
getDictDatas,
/** 获取产品属性列表 */
getAttrList() {
getProductAttrList().then(response => {
......
src/views/member/user/index.vue
View file @ 66c95057
......@@ -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: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 type="text" v-has-permi="['member:user:info']" size="mini" @click="$router.push('member/member-details/' + scope.row.id )" >{{ $t('查看') }}</el-button>
</template>
</el-table-column>
</el-table>
......
src/views/member/user/memberDetails.vue 0 → 100644
View file @ 66c95057
<template>
<div style="padding: 20px">
<header style="display: flex;justify-content: space-between;align-items: center;">
<h1 style="font-weight: 600;font-size: 20px">{{$t('会员详情')}}</h1>
<div>
<el-button type="primary" v-has-permi="['member:certificate']" @click="guarantee(details)">{{ $t('保函证书') }}</el-button>
<el-button type="primary" v-has-permi="['member:log']" @click="operationLogFn(details)">{{ $t('操作日志') }}</el-button>
<el-button type="primary" v-has-permi="['member:id-card']" @click="identityFn(details , '1')">{{ $t('身份证') }}</el-button>
<el-button type="primary" v-has-permi="['member:business-license']" @click="identityFn(details, '2')">{{ $t('营业执照') }}</el-button>
<el-button type="danger" v-has-permi="['member:delete']" @click="deleteFn(details)">{{ $t('删除') }}</el-button>
</div>
</header>
<el-descriptions :title="$t('公司信息')" :column="4" border>
<el-descriptions-item :label="$t('会员编号')">{{ details.id }}</el-descriptions-item>
<el-descriptions-item :label="$t('会员昵称')">{{ details.nickname }}</el-descriptions-item>
<el-descriptions-item :label="$t('英文名称')">{{ details.englishName }}</el-descriptions-item>
<el-descriptions-item :label="$t('真实姓名')">{{ details.identityName || '-' }}</el-descriptions-item>
<el-descriptions-item :label="$t('联系方式')"><span
style="margin-right: 10px;">+{{ details.areaCode }}</span><span>{{ details.mobile }}</span>
</el-descriptions-item>
<el-descriptions-item :label="$t('绑定邮箱')">{{ details.email }}</el-descriptions-item>
<el-descriptions-item :label="$t('生日')">{{ details.birthday }}</el-descriptions-item>
<el-descriptions-item :label="$t('性别')">{{
details.gender === 0 ? '女' : details.gender === 1 ? '男' : '保密'
}}
</el-descriptions-item>
<el-descriptions-item :label="$t('地址')">{{ details.address }}</el-descriptions-item>
<el-descriptions-item :label="$t('部门')">{{details.department}}</el-descriptions-item>
<el-descriptions-item :label="$t('职位')">{{details.jobPosition}}</el-descriptions-item>
<el-descriptions-item :label="$t('创建时间')">{{details.createTime}}</el-descriptions-item>
<el-descriptions-item :label="$t('上次登录')">{{details.loginDate}}</el-descriptions-item>
</el-descriptions>
<el-descriptions style="margin-top: 20px" :title="$t('基础信息')" :column="4" border>
<el-descriptions-item :label="$t('公司名称')">{{details.enterpriseName}}</el-descriptions-item>
<el-descriptions-item :label="$t('公司英文名称')">{{details.enterpriseNameEn}}</el-descriptions-item>
<el-descriptions-item :label="$t('档口')">{{details.enterpriseStall}}</el-descriptions-item>
<el-descriptions-item :label="$t('品牌')">{{details.enterpriseBrand}}</el-descriptions-item>
<el-descriptions-item :label="$t('公司地址')">{{details.enterpriseAddress}}</el-descriptions-item>
<el-descriptions-item :label="$t('公司简介')">{{details.enterpriseDesc}}</el-descriptions-item>
</el-descriptions>
<el-descriptions style="margin-top: 20px" :title="$t('认证信息')" :column="4" border>
<el-descriptions-item :label="$t('成交')">{{details.customerStatus === 3 ? '成交' : '未成交' }}</el-descriptions-item>
<el-descriptions-item :label="$t('认证')">
<span v-if="details.identityAuditStatus === 2 && details.enterpriseAuditStatus === 2" >{{ $t('双认证') }}</span>
<span v-else-if="details.identityAuditStatus === 2 && details.enterpriseAuditStatus !== 2 " >{{ $t('身份证') }}</span>
<span v-else-if="details.identityAuditStatus !== 2 && details.enterpriseAuditStatus === 2 " >{{ $t('企业') }}</span>
<span v-else-if="details.identityAuditStatus !== 2 && details.enterpriseAuditStatus !== 2 " >{{ $t('否') }}</span>
</el-descriptions-item>
<el-descriptions-item :label="$t('身份证认证状态')">{{ details.identityAuditStatus !== null ? $l(getDictDatas(this.DICT_TYPE.AUDIT_STATUS).find(i => i.value == details.identityAuditStatus),'label') : ''}}</el-descriptions-item>
<el-descriptions-item :label="$t('身份证认证状态')">{{details.enterpriseAuditStatus !== null ? $l(getDictDatas(this.DICT_TYPE.AUDIT_STATUS).find(i => i.value == details.enterpriseAuditStatus),'label' ) : '' }}</el-descriptions-item>
</el-descriptions>
<el-dialog
title="保函/证书"
:visible.sync="guaranteeShow"
:before-close="()=>{guaranteeUrl = ''; guaranteeShow = false;}"
width="50%">
<el-form>
<el-form-item :label="$t('保函/证书')">
<el-row :gutter="20" type="flex" justify="center">
<el-col :span="12">
<el-input v-model="guaranteeUrl"></el-input>
</el-col>
<el-col :span="4">
<div style="height: 45px;overflow: hidden;">
<file-upload v-model="guaranteeUrl" :fileType="['png', 'jpg', 'jpeg','pdf']" :limit="1"
:isShowTip="false"></file-upload>
</div>
</el-col>
<el-col :span="6">
<div>{{ $t('可上传图片,pdf文档') }}</div>
</el-col>
</el-row>
</el-form-item>
</el-form>
<div style="text-align: center;">
<el-button @click="setGuarantee">{{ $t('保 存') }}</el-button>
</div>
</el-dialog>
<el-dialog
:title="$t('操作日志')"
:visible.sync="operationLogShow"
width="50%">
<el-table :data="operationLogList">
<el-table-column :label="$t('标题')" prop="title"></el-table-column>
<el-table-column :label="$t('操作内容')" prop="content"></el-table-column>
<el-table-column :label="$t('操作人')" prop="userId">
<template v-slot="{row}">
{{ details.identityName }}
</template>
</el-table-column>
<el-table-column :label="$t('操作时间')">
<template v-slot:default="scope">
{{ parseTime(scope.row.createTime) }}
</template>
</el-table-column>
<el-table-column :label="$t('操作ip')" prop="ip"></el-table-column>
</el-table>
<pagination v-show="totalLog > 0" :total="totalLog" :page.sync="operationLogFrom.page"
:limit.sync="operationLogFrom.row"
@pagination="getOperationLogList"/>
</el-dialog>
<el-dialog
:title="$t('认证')"
:visible.sync="attestationShow"
width="80%">
<div class="details">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :label="$t('身份证')" name="1">
<div style="padding:0 40px;box-sizing: border-box;">
<el-form :disabled="[2,3].includes(IdDetails.status) && modifyIdCard" ref="formId" label-position="left"
label-width="100px" :rules="rulesId" :model="IdDetails">
<el-form-item :label="$t('姓名')" prop="name">
<el-input v-model="IdDetails.name"></el-input>
</el-form-item>
<el-form-item :label="$t('证件类型')" prop="cardType">
<dict-selector v-model="IdDetails.cardType" :type="DICT_TYPE.CERTIFICATE_TYPE"></dict-selector>
</el-form-item>
<el-form-item :label="$t('证件号码')" prop="cardNumber">
<el-input v-model="IdDetails.cardNumber"></el-input>
</el-form-item>
<el-form-item :label="$t('证件正面照')" prop="img1">
<div>
<el-input readonly style="margin-bottom: 20px" v-model="IdDetails.img1"></el-input>
<ImageUpload :isShowTip="false" v-model="IdDetails.img1" :limit="1"></ImageUpload>
</div>
</el-form-item>
<el-form-item :label="$t('证件背面照')" prop="img2">
<div>
<el-input readonly style="margin-bottom: 20px" v-model="IdDetails.img2"></el-input>
<ImageUpload :isShowTip="false" :limit="1" v-model="IdDetails.img2"></ImageUpload>
</div>
</el-form-item>
<el-form-item :label="$t('审核状态')" v-if="modifyIdCard && IdDetails.status !== 0 ">
{{
getDictDatas(DICT_TYPE.AUDIT_STATUS)[IdDetails.status] ? getDictDatas(DICT_TYPE.AUDIT_STATUS)[IdDetails.status].label : ''
}}
</el-form-item>
<el-form-item :label="$t('审核时间')" v-if="[2,3].includes(IdDetails.status) && modifyIdCard">
{{ parseTime(IdDetails.auditTime) }}
</el-form-item>
<el-form-item v-if="modifyIdCard && IdDetails.status !== 0" :label="$t('审核备注')">
<el-input v-model="IdDetails.auditRemark" :disabled="IdDetails.status === 3"
type="textarea"></el-input>
</el-form-item>
</el-form>
<div v-if="IdDetails.status === 1" style="text-align: center;margin-top: 20px;">
<el-button type="primary" @click="idCardAuditFn(2)">{{ $t('审核通过') }}</el-button>
<el-button type="primary" @click="idCardAuditFn(3)">{{ $t('审核不通过') }}</el-button>
<el-button @click="attestationShow = false">{{ $t('取 消') }}</el-button>
</div>
<div v-if="IdDetails.status === 2 || IdDetails.status === 3" style="text-align: center;margin-top: 20px;">
<el-button type="primary" v-if="modifyIdCard" @click="modifyIdCard = false;">{{ $t('修 改') }}
</el-button>
<el-button type="primary" v-else @click="setMemberUserUpdateIdCard">{{ $t('提交审核') }}</el-button>
<el-button @click="attestationShow = false">{{ $t('取 消') }}</el-button>
</div>
<div v-if="IdDetails.status === 0" style="text-align: center;margin-top: 20px;">
<el-button type="primary" @click="submitId">{{ $t('上 传') }}</el-button>
<el-button @click="attestationShow = false">{{ $t('取 消') }}</el-button>
</div>
</div>
</el-tab-pane>
<el-tab-pane :label="$t('营业执照')" name="2">
<div style="width: 500px;padding:0 40px;box-sizing: border-box;">
<el-form :disabled="modifyLicense && [2,3].includes(enterpriseFrom.status)" :rules="rulesEnterprise"
:model="enterpriseFrom" label-position="left" ref="formEnter" label-width="100px">
<el-form-item :label="$t('企业名称')" prop="name">
<el-input v-model="enterpriseFrom.name"></el-input>
</el-form-item>
<el-form-item :label="$t('企业法人')" prop="legalName">
<el-input v-model="enterpriseFrom.legalName"></el-input>
</el-form-item>
<el-form-item :label="$t('证件号码')" prop="cardNumber">
<el-input v-model="enterpriseFrom.cardNumber"></el-input>
</el-form-item>
<el-form-item :label="$t('证件照')" prop="img1">
<div>
<el-input readonly style="margin-bottom: 20px" v-model="enterpriseFrom.img1"></el-input>
<ImageUpload :isShowTip="false" :limit="1" v-model="enterpriseFrom.img1"></ImageUpload>
</div>
</el-form-item>
<el-form-item :label="$t('附件')">
<el-input readonly v-model="enterpriseFrom.img2"></el-input>
<ImageUpload :isShowTip="false" :limit="1" v-model="enterpriseFrom.img2"></ImageUpload>
</el-form-item>
<el-form-item v-if="modifyLicense && enterpriseFrom.status !== 0 " :label="$t('审核状态')">
{{ getDictDatas(DICT_TYPE.AUDIT_STATUS)[enterpriseFrom.status].label }}
</el-form-item>
<el-form-item v-if="[2,3].includes(enterpriseFrom.status) && modifyLicense " :label="$t('审核时间')">
{{ parseTime(enterpriseFrom.auditTime) }}
</el-form-item>
<el-form-item v-if="modifyLicense && enterpriseFrom.status !== 0" :label="$t('审核备注')">
<el-input v-model="enterpriseFrom.auditRemark" :disabled="enterpriseFrom.status === 3"
type="textarea"></el-input>
</el-form-item>
</el-form>
<div v-if="enterpriseFrom.status === 1" style="text-align: center;margin-top: 20px;">
<el-button type="primary" @click="certificateVerificationFn(2)">{{ $t('审核通过') }}</el-button>
<el-button type="primary" @click="certificateVerificationFn(3)">{{ $t('审核不通过') }}</el-button>
<el-button @click="attestationShow = false">{{ $t('取 消') }}</el-button>
</div>
<div v-if="enterpriseFrom.status === 2 || enterpriseFrom.status === 3"
style="text-align: center;margin-top: 20px;">
<el-button type="primary" v-if="modifyLicense" @click="modifyLicense = false">{{ $t('修 改') }}
</el-button>
<el-button type="primary" v-else @click="setMemberUserUpdateEnterprise">{{ $t('提交审核') }}</el-button>
<el-button @click="attestationShow = false">{{ $t('取 消') }}</el-button>
</div>
<div v-if="enterpriseFrom.status === 0" style="text-align: center;margin-top: 20px;">
<el-button type="primary" @click="submit">{{ $t('上 传') }}</el-button>
<el-button @click="attestationShow = false">{{ $t('取 消') }}</el-button>
</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
</el-dialog>
</div>
</template>
<script>
import {
createAuditIdCard, deleteUser,
memberGetAuthEnterpriseInfo,
memberGetAuthIdcardInfo,
memberUserAuditEnterprise,
memberUserAuditIdCard,
memberUserGet, memberUserUpdateEnterprise,
memberUserUpdateIdCard,
operationLogApi, seTupdateBackletter, userCreateAuditEnterprise
} from "@/api/member/user";
import FileUpload from "@/components/FileUpload/index.vue";
import ImageUpload from "@/components/ImageUpload/index.vue";
import {DICT_TYPE, getDictDatas} from "@/utils/dict";
export default {
name: "memberDetails",
components: {ImageUpload, FileUpload},
data() {
return {
// 表单校验
rulesId: {
name: [{required: true, message: this.$t('用户昵称不能为空'), trigger: "blur"}],
cardType: [{required: true, message: this.$t('证件类型不能为空'), trigger: "blur"}],
cardNumber: [{required: true, message: this.$t('证件号码不能为空'), trigger: "blur"}],
img1: [{required: true, message: this.$t('身份正面照不能为空'), trigger: ['blur', 'change']}],
img2: [{required: true, message: this.$t('身份正面照不能为空'), trigger: ['blur', 'change']}],
},
rulesEnterprise: {
name: [{required: true, message: this.$t('企业名称不能为空'), trigger: "blur"}],
legalName: [{required: true, message: this.$t('企业法人不能为空'), trigger: "blur"}],
cardNumber: [{required: true, message: this.$t('证件号码不能为空'), trigger: "blur"}],
img1: [{required: true, message: this.$t('证件照不能为空'), trigger: ['blur', 'change']}],
},
getDictDatas,
DICT_TYPE,
details: {
"address": "",
"areaCode": "",
"avatar": "",
"backLetterImg": "",
"birthday": "",
"createTime": "",
"customerStatus": "",
"department": "",
"email": "",
"englishName": "",
"enterpriseAddress": "",
"enterpriseAuditCreateTime": "",
"enterpriseAuditRemark": "",
"enterpriseAuditStatus": "",
"enterpriseAuditTime": "",
"enterpriseBrand": "",
"enterpriseDesc": "",
"enterpriseName": "",
"enterpriseNameEn": "",
"enterpriseStall": "",
"enterpriseWebsite": "",
"gender": "",
"groupCount": "",
"id": "",
"identityAuditCreateTime": "",
"identityAuditRemark": "",
"identityAuditStatus": "",
"identityAuditTime": "",
"identityName": "",
"isDeal": "",
"isSimplePassword": "",
"jobPosition": "",
"loginDate": "",
"loginIp": "",
"mobile": "",
"nickname": "",
"password": "",
"registDate": "",
"registerIp": "",
"status": ""
},
publicObj: {},
guaranteeShow: false,
guaranteeUrl: '',
operationLogFrom: {
page: 1,
row: 10,
userId: undefined
},
attestationShow: false,
modifyLicense: false,
modifyIdCard: true,//修改身份证
IdDetails: {},
enterpriseFrom: {},
operationLogShow: false,
activeName: "1",
operationLogList: [],
totalLog: 0,
}
},
created() {
this.getDetails()
},
methods: {
deleteFn(row) {
const nickname = row.nickname;
this.$modal.confirm(`${this.$t('是否确认删除昵称为{nickname}的会员?', {nickname})}`).then(function () {
return deleteUser(row.id)
}).then(res => {
this.$message.success(this.$t('删除成功'))
this.$router.back()
}).catch(() => {
// this.$message.success(this.$t('删除失败'))
}
)
},
getDetails() {
memberUserGet({id: this.$route.params.id}).then(r => {
console.log(r, 'rrrr')
this.details = r.data
})
},
// 保函证书
guarantee(row) {
this.publicObj = row;
this.guaranteeShow = true;
this.guaranteeUrl = row.backLetterImg;
},
// 操作日志
operationLogFn(row) {
this.publicObj = row;
this.operationLogFrom.page = 1;
this.operationLogFrom.userId = row.id
this.operationLogShow = true;
this.operationLogList = [];
this.getOperationLogList();
},
getOperationLogList() {
operationLogApi(this.operationLogFrom).then(r => {
if (r.code === 0) {
this.operationLogList = r.data.list
this.totalLog = r.data.total
}
})
},
identityFn(row, val) {
this.attestationShow = true;
this.activeName = val;
this.publicObj = row;
if (val == 1) {
this.getIdentityDetails();
} else {
this.getEnterpriseFn();
}
},
handleClick(val) {
if (val.name == 1) {
this.getIdentityDetails();
} else {
this.getEnterpriseFn();
}
},
getIdentityDetails() {
this.resetId();
memberGetAuthIdcardInfo({userId: this.publicObj.id}).then(r => {
if (r.code === 0 && !!r.data) {
this.IdDetails = r.data
}
})
},
getEnterpriseFn() {
this.resetEnterprise();
memberGetAuthEnterpriseInfo({userId: this.publicObj.id}).then(r => {
if (r.code === 0 && !!r.data) {
this.enterpriseFrom = r.data
}
})
},
//身份证审核
idCardAuditFn(val) {
let p = {
auditStatus: val,
userCardAuthId: this.IdDetails.id,
auditRemark: this.IdDetails.auditRemark
}
memberUserAuditIdCard(p).then(r => {
if (r.code === 0) {
this.$message.success(this.$t('修改成功'));
this.getList()
this.getIdentityDetails()
}
})
},
// 企业证书审核
certificateVerificationFn(val) {
let p = {
auditStatus: val,
userEnterpriseAuthId: this.enterpriseFrom.id,
auditRemark: this.enterpriseFrom.auditRemark
}
memberUserAuditEnterprise(p).then(r => {
if (r.code === 0) {
this.getList()
this.getEnterpriseFn();
}
})
},
setMemberUserUpdateIdCard() {
this.$refs.formId.validate(async valid => {
if (valid) {
let p = {
cardNumber: this.IdDetails.cardNumber,
cardType: this.IdDetails.cardType,
img1: this.IdDetails.img1,
img2: this.IdDetails.img2,
name: this.IdDetails.name,
userCardAuthId: this.IdDetails.id,
auditPass: true,
};
memberUserUpdateIdCard(p).then(r => {
if (r.code === 0) {
this.$message.success(this.$t('修改成功'))
if (p.auditPass === true) {
this.getIdentityDetails()
}
this.getList()
this.modifyIdCard = true;
}
})
}
})
},
setMemberUserUpdateEnterprise() {
this.$refs.formEnter.validate(async valid => {
if (valid) {
let p = {
cardNumber: this.enterpriseFrom.cardNumber,
img1: this.enterpriseFrom.img1,
img2: this.enterpriseFrom.img2,
legalName: this.enterpriseFrom.legalName,
name: this.enterpriseFrom.name,
userEnterpriseAuthId: this.enterpriseFrom.id,
auditPass: true,
}
memberUserUpdateEnterprise(p).then(r => {
if (r.code === 0) {
if (p.auditPass === true) {
this.getEnterpriseFn();
}
this.getList()
this.modifyLicense = true;
this.$message.success(this.$t('修改成功'));
}
})
}
})
},
submit() {
let p = {
cardNumber: this.enterpriseFrom.cardNumber,
img1: this.enterpriseFrom.img1,
img2: this.enterpriseFrom.img2,
legalName: this.enterpriseFrom.legalName,
name: this.enterpriseFrom.name,
userEnterpriseAuthId: this.enterpriseFrom.id,
userId: this.publicObj.id
}
userCreateAuditEnterprise(p).then(r => {
if (r.code === 0) {
this.$message.success(this.$t('添加成功!'));
this.enterpriseFrom.status = 2
this.enterpriseFrom.auditTime = new Date().getTime()
this.getEnterpriseFn();
this.getList()
}
})
},
submitId() {
this.$refs.formId.validate(async valid => {
if (valid) {
let p = {
cardNumber: this.IdDetails.cardNumber,
cardType: this.IdDetails.cardType,
img1: this.IdDetails.img1,
img2: this.IdDetails.img2,
name: this.IdDetails.name,
status: 2,
userId: this.publicObj.id
};
createAuditIdCard(p).then(r => {
if (r.code === 0) {
this.$message.success(this.$t('添加成功!'));
this.IdDetails.status = 2
this.IdDetails.auditTime = new Date().getTime()
this.getIdentityDetails();
this.getList()
}
})
}
})
},
/** 表单重置 */
resetId() {
this.IdDetails = {
auditRemark: undefined,
auditTime: undefined,
cardNumber: undefined,
cardType: undefined,
createTime: undefined,
id: 0,
img1: undefined,
img2: undefined,
name: '',
status: 0,
userId: 0
}
},//清空身份证
resetEnterprise() {
this.enterpriseFrom = {
auditRemark: undefined,
auditTime: undefined,
cardNumber: undefined,
createTime: undefined,
id: undefined,
img1: undefined,
img2: undefined,
legalName: undefined,
name: undefined,
status: 0,
userId: undefined
}
},//清空企业
setGuarantee() {
seTupdateBackletter({userId: this.publicObj.id, backLetter: this.guaranteeUrl}).then(r => {
if (r.code === 0) {
this.publicObj.backLetterImg = this.guaranteeUrl;
this.guaranteeShow = false;
this.$message.success(this.$t('保存成功'));
}
})
},
}
}
</script>
<style scoped lang="scss">
</style>
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