Browse Source

Merge remote-tracking branch 'origin/04/22-index' into 03/03Lebao

lex-xin 4 years ago
parent
commit
af22d3eef9

+ 0 - 1
src/components/filter-search/index.vue

@@ -84,7 +84,6 @@ export default {
   },
   mounted() {
     this.initSearch = this.$route.query
-    // console.log(this.activeItems)
   },
   watch: {
     $route() {

File diff suppressed because it is too large
+ 485 - 363
src/views/businessManager/shopManager/shopList.vue


+ 409 - 358
src/views/businessManager/shopManager/shopOperation.vue

@@ -1,71 +1,80 @@
 <template>
   <div class="m-container">
     <h2>
-      <el-page-header @back="onCancel"
-                      :content="(pageTitle[pageType]) + '商品'"></el-page-header>
+      <el-page-header
+        @back="onCancel"
+        :content="pageTitle[pageType] + '商品'"
+      ></el-page-header>
     </h2>
 
     <div class="m-core">
-      <el-form :model="form"
-               :rules="rules"
-               ref="form"
-               label-width="120px">
-        <el-form-item label="货号"
-                      prop="sn">
-          <el-input v-model.trim="form.sn"
-                    :disabled="pageDisabled"
-                    placeholder="请输入货号"
-                    style="width: 400px"></el-input>
+      <el-form :model="form" :rules="rules" ref="form" label-width="120px">
+        <el-form-item label="货号" prop="sn">
+          <el-input
+            v-model.trim="form.sn"
+            :disabled="pageDisabled"
+            placeholder="请输入货号"
+            style="width: 400px"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="品牌"
-                      prop="brand">
-          <el-input v-model.trim="form.brand"
-                    :disabled="pageDisabled"
-                    placeholder="请输入品牌"
-                    style="width: 400px"></el-input>
+        <el-form-item label="品牌" prop="brand">
+          <el-input
+            v-model.trim="form.brand"
+            :disabled="pageDisabled"
+            placeholder="请输入品牌"
+            style="width: 400px"
+          ></el-input>
         </el-form-item>
         <!-- <el-form-item label="备查货号" prop="supplyChannel" v-if="pageType == 'create'">
           <el-input v-model.trim="form.supplyChannel" placeholder="请输入备查货号" style="width: 400px"></el-input>
         </el-form-item> -->
-        <el-form-item label="商品名称"
-                      prop="name">
-          <el-input v-model.trim="form.name"
-                    placeholder="请输入商品名称"
-                    :disabled="pageDisabled"
-                    style="width: 400px"></el-input>
+        <el-form-item label="商品名称" prop="name">
+          <el-input
+            v-model.trim="form.name"
+            placeholder="请输入商品名称"
+            :disabled="pageDisabled"
+            style="width: 400px"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="商品类型"
-                      prop="type">
-          <el-select v-model.trim="form.type"
-                     placeholder="请选择商品类型"
-                     :disabled="pageDisabled"
-                     style="width: 400px !important;">
-            <el-option v-for="(item, index) in goodsType"
-                       :key="index"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+        <el-form-item label="商品类型" prop="type">
+          <el-select
+            v-model.trim="form.type"
+            placeholder="请选择商品类型"
+            :disabled="pageDisabled"
+            style="width: 400px !important"
+          >
+            <el-option
+              v-for="(item, index) in goodsType"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品分类"
-                      prop="goodsCategoryId">
-          <el-select v-model.trim="form.goodsCategoryId"
-                     placeholder="请选择商品分类"
-                     :disabled="pageDisabled"
-                     style="width: 400px !important;"
-                     filterable>
-            <el-option v-for="item in categoryList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+        <el-form-item label="商品分类" prop="goodsCategoryId">
+          <el-select
+            v-model.trim="form.goodsCategoryId"
+            placeholder="请选择商品分类"
+            :disabled="pageDisabled"
+            style="width: 400px !important"
+            filterable
+          >
+            <el-option
+              v-for="item in categoryList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品型号"
-                      prop="specification">
-          <el-input v-model.trim="form.specification"
-                    placeholder="请输入商品型号"
-                    :disabled="pageDisabled"
-                    style="width: 400px"></el-input>
+        <el-form-item label="商品型号" prop="specification">
+          <el-input
+            v-model.trim="form.specification"
+            placeholder="请输入商品型号"
+            :disabled="pageDisabled"
+            style="width: 400px"
+          ></el-input>
         </el-form-item>
         <!-- <el-form-item label="内部库存" prop="stockCount">
           <el-input type="number" :disabled="pageType != 'create'" v-model.trim="form.stockCount" placeholder="请输入内部库存" style="width: 400px"></el-input>
@@ -73,124 +82,138 @@
         <el-form-item label="税务库存" prop="taxStockCount">
           <el-input type="number" :disabled="pageType != 'create'" v-model.trim="form.taxStockCount" placeholder="请输入税务库存" style="width: 400px"></el-input>
         </el-form-item> -->
-        <el-form-item label="库存类型"
-                      prop="stockType">
-          <el-select v-model="form.stockType"
-                     placeholder="请选择库存类型"
-                     :disabled="pageDisabled"
-                     style="width: 400px !important;">
-            <el-option v-for="(item, index) in stockType"
-                       :key="index"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+        <el-form-item label="库存类型" prop="stockType">
+          <el-select
+            v-model="form.stockType"
+            placeholder="请选择库存类型"
+            :disabled="pageDisabled"
+            style="width: 400px !important"
+          >
+            <el-option
+              v-for="(item, index) in stockType"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="市场价"
-                      prop="marketPrice">
-          <el-input type="number"
-                    placeholder="请输入市场价"
-                    :disabled="pageDisabled"
-                    @mousewheel.native.prevent
-                    v-model.trim="form.marketPrice"
-                    style="width: 400px"></el-input>
+        <el-form-item label="市场价" prop="marketPrice">
+          <el-input
+            type="number"
+            placeholder="请输入市场价"
+            :disabled="pageDisabled"
+            @mousewheel.native.prevent
+            v-model.trim="form.marketPrice"
+            style="width: 400px"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="零售价"
-                      prop="discountPrice">
-          <el-input type="number"
-                    placeholder="请输入零售价"
-                    @mousewheel.native.prevent
-                    :disabled="pageDisabled"
-                    v-model.trim="form.discountPrice"
-                    style="width: 400px"></el-input>
+        <el-form-item label="零售价" prop="discountPrice">
+          <el-input
+            type="number"
+            placeholder="请输入零售价"
+            @mousewheel.native.prevent
+            :disabled="pageDisabled"
+            v-model.trim="form.discountPrice"
+            style="width: 400px"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="商品团购价"
-                      prop="groupPurchasePrice">
-          <el-input type="number"
-                    placeholder="请输入商品团购价"
-                    @mousewheel.native.prevent
-                    :disabled="pageDisabled"
-                    v-model.trim="form.groupPurchasePrice"
-                    style="width: 400px"></el-input>
+        <el-form-item label="商品团购价" prop="groupPurchasePrice">
+          <el-input
+            type="number"
+            placeholder="请输入商品团购价"
+            @mousewheel.native.prevent
+            :disabled="pageDisabled"
+            v-model.trim="form.groupPurchasePrice"
+            style="width: 400px"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="学员是否展示"
-                      prop="clientShow">
-          <el-select v-model="form.clientShow"
-                     placeholder="请选择学员是否展示"
-                     style="width: 400px !important;">
-            <el-option label="是"
-                       :value="1"></el-option>
-            <el-option label="否"
-                       :value="0"></el-option>
+        <el-form-item label="学员是否展示" prop="clientShow">
+          <el-select
+            v-model="form.clientShow"
+            placeholder="请选择学员是否展示"
+            style="width: 400px !important"
+          >
+            <el-option label="是" :value="1"></el-option>
+            <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="教务端是否展示"
-                      prop="educationalShow">
-          <el-select v-model="form.educationalShow"
-                     placeholder="请选择教务端是否展示"
-                     style="width: 400px !important;">
-            <el-option label="是"
-                       :value="1"></el-option>
-            <el-option label="否"
-                       :value="0"></el-option>
+        <el-form-item label="教务端是否展示" prop="educationalShow">
+          <el-select
+            v-model="form.educationalShow"
+            placeholder="请选择教务端是否展示"
+            style="width: 400px !important"
+          >
+            <el-option label="是" :value="1"></el-option>
+            <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="乐团是否展示"
-                      prop="musicGroupShow">
-          <el-select v-model="form.musicGroupShow"
-                     placeholder="请选择乐团是否展示"
-                     style="width: 400px !important;">
-            <el-option label="是"
-                       :value="1"></el-option>
-            <el-option label="否"
-                       :value="0"></el-option>
+        <el-form-item label="乐团是否展示" prop="musicGroupShow">
+          <el-select
+            v-model="form.musicGroupShow"
+            placeholder="请选择乐团是否展示"
+            style="width: 400px !important"
+          >
+            <el-option label="是" :value="1"></el-option>
+            <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否库存预警"
-                      prop="stockWarning">
-          <el-select v-model="form.stockWarning"
-                     placeholder="请选择库存预警"
-                     :disabled="pageDisabled"
-                     style="width: 400px !important;">
-            <el-option label="是"
-                       :value="1"></el-option>
-            <el-option label="否"
-                       :value="0"></el-option>
+        <el-form-item label="是否库存预警" prop="stockWarning">
+          <el-select
+            v-model="form.stockWarning"
+            placeholder="请选择库存预警"
+            :disabled="pageDisabled"
+            style="width: 400px !important"
+          >
+            <el-option label="是" :value="1"></el-option>
+            <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品图片"
-                      prop="image">
-          <el-upload class="avatar-uploader"
-                     action="/api-web/uploadFile"
-                     accept=".jpg, .jpeg, .png"
-                     :headers="headers"
-                     :disabled="pageDisabled"
-                     :show-file-list="false"
-                     :on-success="handleAvatarSuccess"
-                     :before-upload="beforeAvatarUpload">
-            <img v-if="form.image"
-                 :src="form.image"
-                 class="avatar">
-            <i v-else
-               class="el-icon-plus avatar-uploader-icon"></i>
+        <el-form-item label="是否参与置换" prop="replacementShow">
+          <el-select
+            v-model="form.replacementShow"
+            placeholder="请选择库存预警"
+            :disabled="pageDisabled"
+            style="width: 400px !important"
+          >
+            <el-option label="是" :value="1"></el-option>
+            <el-option label="否" :value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商品图片" prop="image">
+          <el-upload
+            class="avatar-uploader"
+            action="/api-web/uploadFile"
+            accept=".jpg, .jpeg, .png"
+            :headers="headers"
+            :disabled="pageDisabled"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img v-if="form.image" :src="form.image" class="avatar" />
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="商品描述"
-                      prop="brief">
-          <el-input type="textarea"
-                    v-model.trim="form.brief"
-                    :disabled="pageDisabled"
-                    style="width: 400px"></el-input>
+        <el-form-item label="商品描述" prop="brief">
+          <el-input
+            type="textarea"
+            v-model.trim="form.brief"
+            :disabled="pageDisabled"
+            style="width: 400px"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="商品详情"
-                      prop="desc">
-          <el-input type="textarea"
-                    v-model.trim="form.desc"
-                    :disabled="pageDisabled"
-                    style="width: 400px"></el-input>
+        <el-form-item label="商品详情" prop="desc">
+          <el-input
+            type="textarea"
+            v-model.trim="form.desc"
+            :disabled="pageDisabled"
+            style="width: 400px"
+          ></el-input>
         </el-form-item>
         <el-form-item v-if="!pageDisabled">
-          <el-button @click="onSubmit('form')"
-                     type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+          <el-button @click="onSubmit('form')" type="primary"
+            >立即{{ pageType == "create" ? "创建" : "修改" }}</el-button
+          >
           <el-button @click="onReSet('form')">重置</el-button>
         </el-form-item>
       </el-form>
@@ -202,48 +225,46 @@ import {
   categoryListTree,
   goodsAdd,
   goodsUpdate,
-  goodsSingleQuery
-} from '@/api/businessManager'
-import {
-  getToken
-} from '@/utils/auth'
-import { goodsType, stockType } from '@/utils/searchArray'
+  goodsSingleQuery,
+} from "@/api/businessManager";
+import { getToken } from "@/utils/auth";
+import { goodsType, stockType } from "@/utils/searchArray";
 let validPrice = (rule, value, callback) => {
-  if (value == '' && typeof value == 'string' || value == null) {
-    callback(new Error('请输入金额'))
+  if ((value == "" && typeof value == "string") || value == null) {
+    callback(new Error("请输入金额"));
   } else if (value < 0) {
-    callback(new Error('输入金额必须大于或等于0'))
+    callback(new Error("输入金额必须大于或等于0"));
   } else if (value >= 100000) {
-    callback(new Error('输入金额必须小于100000'))
+    callback(new Error("输入金额必须小于100000"));
   } else {
-    callback()
+    callback();
   }
-}
+};
 let validStock = (rule, value, callback) => {
-  if (value == '' && typeof value == 'string' || value == null) {
-    callback(new Error('请输入库存'))
+  if ((value == "" && typeof value == "string") || value == null) {
+    callback(new Error("请输入库存"));
   } else if (value < 0) {
-    callback(new Error('库存数量必须大于或等于0'))
+    callback(new Error("库存数量必须大于或等于0"));
   } else {
-    callback()
+    callback();
   }
-}
+};
 export default {
-  name: 'shopOperation',
-  data () {
+  name: "shopOperation",
+  data() {
     return {
       goodsType: goodsType,
       stockType: stockType,
       categoryList: [],
       pageType: null,
       pageTitle: {
-        'create': '添加',
-        'update': '修改',
-        'look': '查看',
+        create: "添加",
+        update: "修改",
+        look: "查看",
       },
       pageDisabled: false,
       headers: {
-        Authorization: getToken()
+        Authorization: getToken(),
       },
       form: {
         sn: null,
@@ -265,186 +286,215 @@ export default {
         stockWarning: null,
         image: null,
         brief: null,
-        desc: null
+        desc: null,
+        replacementShow:null
+
       },
       rules: {
-        sn: [{ required: true, message: '请输入商品货号', trigger: 'blur' }],
-        brand: [{
-          required: true,
-          message: '请输入品牌',
-          trigger: 'blur'
-        },
-        {
-          min: 2,
-          max: 30,
-          message: '长度在 2 到 30 个字符',
-          trigger: 'blur'
-        }
+        sn: [{ required: true, message: "请输入商品货号", trigger: "blur" }],
+        brand: [
+          {
+            required: true,
+            message: "请输入品牌",
+            trigger: "blur",
+          },
+          {
+            min: 2,
+            max: 30,
+            message: "长度在 2 到 30 个字符",
+            trigger: "blur",
+          },
         ],
         supplyChannel: [
-          { required: true, message: '请输入备查货号', trigger: 'blur' }
+          { required: true, message: "请输入备查货号", trigger: "blur" },
         ],
-        name: [{
-          required: true,
-          message: '请输入商品名称',
-          trigger: 'blur'
-        },
-        {
-          min: 2,
-          max: 30,
-          message: '长度在 2 到 30 个字符',
-          trigger: 'blur'
-        }
+        name: [
+          {
+            required: true,
+            message: "请输入商品名称",
+            trigger: "blur",
+          },
+          {
+            min: 2,
+            max: 30,
+            message: "长度在 2 到 30 个字符",
+            trigger: "blur",
+          },
         ],
-        type: [{
-          required: true,
-          message: '请选择商品分类',
-          trigger: 'change'
-        }],
-        goodsCategoryId: [{
-          required: true,
-          message: '请选择商品类型',
-          trigger: 'change'
-        }],
-        specification: [{
-          required: true,
-          message: '请输入商品型号',
-          trigger: 'blur'
-        },
-        {
-          min: 2,
-          max: 30,
-          message: '长度在 2 到 30 个字符',
-          trigger: 'blur'
-        }
+        type: [
+          {
+            required: true,
+            message: "请选择商品分类",
+            trigger: "change",
+          },
+        ],
+        goodsCategoryId: [
+          {
+            required: true,
+            message: "请选择商品类型",
+            trigger: "change",
+          },
+        ],
+        specification: [
+          {
+            required: true,
+            message: "请输入商品型号",
+            trigger: "blur",
+          },
+          {
+            min: 2,
+            max: 30,
+            message: "长度在 2 到 30 个字符",
+            trigger: "blur",
+          },
         ],
         stockCount: [
-          { required: true, validator: validStock, trigger: 'blur' }
+          { required: true, validator: validStock, trigger: "blur" },
         ],
         taxStockCount: [
-          { required: true, validator: validStock, trigger: 'blur' }
+          { required: true, validator: validStock, trigger: "blur" },
         ],
         stockType: [
-          { required: true, message: '请选择库存类型', trigger: 'change' }
+          { required: true, message: "请选择库存类型", trigger: "change" },
+        ],
+        marketPrice: [
+          {
+            required: true,
+            validator: validPrice,
+            trigger: "blur",
+          },
+        ],
+        discountPrice: [
+          {
+            required: true,
+            validator: validPrice,
+            trigger: "blur",
+          },
+        ],
+        groupPurchasePrice: [
+          {
+            required: true,
+            validator: validPrice,
+            trigger: "blur",
+          },
         ],
-        marketPrice: [{
-          required: true,
-          validator: validPrice,
-          trigger: 'blur'
-        }],
-        discountPrice: [{
-          required: true,
-          validator: validPrice,
-          trigger: 'blur'
-        }],
-        groupPurchasePrice: [{
-          required: true,
-          validator: validPrice,
-          trigger: 'blur'
-        }],
         clientShow: [
-          { required: true, message: '请选择学员是否展示', trigger: 'change' }
+          { required: true, message: "请选择学员是否展示", trigger: "change" },
+        ],
+        replacementShow:[
+          { required: true, message: "是否参与乐器置换", trigger: "change" },
         ],
         educationalShow: [
-          { required: true, message: '请选择教务端是否展示', trigger: 'change' }
+          {
+            required: true,
+            message: "请选择教务端是否展示",
+            trigger: "change",
+          },
         ],
         musicGroupShow: [
-          { required: true, message: '请选择乐团是否展示', trigger: 'change' }
+          { required: true, message: "请选择乐团是否展示", trigger: "change" },
         ],
         stockWarning: [
-          { required: true, message: '请选择是否库存预警', trigger: 'change' }
+          { required: true, message: "请选择是否库存预警", trigger: "change" },
+        ],
+        image: [
+          {
+            required: true,
+            message: "请选择图片",
+            trigger: "blur",
+          },
+        ],
+        brief: [
+          {
+            required: true,
+            message: "请输入商品描述",
+            trigger: "blur",
+          },
+        ],
+        desc: [
+          {
+            required: true,
+            message: "请输入商品详情",
+            trigger: "blur",
+          },
         ],
-        image: [{
-          required: true,
-          message: '请选择图片',
-          trigger: 'blur'
-        }],
-        brief: [{
-          required: true,
-          message: '请输入商品描述',
-          trigger: 'blur'
-        }],
-        desc: [{
-          required: true,
-          message: '请输入商品详情',
-          trigger: 'blur'
-        }]
       },
       Fsearch: null,
       Frules: null,
       imageWidthM: 400,
-      imageHeightM: 400
-    }
+      imageHeightM: 400,
+    };
   },
-  mounted () {
-    this.init()
+  mounted() {
+    this.init();
   },
   methods: {
-    init () {
-      let query = this.$route.query
+    init() {
+      let query = this.$route.query;
       if (query.paramInfo) {
-        let paramInfo = JSON.parse(query.paramInfo)
-        this.pageType = paramInfo.type
-        this.id = paramInfo.id
+        let paramInfo = JSON.parse(query.paramInfo);
+        this.pageType = paramInfo.type;
+        this.id = paramInfo.id;
       }
-      this.pageDisabled = this.pageType == 'look' ? true : false
-      this.getList()
-      this.getCatagory()
+      this.pageDisabled = this.pageType == "look" ? true : false;
+      this.getList();
+      this.getCatagory();
     },
-    onSubmit (formName) {
+    onSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.pageType == 'create') {
-            if (this.form.id) { // 判断有没有Id,如果有则删除
-              delete this.form.id
+          if (this.pageType == "create") {
+            if (this.form.id) {
+              // 判断有没有Id,如果有则删除
+              delete this.form.id;
             }
-            this.form.status = 'NO' // 默认上架
-            goodsAdd(this.form).then(res => {
-              this.messageTips('添加', res)
-            })
-          } else if (this.pageType == 'update') {
-            goodsUpdate(this.form).then(res => {
-              this.messageTips('修改', res)
-            })
+            this.form.status = "NO"; // 默认上架
+            goodsAdd(this.form).then((res) => {
+              this.messageTips("添加", res);
+            });
+          } else if (this.pageType == "update") {
+            goodsUpdate(this.form).then((res) => {
+              this.messageTips("修改", res);
+            });
           }
         } else {
           this.$nextTick(() => {
-            let isError = document.getElementsByClassName('is-error')
+            let isError = document.getElementsByClassName("is-error");
             isError[0].scrollIntoView({
-              block: 'center',
-              behavior: 'smooth',
-            })
-          })
-          return false
+              block: "center",
+              behavior: "smooth",
+            });
+          });
+          return false;
         }
-      })
+      });
     },
-    messageTips (title, res) {
+    messageTips(title, res) {
       if (res.code == 200) {
-        this.$message.success(title + '成功')
-        this.$store.dispatch('delVisitedViews', this.$route)
+        this.$message.success(title + "成功");
+        this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
-          path: '/shopManager/shopManager',
+          path: "/shopManager/shopManager",
           query: {
             pageInfo: this.Frules,
-            searchForm: this.Fsearch
-          }
-        })
+            searchForm: this.Fsearch,
+          },
+        });
       } else {
-        this.$message.error(res.msg)
+        this.$message.error(res.msg);
       }
     },
