centaline-data-driven 1.1.61 → 1.1.65

package/build/centaline/centaline.path.js

@@ -31,6 +31,7 @@ const paths = {
     "dynamicRichText": "./src/centaline/dynamicRichText/index.js",//纯文本
     "dynamicComboBoxWithTextBox": "./src/centaline/dynamicComboBoxWithTextBox/index.js",//下拉框+文本
     "dynamicHyperLink": "./src/centaline/dynamicHyperLink/index.js",//带标签的超链接
+    "dynamicHyperLinkList": "./src/centaline/dynamicHyperLinkList/index.js",//带标签的超链接List
     "dynamicPlaceHolder": "./src/centaline/dynamicPlaceHolder/index.js",//占位控件
     "dynamicDetail": "./src/centaline/dynamicDetail/index.js",//详情页控件
     "dynamicTree": "./src/centaline/dynamicTree/index.js",//树组件

package/config/dev.env.js

@@ -5,7 +5,7 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://10.88.1.151:8085/v1/form/router"',//aplus黄兰
-  BASE_API: '"http://10.88.22.46:7070/v1/form/router"',//max本地
+  BASE_API: '"http://10.88.22.13:7070/v1/form/router"',//max本地
   //BASE_API: '"http://10.88.22.71:5008/api/doaction/router"',
   // BASE_API: '"http://tjcptest.centaline.com.cn/v1/form/router"',
   // BASE_API: '"http://10.88.200.31:5000/gateway/redirect"',

package/package.json

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

package/src/Form.vue

@@ -24,7 +24,7 @@
         // apiParam: {SN: "13557_132", UserID: "wuhan3"},
         // apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
         // apiParam: {chanceID: "1", actionType: 2} ,
-        apiParam: {worklistID: "1491261975253094400", actionType: 2}
+        apiParam: {worklistID: "1494180846406602752", actionType: 2}
         // apiParam: {
         //   actionType: 2,
         //   agentId: "1450283160825425922",

package/src/SearchList.vue

@@ -1,8 +1,16 @@
 <template>
   <div id="app-search" style="height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
+
     <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist>
     <!-- <ct-searchlist :searchConditionApi="'/WorklistList/getLayoutOfSearch'" :searchDataApi="'/WorklistList/getListOfSearchModel'" :searchCategoryApi="'/WorklistList/getLayoutOfSearchCategory'"></ct-searchlist> -->
+
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+                   :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
+                   :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
+                    :searchStatsApi="'/exampleList/getListStats'"
+                   ></ct-searchlist> -->
+
     <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/SearchTree.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app-Tree" style="height:100%;position: fixed;width:100%">
-    <ct-treelist :flagsearch="true" :apiParam="apiParam"
+    <ct-treelist :flagsearch="true" :apiParam="apiParam" :leftWidth="'180'"
                  :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
                  :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
     <ct-dialog-list></ct-dialog-list>

package/src/centaline/css/common.css

@@ -566,11 +566,10 @@ html {
 
 .ct-searchtable{
   margin-top: 10px;
-  padding: 20px 10px 0 0px;
+  padding: 20px 10px 0 15px;
   background: #fff;
   -webkit-box-sizing: border-box;
   border-radius:6px;
-
 }
 
 .ct-unitname {
@@ -589,11 +588,13 @@ html {
     background-color: #bebebe;
     height: 5px;
     border-radius: 4px;
+    display: block;
 }
- ::-webkit-scrollbar {
+::-webkit-scrollbar {
   width: 6px;
   height:6px;
-  background-color: #f1f1f1
+  background-color: #f1f1f1;
+  display: block;
  }
 
 .el-input-group__append, .el-input-group__prepend {
@@ -712,7 +713,7 @@ html {
   right: 10px !important;
 }
 .ct-table-content{
-  padding: 0 15px;
+  padding: 0;
 }
 .el-card.is-always-shadow {
   border: none;

package/src/centaline/css/max.css

@@ -146,6 +146,12 @@
     width:4px;
     height:6px;
 }
+.ct-selectOptionVertical::-webkit-scrollbar {
+    width: 6px!important;
+    height:6px!important;
+    background-color: #f1f1f1!important;
+    display: block!important;
+   }
 .ct-table-auto{
     white-space: nowrap;
 }
@@ -206,3 +212,21 @@
     color: #666;
     border-color:#cecece;
   }
+  .details-content .ct-search-list .ct-ptb5{
+      padding: 0 0 10px 0;
+  }
+  .details-content .ct-search-list .ct-searchtable{
+    margin-top: 0;
+    padding: 0px;
+  }
+  .details-content .ct-search-list .ct-searchtable .ct-table-content{
+      padding: 0;
+  }
+  .icon-more{
+    background: url(../../assets/vertical.png)no-repeat;
+    background-size: 100% 100%;
+    height: 12px;
+    width: 14px;
+    display: inline-block;
+    margin-right: 2px;
+}

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

@@ -180,86 +180,19 @@
             </div>
             <div class="tablist-info base-box">
                 <div class="details-tabs-box">
-                  <el-menu :default-active="model.activeIndex" class="el-menu-demo el-menu-detail" mode="horizontal" @select="handleSelect">
+                  <!-- <el-menu :default-active="model.activeIndex1" class="el-menu-demo el-menu-detail" mode="horizontal" @select="handleSelect">
                     <el-menu-item v-for="(col, index) in model.tags1" :key="col.appID" :index="index.toString()">
                       {{col.appName}}
                     </el-menu-item>
-                  </el-menu>
+                  </el-menu> -->
+                  <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
+                    <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID" 
+                    :index="index.toString()" :name="index.toString()" :label="col.appName"></el-tab-pane>
+                  </el-tabs>
                   <ct-searchlist v-if="model.searchConditionApiTags1" :key="model.searchlistKey"
                   :apiParam="model.paramDataTags1"
                   :searchConditionApi="model.searchConditionApiTags1" 
                   :searchDataApi="model.searchDataApiTags1"></ct-searchlist>
-                    <!-- <el-tabs v-model="follow">
-                      <el-tab-pane label="跟进" name="first">
-                        <el-form
-                          class="follow-search-bar"
-                        >
-                              <!-- <el-select
-                                v-model="value"
-                                placeholder="跟进类型"
-                                class="mr10"
-                              >
-                                <el-option
-                                  v-for="item in options"
-                                  :key="item.value"
-                                  :label="item.label"
-                                  :value="item.value"
-                                >
-                                </el-option>
-                              </el-select>
-                              <el-input
-                                class="w300 mr10"
-                                placeholder="请输入"
-                                maxlength="500"
-                              ></el-input>
-                              <el-button
-                                type="primary"
-                                @click="onSearch"
-                              >保存</el-button>
-                              <button class="el-button el-button--primary el-button--mini max-btn-add">新增跟进</button>
-                        </el-form>
-
-                        <el-table
-                          :data="followData"
-                          stripe
-                          style="width: 100%;margin-top:20px;height:200px;overflow:auto"
-                          :header-cell-style="{background:'#f3f3f3',color:'#333333'}"
-                          >
-                          <el-table-column
-                            prop="date"
-                            label="日期"
-                            width="180">
-                          </el-table-column>
-                          <el-table-column
-                            prop="name"
-                            label="状态"
-                            width="180">
-                          </el-table-column>
-                          <el-table-column
-                            prop="address"
-                            label="跟进人">
-                          </el-table-column>
-                          <el-table-column
-                            prop="address"
-                            label="跟进人部门">
-                          </el-table-column>
-                          <el-table-column
-                            prop="address"
-                            label="跟进时间">
-                          </el-table-column>
-                        </el-table>
-                      </el-tab-pane>
-                      <el-tab-pane label="委托" name="second">委托</el-tab-pane>
-                      <el-tab-pane label="钥匙" name="third">钥匙</el-tab-pane>
-                      <el-tab-pane label="交易变更" name="fourth">交易变更</el-tab-pane>
-                      <el-tab-pane label="多媒体记录" name="">多媒体记录</el-tab-pane>
-                      <el-tab-pane label="业绩分配" name="">业绩分配</el-tab-pane>
-                      <el-tab-pane label="楼主历史" name="">楼主历史</el-tab-pane>
-                      <el-tab-pane label="租户信息" name="">租户信息</el-tab-pane>
-                      <el-tab-pane label="合并盘" name="">合并盘</el-tab-pane>
-                      <el-tab-pane label="佐证" name="">佐证</el-tab-pane>
-                      <el-tab-pane label="销控表" name="">销控表</el-tab-pane>
-                    </el-tabs> -->
                 </div>
             </div>
               <div class="contribute-info base-box">
@@ -299,29 +232,35 @@
                   <div>最近7天带看<span class="red-text">{{model.fields1Dic.CustomerLookCount7.value}}</span>次,总带看<span class="red-text">{{model.fields1Dic.CustomerLookCountAll.value}}</span>次。</div>
               </div>
               <div class="staff-info base-box">
-                  <el-tabs v-model="opening " @tab-click="handleClick">
-                    <el-tab-pane label="开盘人" name="first">
-                        <div class="el-tabs__content">
-                            <div role="tabpanel" id="pane-first" aria-labelledby="tab-first" class="el-tab-pane">
-                                <div class="tab-conten">
-                                  <img src="/static/img/user-head.d2916812.png">
-                                  <div>
-                                    <div class="user-name">
-                                      <div class="text">柳晓青</div><span class="user-but">系统管理组</span>
-                                    </div>
-                                  <div class="text">13736376666</div>
-                                  <div v-show="allIn"><div class="user-other">其它信息</div></div>
-                                </div>
-                              </div>
+                <el-tabs :value="model.activeIndex2" @tab-click="handleClick">
+                  <el-tab-pane v-for="(col, index) in model.tags2" :key="col.appID" 
+                  :index="index.toString()" :name="index.toString()" :label="col.appName">
+                    <div v-if="col.appID==='Maintain'" class="el-tabs__content">
+                        <div v-if="col.list" role="tabpanel" aria-labelledby="tab-first" class="el-tab-pane">
+                          <div class="tab-conten">
+                            <img :src="col.list[0].maintainEmpUrl">
+                            <div class="user-name">
+                              <div class="text">{{col.list[0].maintainEmpName}}</div><span class="user-but">{{col.list[0].maintainDeptName}}</span>
+                            </div>
+                            <div class="text">{{col.list[0].mobileNo}}</div>
+                          </div>
+                          <div v-show="allIn" class="tab-conten">
+                            <img src="/static/img/user-head.d2916812.png">
+                            <div class="user-name">
+                              <div class="text">柳晓青1</div><span class="user-but">系统管理组</span>
                             </div>
+                            <div class="text">13736376666</div>
+                          </div>
+                          <div class="open-mero" @click="allIn=!allIn">{{allIn?'收起全部':'查看全部'}}
+                            <img src="../../../assets/mero.png" alt="" class="mero" >  <!--:class="allIn?'more-colose':'more-open'" -->
+                          </div>
                         </div>
-
-                    </el-tab-pane>
-                    <el-tab-pane label="楼主" name="second">楼主</el-tab-pane>
-                  </el-tabs>
-                  <div class="open-mero" @click="allIn=!allIn">{{allIn?'收起全部':'查看全部'}}
-                    <img src="../../../assets/mero.png" alt="" class="mero" >  <!--:class="allIn?'more-colose':'more-open'" -->
-                  </div>
+                    </div>
+                    <div v-else class="el-tabs__content">
+                      <div v-for="(m, i) in col.list" class="text" :key="i">{{m.dutyEmpName}}</div>
+                    </div>
+                  </el-tab-pane>
+                </el-tabs>
               </div>
               <!-- <div class="operation-list p0">
                   <button data-v-6fe32525="" type="button" class="el-button list-item base-box el-button--default">编辑房源</button>
@@ -557,26 +496,6 @@
             remarks: '删除',
             isIcon: true,
           },
-        ],
-        follow:'first',
-        followData:[
-          {
-            date:'20/12/2020',
-            name:'出售',
-            address:'kenly',
-
-          }
-        ],
-        options: [{
-          value: '选项1',
-          label: '本盘跟进'
-        }, {
-          value: '选项2',
-          label: '全部跟进'
-        }, {value: '选项3',
-          label: '合开盘跟进'
-        },
-        
         ],
         opening:'first',      
       }
@@ -602,9 +521,18 @@
     },
     methods: {
       load(data) {
+        var self = this;
         this.model = data; 
         this.loadFields();
+        if(this.model.tags2 && this.model.tags2[0]){
+          this.model.getTags2List(0);
+        }
         this.setDetailHeight();
+        this.$nextTick(() => {
+          window.addEventListener("resize", (ev) => {
+            self.setDetailHeight();
+          });
+        });
       },
       loadFields() {
         var self = this;
@@ -654,12 +582,16 @@
         console.log('submit!');
       },
       handleClick(tab, event) {
-          console.log(tab, event);
+        let i=tab.index;
+        if(this.model.tags2 && this.model.tags2[i]){
+          this.model.getTags2List(i);
+        }
       },
       setDetailHeight() {
         this.$nextTick(() => {
           if (this.$refs.detail && this.$refs.main) {
-            var h1 = this.$refs.main.offsetHeight | 0;
+            var h1 = document.documentElement.clientHeight | 0;
+            var h2 = this.$refs.main.parentElement.offsetTop | 0;
             var h3 = this.$refs.detail.offsetTop | 0;
             let detailHeight = h1 - h3 - 65;
             this.model.detailHeight = detailHeight < 40 ? 350 : detailHeight;
@@ -667,11 +599,12 @@
         });
       }, 
       handleSelect(key, keyPath) {
-        if(this.model.tags1 && this.model.tags1[key]){
+        let i=key.index;
+        if(this.model.tags1 && this.model.tags1[i]){
           this.model.searchlistKey=this.model.searchlistKey+1;
-          this.model.searchConditionApiTags1=this.model.tags1[key].searchConditionApiUrl||'';
-          this.model.searchDataApiTags1=this.model.tags1[key].searchDataApiUrl||'';
-          this.model.paramDataTags1=this.model.tags1[key].paramData||'';
+          this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
+          this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
+          this.model.paramDataTags1=this.model.tags1[i].paramData||'';
         }
       },
     }
@@ -1021,7 +954,16 @@
             }
           }
         }
