Merge branch 'feat/banner-vertex' of gitee.com:cabbage_qd/web-base-admin into bd-dev

src/views/configManage/advertisementBanner/index.vue

@@ -9,7 +9,7 @@
     <div class="thetopbox">
       <el-form ref="form" :model="queryParams" label-width="100px">
         <el-row>
-          <el-col :span="4"  style="margin-left: -30px">
+          <!-- <el-col :span="4" style="margin-left: -30px">
             <el-form-item :label="'位置'" prop="status">
               <el-select v-model="queryParams.sendType" clearable placeholder="">
                 <el-option
@@ -20,9 +20,24 @@
                 />
               </el-select>
             </el-form-item>
+          </el-col> -->
+          <el-col :span="4" style="margin-left: -30px">
+            <el-form-item
+              label="隶属体系"
+              prop="status"
+            >
+              <el-select v-model="queryParams.pkVertex" clearable placeholder="">
+                <el-option
+                  v-for="item in vertexList"
+                  :key="item.pkId"
+                  :label="item.vertexName"
+                  :value="item.pkId"
+                />
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="'发送时间'" prop="creationTime">
+            <el-form-item label="创建时间" prop="creationTime">
               <el-date-picker
                 v-model="modifiedTime"
                 value-format="yyyy-MM-dd"
@@ -49,7 +64,7 @@
           </el-col>
           <el-col :span="4">
             <div class="searchbox">
-              <el-button class="my_search" @click="research()" style="margin-left: 40px"> {{ '搜索' }}</el-button>
+              <el-button class="my_search" style="margin-left: 40px" @click="research()"> {{ '搜索' }}</el-button>
               <el-button class="my_reset" @click="reChongzhi"> {{ '重置' }}</el-button>
             </div>
           </el-col>
@@ -64,8 +79,8 @@
       </div>
       <div class="maintable">
         <el-table
-          :data="tableData"
           v-loading="loading"
+          :data="tableData"
           height="730px"
           style="width: 100%"
           :header-cell-style="{ background: '#EEEEEE' }"
@@ -77,16 +92,17 @@
           <el-table-column align="center" prop="sort" :label="'排序'" />
           <el-table-column align="center" prop="phone" :label="'图片'">
             <template slot-scope="scope">
-                <img :src="scope.row.picture" style="width: 44px;height: 44px;border-radius: 8px" />
+              <img :src="scope.row.picture" style="width: 44px;height: 44px;border-radius: 8px">
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="positionVal" :label="'位置'" />
+          <el-table-column align="center" prop="vertexName" label="隶属体系" />
+          <!-- <el-table-column align="center" prop="positionVal" :label="'位置'" /> -->
           <el-table-column align="center" prop="link" :label="'链接'" />
           <el-table-column align="center" prop="creationTime" :label="'创建日期'" />
           <el-table-column align="center" prop="effectiveDate" :label="'生效日期'" />
           <el-table-column align="center" :label="'操作'" width="150">
             <template slot-scope="scope">
-              <el-button
+              <!-- <el-button
                 class="colors"
                 type="text"
                 style="color: #108EE9"
@@ -112,7 +128,7 @@
                 @click.native.prevent="updateTop(scope.row)"
               >
                 {{ '置顶' }}
-              </el-button>
+              </el-button> -->
               <el-button
                 class="colors"
                 type="text"
@@ -120,7 +136,7 @@
                 style="color: #FFAD41"
                 @click.native.prevent="updateShow(scope.row)"
               >
-                {{ '查看' }}
+                编辑
               </el-button>
               <el-button
                 class="colors"
@@ -129,7 +145,7 @@
                 style="color: #C73030"
                 @click.native.prevent="delRole(scope.row)"
               >
-                {{ '删除' }}
+                删除
               </el-button>
             </template>
           </el-table-column>
@@ -145,7 +161,7 @@
       :before-close="handleClose"
     >
       <el-form ref="forms" :rules="rules" :model="table" label-width="80px">
-        <el-form-item :label="'发布位置'" class="input-s" prop="position">
+        <!-- <el-form-item :label="'发布位置'" class="input-s" prop="position">
           <el-select v-model="table.position" clearable placeholder="">
             <el-option
               v-for="item,index in getPostionList"
@@ -154,7 +170,7 @@
               :value="item.value"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="'排序'" prop="sort">
           <el-input
             v-model="table.sort"
@@ -170,6 +186,16 @@
             :placeholder="'请输入'"
           />
         </el-form-item>
+        <el-form-item label="隶属体系" prop="pkVertex">
+          <el-select v-model="table.pkVertex" clearable placeholder="">
+            <el-option
+              v-for="item in vertexList"
+              :key="item.pkId"
+              :label="item.vertexName"
+              :value="item.pkId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item :label="'生效日期'" prop="effectiveDate">
           <el-date-picker
             v-model="table.effectiveDate"
@@ -201,14 +227,22 @@
 
 <script>
 import topBar from '@/components/topBar'
-import { getbdmenuList, getPubenumsList } from '@/api/system'
+import { getPubenumsList } from '@/api/system'
 import { getgradeRanglist, getAwardsListChiose } from '@/api/level'
 import * as api from '@/api/sms.js'
 import { Message } from 'element-ui'
-import { deleteAgreement } from '@/api/configManage'
 import ImageUpload from '@/components/ImageUpload'
+import { getvertexValue } from '@/api/member'
+const initForm = {
+  position: 1,
+  picture: '',
+  sort: '',
+  effectiveDate: '',
+  link: '',
+  pkVertex: ''
+}
 export default {
-  name: 'Qxpz',
+  name: 'BannerConfig',
   components: {
     topBar,
     ImageUpload
@@ -236,7 +270,9 @@ export default {
           { required: true, message: '请输入链接', trigger: 'blur' }
         ]
       },
-      table: { position: '', picture: '', sort: '', effectiveDate: '', link: '' },
+      table: {
+        ...initForm
+      },
       ruleShow: false,
       moren: 'advertisementBanner',
       topList: [
@@ -253,7 +289,8 @@ export default {
       multipleSelection: [],
       queryParams: {
         pageNum: 1,
-        pageSize: 50
+        pageSize: 50,
+        pkVertex: ''
       },
       gradeRangList: [],
       awardsList: [],
@@ -265,15 +302,22 @@ export default {
       total: 0,
       types: '',
       formId: '',
-      getPostionList: []
+      getPostionList: [],
+      vertexList: [] // 隶属体系
+
     }
   },
   created() {
     this.research()
     this.getPostion()
+    this.getvertexValue()
   },
   methods: {
-    // 置顶
+    getvertexValue() {
+      getvertexValue().then((res) => {
+        this.vertexList = res.data
+      })
+    },
     updateTop(item) {
       api.getPostion({ 'pkId': item.pkId }).then((res) => {
         if (res.code == '200') {
@@ -420,7 +464,9 @@ export default {
     },
     handleClose() {
       this.ruleShow = false
-      this.table = { position: '', picture: '', sort: '', effectiveDate: '', link: '' }
+      this.table = {
+        ...initForm
+      }
     },
     changeBox(row) {
       console.error(row)