Browse Source

1. 修复

MONSTER-ygh 8 months ago
parent
commit
e9d0a12985

+ 11 - 2
src/views/finance/InvoiceRecords/index.vue

@@ -60,7 +60,7 @@
             v-for="dict in [
             v-for="dict in [
               { label: '小程序',value: 0 },
               { label: '小程序',value: 0 },
               { label: '团购H5',value: 1 },
               { label: '团购H5',value: 1 },
-              { label: '线下',value: 2 },
+              { label: '线下(诺诺系统)',value: 2 },
             ]"
             ]"
             :key="dict.value"
             :key="dict.value"
             :label="dict.label"
             :label="dict.label"
@@ -100,6 +100,15 @@
           <dict-tag :options="dict.type.Invoicing_type" :value="scope.row.status"/>
           <dict-tag :options="dict.type.Invoicing_type" :value="scope.row.status"/>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
+      <el-table-column label="开票来源" align="center">
+        <template slot-scope="scope">
+          <dict-tag :options="[
+              { label: '小程序',value: '0',raw: {listClass:'default'} },
+              { label: '团购H5',value: '1',raw: {listClass:'default'} },
+              { label: '线下(诺诺系统)',value: '2',raw: {listClass:'default'} },
+            ]" :value="scope.row.invoiceSource"/>
+        </template>
+      </el-table-column>
       <el-table-column label="申请时间" align="center">
       <el-table-column label="申请时间" align="center">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -129,7 +138,7 @@
               size="mini"
               size="mini"
               type="text"
               type="text"
               style="margin-left: 10px;"
               style="margin-left: 10px;"
-              v-if="scope.row.status == 6"
+              v-if="scope.row.invoiceSource == 2"
               @click="openRelatedOrders(scope.row)"
               @click="openRelatedOrders(scope.row)"
             >{{ scope.row.orderId ? '重新关联订单': '关联订单' }}</el-button>
             >{{ scope.row.orderId ? '重新关联订单': '关联订单' }}</el-button>
           </span>
           </span>

+ 5 - 1
src/views/team/ticketMr/dialog/dumplingEdit.vue

@@ -196,7 +196,11 @@ export default {
     openDialog(title, obj) {
     openDialog(title, obj) {
       this.open = true;
       this.open = true;
       this.title = "团队绑定";
       this.title = "团队绑定";
-      this.queryParams.name = null
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        type: 1,
+      }
       this.onwObj = obj;
       this.onwObj = obj;
       this.getList(obj);
       this.getList(obj);
     },
     },

+ 1 - 1
src/views/ticket/ticketMr/dialog/details.vue

@@ -77,7 +77,7 @@
            + ' ' + 
            + ' ' + 
            (form.goodsPerform.channelAutoSale == 0 ? '自助售/取票机,' : '')
            (form.goodsPerform.channelAutoSale == 0 ? '自助售/取票机,' : '')
            + ' ' + 
            + ' ' + 
-           (form.goodsPerform.channelPersonSale == 0 ? '小程序(分销)' : '')
+           (form.goodsPerform.channelPersonSale == 0 ? '小程序-分销' : '')
            }}</span></div>
            }}</span></div>
         </el-col>
         </el-col>
         <el-col :span="12">
         <el-col :span="12">

+ 4 - 1
src/views/ticket/ticketMr/index.vue

@@ -51,7 +51,10 @@
           ' ' + 
           ' ' + 
           (scope.row.goodsPerform.channelWindow == 0 ? '窗口' : '') +
           (scope.row.goodsPerform.channelWindow == 0 ? '窗口' : '') +
           ' ' + 
           ' ' + 
-          (scope.row.goodsPerform.channelAutoSale == 0 ? '自助售/取票机' : '')}}</span>
+          (scope.row.goodsPerform.channelAutoSale == 0 ? '自助售/取票机' : '')
+          + ' ' + 
+          (scope.row.goodsPerform.channelPersonSale == 0 ? '小程序-分销' : '')
+          }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column label="是否可退" align="center">
       <el-table-column label="是否可退" align="center">

+ 11 - 1
src/views/venue/schedulingMr/index.vue

@@ -61,7 +61,17 @@
           </el-select>
           </el-select>
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-dropdown>
+          <el-button size="mini" type="primary" icon="el-icon-plus"></el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item>黄金糕</el-dropdown-item>
+            <el-dropdown-item>狮子头</el-dropdown-item>
+            <el-dropdown-item>螺蛳粉</el-dropdown-item>
+            <el-dropdown-item>双皮奶</el-dropdown-item>
+            <el-dropdown-item>蚵仔煎</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-button style="margin-left: 10px;" type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>