Browse Source

修改内容提交

zhuxinbo 5 years ago
parent
commit
20377941a5

+ 3 - 3
src/views/modules/advertiser/AdvertiserList.vue

@@ -5,8 +5,8 @@
       <a-form layout="inline">
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
-            <a-form-item label="广告主名称">
-              <a-input placeholder="请输入广告主名称" v-model="queryParam.name"></a-input>
+            <a-form-item label="广告主开户主体名称">
+              <a-input placeholder="请输入广告主开户主体名称" v-model="queryParam.name"></a-input>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="6">
@@ -214,7 +214,7 @@ export default {
       // 表头
       columns: [
         {
-          title: '广告主名称',
+          title: '广告主开户主体名称',
           align: 'center',
           dataIndex: 'name'
         },

+ 2 - 2
src/views/modules/advertiser/modules/AdvertiserModal.vue

@@ -5,8 +5,8 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
 
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="广告主名称">
-          <a-input placeholder="请输入广告主名称" v-decorator="['name', validatorRules.name ]" />
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="广告主开户主体名称">
+          <a-input placeholder="请输入广告主开户主体名称" v-decorator="['name', validatorRules.name ]" />
         </a-form-item>
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="行业">
           <j-tree-select ref="treeSelect" placeholder="请选择行业" v-decorator="['industryId', validatorRules.pid]"

+ 2 - 0
src/views/modules/onlineTraining/onlineTrainingList.vue

@@ -168,6 +168,8 @@ export default {
             }
           })
         } else if (treeNode.eventKey == '系统操作') {
+          resolve()
+          return
         } else if (treeNode.eventKey.split('@').length == 2) {
           var data = treeNode.eventKey.split('@')
           if (data[1] == 'juliang') {