centaline-data-driven 1.1.60 → 1.1.64

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.60",
+  "version": "1.1.64",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Form.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'/roomtype/readDetail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/employee/getLayoutOfPwd'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--:api="'FormSample/formdata'"-->
     <!--<ct-form :source="formdata.content"></ct-form>-->
@@ -16,8 +16,8 @@
     data() {
       return {
         apiParam: {
-        actionType: 2,
-        jsonData: {searchFields: {fields: []}}
+        actionType: 3,
+        empId:"202105071745197FAD2771D2D7A6A667"
         },
       }
     },

package/src/SearchList.vue

@@ -1,7 +1,7 @@
 <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="'/system/menulist/getLayoutOfSearch'" :searchDataApi="'/system/menulist/getList'"></ct-searchlist>
+     <ct-searchlist :searchConditionApi="'/estatemanage/estatlist/getLayoutOfSearch'" :searchDataApi="'/estatemanage/estatlist/getList'"></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/centaline/css/common.css

@@ -589,11 +589,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 {

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,13 @@
     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-top: 0px;
+  }
+  .details-content .ct-search-list .ct-searchtable .ct-table-content{
+      padding: 0;
+  }

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" 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 class="el-tabs__content">
+                        <div v-if="col.appID==='Maintain'" 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 class="user-name">
+                              <div class="text">柳晓青</div><span class="user-but">系统管理组</span>
+                            </div>
+                            <div class="text">13736376666</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 v-else>
+                          22222222222222
+                        </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,8 +521,15 @@
     },
     methods: {
       load(data) {
+        var self = this;
         this.model = data; 
         this.loadFields();
+        this.setDetailHeight();
+        this.$nextTick(() => {
+          window.addEventListener("resize", (ev) => {
+            self.setDetailHeight();
+          });
+        });
       },
       loadFields() {
         var self = this;
@@ -657,23 +583,22 @@
       },
       setDetailHeight() {
         this.$nextTick(() => {
-          if (this.$refs.detail) {
-            var h1 = this.$refs.main.offsetHeight | 0;
-            var h2 = this.$refs.detail.offsetTop | 0;
-            let detailHeight = h1 - h2 - 5;
+          if (this.$refs.detail && this.$refs.main) {
+            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;
-            console.log(h1);
-            console.log(h2);
-            console.log(this.model.detailHeight);
           }
         });
       }, 
       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||'';
         }
       },
     }
@@ -1023,7 +948,16 @@
             }
           }
         }
+        
         .tablist-info {
+          .details-tabs-box{
+            
+            .el-menu--horizontal > .el-menu-item{
+              height: 30px;
+              line-height: 30px;
+              border-radius: none;
+            }
+          }
         }
 
         .contribute-info {
@@ -1341,6 +1275,7 @@
 .r{
   float: right;
 }
+
 </style>
 
 

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/dynamicSearchTable.vue

@@ -754,9 +754,12 @@
                 self.operationLoading = true;
                 field.doAction(submitData, (data) => {
                   self.operationLoading = false;
-                  self.model.doAction({ responseData: data });
+                  if (!field.flagFreshCurrentRow) {
+                    self.model.doAction({ responseData: data });
+                  }
                   self.$forceUpdate();
                   self.$refs.footer.$forceUpdate();
+                  self.updateCurrentRow(field);
                 })
               }
             }
@@ -880,7 +883,7 @@
 
   .ct-searchtable .ct-table {
     min-width: 100%;
-    border-collapse: collapse;
+    border-collapse: separate;
   }
 
     .ct-searchtable .ct-table th {

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -11,7 +11,7 @@
                 @keyup.enter.native="search()">
         <span slot="suffix" v-if="model.unitName" class="ct-unitname">{{model.unitName}}</span>
 
-        <span slot="suffix" class="el-input__suffix el-input--mini" v-if="showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
+        <span slot="suffix" class="el-input__suffix el-input--mini" v-if="!model.isPassword&&showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
           <span class="el-input__suffix-inner ct-close">
             <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
           </span>

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

@@ -14,11 +14,15 @@ const Detail = function (source,para ,callBack) {
         _actionRouters:null,//页面上的动作行为
         _actionRoutersMoreList:null,//页面上的更多动作行为
         detailHeight:750,
-        activeIndex:'0',
+        activeIndex1:'0',
+        activeIndex2:'0',
         searchlistKey:0,
         _searchConditionApiTags1:null,
         _searchDataApiTags1:null,
         _paramDataTags1:null,
+        _searchConditionApiTags2:null,
+        _searchDataApiTags2:null,
+        _paramDataTags2:null,
         get fields1() {
             return data.fields1;
         },
@@ -206,6 +210,46 @@ const Detail = function (source,para ,callBack) {
             rtn._paramDataTags1={};
             if(v)rtn._paramDataTags1 = JSON.parse(v);
         },
+        get tags2() {
+            return data.tags2;
+        },
+        get searchConditionApiTags2() {
+          if (rtn._searchConditionApiTags2 !==null){
+            return rtn._searchConditionApiTags2;
+          }
+          else if(rtn.tags2 && rtn.tags2.length>0){
+            rtn._searchConditionApiTags2= rtn.tags2[0].searchConditionApiUrl;
+            return rtn._searchConditionApiTags2;
+          }
+        },
+        set searchConditionApiTags2(v) {
+            rtn._searchConditionApiTags2 = v;
+        },
+        get searchDataApiTags2() {
+          if (rtn._searchDataApiTags2 !==null){
+            return rtn._searchDataApiTags2;
+          }
+          else if(rtn.tags2 && rtn.tags2.length>0){
+            rtn._searchDataApiTags2= rtn.tags2[0].searchDataApiUrl;
+            return rtn._searchDataApiTags2;
+          }
+        },
+        set searchDataApiTags2(v) {
+            rtn._searchDataApiTags2 = v;
+        },
+        get paramDataTags2() {
+          if (rtn._paramDataTags2){
+            return rtn._paramDataTags2;
+          }
+          else if(rtn.tags2 && rtn.tags2.length>0){
+            rtn._paramDataTags2= JSON.parse(rtn.tags2[0].paramData);
+            return rtn._paramDataTags2;
+          }
+        },
+        set paramDataTags2(v) {
+            rtn._paramDataTags2={};
+            if(v)rtn._paramDataTags2 = JSON.parse(v);
+        },
     };
     return rtn;
   }

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

