centaline-data-driven 1.2.33 → 1.2.34

package/package.json

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

package/src/Detail.vue

@@ -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:'',
       }
     },
@@ -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/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

@@ -16,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">
@@ -143,7 +143,11 @@
       flagFocus:{
         Boolean,
         default:true
-      }
+      },
+      from: {
+        String,
+        default:'searchlist'
+      },
     },
     computed: {
 

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',