@@ -536,6 +558,7 @@
type="textarea"
:autosize="{ minRows: 5, maxRows: 4 }"
placeholder="请输入仲裁原因"
+ :disabled="Processingresults"
/>
@@ -578,7 +601,9 @@
提交
@@ -696,6 +721,7 @@ import {
$_modifyData,
$_shippingInformation,
$_updateCompletionEnd,
+ $_addProcessingResults,
} from '@/api/aftersales/aftersalesWorkOrder';
import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
import { AddressClosed } from '@/utils/util';
@@ -714,7 +740,7 @@ const Indexform = ref({
decreaseImageEntityList: [], //处理好的图片数据
}); //首页新增表单
const IndexException = ref([]); //异常类型下拉选择
-const editloading=ref(false);//页面加载效果
+const editloading = ref(false); //页面加载效果
const ProcessingList = ref([]); //处理结果已经选择的列表
const DiscoveringNodes = ref([]); //发现节点下拉选择
const warehouseData = ref([]); //处理方
@@ -766,6 +792,7 @@ const formData = ref({}); // 存储修改过的数据
const dialogImgList = ref(false); //图片预览弹窗
const amplifyurl = ref(''); //当前点击的图片
const amplifysrcList = ref([]); //图片循环列表
+const Processingresults = ref(false); //理赔是否可以编辑
// ref 用于跟踪哪些字段被修改过
// 当字段改变时标记它为已修改
@@ -812,33 +839,20 @@ const FangAddList = ref([
// 提货责任方
const responsible = ref([
{
- value: '1',
+ value: 1,
label: '工厂',
},
{
- value: '2',
+ value: 2,
label: '外包搬运',
},
{
- value: '3',
+ value: 3,
label: '物流',
},
]);
-
-const DeliveryDriver = ref([
- {
- value: '0',
- label: '兰溪',
- },
- {
- value: '1',
- label: '李华',
- },
- {
- value: '2',
- label: '唐飞',
- },
-]);
+// 司机信息
+const DeliveryDriver = ref([]);
// 图片列表
const fileList = ref([]);
// 字典公共函数
@@ -853,7 +867,33 @@ function updateDictionary(targetArray, dictionaryType) {
});
});
}
-
+// 车次号自动带出时间司机
+function DeliveryTrainnumber() {
+ if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) {
+ Indexform.value.deliveryTime = null;
+ Indexform.value.deliveryDriver = '';
+ DeliveryDriver.value = [];
+ }
+ if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) {
+ return;
+ }
+ let data = {
+ trainNumber: Indexform.value.trainNumber,
+ taskTime: Indexform.value.deliveryTime,
+ };
+ data.current = 1; //页码
+ data.size = 200; //条数
+ $_shippingInformation(data).then(res => {
+ console.log(res, '查询返回值');
+ DeliveryDriver.value = res.data.data.records; //获取到的信息
+ // 如果是精确搜索自动带入日期
+ if (res.data.data.records.length == 1 && groundlineType.value != 3) {
+ Indexform.value.deliveryTime = res.data.data.records[0].taskTime; //配送时间
+ Indexform.value.deliveryDriver = res.data.data.records[0].id; //配送人
+ // Indexform.value.trainNumber = res.data.data.records[0].trainNumber; //车次号
+ }
+ });
+}
// 图片上传必须携带TOKEN
const headers = computed(() => {
return { 'Blade-Auth': 'Bearer ' + getToken() };
@@ -923,7 +963,10 @@ const onLoad = () => {
Appealeditor.value = $route.query.Appealeditor; //申诉编辑
console.log(Appealeditor.value, '申诉编辑状态');
}
-
+ // 判断是否为理赔金未出编辑
+ if ($route.query.Processingresults) {
+ Processingresults.value = true;
+ }
console.log(RouterState.value, '路由状态');
getDictionaryBiz('result_handling').then(res => {
console.log(res, '发现环节');
@@ -945,6 +988,11 @@ const onLoad = () => {
handle(); //处理方和责任方信息
$_getInfo({ id: $route.query.id }).then(res => {
+ if(res.data.data.discoveryNode=='1'){
+ groundlineType.value = '1'
+ }else{
+ groundlineType.value = 'null'
+ }
oldData.value = JSON.parse(JSON.stringify(res.data.data));
console.log(oldData.value, '旧数据');
console.log(res, '回显返回值参数');
@@ -978,6 +1026,11 @@ const onLoad = () => {
unPackageInfo.value = JSON.parse(JSON.stringify(PackageInfo.value)); //拷贝一份旧的包件信息
console.log(unPackageInfo.value, '包件信息');
+
+ let factorydata = res.data.data.personResponsibleVOS.find(item => item.typesOf);
+ // if (factorydata.typesOf) {
+ // groundlineType.value = true; //切换处理方模式
+ // }
FangAddList.value = res.data.data.personResponsibleVOS.map(res => {
ResponsiblepartyData.value.push(res);
@@ -1042,6 +1095,7 @@ const onLoad = () => {
text: item.compensationMethodName,
compensationTime: item.compensationTime,
paymentUnit: item.paymentUnit, //支付单位
+ id:item.id, //id
};
}
);
@@ -1139,6 +1193,31 @@ const onLoad = () => {
});
};
onLoad(); //初始化程序
+
+// 统计包件个数
+const Statistics = () => {
+ // 订单统计包件个数
+ if (identifying.value == 1) {
+ Indexform.value.number = 0;
+ PackageInfo.value.map(res => {
+ if (res.packageCode) {
+ Indexform.value.number++;
+ }
+ });
+ } else {
+ // 零担统计包件个数
+ Indexform.value.number = 0;
+ PackageInfo.value.map(res => {
+ console.log(res);
+ if (res.waybillNumber) {
+ Indexform.value.number++;
+ }
+ });
+ }
+};
+
+
+
// 异常类型事件
const abnormalChange = val => {
console.log(val, '异常事件类型');
@@ -1215,7 +1294,7 @@ const AddPackage = () => {
packageCode: '',
orderCode: '',
waybillNumber: '',
- state: 1,
+ state: 0,
brandName: '',
});
};
@@ -1263,21 +1342,25 @@ const TopChange = val => {
};
const changeProcessingResults = val => {
- // 首先删除取消的项目
+ console.log(val,'当前点击的参数');
+ console.log(ProcessingList.value,'当前的列表');
+ // 首先删除取消的项目
+ console.log(val[val.length-1]);
ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1));
-
// 然后添加或保持新的项目
- val.forEach(num => {
- let newItem = {
+console.log(val,'当前状态');
+ console.log(num,'当前参数');
+ newItem = {
input: 0,
min: 0,
max: 9999999999999,
- state: num + 1,
+ state: num,
payment: '',
text: '',
compensationTime: '',
paymentUnit: '',
};
+
// 根据num为newItem的name字段赋值
switch (num) {
case '1':
@@ -1309,8 +1392,8 @@ const changeProcessingResults = val => {
if (!ProcessingList.value.some(item => item.state === newItem.state)) {
ProcessingList.value.push(newItem);
console.log(`添加：${newItem.name}`);
- }
- });
+ }
+
};
// 支付方式选择
@@ -1354,6 +1437,10 @@ const PaymentConfirmation = val => {
// 添加赔款方
const AddCompensation = () => {
+ if (!Processingresults.value) {
+ // 表示此刻为理赔编辑状态，只能操作处理结果
+ return;
+ }
console.log('添加赔款方');
let som = 1;
CompensationParty.value.forEach(item => {
@@ -1365,6 +1452,10 @@ const AddCompensation = () => {
};
// 添加受款方
const AddPayee = () => {
+ if (!Processingresults.value) {
+ // 表示此刻为理赔编辑状态，只能操作处理结果
+ return;
+ }
let som = 1;
CompensationParty.value.forEach(item => {
if (item.state == 1) {
@@ -1398,6 +1489,10 @@ const amountMoney = () => {
};
// 移除按钮
const payremove = (state, val, data) => {
+ if (!Processingresults.value) {
+ // 表示此刻为理赔编辑状态，只能操作处理结果
+ return;
+ }
console.log(state, '当前移除按钮的状态');
// const completionRecipientEntityListData=ref([]);//受款方拷贝
// const completionRecordEntitiesData=ref([]);//赔款方拷贝
@@ -1776,6 +1871,77 @@ const ConfirmForm = () => {
// 客服仲裁完结
const Arbitrationcompleted = () => {
+ if (Processingresults.value) {
+ // 理赔金额未出编辑
+ // 处理结果编辑
+ let data = {
+ id: $route.query.id,
+ // workOrderId: $route.query.id, //异常工单ID
+ resultDescription:Indexform.value.resultDescription,//处理结果说明
+ aftersalesProcessingResultsDTO: {
+ resultDescription:Indexform.value.resultDescription,//处理结果说明
+ id:$route.query.subId,
+ },
+ };
+ data.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value
+ .map(item => {
+ console.log(item);
+ let match = ProcessingResults.value.find(element => element.dictValue == item.name);
+ if (match) {
+ let paymentMethodMatch = Paymentmethod.value.find(
+ paymentMethod => paymentMethod.dictKey == item.payment
+ );
+ return {
+ resultType: match.dictKey, //赔方式的key
+ money: item.input, //金额
+ typesOf: 1, //固定参数
+ compensationMethod: paymentMethodMatch ? paymentMethodMatch.dictKey : '',
+ compensationMethodName: paymentMethodMatch ? paymentMethodMatch.dictValue : '',
+ resultName: item.name, //处理结果名字
+ paymentUnit: item.paymentUnit, //支付单位
+ id:item.id, //id
+ compensationTime:item.compensationTime,//时间
+ };
+ } else {
+ return null;
+ }
+ })
+ .filter(item => item !== null);
+
+ // 总金额
+ let sum = 0; //金额总计
+ for (let i = 0; i < ProcessingList.value.length; i++) {
+ sum = computeNumber(sum, '+', ProcessingList.value[i].input).result;
+ }
+ data.aftersalesProcessingResultsDTO.money = sum; //金额汇总
+ data.aftersalesProcessingResultsDTO['resultType'] = ProcessingList.value
+ .map(item => item.name)
+ .join(','); //处理结果说明文字拼接
+ data.aftersalesProcessingResultsDTO['compensationMethod'] = ProcessingList.value
+ .map(item => item.text)
+ .join(',');
+ console.log(data, '编辑后的数据');
+ $_addProcessingResults(data).then(res=>{
+ console.log(res, '理赔编辑成功返回值');
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ if (res.data.code == 200) {
+ $router.push({
+ path: '/aftersales/aftersalesWorkOrder',
+ });
+ AddressClosed('/aftersales/aftersalesWorkOrdermodify'); //关闭当前页面
+ }
+ }) .catch(error => {
+ ElMessage({
+ message: res.data.msg,
+ type: 'success',
+ });
+ });
+ return;
+ }
+// 申诉只修改完结信息
if (Appealeditor.value == 'appeal') {
// 表示当前是申诉状态,只修改完结信息
let data = {
@@ -1822,9 +1988,8 @@ const Arbitrationcompleted = () => {
};
});
console.log(data, '处理好的值');
- editloading.value=true,//开启加载效果
- $_updateCompletionEnd(data)
- .then(res => {
+ editloading.value = true; //开启加载效果
+ $_updateCompletionEnd(data).then(res => {
console.log(res, '完结编辑');
if (res.data.code == 200) {
ElMessage({
@@ -1832,14 +1997,15 @@ const Arbitrationcompleted = () => {
type: 'success',
});
$store.commit('DEL_TAG_CURRENT'); //关闭当前页面
- $router.push({//跳转到首页
+ $router.push({
+ //跳转到首页
path: '/aftersales/aftersalesWorkOrder',
});
- editloading.value=false;//关闭加载效果
+ editloading.value = false; //关闭加载效果
}
})
.catch(res => {
- editloading.value=false;//关闭加载效果
+ editloading.value = false; //关闭加载效果
});
return;
// 下面不执行
@@ -1851,7 +2017,7 @@ const Arbitrationcompleted = () => {
completionRecordEntities: [], //处理结果赔款方
reasonArbitration: Indexform.value.arbitrate, //仲裁原因
aftersalesProcessingResultsDTO: {
- workOrderId: '', //异常工单ID
+ workOrderId: $route.query.id, //异常工单ID
},
assignList: [],
};
@@ -1866,7 +2032,6 @@ const Arbitrationcompleted = () => {
money: Number(item.num), // 金额
reasonArbitration: item.reason, // 说明
workOrderId: $route.query.id, // 异常工单
- //warehouseId: $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, // 仓库ID
warehouseId: item.warehouseId, //仓库ID
personResponsibleList: item.personResponsibleList, //责任人
};
@@ -1911,6 +2076,7 @@ const Arbitrationcompleted = () => {
compensationMethodName: paymentMethodMatch ? paymentMethodMatch.dictValue : '',
resultName: item.name, //处理结果名字
paymentUnit: item.paymentUnit, //支付单位
+ id:item.id,//当前id
};
} else {
return null;
@@ -1933,7 +2099,7 @@ const Arbitrationcompleted = () => {
});
if (res.data.code == 200) {
$router.push('/aftersales/aftersalesWorkOrder'); //打回成功跳转到列表
- AddressClosed('/aftersales/aftersalesWorkOrdermodify');
+ AddressClosed('/aftersales/aftersalesWorkOrdermodify');///删除当前页面
}
});
};
@@ -2024,6 +2190,9 @@ const moneyBtnB = () => {
};
// 查询包件信息自动回显
const ChangePackageInfo = (val, index) => {
+ if(!val){
+ return
+ }
PackageInfo.value[index].orderCode = ''; //订单自编码
PackageInfo.value[index].waybillNumber = ''; //运单号
PackageInfo.value[index].orderId = ''; //运单号
diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
index a8516ba7..fbfa1e03 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
@@ -30,11 +30,32 @@
@click="handleDelete"
>删 除
+
+
导 入
+
+
+
导 出
+
+
+
+
+
+
+
+
+
+ 点击下载
+
+
+
+
+
@@ -64,6 +85,33 @@ import { getDetail as getDetailDelineNode } from '@/api/basic/basicDelineNode';
export default {
data() {
return {
+ excelBox:false,
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: '文件上传',
+ prop: 'excelFile',
+ type: 'upload',
+ drag: true,
+ loadText: '文件上传，请稍等',
+ span: 24,
+ propsHttp: {
+ res: 'data',
+ },
+ tip: '请上传 .xls,.xlsx 标准格式文件',
+ action: '/api/logpm-basicdata/driverArtery/mport-stockArticle',
+ },
+ {
+ label: '模板下载',
+ prop: 'excelTemplate',
+ formslot: true,
+ span: 24,
+ },
+ ],
+ },
form: {},
query: {},
search: {},
@@ -640,6 +688,16 @@ export default {
},
},
methods: {
+ //导入
+ handleImport() {
+ this.excelBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
rowSave(row, done, loading) {
console.log(row, 'row信息');
if (Array.isArray(row.bindVehicles)) {
@@ -732,16 +790,11 @@ export default {
});
},
handleExport() {
- let downloadUrl = `/blade-basicdataDriverArtery/basicdataDriverArtery/export-basicdataDriverArtery?${
+ let downloadUrl = `/api/logpm-b1asicdata/driverArtery/export-basicdataDriverArteryMb?${
this.website.tokenHeader
}=${getToken()}`;
- const { name, phone, type, jobType } = this.query;
- let values = {
- name_like: name,
- phone_like: phone,
- type_equal: type,
- jobType_equal: jobType,
- };
+ const {} = this.query;
+ let values = {};
this.$confirm('是否导出数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -749,10 +802,19 @@ export default {
}).then(() => {
NProgress.start();
exportBlob(downloadUrl, values).then(res => {
- downloadXls(res.data, `司机信息表${dateNow()}.xlsx`);
+ downloadXls(res.data, `司机信息${dateNow()}.xlsx`);
NProgress.done();
});
});
+ },
+ //下载模板
+ handleTemplate() {
+ console.log('下载模板！！！');
+ exportBlob(
+ `/api/logpm/basicdata/driverArtery/export-basicdataDriverArteryMb?${this.website.tokenHeader}=${getToken()}`
+ ).then(res => {
+ downloadXls(res.data, '物料数据模板.xlsx');
+ });
},
beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) {
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index 998dc0e9..fca93165 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -120,7 +120,7 @@
@click="handleEdits(slotProps.scope, '1')"
v-if="
permission.distrilbutionBillLadingList_edit &&
- Number(slotProps.scope.row.conditions) < 20
+ Number(slotProps.scope.row.conditions) < 30
"
>编辑提货信息