centaline-data-driven 1.2.21 → 1.2.24

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

@@ -135,52 +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">
-              <!-- 联系人 -->
-              <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>
-                    <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>
-                      <button class="el-button el-button--primary el-button--mini max-btn-add">查看历史号码</button>
-                    </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>
-                  </el-table>
-              </div>
+              <ct-contactList v-if="model.contactApiRouter!==null" :apiRouter="model.contactApiRouter" ></ct-contactList>
             </div>
             <div class="tablist-info base-box">
                 <div class="details-tabs-box">
@@ -230,6 +189,17 @@
                   <div>该房源共<span class="red-text">{{model.fields1Dic.LookCustomerCount.value}}</span>位客户看房</div>
                   <div>最近7天带看<span class="red-text">{{model.fields1Dic.CustomerLookCount7.value}}</span>次,总带看<span class="red-text">{{model.fields1Dic.CustomerLookCountAll.value}}</span>次。</div>
               </div>
+              <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
+                <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
+                  <div class="t-item">
+                    <span class="i">{{col.operationName}}</span>
+                  </div>
+                  <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
+                  <div class="t-item" style="height: 50px;">
+                    <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
+                  </div>
+                </div>                  
+              </div>
               <div class="staff-info base-box">
                 <el-tabs :value="model.activeIndex2" @tab-click="handleClick">
                   <el-tab-pane v-for="(col, index) in model.tags2" :key="col.appID" 
@@ -262,17 +232,6 @@
                   </el-tab-pane>
                 </el-tabs>
               </div>
-              <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
-                <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
-                  <div class="t-item">
-                    <span class="i">{{col.operationName}}</span>
-                  </div>
-                  <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
-                  <div class="t-item" style="height: 50px;">
-                    <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
-                  </div>
-                </div>                  
-              </div>
               <div class="customer">
                   <div class="customer-title">
                       匹配客户
@@ -346,11 +305,13 @@
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
   import dynamicSearchList from '../../dynamicSearchList/src/dynamicSearchList.vue';
+  import dynamicContactList from './dynamicContactList.vue';
   export default {
     name: 'ct-PropertyDetailRET',
     mixins: [dynamicElement],
     components: {
       'ct-searchlist': dynamicSearchList,
+      'ct-contactList': dynamicContactList,
     },
     props: {
       vmodel: Object,
@@ -365,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/dynamicPhotoSelectList/src/dynamicPhotoSelectList.vue

@@ -107,6 +107,7 @@
           });
           self.FlagPhoto = true;
           self.imageList = sourceRows;
+          //self.imageList=[{thumbnailUrl:'lmg.jj20.com/up/allimg/tp01/1ZZH250054149-0-lp.jpg',mediaUrl:'lmg.jj20.com/up/allimg/tp01/1ZZH250054149-0-lp.jpg'}];
         } catch (e) {
           self.$message.warning(e);
         }