@@ -130,24 +130,102 @@ const SearchScreen = function (source, callBack, screenPara) {
           btn.disabled = loading;
         });
       },
+      //如果是复选框则searchValue1格式为 1,2
       get searchData() {
+      
+        let that=this;
         var rtn = {
           fields: []
         };
         this.screen.forEach((v) => {
-          var tempObj = v.searchObj;
+          var tempObj = common.deepClone(v.searchObj);          
           if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
+            if(that.isHandle(v.type))
+            {
+              tempObj.searchValue1=that.getNewSearchValue(tempObj); 
+            }
             rtn.fields.push(tempObj);
+           
           }
         });
         this.highScreen.forEach((v) => {
-          var tempObj = v.searchObj;
+          var tempObj = common.deepClone(v.searchObj);
           if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
+            if(that.isHandle(v.type))
+            {
+              tempObj.searchValue1=that.getNewSearchValue(tempObj); 
+            }
             rtn.fields.push(tempObj);
           }
         });
         return rtn;
       },
+      getNewSearchValue(tempObj)
+      {
+          let codeList=JSON.parse(tempObj.searchValue1);
+          let dataType=this.getDataType(tempObj.searchDataType);
+          let code='';
+          let symbol=',';
+          if(dataType==1)
+          {
+            codeList.forEach((v) => {
+              if(!v.flagDeleted&&v.code)
+              {
+                code+= `'${v.code}'${symbol}`;
+              }
+            });
+          }else
+          {
+            codeList.forEach((v) => {
+              if(!v.flagDeleted&&v.code)
+              {
+                code+= `${v.code}${symbol}`;
+              }
+            });
+          }
+          if(code.endsWith(`${symbol}`))
+          {
+            code=code.substring(0,code.length-1);
+          }
+         return code;
+      },
+      //判断控件是否需要单独处理searchValue1
+      isHandle(type)
+      {
+        let result=false;
+        switch (type) 
+        {
+          case Enum.ControlType.CheckBoxList://复选列表
+          result=true;
+          break;
+          default:
+            result=false;
+            break;
+        }
+        return result;
+      },
+       // 1 是字符串 2是数字
+       getDataType(searchDataType)
+       {
+         let dataType=1;
+         switch(searchDataType)
+         {
+           case 2:
+           case 6:
+            dataType=2;
+             break;
+            case 1:
+            case 3:
+            case 4:
+            case 5:
+               dataType=1;
+                break;
+           default:
+                dataType=1;
+               break; 
+         }
+         return dataType;
+       },
       initScreen(screens) {
         var rtnscreens = [];
 

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

@@ -494,7 +494,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         var searchFields = this.searchModel ? this.searchModel.searchData : { fields: [] };
         if (self.primaryKey) {
           searchFields.fields.push({
-            fieldName1: self.primaryKey,
+            fieldName1: self.primaryFieldMappingDBName?self.primaryFieldMappingDBName:self.primaryKey,
             groupName: self.primaryKey,
             operation: 2,
             searchDataType: 3,
@@ -563,6 +563,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get primaryKey() {
         return common.initialsToUpperCase(source.content.primaryFieldName);
       },
+      get primaryFieldMappingDBName() {
+        return source.content.primaryFieldMappingDBName;
+      },
       get $index() {
         if (this.$rowCount > 0) {
           return this.selectIndex + 1;

package/src/main.js

@@ -12,7 +12,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: 'http://10.88.23.22:9999/v1/form/router',
+  baseUrl: 'http://10.88.22.67:9999/v1/form/router',
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -27,7 +27,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijg4MjUzNTNmLTQwY2QtNDk0OS1iMmFiLTNkYmZkM2VhOGY5YyJ9.vST557XxrpihiQfogTXgGmcfvAHprul0hGGME864lEIvU51ZBEEns-kUjUj0FsH_YTEb98CZPwD5-_3jDE7w8g',
+        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdjOWM1ZmE0LWIxM2MtNDQwMC1iYmIzLTYwY2RmY2FhZjNhMyJ9.G5G5kp8BkIhxbXkcWFIEf_2qNQE6N7XQ0hxY34M5FifPsM-X23FVGA6D-zlDWjTO6mo28QY3_3Bb7N6NW2yzjg',
         originalRequestURL: 'http://10.88.23.22:9999',
         EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"A-%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}'
       };