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

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 5 months ago
parent
8a150fe850 230010bdc1
commit
17dcc0987e
6 changed files with 75 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. 2
      src/axios.js
  2. 16
      src/option/aftersales/vueTvemp.js
  3. 14
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  4. 23
      src/views/aftersales/aftersalesWorkOrderend.vue
  5. 53
      src/views/distribution/reservation/reservation.vue
  6. 1
      src/views/distribution/turndelivery/deliveryMarket.vue

2
src/axios.js
Unescape View File

@ -139,7 +139,7 @@ axios.interceptors.response.use(
// 如果状态码为401，则表示用户未认证，需跳转到登录页 // 如果状态码为401，则表示用户未认证，需跳转到登录页
if (status === 401 && !isAlertShowing) { if (status === 401 && !isAlertShowing) {
isAlertShowing = true; // 设置为 true 表示弹窗正在显示 isAlertShowing = true; // 设置为 true 表示弹窗正在显示
ElMessageBox.alert('长时间未操作,登录已过期，请重新登录', '提示', { ElMessageBox.alert('长时间未操作,登录已过期，或账号已在别处登录，请重新登录', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
showClose: false, // 不显示关闭按钮 showClose: false, // 不显示关闭按钮
closeOnPressEscape: false, // 禁止通过 ESC 键关闭 closeOnPressEscape: false, // 禁止通过 ESC 键关闭

16
src/option/aftersales/vueTvemp.js
Unescape View File

@ -19,7 +19,7 @@ export const columnList = [
label: '异常类型', label: '异常类型',
type: 3, type: 3,
values: '', values: '',
width: '100', width: '110',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -30,7 +30,7 @@ export const columnList = [
label: '发现节点', label: '发现节点',
type: 3, type: 3,
values: '', values: '',
width: '100', width: '110',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -479,7 +479,7 @@ export const Claimsfield = [
label: '商场名称', label: '商场名称',
type: 2, type: 2,
values: '', values: '',
width: '100', width: '110',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -512,7 +512,7 @@ export const Claimsfield = [
label: '异常类型名称', label: '异常类型名称',
type: 3, type: 3,
values: '', values: '',
width: '120', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -534,7 +534,7 @@ export const Claimsfield = [
label: '处理结果名称', label: '处理结果名称',
type: 3, type: 3,
values: '', values: '',
width: '120', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -578,7 +578,7 @@ export const Claimsfield = [
label: '处理结果说明', label: '处理结果说明',
type: 2, type: 2,
values: '', values: '',
width: '120', width: '130',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -589,7 +589,7 @@ export const Claimsfield = [
label: '车辆路线', label: '车辆路线',
type: 2, type: 2,
values: '', values: '',
width: '100', width: '110',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,
@ -611,7 +611,7 @@ export const Claimsfield = [
label: '判责原因', label: '判责原因',
type: 2, type: 2,
values: '', values: '',
width: '100', width: '110',
checkarr: [], checkarr: [],
fixed: false, fixed: false,
sortable: true, sortable: true,

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

@ -1118,12 +1118,12 @@ const Completionpermissions = computed(() => {
} }
} }
}); });
const onLoad = () => { const onLoad = async () => {
pageState.value = true; //开启页面加载 pageState.value = true; //开启页面加载
if (localStorage.getItem('my_data')) { if (localStorage.getItem('my_data')) {
Mydata.value = JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息 Mydata.value = await JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息
} }
getDictionaryBiz('after_sales_visits').then(res => { getDictionaryBiz('after_sales_visits').then(async res => {
const matchingItem = res.data.data.find( const matchingItem = res.data.data.find(
item => item.dictValue == JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name item => item.dictValue == JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name
); );
@ -1133,11 +1133,11 @@ const onLoad = () => {
UserPermissions.value = '仓库客服'; UserPermissions.value = '仓库客服';
} }
console.log(UserPermissions.value, '当前角色权限'); console.log(UserPermissions.value, '当前角色权限');
Chathistory(); //聊天的历史记录 await Chathistory(); //聊天的历史记录
routerState.value = $route.query.routerState; routerState.value = $route.query.routerState;
updateDictionary(IndexException.value, 'pc_work_order'); //异常类型 await updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节 await updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
handle(); //处理方和责任方信息 await handle(); //处理方和责任方信息
$_getInfo({ id: $route.query.id }).then(res => { $_getInfo({ id: $route.query.id }).then(res => {
pageState.value = false; //关闭页面加载 pageState.value = false; //关闭页面加载

23
src/views/aftersales/aftersalesWorkOrderend.vue
Unescape View File

@ -336,7 +336,7 @@
:reserve-keyword="false" :reserve-keyword="false"
placeholder="请选择处理结果" placeholder="请选择处理结果"
@change="changeProcessingResults" @change="changeProcessingResults"
:disabled="!PermissionButton.Submission_results" :disabled="!PermissionButton.Processing_result_disabled"
> >
<el-option <el-option
v-for="item in ProcessingResults" v-for="item in ProcessingResults"
@ -362,7 +362,7 @@
:value-on-clear="0" :value-on-clear="0"
:precision="2" :precision="2"
@change="Totalamount" @change="Totalamount"
:disabled="!PermissionButton.Submission_results" :disabled="!PermissionButton.Processing_result_disabled"
/> />
</el-form-item> </el-form-item>
@ -371,7 +371,7 @@
v-model="item.paymentUnit" v-model="item.paymentUnit"
placeholder="请输入支付单位" placeholder="请输入支付单位"
clearable clearable
:disabled="!PermissionButton.Submission_results" :disabled="!PermissionButton.Processing_result_disabled"
/> />
</el-form-item> </el-form-item>
<el-form-item label="理赔支付时间"> <el-form-item label="理赔支付时间">
@ -382,7 +382,7 @@
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="理赔支付时间" placeholder="理赔支付时间"
size="default" size="default"
:disabled="!PermissionButton.Submission_results" :disabled="!PermissionButton.Processing_result_disabled"
/> />
</el-form-item> </el-form-item>
<el-form-item label="支付方式"> <el-form-item label="支付方式">
@ -391,7 +391,7 @@
placeholder="请选择支付方式" placeholder="请选择支付方式"
style="width: 100%" style="width: 100%"
clearable clearable
:disabled="!PermissionButton.Submission_results" :disabled="!PermissionButton.Processing_result_disabled"
> >
<el-option <el-option
v-for="items in item.Paymentmethod" v-for="items in item.Paymentmethod"
@ -413,7 +413,7 @@
placeholder="请输入处理结果说明" placeholder="请输入处理结果说明"
clearable clearable
:autosize="{ minRows: 3, maxRows: 4 }" :autosize="{ minRows: 3, maxRows: 4 }"
:disabled="!PermissionButton.Submission_results" :disabled="!PermissionButton.Processing_result_disabled"
type="textarea" type="textarea"
/> />
</el-form-item> </el-form-item>
@ -1149,6 +1149,14 @@ const Arbitrationcompleted = () => {
} }
} }
}; };
// 处理结果是否可以填写
const Processingresultdisabled = () => {
if (['10', '20', '90'].includes($route.query.workOrderStatus)) {
return true;
}
};
// 权限按钮 // 权限按钮
const PermissionButton = computed(() => ({ const PermissionButton = computed(() => ({
Completed_submission: Completedsubmission(), //处理结果 Completed_submission: Completedsubmission(), //处理结果
@ -1156,6 +1164,7 @@ const PermissionButton = computed(() => ({
Save_results: Saveresults(), //处理结果保存 Save_results: Saveresults(), //处理结果保存
Arbitration_completed: Arbitrationcompleted(), //客服仲裁完结 Arbitration_completed: Arbitrationcompleted(), //客服仲裁完结
Processing_result_modification: Processingresultmodification(), //处理结果编辑提交 Processing_result_modification: Processingresultmodification(), //处理结果编辑提交
Processing_result_disabled: Processingresultdisabled(), //处理结果是否可以填写
})); }));
// 页面初始化数据 // 页面初始化数据
@ -1887,8 +1896,8 @@ const submitresults = async value => {
// 传递要刷新的菜单 // 传递要刷新的菜单
$useStore.commit('EDIT_REFRESHITEM', { title: 'aftersalesWorkOrder', status: true }); //要刷新的页面 $useStore.commit('EDIT_REFRESHITEM', { title: 'aftersalesWorkOrder', status: true }); //要刷新的页面
$useStore.commit('Customer_Menu', Number($route.query.RouteIndexs)); //要刷新的菜单 $useStore.commit('Customer_Menu', Number($route.query.RouteIndexs)); //要刷新的菜单
$router.push('/aftersales/aftersalesWorkOrder');
AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面 AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面
$router.push('/aftersales/aftersalesWorkOrder');
} }
}) })
.catch(error => { .catch(error => {

53
src/views/distribution/reservation/reservation.vue
Unescape View File

@ -41,17 +41,17 @@
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"> <div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd" <el-button type="primary" @click="handleAdd" v-if="permissionList.reservation_add"
>添加预约 >添加预约
</el-button> </el-button>
<el-button <el-button
type="danger" type="danger"
icon="el-icon-delete"
@click="handleConfirmReservations" @click="handleConfirmReservations"
plain plain
v-if="permissionList.reservation_enter_batch"
>批量确认 >批量确认
</el-button> </el-button>
<el-button type="danger" icon="el-icon-download" @click="handleExportInfo(1)" plain <el-button type="danger" icon="el-icon-download" @click="handleExportInfo(1)" plain v-if="permissionList.reservation_export"
>导出 >导出
</el-button> </el-button>
</div> </div>
@ -84,6 +84,7 @@
link link
icon="el-icon-view" icon="el-icon-view"
@click="viewReservation(slotProps.scope)" @click="viewReservation(slotProps.scope)"
v-if="permissionList.reservation_view"
>查看 >查看
</el-text> </el-text>
<el-text <el-text
@ -92,6 +93,7 @@
link link
icon="el-icon-view" icon="el-icon-view"
@click="editsolt(slotProps.scope)" @click="editsolt(slotProps.scope)"
v-if="permissionList.reservation_update"
>编辑 >编辑
</el-text> </el-text>
<el-text <el-text
@ -100,10 +102,11 @@
link link
icon="el-icon-view" icon="el-icon-view"
@click="cancelReservation(slotProps.scope)" @click="cancelReservation(slotProps.scope)"
v-if="permissionList.reservation_cancel"
>取消预约 >取消预约
</el-text> </el-text>
<el-text <el-text
v-if="this.queryA.reservationStatus === '1' ? true : false" v-if="(this.queryA.reservationStatus === '1') && permissionList.Confirm_appointment"
size="small" size="small"
@click="confirmReservation(slotProps.scope)" @click="confirmReservation(slotProps.scope)"
>确认预约 >确认预约
@ -134,28 +137,29 @@
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
<div class="avue-crud__left"> <div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd" <el-button type="primary" @click="handleAdd"
>添加预约 >添加预约
</el-button> </el-button>
<el-button type="danger" @click="handleStockUp()" plain>批量转备货 </el-button> <el-button type="danger" @click="handleStockUp()" v-if="permissionList.reservation_Stock_batch" plain>批量转备货 </el-button>
<el-button type="danger" @click="handleDeliverys" plain>批量转配送 </el-button> <el-button type="danger" @click="handleDeliverys" v-if="permissionList.reservation_delivery_batch" plain>批量转配送 </el-button>
<el-button type="danger" @click="batchPrintData" plain>批量打印 </el-button> <el-button type="danger" @click="batchPrintData" v-if="permissionList.reservation_print_batch" plain>批量打印 </el-button>
<el-button <el-button
type="danger" type="danger"
icon="el-icon-download" icon="el-icon-download"
@click="handleExportInfo(2)" @click="handleExportInfo(2)"
plain plain
v-if="permissionList.reservation_export"
>导出 >导出
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
icon="Plus" icon="Plus"
@click="handleAddPickerClipData" @click="handleAddPickerClipData"
v-if="orderStatus === 'all'" v-if="(orderStatus === 'all') && (permissionList.reservation_jionPickerclip)"
>加入挑单夹 >加入挑单夹
</el-button> </el-button>
<el-button <el-button
v-else v-if="!(orderStatus === 'all' && permissionList.reservation_jionPickerclip) && permissionList.remove_pickerclip"
type="primary" type="primary"
icon="Delete" icon="Delete"
@click="handleRemovePickerClipData" @click="handleRemovePickerClipData"
@ -190,6 +194,7 @@
link link
icon="el-icon-view" icon="el-icon-view"
@click="viewReservation(slotProps.scope)" @click="viewReservation(slotProps.scope)"
v-if="permissionList.reservation_view"
>查看 >查看
</el-text> </el-text>
<el-text <el-text
@ -198,6 +203,7 @@
link link
icon="el-icon-view" icon="el-icon-view"
@click="editsolt(slotProps.scope)" @click="editsolt(slotProps.scope)"
v-if="permissionList.reservation_update"
>编辑 >编辑
</el-text> </el-text>
<el-text <el-text
@ -206,20 +212,23 @@
link link
icon="el-icon-view" icon="el-icon-view"
@click="cancelReservation(slotProps.scope)" @click="cancelReservation(slotProps.scope)"
v-if="permissionList.reservation_cancel"
>取消预约 >取消预约
</el-text> </el-text>
<el-text <el-text
v-if="this.queryB.reservationStatus === '1' ? true : false" v-if="(this.queryB.reservationStatus === '1') && permissionList.Confirm_appointment"
size="small" size="small"
@click="confirmReservation(slotProps.scope)" @click="confirmReservation(slotProps.scope)"
>确认预约 >确认预约
</el-text> </el-text>
<el-text <el-text
size="small" size="small"
type="primary" type="primary"
link link
icon="el-icon-view" icon="el-icon-view"
@click="printData(slotProps.scope)" @click="printData(slotProps.scope)"
v-if="permissionList.reservation_print"
>打印 >打印
</el-text> </el-text>
</template> </template>
@ -266,7 +275,7 @@
:columnList="columnList" :columnList="columnList"
v-model="columnList" v-model="columnList"
></edittablehead> ></edittablehead>
<el-dialog v-model="dialogFormCustomer" v-loading="" title="指派叉车"> <el-dialog v-model="dialogFormCustomer" title="指派叉车">
<el-form :model="info"> <el-form :model="info">
<el-form-item label="备货时间:"> <el-form-item label="备货时间:">
<el-date-picker v-model="info.stockupDate" type="date" placeholder="选择日期"> <el-date-picker v-model="info.stockupDate" type="date" placeholder="选择日期">
@ -905,6 +914,26 @@ export default {
}); });
return ids.join(','); return ids.join(',');
}, },
permissionList() {
console.log(this.permission,'permission');
return {
reservation_add: this.validData(this.permission.reservation_add, false),//添加预约
reservation_export: this.validData(this.permission.reservation_export, false),//导出
reservation_enter_batch: this.validData(this.permission.reservation_enter_batch, false),//批量确认
reservation_Stock_batch: this.validData(this.permission.reservation_Stock_batch, false),//批量转备货
reservation_delivery_batch: this.validData(this.permission.reservation_delivery_batch, false),//批量转配送
reservation_print_batch: this.validData(this.permission.reservation_print_batch, false),//批量打印
reservation_cancel: this.validData(this.permission.reservation_cancel, false),//取消预约
reservation_update: this.validData(this.permission.reservation_update, false),//编辑
reservation_view: this.validData(this.permission.reservation_view, false),//查看
reservation_print: this.validData(this.permission.reservation_print, false),//打印
reservation_jionPickerclip: this.validData(this.permission.reservation_jionPickerclip, false),//加入挑单夹
Confirm_appointment: this.validData(this.permission.Confirm_appointment, false),//确认预约
remove_pickerclip: this.validData(this.permission.remove_pickerclip, false),//移除调单夹
};
},
}, },
methods: { methods: {
/** /**

1
src/views/distribution/turndelivery/deliveryMarket.vue
Unescape View File

@ -1899,6 +1899,7 @@ export default {
background-color: #ffffff; background-color: #ffffff;
// border-bottom: 1px solid rgb(228, 228, 228); // border-bottom: 1px solid rgb(228, 228, 228);
padding-left: 10px; padding-left: 10px;
justify-content: flex-start;
> .buts { > .buts {
padding: 10px 20px; padding: 10px 20px;

Write Preview
Loading…
Cancel
Save