centaline-data-driven 1.2.30 → 1.2.33

package/package.json

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

package/src/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="appDetail" style="height:100%;position: fixed;">
+  <div id="appDetail" style="height:100%;">
     <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/css/common.css

@@ -780,3 +780,6 @@ html {
 .current-row .el-table__cell .el-input-group__prepend{
   min-width: 0!important;
 }
+.list-button .max-btn-add{
+  width: 85px;
+}

package/src/centaline/css/max.css

@@ -47,7 +47,6 @@
     height: 26px;
     background: #EE6B6B;
     border-color:#EE6B6B;
-    width: 85px;
     box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
     border-radius: 6px;
 }

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

@@ -71,6 +71,7 @@
                     //row.flagRow && row.columnShow===column.id?'ct-td3':null,
                     rowBorderLeftColumns.includes(column.id)?'ct-td4':null,
                     rowBorderRightColumns.includes(column.id)?'ct-td5':null,
+                    model.rowHiddenKeyData.indexOf(row[model.rowHiddenKey])%2?'ct-tdDouble':'ct-tdSingle',
                     selectKey===row[model.rowHiddenKey]?'select':null,
                     colIndex === leftShadow?'shadowLeft':null,
                     colIndex === rightShadow?'shadowRight':null,
@@ -179,12 +180,12 @@
         };
         submitData.para.searchFields=router.getSearchPara();
         submitData.para.searchFields.fields.push({
-            fieldName1: 'flagLookFromButton',
-            groupName: 'flagLookFromButton',
-            operation: 1,
-            searchDataType: 3,
-            searchValue1: '1',
-          });
+          fieldName1: 'flagLookFromButton',
+          groupName: 'flagLookFromButton',
+          operation: 1,
+          searchDataType: 3,
+          searchValue1: '1',
+        });
         router.doSearch(submitData, (res) => {
           if (res.rtnCode === 200) {
             res.apiRouter=self.apiRouter;            
@@ -503,6 +504,7 @@
     border-bottom: 0px;
     width: 100%;
     outline: 0;
+    padding: 0px;
   }
 .ct-searchtable .ct-table {
     min-width: 100%;
@@ -536,6 +538,12 @@
   .ct-searchtable .ct-tr > .ct-td5 {
     border-right: 1px solid #e7e8eb;
   }
+  .ct-searchtable .ct-tr > .ct-tdSingle {
+    background-color: rgb(255 243 244);
+  }
+  .ct-searchtable .ct-tr > .ct-tdDouble {
+    background-color: rgb(239 255 239);
+  }
   .shadowLeft {
     border-right: 1px solid #e7e8eb;
     box-shadow: 2px 0 3px -1px rgba(0,0,0,0.1);

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

@@ -24,8 +24,7 @@
                   {{tag.label}}
                   </div>
                 </div>
-            </div>
-           
+            </div>           
             <div class="head-but">
               <div>
                 <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default"
@@ -56,7 +55,7 @@
             </div>
         </div>
         <div ref="detail" class="details-mid y-auto" :style="{'height':model.detailHeight?model.detailHeight+'px':'780px'}">
-          <div class="mid-l">
+          <div ref="midl" class="mid-l" :style="{'width':model.midlWidth?model.midlWidth+'px':'1200px'}">
             <!-- 图片内容部分 -->
             <div class="hous-info base-box">
               <div class="info-conten">
@@ -153,38 +152,22 @@
                   :searchDataApi="model.searchDataApiTags1"></ct-searchlist>
                 </div>
             </div>
-            <div class="contribute-info base-box">
+            <div class="contribute-info base-box" v-if="model._commissionList !==null">
                 <div class="title-l">贡献人信息</div>
                 <div class="contribute-list">
-                    <div class="contribute-i">
-                      <img src="" alt="图片">
-                      <div><div class="user-title">柳晓青（离职）</div><div class="user-but w56">收钥人</div></div>
-                    </div>
-                    <div class="contribute-i">
-                      <img src="" alt="图片">
-                      <div><div class="user-title">柳晓青（离职）</div><div class="user-but w56">收钥人</div></div>
-                    </div>
-                    <div class="contribute-i">
-                      <img src="" alt="图片">
-                      <div><div class="user-title">柳晓青（离职）</div><div class="user-but w56">收钥人</div></div>
-                    </div>
-                    <div class="contribute-i">
-                      <img src="" alt="图片">
-                      <div><div class="user-title">柳晓青（离职）</div><div class="user-but w56">收钥人</div></div>
-                    </div>
-                    <div class="contribute-i">
-                      <img src="" alt="图片">
-                      <div><div class="user-title">柳晓青（离职）</div><div class="user-but w56">收钥人</div></div>
-                    </div>
-                    <div class="contribute-i">
-                      <img src="" alt="图片">
-                      <div><div class="user-title">柳晓青（离职）</div><div class="user-but w56">收钥人</div></div>
+                    <div class="contribute-i" v-for="(m, index) in model._commissionList" :key="index">
+                      <img :src="m.regEmpImgUrl" alt="图片">
+                      <div>
+                        <div class="user-title">{{m.regEmpName}}</div>
+                        <div class="user-title">{{m.commissionPercentDesc}}</div>
+                        <div class="user-but w56">{{m.commissionRole}}</div>
+                      </div>
                     </div>
                 </div>
             </div>
           </div>
           <!-- 右侧委托信息 -->
-          <div class="mid-r">
+          <div ref="midr" class="mid-r" style="width:420px;">
               <div class="take-info  base-box">
                   <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>
@@ -361,6 +344,7 @@
           this.model.getTags2List(0);
         }
         this.loadOperation();
+        this.loadCommission();
         this.setDetailHeight();
         this.$nextTick(() => {
           window.addEventListener("resize", (ev) => {
@@ -414,6 +398,9 @@
         this.model._operationRouters=[];
         this.model.getOperationList();
       },
+      loadCommission() {
+        this.model.getCommissionList();
+      },
       lookOwner() {
         this.codeOwner = true
       },
@@ -433,6 +420,10 @@
             var h2 = this.$refs.detail.offsetTop | 0;
             let detailHeight = h1 - h2;
             this.model.detailHeight = detailHeight < 40 ? 350 : detailHeight;
+
+            var w1=this.$refs.detail.clientWidth | 0;
+            var w2=this.$refs.midr.clientWidth | 0;
+            this.model.midlWidth=w1-w2-10;
           }
         });
       }, 
@@ -912,12 +903,6 @@
             text-align: center;
             padding: 3px 0;
           }
-          // .mero{
-              
-          //     vertical-align: 2px;
-          //     overflow: hidden;
-          //     margin-left: 5px;
-          // }
           .more-colose{
             background: url('../../../assets/mero-colose.png')no-repeat;
             background-size: 100% 100%;

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

@@ -1,6 +1,5 @@
 <template>
   <div style="width:100%;" class="ct-searchtable" ref="searchTable">
-
     <ct-tableStats ref="tableStats" class="ct-search-table-list-header"
                    v-if="!isLoading&&searchStatsApi"
                    :api="searchStatsApi"
@@ -26,18 +25,16 @@
                :class="['ct-table',model.attrs.size?'ct-table-'+model.attrs.size:'']">
           <!--表头-->
           <thead ref="tableHead">
-            <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr">
+            <tr class="ct-tr" ref="headTr" v-for="(columns,columnsIndex) in model.columnsArr" :key="columnsIndex">
               <th v-if="model.isMulti && columnsIndex === 0" ref="headLeftThs" class="ct-td left-fixation-th checkbox-td" :class="[model.tdClass]">
                 <label class="el-checkbox"><span class="el-checkbox__input" :class="model.selectAllType">
                   <span class="el-checkbox__inner"></span>
-                  <!-- <input type="checkbox" aria-hidden="false" class="el-checkbox__original" value=""> -->
                   <input type="checkbox" @click="selectAll($event)" v-model="model.selectAll" class="el-checkbox__original checkbox-td-1" aria-hidden="false" />
                   </span>
                 </label>
-
-                
               </th>
-              <th :ref="column.fixed?(column.fixed==='left'?'headLeftThs':'headRightThs'):'headThs'" v-for="(column,colIndex) in columns"
+              <th :ref="column.fixed?(column.fixed==='left'?'headLeftThs':'headRightThs'):'headThs'" 
+                  v-for="(column,colIndex) in columns" :key="colIndex"
                   v-if="column.show" class="ct-td ct-searchtable-th"
                   :rowspan="column.rowspan"
                   :colspan="column.colspan"
@@ -50,7 +47,6 @@
                   typeof column.fixed === 'undefined'?'right-no-fixation-th':null]"
                   @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event,colIndex)"
                   v-bind="column.attrs">