+        
         .tablist-info {
+          .details-tabs-box{
+            
+            .el-menu--horizontal > .el-menu-item{
+              height: 30px;
+              line-height: 30px;
+              border-radius: none;
+            }
+          }
         }
 
         .contribute-info {
@@ -1339,6 +1281,7 @@
 .r{
   float: right;
 }
+
 </style>
 
 

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -214,6 +214,7 @@
         });
       },
       fieldClickHandler(field) {
+        let submitData=null;
         var router = this.model.buttons.find((v) => {
           return v.id === field.id;
         });
@@ -223,11 +224,17 @@
           });
         }
         if(router==undefined){
-            router = this.model.actionRouters.find((v) => {
+          router = this.model.actionRouters.find((v) => {
             return v.id === field.id;
           });
         }
-        this.clickHandler(router);
+        if(router && field.isSubmitDataFromSelf){
+          submitData={};
+          router.submitFormField.forEach((v) => {
+            submitData[v] = field.list[field.listIndex].code;
+          });
+        }
+        this.clickHandler(router,submitData);
       },
       clickHandler(field, submitData) {
         var self = this;
@@ -367,6 +374,7 @@
           }
           //执行客户端脚本
           else {
+            debugger
             if (!submitData) {
               submitData = {};
               var tempFormData = self.model.getFormObj();
@@ -393,12 +401,12 @@
             //type: 'warning'
             center: field.alertCenter
           }).then(() => {
-            clickAcion(field);
+            clickAcion(field,submitData);
           }).catch(() => {
           });
         }
         else {
-          clickAcion(field);
+          clickAcion(field,submitData);
         }
       },
       changeHandler(field) {

package/src/centaline/dynamicHyperLinkList/index.js

@@ -0,0 +1,11 @@
+import dynamicHyperLinkList from './src/dynamicHyperLinkList'
+
+dynamicHyperLinkList.install = function (Vue) {
+  Vue.component(dynamicHyperLinkList.name, dynamicHyperLinkList);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicHyperLinkList);
+}
+
+export default dynamicHyperLinkList

