{{ item.state == 0 ? '赔款方' : '收款方' }}{{ item.cld }}{{ item.state == 0 ? '赔款方' : '受款方' }}{{ item.cld }}
@@ -352,6 +352,35 @@
placeholder="金额"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
移除
@@ -541,6 +570,8 @@ import {
$_listOwn,
$_moneyUpdate,
$_updateWorkList,
+ $_updateManagerConfirmed,
+ $_updateWorkOrderStatus,
} from '@/api/aftersales/aftersalesWorkOrder';
import { getToken } from '@/utils/auth';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
@@ -689,8 +720,8 @@ const TabList = ref([
const DeliveryDriver = ref([]);
const CompensationParty = ref([
- { name: '', state: 0, num: null, reason: '', cld: 1 }, //赔款方
- { name: '', state: 1, num: null, reason: '', cld: 1 }, //收款方
+ { name: '', state: 0, num: null, reason: '', cld: 1 ,warehouseId:'',personResponsibleName:''}, //赔款方
+ { name: '', state: 1, num: null, reason: '', cld: 1 ,warehouseId:'',personResponsibleName:''}, //受款方
]); //收/赔
const details = reactive({
@@ -1297,31 +1328,29 @@ const view = val => {
businessId: val.row.businessId,
ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理
RouteIndexs: TabPermissions.value, //当前记录参数
+
},
});
- return;
- console.log(val, '当前行数据');
- FromDisabled.value = true; //禁用输入框
- updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
- updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
- getDeptWarehouse({}).then(res => {
- res.data.data.forEach(item => {
- warehouseData.value.push({
- value: item.id,
- label: item.name,
- });
- });
- });
- $_getDetail({
- id: val.row.id,
- }).then(res => {
- console.log(res, '查看详情返回值');
- if (res.data.data) {
- Indexform.value = res.data.data;
- Indexdialog.value = true; //展开弹窗
- }
+};
+
+// 申诉列表编辑
+const Appealeditor = (val) => {
+// 编辑信息
+ $router.push({
+ path: '/aftersales/aftersalesWorkOrdermodify',
+ query: {
+ id: val.row.id,
+ name: val.row.workOrderNumber + '-申诉编辑',
+ businessId: $route.query.businessId,
+ warehouseId: val.row.warehouseId,
+ workOrderNumber: val.row.workOrderNumber,
+ RouterState: 'Kfend',
+ Appealeditor: 'appeal',//申诉编辑
+ },
});
};
+
+
// 首页删除
const ViewDelete = val => {
ElMessageBox.confirm(`是否删除该条数据?`)
@@ -1492,8 +1521,7 @@ const Appealbutton = () => {
});
};
-// 申诉列表编辑
-const Appealeditor = () => {};
+
// 异常类型事件
const abnormalChange = val => {
@@ -2225,7 +2253,7 @@ const DetermineStorage = val => {
let ID = {};
ID = val.row.id;
data['assignList'].push(ID);
- if (routerState.value == 'end') {
+ if(TabPermissions.value=='6'){
$_updateManagerConfirmed(data).then(res => {
if (res.data.code == 200) {
ElMessage({
@@ -2237,7 +2265,8 @@ const DetermineStorage = val => {
});
// 赔款方
console.log(data, '处理好的值');
- } else {
+ }
+ if(TabPermissions.value=='2'){
console.log(data, '处理好的数据');
$_updateWorkOrderStatus(data).then(res => {
console.log(res, '确定提交存储');
@@ -2445,9 +2474,9 @@ const AddCompensation = () => {
som++;
}
});
- CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som });
+ CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som ,warehouseId:'',personResponsibleName:''});
};
-// 添加收款方
+// 添加受款方
const AddPayee = () => {
let som = 1;
CompensationParty.value.forEach(item => {
@@ -2494,7 +2523,7 @@ const amountMoney = () => {
_num
).result;
}
- // 统计收款方金额【1】
+ // 统计受款方金额【1】
if (item.state == 1) {
TotalamountReceived.value = computeNumber(TotalamountReceived.value, '+', _num).result;
}
@@ -2519,6 +2548,7 @@ const Batchcompletion = () => {
// 批量提交
const CompletedSubmission = () => {
+
PLloading.value = true; //开启处理加载效果
console.log(CompensationParty.value);
let pay = CompensationParty.value.find(item => item.cld == 1);
@@ -2557,13 +2587,14 @@ const CompletedSubmission = () => {
reason: party.reason,
money: Number(party.num),
reasonArbitration: Reasonarbitration.value,
- workOrderId: selection.id,
- warehouseId: selection.warehouseId,
+ // workOrderId: selection.id,
+ warehouseId: party.warehouseId,//仓库
+ personResponsibleName:party.personResponsibleName
};
// 将赔款方信息添加到对应的completionRecordEntities数组中
data[index].completionRecordEntities.push(record);
} else {
- // 收款方信息对象
+ // 受款方信息对象
const recipient = {
recipient: party.name,
reasonReceivingPayment: party.reason,
@@ -2573,7 +2604,7 @@ const CompletedSubmission = () => {
workOrderId: selection.id,
warehouseId: selection.warehouseId,
};
- // 将收款方信息添加到对应的completionRecipientEntities数组中
+ // 将受款方信息添加到对应的completionRecipientEntities数组中
data[index].completionRecipientEntities.push(recipient);
}
});
@@ -2800,7 +2831,7 @@ const CompletedSubmission = () => {
align-items: center;
margin-top: 20px;
.title {
- width: 76px;
+ width: 120px;
height: 100%;
display: flex;
display: block;
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index d83a6a03..e7d453ff 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -960,7 +960,8 @@ const onLoad = () => {
payment: item.compensationMethod,
name: item.resultTypeName,
text: item.compensationMethodName,
- compensationTime: item.compensationTime,
+ compensationTime: item.compensationTime,//支付时间
+ paymentUnit: item.paymentUnit, //支付单位
};
}
);
diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue
index 58322851..2c35f656 100644
--- a/src/views/aftersales/aftersalesWorkOrdermodify.vue
+++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue
@@ -324,8 +324,8 @@
%