centaline-data-driven 1.2.22 → 1.2.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.22",
+  "version": "1.2.23",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/centaline/api/index.js

@@ -214,6 +214,14 @@ const api = {
         }
         else {
           Vue.prototype.$message.error(response.data.rtnMsg);
+          // Vue.prototype.$message({
+          //   message: response.data.rtnMsg,//消息文字
+          //   dangerouslyUseHTMLString: false,
+          //   type: 'error',//主题:success/warning/info/error
+          //   center: true,//是否居中
+          //   duration: 0, //显示时间, 毫秒。设为 0 则不会自动关闭
+          //   showClose: true,//是否显示关闭按钮
+          // });
         }
       }
       return Promise.reject(response);

package/src/centaline/css/common.css

@@ -768,4 +768,12 @@ html {
 }
 .ct-table-content .checkbox-td .el-checkbox{
   min-width: initial;
-}
+}
+
+.el-message__content{
+  white-space: pre-line;
+  line-height: 20px;
+}
+.details-mid .st-serach-screen,.details-mid .ct-searchtable{
+  border-radius: initial;
+}

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -3,7 +3,9 @@
         <!-- 联系人 -->
         <div class="contacts-head">
             <div class="title-l">联系人信息</div>
-            <button type="button"  v-if="!codeOwner"  @click="lookOwner" class="el-button contacts-but el-button--info el-button--mini max-info">查看业主</button>
+            <component class="el-button contacts-but el-button--info el-button--mini max-info" 
+                v-if="apiRouter!==null && !flagLook" :is="apiRouter.is" :vmodel="apiRouter" 
+                @click="lookOwner(apiRouter,$event)"></component>
             <div class="contacts-tips" v-else>
                 <button class="el-button el-button--primary el-button--mini max-btn-add">新增联系人</button>
                 <button class="el-button el-button--primary el-button--mini max-btn-add">通话记录</button>
@@ -11,33 +13,18 @@
             </div>
         </div>
         <!-- 表格 -->
-        <div class="contacts-table" v-show="codeOwner">
-            <el-table
-                :data="tableData"
-                stripe
-                fit
-                style="width: 100%"
-                :header-cell-style="{background:'#f3f3f3',color:'#333333'}">
-            <el-table-column
-            v-for="(item,index) in columnList"
-            :key="index"
-            :property="item.prop"
-            :label="item.label"
-            :min-width="item.width"
-        >
-            <template slot-scope="scope">
-            <span v-if="scope.column.property=='phone'">{{ scope.row.phone }}
-                
-            </span>
-            <span v-else-if="scope.column.property=='tel'">
-                {{scope.row.tel}}
-                
-            </span>
-            <span v-else>
-                {{scope.row[scope.column.property]}}
-            </span>
-            </template>
-        </el-table-column>
+        <div class="contacts-table" v-show="flagLook">
+            <el-table :data="tableData" stripe fit style="width: 100%" :header-cell-style="{background:'#f3f3f3',color:'#333333'}">
+                <el-table-column v-for="(item,index) in columnList" :key="index"
+                    :property="item.prop" :label="item.label" :min-width="item.width" >
+                    <template slot-scope="scope">
+                    <span v-if="scope.column.property=='phone'">{{scope.row.phone }}</span>
+                    <span v-else-if="scope.column.property=='tel'">{{scope.row.tel}}</span>
+                    <span v-else>
+                        {{scope.row[scope.column.property]}}
+                    </span>
+                    </template>
+                </el-table-column>
             </el-table>
         </div>
     </div>
@@ -53,10 +40,14 @@
       vmodel: Object,
       api: String,
       apiParam: Object,