-
                 <span>{{column.name}}</span>
                 <span class="caret-wrapper" v-if="column.sort" @click="toSort($event,column);" @contextmenu.prevent="clearSort($event,column);">
                   <i class="sort-caret ascending" @click.left="toSort($event,column,'asc')" @contextmenu.prevent="clearSort($event,column);"></i>
@@ -65,17 +61,8 @@
           </thead>
           <!--表体-->
           <tbody>
-            <!--这一行仅用于设置未加载数据时的列宽-->
-            <!--<tr v-if="model.listData.length === 0" class="ct-tr" style="visibility: hidden;">
-              <td v-if="model.isMulti">
-              </td>
-              <td v-for="(column,colIndex) in model.dataFieldcolumns" class="ct-td" v-if="column.show">
-                <div :style="{'width': column.width + 'px'}">
-                </div>
-              </td>
-            </tr>-->
             <!--可视区域的行数据-->
-            <tr v-for="(row,rowindex) in model.listData"
+            <tr v-for="(row,rowindex) in model.listData" :key="rowindex"
                 v-if="pageRowMin <= rowindex && rowindex <= pageRowMax"
                 :ref="'rows.'+rowindex" @click="rowClickHandle($event,rowindex)"
                 class="ct-tr"
@@ -83,13 +70,12 @@
               <td v-if="model.isMulti" class="ct-td tdFiexd left-fixation checkbox-td" :class="[model.tdClass]" align="center">
                 <label v-if="!model.rightMulti || row[model.rightMulti] == 1" class="el-checkbox is-checked"><span class="el-checkbox__input" :class="rowCheckClass(row)">
                  <span class="el-checkbox__inner"></span>