@@ -139,7 +140,7 @@
         if (this.chooseList && this.chooseList.length > 0) {
           this.$emit('handlePhoto', this.chooseList);
         } else {
-          self.$message.warning("请选择至少一张图片");
+          this.$message.warning("请选择至少一张图片");
         }
         
       },

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -719,7 +719,7 @@
                     },
                     on: {
                       submit(ev) {
-                        if (!field.flagFreshCurrentRow) {
+                        if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
                           self.model.doAction(ev);
                         }
                         self.$forceUpdate();
@@ -790,7 +790,7 @@
                 self.operationLoading = true;
                 field.doAction(submitData, (data) => {
                   self.operationLoading = false;
-                  if (!field.flagFreshCurrentRow) {
+                  if (!field.flagFreshCurrentRow && !field.flagAddRowAfterAction) {
                     self.model.doAction({ responseData: data });
                   }
                   self.$forceUpdate();
@@ -867,7 +867,7 @@
       },
       updateCurrentRow(router,data) {
         let self = this;
-        if (router.flagFreshCurrentRow) {
+        if (router.flagFreshCurrentRow || router.flagAddRowAfterAction) {
           self.tableComplate = true;
           self.model.getCurrentRowApiData(function () {
             self.$forceUpdate();

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

@@ -0,0 +1,86 @@
+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,        
+      _buttons: null,
+      _actionRouter: null,
+      _rowRouter: null,
+      get buttons() {
+        if (rtn._buttons !== null) {
+          return rtn._buttons;
+        }
+        else {
+          if (source.content.toolButtons) {
+            rtn._buttons = [];
+            source.content.toolButtons.forEach((v) => {
+              var button = Router(v);
+              button.is = "ct-btn";
+              button.attrs = { size: "mini", class: 'max-btn-gray' }
+              rtn._buttons.push(button);
+            });
+          }
+          return rtn._buttons;
+        }
+      },      
+      get actionRouter() {
+        if (rtn._actionRouter !== null) {
+          return rtn._actionRouter;
+        }
+        else {
+          rtn._actionRouter = [];
+          if (source.content.actionRouters) {
+            source.content.actionRouters.forEach((v) => {
+              var router = Router(v);
+              //router.is = "ct-btn";
+              //router.attrs = { size: "mini" }
+              rtn._actionRouter.push(router);
+            });
+          }
+          return rtn._actionRouter;
+        }
+      },
+      get rowRouter() {
+        if (rtn._rowRouter !== null) {
+          return rtn._rowRouter;
+        }
+        else {
+          rtn._rowRouter = [];
+          if (rtn.actionRouter) {
+            rtn.actionRouter.forEach((v) => {
+              if (v.show) {
+                rtn._rowRouter.push(v);
+              }
+            });
+          }
+          return rtn._rowRouter;
+        }
+      },
+    };
+    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 {
+    var rtn = init(source);
+    if (callBack) {
+      callBack(rtn);
+    }
+  }
+}
+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) {
@@ -295,7 +310,7 @@ const Detail = function (source,para ,callBack) {
           }
           if(field.id=='Follow' 
           || field.id=='Trust' || field.id=='TrustZJJ' || field.id=='TrustDJ' || field.id=='TrustPT'
-          || field.id=='RealLook'
+          || field.id=='RealLook' || field.id=='RealLookVR'
           || field.id=='StatusAdjust'
           || field.id=='OperationKey' || field.id=='OperationKeyCommon' || field.id=='OperationKeyPassword'
           || field.id=='Key'){
@@ -306,6 +321,9 @@ const Detail = function (source,para ,callBack) {
             else if(field.id=='TrustZJJ' || field.id=='TrustDJ' || field.id=='TrustPT'){
               id='Trust';
             }
+            else if(field.id=='RealLookVR'){
+              id='RealLook';
+            }
             var advIndex = rtn.tags1.findIndex((v) => {
               return v.appID === id;
             });

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

@@ -183,6 +183,10 @@ const Router = function (source) {
     get flagFreshCurrentRow() {
       return source.flagFreshCurrentRow;
     },
+    //路由操作完成后是根据返回ID读取数据新增行
+    get flagAddRowAfterAction() {
+      return source.flagAddRowAfterAction;
+    },
     get textColor() {
       return source.textColor || '';
     },

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

@@ -563,7 +563,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             groupName: self.primaryKey,
             operation: 2,
             searchDataType: 3,
-            searchValue1: router.actionType==Enum.ActionType.New? rtnData.responseData.content: rtn.listData[rtn.selectIndex][self.primaryKey],
+            searchValue1: router.flagAddRowAfterAction? rtnData.responseData.content: rtn.listData[rtn.selectIndex][self.primaryKey],
           });
         }
         Vue.prototype.$api.postHandler(common.globalUri(), {
@@ -577,7 +577,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           .then(function (response) {
             if (response.rtnCode === Enum.ReturnCode.Successful) {
               if (response.content.rows.length > 0) {
-                if(router.actionType==Enum.ActionType.New){
+                if(router.flagAddRowAfterAction){
                   rtn.setStyleRow(response.content.rows);
                   response.content.rows.forEach((nr) => {
                     rtn.listData.unshift(nr);

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;