12/11 16:21

111

dist/static/css/chunk-1ee4ba0a.1699de6a.css

@@ -0,0 +1 @@
+.newBand[data-v-0fafcc44]{display:inline-block}[data-v-0fafcc44] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-0fafcc44]{display:inline-block}.lookTitle[data-v-0fafcc44]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}

dist/static/css/chunk-733e3dd2.6beb647a.css

@@ -1 +0,0 @@
-.lookTitle[data-v-be38702e]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-be38702e]{display:inline-block}

dist/static/css/chunk-793b48b2.c9c6cb74.css

@@ -1 +0,0 @@
-.newBand[data-v-313dbfda]{display:inline-block}[data-v-313dbfda] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-313dbfda]{display:inline-block}.lookTitle[data-v-313dbfda]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}

dist/static/css/chunk-79b26c5c.1200c49c.css

@@ -0,0 +1 @@
+.lookTitle[data-v-5fac8006]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-5fac8006]{display:inline-block}

src/views/businessManager/orderManager/financeManager.vue

@@ -12,7 +12,6 @@
           () => {
             routeOrderStatus = true;
             (isAdd = true), (form.applyType = null);
-      
           }
         "
       >
@@ -278,12 +277,13 @@
           <el-table-column align="center" label="学员姓名">
             <template slot-scope="scope">
               <div>
-                <div v-if="scope.row.type !== 'OUTORDER'">
+                <!-- v-if="scope.row.type !== 'OUTORDER'" -->
+                <div>
                   {{ scope.row.user.username }}
-                  <span v-if="scope.row.user.username && scope.row.user.phone"
+                  <!-- <span v-if="scope.row.user.username && scope.row.user.phone"
                     >/</span
-                  >
-                  {{ scope.row.user.phone }}
+                  > -->
+                  <p>{{ scope.row.user.phone }}</p>
                 </div>
               </div>
             </template>
