centaline-data-driven 1.2.31 → 1.2.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.31",
+  "version": "1.2.34",
   "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>
@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "2"} ,
+        apiParam: {actionType: 1,chanceID: "1"} ,
       }
     },
     mounted() {

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="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/profit-return/applyUI'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :api="'/PropertyPublish/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--:api="'FormSample/formdata'"-->
@@ -16,9 +16,9 @@
     name: 'App',
     data() {
       return {
-        // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
-        apiParam: {originalTraId: "1475658732246241281", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
+        apiParam: {profitReturnId: "1504359257134055426", actionType: 1, pageStyle: 2, pageTitle: "查看返利", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
+        // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {SN: "13557_132", UserID: "wuhan3"},
       }
     },

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,
+                    rowMergedTopColumns.includes(column.id)?'ct-tdTop':null,
                     model.rowHiddenKeyData.indexOf(row[model.rowHiddenKey])%2?'ct-tdDouble':'ct-tdSingle',
                     selectKey===row[model.rowHiddenKey]?'select':null,
                     colIndex === leftShadow?'shadowLeft':null,
@@ -134,6 +135,7 @@
         rowMergedColumns:['contactNameDesc','propertyIdentityTypeID','operation'],
         rowBorderLeftColumns:['contactNameDesc','operation'],
         rowBorderRightColumns:['propertyIdentityTypeID','operation'],
+        rowMergedTopColumns:['contactNameDesc','propertyIdentityTypeID'],
         selectKey:'',
       }
     },
@@ -180,12 +182,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;            
@@ -544,6 +546,9 @@
   .ct-searchtable .ct-tr > .ct-tdDouble {
     background-color: rgb(239 255 239);
   }
+  .ct-searchtable .ct-tr > .ct-tdTop {
+    vertical-align: top;
+  }
   .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/dynamicForm/src/dynamicForm.vue

@@ -6,16 +6,18 @@
         <div slot="header" class="clearfix" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
           <span style="font-weight:bold">{{model.title}}</span>
         </div>
+
         <!--头部元素-->
         <el-row v-if="collapseFieldsRow.length > 0">
           <el-col v-for="(col, index) in collapseFieldsRow[0]" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
-            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara"
+            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :from="'form'"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
                        @input="inputHandler(col,$event)"
                        @popupSearchList="popupSearchListHandler"
                        @tableButtonClick="clickHandler"></component>
           </el-col>
         </el-row>
+
         <!--tabs-->
         <el-tabs v-if="model.isHorizontalLayout" v-model="activeName">
           <el-tab-pane :label="item.label" :name="index.toString()"
@@ -31,6 +33,7 @@
             </el-row>
           </el-tab-pane>
         </el-tabs>
+
         <!--分组-->
         <el-collapse v-else v-model="collapseActiveNames" @change="collapseHandleChange">
           <el-collapse-item v-for="(item, index) in collapse" v-if="item.show !== false" :key="index" :title="item.label" :name="index" :disabled="item.lock" :class="item.lock?'ct-collapse-item-title':''">
@@ -40,7 +43,7 @@
             </template>
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :from="'form'"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
                            @input="inputHandler(col,$event)"
                            @popupSearchList="popupSearchListHandler"
@@ -49,6 +52,7 @@
             </el-row>
           </el-collapse-item>
         </el-collapse>
+
         <!--尾部元素-->
         <el-row v-if="independentItem.length > 0" style="margin-top: 20px;">
           <el-col v-for="(col, index) in independentItem" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">

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" :searchStatsApi="searchStatsApi" 
+    <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from"
     @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate()" 
     @showTitle="showTitleHandler"></ct-searchtable>
   </div>
@@ -42,6 +42,10 @@
         type: Object,
         default: () => { }
       },
+      from: {
+        String,
+        default:'searchlist'
+      },
     },
     created() {
       this.model = this.vmodel;

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"
@@ -17,7 +16,7 @@
     <div v-loading="operationLoading">
     </div>
     <div class="ct-tableParent" ref="tableParent" v-bind="model.attrs" v-if="!isLoading"
-         :style="{'height':model.tableHeight+'px'}"
+         :style="{'height':from=='form'?'100%':model.tableHeight+'px'}"
          @scroll="scrollHandle($event)" :v-focus="model.flagFocus"
          @keydown.up="rowKeyDownHandle($event,0)" @keydown.down="rowKeyDownHandle($event,1)"
          tabindex="-1">
@@ -30,14 +29,12 @@
               <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" :key="colIndex"
+              <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,15 +61,6 @@
           </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" :key="rowindex"
                 v-if="pageRowMin <= rowindex && rowindex <= pageRowMax"
@@ -83,7 +70,6 @@
               <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>
@@ -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;">
@@ -161,7 +143,11 @@
       flagFocus:{
         Boolean,
         default:true
-      }
+      },
+      from: {
+        String,
+        default:'searchlist'
+      },
     },
     computed: {
 

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

@@ -416,11 +416,11 @@ const ContactList = function (source,para ,callBack) {
             updateData.push(newRow);
           }
         });
-        let strat=0;
+        let strat=-1;
         let count=0;
         rtn._listData.forEach((v,i) => {
           if(v[rtn.rowHiddenKey]===searchValue1){
-            if(strat===0)strat=i;
+            if(strat===-1)strat=i;
             count=count+1;
           }
         });

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) {

package/src/main.js

@@ -12,8 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/v1/form/router",
-  // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",  
+  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",  
   // baseUrl: "http://10.88.22.46:7070/", 
   // flagRouterSelf: true,
   zindex: 999,
@@ -36,7 +36,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'e922a9d1-2dbe-4e39-91ca-aa77c4700aef',
+        oldToken: '4195d16c-9b1d-43b2-b6de-ef4a9f2b7d44',
         estateId: '20210729104021C49F04B55C50F6AF58',
         originalRequestURL: 'http://10.88.22.67:8080',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',