短信发送

src/views/caseManagement/components/payDialog.vue

@@ -7,7 +7,6 @@
           formPayDetail.caseNum
         }}</el-descriptions-item>
         <el-descriptions-item label="申请人">{{
-<<<<<<< HEAD
           formPayDetailAffiliate.applicationName || ''
         }}</el-descriptions-item>
         <!-- <el-descriptions-item label="案件标的">{{
@@ -29,24 +28,6 @@
             {{ formPayDetail.reason }}
           </el-tag>
         </el-descriptions-item>
-=======
-          formPayDetail.affiliate.applicationOrganName || ''
-        }}</el-descriptions-item>
-        <el-descriptions-item label="案件标的">{{
-          formPayDetail.caseSubjectAmount
-        }}</el-descriptions-item>
-        <el-descriptions-item label="案件应缴费用">{{
-          formPayDetail.feePayable
-        }}</el-descriptions-item>
-        <el-descriptions-item label="被申请人">{{
-          formPayDetail.affiliate.respondentName
-        }}</el-descriptions-item>
-        <!-- <el-descriptions-item label="案件状态">
-          <el-tag size="mini" type='danger' effect="dark">
-            {{ formPayDetail.caseStatusName }}
-          </el-tag>
-        </el-descriptions-item> -->
->>>>>>> 0ca62df (缴费，案件详情问题处理)
       </el-descriptions>
       <div class="paySelectType">
         <el-radio-group v-model="paySelect" @input="changPayType">
@@ -76,13 +57,8 @@
       </div>
       <div class="payTitle">{{ payMain }}</div>
       <div slot="footer" class="dialog-footer">
-<<<<<<< HEAD
         <el-button @click="payCancel" round><span>取 消</span></el-button>
         <el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button>
-=======
-        <el-button @click="payCancel" class="endbutton"><span>取 消</span></el-button>
-        <el-button @click="submitUpload" class="endbutton"><span>确认缴费</span></el-button>
->>>>>>> 0ca62df (缴费，案件详情问题处理)
       </div>
     </el-dialog>
   </div>
@@ -93,11 +69,7 @@ import { casePay, confirmPayDig } from "@/api/pay/pay";
 import QRCode from "qrcodejs2";
 import { getToken } from "@/utils/auth";
 export default {
-<<<<<<< HEAD
   props: ["openPay", "payTitle", "formPayDetail", "payForm", "queryParams","payId","formPayDetailAffiliate"],
-=======
-  props: ["openPay", "payTitle", "formPayDetail", "payForm", "queryParams","payId"],
->>>>>>> 0ca62df (缴费，案件详情问题处理)
   data() {
     return {
       // key: value
@@ -110,22 +82,14 @@ export default {
         Authorization: "Bearer " + getToken(),
       },
       filedata: {
-<<<<<<< HEAD
         annexType: 4,
-=======
-        annexType: 8,
->>>>>>> 0ca62df (缴费，案件详情问题处理)
       },
       submitForm:{
         payType:1,
         payOrderList:[],
         caseId:null
-<<<<<<< HEAD
       },
       payFlagSubmit:true
-=======
-      }
->>>>>>> 0ca62df (缴费，案件详情问题处理)
     };
   },
   methods: {
@@ -149,10 +113,7 @@ export default {
         annexId: res.annexId,
         annexName:res.annexName
       });
-<<<<<<< HEAD
       this.payFlagSubmit = false;
-=======
->>>>>>> 0ca62df (缴费，案件详情问题处理)
     },
     submitUpload() {
       if (this.fileList.length < 1) {
@@ -169,11 +130,7 @@ export default {
     handleRemove(file, fileList) {
       (this.submitForm.payOrderList = []),
       fileList.forEach((item) => {
-<<<<<<< HEAD
           this.submitForm.payOrderList.push({ annexId:item.response.annexId,annexName:item.response.annexName });
-=======
-          this.submitForm.payOrderList.push({ annexId:item.response.data.annexId,annexName:item.response.data.annexName });
->>>>>>> 0ca62df (缴费，案件详情问题处理)
         });
     },
     handlePreview(file) {
@@ -232,11 +189,7 @@ export default {
       this.submitForm.caseId = this.payId;
       }
     }
-<<<<<<< HEAD
   },
-=======
-  }
->>>>>>> 0ca62df (缴费，案件详情问题处理)
 };
 </script>