1.perf：优化加载提示，fix：修改字段名称

src/views/Marketing/productPackManage/component/editProductPack.vue → src/views/Marketing/productPackManage/component/editGoodsPack.vue

@@ -45,7 +45,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="培训项目" prop="businessId">
+          <el-form-item label="业务层次" prop="businessId">
             <el-select
               v-model="ruleForm.businessId"
               placeholder="请选择"
@@ -152,7 +152,7 @@ export default {
           { required: true, message: "请选择教育类型", trigger: "blur" },
         ],
         businessId: [
-          { required: true, message: "请选择培训项目", trigger: "blur" },
+          { required: true, message: "请选择业务层次", trigger: "blur" },
         ],
         gradeType: [
           { required: true, message: "请选择班级类型", trigger: "blur" },
@@ -213,7 +213,7 @@ export default {
       }
       console.log(row, "row");
       this.dialogTitle = "修改";
-      this.ruleForm = row;
+      this.ruleForm = JSON.parse(JSON.stringify(row));
       this.isBusinessId = false
     },
     close() {

src/views/Marketing/productPackManage/component/matchingDialog.vue

@@ -20,7 +20,7 @@
       <div>
         <div>
           教育类型：{{ queryData.educationName }}
-          <span style="margin: 0 25px;">培训项目：{{queryData.projectName}} </span>
+          <span style="margin: 0 25px;">业务层次：{{queryData.projectName}} </span>
           班级类型：{{
             queryData.gradeType === 1
               ? "基础班"
@@ -38,7 +38,7 @@
           :data="tableData"
           :header-cell-style="{ 'text-align': 'center' }"
           :cell-style="{ 'text-align': 'center' }"
-          :loading="loading"
+          v-loading="loading"
         >
           <el-table-column label="序号" type="index" width="50">
           </el-table-column>
@@ -139,7 +139,7 @@
           >
             暂无符合条件商品
           </div>
-          <el-checkbox-group v-model="checkList">
+          <el-checkbox-group v-model="checkList" v-loading="subLoading">
             <ul
               style="
                 max-height: 240px;
@@ -222,7 +222,8 @@ export default {
       checkList: [],
       statusPop: "", //1新增2修改
       isMatchingDialog: false,
-      loading: false,
+      loading: false, // 匹配商品加载
+      subLoading: false, // 搜索弹窗内容加载
     };
   },
   computed: {
@@ -248,6 +249,7 @@ export default {
     openBoxs(row) {
       this.isMatchingDialog = true;
       this.queryData = row;
+      this.tableData = []
       console.log(this.queryData, "queryData");
       this.initData();
     },
@@ -259,6 +261,7 @@ export default {
      * 搜索弹窗内容
      */
     getSeachData(type) {
+      this.subLoading = true
       var data = {
         goodsType: type,
         goodsName: this.goodsName || "",
@@ -270,7 +273,9 @@ export default {
       }
       this.$api.inquireGoods(data).then((res) => {
         this.goodsList = res.rows;
-      });
+      }).finally(() => {
+        this.subLoading = false
+      })
     },
     /**
      * 设置
@@ -366,11 +371,11 @@ export default {
               this.tableData = arr;
             })
             .finally(() => {
-              this.loading = true;
+              this.loading = false;
             });
         })
         .finally(() => {
-          this.loading = true;
+          console.log('end')
         });
     },
   },

src/views/Marketing/productPackManage/index.vue

@@ -17,14 +17,14 @@
         <el-button
           size="medium"
           type="warning"
-          @click="openEditProductPackDialog(null, 'add')"
+          @click="openEditGoodsPackDialog(null, 'add')"
           >新增</el-button
         >
       </template>
       <template slot="btn" slot-scope="props">
         <el-button
           type="text"
-          @click="openEditProductPackDialog(props.scope.row, 'edit')"
+          @click="openEditGoodsPackDialog(props.scope.row, 'edit')"
           >修改</el-button
         >
         <el-button type="text" @click="openMatchingDialog(props.scope.row)"
@@ -40,7 +40,7 @@
       @handleSizeChange="handleSizeChange"
       @handleCurrentChange="handleCurrentChange"
     />
-    <editProductPack ref="editProductPack" @refresh="init()" />
+    <editGoodsPack ref="editGoodsPack" @refresh="init()" />
     <matchingDialog ref="matchingDialog" @refresh="init()" />
   </div>
 </template>
@@ -49,11 +49,11 @@
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
-import editProductPack from "./component/editProductPack.vue";
+import editGoodsPack from "./component/editGoodsPack.vue";
 import matchingDialog from "./component/matchingDialog.vue";
 export default {
   name: "OfflineOrder",
-  components: { searchBoxNew, tableList, pagination, editProductPack, matchingDialog },
+  components: { searchBoxNew, tableList, pagination, editGoodsPack, matchingDialog },
   data() {
     return {
       loading: false, //当前表单加载是否加载动画
@@ -78,7 +78,7 @@ export default {
         },
         {
           prop: "businessId",
-          placeholder: "培训项目",
+          placeholder: "业务层次",
           scope: "businessLevel",
           edu: "educationId",
         },
@@ -137,7 +137,7 @@ export default {
           hidden: true,
         },
         {
-          label: "培训项目",
+          label: "业务层次",
           prop: "projectName",
           hidden: true,
         },
@@ -186,8 +186,8 @@ export default {
   },
   methods: {
     // 打开新增/编辑商品包弹窗
-    openEditProductPackDialog(row, type) {
-      this.$refs.editProductPack.openBoxs(row, type);
+    openEditGoodsPackDialog(row, type) {
+      this.$refs.editGoodsPack.openBoxs(row, type);
     },
     // 打开匹配弹窗
     openMatchingDialog(row) {