package/src/centaline/dynamicHyperLinkList/src/dynamicHyperLinkList.vue

@@ -0,0 +1,58 @@
+<template>
+  <div class="field-top">
+    <div v-if="model !== null" class="ct-text ct-flex-div" :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']">
+      <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div" :class="[model.labelClass]">
+        <span>{{model.label}}</span>
+      </div>
+      <el-button v-for="(r, i) in model.list" style="padding-left: 15px;"
+                :key="i"
+                 :type="r.isHyperLink ? 'text' : 'primary'"
+                 v-bind="r.attrs" @click="clickHandler(i)">
+        {{r.name}}
+      </el-button>
+    </div>
+  </div>
+  
+</template>
+<script>
+  import dynamicElement from '../../mixins/dynamicElement'
+  export default {
+    name: 'ct-hyperLinkList',
+    props: {
+      vmodel: Object,
+      fileData: Object
+    },
+    mixins: [dynamicElement],
+    data: function () {
+      return {};
+    },
+    created() {
+      if (typeof this.vmodel === 'undefined') {
+        this.model = this.loaderObj.HyperLink(this.source);
+      }
+      else {
+        this.model = this.vmodel;
+      }
+    },
+    computed: {
+      headers() {
+        return this.$common.getDataDrivenOpts().handler.getRequestHeaders();
+      }
+    },
+    methods: {
+      handleAvatarSuccess(res) {
+        let self = this;
+        this.$api.postThenHandler({ data: res}).then(function () {
+          self.$emit('importComplete', res);
+        });
+      },
+      handleAvatarError(info) {
+        this.$message.warning("失败,请重试");
+      },
+      clickHandler(i) {
+        this.model.listIndex=i;
+        this.$emit('click');
+      },
+    }
+  }
+</script>

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue

@@ -236,4 +236,8 @@
     padding-left: 5px;
     padding-right: 5px;
   }
+  .el-table td.el-table__cell{
+    padding-left: 5px;
+    padding-right: 5px;
+  }
 </style>

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

@@ -11,7 +11,7 @@
     :categoryLoaded="loaded.categoryLoaded" @search="search()" 
     @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
-    <ct-searchtable ref="table" :api="searchDataApi" :searchDataStatisticsApi="searchDataStatisticsApi" 
+    <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" 
     @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
     @showTitle="showTitleHandler"></ct-searchtable>
   </div>
@@ -36,7 +36,7 @@
       searchCategoryApi: String,
       searchConditionApi: String,
       searchDataApi: String,
-      searchDataStatisticsApi: String,
+      searchStatsApi: String,
       pageHeight: String,
       apiParam: {
         type: Object,
@@ -79,6 +79,7 @@
       screenLoaded(defaultSearch) {
         this.loaded.screenLoaded = true;
         this.$refs.table.searchComplate(this.$refs.screen.model, defaultSearch);
+ 
         this.$emit('loaded', this.$refs.screen.model);
       },
       categoryLoaded(param) {
@@ -100,6 +101,8 @@
         else {
           this.$refs.table.searchComplate(this.$refs.screen.model);
         }
+
+        this.$refs.table.loadStats();
       },
       searchComplate() {
         this.pageDisabled=false;