Browse Source

最大值计算修复,新增关闭当前页面

pre-production
马远东 1 year ago
parent
commit
97e88aa82d
  1. 112
      src/views/aftersales/aftersalesWorkOrderAdd.vue

112
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -12,7 +12,7 @@
ref="IndexForm" ref="IndexForm"
:rules="rules" :rules="rules"
> >
<el-form-item label="异常类型" prop="workOrderType"> <el-form-item label="异常类型" prop="workOrderType" class="el_inputTop">
<el-select <el-select
v-model="Indexform.workOrderType" v-model="Indexform.workOrderType"
clearable clearable
@ -28,7 +28,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="发现节点" prop="discoveryNode"> <el-form-item label="发现节点" prop="discoveryNode" class="el_inputTop">
<el-select <el-select
v-model="Indexform.discoveryNode" v-model="Indexform.discoveryNode"
clearable clearable
@ -44,7 +44,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="异常工单号"> <el-form-item label="异常工单号" class="el_inputTop">
<el-input <el-input
v-model="Indexform.workOrderNumber" v-model="Indexform.workOrderNumber"
disabled disabled
@ -61,6 +61,10 @@
<div class="leftbox"> <div class="leftbox">
<div class="maxBox"> <div class="maxBox">
<el-form-item label="包条码"> <el-form-item label="包条码">
<el-tooltip
:content="item.packageCode ? item.packageCode : '包条码'"
placement="top"
>
<el-input <el-input
v-model="item.packageCode" v-model="item.packageCode"
placeholder="请输入包条码" placeholder="请输入包条码"
@ -68,24 +72,31 @@
:rows="2" :rows="2"
@change="ChangePackageInfo(item.packageCode, index)" @change="ChangePackageInfo(item.packageCode, index)"
/> />
</el-tooltip>
</el-form-item> </el-form-item>
</div> </div>
<div class="maxBox"> <div class="maxBox">
<el-form-item label="订单自编号"> <el-form-item label="订单自编号">
<el-input v-model="item.orderCode" placeholder="请输入订单自编号" clearable /> <el-tooltip :content="item.orderCode" placement="top">
<el-input v-model="item.orderCode" placeholder="请输入订单自编号" />
</el-tooltip>
</el-form-item> </el-form-item>
</div> </div>
<div class="maxBox"> <div class="maxBox">
<el-form-item label="运单号"> <el-form-item label="运单号">
<el-input v-model="item.waybillNumber" placeholder="请输入运单号" clearable /> <el-tooltip :content="item.waybillNumber" placement="top">
<el-input v-model="item.waybillNumber" placeholder="请输入运单号" />
</el-tooltip>
</el-form-item> </el-form-item>
</div> </div>
<div class="maxBox"> <div class="maxBox">
<el-form-item label="品牌"> <el-form-item label="品牌">
<el-input v-model="item.brandName" placeholder="请输入品牌" clearable /> <el-tooltip :content="item.brandName" placement="top">
<el-input v-model="item.brandName" placeholder="请输入品牌" />
</el-tooltip>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -191,11 +202,11 @@
</el-form-item> </el-form-item>
<el-form-item label="一级品" prop="first"> <el-form-item label="一级品" prop="first">
<el-input v-model="Indexform.first" placeholder="请输入一级品类" clearable /> <el-input v-model="Indexform.first" placeholder="请输入一级品类" />
</el-form-item> </el-form-item>
<el-form-item label="二级品" prop="secondary"> <el-form-item label="二级品" prop="secondary">
<el-input v-model="Indexform.secondary" placeholder="请输入二级品类" clearable /> <el-input v-model="Indexform.secondary" placeholder="请输入二级品类" />
</el-form-item> </el-form-item>
<el-form-item label="入库时间" prop="warehousingTime" v-if="groundlineType == 4"> <el-form-item label="入库时间" prop="warehousingTime" v-if="groundlineType == 4">
@ -209,7 +220,7 @@
</el-form-item> </el-form-item>
<!-- 必填 --> <!-- 必填 -->
<el-form-item label="运单商场" prop="waybillMall"> <el-form-item label="运单商场" prop="waybillMall">
<el-input v-model="Indexform.waybillMall" placeholder="请输入运单商场" clearable /> <el-input v-model="Indexform.waybillMall" placeholder="请输入运单商场" />
</el-form-item> </el-form-item>
<el-form-item label="合作模式"> <el-form-item label="合作模式">
@ -266,7 +277,7 @@
<el-form-item> </el-form-item> <el-form-item> </el-form-item>
<el-tabs type="border-card"> <el-tabs type="border-card" class="el_nint">
<el-tab-pane label="内部责任划分"> <el-tab-pane label="内部责任划分">
<div class="ResponsibilityBox"> <div class="ResponsibilityBox">
<div><el-button type="primary" @click="responsibleParty"> 添加信息 </el-button></div> <div><el-button type="primary" @click="responsibleParty"> 添加信息 </el-button></div>
@ -339,9 +350,9 @@
v-model="item.responsibilityRatio" v-model="item.responsibilityRatio"
placeholder="占比 " placeholder="占比 "
:min="0" :min="0"
:max="ProportionMax" :max="item.ProportionMax"
v-percentage v-percentage
@change="CompanyProportionInput(item)" @input="CompanyProportionInput(item)"
/> />
<span>%</span> <span>%</span>
</el-form-item> </el-form-item>
@ -354,12 +365,7 @@
<div class="maxBox"> <div class="maxBox">
<el-form-item label="说明"> <el-form-item label="说明">
<el-input <el-input v-model="item.description" placeholder="请输入说明 " :rows="2" />
v-model="item.description"
placeholder="请输入说明 "
clearable
:rows="2"
/>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
@ -570,6 +576,8 @@
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { ElMessageBox } from 'element-plus'; import { ElMessageBox } from 'element-plus';
import { useRouter, useRoute } from 'vue-router'; import { useRouter, useRoute } from 'vue-router';
import { useStore } from 'vuex';
const $store = useStore();
import { getDictionaryBiz } from '@/api/system/dict'; // import { getDictionaryBiz } from '@/api/system/dict'; //
import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; // import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //
import { import {
@ -625,7 +633,7 @@ const amplifyurl = ref(''); //当前点击的图片
const amplifysrcList = ref([]); // const amplifysrcList = ref([]); //
const ProcessingList = ref([]); // const ProcessingList = ref([]); //
const Paymentmethod = ref([]); // const Paymentmethod = ref([]); //
const ProportionMax=ref(100);// const ProportionMax = ref(100); //
const PackageInfo = ref([ const PackageInfo = ref([
// //
@ -639,6 +647,7 @@ const FangAddList = ref([
responsibilityRatio: '', responsibilityRatio: '',
description: '', description: '',
tripartite: '', tripartite: '',
ProportionMax: 100,
}, },
]); ]);
// //
@ -942,17 +951,25 @@ const PackagRemoval = val => {
Statistics(); Statistics();
}; };
// //
const responsibleParty = () => { const responsibleParty = () => {
let sum = 0;
FangAddList.value.forEach(item => {
console.log(item.responsibilityRatio, '当前比例');
sum += item.responsibilityRatio;
});
console.log(sum, '当前总和');
let max = 100 - sum;
console.log('添加了责任方');
FangAddList.value.push({ FangAddList.value.push({
businessName: '', businessName: '',
personResponsibleName: '', personResponsibleName: '',
tripartite: '', tripartite: '',
responsibilityRatio: '', responsibilityRatio: '',
description: '', description: '',
ProportionMax: max,
}); });
console.log(max, '当前最大值');
}; };
// //
const ResponsibilityRemoval = val => { const ResponsibilityRemoval = val => {
@ -969,40 +986,29 @@ const TopChange = val => {
} }
}; };
//
const CalculateTheproportion=()=>{
console.log( ProportionMax.value,'当前最大值');
console.log( companyProportion.value,'当前公司占比');
ProportionMax.value= ProportionMax.value - companyProportion.value
console.log( ProportionMax.value,'当前还剩余的值');
}
// //
const CompanyProportion = (item) => { const CompanyProportion = val => {
setTimeout(() => { setTimeout(() => {
console.log(FangAddList.value, ' FangAddList.value'); console.log(FangAddList.value, ' FangAddList.value');
let proportion = 0; // let proportion = 0; //
FangAddList.value.forEach(item => { FangAddList.value.forEach(item => {
console.log(item.responsibilityRatio);
proportion += Number(item.responsibilityRatio); proportion += Number(item.responsibilityRatio);
ProportionMax.value=ProportionMax.value-Number(item.responsibilityRatio)
}); });
if(!ProportionMax.value){ // companyProportion.value
return companyProportion.value = 100 - proportion;
}else{
companyProportion.value = companyProportion.value-proportion
}
let sum = 0;
FangAddList.value.forEach(item => {
console.log(item.responsibilityRatio, '当前比例');
sum += item.responsibilityRatio;
});
let max = 100 - sum;
val.ProportionMax = max;
}, 0); }, 0);
}; };
// //
const CompanyProportionInput = (item) => { const CompanyProportionInput = item => {
CompanyProportion(item); CompanyProportion(item);
}; };
// //
@ -1024,7 +1030,6 @@ const rules = reactive({
}); });
// //
const ConfirmForm = () => { const ConfirmForm = () => {
console.log(rules, '表单校验规则');
IndexForm.value.validate(valid => { IndexForm.value.validate(valid => {
if (valid) { if (valid) {
// //
@ -1286,12 +1291,13 @@ const ConfirmForm = () => {
type: 'success', type: 'success',
}); });
Indexform.value = {}; // Indexform.value = {}; //
$store.commit('DEL_TAG_CURRENT'); //
$router.push('/aftersales/aftersalesWorkOrder'); // $router.push('/aftersales/aftersalesWorkOrder'); //
} }
}) })
.catch(res => { .catch(res => {
console.log(res, '错误信息'); console.log(res, '错误信息');
ElMessage.error('提交失败'); ElMessage.error('提交失败,请刷新页面重新尝试');
}); });
} else { } else {
console.log('表单验证失败'); console.log('表单验证失败');
@ -1299,7 +1305,6 @@ const ConfirmForm = () => {
message: '请填完整信息', message: '请填完整信息',
type: 'warning', type: 'warning',
}); });
return false;
} }
}); });
}; };
@ -1472,7 +1477,6 @@ const historicalPackages = val => {
}; };
// //
const HistoricalPackage = val => { const HistoricalPackage = val => {
let info = HistoricalPackageList.value.find(obj => obj.workOrderId == val); let info = HistoricalPackageList.value.find(obj => obj.workOrderId == val);
console.log(info); console.log(info);
PackageInfo.value[HistorIndex.value].orderCode = info.orderCode; // PackageInfo.value[HistorIndex.value].orderCode = info.orderCode; //
@ -1744,14 +1748,14 @@ const isShowFormItem2 = computed(() => {
} }
:deep(.PackageInformation) { :deep(.PackageInformation) {
margin-bottom: 10px; margin-bottom: 10px;
width: 97%; width: 100%;
border-left: none; border-left: none;
.el-tabs__header { .el-tabs__header {
} }
} }
.NumTotal { .NumTotal {
width: 30%; width: 30%;
margin-top: 36px; margin-top: 10px;
display: flex; display: flex;
align-items: center; align-items: center;
span { span {
@ -1887,12 +1891,12 @@ const isShowFormItem2 = computed(() => {
border: 1px solid #bfbfbf; border: 1px solid #bfbfbf;
margin-left: 2px; margin-left: 2px;
border-radius: 4px; border-radius: 4px;
width: 100px;
font-size: 14px; font-size: 14px;
padding: 10px; padding: 10px;
cursor: pointer; cursor: pointer;
width: 100px; width: 140px;
margin: 0 10px; margin: 0 10px;
overflow: hidden;
} }
.Paymentname:hover { .Paymentname:hover {
border: 1px solid #172e60; border: 1px solid #172e60;
@ -1927,4 +1931,10 @@ const isShowFormItem2 = computed(() => {
font-weight: normal; font-weight: normal;
} }
} }
.el_nint {
width: 100%;
}
:deep(.el_inputTop) {
margin-bottom: 0 !important;
}
</style> </style>

Loading…
Cancel
Save