java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

master
qb 1 year ago
parent
f098d6d6a6 0ac6438abc
commit
c5bb0ed059
3 changed files with 270 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 210
      src/views/aftersales/aftersalesWorkOrder.vue
  2. 8
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  3. 80
      src/views/warehouse/parcelList/distributionParcelList.vue

210
src/views/aftersales/aftersalesWorkOrder.vue
Unescape View File

@ -83,7 +83,7 @@
<el-button <el-button
type="primary" type="primary"
@click="AddInfo" @click="AddInfo"
v-if="TabPermissions == 0 && UserPermissions == '仓库客服'" v-if="ButtonPermissions.add"
> >
<el-icon><Plus /></el-icon>新 增</el-button <el-icon><Plus /></el-icon>新 增</el-button
> >
@ -93,40 +93,31 @@
<el-button <el-button
type="primary" type="primary"
@click="BatchReturn" @click="BatchReturn"
v-if=" v-if="ButtonPermissions.batchReject"
(TabPermissions == 0 && UserPermissions == '职能客服') || (TabPermissions == 1 && UserPermissions != '仓库客服' ) || (TabPermissions !=2 && !AppealStatusT)
"
>批量打回</el-button >批量打回</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="assign" @click="assign"
v-if="TabPermissions == 0 && UserPermissions == '客服经理' && TabPermissions !=2" v-if="ButtonPermissions.assignment"
>工单指派</el-button >工单指派</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="arbitrate" @click="arbitrate"
v-if=" v-if="ButtonPermissions.applyArbitration"
((TabPermissions == 0 || TabPermissions == 1 ) && TabPermissions !=2) && UserPermissions == '仓库客服'
"
>申请仲裁</el-button >申请仲裁</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="Batchcompletion" @click="Batchcompletion"
v-if=" v-if="ButtonPermissions.batchFinish"
(TabPermissions == 0 || UserPermissions == '职能客服') &&
(TabPermissions == 1 || UserPermissions != '仓库客服')
"
>批量完结</el-button >批量完结</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="appeal" @click="appeal"
v-if="(TabPermissions !=2 && UserPermissions == '仓库客服') || AppealStatusT " v-if="ButtonPermissions.appeal"
>申诉</el-button >申诉</el-button
> >
<!-- v-if="details.query.workOrderStatus == 30" --> <!-- v-if="details.query.workOrderStatus == 30" -->
@ -1172,7 +1163,7 @@ const AppealStatus = ref(false); //申诉列表状态
const dialogModifyAmount = ref(false); //超时金额修改弹出状态 const dialogModifyAmount = ref(false); //超时金额修改弹出状态
const UserPermissions = ref('仓库客服'); //客服权限 const UserPermissions = ref('仓库客服'); //客服权限
const TabPermissions = ref(0); //菜单权限 const TabPermissions = ref(0); //菜单权限
const AppealStatusT=ref(false);//是否为申诉列表 const AppealStatusT = ref(false); //是否为申诉列表
const TabList = ref([ const TabList = ref([
{ name: 0, label: '全部' }, { name: 0, label: '全部' },
{ name: 1, label: '处理中' }, { name: 1, label: '处理中' },
@ -1304,10 +1295,181 @@ const {
recorddata, recorddata,
} = toRefs(details); } = toRefs(details);
// let tab = [
let s=[ // { label: '全部', value: 0 },
// { label: '处理中', value: 1 },
] // { label: '待处理完毕', value: 2 },
// { label: '待处理', value: 3 },
// { label: '理赔金额未出', value: 4 },
// { label: '仲裁中', value: 5 },
// { label: '完结', value: 6 },
// { label: '超时未处理', value: 7 },
// ];
// // 按钮配置
// // 1.新增 2.批量打回 3.工单指派 4.申请仲裁 5.批量完结 6.申诉
// // 角色配置
// // 1.仓库客服
// // 2.职能客服
// // 3.客服经理
// // 在value == 0状态下的权限配置
// 1.新增 只能仓库客服查看
// 2.批量打回 只能职能客服查看
// 3.工单指派 只能客服经理查看
// 4.申请仲裁 只能仓库客服查看
// 5.批量完结 只能职能客服查看
// 6.申诉 隐藏
// // 在value==1状态下的权限配置
// 1.新增 隐藏
// 2.批量打回 只能仓库客服查看
// 3.工单指派 隐藏
// 4.申请仲裁 只能仓库客服查看
// 5.批量完结 只能职能客服和客服经理查看
// 6.申诉 隐藏
// // 在value==2状态下的权限配置
// 隐藏所有按钮
// // 在value==3状态下的权限配置
// 1.新增 隐藏
// 2.批量打回 只能仓库客服查看
// 3.工单指派 只能客服经理查看
// 4.申请仲裁 隐藏
// 5.批量完结 隐藏
// 6.申诉 隐藏
// // 在value==4状态下的权限配置
// 1.新增 隐藏
// 2.批量打回 隐藏
// 3.工单指派 隐藏
// 4.申请仲裁 隐藏
// 5.批量完结 隐藏
// 6.申诉 仓库客服查看
// // 在value==5状态下的权限配置
// 1.新增 隐藏
// 2.批量打回 隐藏
// 3.工单指派 隐藏
// 4.申请仲裁 隐藏
// 5.批量完结 隐藏
// 6.申诉 隐藏
// // 在value==6状态下的权限配置
// 1.新增 隐藏
// 2.批量打回 隐藏
// 3.工单指派 隐藏
// 4.申请仲裁 隐藏
// 5.批量完结 隐藏
// 6.申诉 隐藏
// // 在value== 7 状态下的权限配置
// 1.新增 隐藏
// 2.批量打回 隐藏
// 3.工单指派 隐藏
// 4. 申请仲裁 隐藏
// 5.批量完结 隐藏
// 6.申诉 隐藏
// 角色通过 UserPermissions 变量控制
// 菜单通过 TabPermissions变量 来控制
// 例如：
// const UserPermissions = ref('仓库客服'); //客服权限
// const TabPermissions = ref(0); //菜单权限
const ButtonPermissions = computed(() => {
// 根据 TabPermissions 的状态，决定每个按钮的显示隐藏逻辑
switch (TabPermissions.value) {
case 0://全部
return {
add: UserPermissions.value == '仓库客服', //新增按钮
batchReject: UserPermissions.value == '职能客服',//批量打回
assignment: UserPermissions.value == '客服经理',//工单指派
applyArbitration: UserPermissions.value == '仓库客服',//申请仲裁
batchFinish: UserPermissions.value == '职能客服',//批量完结
appeal: false//申诉
};
case 1://处理中
return {
add: false,//新增按钮
batchReject: UserPermissions.value != '仓库客服',//批量打回
assignment: false,//工单指派
applyArbitration: UserPermissions.value == '仓库客服',//申请仲裁
batchFinish:UserPermissions.value != '仓库客服',//批量完结
appeal: false//申诉
};
case 2://处理完毕
return {
add: false,//新增按钮
batchReject: false,//批量打回
assignment: false,//工单指派
applyArbitration: false,//申请仲裁
batchFinish:false,//批量完结
appeal: UserPermissions.value == '仓库客服' && AppealStatusT.value//申诉
};
case 3://待处理
return {
add: false,//新增按钮
batchReject: UserPermissions.value == '仓库客服',//批量打回
assignment:UserPermissions.value == '客服经理',//工单指派
applyArbitration: false,//申请仲裁
batchFinish:false,//批量完结
appeal: false//申诉
};
case 4://理赔金额未出
return {
add: false,//新增按钮
batchReject: false,//批量打回
assignment:false,//工单指派
applyArbitration: false,//申请仲裁
batchFinish:false,//批量完结
appeal: UserPermissions.value == '仓库客服'//申诉
};
case 5://仲裁中
return {
add: false,//新增按钮
batchReject: false,//批量打回
assignment:false,//工单指派
applyArbitration: false,//申请仲裁
batchFinish:false,//批量完结
appeal:false//申诉
};
case 6://完结
return {
add: false,//新增按钮
batchReject: false,//批量打回
assignment:false,//工单指派
applyArbitration: false,//申请仲裁
batchFinish:false,//批量完结
appeal:false//申诉
};
case 7://超时未处理
return {
add: false,//新增按钮
batchReject: false,//批量打回
assignment:false,//工单指派
applyArbitration: false,//申请仲裁
batchFinish:false,//批量完结
appeal:false//申诉
};
// 其他任何情况下的默认情况
default:
return {
add: false,
batchReject: false,
assignment: false,
applyArbitration: false,
batchFinish: false,
appeal: false
};
}
});
const ProcessingResults = [ const ProcessingResults = [
@ -2141,7 +2303,7 @@ const appealFn = val => {
// 申诉列表 // 申诉列表
const AppealTab = val => { const AppealTab = val => {
if (val == 0) { if (val == 0) {
AppealStatusT.value=false;//申诉列表开启 AppealStatusT.value = false; //申诉列表开启
Tableheaderswitching(columnList); //切换表头 Tableheaderswitching(columnList); //切换表头
console.log('处理完毕'); console.log('处理完毕');
ProcessingPartyState.value = false; //关闭处理方 ProcessingPartyState.value = false; //关闭处理方
@ -2154,8 +2316,8 @@ const AppealTab = val => {
}; };
IndexTable(data); IndexTable(data);
} else { } else {
AppealStatusT.value=true;//申诉列表开启 AppealStatusT.value = true; //申诉列表开启
console.log(val,'切换申诉列表'); console.log(val, '切换申诉列表');
Tableheaderswitching(AppealList); //切换表头 Tableheaderswitching(AppealList); //切换表头
AppealList.forEach(item => { AppealList.forEach(item => {
//清空搜索记录 //清空搜索记录
@ -2216,7 +2378,7 @@ const TimeoutHandling = val => {
// 标签栏触发 // 标签栏触发
const tabChenge = val => { const tabChenge = val => {
TabPermissions.value = val; //记录当前点击的菜单 TabPermissions.value = val; //记录当前点击的菜单
AppealStatusT.value=false;//申诉列表开启 AppealStatusT.value = false; //申诉列表开启
console.log(val, '触发了标签栏'); console.log(val, '触发了标签栏');
let data = {}; let data = {};
if (val == 0) { if (val == 0) {

8
src/views/aftersales/aftersalesWorkOrderInfo.vue
Unescape View File

@ -1421,16 +1421,10 @@ const EndJump = () => {
.foot_btn { .foot_btn {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 50%; left: 42%;
transform: translate(0, -50%);
width: 100%;
height: 40px; height: 40px;
background-color: #ffffff;
border-top: 1px solid #fff;
box-shadow: 3px -1px 1px #ccc;
display: flex; display: flex;
align-items: center; align-items: center;
padding-left: 10px;
} }
:deep(.el-card__body) { :deep(.el-card__body) {
margin-bottom: 50px; margin-bottom: 50px;

80
src/views/warehouse/parcelList/distributionParcelList.vue
Unescape View File

@ -8,6 +8,9 @@
<el-button type="danger" icon="el-icon-bottom" @click="handleExportInfo" plain <el-button type="danger" icon="el-icon-bottom" @click="handleExportInfo" plain
>导出</el-button >导出</el-button
> >
<el-button type="primary" icon="el-icon-view" @click="batchHandQrCode" plain
>批量查看二维码</el-button
>
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>--> <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>-->
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>--> <!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
</div> </div>
@ -31,7 +34,8 @@
@selection="selectionChange" @selection="selectionChange"
> >
<template #default="slotProps"> <template #default="slotProps">
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text> <!-- <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>-->
<el-text size="small" @click="handleQRCode(slotProps.scope)">查看二维码</el-text>
</template> </template>
</tablecmt> </tablecmt>
</el-row> </el-row>
@ -125,6 +129,23 @@
:drawerShow="drawerShow" :drawerShow="drawerShow"
:columnList="columnList" :columnList="columnList"
></edittablehead> ></edittablehead>
<el-dialog
title="二维码"
:visible.sync="dialogVisibleF"
width="780px"
v-model="dialogVisibleF"
>
<div>
<div v-html="html"></div>
</div>
<span slot="footer" class="dialog-footer">
<!-- <el-button type="primary" @click="ddd">导 出</el-button>-->
<el-button type="primary" @click="printTemplate">打 印</el-button>
<el-button @click="dialogVisibleF = false">取 消</el-button>
</span>
</el-dialog>
</template> </template>
<script> <script>
@ -141,9 +162,13 @@ import { getDictionaryBiz } from '@/api/system/dict';
import option from '@/option/distribution/distributionParcelList'; import option from '@/option/distribution/distributionParcelList';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { downloadXls } from '@/utils/util'; import { downloadXls } from '@/utils/util';
import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
export default { export default {
data() { data() {
return { return {
dialogVisibleF:false,
html:'',
columnList: [ columnList: [
{ {
prop: '', prop: '',
@ -337,6 +362,17 @@ export default {
sortable: true, sortable: true,
isshowSummary: true, isshowSummary: true,
}, },
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
isshowSummary: true,
},
], ],
drawerShow: false, drawerShow: false,
@ -455,6 +491,48 @@ export default {
}, },
}, },
methods: { methods: {
//批量查看二维码
batchHandQrCode(){
console.log(' this.selectionList--------->', this.selectionList);
if (this.selectionList.length <=0){
this.$message.warning('请选择包件');
return ;
}
const data = this.selectionList.map((item)=>{
return item.id;
});
let qr = {
ids:data.join(',')
}
this.html = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
this.dialogVisibleF = true;
},
//查看二维码
handleQRCode(scope){
const { row } = scope;
console.log('执行查看二维码');
this.materialQRCode = row;
console.log('---------------->',row);
let qr = {
ids: row.id,
};
this.html = '';
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
});
this.dialogVisibleF = true;
},
handleExportInfo() { handleExportInfo() {
let row = {}; let row = {};
// 查询信息 // 查询信息

Write Preview
Loading…
Cancel
Save