+      apiRouter: {
+        Object,
+        default:{}
+      },
     },
     data() {
       return {
-        codeOwner: false,
+        flagLook: false,
         columnList: [
         {
           prop: 'name',
@@ -115,40 +106,31 @@
         opening:'first',      
       }
     },
-    mounted() {
-      var self = this;
-      this.$nextTick(function () {
-        if (self.vmodel) {
-          self.load(self.vmodel);
-        }
-        else if (typeof self.source !== 'undefined') {
-          self.loaderObj.Detail(self.source,null,self.load);
-        }
-        else if (typeof self.api !== 'undefined') {
-          self.loaderObj.Detail(self.api,self.apiParam, self.load);
-        }
-      });
+    mounted() {      
     },
     activated() {
       this.$nextTick(() => {
-        this.setDetailHeight();
+          this.setDetailHeight();
       })
     },
     methods: {
       load(data) {
         var self = this;
-        this.model = data; 
+        this.model = data;
         this.model.$vue = self;
-        
       },
       loadFields() {
         var self = this;        
       },
-      lookOwner() {
-        this.codeOwner = true
-      },
-      onSearch() {
-        console.log('submit!');
+      lookOwner(router) {
+        var self = this; 
+        var submitData=router.getActionPara({}).para;
+        router.doAction(submitData, (res) => {
+          if (res.rtnCode === Enum.ReturnCode.Successful) {
+            self.loaderObj.ContactList(res.content,null,self.load);
+            self.flagLook = true;
+          }
+        });
       },
       setDetailHeight() {
         this.$nextTick(() => {
@@ -320,53 +302,6 @@
   }
 </script>
 <style lang="scss" scoped>
-.main{
-  background: #ECEFF2;  
-}
-.rel{
-  position: relative;
-}
-.y-auto {
-    overflow-y: auto;
-    overflow-x: auto;
-}
-.w64{width: 64px!important}
-.w93{width: 93px!important}
-.w300 {
-  width: 300px;
-}
-.mt5{
-  margin-top: 5px;
-}
-.mt10{
-  margin-top: 10px;
-}
-.mt15{
-  margin-top: 15px;
-}
-.mb10{
-  margin-bottom: 10px;
-}
-.mb20 {
-    margin-bottom: 20px;
-}
-.mr10{
-  margin-right: 10px;
-}
-.p0 {
-    padding: 0 !important;
-  }
-  .pb10{
-    padding-bottom: 10px!important;
-  }
-  .f-wb {
-    font-weight: bold;
-}
-  .base-box {
-    background: #FFFFFF;
-    border-radius: 6px;
-    width: 100%;
-  }
   .details-content{
     font-size: 12px;
     .title-l{
@@ -963,36 +898,33 @@
     }
   }
   // 按钮
-        .max-info{
-          height: 26px;
-          color: #333333;
-          background-color: #FFFFFF;
-          border: 1px solid #E0E0E0;
-          border-radius: 6px;
-          font-size: 12px;
-        }
-        .max-default{
-          border: 1px solid #EE6B6B;
-          color: #EE6B6B;
-          height: 26px;
-          
-          border-radius: 6px;
-          font-size: 12px;
-        }
-        .max-info:hover,.max-default:hover{
-           background-color:#FF9393;
-            border-color: #FF9393;
-            color: #fff;
-        }
-        // .max-infon:hover.report,.max-info:active.report{
-        //   color: #fff;
-        // }
-        .max-info:active,.max-default:active{
-            background-color: #B33136;
-            border-color: #B33136;
-            color: #fff;
-        }
-        .max-btn-add button{ /*list-button*/
+.max-info{
+  height: 26px;
+  color: #333333;
+  background-color: #FFFFFF;
+  border: 1px solid #E0E0E0;
+  border-radius: 6px;
+  font-size: 12px;
+}
+.max-default{
+  border: 1px solid #EE6B6B;
+  color: #EE6B6B;
+  height: 26px;
+  
+  border-radius: 6px;
+  font-size: 12px;
+}
+.max-info:hover,.max-default:hover{
+    background-color:#FF9393;
+    border-color: #FF9393;
+    color: #fff;
+}
+.max-info:active,.max-default:active{
+    background-color: #B33136;
+    border-color: #B33136;
+    color: #fff;
+}
+.max-btn-add button{ /*list-button*/
     height: 26px;
     background: #EE6B6B;
     box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
@@ -1010,11 +942,7 @@
     height: 26px;
     border-radius: 6px;
 }
-.follow-search-bar{
-  display: flex;
-}
 .r{
   float: right;
 }
-
 </style>

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -135,12 +135,11 @@
                   </div>
               </div>
               <div class="open-mero" @click="allInfo=!allInfo">{{allInfo?'收起全部':'查看全部'}}
-                <!-- <img src="../../../assets/mero.png" alt="" class="mero" >  :class="allInfo?'more-colose':'more-open'" -->
                 <i :class="allInfo?'more-colose':'mero-open'"></i>
               </div>
             </div>
             <div class="contacts-info base-box">
-              <ct-contactList v-if="model.searchConditionApiTags1" :key="model.searchlistKey" :apiParam="model.paramDataTags1" ></ct-contactList>
+              <ct-contactList v-if="model.contactApiRouter!==null" :apiRouter="model.contactApiRouter" ></ct-contactList>
             </div>
             <div class="tablist-info base-box">
                 <div class="details-tabs-box">
@@ -327,66 +326,10 @@
           { name: '餐厅', url: 'http://10.5.10.44:13031/Images/20210705/112124_4f83c6d5-36bd-444f-9ea1-fa4e3f4de5e0.jpg?width=140&height=135&mode=stretch', isVr: false, type: 'img' },
           { name: '户型图', url: 'http://10.5.10.44:13031/Images/20210705/112505_6a3cb2d4-c773-4aba-91af-df6721eadb34.jpg?width=140&height=135&mode=stretch', isVr: false, type: 'video' },
           { name: '其它', url: 'http://10.5.10.44:13031/Images/20210705/112133_b62d7a78-96b3-4801-b94c-47b83263a001.jpg?width=140&height=135&mode=stretch', isVr: false, type: 'video' },
-        ],},
-        allInfo: false,
-        allIn:false,
-        codeOwner: false,
-        columnList: [
-        {
-          prop: 'name',
-          label: '联系人',
-          width: '80'
-        },
-        {
-          prop: 'type',
-          label: '类型',
-          width: '60'
-        },
-        {
-          prop: 'phone',
-          label: '手机',
-          width: '125'
-        },
-        {
-          prop: 'tel',
-          label: '座机',
-          width: '170'
-        },
-        {
-          prop: 'wx',
-          label: '微信',
-          width: '150'
+          ],
         },
-        {
-          prop: 'entTime',
-          label: '录入时间',
-          width: '150'
-        },
-        {
-          prop: 'entUser',
-          label: '录入人',
-          width: '80'
-        },
-        {
-          prop: 'remarks',
-          label: '操作',
-          // width:'180'
-        },
-        ],
-        tableData: [
-          {
-            name: '王建国先生',
-            type: '业主',
-            phone: '13866668888',
-            tel: '0275-55556666-5896',
-            wx: '555566665896',
-            entTime: '2021-10-26 29:27:25',
-            entUser: '王天',
-            remarks: '删除',
-            isIcon: true,
-          },
-        ],
-        opening:'first',      
+        allInfo: false,
+        allIn:false, 
       }
     },
     mounted() {

package/src/centaline/loader/src/ctl/ContactList.js

@@ -0,0 +1,31 @@
+import base from '../../index';
+import Base from './Base';
+import Enum from './lib/Enum';
+import common from '../../../common';
+import Router from './Router';
+import Vue from 'vue';
+const ContactList = function (source,para ,callBack) {
+  var init = function (data) {
+    var rtn = {
+        $vue: null,
+        
+    };
+    return rtn;
+  }
+  if (typeof source === 'string') {
+    Vue.prototype.$api.postHandler(common.globalUri(), { action: source,para:para}).then(
+      function (response) {
+        if (response.rtnCode === Enum.ReturnCode.Successful) {
+          var rtn = init(response.content);
+          if (callBack) {
+            callBack(rtn);
+          }
+        }
+      }
+    );
+  }
+  else {
+    return init(source);
+  }
+}
+export default ContactList;

package/src/centaline/loader/src/ctl/Detail.js

@@ -14,6 +14,7 @@ const Detail = function (source,para ,callBack) {
         _otherTradeActionRouter: null,//对应另外种交易的 router 如：本盘出售 则可能对应的出租的交易，没有则为空
         _actionRouters:null,//页面上的动作行为
         _actionRoutersMoreList:null,//页面上的更多动作行为
+        _contactApiRouter:null,//查看联系人
         detailHeight:750,
         activeIndex1:'0',
         activeIndex2:'0',
@@ -130,6 +131,20 @@ const Detail = function (source,para ,callBack) {
             }
             return rtn._otherTradeActionRouter;
           }
+        },        
+        get contactApiRouter() {
+          if (rtn._contactApiRouter !== null) {
+            return rtn._contactApiRouter;
+          }
+          else {
+            if (data.contactApiRouter) {                
+                var router = Router(data.contactApiRouter);
+                router.is = "ct-btn";
+                router.attrs = { size: "mini" }
+                rtn._contactApiRouter=router;
+            }
+            return rtn._contactApiRouter;
+          }
         },
         get actionRouters() {
             if (rtn._actionRouters !== null) {

package/src/centaline/loader/src/ctl.js

@@ -36,6 +36,7 @@ const loader = {
   PhotoSelect: require("./ctl/PhotoSelect.js").default,
   PhotoSelectList: require("./ctl/PhotoSelectList.js").default,
   QuickInputSos: require("./ctl/QuickInputSos.js").default,
+  ContactList: require("./ctl/ContactList.js").default,
 };
 
 export default loader;