Browse Source

修复已知bug,修复司机

dev
马远东 4 months ago
parent
commit
b9bc161767
  1. 6
      src/views/aftersales/aftersalesWorkOrder.vue
  2. 11
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  3. 4
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  4. 75
      src/views/aftersales/aftersalesWorkOrderend.vue
  5. 2
      src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue

6
src/views/aftersales/aftersalesWorkOrder.vue

@ -330,7 +330,7 @@
</el-form> </el-form>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="BatchReturn.BatchReturn.dialogReturn = false">取消</el-button> <el-button @click="BatchReturn.dialogReturn = false">取消</el-button>
<el-button type="primary" @click="ConfirmReturn()" :disabled="BatchReturn.repulseloading"> <el-button type="primary" @click="ConfirmReturn()" :disabled="BatchReturn.repulseloading">
提交 提交
</el-button> </el-button>
@ -2528,6 +2528,8 @@ const BatchReturnResults = () => {
}); });
return; return;
} }
BatchReturn.value.BatchFrom.txt = ''
BatchReturn.value.BatchFrom.businessDepartment = []
BatchReturn.value.dialogReturn = true; // BatchReturn.value.dialogReturn = true; //
}; };
const ConfirmReturn = async () => { const ConfirmReturn = async () => {
@ -2994,7 +2996,7 @@ const JExportAll = async dataID => {
} }
} }
:deep(.plAllret) { :deep(.plAllret) {
height: 30%; height: 40%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.el-select { .el-select {

11
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -512,7 +512,7 @@
v-model="item.description" v-model="item.description"
placeholder="请输入说明" placeholder="请输入说明"
type="textarea" type="textarea"
:autosize="{ minRows: 1, maxRows: 4 }" :autosize="{ minRows: 1, maxRows: 1 }"
clearable clearable
/> />
</el-form-item> </el-form-item>
@ -1918,11 +1918,19 @@ const TabactiveClick = (a, b) => {
} }
} }
.responsibilities { .responsibilities {
width: 100%;
:deep(.el-tabs__content) {
width: 100%;
}
:deep(.el-upload-dragger) { :deep(.el-upload-dragger) {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
:deep(.el-tab-pane) {
width: 100%;
}
// .el-dialog{ // .el-dialog{
// height: 40% !important; // height: 40% !important;
// img{ // img{
@ -1930,6 +1938,7 @@ const TabactiveClick = (a, b) => {
// } // }
// } // }
.el_responsibilities { .el_responsibilities {
width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;

4
src/views/aftersales/aftersalesWorkOrderInfo.vue

@ -259,7 +259,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-tabs type="border-card" class="el_nint" v-if="FangAddList.length"> <el-tabs type="border-card" class="el_nint" v-if="Indexform.discoveryNode != 3">
<el-tab-pane> <el-tab-pane>
<template #label> <template #label>
<span class="custom-tabs-label"> <span class="custom-tabs-label">
@ -598,7 +598,7 @@
> >
<el-button <el-button
type="primary" type="primary"
v-if="PermissionButton.information_editing" v-if="PermissionButton.information_editing && Indexform.discoveryNode != 3"
@click="EditInformation" @click="EditInformation"
>修改内部责任划分</el-button >修改内部责任划分</el-button
> >

75
src/views/aftersales/aftersalesWorkOrderend.vue

@ -44,7 +44,7 @@
</el-form-item> </el-form-item>
</div> </div>
<el-tabs type="border-card" class="PackageInformation"> <el-tabs type="border-card" class="PackageInformation">
<el-tab-pane label="包件信息"> <el-tab-pane :label="`包件信息-总件数${PackageInfo.length}`">
<div class="ResponsibilityBoxS"> <div class="ResponsibilityBoxS">
<div class="el_btbox" v-for="(item, index) in PackageInfo" :key="index"> <div class="el_btbox" v-for="(item, index) in PackageInfo" :key="index">
<div class="leftbox"> <div class="leftbox">
@ -79,9 +79,9 @@
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div class="NumTotal"> <!-- <div class="NumTotal">
<span>总件数:{{ PackageInfo.length }}</span> <span>总件数:{{ PackageInfo.length }}</span>
</div> </div> -->
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -177,16 +177,18 @@
<el-form-item <el-form-item
label="责任方" label="责任方"
class="processor_box" class="processor_box"
style="width: 42%"
v-if="displaySettings.processorEntityList" v-if="displaySettings.processorEntityList"
> >
<el-select <el-select
v-model="endFrom.processorEntityList" v-model="endFrom.processorEntityList"
placeholder="请选择责任方" placeholder="请选择责任方"
disabled disabled
multiple multiple
filterable filterable
clearable clearable
collapse-tags-tooltip
collapse-tags
> >
<el-option <el-option
v-for="item in warehouseData" v-for="item in warehouseData"
@ -201,7 +203,6 @@
class="processor_box" class="processor_box"
label="处理方" label="处理方"
v-if="displaySettings.processor" v-if="displaySettings.processor"
style="width: 42%"
> >
<el-select <el-select
v-model="endFrom.processor" v-model="endFrom.processor"
@ -211,6 +212,8 @@
default-first-option default-first-option
:reserve-keyword="false" :reserve-keyword="false"
disabled disabled
collapse-tags-tooltip
collapse-tags
> >
<el-option <el-option
v-for="item in warehouseData" v-for="item in warehouseData"
@ -224,6 +227,7 @@
<el-form-item <el-form-item
style="min-width: 100%" style="min-width: 100%"
label="调查经过" label="调查经过"
class="inpuit_Investigationprocess"
v-if="displaySettings.investigationProcess" v-if="displaySettings.investigationProcess"
> >
<el-input v-model="endFrom.investigationProcess" disabled /> <el-input v-model="endFrom.investigationProcess" disabled />
@ -233,7 +237,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-tabs type="border-card" class="Responsible_box" v-if="FangAddList.length"> <el-tabs type="border-card" class="Responsible_box" v-if="endFrom.discoveryNode !='3'">
<el-tab-pane label="内部责任划分"> <el-tab-pane label="内部责任划分">
<div class="ResponsibilityBox"> <div class="ResponsibilityBox">
<div></div> <div></div>
@ -330,7 +334,7 @@
<div class="selector"> <div class="selector">
<div class="el-form-item selector"> <div class="el-form-item selector">
<el-tabs type="border-card" style="width: 100%"> <el-tabs type="border-card" style="width: 100%">
<el-tab-pane label="处理结果"> <el-tab-pane :label="`处理结果-总金额${TotalClaimAmount || 0}`">
<el-select <el-select
v-model="endFrom.result" v-model="endFrom.result"
multiple multiple
@ -420,9 +424,9 @@
type="textarea" type="textarea"
/> />
</el-form-item> </el-form-item>
<div class="el_tool"> <!-- <div class="el_tool">
<span>总金额:{{ TotalClaimAmount }}</span> <span>总金额:{{ TotalClaimAmount }}</span>
</div> </div> -->
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -722,6 +726,9 @@
multiple multiple
filterable filterable
default-first-option default-first-option
collapse-tags-tooltip
collapse-tags
:max-collapse-tags="3"
:reserve-keyword="false" :reserve-keyword="false"
placeholder="请选择处理方" placeholder="请选择处理方"
@change="Msgresponsibility" @change="Msgresponsibility"
@ -3050,7 +3057,6 @@ const AppealEstablished = () => {
height: 300px !important; height: 300px !important;
} }
.Improveinformation { .Improveinformation {
margin-top: 32px;
width: 100%; width: 100%;
:deep(.custom-tabs-label) { :deep(.custom-tabs-label) {
@ -3072,6 +3078,9 @@ const AppealEstablished = () => {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
} }
:deep(.el-tabs__content){
padding: 0 10px;
}
} }
.payanindemnity { .payanindemnity {
display: flex; display: flex;
@ -3437,16 +3446,23 @@ const AppealEstablished = () => {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
.PackageInformation { :deep(.PackageInformation) {
width: 100%; width: 100%;
margin-bottom: 10px; margin-bottom: 4px;
.is-active{
font-weight: bold;
}
.el-tabs__content{
padding: 0 12px;
}
} }
.ResponsibilityBoxS { .ResponsibilityBoxS {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-bottom: 10px; margin-bottom:2px;
justify-content: flex-start; justify-content: flex-start;
.leftbox { .leftbox {
width: 100%; width: 100%;
display: flex; display: flex;
@ -3480,7 +3496,7 @@ const AppealEstablished = () => {
} }
.el_btbox { .el_btbox {
display: flex; display: flex;
margin-top: 10px; margin-top: 2px;
} }
} }
.NumTotal { .NumTotal {
@ -3623,22 +3639,26 @@ const AppealEstablished = () => {
:deep(.is-active) { :deep(.is-active) {
font-weight: bold; font-weight: bold;
} }
:deep(.el-tabs__content){
padding: 0 12px;
}
.el_information { .el_information {
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
:deep(.el-form-item) { :deep(.el-form-item) {
width: 16%; width: 19%;
height: auto; height: auto;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
flex-direction: column; flex-direction: row;
flex: none; flex: none;
margin: 2px 0;
margin-right: 4px; margin-right: 4px;
margin-bottom: 0;
.el-form-item__label { .el-form-item__label {
margin-left: 0; margin-left: 0;
padding-right: 2px;
} }
.el-form-item__content { .el-form-item__content {
width: 100% !important; width: 100% !important;
@ -3653,6 +3673,25 @@ const AppealEstablished = () => {
.el-select { .el-select {
width: 100; width: 100;
} }
.inpuit_Investigationprocess{
display: flex;
flex-direction: row !important;
margin: 2px 0;
}
.processor_box{
display: flex;
flex-direction: row !important;
margin: 2px 0;
}
:deep(.el_Responsibilityhandling){
width: 100%;
display: flex;
margin: 3px 0;
justify-content: space-between;
.el-form-item{
margin: 0;
}
}
} }
:deep(.el_Processingresults) { :deep(.el_Processingresults) {
display: flex; display: flex;
@ -3707,7 +3746,7 @@ const AppealEstablished = () => {
} }
:deep(.Responsible_box) { :deep(.Responsible_box) {
width: 100%; width: 100%;
margin-top: 10px; margin-top: 4px;
.is-active { .is-active {
font-weight: bold; font-weight: bold;
} }

2
src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue

@ -464,7 +464,7 @@ const Getdriver = async () => {
if (res.data.data.length) { if (res.data.data.length) {
res.data.data.forEach(item => { res.data.data.forEach(item => {
driver.value.push({ driver.value.push({
value: item.id, value: item.userId,
label: item.name, label: item.name,
}); });
}); });

Loading…
Cancel
Save