centaline-data-driven 1.2.21 → 1.2.22

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

@@ -140,47 +140,7 @@
               </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.searchConditionApiTags1" :key="model.searchlistKey" :apiParam="model.paramDataTags1" ></ct-contactList>
             </div>
             <div class="tablist-info base-box">
                 <div class="details-tabs-box">
@@ -346,11 +306,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,

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/Detail.js

@@ -295,7 +295,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 +306,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);