Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-oper into dev

epmet-oper-web/src/views/modules/customer/init/RegisterList.vue

@@ -281,7 +281,6 @@ export default {
       selCustomerId: '',
       diaSubVisible: false,
       activeName: 'resi',
-      dataListLoading: false,
 
       resiDataList: [],
       workDataList: [],
@@ -425,6 +424,7 @@ export default {
       this.workDataList = []
       this.$nextTick(() => {
         this.selCustomerId = row.customerId
+
         this.loadSubscribeData()
 
       })
@@ -433,7 +433,10 @@ export default {
 
     //加载列表数据
     async loadSubscribeData () {
-      this.dataListLoading = true
+      this.$refs.temp_list_resi_has.setTableLoading()
+      this.$refs.temp_list_resi_no.setTableLoading()
+      this.$refs.temp_list_work_has.setTableLoading()
+      this.$refs.temp_list_work_no.setTableLoading()
       // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getcustomerlist'
       const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getcustomerlist'
       let params = {
@@ -479,7 +482,10 @@ export default {
       } else {
         this.$message.error(msg + "：" + internalMsg)
       }
-      this.dataListLoading = false
+      this.$refs.temp_list_resi_has.setTableLoading()
+      this.$refs.temp_list_resi_no.setTableLoading()
+      this.$refs.temp_list_work_has.setTableLoading()
+      this.$refs.temp_list_work_no.setTableLoading()
     },
 
     // 订阅消息窗口取消
@@ -504,7 +510,7 @@ export default {
   }
 }
 </script>
-<style lang="css" >
+<style lang="css" scoped >
 .dialogSub .el-dialog__body {
   padding: 0 20px 10px 20px;
 }

epmet-oper-web/src/views/modules/customer/init/TempList.vue

@@ -8,7 +8,7 @@
                @click="tableType==='sync'?delSubSure():syncSubSure()">{{btnName}}</el-button>
     <el-table :height="subTabHeight"
               ref="ref_table"
-              v-loading="dataListLoading"
+              v-loading="tableLoading"
               :data="tableData"
               border
               style="width: 100%;"
@@ -59,7 +59,7 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      dataListLoading: false,
+      tableLoading: false,
       selCustomerId: '',
       resiAppid: '',
       workAppid: '',
@@ -70,9 +70,7 @@ export default {
   },
   components: {},
   activated () {
-    this.$nextTick(() => {
+
-      this.$refs.table.doLayout() // 解决表格错位
-    })
   },
   mounted () {
 
@@ -88,12 +86,15 @@ export default {
       this.selList = val
 
     },
-    getSelTemplIdList () {
+    setTableLoading () {
-      let selTempIdList = []
+      this.tableLoading = !this.tableLoading
+    },
+    getSelIdList () {
+      let selIdList = []
       this.selList.forEach(element => {
-        selTempIdList.push(element.tmplId)
+        selIdList.push(element.id)
       })
-      return selTempIdList
+      return selIdList
     },
     getSelPersonalIdList () {
       let personalIdList = []
@@ -117,7 +118,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let selList = this.getSelTemplIdList()
+        let selList = this.getSelIdList()
         if (selList.length === 0) {
           this.$message.info("请选择要同步的模板")
         } else {

epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue

@@ -1,70 +1,71 @@
 <!-- 代小程序管理 -->
 <template>
   <div>
+    <el-card shadow="never"
+             class="aui-card--fill">
+      <div v-show="!showVersion"
+           class="mod-demo__demo}">
 
-    <div v-show="!showVersion"
+        <el-form :inline="true"
-         class="mod-demo__demo}">
+                 :model="tableParams">
+          <el-form-item>
+            <el-select v-model="tableParams.customerId"
+                       placeholder="客户"
+                       clearable>
+              <el-option v-for="item in form.data['customerId']"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-select v-model="tableParams.clientType"
+                       placeholder="类型"
+                       clearable>
+              <el-option v-for="item in form.data['clientType']"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
 
-      <el-form :inline="true"
+          <el-form-item>
-               :model="tableParams">
+            <el-button @click="loadTableData()">查询</el-button>
-        <el-form-item>
+          </el-form-item>
-          <el-select v-model="tableParams.customerId"
+          <!-- <el-form-item>
-                     placeholder="客户"
-                     clearable>
-            <el-option v-for="item in form.data['customerId']"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-select v-model="tableParams.clientType"
-                     placeholder="类型"
-                     clearable>
-            <el-option v-for="item in form.data['clientType']"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button @click="loadTableData()">查询</el-button>
-        </el-form-item>
-        <!-- <el-form-item>
             <el-button type="primary"
                        @click="commitCodeDiaShow('')">上传代码</el-button>
           </el-form-item> -->
-      </el-form>
+        </el-form>
-
-      <c-table column-type="index"
-               ref="table"
-               :url="tableUrl"
-               :params="tableParams"
-               keyword="MiniProList"
-               :operations="operations"
-               :tableHeight="tableHeight"
-               @versionManage="versionManage"
-               @setweappsupportversion="setweappsupportversion"
-               @basicinfo="basicinfo"
-               @getcategory="getcategory">
-      </c-table>
 
-    </div>
+        <c-table column-type="index"
+                 ref="table"
+                 :url="tableUrl"
+                 :params="tableParams"
+                 keyword="MiniProList"
+                 :operations="operations"
+                 :tableHeight="tableHeight"
+                 @versionManage="versionManage"
+                 @setweappsupportversion="setweappsupportversion"
+                 @basicinfo="basicinfo"
+                 @getcategory="getcategory">
+        </c-table>
 
-    <version-item v-show="showVersion"
+      </div>
-                  ref="ref_version_item"
-                  @okVersion="okVersion"
-                  @cancelVersion="cancelVersion"></version-item>
 
-    <low-version ref="ref_version_form"></low-version>
+      <version-item v-show="showVersion"
+                    ref="ref_version_item"
+                    @okVersion="okVersion"
+                    @cancelVersion="cancelVersion"></version-item>
 
-    <basic-info ref="ref_basic_info"></basic-info>
+      <low-version ref="ref_version_form"></low-version>
 
-    <category ref="ref_catefoty"></category>
+      <basic-info ref="ref_basic_info"></basic-info>
 
+      <category ref="ref_catefoty"></category>
+    </el-card>
   </div>
 </template>