-    onCancel () {
-      this.$store.dispatch('delVisitedViews', this.$route)
+    onCancel() {
+      this.$store.dispatch("delVisitedViews", this.$route);
       this.$router.push({
-        path: '/shopManager/shopManager'
-      })
+        path: "/shopManager/shopManager",
+      });
     },
-    onReSet (formName) {
-      this.$refs[formName].resetFields()
+    onReSet(formName) {
+      this.$refs[formName].resetFields();
     },
-    getList () {
-      if (this.pageType == 'create') {
+    getList() {
+      if (this.pageType == "create") {
         this.form = {
           sn: null,
           brand: null,
@@ -465,16 +515,15 @@ export default {
           stockWarning: null,
           image: null,
           brief: null,
-          desc: null
-        }
-        if (this.$refs['form']) {
-          this.$refs['form'].resetFields();
+          desc: null,
+        };
+        if (this.$refs["form"]) {
+          this.$refs["form"].resetFields();
         }
-
       } else {
-        goodsSingleQuery(this.id).then(res => {
+        goodsSingleQuery(this.id).then((res) => {
           if (res.code == 200) {
-            let result = res.data
+            let result = res.data;
             this.form = {
               id: result.id,
               sn: result.sn,
@@ -496,83 +545,85 @@ export default {
               stockWarning: result.stockWarning,
               image: result.image,
               brief: result.brief,
-              desc: result.desc
-            }
+              desc: result.desc,
+              replacementShow:result.replacementShow
+            };
           }
-        })
+        });
       }
-
     },
-    getCatagory () {
+    getCatagory() {
       categoryListTree({
         delFlag: 0,
-        rows: 9999
-      }).then(res => {
-        let result = res.data
+        rows: 9999,
+      }).then((res) => {
+        let result = res.data;
         if (res.code == 200) {
-          let tempArray = []
-          result.rows.forEach(row => {
+          let tempArray = [];
+          result.rows.forEach((row) => {
             tempArray.push({
               label: row.name,
-              value: row.id
-            })
-          })
-          this.categoryList = tempArray
+              value: row.id,
+            });
+          });
+          this.categoryList = tempArray;
         }
-      })
+      });
     },
-    handleAvatarSuccess (res, file) {
-      this.form.image = res.data.url
-
+    handleAvatarSuccess(res, file) {
+      this.form.image = res.data.url;
     },
-    beforeAvatarUpload (file) {
+    beforeAvatarUpload(file) {
       const imageType = {
-        'image/png': true,
-        'image/jpeg': true
-      }
-      const isImage = imageType[file.type]
-      const isLt2M = file.size / 1024 / 1024 < 2
-      const imageWidth = this.imageWidthM
-      const imageHeigh = this.imageHeightM
-      const _URL = window.URL || window.webkitURL
+        "image/png": true,
+        "image/jpeg": true,
+      };
+      const isImage = imageType[file.type];
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      const imageWidth = this.imageWidthM;
+      const imageHeigh = this.imageHeightM;
+      const _URL = window.URL || window.webkitURL;
       const isSize = new Promise((resolve, reject) => {
-        const img = new Image()
+        const img = new Image();
         img.onload = function () {
-
           if (imageWidth && imageHeigh) {
-            this.width === imageWidth && this.height === imageHeigh ? resolve() : reject(`请上传${imageWidth}x${imageHeigh}尺寸图片`)
+            this.width === imageWidth && this.height === imageHeigh
+              ? resolve()
+              : reject(`请上传${imageWidth}x${imageHeigh}尺寸图片`);
           } else if (imageWidth && !imageHeigh) {
-            this.width === imageWidth ? resolve() : reject(`请上传宽为${imageWidth}的图片`)
+            this.width === imageWidth
+              ? resolve()
+              : reject(`请上传宽为${imageWidth}的图片`);
           } else if (!imageWidth && imageHeigh) {
-            this.height === imageHeigh ? resolve() : reject(`请上传高为${imageHeigh}的图片`)
+            this.height === imageHeigh
+              ? resolve()
+              : reject(`请上传高为${imageHeigh}的图片`);
+          } else {
+            resolve();
           }
-          else {
-            resolve()
-          }
-
-        }
-        img.src = _URL.createObjectURL(file)
+        };
+        img.src = _URL.createObjectURL(file);
       }).then(
         () => {
-          return file
+          return file;
         },
         (src) => {
           this.$message.error(src);
-          this.uploadImgLoading = false
-          return Promise.reject()
+          this.uploadImgLoading = false;
+          return Promise.reject();
         }
-      )
-      console.log(isSize)
+      );
+      console.log(isSize);
       if (!isImage) {
-        this.$message.error('只能上传图片格式!')
+        this.$message.error("只能上传图片格式!");
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
+        this.$message.error("上传头像图片大小不能超过 2MB!");
       }
       return isImage && isLt2M && isSize;
     },
