1. 优化

src/views/order/groupBuyingMr/index.vue

@@ -162,7 +162,6 @@
       <div class="app-container-table-info">
         <el-table ref="tables" v-loading="loading" height="100%" :data="dataList" border>
           <el-table-column label="序号" align="center" :fixed="fixed" type="index" width="60"></el-table-column>
-          <el-table-column label="支付单号" align="center" :fixed="fixed" prop="paymentId" />
           <el-table-column label="订单号" align="center" :fixed="fixed" prop="id" />
           <el-table-column label="团队名称" align="center" :fixed="fixed" prop="teamName" />
           <el-table-column label="团队类型" align="center" :fixed="fixed" prop="type">
@@ -208,6 +207,7 @@
               <span>{{ parseTime(scope.row.payTime) }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="支付单号" align="center" :fixed="fixed" prop="paymentId" />
           <el-table-column label="订单状态" align="center" prop="type">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>
@@ -694,6 +694,7 @@ export default {
 
         },
         handleCorporatePayClose(){
+          this.$set(this.form,'photoList',[])
           console.log('1111');
           this.corporatePayLoading = false;
           this.showCorporatePay = false;

src/views/order/orderMr/index.vue

@@ -204,7 +204,6 @@
       <div class="app-container-table-info">
         <el-table ref="tables" height="100%" v-loading="loading" :data="dataList" border>
           <el-table-column label="序号" align="center" :fixed="fixed" type="index" width="60"></el-table-column>
-          <el-table-column label="支付单号" align="center" :fixed="fixed" prop="paymentId" />
           <el-table-column label="订单号" align="center" :fixed="fixed" prop="id" />
           <el-table-column label="购票人手机号" align="center" :fixed="fixed" prop="memberMobile" />
           <el-table-column label="剧目名称" align="center" :fixed="fixed" prop="performName" />
@@ -244,6 +243,7 @@
               <span>{{ parseTime(scope.row.payTime) }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="支付单号" align="center" :fixed="fixed" prop="paymentId" />
           <el-table-column label="订单状态" align="center" prop="status">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>

src/views/team/teamMr/dialog/addAndEdit.vue

@@ -179,31 +179,31 @@ export default {
         type: "",
       },
       listType: [
-        {
-            "label": "窗口美团",
-            "value": 10,
-        },
-        {
-            "label": "窗口携程",
-            "value": 11,
-        },
-        {
-            "label": "窗口抖音",
-            "value": 13,
-        },
-        {
-            "label": "窗口猫眼",
-            "value": 14
-        },
-        {
-            "label": "窗口大麦",
-            "value": 18,
-        },
-        {
-            "label": "窗口飞猪",
-            "value": 19,
-        }
-    ],
+          {
+              "label": "窗口美团",
+              "value": 10,
+          },
+          {
+              "label": "窗口携程",
+              "value": 11,
+          },
+          {
+              "label": "窗口抖音",
+              "value": 13,
+          },
+          {
+              "label": "窗口猫眼",
+              "value": 14
+          },
+          {
+              "label": "窗口大麦",
+              "value": 18,
+          },
+          {
+              "label": "窗口飞猪",
+              "value": 19,
+          }
+      ],
       rules: {
         name: [{ required: true, message: "请输入团队名称", trigger: ["change","blur"] }],
         type: [{ required: true, message: "请选择团队类型", trigger: ["change","blur"] }],

src/views/team/teamMr/dialog/auditBox.vue

@@ -26,6 +26,11 @@
             <dict-tag :options="dict.type.team_type" :value="form.type"/>
           </el-form-item>
         </div>
+        <div style="display: flex;" v-if="form.type == 6">
+          <el-form-item label="OTA来源:" prop="source">
+            <dict-tag :options="dict.type.order_form_type" :value="form.source"/>
+        </el-form-item>
+        </div>
         <div style="display: flex;">
           <el-form-item label="销售员:" prop="salerPerson">
             <span style="display: flex ; min-width: 300px;">{{ form.salerPerson }}</span>
@@ -42,13 +47,13 @@
             <span style="display: flex ; min-width: 300px;">{{ form.mobile }}</span>
           </el-form-item>
         </div>
-        <el-form-item label="是否有合同">
+        <el-form-item label="是否有合同:">
           <span>{{ form.haveContract==0?'无':'有' }}</span>
         </el-form-item>
         <!-- <el-form-item label="密码">
           <span>{{ form.password }}</span>
         </el-form-item> -->
-        <el-form-item label="无合约原因" >
+        <el-form-item label="无合约原因:" >
           <span>{{ form.contractReason }}</span>
         </el-form-item>
         <el-form-item v-if="form.haveContract==1" label="合约信息:">
@@ -74,7 +79,7 @@
             v-if="model == 'Audit'"
             v-model="form.checkRemark"
             type="textarea"
-            placeholder="审核备注"
+            placeholder="审核备注:"
             clearable
             style="width: 100%;"
             @input="checkRemarkFun"
@@ -138,13 +143,14 @@ export default {
         id: undefined,
         type: "",
       },
+      
       rules: {
-        name: [{ required: true, message: "请输入团队名称", trigger: ["change","blur"] }],
-        type: [{ required: true, message: "请选择团队类型", trigger: ["change","blur"] }],
-        contact: [{ required: true, message: "请输入客户负责人", trigger: ["change","blur"] }],
-        mobile: [{ required: true, message: "请输入客户账号/联系电话", trigger: ["change","blur"] }],
-        salerPerson: [{ required: true, message: "请输入销售员", trigger: ["change","blur"] }],
-        salerMobile: [{ required: true, message: "请输入销售员联系电话", trigger: ["change","blur"] }],
+        name: [{ required: false, message: "请输入团队名称", trigger: ["change","blur"] }],
+        type: [{ required: false, message: "请选择团队类型", trigger: ["change","blur"] }],
+        contact: [{ required: false, message: "请输入客户负责人", trigger: ["change","blur"] }],
+        mobile: [{ required: false, message: "请输入客户账号/联系电话", trigger: ["change","blur"] }],
+        salerPerson: [{ required: false, message: "请输入销售员", trigger: ["change","blur"] }],
+        salerMobile: [{ required: false, message: "请输入销售员联系电话", trigger: ["change","blur"] }],
       },
       uploadObj: {
         url: process.env.VUE_APP_UPLOAD_FILE_API + "/upload/single/minio",

src/views/team/teamMr/dialog/orderAllBox.vue

@@ -9,7 +9,6 @@
 -->
 <template>
     <el-dialog
-      :title="title"
       :visible.sync="open"
       width="95%"
       append-to-body
@@ -18,23 +17,13 @@
     >
       <div class="dialog">
         <div class="app-container-table-box">
+            <div style="width: 100%;display: flex;justify-content: center;font-size: 20px;"><span>{{ teamName + '团队订单' }}</span></div>
             <div class="app-container-table-info">
-                <el-table ref="tables" height="calc( 80vh - 60px )" v-loading="loading" :data="dataList" border>
+                <el-table ref="tables" height="calc( 80vh - 90px )" v-loading="loading" :data="dataList" border>
                   <el-table-column label="序号" align="center" :fixed="fixed" type="index" width="60"></el-table-column>
-                  <el-table-column label="支付单号" align="center" :fixed="fixed" prop="paymentId" />
                   <el-table-column label="订单号" align="center" :fixed="fixed" prop="id" />
-                  <el-table-column label="团队名称" align="center" :fixed="fixed" prop="teamName" />
-                  <el-table-column label="团队类型" align="center" :fixed="fixed" prop="type">
-                    <template slot-scope="scope">
-                      <dict-tag :options="dict.type.team_type" :value="scope.row.teamType"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="联系电话" align="center" prop="teamMobile" />
-                  <el-table-column label="客户负责人" align="center" prop="teamContact" />
-                  <el-table-column label="销售员" align="center" prop="salerPerson" />
-                  <el-table-column label="剧目名称" align="center" prop="performName" />
-                  <el-table-column label="票务名称" align="center" prop="goodsName" />
-                  <el-table-column label="座位类型" align="center" prop="seatTypeName" />
+                  <el-table-column label="票务名称" align="center" :fixed="fixed" prop="goodsName" />
+                  <el-table-column label="座位类型" align="center" :fixed="fixed" prop="seatTypeName" />
                   <el-table-column label="场次时间" align="center" prop="performDate" />
                   <el-table-column label="场次" width="120" align="center" prop="timeSnapshot">
                     <template slot-scope="scope">
@@ -155,7 +144,8 @@
             pageNum: 1,
             pageSize: 10,
         },
-        fixed: false,
+        fixed: 'left',
+        teamName: null,
       };
     },
     methods: {
@@ -175,6 +165,7 @@
             pageSize: 10,
             teamId: obj.id,
           }
+          this.teamName = obj.name
           this.getSelectByIdApi(obj);
         }else{
           this.$nextTick(() => {