diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 935b1976..e6257e66 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -324,7 +324,7 @@
<div class="el-ckbtn">
<el-button type="primary" @click="AddCompensation">添加赔款方</el-button>
- <el-button type="primary" @click="AddPayee">添加收款方</el-button>
+ <el-button type="primary" @click="AddPayee">添加受款方</el-button>
</div>
<div
@@ -333,12 +333,12 @@
:key="index"
>
<span class="title" :style="{ color: item.state != 0 ? '#000' : '#F56C6C' }"
- >{{ item.state == 0 ? '赔款方' : '收款方' }}{{ item.cld }}</span
+ >{{ item.state == 0 ? '赔款方' : '受款方' }}{{ item.cld }}</span
>
<div class="sk_input">
<el-input
v-model="item.name"
- :placeholder="item.state == 0 ? '请填写赔款方' : '请填写收款方'"
+ :placeholder="item.state == 0 ? '请填写赔款方' : '请填写受款方'"
/>
</div>
<div class="sk_input">
@@ -352,6 +352,35 @@
placeholder="金额"
/>
</div>
+
+ <div class="sk_input" v-if="item.state == 0">
+ <el-select v-model="item.warehouseId" filterable placeholder="请选择仓库">
+ <el-option
+ v-for="item in warehouseData"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </div>
+
+ <div class="sk_input" v-if="item.state == 0">
+ <el-input
+ v-model="item.personResponsibleName"
+ placeholder="请填写责任人"
+ clearable
+ :rows="2"
+ />
+ </div>
+
+
+ <div class="sk_input" v-if="item.state == 1">
+
+ </div>
+
+ <div class="sk_input" v-if="item.state == 1">
+
+ </div>
<el-button type="danger" round @click="payremove(item.state, index)"
>移除</el-button
>
@@ -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 @@
<span>%</span>
</div>
<div class="maxBox">
- <el-form-item label="三方责任人">
- <el-input v-model="item.tripartite" placeholder="请输入三方责任人" />
+ <el-form-item label="三方责任人:">
+ <el-input v-model="item.tripartite" placeholder="请输入三方责任人" :disabled="RouterState == 'Kfend'"/>
</el-form-item>
</div>
@@ -366,6 +366,7 @@
:reserve-keyword="false"
placeholder="请选择处理结果"
@change="changeProcessingResults"
+ :disabled="Appealeditor=='appeal' "
>
<el-option
v-for="item in ProcessingResults"
@@ -387,15 +388,23 @@
:min="item.min"
:max="item.max"
@change="TotalChange"
+ :disabled="Appealeditor=='appeal'"
+
/>
</el-tooltip>
+ <!-- 申诉的时候不展示 -->
+ <div v-if="Appealeditor !='appeal'" class="Paymentname" @click="PaymentSelection(item)">
+ {{ item.payment ? item.text : '支付方式' }}
+ </div>
- <div class="Paymentname" @click="PaymentSelection(item)">
+ <div class="Paymentname" v-else>
{{ item.payment ? item.text : '支付方式' }}
</div>
+
+
<div class="el_PaymentUnit">
<span>支付单位:</span>
- <el-input v-model="item.paymentUnit" placeholder="请输入支付单位" />
+ <el-input v-model="item.paymentUnit" placeholder="请输入支付单位" :disabled="Appealeditor=='appeal' " />
</div>
<el-date-picker
disabled
@@ -551,11 +560,11 @@
<div class="dialog-footer">
<el-button @click="Indexdialog = false">取消</el-button>
- <el-button type="primary" @click="ConfirmForm" v-if="RouterState == 'Infoedit'">
+ <el-button type="primary" @click="ConfirmForm" v-if="RouterState == 'Infoedit' || Appealeditor=='appeal'">
提交
</el-button>
<!--编辑提交-->
- <el-button type="primary" @click="Arbitrationcompleted" v-if="RouterState == 'Kfend'">
+ <el-button type="primary" @click="Arbitrationcompleted" v-if="RouterState == 'Kfend' && !Appealeditor">
提交
</el-button>
<!--客服仲裁完结 -->
@@ -866,6 +875,11 @@ const ResponsiblePartychange = (val, index) => {
};
const onLoad = () => {
RouterState.value = $route.query.RouterState;
+ if($route.query.Appealeditor){
+ Appealeditor.value = $route.query.Appealeditor;//申诉编辑
+ console.log(Appealeditor.value,'申诉编辑状态');
+ }
+
console.log(RouterState.value, '路由状态');
getDictionaryBiz('result_handling').then(res => {
console.log(res, '发现环节');
@@ -919,12 +933,6 @@ const onLoad = () => {
unPackageInfo.value = JSON.parse(JSON.stringify(PackageInfo.value)); //拷贝一份旧的包件信息
console.log(unPackageInfo.value, '包件信息');
- // 责任方回显
- // FangAddList.value = res.data.data.processorVOList
- // .filter(item => item && item.typesOf && item.typesOf == '1')
- // .map(item => {
- // return { businessName: item.businessId };
- // });
FangAddList.value = res.data.data.personResponsibleVOS.map(res => {
ResponsiblepartyData.value.push(res);
diff --git a/vite.config.js b/vite.config.js
index 2e2d8817..f9da57f9 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -25,7 +25,7 @@ export default ({ mode, command }) => {
// target: 'http://192.168.6.122:8777',
// target: 'http://192.168.10.25:13000',
// target: 'http://192.168.10.25:2888',
- target: 'http://192.168.6.163:9777',//CYZ
+ target: 'http://192.168.6.163:9777',//CYZ
// target: 'http://192.168.10.57:13000',
// target: 'http://192.168.10.200:13000',
// target: 'http://192.168.10.29:13000',