浏览代码

是否开票改成是否成功开票

gcz 1 年之前
父节点
当前提交
2ce7b783c2

+ 2 - 2
src/views/marketing/activity/dialog/addAndEdit.vue

@@ -3,7 +3,7 @@
  * @Author: Sugar.
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: gcz
- * @LastEditTime: 2024-03-15 14:38:54
+ * @LastEditTime: 2024-03-15 15:37:32
  * @FilePath: \great_webui\src\views\marketing\activity\dialog\addAndEdit.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
@@ -54,7 +54,7 @@
             style="width: 100%;"
             v-show="false"
           /> -->
-          <span style="color: deepskyblue;" @click="showSelectTable = true">选择</span>
+          <span style="color: deepskyblue;cursor: pointer;" @click="showSelectTable = true">选择</span>
         </el-form-item>
       </el-form>
       <div class="select-table">

+ 1 - 1
src/views/order/groupBuyingMr/dialog/details.vue

@@ -78,7 +78,7 @@
           <div class="grid-content bg-purple item-class">订单状态: <span>{{ statusList[form.status] || '' }}</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class" style="display: flex;">是否开票: <span style="display: block;margin-left: 5px;">{{ form.ifInvoice=='1'?'是':'否'  }}</span></div>
+          <div class="grid-content bg-purple item-class" style="display: flex;">是否成功开票: <span style="display: block;margin-left: 5px;">{{ form.ifSuccessInvoice=='1'?'是':'否'  }}</span></div>
         </el-col>
       </el-row>
 

+ 6 - 6
src/views/order/groupBuyingMr/index.vue

@@ -34,9 +34,9 @@
         />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否开票">
+      <el-form-item label="是否成功开票">
         <el-select
-          v-model="queryParams.ifInvoice"
+          v-model="queryParams.ifSuccessInvoice"
           placeholder="请选择"
           clearable
           style="width: 100%"
@@ -185,10 +185,10 @@
           <span>{{statusList[scope.row.status]}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否开票" align="center">
+      <el-table-column label="是否成功开票" align="center">
         <template slot-scope="scope">
-          <el-tag type="danger" v-if="scope.row.ifInvoice  == '0'">否</el-tag>
-          <el-tag type="success" v-else-if="scope.row.ifInvoice  == '1'">是</el-tag>
+          <el-tag type="danger" v-if="scope.row.ifSuccessInvoice  == '0'">否</el-tag>
+          <el-tag type="success" v-else-if="scope.row.ifSuccessInvoice  == '1'">是</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
@@ -304,7 +304,7 @@ const https = require('https');
 const axios = require('axios');
 export default {
   name: "agreement",
-  dicts: ['agreement_type', 'team_type'],
+  dicts: ['agreement_type', 'team_type','order_status_type'],
   components: { detailsDia },
   data() {
     return {

+ 2 - 2
src/views/order/orderMr/dialog/details.vue

@@ -3,7 +3,7 @@
  * @Author: Sugar.
  * @Date: 2023-11-24 13:55:00
  * @LastEditors: gcz
- * @LastEditTime: 2024-03-15 15:12:30
+ * @LastEditTime: 2024-03-15 17:47:17
  * @FilePath: \great_webui\src\views\order\orderMr\dialog\details.vue
  * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
 -->
@@ -84,7 +84,7 @@
           <div class="grid-content bg-purple item-class" style="display: flex;">订单备注: <span style="display: block;margin-left: 5px;">{{ form.remark }}</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class" style="display: flex;">是否开票: <span style="display: block;margin-left: 5px;">{{ form.ifInvoice=='1'?'是':'否'  }}</span></div>
+          <div class="grid-content bg-purple item-class" style="display: flex;">是否成功开票: <span style="display: block;margin-left: 5px;">{{ form.ifSuccessInvoice=='1'?'是':'否'  }}</span></div>
         </el-col>
       </el-row>
 

+ 5 - 5
src/views/order/orderMr/index.vue

@@ -37,9 +37,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否开票">
+      <el-form-item label="是否成功开票">
         <el-select
-          v-model="queryParams.ifInvoice"
+          v-model="queryParams.ifSuccessInvoice"
           placeholder="请选择"
           clearable
           style="width: 100%"
@@ -232,10 +232,10 @@
           <span>{{ scope.row.usedTotal }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否开票" align="center">
+      <el-table-column label="是否成功开票" align="center">
         <template slot-scope="scope">
-          <el-tag type="danger" v-if="scope.row.ifInvoice  == '0'">否</el-tag>
-          <el-tag type="success" v-else-if="scope.row.ifInvoice  == '1'">是</el-tag>
+          <el-tag type="danger" v-if="scope.row.ifSuccessInvoice  == '0'">否</el-tag>
+          <el-tag type="success" v-else-if="scope.row.ifSuccessInvoice  == '1'">是</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">