页面修改

src/components/sale/b2bcustomlist.vue

@@ -111,6 +111,10 @@
       sticky: {
         type: String,
         default: ""
+      },
+      loading: {
+        type: Boolean,
+        default: false,
       }
     },
     components: {
@@ -134,7 +138,7 @@
           },
           {
             name: "CategoryName",
-            label: "同业名称",
+            label: "同行名称",
             field: "CategoryName",
             align: "left"
           },
@@ -231,9 +235,9 @@
       this.getEmployeeList();
     },
     mounted() {
-      if(this.dataList&&this.dataList.length>0){
-        this.dataList.forEach(x=>{
-          if(x.CustomerType==4){
+      if (this.dataList && this.dataList.length > 0) {
+        this.dataList.forEach(x => {
+          if (x.CustomerType == 4) {
             x.CategoryName = x.EnterpriseName
           }
         })

src/components/sale/customcategorylist.vue

@@ -10,8 +10,8 @@
 </style>
 <template>
   <div class="b2bcustomlist">
-    <q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat
-        class="sticky-column-table" separator="none" :data="dataList" :columns="columns" row-key="CustomerId">
+    <q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
+      separator="none" :data="dataList" :columns="columns" row-key="CustomerId">
       <template v-slot:top>
         <q-space />
         <div class="page-option">
@@ -41,8 +41,10 @@
       </template>
       <template v-slot:body-cell-optioned="props">
         <q-td :props="props">
-          <q-btn flat size="xs" icon="edit" color="accent" @click="EditCustom(props.row)" style="font-weight:400" label="修改" />
-          <q-btn flat size="xs" icon="delete" @click="RemoveCustomer(props.row)" color="negative" style="font-weight:400" label="删除" />
+          <q-btn flat size="xs" icon="edit" color="accent" @click="EditCustom(props.row)" style="font-weight:400"
+            label="修改" />
+          <q-btn flat size="xs" icon="delete" @click="RemoveCustomer(props.row)" color="negative"
+            style="font-weight:400" label="删除" />
         </q-td>
       </template>
       <template v-slot:bottom>
@@ -52,7 +54,8 @@
     <categoryEdit-form v-if="isShowCategoryForm" :customerObj="customerObj" @close="closeCustomForm"
       @success="refreshQuestion">
     </categoryEdit-form>
-    <peerRight v-if="isShowDetailForm" :CategoryId="CategoryId" @close="closeCustomForm" :auth="AuthorityObj" @success="refreshQuestion"></peerRight>
+    <peerRight v-if="isShowDetailForm" :CategoryId="CategoryId" @close="closeCustomForm" :auth="AuthorityObj"
+      @success="refreshQuestion"></peerRight>
   </div>
 </template>
 <script>
@@ -66,6 +69,10 @@
       dataList: {
         type: Array,
         default: null
+      },
+      loading: {
+        type: Boolean,
+        default: false,
       }
     },
     components: {
@@ -127,7 +134,7 @@
         loading: false,
         isShowCategoryForm: false,
         customerObj: null, //传入参数
-        tabId:1,
+        tabId: 1,
         //权限设置
         AuthorityObj: {
           isShowEdit: false, //是否显示新增修改按钮
@@ -135,15 +142,14 @@
           isShowBankBook: false, //是否显示幸福存折
           isShowRebate: false //是否显示返佣
         },
-        isShowDetailForm:false,
-        CategoryId:0
+        isShowDetailForm: false,
+        CategoryId: 0
       };
     },
     created() {
 
     },
-    mounted() {
-    },
+    mounted() {},
     methods: {
       //新增或者修改客户
       EditCustom(obj) {

src/components/sale/customerEdit-form.vue

@@ -139,7 +139,7 @@
             :options="customList" class="col-6 q-pr-lg q-pb-lg" v-model="objOption.CategoryId" clearable emit-value map-options />
           <template v-if="objOption.CustomerType!=4">
             <div class="col-6" v-if="!isShowEdit">
-              <q-btn label="立即添加" @click="isShowEdit=true" size="sm" color="primary" />
+              <q-btn label="立即添加同行" @click="isShowEdit=true" size="sm" color="primary" />
             </div>
             <div class="col-6" v-if="isShowEdit" style="position:relative">
               <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.CategoryName" lazy-rules

src/pages/sale/b2bAllCustomer.vue

@@ -28,7 +28,7 @@
             <q-input @input="resetSearch" filled clearable v-model="msg.CustomerName" label="联系人" maxlength="20" />
           </div>
           <div class="col-3">
-            <q-input @input="resetSearch" filled clearable v-model="msg.CategoryName" label="同业名称" maxlength="20" />
+            <q-input @input="resetSearch" filled clearable v-model="msg.CategoryName" label="同行名称" maxlength="20" />
           </div>
           <div class="col-3">
             <q-input @input="resetSearch" filled clearable v-model="msg.ContactNumber" label="电话" maxlength="20" />

src/pages/sale/b2bcustomer.vue

@@ -28,7 +28,7 @@
               <q-input @input="resetSearch" filled clearable v-model="msg.CustomerName" label="联系人" maxlength="20" />
             </div>
             <div class="col-3">
-              <q-input @input="resetSearch" filled clearable v-model="msg.CategoryName" label="同业名称" maxlength="20" />
+              <q-input @input="resetSearch" filled clearable v-model="msg.CategoryName" label="同行名称" maxlength="20" />
             </div>
             <div class="col-3">
               <q-input @input="resetSearch" filled clearable v-model="msg.ContactNumber" label="电话" maxlength="20" />

src/pages/school/student.vue

@@ -48,7 +48,7 @@
       </div>
     </div>
     <div class="page-content">
-      <stulist :dataList="data" @success="refreshPage" ref="stuList">
+      <stulist :dataList="data" @success="refreshPage" :loading="loading" ref="stuList">
       </stulist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"