no message

src/views/valueAddedService/orderSettleManag/mixins/examineInfo.js

@@ -14,7 +14,7 @@ export default {
           md: 24,
           formItemAttributes: {
             label: '审批结果',
-            prop: 'flag',
+            prop: 'flagSh',
             rules: [...required],
           },
           options: [{ label: "通过", value: "OK" }, { label: "驳回", value: "FAIL" }],

src/views/valueAddedService/orderSettleManag/mixins/formItems.js

@@ -69,7 +69,7 @@ export default {
                   {({ "EXPIRE": "过期", "CANCEL": "取消", "PAID": "已支付", "WAIT": "待支付", "REFUND": "已退款" })[formData.payStatus] || ""}
                 </el-descriptions-item>
                 <el-descriptions-item label="支付方式">
-                  {({ 1: "扫码支付", 2: "代客支付" })[formData.payType] || ""}
+                  {({ 1: "微信支付", 2: "代客支付", 3: "现金支付" })[formData.payType] || ""}
                 </el-descriptions-item>
                 <el-descriptions-item label="支付订单号" >
                   {formData.payNo}

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

@@ -24,7 +24,7 @@
         </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>
+          <el-button size="mini" type="primary" @click="() => { wxPay(formData.id) }">微信支付</el-button>
         </div>
       </el-dialog>
     </div>
@@ -90,13 +90,14 @@ export default {
       formTypeName: ["查看", "审批"],
       formType: -1,
       formData: {
+        flagSh: "",
         flag: "",
         examineRemark: "",
         pgIncreItems: []
       },
       formDialog: false,
       addFormDialog: false,
-      formDshType:false,
+      formDshType: false,
       addFormData: {
         shiyongleixing: "按使用年限",
         "amount": "",
@@ -341,7 +342,7 @@ export default {
     shenhexinxi() {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
         if (valid) {
-          increOrderSettleExamine(this.formData).then(res => {
+          increOrderSettleExamine({ ...this.formData, flag: this.formData.flagSh }).then(res => {
             this.$message({ type: 'success', message: `审核完成!` })
             this.formCancel()
             this.$refs?.pageRef?.refreshList()