Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -959,7 +959,7 @@ const onLoad = async () => {
   await updateDictionary(Processingresultsoptions.value, 'result_handling'); //理赔选择
   await Handling(); //获取处理方和责任方
   await PageState(); //页面基础数据处理
-  // form.value.Pageloading = false; //关闭页面加载
+  form.value.Pageloading = false; //关闭页面加载
 };
 onLoad();
 const ProcessingState = computed(() => {
@@ -1610,7 +1610,8 @@ const onSubmit = () => {
           }
         });
       }
-
+      console.log(form.value,'表单内容');
+      
       // 处理结果
       if (form.value.basis.result?.length) {
         submitData.aftersalesProcessingResultsDTO = {
@@ -1624,7 +1625,7 @@ const onSubmit = () => {
             let resultTypeValue = Processingresultsoptions.value.find(
               res => res.label == item.title
             ).value;
-            if (item.compensationMethod) {
+            if (item.compensationMethod) { 
               PlayName.push(
                 item.Paymentmethod.find(res => res.value == item.compensationMethod).label
               );
@@ -1632,16 +1633,14 @@ const onSubmit = () => {
             submitData.aftersalesProcessingResultsDTO['processingMoneyEntityList'].push({
               compensationMethodName: item.Paymentmethod.find(
                 res => res.value == item.compensationMethod
-              ).label, //支付方式名称
+              )?.label ||'', //支付方式名称
               compensationMethod: item.compensationMethod, //支付方式value
               compensationTime: item.compensationTime, //支付时间
               money: item.money, //支付金额
               paymentUnit: item.paymentUnit, //支付单位
               resultName: item.title, //处理结果方式  下补单
-              resultType: ProcessingresultsoptiTons.value.find(res => res.label == item.title)
-                .value, //处理结果方式 value
-              resultType: resultTypeValue ? resultypeValue.value : null, //处理结果方式 value
-              typesOf: 1, //固定参数
+              resultType: resultTypeValue ? resultTypeValue : null, //处理结果方式 value
+              typesOf: 1, //固定参数 
             });
           });
           submitData.aftersalesProcessingResultsDTO.resultType = form.value.Claimamount.map(
@@ -1661,7 +1660,6 @@ const onSubmit = () => {
           delete form.value.basis.resultDescription; //删除无用信息
         }
       }
-
       form.value.Pageloading = true; //关闭页面加载
       //是否直接提交到处理结果(处理完毕)
       if (form.value.Processed) {