no message

src/api/common.js

@@ -1,5 +1,13 @@
 import request, { postBlob, getBlob, handleImport } from '@/utils/request'
 
+export function adminWebsitPayConfigList(params) {
+  return request({
+    url: '/admin/websit/pay/config/list',
+    method: 'post',
+    params
+  })
+}
+
 //高德省市区街道
 export function lbsAmapRegion(params) {
   return request({
@@ -89,7 +97,6 @@ export function bigGetRegion(params) {
   })
 }
 
-
 // 模板下载
 export function commonTemplateDownload(params, name) {
   return getBlob({
@@ -130,4 +137,4 @@ export function getOssConfig(params) {
     method: 'get',
     params
   })
-}
+}

src/utils/xialaxuanz.js

@@ -0,0 +1,70 @@
+export default function (option) {
+  return new Promise((r, j) => {
+    const h = this.$createElement
+    var _this = this
+    var done_ = null
+    this.$msgbox({
+      title: '请选择', //弹框标题
+      //弹框信息
+      message: h(
+        'el-select',
+        {
+          style: {
+            width: '100%'
+          },
+          props: {
+            value: '',
+            filterable: true
+          },
+          ref: 'selectView',
+          on: {
+            change: e => {
+              _this.$refs.selectView.value = e
+            }
+          }
+        },
+        [
+          option.map(it => {
+            return h('el-option', {
+              props: {
+                key: it.value,
+                label: it.label,
+                value: it.value
+              }
+            })
+          })
+        ]
+      ),
+      beforeClose: (action, instance, done) => {
+        if (action === 'confirm') {
+          if (_this.$refs.selectView.value) {
+            done()
+          } else {
+            done_ = done
+            this.$message({
+              message: '请先选择数据',
+              type: 'warning'
+            })
+          }
+        } else {
+          done()
+        }
+      },
+      showCancelButton: true,
+      closeOnClickModal: false,
+      confirmButtonText: '确定',
+      cancelButtonText: '取消'
+    })
+      .then(_ => {
+        if (_this.$refs.selectView.value) {
+          r(_this.$refs.selectView.value)
+          done_?.()
+        } else {
+          j()
+        }
+      })
+      .catch(_ => {
+        j()
+      })
+  })
+}

src/views/auxiliaryFittings/salesManagement/auxiliarySalesOrder/index.vue

@@ -173,12 +173,12 @@ export default {
   methods: {
     // 切换状态
     changeType(val) {
-      this.$refs.pageRef.refreshList()
+      this.$refs?.pageRef?.refreshList()
     },
     backList() {
       this.id = ''
       this.formDialog = false
-      this.$refs.pageRef.refreshList()
+      this.$refs?.pageRef?.refreshList()
     },
     // 列表请求函数
     getList(p, cb) {
@@ -446,7 +446,7 @@ export default {
     },
     handleRefreshList() {
       this.recordSelected = []
-      this.$refs.pageRef.refreshList()
+      this.$refs?.pageRef?.refreshList()
     },
     handleInitPrint() {
       this.$nextTick(() => {

src/views/auxiliaryFittings/salesManagement/components/attachmentSalesOrderDetail.vue

@@ -604,7 +604,7 @@
 <script>
 import { getWebsit } from '@/api/customerManagement'
 import QRCode from 'qrcodejs2'
-import { lbsAmapRegion } from '@/api/common.js'
+import { lbsAmapRegion, adminWebsitPayConfigList } from '@/api/common.js'
 import geographicalPosi from '@/components/geographicalPosi/index.vue'
 import ImageUpload from '@/components/file-upload'
 import {
@@ -621,6 +621,7 @@ import {
   getProjectCollectionList
 } from '@/api/auxiliaryFittings/auxiliarySalesOrder'
 import { storageListPageV2 } from '@/api/storage.js'
+import selectEl from '@/utils/xialaxuanz.js'
 export default {
   components: { geographicalPosi, ImageUpload },
   props: ['id', 'title', 'formType'],
@@ -1004,31 +1005,48 @@ export default {
       if (!this.is_submit) {
         return false
       }
-      this.is_submit = false
-      setTimeout(() => {
-        this.is_submit = true
-      }, 2000)
-      getCode({
-        salesId: this.formData.salesId
-      }).then(res => {
-        if (res.code == 200) {
-          this.payCodeUrl = res.data.codeUrl
-          this.$refs.payQRCode.innerHTML = ''
-          this.$nextTick(() => {
-            this.payUrl = res.data.codeUrl
-            new QRCode(this.$refs.payQRCode, {
-              text: res.data.codeUrl,
-              width: 200,
-              height: 200,
-              colorDark: '#333333', // 二维码颜色
-              colorLight: '#ffffff', // 二维码背景色
-              correctLevel: QRCode.CorrectLevel.L // 容错率，L/M/H
+
+      adminWebsitPayConfigList({
+        status: true,
+        type: 'P',
+        websitId: this.formData.websitId
+      }).then(resd => {
+        selectEl
+          .bind(this)(
+            resd?.data?.map(item => ({
+              value: item.id,
+              label: item.name
+            }))
+          )
+          .then(val => {
+            this.is_submit = false
+            setTimeout(() => {
+              this.is_submit = true
+            }, 2000)
+            getCode({
+              payConfigId: val,
+              salesId: this.formData.salesId
+            }).then(res => {
+              if (res.code == 200) {
+                this.payCodeUrl = res.data.codeUrl
+                this.$refs.payQRCode.innerHTML = ''
+                this.$nextTick(() => {
+                  this.payUrl = res.data.codeUrl
+                  new QRCode(this.$refs.payQRCode, {
+                    text: res.data.codeUrl,
+                    width: 200,
+                    height: 200,
+                    colorDark: '#333333', // 二维码颜色
+                    colorLight: '#ffffff', // 二维码背景色
+                    correctLevel: QRCode.CorrectLevel.L // 容错率，L/M/H
+                  })
+                  this.checkPay()
+                })
+              }
             })
-            this.checkPay()
+            this.isPay = true
           })
-        }
       })
-      this.isPay = true
     },
     save() {
       this.$refs.formData.validate((valid, invalidFields, errLabels) => {

src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesOrderDetail.vue

@@ -645,7 +645,7 @@
 <script>
 import { getWebsit } from '@/api/customerManagement'
 import QRCode from 'qrcodejs2'
-import { lbsAmapRegion } from '@/api/common.js'
+import { lbsAmapRegion, adminWebsitPayConfigList } from '@/api/common.js'
 import geographicalPosi from '@/components/geographicalPosi/index.vue'
 import ImageUpload from '@/components/file-upload'
 import {
@@ -662,6 +662,7 @@ import {
   getProjectCollectionList
 } from '@/api/auxiliaryFittings/auxiliarySalesOrder'
 import { storageListPageV2 } from '@/api/storage.js'
+import selectEl from '@/utils/xialaxuanz.js'
 export default {
   components: { geographicalPosi, ImageUpload },
   props: ['id', 'title', 'formType'],
@@ -759,6 +760,7 @@ export default {
     this.getWebsit()
     this.getProject()
   },
+  mounted() {},
   methods: {
     // 返回
     goBack() {
@@ -1110,31 +1112,47 @@ export default {
       if (!this.is_submit) {
         return false
       }
-      this.is_submit = false
-      setTimeout(() => {
-        this.is_submit = true
-      }, 2000)
-      getCode({
-        salesId: this.formData.salesId
-      }).then(res => {
-        if (res.code == 200) {
-          this.payCodeUrl = res.data.codeUrl
-          this.$refs.payQRCode.innerHTML = ''
-          this.$nextTick(() => {
-            this.payUrl = res.data.codeUrl
-            new QRCode(this.$refs.payQRCode, {
-              text: res.data.codeUrl,
-              width: 200,
-              height: 200,
-              colorDark: '#333333', // 二维码颜色
-              colorLight: '#ffffff', // 二维码背景色
-              correctLevel: QRCode.CorrectLevel.L // 容错率，L/M/H
+      adminWebsitPayConfigList({
+        status: true,
+        type: 'M',
+        websitId: this.formData.websitId
+      }).then(resd => {
+        selectEl
+          .bind(this)(
+            resd?.data?.map(item => ({
+              value: item.id,
+              label: item.name
+            }))
+          )
+          .then(val => {
+            this.is_submit = false
+            setTimeout(() => {
+              this.is_submit = true
+            }, 2000)
+            getCode({
+              payConfigId: val,
+              salesId: this.formData.salesId
+            }).then(res => {
+              if (res.code == 200) {
+                this.payCodeUrl = res.data.codeUrl
+                this.$refs.payQRCode.innerHTML = ''
+                this.$nextTick(() => {
+                  this.payUrl = res.data.codeUrl
+                  new QRCode(this.$refs.payQRCode, {
+                    text: res.data.codeUrl,
+                    width: 200,
+                    height: 200,
+                    colorDark: '#333333', // 二维码颜色
+                    colorLight: '#ffffff', // 二维码背景色
+                    correctLevel: QRCode.CorrectLevel.L // 容错率，L/M/H
+                  })
+                  this.checkPay()
+                })
+              }
             })
-            this.checkPay()
+            this.isPay = true
           })
-        }
       })
-      this.isPay = true
     },
     save() {
       this.$refs.formData.validate((valid, invalidFields, errLabels) => {

src/views/valueAddedService/orderSettleManag/pages/offline.vue

@@ -1,44 +1,107 @@
 <template>
-  <template-page ref="pageRef" :get-list="getList" :exportList="exportList" :table-attributes="tableAttributes"
-    :table-events="tableEvents" :moreParameters="moreParameters" :column-parsing="columnParsing" :operation="operation()"
-    :operationColumnWidth="200" :optionsEvensGroup="optionsEvensGroup" :defaultSearchData="defaultSearchData">
+  <template-page
+    ref="pageRef"
+    :get-list="getList"
+    :exportList="exportList"
+    :table-attributes="tableAttributes"
+    :table-events="tableEvents"
+    :moreParameters="moreParameters"
+    :column-parsing="columnParsing"
+    :operation="operation()"
+    :operationColumnWidth="200"
+    :optionsEvensGroup="optionsEvensGroup"
+    :defaultSearchData="defaultSearchData"
+  >
     <div class="cartographer">
-      <el-dialog :title="formTypeName[formType]" width="100%" :modal="false" :visible.sync="formDialog"
-        :before-close="formCancel">
+      <el-dialog
+        :title="formTypeName[formType]"
+        width="100%"
+        :modal="false"
+        :visible.sync="formDialog"
+        :before-close="formCancel"
+      >
         <zj-form-container v-if="formDialog" ref="formRef" :form-data="formData" :styleSwitch="false">
-          <zj-form-module title="基础信息" label-width="120px" :showPackUp="false" :form-data="formData"
-            :form-items="formItems">
+          <zj-form-module
+            title="基础信息"
+            label-width="120px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="formItems"
+          >
           </zj-form-module>
-          <zj-form-module title="订单信息" label-width="120px" :showPackUp="false" :form-data="formData"
-            :form-items="formItemsList">
+          <zj-form-module
+            title="订单信息"
+            label-width="120px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="formItemsList"
+          >
           </zj-form-module>
-          <zj-form-module title="附件图片" label-width="120px" :showPackUp="false" :form-data="formData"
-            :form-items="formItemsImgs">
+          <zj-form-module
+            title="附件图片"
+            label-width="120px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="formItemsImgs"
+          >
           </zj-form-module>
-          <zj-form-module v-if="formType == 1" title="审核信息" label-width="120px" :showPackUp="false" :form-data="formData"
-            :form-items="examineInfo">
+          <zj-form-module
+            v-if="formType == 1"
+            title="审核信息"
+            label-width="120px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="examineInfo"
+          >
           </zj-form-module>
         </zj-form-container>
         <div v-if="formType == 1 && formDshType" slot="footer" class="dialog-footer">
           <el-button size="mini" type="primary" @click="shenhexinxi">审核</el-button>
         </div>
-        <div v-if="formType == 0 && formData.flag == 'OK' && formData.payStatus == 'WAIT' && formData.payType == 1"
-          slot="footer" class="dialog-footer">
-          <el-button size="mini" type="primary" @click="() => { wxPay(formData.id) }">微信支付</el-button>
+        <div
+          v-if="formType == 0 && formData.flag == 'OK' && formData.payStatus == 'WAIT' && formData.payType == 1"
+          slot="footer"
+          class="dialog-footer"
+        >
+          <el-button
+            size="mini"
+            type="primary"
+            @click="
+              () => {
+                wxPay(formData.id)
+              }
+            "
+            >微信支付</el-button
+          >
         </div>
       </el-dialog>
     </div>
     <div class="cartographer">
       <el-dialog title="新增" width="100%" :modal="false" :visible.sync="addFormDialog" :before-close="addFormCancel">
         <zj-form-container v-if="addFormDialog" ref="addFormRef" :form-data="addFormData">
-          <zj-form-module v-if="addFormDialog" title="客户信息" label-width="80px" :form-data="addFormData"
-            :form-items="basicInfo">
+          <zj-form-module
+            v-if="addFormDialog"
+            title="客户信息"
+            label-width="80px"
+            :form-data="addFormData"
+            :form-items="basicInfo"
+          >
           </zj-form-module>
-          <zj-form-module v-if="addFormDialog" title="服务信息" label-width="80px" :form-data="addFormData"
-            :form-items="serviceInfo">
+          <zj-form-module
+            v-if="addFormDialog"
+            title="服务信息"
+            label-width="80px"
+            :form-data="addFormData"
+            :form-items="serviceInfo"
+          >
           </zj-form-module>
-          <zj-form-module v-if="addFormDialog" title="产品信息" label-width="80px" :form-data="addFormData"
-            :form-items="productInfo">
+          <zj-form-module
+            v-if="addFormDialog"
+            title="产品信息"
+            label-width="80px"
+            :form-data="addFormData"
+            :form-items="productInfo"
+          >
           </zj-form-module>
         </zj-form-container>
         <div slot="footer" class="dialog-footer">
@@ -46,12 +109,18 @@
         </div>
       </el-dialog>
     </div>
-    <el-dialog title="微信支付" :visible.sync="isPay" width="50%" :close-on-click-modal="false" :modal-append-to-body="false"
-      @close="codeUrl = ''">
-      <h3 style="text-align: center;">扫二维码支付</h3>
-      <div ref="payQRCode" style="display: flex; justify-content: center;" />
-      <div style="color: #EA8000;text-align: center;margin-top: 20px;">注：支付成功后，方可操作！</div>
-      <div style="display: flex;justify-content: flex-end;margin-top: 30px;">
+    <el-dialog
+      title="微信支付"
+      :visible.sync="isPay"
+      width="50%"
+      :close-on-click-modal="false"
+      :modal-append-to-body="false"
+      @close="codeUrl = ''"
+    >
+      <h3 style="text-align: center">扫二维码支付</h3>
+      <div ref="payQRCode" style="display: flex; justify-content: center" />
+      <div style="color: #ea8000; text-align: center; margin-top: 20px">注：支付成功后，方可操作！</div>
+      <div style="display: flex; justify-content: flex-end; margin-top: 30px">
         <el-button size="mini" type="text" @click="codeUrl = ''">取消</el-button>
       </div>
     </el-dialog>
@@ -61,19 +130,29 @@
 <script>
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
-import { increOrderSettleExamine, increOrderSettleGetBrand, increOrderSettleGeneratePayCode, increOrderSettleList, increOrderSettleListExport, increOrderSettleAdd, increOrderSettleDetail, increOrderSettleConfirm, increOrderSettleRefund } from "@/api/orderSettleManag.js"
+import {
+  increOrderSettleExamine,
+  increOrderSettleGetBrand,
+  increOrderSettleGeneratePayCode,
+  increOrderSettleList,
+  increOrderSettleListExport,
+  increOrderSettleAdd,
+  increOrderSettleDetail,
+  increOrderSettleConfirm,
+  increOrderSettleRefund
+} from '@/api/orderSettleManag.js'
 import operation_mixin from '@/components/template/operation_mixin.js'
-import formItems from "../mixins/formItems.js"
-import basicInfo from "../mixins/basicInfo.js"
-import serviceInfo from "../mixins/serviceInfo.js"
-import productInfo from "../mixins/productInfo.js"
-import examineInfo from "../mixins/examineInfo.js"
-import QRCode from "qrcodejs2";
+import formItems from '../mixins/formItems.js'
+import basicInfo from '../mixins/basicInfo.js'
+import serviceInfo from '../mixins/serviceInfo.js'
+import productInfo from '../mixins/productInfo.js'
+import examineInfo from '../mixins/examineInfo.js'
+import QRCode from 'qrcodejs2'
 export default {
   props: {
     storageType: {
       type: String,
-      default: ""
+      default: ''
     }
   },
   components: { TemplatePage },
@@ -81,21 +160,19 @@ export default {
   data() {
     return {
       isPay: false,
-      codeUrl: "",
+      codeUrl: '',
       // 表格属性
-      tableAttributes: {
-      },
+      tableAttributes: {},
       // 表格事件
-      tableEvents: {
-      },
+      tableEvents: {},
       // 勾选选中数据
       recordSelected: [],
-      formTypeName: ["查看", "审批"],
+      formTypeName: ['查看', '审批'],
       formType: -1,
       formData: {
-        flagSh: "",
-        flag: "",
-        examineRemark: "",
+        flagSh: '',
+        flag: '',
+        examineRemark: '',
         pgIncreItems: []
       },
       formDialog: false,
@@ -103,65 +180,65 @@ export default {
       formDshType: false,
       defaultSearchData: [],
       addFormData: {
-        shiyongleixing: "按使用年限",
-        "amount": "",
-        "brandId": "",
-        "brandName": "",
-        "buyCertImg": [],
-        "commissionAmount": "",
-        "companyWechatId": "",
-        "companyWechatName": "",
-        "createBy": "",
-        "createTime": "",
-        "examineBy": "",
-        "examineRemark": "",
-        "examineTime": "",
-        "flag": "",
-        "id": "",
-        "increContent": "",
-        "increType": "",
-        "insideCode": "",
-        "insideCodeImg": [],
-        "insureTime": "",
-        "invoiceAmount": "",
-        "invoiceTime": "",
-        "limitNum": "",
-        "machineImg": [],
-        "mainId": "",
-        "mainImg": "",
-        "mainName": "",
-        "orderChannel": "",
-        "payNo": "",
-        "payStatus": "",
-        "payTime": "",
-        "payType": "",
-        "pgIncreId": "",
-        "pgIncreItemId": "",
-        "refundNo": "",
-        "refundTime": "",
-        "remark": "",
-        "residuNum": "",
-        "serviceEndTime": "",
-        "serviceNo": "",
-        "settleRemark": "",
-        "settleStatus": "",
-        "transcationId": "",
-        "updateBy": "",
-        "updateTime": "",
-        "userAddress": "",
-        "userAddressId": "",
-        "userMobile": "",
-        "userName": "",
-        "websitAmount": "",
-        "websitId": "",
-        "websitName": "",
-        "workerAmount": "",
-        "workerId": "",
-        "workerIdcard": "",
-        "workerMobile": "",
-        "workerName": "",
-        "workerOpenId": ""
-      },
+        shiyongleixing: '按使用年限',
+        amount: '',
+        brandId: '',
+        brandName: '',
+        buyCertImg: [],
+        commissionAmount: '',
+        companyWechatId: '',
+        companyWechatName: '',
+        createBy: '',
+        createTime: '',
+        examineBy: '',
+        examineRemark: '',
+        examineTime: '',
+        flag: '',
+        id: '',
+        increContent: '',
+        increType: '',
+        insideCode: '',
+        insideCodeImg: [],
+        insureTime: '',
+        invoiceAmount: '',
+        invoiceTime: '',
+        limitNum: '',
+        machineImg: [],
+        mainId: '',
+        mainImg: '',
+        mainName: '',
+        orderChannel: '',
+        payNo: '',
+        payStatus: '',
+        payTime: '',
+        payType: '',
+        pgIncreId: '',
+        pgIncreItemId: '',
+        refundNo: '',
+        refundTime: '',
+        remark: '',
+        residuNum: '',
+        serviceEndTime: '',
+        serviceNo: '',
+        settleRemark: '',
+        settleStatus: '',
+        transcationId: '',
+        updateBy: '',
+        updateTime: '',
+        userAddress: '',
+        userAddressId: '',
+        userMobile: '',
+        userName: '',
+        websitAmount: '',
+        websitId: '',
+        websitName: '',
+        workerAmount: '',
+        workerId: '',
+        workerIdcard: '',
+        workerMobile: '',
+        workerName: '',
+        workerOpenId: ''
+      }
     }
   },
   computed: {
@@ -170,12 +247,12 @@ export default {
       return [
         [
           [
-            this.optionsEvensAuth("add", {
+            this.optionsEvensAuth('add', {
               click: () => {
                 this.addFormOpen()
               }
             })
-          ],
+          ]
         ]
       ]
     },
@@ -188,21 +265,25 @@ export default {
           value: this?.$route?.params?.pageCode || '',
           conditions: [
             {
-              label: "全部",
-              value: ""
-            }, {
-              label: "待审核",
-              value: "WAIT"
-            }, {
-              label: "通过",
-              value: "OK"
-            }, {
-              label: "失败",
-              value: "FAIL"
-            }]
-        },
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '待审核',
+              value: 'WAIT'
+            },
+            {
+              label: '通过',
+              value: 'OK'
+            },
+            {
+              label: '失败',
+              value: 'FAIL'
+            }
+          ]
+        }
       ]
-    },
+    }
   },
   watch: {
     codeUrl(newVal) {
@@ -218,8 +299,8 @@ export default {
     }
   },
   created() {
-    if (this.pageCode && !~['WAIT','OK','FAIL'].indexOf(this.pageCode)) {
-      this.defaultSearchData = [{ "param": "a.id", "compare": "=", "value": this.pageCode, label: "订单单号" }]
+    if (this.pageCode && !~['WAIT', 'OK', 'FAIL'].indexOf(this.pageCode)) {
+      this.defaultSearchData = [{ param: 'a.id', compare: '=', value: this.pageCode, label: '订单单号' }]
     }
   },
   methods: {
@@ -227,19 +308,19 @@ export default {
       increOrderSettleGeneratePayCode({ id }).then(res => {
         this.codeUrl = res.data.codeUrl
         if (this.$refs?.payQRCode?.innerHTML) {
-          this.$refs.payQRCode.innerHTML = '';
+          this.$refs.payQRCode.innerHTML = ''
         }
         this.$nextTick(() => {
           new QRCode(this.$refs.payQRCode, {
             text: res.data.codeUrl,
             width: 200,
             height: 200,
-            colorDark: "#333333", // 二维码颜色
-            colorLight: "#ffffff", // 二维码背景色
+            colorDark: '#333333', // 二维码颜色
+            colorLight: '#ffffff', // 二维码背景色
             correctLevel: QRCode.CorrectLevel.L // 容错率，L/M/H
-          });
+          })
           this.wxpaygetDetail(id)
-        });
+        })
       })
     },
     wxpaygetDetail(id) {
@@ -248,8 +329,8 @@ export default {
       }
       this.wxpayTimeId = setTimeout(() => {
         increOrderSettleDetail({ id }).then(res => {
-          if (res.data.payStatus == "PAID" && res.data.payType == 1) {
-            this.codeUrl = ""
+          if (res.data.payStatus == 'PAID' && res.data.payType == 1) {
+            this.codeUrl = ''
             this.addFormCancel()
           } else {
             this.wxpaygetDetail(id)
@@ -262,13 +343,12 @@ export default {
       var pam = JSON.parse(JSON.stringify(p))
       try {
         if (pam.flag) {
-          pam.params.push({ "param": "a.flag", "compare": "=", "value": pam.flag })
+          pam.params.push({ param: 'a.flag', compare: '=', value: pam.flag })
         }
-        pam.params.push({ "param": "a.order_channel", "compare": "=", "value": "SELF" })
+        pam.params.push({ param: 'a.order_channel', compare: '=', value: 'SELF' })
         cb && cb(pam)
         return increOrderSettleList(pam)
-      } catch (err) {
-      }
+      } catch (err) {}
     },
     // 列表导出函数
     exportList: increOrderSettleListExport,
@@ -276,18 +356,14 @@ export default {
     columnParsing(item, defaultData) {
       if (item.jname === 'residuNum') {
         defaultData.render = (h, { row, index, column }) => {
-          return (
-            <div style="padding:0 6px;cursor: pointer;">
-              {row["increType"] != 1 ? row["residuNum"] : ""}
-            </div>
-          )
+          return <div style="padding:0 6px;cursor: pointer;">{row['increType'] != 1 ? row['residuNum'] : ''}</div>
         }
       }
       if (item.jname === 'serviceEndTime') {
         defaultData.render = (h, { row, index, column }) => {
           return (
             <div style="padding:0 6px;cursor: pointer;">
-              {row[column.columnAttributes.prop] ? row[column.columnAttributes.prop].split(" ")[0] : ""}
+              {row[column.columnAttributes.prop] ? row[column.columnAttributes.prop].split(' ')[0] : ''}
             </div>
           )
         }
@@ -307,7 +383,7 @@ export default {
         orderDetail: {
           btnType: 'text',
           conditions: ({ row, index, column }) => {
-            return ["PAID", "REFUND"].includes(row.payStatus)
+            return ['PAID', 'REFUND'].includes(row.payStatus)
           },
           click: ({ row, index, column }) => {
             this.$router.push({
@@ -315,22 +391,22 @@ export default {
               params: {
                 pageName: row.id,
                 pageType: 'pgIncreItemId',
-                pageCode: row.id,
-              },
+                pageCode: row.id
+              }
             })
           }
         },
         examine: {
           btnType: 'text',
           conditions: ({ row, index, column }) => {
-            return row.flag == "WAIT"
+            return row.flag == 'WAIT'
           },
           click: ({ row, index, column }) => {
             this.formType = 1
             this.formDshType = true
             this.getDetail(row.id)
           }
-        },
+        }
       })
     },
     getDetail(id) {
@@ -378,10 +454,10 @@ export default {
         if (valid) {
           increOrderSettleAdd({
             ...this.addFormData,
-            "serviceEndTime": this.addFormData.serviceEndTime + " 23:59:59",
-            "buyCertImg": this.addFormData.buyCertImg.map(item => item.url).join(","),
-            "insideCodeImg": this.addFormData.insideCodeImg.map(item => item.url).join(","),
-            "machineImg": this.addFormData.machineImg.map(item => item.url).join(","),
+            serviceEndTime: this.addFormData.serviceEndTime + ' 23:59:59',
+            buyCertImg: this.addFormData.buyCertImg.map(item => item.url).join(','),
+            insideCodeImg: this.addFormData.insideCodeImg.map(item => item.url).join(','),
+            machineImg: this.addFormData.machineImg.map(item => item.url).join(',')
           }).then(res => {
             this.$message({ type: 'success', message: `新增成功!` })
             this.$refs?.pageRef?.refreshList()
@@ -394,7 +470,7 @@ export default {
           })
         }
       })
-    },
+    }
   }
 }
 </script>