-  <!-- <input type="checkbox" aria-hidden="false" class="el-checkbox__original" value=""> -->
                  <input  type="checkbox" v-model="row.$select" @change="selectOne($event)" class="el-checkbox__original checkbox-td-1" />
                 </span>
               </label>
               </td>
               <td :ref="column.fixed?(column.fixed==='left'?'headLeftTds':'headRightTds'):null"
-                  v-for="(column,colIndex) in model.dataFieldcolumns"
+                  v-for="(column,colIndex) in model.dataFieldcolumns" :key="colIndex"
                   v-if="tdShow(column, row)"
                   :rowspan="tdRowspan(column, row)"
                   class="ct-td"
@@ -125,16 +111,12 @@
                 </component>-->
               </td>
             </tr>
-
-
-
             <!--适配滚动条-->
             <tr v-else v-bind:style="{ height: row.$heigth + 'px' }"></tr>
           </tbody>
         </table>
       </div>
     </div>
-
     <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter" v-if="!isLoading"></ct-tabletip>
     <ct-tabletip ref="footer" class="ct-search-table-footer" :tip="model.footer" v-if="!isLoading"></ct-tabletip>
     <div v-if="isLoading && searchLoading" v-loading="isLoading" style="top:30px;">

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

@@ -15,6 +15,7 @@ const ContactList = function (source,para ,callBack) {
       _columns: [],
       _columnsArr: [],
       _dataFieldcolumns: [],
+      _dataFieldcolumnsShow: [],
       _listData: [],
       _scripts: null,
       isMergeTitle: false,//是否合并标题    
@@ -23,6 +24,7 @@ const ContactList = function (source,para ,callBack) {
       rowHiddenKey:'contactID',
       rowHiddenColumns:['contactNameDesc','propertyIdentityTypeID'],
       columnShow:'contactNoTypeDesc',
+      rowHiddenKeyData:[],
       attrs: {
         size: 'mini'
       },
@@ -91,7 +93,7 @@ const ContactList = function (source,para ,callBack) {
                   var newRow = {};
                   newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
                   newRow.descNewRow = v.descNewRow;
-                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
+                  newRow.colspan = rtn.dataFieldcolumnsShow.length-rtn.rowMergedColumns.length;
                   newRow.columnShow=rtn.columnShow;
                   newRow.flagRow=true;
                   rtn._listData.push(newRow);
@@ -101,6 +103,11 @@ const ContactList = function (source,para ,callBack) {
         }
         return rtn._listData;
       },
+      set listData(v) {
+        if (v) {
+          rtn._listData=v;
+        }
+      },
       get columns() {
         var self = this;
         if (self._columns.length > 0) {
@@ -282,6 +289,20 @@ const ContactList = function (source,para ,callBack) {
           self._dataFieldcolumns = arr;
           return self._dataFieldcolumns;
         }
+      },      
+      get dataFieldcolumnsShow() {
+        var self = this;
+        if (self._dataFieldcolumnsShow.length > 0) {
+          return self._dataFieldcolumnsShow;
+        }
+        else {
+          var arr = self.columns.filter(v => {
+            return v.isDataField !== false && v.show
+          });
+
+          self._dataFieldcolumnsShow = arr;
+          return self._dataFieldcolumnsShow;
+        }
       },
       get rowMergedColumns() {
         return source.rowMergedColumns || [];
@@ -314,44 +335,10 @@ const ContactList = function (source,para ,callBack) {
           if (response.rtnCode === Enum.ReturnCode.Successful) {
             if (response.content.rows.length > 0) {
               if(router.flagAddRowAfterAction){
-                response.content.rows.forEach((v) => {
-                  if(v.descNewRow){
-                    var newRow = {};
-                    newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
-                    newRow.descNewRow = v.descNewRow;
-                    newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
-                    newRow.columnShow=rtn.columnShow;
-                    newRow.flagRow=true;
-                    rtn._listData.unshift(newRow);
-                  }
-                  rtn._listData.unshift(v);
-                });
-                rtn.setHiddenRow();
+                rtn.doNew(response.content.rows);   
               }
               else{
-                let updateData=[];
-                response.content.rows.forEach((v) => {
-                  updateData.push(v);
-                  if(v.descNewRow){
-                    var newRow = {};
-                    newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
-                    newRow.descNewRow = v.descNewRow;
-                    newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
-                    newRow.columnShow=rtn.columnShow;
-                    newRow.flagRow=true;
-                    updateData.push(newRow);
-                  }
-                });
-                let strat=0;
-                let count=0;
-                rtn._listData.forEach((v,i) => {
-                  if(v[rtn.rowHiddenKey]===searchValue1){
-                    if(strat===0)strat=i;
-                    count=count+1;
-                  }
-                });
-                rtn._listData.splice(strat, count,updateData);
-                rtn.setHiddenRow();
+                rtn.doUpdate(response.content.rows,searchValue1);
               }
             }
           }
@@ -387,46 +374,12 @@ const ContactList = function (source,para ,callBack) {
               break;
             case Enum.ActionType.New://新增
             case Enum.ActionType.CloseTabThenNew://新增  
-              response.content.forEach((v) => {
-                if(v.descNewRow){
-                  var newRow = {};
-                  newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
-                  newRow.descNewRow = v.descNewRow;
-                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
-                  newRow.columnShow=rtn.columnShow;
-                  newRow.flagRow=true;
-                  rtn._listData.unshift(newRow);
-                }
-                rtn._listData.unshift(v);
-              });
-              rtn.setHiddenRow();
+              rtn.doNew(response.content);              
               break;
             case Enum.ActionType.Update://修改
             case Enum.ActionType.CloseTabThenUpdate://修改
               var searchValue1=rtn.listData[rtn.selectIndex][self.primaryKey];
-              let updateData=[];
-              response.content.forEach((v) => {
-                updateData.push(v);
-                if(v.descNewRow){
-                  var newRow = {};
-                  newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
-                  newRow.descNewRow = v.descNewRow;
-                  newRow.colspan = rtn.dataFieldcolumns.length-rtn.rowMergedColumns.length;
-                  newRow.columnShow=rtn.columnShow;
-                  newRow.flagRow=true;
-                  updateData.push(newRow);
-                }
-              });
-              let strat=0;
-              let count=0;
-              rtn._listData.forEach((v,i) => {
-                if(v[rtn.rowHiddenKey]===searchValue1){
-                  if(strat===0)strat=i;
-                  count=count+1;
-                }
-              });
-              rtn._listData.splice(strat, count,updateData);
-              rtn.setHiddenRow();
+              rtn.doUpdate(response.content,searchValue1);
               break;
             default:
               break;
@@ -434,6 +387,63 @@ const ContactList = function (source,para ,callBack) {
         }
         rtn.$vue.$forceUpdate();
       },
+      doNew(data){
+        data.forEach((v) => {
+          if(v.descNewRow){
+            var newRow = {};
+            newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+            newRow.descNewRow = v.descNewRow;
+            newRow.colspan = rtn.dataFieldcolumnsShow.length-rtn.rowMergedColumns.length;
+            newRow.columnShow=rtn.columnShow;
+            newRow.flagRow=true;
+            rtn._listData.unshift(newRow);
+          }
+          rtn._listData.unshift(v);
+        });
+        rtn.setHiddenRow();
+      },
+      doUpdate(data,searchValue1){
+        let updateData=[];
+        data.forEach((v) => {
+          updateData.push(v);
+          if(v.descNewRow){
+            var newRow = {};
+            newRow[rtn.rowHiddenKey]=v[rtn.rowHiddenKey];
+            newRow.descNewRow = v.descNewRow;
+            newRow.colspan = rtn.dataFieldcolumnsShow.length-rtn.rowMergedColumns.length;
+            newRow.columnShow=rtn.columnShow;
+            newRow.flagRow=true;
+            updateData.push(newRow);
+          }
+        });
+        let strat=-1;
+        let count=0;
+        rtn._listData.forEach((v,i) => {
+          if(v[rtn.rowHiddenKey]===searchValue1){
+            if(strat===-1)strat=i;
+            count=count+1;
+          }
+        });
+        if(updateData.length===1){
+          rtn._listData.splice(strat, count,updateData[0]);
+        }        
+        else if(updateData.length===2){
+          rtn._listData.splice(strat, count,updateData[0],updateData[1]);
+        }       
+        else if(updateData.length===3){
+          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2]);
+        }       
+        else if(updateData.length===4){
+          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2],updateData[3]);
+        }       
+        else if(updateData.length===5){
+          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2],updateData[3],updateData[4]);
+        }       
+        else if(updateData.length===6){
+          rtn._listData.splice(strat, count,updateData[0],updateData[1],updateData[2],updateData[3],updateData[4],updateData[5]);
+        }
+        rtn.setHiddenRow();
+      },
       get scripts() {
         if (rtn._scripts !== null) {
           return rtn._scripts;
@@ -471,7 +481,11 @@ const ContactList = function (source,para ,callBack) {
         let lastKey='';
         let count=1;
         let firstIndex=0;
+        rtn.rowHiddenKeyData=[];
         for (let i = 0; i < rtn.listData.length; i++) {
+          if(!rtn.rowHiddenKeyData.includes(rtn.listData[i][rtn.rowHiddenKey])){
+            rtn.rowHiddenKeyData.push(rtn.listData[i][rtn.rowHiddenKey])
+          }
           rtn.listData[i].$rowspan=0;
           if(lastKey){
             if(rtn.listData[i][rtn.rowHiddenKey]){

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

@@ -15,7 +15,9 @@ const Detail = function (source,para ,callBack) {
         _actionRouters:null,//页面上的动作行为
         _actionRoutersMoreList:null,//页面上的更多动作行为
         _contactApiRouter:null,//查看联系人
+        _commissionApiRouter:null,//查看角色
         detailHeight:750,
+        midlWidth:1200,
         activeIndex1:'0',
         activeIndex2:'0',
         searchlistKey:0,      
@@ -27,6 +29,7 @@ const Detail = function (source,para ,callBack) {
         _operationApiRouter:null,
         _operationList:null,
         _operationRouters:[],
+        _commissionList:null,
         get fields1() {
             return data.fields1;
         },
@@ -145,7 +148,7 @@ const Detail = function (source,para ,callBack) {
             }
             return rtn._contactApiRouter;
           }
-        },
+        }, 
         get actionRouters() {
             if (rtn._actionRouters !== null) {
                 return rtn._actionRouters;
@@ -303,6 +306,43 @@ const Detail = function (source,para ,callBack) {
                 }
             );
           }
+        },     
+        get commissionApiRouter() {
+          if (rtn._commissionApiRouter !== null) {
+            return rtn._commissionApiRouter;
+          }
+          else {
+            if (data.commissionApiRouter) {                
+                var router = Router(data.commissionApiRouter);
+                router.is = "ct-btn";
+                router.attrs = { size: "mini" }
+                rtn._commissionApiRouter=router;
+            }
+            return rtn._commissionApiRouter;
+          }
+        },
+        getCommissionList(){
+          if (rtn._commissionList !==null){
+            return rtn._commissionList;
+          }
+          else if(rtn.commissionApiRouter){
+            var router=rtn.commissionApiRouter;
+            var submitData={
+              action: router.action,
+              para: {
+                searchFields: null,
+                pageAttribute: { pageIndex: 1 },
+                flagSearch: true
+              }
+            };
+            submitData.para.searchFields=router.getSearchPara();
+            router.doSearch(submitData, (res) => {
+              if (res.rtnCode === 200) {
+                rtn._commissionList=res.content.rows;                
+              }
+            });
+          }
+          return rtn._commissionList;
         },
         doAction(response,field) {
           if (response.responseData) {