-  }
-}
+  },
+};
 </script>
 <style lang="scss" scoped>
 .el-button--primary {

+ 9 - 8
src/views/main/baseinfo/curriculum.vue

@@ -10,7 +10,7 @@
         :isShowQuert="true"
       />
     </div>
-    <statistic class="statistic" :cols="0">
+    <statistic class="statistic" :cols="0" :col="5">
       <statistic-item
         v-for="(item, key) in items"
         :key="key"
@@ -77,6 +77,8 @@ export default {
       return {
         MUSIC_GROUP_COURSE: this.data["MUSIC_GROUP_COURSE"] || {},
         VIP_GROUP_COURSE: this.data["VIP_GROUP_COURSE"] || {},
+        VIP_GROUP_ONLINE_COURSE: this.data["VIP_GROUP_ONLINE_COURSE"] || {},
+        VIP_GROUP_OFFLINE_COURSE: this.data["VIP_GROUP_OFFLINE_COURSE"] || {},
         PRACTICE_GROUP_COURSE: this.data["PRACTICE_GROUP_COURSE"] || {},
       };
     },
@@ -103,6 +105,7 @@ export default {
           months[key][item.title] = row.percent;
         }
       }
+      console.log(months)
       return {
         columns: ["日期", ...values.map((item) => item.title)],
         rows: Object.values(months),
@@ -145,13 +148,13 @@ export default {
         },
         yAxis: {
           //纵轴标尺固定
-          minInterval:1,
+          minInterval: 1,
           type: "value",
           scale: true,
           min: 0,
-            axisLabel:{
-            formatter:'{value}节'
-          }
+          axisLabel: {
+            formatter: "{value}节",
+          },
         },
         tooltip: {
           axisPointer: {
@@ -160,8 +163,8 @@ export default {
               color: "rgba(150,150,150,0.2)",
             },
           },
-
           formatter: (item) => {
+            console.log(this.items['VIP_GROUP_COURSE']['indexMonthData'][item[0].dataIndex].extendInfo)
             return [
               item[0].axisValueLabel,
               ...item.map(
@@ -202,7 +205,6 @@ export default {
         for (const item of res.data) {
           // 再循环一遍
           for (const key in this.items) {
-
             if (item.dataType == key) {
               data[item.dataType] = {
                 ...item,
@@ -220,7 +222,6 @@ export default {
       this.$emit("resetDate", data);
     },
     isDayOrMoth(arr) {
-
       if (!arr || arr.length < 1) {
         this.timer = "day";
       } else {

+ 4 - 1
src/views/main/teamSchedule/compontent/taskInfo.vue

@@ -90,13 +90,14 @@ export default {
         endTimer:'',
         startTimer: '',
         musicGroupId: "",
+        userId:''
       },
       timerStr:''
     };
   },
   mounted() {
     this.checkTimes()
-
+        this.userId = this.$route.query.teacher;
     if (this.taskInfo) {
       this.taskForm.date = this.taskInfo.planStart;
       this.taskForm.startTimer = dayjs(this.taskInfo.planStart).format('HH:mm:ss')
@@ -151,6 +152,7 @@ export default {
                 planEnd,
                 itemId: this.itemId,
                 id: this.taskInfo.id,
+                userId:this.userId
               });
                 this.$message.success("提交成功");
               this.$emit("refreshList", this.taskForm.date);
@@ -166,6 +168,7 @@ export default {
                 planStart,
                 planEnd,
                 itemId: this.itemId,
+                userId:this.userId
               });
               this.$message.success("提交成功");
               this.$emit("refreshList", this.taskForm.date);

+ 2 - 0
src/views/main/teamSchedule/compontent/taskList.vue

@@ -82,6 +82,7 @@ export default {
     this.rangeStart = this.$route.query.startTime;
     this.rangeEnd = this.$route.query.endTime;
     this.userId = this.$route.query.teacher;
+     this.itemId = this.$route.query.itemId;
     this.getList();
   },
   methods: {
@@ -93,6 +94,7 @@ export default {
           userId: this.userId,
           page: this.rules.page,
           rows: this.rules.limit,
+          itemId:this.itemId
         });
         this.tableList = result.data.rows;
         this.rules.total = result.data.total;

+ 2 - 4
src/views/main/teamSchedule/scheduleDetail.vue

@@ -124,11 +124,10 @@ export default {
     };
   },
   async mounted() {
-    console.log('加载页面')
     this.init();
     // 获取乐团
     try {
-      const ruselt = await getMusicGroup({ organId: this.organId });
+      const ruselt = await getMusicGroup({ organId: this.organId,userId:this.userId });
       this.MusicGroupList = ruselt.data;
     } catch (e) {}
   },
@@ -164,6 +163,7 @@ export default {
           startTime: this.startTime,
           endTime: this.endTime,
           userId: this.userId,
+          itemId: this.itemId,
           page: 1,
           rows: 9999,
         });
@@ -230,7 +230,6 @@ export default {
     },
 
     drop(e) {
-      console.log(e)
       this.isNew = true;
       this.activeTask = null;
       this.taskStatus = true;
@@ -239,7 +238,6 @@ export default {
       event.preventDefault();
     },
     dragstart(e){
-      console.log(e)
     },
     submitInfo(val) {
       // 新增修改提交

+ 13 - 1
src/views/operateManager/serverIndexList.vue

@@ -56,7 +56,7 @@
 
         <el-form-item>
           <el-button
-            type="primary"
+             :type="isSearch ? 'primary' : 'info'"
             icon="el-icon-circle-plus-outline"
             @click="showMove = true"
             >更多选项</el-button
@@ -762,6 +762,18 @@ export default {
       }
     },
   },
+  computed:{
+    isSearch(){
+      return  this.searchForm.organIdList ||
+        this.searchForm.actualExercisesNumIsAchieve ||
+        this.searchForm.exercisesReplyNumIsAchieve ||
+        this.searchForm.exercisesMessageNumIsAchieve ||
+        this.searchForm.exercisesMessageTimelyNumIsAchieve ||
+        this.searchForm.existVipCourse||
+        this.searchForm.existPracticeCourse||
+        this.searchForm.workTimer?.length>0
+    }
+  }
 };
 </script>
 <style lang='scss' scoped>

+ 0 - 1
src/views/studentManager/components/teamAndcourse.vue

@@ -258,7 +258,6 @@ export default {
       let params = this.searchForm;
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
-      console.log(params)
       findStudentAttendance(params).then(res => {
         if (res.code == 200) {
           this.coursesInfo = res.data.rows;

+ 103 - 43
src/views/teamBuild/signupList.vue

@@ -3,13 +3,20 @@
     <div class="topWrap">
       <div>
         <div style="display: flex; justify-content: space-between">
-          <div style="display:flex;margin-bottom: 15px; font-size: 18px; font-weight: 400">
-            <p style="margin-right:10px" v-if="applyExpireDate">
+          <div
+            style="
+              display: flex;
+              margin-bottom: 15px;
+              font-size: 18px;
+              font-weight: 400;
+            "
+          >
+            <p style="margin-right: 10px" v-if="applyExpireDate">
               报名截止时间:{{ applyExpireDate | formatTimer }}
             </p>
-            <p v-if="paymentExpireDate">缴费截止时间:{{
-                paymentExpireDate | formatTimer
-              }}</p>
+            <p v-if="paymentExpireDate">
+              缴费截止时间:{{ paymentExpireDate | formatTimer }}
+            </p>
           </div>
         </div>
 
@@ -57,12 +64,19 @@
           >
             延长报名
           </div>
-          <div class="newBand" @click="onCreateQRCode('payment')"   v-show="
+          <div
+            class="newBand"
+            @click="onCreateQRCode('payment')"
+            v-show="
               (status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')&&ischeckCanReg
-            ">报名链接</div>
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE') &&
+              ischeckCanReg
+            "
+          >
+            报名链接
+          </div>
           <div class="newBand" @click="onCreateQRCode('detail')">缴费详情</div>
           <div
             class="newBand"
@@ -86,11 +100,12 @@
             class="newBand"
             v-permission="'musicGroup/addMusicGroupRegs'"
             @click="mergeVisible = true"
-             v-show="
+            v-show="
               (status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')&&ischeckCanReg
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE') &&
+              ischeckCanReg
             "
           >
             合并学员
@@ -99,11 +114,12 @@
             class="newBand"
             style="background-color: #f97215; border: 1px solid #f97215"
             @click="onCreateQRCode('rePayment')"
-             v-show="
+            v-show="
               (status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')&&ischeckCanReg
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE') &&
+              ischeckCanReg
             "
           >
             报名链接(无乐器)
@@ -192,6 +208,29 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchFrom.paymentStatus"
+            clearable
+            filterable
+            placeholder="报名缴费"
+          >
+            <el-option label="未开启缴费" value="0"></el-option>
+            <el-option label="开启缴费" value="1"></el-option>
+            <el-option label="已缴费" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchFrom.visited"
+            clearable
+            filterable
+            placeholder="是否回访"
+          >
+            <el-option label="否" value="false"></el-option>
+            <el-option label="是" value="true"></el-option>
+          </el-select>
+        </el-form-item>
         <!-- 专业actualSubjectId 调剂isAllowAdjust 手机号name -->
         <el-form-item>
           <el-button type="danger" native-type="search">搜索</el-button>
@@ -234,12 +273,17 @@
           v-permission="'musicGroup/updateExpectedStudentNum'"
           style="margin-right: 20px; margin-top: 20px"
         >
-          <el-button v-show="!isEdit&&(
-              status == 'PAY' ||
-              status == 'APPLY' ||
-              status == 'PROGRESS' ||
-              status == 'PREPARE')
-            " @click="isEdit = true">编辑</el-button>
+          <el-button
+            v-show="
+              !isEdit &&
+              (status == 'PAY' ||
+                status == 'APPLY' ||
+                status == 'PROGRESS' ||
+                status == 'PREPARE')
+            "
+            @click="isEdit = true"
+            >编辑</el-button
+          >
           <el-button v-show="isEdit" @click="saveIsEdit">保存</el-button>
         </div>
       </div>
@@ -298,6 +342,15 @@
           </el-table-column>
           <el-table-column label="联系电话" prop="parentsPhone" align="center">
           </el-table-column>
+
+          <el-table-column label="是否回访" prop="paymentStatus" align="center">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.visitNum ? "是" : "否" }}
+              </div>
+            </template>
+          </el-table-column>
+          <!-- visited -->
           <!-- v-show='status == "PAY"' -->
           <el-table-column
             label="报名缴费状态"
@@ -311,23 +364,24 @@
               </div>
             </template>
           </el-table-column>
+
           <el-table-column
             label="操作"
             fixed="right"
             width="240"
             align="center"
-             v-if="
+            v-if="
               status == 'PAY' ||
               status == 'APPLY' ||
               status == 'PROGRESS' ||
               status == 'PREPARE'
             "
           >
-          <!--  v-show="
+            <!--  v-show="
               status == 'PAY' || status == 'PROGRESS' || status == 'PREPARE' || status=='APPLY'
             " -->
             <template slot-scope="scope">
-              <div  >
+              <div>
                 <auth :auths="'studentRegistration/batchUpdateSubject'">
                   <el-button
                     type="text"
@@ -374,7 +428,7 @@
                     >退团</el-button
                   >
                 </auth>
-                <auth :auths="'visit/add/teamSignupList'">
+                <auth :auths="'visit/add/teamSignupList'" v-if=" scope.row.visitNum<=0">
                   <el-button type="text" @click="addVisit(scope.row)"
                     >新增回访</el-button
                   >
@@ -703,7 +757,7 @@ import {
   studentApplyDetailExport,
   StudentQuit,
   getMusicGroupGradeList,
-  checkCanReg
+  checkCanReg,
 } from "@/api/buildTeam";
 import mergeMusic from "./components/merge-music";
 import forecastList from "./components/forecast-list";
@@ -748,6 +802,8 @@ export default {
         subject: "", // 专业
         isAllowAdjust: "", // 是否允许调剂
         currentGrade: null, // 入学年级
+        paymentStatus: "",
+        visited: "",
       },
       quitForm: {
         // 退团信息确认
@@ -856,7 +912,7 @@ export default {
       applyDates: this.applyDate(),
       detail: null,
       gradeList: [],
-      ischeckCanReg:false
+      ischeckCanReg: false,
     };
   },
   created() {},
@@ -871,7 +927,7 @@ export default {
     permission(str) {
       return permission(str);
     },
-   async init() {
+    async init() {
       this.status = this.$route.query.team_status;
       // 通过乐团id 获取乐团招生状态
       this.id = this.$route.query.id;
@@ -879,14 +935,15 @@ export default {
       // 判断是否带缓存参数
       this.pickerOptions = this.beginDate(new Date());
       // checkCanReg
-      try{
-       this.ischeckCanReg = await (await checkCanReg({musicGroupId:this.id})).data
-       console.log(this.ischeckCanReg)
-      }catch(e){
-        console.log(e)
+      try {
+        this.ischeckCanReg = await (
+          await checkCanReg({ musicGroupId: this.id })
+        ).data;
+        console.log(this.ischeckCanReg);
+      } catch (e) {
+        console.log(e);
       }
 
-
       getMusicGroupGradeList({ musicGroupId: this.id }).then((res) => {
         let result = res.data;
         if (res.code == 200 && result) {
@@ -928,6 +985,8 @@ export default {
         subject: null, // 专业
         isAllowAdjust: null, // 是否允许调剂
         currentGrade: null,
+        paymentStatus: null,
+        visited: null,
       };
       this.getList();
     },
@@ -951,6 +1010,8 @@ export default {
         isAllowAdjust: this.searchFrom.isAllowAdjust || null,
         name: this.searchFrom.name || null,
         currentGrade: this.searchFrom.currentGrade || null,
+        paymentStatus: this.searchFrom.paymentStatus || null,
+        visited: this.searchFrom.visited || null,
         page: this.rules.page,
         rows: this.rules.limit,
       };
@@ -1215,9 +1276,9 @@ export default {
     },
     // 修改专业
     resetSubject(row) {
-      console.log(row)
+      console.log(row);
       this.activeId = row.studentId;
-      this.maskForm.subject = row.actualSubjectId
+      this.maskForm.subject = row.actualSubjectId;
       this.subjectVisible = true;
       //   resetStudentSubject().then(res=>{]})
     },
@@ -1424,10 +1485,9 @@ export default {
       this.getList().then((res) => {
         for (const item of res.data.rows) {
           if (item.id === row.id) {
-            this.rowDetail = { ...item,userId:item.studentId };
+            this.rowDetail = { ...item, userId: item.studentId };
             // console.log(this.rowDetail)
             this.changeVoiceVisible = true;
-
           }
         }
       });
@@ -1480,7 +1540,7 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-         return time.getTime()+ 86400000 < new Date().getTime();
+          return time.getTime() + 86400000 < new Date().getTime();
         },
       };
     },
@@ -1489,7 +1549,7 @@ export default {
       return {
         firstDayOfWeek: 1,
         disabledDate(time) {
-          return time.getTime()+ 86400000 < new Date().getTime();
+          return time.getTime() + 86400000 < new Date().getTime();
         },
       };
     },

+ 1 - 0
src/views/teamDetail/componentCourse/teacherList.vue

@@ -372,6 +372,7 @@ export default {
             if (res.code == 200) {
               this.$message.success("补卡成功");
               this.getList();
+              this.$emit('syncTeacherAttend')
             } else {
               this.$message.error(res.msg);
             }

+ 54 - 28
src/views/teamDetail/teamCourseList.vue

@@ -195,25 +195,24 @@
         </el-form-item> -->
 
         <el-form-item>
-             <el-button
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="showMove = true"
-          >更多选项</el-button
-        >
+          <el-button
+            :type="isSearch ? 'primary' : 'info'"
+            icon="el-icon-circle-plus-outline"
+            @click="showMove = true"
+            >更多选项</el-button
+          >
         </el-form-item>
         <el-form-item>
-               <el-button native-type="submit" type="primary">搜索</el-button>
-        <el-button native-type="reset" type="danger">重置</el-button>
+          <el-button native-type="submit" type="primary">搜索</el-button>
+          <el-button native-type="reset" type="danger">重置</el-button>
 
-        <el-button
-          v-permission="'export/superFindCourseSchedules'"
-          @click="onCourseExport"
-          type="primary"
-          >导出课表</el-button
-        >
+          <el-button
+            v-permission="'export/superFindCourseSchedules'"
+            @click="onCourseExport"
+            type="primary"
+            >导出课表</el-button
+          >
         </el-form-item>
-
       </save-form>
       <!-- 列表 -->
       <div class="tableWrap">
@@ -588,6 +587,7 @@
               :courseScheduleId="maskForm.id"
               :teachMode="maskForm.teachMode"
               :courseStatus="maskForm.status"
+              @syncTeacherAttend="syncTeacherAttend"
             ></teacherList>
           </div>
         </el-tab-pane>
@@ -656,7 +656,7 @@
       >
         <el-form-item label="课程组编号/名称" prop="search">
           <el-input
-          style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.search"
             clearable
             placeholder="课程组编号/课程名称"
@@ -664,7 +664,7 @@
         </el-form-item>
         <el-form-item label="教学点" prop="schoolId">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.schoolId"
             clearable
             filterable
@@ -680,7 +680,7 @@
         </el-form-item>
         <el-form-item label="分部" prop="organIdList">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             class="multiple"
             v-model.trim="searchForm.organIdList"
             filterable
@@ -697,7 +697,7 @@
         </el-form-item>
         <el-form-item label="课程组类型" prop="groupType">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.groupType"
             clearable
             filterable
@@ -713,7 +713,7 @@
         </el-form-item>
         <el-form-item label="教学模式" prop="teachMode">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.teachMode"
             clearable
             filterable
@@ -738,7 +738,7 @@
         </el-form-item> -->
         <el-form-item label="合并课类型" prop="mergeCourseType">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.mergeCourseType"
             clearable
             filterable
@@ -754,7 +754,7 @@
         </el-form-item>
         <el-form-item label="老师类型" prop="teachType">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.teachType"
             clearable
             filterable
@@ -770,7 +770,7 @@
         </el-form-item>
         <el-form-item label="是否点名" prop="isCallNames">
           <el-select
-             style="width:180px"
+            style="width: 180px"
             v-model.trim="searchForm.isCallNames"
             clearable
             filterable
@@ -919,6 +919,19 @@ export default {
     mergeCourseTypeOptions() {
       return objectToOptions(mergeCourseType);
     },
+    isSearch() {
+      return (
+        this.searchForm.search ||
+        this.searchForm.schoolId ||
+        this.searchForm.organIdList ||
+        this.searchForm.groupType ||
+        this.searchForm.teachMode ||
+        this.searchForm.mergeCourseType||
+        this.searchForm.teachType||
+        this.searchForm.isCallNames||
+        this.searchForm.creatTimer?.length>0
+      );
+    },
   },
   mounted() {
     const { query } = this.$route;
@@ -1172,6 +1185,19 @@ export default {
         }
       );
     },
+    syncTeacherAttend() {
+      if (this.maskForm.id) {
+        getTeacherPersonalAttendanceDetail({
+          courseScheduleId: this.maskForm.id,
+        }).then((res) => {
+          if (res.code == 200) {
+            this.maskForm = { ...this.maskForm, ...res.data };
+            this.isMainGo = this.$refs.filterSearch?.show;
+          }
+        });
+      }
+    },
+
     handleClick(tab, event) {
       // console.log(tab, event);
     },
@@ -1201,13 +1227,13 @@ export default {
         })
         .catch(() => {});
     },
-    cancleMore(){
+    cancleMore() {
       // this.$refs.searchForm2.resetFields()
-      this.showMove = false
+      this.showMove = false;
     },
-    okMore(){
-      this.getList()
-      this.showMove = false
+    okMore() {
+      this.getList();
+      this.showMove = false;
     },
     // addCompound(row) {
     //   this.compoundList.push(row);

Some files were not shown because too many files changed in this diff