Merge branch 'dev1.2' of http://192.168.3.207:10080/group3/qmx_page_admin into dev1.2

src/views/bus/components/distribute.vue

@@ -145,13 +145,13 @@ export default {
         cellClick(indx, index, arr) {
             this.digs = indx;
             this.cellIndex = index;
+            this.boxData = this.tableData1[index]?this.tableData1[index]:[];
             if (indx == 5) {
                 this.$refs.fenModel.centerDialogVisible = true;
                 // this.$refs.fenModel.selectedList = [];
             } else if (indx == 6) {
                 
             } else {
-                this.boxData = this.tableData1[index]?this.tableData1[index]:[];
                 this.$refs.editModel.boxVisible = true;
             }
         },

src/views/bus/components/editBox.vue

@@ -73,6 +73,7 @@
 </template>
 
 <script>
+import { scribeKey } from '@/api/api';
 import { industryData2, industryData3 } from'@/assets/js/industry_data';
 
 export default {
@@ -115,15 +116,13 @@ export default {
                 Y: ['云南'],
                 Z: ['浙江']
             },
-            proMapList: [],
-            keyData6: {}
+            proMapList: []
         }
     },
     created() {
         this.groupData2 = industryData2;
         this.groupData3 = industryData3;
         // this.checkboxGroup2 = this.boxData;
-        this.groupData6 = this.keyData6;
         console.log(this.groupData6);
         for (const key in this.provinceData) {
             this.groupData1.push(key);
@@ -131,6 +130,9 @@ export default {
                 return v
             });
         }
+        scribeKey().then(res => {
+            this.groupData6 = res.data;
+        })
     },
     methods: {
         confirmed() {

src/views/bus/components/subMage.vue

@@ -39,7 +39,7 @@
                         </el-switch>
                     </el-form-item>
                     <el-form-item label="区域：" :required="true" :show-message="false">
-                        <el-input class="areaChoose" v-model="bookForm.areas" placeholder="请选择区域" @click.native="decMsg(1)" readonly></el-input>
+                        <el-input v-model="bookForm.areas" placeholder="请选择区域" @click.native="decMsg(1)" readonly></el-input>
                     </el-form-item>
                     <el-form-item label="采购单位行业：" :required="true" :show-message="false">
                         <el-input v-model="bookForm.indust" placeholder="请选择采购单位行业" @click.native="decMsg(2)" readonly></el-input>
@@ -113,11 +113,8 @@
         </div>
         <!-- 开启邮箱提醒 -->
         <v-warn ref="emailed" :exportData="exportData"></v-warn>
-        <!-- 采购单位行业、信息类型弹框 -->
-        <v-edit ref="editModel" :digs="digs" :boxCheck="boxCheck"></v-edit>
-        <!-- 区域选择 -->
-        <area-select ref="editArea"></area-select>
-
+        <!-- 选择区域、采购单位行业、信息类型弹框 -->
+        <v-edit ref="editModel" :digs="digs" :boxData="boxData"></v-edit>
     </div>
 </template>
 
@@ -127,7 +124,6 @@ import vKey from './antistop.vue';
 import vDistri from './distribute.vue';
 import vWarn from './warnBox.vue';
 import vEdit from './editBox.vue';
-import areaSelect from "@/components/areaSelect.vue"
 export default {
     props: {
         entData: {}
@@ -136,7 +132,7 @@ export default {
         vKey, 
         vDistri,
         vWarn,
-        vEdit,areaSelect
+        vEdit
     },
     data() {
         return {
@@ -162,7 +158,7 @@ export default {
                 {id: 4, name: '每月推送', time: '每月28日9点推送一次'},
             ],
             emailVis: false,
-            digs: 0,
+            digs: 1,
             exportData: []
         }
     },
@@ -181,20 +177,6 @@ export default {
             this.bookForm.tuiCheck1 = res.data.apppush == '1' ? true : false;
             this.bookForm.tuiCheck2 = res.data.mailpush == '1' ? true : false;
         })
-        //获取区域设置
-        areaGetdata().then(res =>{
-            console.log(res.data)
-            let newArr = "";
-          for(let key in res.data.area){
-            if(res.data.area[key].length == 0){
-                newArr += `${key}、`
-            }else{
-              newArr += `${key} (${res.data.area[key].join('、')})、`
-            }
-          }
-          newArr = newArr.replace(/(.*)、/,'$1');
-          this.bookForm.areas = newArr;
-        })
     },
     methods: {
         booked(num) {
@@ -230,13 +212,8 @@ export default {
             })
         },
         decMsg(nums) {// 弹框
-          if(nums == 1){
-              this.$refs.editArea.boxVisible = true;
-          }else{
-              this.$refs.editModel.boxVisible = true;
-              this.digs = nums;
-          }
-            
+            this.$refs.editModel.boxVisible = true;
+            this.digs = nums;
         },
         tuiChecked(val) {// 推送时间
             this.ratemodes = val;