浏览代码

样式调整

qymljy 2 年之前
父节点
当前提交
9f1b3e0857

+ 45 - 4
src/HManagement/addressList/addressBook/index.vue

@@ -2,25 +2,66 @@
   <div>
     <normalBook
         ref="basicLayout"
+        tableName="phoneBoolTable"
+        idName="sys_phonebookid"
+        :apiId="{query:20231220085804,del:''}"
+        :autoQuery="false"
     >
       <template #titleLight>
         <el-button size="small" type="primary">新建联系人</el-button>
       </template>
-      <template #tableLeft>
-        <div style="width: 220px">
+      <template #tableLeft style="padding: 0">
+        <div style="margin: 0;padding: 0;min-width: 320px;max-width: 320px;">
           <myGroup></myGroup>
         </div>
       </template>
+      <template v-slot:tbList="scope">
+        <div v-if="scope.data.column.columnname === 'status'">
+          <span style="color:#52c41a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '跟进中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已失败'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已结案'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
+        <div v-else>
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
+        </div>
+      </template>
     </normalBook>
   </div>
 </template>
 
 <script>
 import normalBook from "@/components/normal-basic-layout/normalBook";
-import myGroup from '../mygroup/index'
+import myGroup from '../mygroup/index';
 export default {
   name: "index",
-  components:{normalBook,myGroup}
+  components:{normalBook,myGroup},
+  data(){
+    return {
+      param:{
+        "id": 20231220085804,
+        "content": {
+          "type":1,
+          "groupname":"",
+          "sys_phonebookgroupid":0,
+          "pageNumber": 1,
+          "pageSize": 40,
+          "where": {
+            "condition": ""
+          }
+        }
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      /*const res = await this.$api.requested(this.param)*/
+      this.$refs.basicLayout.listData()
+    }
+  },
+  mounted() {
+    this.listData()
+  }
 }
 </script>
 

+ 2 - 2
src/HManagement/addressList/mygroup/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <add @onSuccess="onSuccess"></add>
+<!--    <add @onSuccess="onSuccess"></add>-->
     <list ref="list">
       <template v-slot:edit="data">
         <edit :data="data" @onSuccess="onSuccess"></edit>
@@ -35,4 +35,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

+ 1 - 1
src/HManagement/addressList/mygroup/modules/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container normal-panel">
+  <div class="container normal-panel" style="padding-top: 0">
     <div style="margin-bottom:30px">
       <p class="normal-title normal-margin">系统群组</p>
       <ul>

+ 1 - 1
src/HManagement/clueManage/m_activity/modules/detailTable.vue

@@ -12,7 +12,7 @@
       <el-input class="inline-16" type="text" v-model="params.content.where.condition" size="small" style="width:200px" placeholder="请输入搜索内容" @keyup.native.enter="getList(params.content.pageNumber=1)"></el-input>
       <slot name="addClue" />
     </div>
-    <tableNewLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="calc(100vh - 345px)" fixedName="operation">
+    <tableNewLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :width="true" height="calc(100vh - 345px)" fixedName="operation">
       <template v-slot:customcol="scope">
           <span v-if="scope.column.columnname == 'province'">
             {{scope.column.data.province}}-{{scope.column.data.city}}-{{scope.column.data.county}}

+ 1 - 1
src/components/dynamic-newTable/index.vue

@@ -7,7 +7,7 @@
           type="selection"
           width="35" fixed v-if="checkbox">
       </el-table-column>
-      <el-table-column show-overflow-tooltip v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="!width ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
+      <el-table-column show-overflow-tooltip v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width ? col.width : 150" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
         <template v-slot:header="{ column,$index }" v-if="customHeader">
           <slot name="header" :data="column"></slot>
         </template>

+ 39 - 35
src/components/normal-basic-layout/normalBook.vue

@@ -43,48 +43,52 @@
           <slot name="custom-right"></slot>
         </div>
       </div>
-      <div class="normal-panel flex-align-center" style="padding:0 16px">
-        <slot name="tableLeft"></slot>
-        <div style="flex:0 1 auto;width: 100%;" v-if="listType === 'table' && refreshTable">
-          <tableTemp ref="table" :layout="tableLayout" :tableName="tableName" :custom="true" :data="list" :fixRightData="fixRightData" :fixLeftData="fixLeftData" @headerSearch="onHeaderSearch" @checkboxCallBack="checkboxCallBack">
-             <template v-slot:temp="scope">
-              <slot name="tempChild" :data="scope.data"></slot>
-            </template>
+      <div class="normal-panel " style="padding:16px;">
+        <div style="display: flex;">
+          <slot name="tableLeft"></slot>
+          <div style="flex: 1;width: 70%" v-if="listType === 'table' && refreshTable">
+            <tableTemp ref="table" :layout="tableLayout" :tableName="tableName" :custom="true" :data="list" :fixRightData="fixRightData" :fixLeftData="fixLeftData" @headerSearch="onHeaderSearch" @checkboxCallBack="checkboxCallBack">
+              <template v-slot:temp="scope">
+                <slot name="tempChild" :data="scope.data"></slot>
+              </template>
 
-            <template v-slot:customcol="scope">
-              <slot :data="scope" name="tbList"></slot>
-            </template>
+              <template v-slot:customcol="scope">
+                <slot :data="scope" name="tbList"></slot>
+              </template>
 
-            <template v-slot:opreation="scope">
+              <template v-slot:opreation="scope">
 
-              <drawerTemp class="inline-16" v-if="detailPath && checkRowStatus(scope.data.status)" :data="scope.data" :detailPath="detailPath" :idName="idName" @onSuccess="listData"></drawerTemp>
-              <slot :data="scope" name="tbOpreation"></slot>
-              <!--systemappid != 163 排除报表应用-->
-              <reportCenter class="inline-16"  size="mini" :data="reportCenterLsit.filter(item => item.type == 'printinfo')" v-if="reportCenterLsit.filter(item => item.type == 'printinfo').length > 0 && systemappid != 163">
-                <template v-slot:print="scope2">
-                  <el-button @click="printBtn(scope.data,scope2.data)" type="text" size="mini">打 印</el-button>
-                </template>
-              </reportCenter>
+                <drawerTemp class="inline-16" v-if="detailPath && checkRowStatus(scope.data.status)" :data="scope.data" :detailPath="detailPath" :idName="idName" @onSuccess="listData"></drawerTemp>
+                <slot :data="scope" name="tbOpreation"></slot>
+                <!--systemappid != 163 排除报表应用-->
+                <reportCenter class="inline-16"  size="mini" :data="reportCenterLsit.filter(item => item.type == 'printinfo')" v-if="reportCenterLsit.filter(item => item.type == 'printinfo').length > 0 && systemappid != 163">
+                  <template v-slot:print="scope2">
+                    <el-button @click="printBtn(scope.data,scope2.data)" type="text" size="mini">打 印</el-button>
+                  </template>
+                </reportCenter>
 
-            </template>
-          </tableTemp>
-          <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
-            <div v-if="!hidePagination" class="container normal-panel" style="text-align:right">
-              <el-pagination
-                background
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="currentPage"
-                :page-sizes="[20, 50, 100, 200]"
-                :page-size="100"
-                layout="total,sizes, prev, pager, next, jumper"
-                :total="total">
-              </el-pagination>
+              </template>
+            </tableTemp>
+            <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
+              <div v-if="!hidePagination" class="container normal-panel" style="text-align:right">
+                <el-pagination
+                    background
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="currentPage"
+                    :page-sizes="[20, 50, 100, 200]"
+                    :page-size="100"
+                    layout="total,sizes, prev, pager, next, jumper"
+                    :total="total">
+                </el-pagination>
+              </div>
+              <slot name="footerLeft"></slot>
             </div>
-            <slot name="footerLeft"></slot>
-          </div>
 
+          </div>
         </div>
+
+
       </div>
     </div>
     <drawer :drawerWidth="drawerWidth" @onSuccess="listData"></drawer>

+ 1 - 1
src/router/HManagement.js

@@ -661,7 +661,7 @@ const HManagement = [
       ast_nav: true,
       keeproute: true
     },
-   /* component: () => import(/!* webpackChunkName: "about" *!/ '@/HManagement/addressList/addressBook/index')*/
+    /*component: () => import(/!* webpackChunkName: "about" *!/ '@/HManagement/addressList/addressBook/index')*/
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/addressList/mycontact/index')
   },{
     path: '/phonebookGroup',

+ 6 - 0
src/style/style.css

@@ -41,6 +41,12 @@ ul{
   display: flex;
   align-items: center;
 }
+.flex-align-top{
+  display: -webkit-flex; /* Safari */
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
 .flex-align-center-wrap{
   display: flex;
   flex-wrap: wrap;