@@ -616,7 +616,7 @@ export default {
     return {
       orderStatus: orderStatus,
       dealStatus: dealStatus,
-     
+
       searchForm: {
         search: null,
         orderStartDate: null,
@@ -631,7 +631,7 @@ export default {
         merNos: null,
         lessBalancePaymentAmount: null,
         lessActualAmount: null,
-         orderDate: [],
+        orderDate: [],
       },
       tableList: [],
       organList: [],
@@ -713,22 +713,22 @@ export default {
         this.shopList = res.data.rows;
       }
     });
-   
-    if(!(this.searchForm.orderDate?.length>0)){
-          var now = new Date();
-    var startDate = new Date(
-      Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-    )
-      .toISOString()
-      .slice(0, 10);
-    var endDate = new Date(
-      Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-    )
-      .toISOString()
-      .slice(0, 10);
-    this.searchForm.orderDate = [];
-    this.searchForm.orderDate.push(startDate);
-    this.searchForm.orderDate.push(endDate);
+
+    if (!(this.searchForm.orderDate?.length > 0)) {
+      var now = new Date();
+      var startDate = new Date(
+        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      )
+        .toISOString()
+        .slice(0, 10);
+      var endDate = new Date(
+        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      )
+        .toISOString()
+        .slice(0, 10);
+      this.searchForm.orderDate = [];
+      this.searchForm.orderDate.push(startDate);
+      this.searchForm.orderDate.push(endDate);
     }
 
     this.getList();
@@ -910,15 +910,15 @@ export default {
     },
     search() {
       this.pageInfo.page = 1;
-      this.$refs.searchForm.save(this.searchForm)
-      this.$refs.searchForm.save(this.pageInfo, 'page')
+      this.$refs.searchForm.save(this.searchForm);
+      this.$refs.searchForm.save(this.pageInfo, "page");
       this.getList();
     },
     getList() {
       // let params = JSON.parse(JSON.stringify(this.searchForm));
-      let params = Object.assign({},this.searchForm)
+      let params = Object.assign({}, this.searchForm);
       // let params = {...this.searchForm}
-      console.log(params)
+      console.log(params);
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
       params.orderNo = params.orderNo ? params.orderNo : null;
@@ -935,9 +935,9 @@ export default {
         params.orderStartDate = null;
         params.orderEndDate = null;
       }
-       console.log(this.searchForm)
+      console.log(this.searchForm);
       params.orderDate = null;
-       console.log(this.searchForm)
+      console.log(this.searchForm);
       routeOrderFinance(cleanDeep(params)).then((res) => {
         let result = res.data;
         if (res.code == 200) {
@@ -984,7 +984,7 @@ export default {
         merNos: null,
         lessBalancePaymentAmount: null,
         lessActualAmount: null,
-        orderDate:[]
+        orderDate: [],
       };
       this.getList();
     },
@@ -1133,32 +1133,32 @@ export default {
       this.form.saleAmount = null;
     },
   },
-  watch:{
-    routeOrderStatus(val){
-      if(!val){
-         this.form= {
-        routeOrganId: null,
-        transNo: null,
-        type: "OTHER",
-        merNo: null,
-        actualAmount: null,
-        memo: null,
-        payTime: null,
-        serviceAmount: null,
-        saleAmount: null,
-        schoolId: null,
-        goodsList: [
-          {
-            id: null,
-            number: null,
-          },
-        ],
-        applyType: null,
-        userId: "",
-      }
+  watch: {
+    routeOrderStatus(val) {
+      if (!val) {
+        this.form = {
+          routeOrganId: null,
+          transNo: null,
+          type: "OTHER",
+          merNo: null,
+          actualAmount: null,
+          memo: null,
+          payTime: null,
+          serviceAmount: null,
+          saleAmount: null,
+          schoolId: null,
+          goodsList: [
+            {
+              id: null,
+              number: null,
+            },
+          ],
+          applyType: null,
+          userId: "",
+        };
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -1,216 +1,298 @@
 <template>
   <div>
-    <el-form :inline='true'
-             ref='ruleForm'>
+    <el-form :inline="true" ref="ruleForm">
       <div class="lookTitle">申请信息</div>
-      <el-form-item label="申请人"
-                    label-width="80px">
-        <div style="width:180px">
-          <p v-if="form.operator&&form.operator.username">{{form.operator.username}}</p>
+      <el-form-item label="申请人" label-width="80px">
+        <div style="width: 180px">
+          <p v-if="form.operator && form.operator.username">
+            {{ form.operator.username }}
+          </p>
         </div>
       </el-form-item>
-      <el-form-item label="申请时间"
-                    label-width="80px">
-        <div style="width:180px">{{form.createTime}}</div>
+      <el-form-item label="申请时间" label-width="80px">
+        <div style="width: 180px">{{ form.createTime }}</div>
       </el-form-item>
     </el-form>
-    <el-form :model="form"
-             ref="ruleForm">
+    <el-form :model="form" ref="ruleForm">
       <div class="lookTitle">基本信息</div>
-      <el-form-item label="所属分部"
-                    :rules="[{ required: true, message: '请选择分部', trigger: 'change' }]"
-                    prop="routeOrganId"
-                    :label-width="formLabelWidth">
+      <el-form-item
+        label="所属分部"
+        :rules="[{ required: true, message: '请选择分部', trigger: 'change' }]"
+        prop="routeOrganId"
+        :label-width="formLabelWidth"
+      >
         <!--    -->
-        <el-select v-model.trim="form.routeOrganId"
-                   :disabled="!isAdd"
-                   @change="changeOrgin"
-                   style="width: 100% !important;">
-          <el-option v-for="(item,index) in organList"
-                     :key="index"
-                     :label="item.name"
-                     :value="item.id"></el-option>
+        <el-select
+          v-model.trim="form.routeOrganId"
+          :disabled="!isAdd"
+          @change="changeOrgin"
+          style="width: 100% !important"
+        >
+          <el-option
+            v-for="(item, index) in organList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所属学校"                  
-                    prop="schoolId"
-                    :label-width="formLabelWidth">
+      <el-form-item
+        label="所属学校"
+        prop="schoolId"
+        :label-width="formLabelWidth"
+      >
         <!--    @change="checkSchool" -->
-        <el-select v-model="form.schoolId"
-                   :disabled="!isAdd"
-                   style="width: 100% !important;">
-          <el-option v-for="(item,index) in cooperationList"
-                     :key="index"
-                     :label="item.name"
-                     :value="item.id"></el-option>
+        <el-select
+          v-model="form.schoolId"
+          :disabled="!isAdd"
+          style="width: 100% !important"
+        >
+          <el-option
+            v-for="(item, index) in cooperationList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="学员编号"
-                    prop="userId"
-                    :label-width="formLabelWidth">
-        <el-input v-model.trim="form.userId"
-                  :disabled="!isAdd"
-                  placeholder="请输入学员编号"></el-input>
+      <el-form-item
+        label="学员编号"
+        prop="userId"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          v-model.trim="form.userId"
+          :disabled="!isAdd"
+          placeholder="请输入学员编号"
+        ></el-input>
       </el-form-item>
       <div class="lookTitle">交易信息</div>
-      <el-form-item label="交易流水号"
-                    :rules="[{ required: true, message: '请输入流水号', trigger: 'change' }]"
-                    prop="transNo"
-                    :label-width="formLabelWidth">
-        <el-input placeholder="请输入交易流水号"
-                  type="text"
-                  :disabled="!isAdd"
-                  v-model.trim="form.transNo"></el-input>
+      <el-form-item
+        label="交易流水号"
+        :rules="[
+          { required: true, message: '请输入流水号', trigger: 'change' },
+        ]"
+        prop="transNo"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入交易流水号"
+          type="text"
+          :disabled="!isAdd"
+          v-model.trim="form.transNo"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="收款账户"
-                    prop="merNo"
-                    :rules="[{ required: true, message: '请输入收款账户', trigger: 'change' }]"
-                    :label-width="formLabelWidth">
-        <el-input placeholder="请输入收款账户"
-                  type="text"
-                  :disabled="!isAdd"
-                  v-model.trim="form.merNo"></el-input>
+      <el-form-item
+        label="收款账户"
+        prop="merNo"
+        :rules="[
+          { required: true, message: '请输入收款账户', trigger: 'change' },
+        ]"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入收款账户"
+          type="text"
+          :disabled="!isAdd"
+          v-model.trim="form.merNo"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="交易日期"
-                    :rules="[{ required: true, message: '请选择交易日期', trigger: 'change' }]"
-                    prop="payTime"
-                    :label-width="formLabelWidth">
-        <el-date-picker style="width: 100%;"
-                        :disabled="!isAdd"
-                        v-model="form.payTime"
-                        type="datetime"
-                        format="yyyy-MM-dd HH:mm:ss"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="选择交易日期">
+      <el-form-item
+        label="交易日期"
+        :rules="[
+          { required: true, message: '请选择交易日期', trigger: 'change' },
+        ]"
+        prop="payTime"
+        :label-width="formLabelWidth"
+      >
+        <el-date-picker
+          style="width: 100%"
+          :disabled="!isAdd"
+          v-model="form.payTime"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择交易日期"
+        >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="收入类型"
-                    :label-width="formLabelWidth"
-                    :rules="[{ required: true, message: '请选收入类型', trigger: 'change' }]"
-                    prop="applyType">
-        <el-select class="multiple"
-                   style="width: 100% !important;"
-                   v-model.trim="form.applyType"
-                   filterable
-                   clearable
-                   :disabled="!isAdd"
-                   placeholder="请选择收入类型">
-          <el-option v-for="(item,index) in orderServerList"
-                     :key="index"
-                     :label="item.label"
-                     :value="item.value"></el-option>
+      <el-form-item
+        label="收入类型"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请选收入类型', trigger: 'change' },
+        ]"
+        prop="applyType"
+      >
+        <el-select
+          class="multiple"
+          style="width: 100% !important"
+          v-model.trim="form.applyType"
+          filterable
+          clearable
+          :disabled="!isAdd"
+          placeholder="请选择收入类型"
+        >
+          <el-option
+            v-for="(item, index) in orderServerList"
+            :key="index"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="销售金额"
-                    :rules="[{ required: true, message: '请输入销售金额', trigger: 'change' }]"
-                    v-if="form.applyType == 'SELL'"
-                    prop="
-                    saleAmount"
-                    :label-width="formLabelWidth">
-        <el-input v-model="form.saleAmount"
-                  @mousewheel.native.prevent
-                  type="number"
-                  :disabled="!isAdd"
-                  placeholder="请输入销售金额" />
+      <el-form-item
+        label="销售金额"
+        prop="saleAmount"
+        :rules="[
+          { required: true, message: '请输入销售金额', trigger: 'change' },
+        ]"
+        v-if="form.applyType == 'SELL'"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          v-model="form.saleAmount"
+          @mousewheel.native.prevent
+          type="number"
+          :disabled="!isAdd"
+          placeholder="请输入销售金额"
+        />
       </el-form-item>
-      <el-form-item label="服务金额"
-                    v-if="form.applyType == 'SERVICE'"
-                    :rules="[{ required: true, message: '请输入服务金额', trigger: 'change' }]"
-                    prop="serviceAmount"
-                    :label-width="formLabelWidth">
-        <el-input type="number"
-                  @mousewheel.native.prevent
-                  :disabled="!isAdd"
-                  v-model="form.serviceAmount"
-                  placeholder="请输入收入金额" />
+      <el-form-item
+        label="服务金额"
+        v-if="form.applyType == 'SERVICE'"
+        :rules="[
+          { required: true, message: '请输入服务金额', trigger: 'change' },
+        ]"
+        prop="serviceAmount"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          type="number"
+          @mousewheel.native.prevent
+          :disabled="!isAdd"
+          v-model="form.serviceAmount"
+          placeholder="请输入收入金额"
+        />
       </el-form-item>
 
-      <div  v-if="form.applyType == 'SELL'">
-        <div v-for="(goodsList, index) in form.goodsList" 
-             :key="index">
-          <el-form-item :label="'商品名称' + (index + 1)"
-                        :label-width="formLabelWidth"
-                        class="setWidth"
-                        :prop="'goodsList.' + index + '.id'"
-                        :rules="[{ required: true, message: '请选择商品', trigger: 'change' }]">
-            <el-select v-model.trim="goodsList.id"
-                       filterable
-                       :disabled="!isAdd"
-                       placeholder="请选择商品">
-              <el-option v-for="(item,index) in shopList"
-                         :key="index"
-                         :label="item.name"
-                         :value="item.id"></el-option>
+      <div v-if="form.applyType == 'SELL'">
+        <div v-for="(goodsList, index) in form.goodsList" :key="index">
+          <el-form-item
+            :label="'商品名称' + (index + 1)"
+            :label-width="formLabelWidth"
+            class="setWidth"
+            :prop="'goodsList.' + index + '.id'"
+            :rules="[
+              { required: true, message: '请选择商品', trigger: 'change' },
+            ]"
+          >
+            <el-select
+              v-model.trim="goodsList.id"
+              filterable
+              :disabled="!isAdd"
+              placeholder="请选择商品"
+            >
+              <el-option
+                v-for="(item, index) in shopList"
+                :key="index"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item class="setWidth"
-                        style="margin-right: 10px"
-                        :prop="'goodsList.' + index + '.number'">
+          <el-form-item
+            class="setWidth"
+            style="margin-right: 10px"
+            :prop="'goodsList.' + index + '.number'"
+          >
             <!--  :rules="validAmount" <el-input-number style="width: 160px;" v-model="goodsList.number" placeholder="商品数量"></el-input-number> -->
-            <el-input type="age"
-                      style="width: 160px;"
-                      :disabled="!isAdd"
-                      clearable
-                      placeholder="请输入商品数量"
-                      @mousewheel.native.prevent
-                      v-model.number="goodsList.number"></el-input>
+            <el-input
+              type="age"
+              style="width: 160px"
+              :disabled="!isAdd"
+              clearable
+              placeholder="请输入商品数量"
+              @mousewheel.native.prevent
+              v-model.number="goodsList.number"
+            ></el-input>
           </el-form-item>
-          <el-button icon="el-icon-minus"
-                     :disabled="!isAdd"
-                     v-if="form.goodsList.length > 1&&auditStatus == 'REJECT'"
-                     circle
-                     @click.prevent="removeGoodsList(goodsList)"></el-button>
-          <el-button icon="el-icon-plus"
-                     :disabled="!isAdd"
-                     v-if="auditStatus == 'REJECT'"
-                     @click.prevent="addGoodsList"
-                     circle
-                     style="margin-left: 5px;"></el-button>
+          <el-button
+            icon="el-icon-minus"
+            :disabled="!isAdd"
+            v-if="form.goodsList.length > 1 && auditStatus == 'REJECT'"
+            circle
+            @click.prevent="removeGoodsList(goodsList)"
+          ></el-button>
+          <el-button
+            icon="el-icon-plus"
+            :disabled="!isAdd"
+            v-if="auditStatus == 'REJECT'"
+            @click.prevent="addGoodsList"
+            circle
+            style="margin-left: 5px"
+          ></el-button>
         </div>
       </div>
       <div class="lookTitle">其它</div>
-      <el-form-item label="提交备注"
-                    :label-width="formLabelWidth"
-                    :rules="[{ required: true, message: '请输入提交备注', trigger: 'change' }]">
-        <el-input placeholder="请输入备注"
-                  :disabled="!isAdd"
-                  v-model.trim="form.memo"
-                  type="textarea"
-                  :rows="3"></el-input>
+      <el-form-item
+        label="提交备注"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请输入提交备注', trigger: 'change' },
+        ]"
+      >
+        <el-input
+          placeholder="请输入备注"
+          :disabled="!isAdd"
+          v-model.trim="form.memo"
+          type="textarea"
+          :rows="3"
+        ></el-input>
       </el-form-item>
       <!-- &&auditStatus != 'REJECT' -->
-      <el-form-item label="审核备注"
-                    v-if="auditStatus != 'ING'"
-                    :label-width="formLabelWidth">
-        <el-input placeholder="请输入备注"
-                  :disabled="true"
-                  v-model.trim="form.auditComment"
-                  type="textarea"
-                  :rows="3"></el-input>
+      <el-form-item
+        label="审核备注"
+        v-if="auditStatus != 'ING'"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入备注"
+          :disabled="true"
+          v-model.trim="form.auditComment"
+          type="textarea"
+          :rows="3"
+        ></el-input>
       </el-form-item>
-
     </el-form>
-    <div class="lookTitle"
-         v-if="auditStatus == 'ING'">审核意见</div>
-    <el-form :model="submitForm"
-             v-if="auditStatus == 'ING'"
-             ref="submitForm">
-      <el-form-item prop="memo"
-                    :rules=" [{ required: true, message:'请输入审核意见',trigger: 'blur'}]">
-        <el-input type='textarea'
-                  :rows="4"
-                  v-model="submitForm.memo"></el-input>
+    <div class="lookTitle" v-if="auditStatus == 'ING'">审核意见</div>
+    <el-form :model="submitForm" v-if="auditStatus == 'ING'" ref="submitForm">
+      <el-form-item
+        prop="memo"
+        :rules="[
+          { required: true, message: '请输入审核意见', trigger: 'blur' },
+        ]"
+      >
+        <el-input
+          type="textarea"
+          :rows="4"
+          v-model="submitForm.memo"
+        ></el-input>
       </el-form-item>
     </el-form>
   </div>
 </template>
 <script>
-import { getRouteOrderInfo, auditOutOrder, updateRouteOrder } from '@/api/orderManager'
-import { orderServerList } from "@/utils/searchArray"
+import {
+  getRouteOrderInfo,
+  auditOutOrder,
+  updateRouteOrder,
+} from "@/api/orderManager";
+import { orderServerList } from "@/utils/searchArray";
 import { getCooperation } from "@/api/buildTeam";
 export default {
-  props: ['orderId', 'shopList', 'organList', 'isLook'],
-  data () {
+  props: ["orderId", "shopList", "organList", "isLook"],
+  data() {
     return {
       formLabelWidth: "100px",
       form: {
@@ -224,29 +306,31 @@ export default {
         serviceAmount: null,
         goodsAmount: null,
         schoolId: null,
-        goodsList: [{
-          id: null,
-          number: null
-        }],
+        goodsList: [
+          {
+            id: null,
+            number: null,
+          },
+        ],
         applyType: null,
-        userId: '',
-        auditComment: ''
+        userId: "",
+        auditComment: "",
       },
       isAdd: !this.isLook,
       cooperationList: [],
       submitForm: {
-        memo: ''
+        memo: "",
       },
-      auditStatus: '',
+      auditStatus: "",
       orderServerList: orderServerList,
-      clearSchool: false
-    }
+      clearSchool: false,
+    };
   },
-  mounted () {
+  mounted() {
     if (this.orderId) {
-      getRouteOrderInfo({ id: this.orderId }).then(res => {
+      getRouteOrderInfo({ id: this.orderId }).then((res) => {
         if (res.code == 200) {
-          let orderInfo = res.data
+          let orderInfo = res.data;
           this.form = {
             createTime: orderInfo.createTime,
             operator: orderInfo.operator,
@@ -260,112 +344,120 @@ export default {
             serviceAmount: orderInfo.serviceAmount,
             saleAmount: orderInfo.saleAmount,
             schoolId: orderInfo.schoolId,
-            userId: orderInfo.userId ? orderInfo.userId : '',
+            userId: orderInfo.userId ? orderInfo.userId : "",
             auditComment: orderInfo.auditComment,
-            applyType: orderInfo.saleAmount ? 'SELL' : 'SERVICE'
-          }
-          this.auditStatus = orderInfo.auditStatus
-          this.$set(this.form, 'goodsList', this.getShopList(orderInfo.goodsJson))
-          this.changeOrgin(orderInfo.routeOrganId)
+            applyType: orderInfo.saleAmount ? "SELL" : "SERVICE",
+          };
+          this.auditStatus = orderInfo.auditStatus;
+          this.$set(
+            this.form,
+            "goodsList",
+            this.getShopList(orderInfo.goodsJson)
+          );
+          this.changeOrgin(orderInfo.routeOrganId);
           this.clearSchool = true;
         }
-      })
+      });
     }
-
   },
   methods: {
-    changeOrgin (val) {
+    changeOrgin(val) {
       if (val) {
         if (this.clearSchool) {
-          this.$set(this.form, 'schoolId', null)
+          this.$set(this.form, "schoolId", null);
         }
-        getCooperation({ rows: 9999, organId: val }).then(res => {
+        getCooperation({ rows: 9999, organId: val }).then((res) => {
           if (res.code === 200) {
-            this.cooperationList = res.data.rows
+            this.cooperationList = res.data.rows;
           }
-        })
+        });
       }
     },
-    getShopList (str) {
-      let arr = []
+    getShopList(str) {
+      let arr = [];
       try {
-        const obj = JSON.parse(str)
+        const obj = JSON.parse(str);
 
         // id: item.goodsId, number: item.num
         for (let i in obj) {
-
-          arr.push({ id: parseInt(i), number: obj[i] })
+          arr.push({ id: parseInt(i), number: obj[i] });
         }
-
-      } catch {
-      }
-      return arr.length>0? arr:[{
-          id: null,
-          number: null
-        }]
+      } catch {}
+      return arr.length > 0
+        ? arr
+        : [
+            {
+              id: null,
+              number: null,
+            },
+          ];
     },
-    auditOutOrder (status) {
+    auditOutOrder(status) {
       const that = this;
-      this.$refs.submitForm.validate(res => {
+      this.$refs.submitForm.validate((res) => {
         if (res) {
-          auditOutOrder({ auditStatus: status, memo: this.submitForm.memo, studentPaymentRouteOrderId: this.orderId }).then(res => {
+          auditOutOrder({
+            auditStatus: status,
+            memo: this.submitForm.memo,
+            studentPaymentRouteOrderId: this.orderId,
+          }).then((res) => {
             if (res.code == 200) {
-              this.$message.success('审核成功')
-              that.$emit('getList')
-              return
+              this.$message.success("审核成功");
+              that.$emit("getList");
+              return;
             }
-          })
+          });
         }
-      })
-
+      });
     },
-    removeGoodsList (item) {
-      const index = this.form.goodsList.indexOf(item)
+    removeGoodsList(item) {
+      const index = this.form.goodsList.indexOf(item);
       if (index !== -1) {
-        this.form.goodsList.splice(index, 1)
+        this.form.goodsList.splice(index, 1);
       }
     },
-    addGoodsList () {
+    addGoodsList() {
       this.form.goodsList.push({
         id: null,
-        number: null
-      })
+        number: null,
+      });
     },
-    submitReaet () {
-      this.$refs.ruleForm.validate(valid => {
+    submitReaet() {
+      this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          let form = this.form
+          let form = this.form;
           if (!form.saleAmount && !form.serviceAmount) {
-            this.$message.error('请输入销售收入或服务收入')
-            return
+            this.$message.error("请输入销售收入或服务收入");
+            return;
           }
-          form.applyType == 'SELL' ? form.serviceAmount = 0 : form.saleAmount = 0
+          form.applyType == "SELL"
+            ? (form.serviceAmount = 0)
+            : (form.saleAmount = 0);
           if (!form.saleAmount) {
-            form.goodsList = null
+            form.goodsList = null;
           }
-          let goodsJson = {}
+          let goodsJson = {};
           for (let i in form.goodsList) {
-            goodsJson[form.goodsList[i]['id']] = form.goodsList[i]['number']
+            goodsJson[form.goodsList[i]["id"]] = form.goodsList[i]["number"];
           }
-          form.goodsJson = form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson)
-          form.id = this.orderId
-          form.auditStatus = 'ING'
-          updateRouteOrder(form).then(res => {
+          form.goodsJson =
+            form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
+          form.id = this.orderId;
+          form.auditStatus = "ING";
+          updateRouteOrder(form).then((res) => {
             if (res.code == 200) {
               this.$message.success("修改成功");
-              this.$emit('getList')
-              return
+              this.$emit("getList");
+              return;
             } else {
               this.$message.error(res.msg);
             }
-          })
-
-
+          });
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 .lookTitle {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -760,7 +760,7 @@ export default {
         },
       };
     },
-    init() {
+  init() {
       this.isInit = true;
       // 分为3种  this.teamStatus
       //          1.resetTeam 乐团修改
@@ -789,13 +789,12 @@ export default {
       ) {
         // 单团修改
         this.teamid = this.$route.query.id;
-        MusicStore.dispatch("getBaseInfo", {
-          data: { musicGroupId: this.teamid },
-        }).then((res) => {
+        getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
           if (res.code == 200) {
-            if (this.$listeners.getBaseInfo) {
-              this.$listeners.getBaseInfo(res.data);
-            }
+            console.log({...res.data.musicGroup})
+            // if (this.$listeners.getBaseInfo) {
+            //   this.$listeners.getBaseInfo(res.data);
+            // }
 
             // 头部
             this.topFrom.name = res.data.musicGroup.name;
@@ -1016,7 +1015,7 @@ export default {
       });
     },
     chioseSchool(val) {},
-    gotoNext(num) {
+     gotoNext(num) {
       // 1.效验数据    判断是否数据正常=> 正常放入store存储
       // 不正常=>  进行效验提示
       let check = [];
@@ -1072,11 +1071,6 @@ export default {
           // this.$store.dispatch("checkinfo", this.checkList);
           // this.$store.dispatch("getpayInfo", this.payList);
           // this.$store.dispatch("newStudentinfo", this.newStudentList);
-          MusicStore.dispatch("getBaseInfo", {
-            data: { musicGroupId: this.teamid },
-            force: true,
-          });
-          console.log(this.teamStatus);
           if (this.teamStatus == "teamDraft") {
             // 获取数据提交