centaline-data-driven 1.3.47 → 1.3.50

package/package.json

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

package/src/Form.vue

@@ -1,9 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
-    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'/commissionmanage/apply'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -14,11 +12,7 @@
     data() {
       return {
         apiParam:{
-          actionType: 3,
-originalTraId: "1556877589776220161",
-pageOnly: true,
-pageStyle: 2,
-pageTitle: "成交报告"
+          
         },
         topHeight:10,
       }

package/src/centaline/css/max.css

@@ -280,3 +280,16 @@
     justify-content: flex-start;
     align-items: center;
 }
+.max-tableToolbar {
+    padding-top: 10px !important;
+}
+ .st-serach-screen .max-shortcutFollow {
+    padding-left: 0px !important;
+	padding-bottom: 10px !important;
+}
+.st-serach-screen .max-list-field {
+    padding-left: 0px !important;
+}
+.st-serach-screen .max-ptb5 {
+    padding-bottom: 5px !important;
+}

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -7,7 +7,7 @@
         </div>
         <div class="ct-checkbox-mian cover-list-item" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'',model.label?'':'lableNaN']">
           <el-checkbox-group v-model="model.checkedItemArr" @change="changeHandler1">
-            <el-checkbox :disabled="model.lock" v-for="item in model.options" :label="item[model.optionAttrs.value]" :key="item[model.optionAttrs.value]">{{item[model.optionAttrs.label]}}</el-checkbox>          
+            <el-checkbox :disabled="model.lock" v-for="item in model.options" :label="item[model.optionAttrs.value]" :key="item[model.optionAttrs.value]" :style="{ width: model.width1 + 'px' }">{{item[model.optionAttrs.label]}}</el-checkbox>          
             <span v-if="!model.lock" class="cover-list-item-span max-cover-list-item">
               <i class="el-input__icon el-icon-circle-close" @click="clearClickHandle"></i>
             </span>

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -32,7 +32,7 @@
               flex: 1; align-items: center; padding: 5px; border-radius: 5px;">
           </div>
         </div>
-        <div class="head-but">
+        <div class="head-but" :key="actionRoutersKey">
           <div>
             <component class="max-report w93"
               v-if="model.actionRouters !== null && model.actionRouters[0] !== null"
@@ -553,6 +553,7 @@ export default {
       FlagStatistics: false,
       dropDownSelected: false,
       iconSort: require("../../../assets/sort.png"),
+      actionRoutersKey: Math.random(),
     };
   },
   mounted() {
@@ -588,7 +589,7 @@ export default {
     });
   },
   methods: {
-  showStats() {
+    showStats() {
       var self = this;
       this.$nextTick(function () {
         if (self.model.tags1.length > 0) {
@@ -625,7 +626,6 @@ export default {
         }
       });
     },
-
     load(data) {
       var self = this;
       this.model = data;
@@ -672,7 +672,8 @@ export default {
         if (v.type === 13) {
           collapseItemArr = [];
           col = 0;
-        } else if (v.singleLine) {
+        } 
+        else if (v.singleLine) {
           if (collapseItemArr.length > 0) {
             self.collapse.push(collapseItemArr);
             collapseItemArr = [];
@@ -681,7 +682,8 @@ export default {
           self.collapse.push(collapseItemArr);
           collapseItemArr = [];
           col = 0;
-        } else if (v.spanCols) {
+        } 
+        else if (v.spanCols) {
           collapseItemArr.push(v);
           col = col + v.spanCols;
           if (col === colCount || index === self.model.fields2Dic.length - 1) {
@@ -689,7 +691,8 @@ export default {
             collapseItemArr = [];
             col = 0;
           }
-        } else {
+        } 
+        else {
           collapseItemArr.push(v);
           col = col + 1;
           if (col === colCount || index === self.model.fields2Dic.length - 1) {
@@ -711,8 +714,11 @@ export default {
     lookOwner() {
       this.codeOwner = true;
     },
-    loadBaseInfo() {
+    loadBaseInfo(field) {
       this.model.loadBaseInfo();
+      if(field.id == "PropertyChanceQuestion"){
+        this.loadOperation();
+      }
     },
     loadFavorite() {
       this.model.loadFavorite();
@@ -751,7 +757,7 @@ export default {
         window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
       }
     },
-	 handleDropDown(key, index) {
+	  handleDropDown(key, index) {
       let i = index;
       this.model.activeIndex1 = (this.showData[0].length + i).toString();
       let dropDownData = this.showData[1];
@@ -798,7 +804,12 @@ export default {
             submitData[v] = self.model.fields1Dic[v].value;
           });
         }
-        if(router.id=="PropertyEdit"){
+        if (router.id == "PropertyEdit" 
+          || router.id == "QuestionAppeal"
+          || router.id == "PropertyChanceQuestion"
+          || router.id == "TranToActive"
+          || router.id == "TranToNotActive"
+          || router.id == "PropertyChanceTipOff") {
           callBack="loadBaseInfo"
         }
         else if (router.id == "Favorite") {
@@ -856,7 +867,7 @@ export default {
                     submit(ev) {
                       self.model.doAction(ev, field);
                       if (callBack) {
-                        callBack();
+                        callBack(field);
                       }
                       self.$common.closeDialog(dialogOption.dialog);
                     },
@@ -900,8 +911,7 @@ export default {
             };
             self.$common.openDialog(dialogOption);
           } 
-          else if (field.isFormPageInTab) {
-            // 外部框架tab页打开
+          else if (field.isFormPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
@@ -913,32 +923,28 @@ export default {
                 field.dialogWidth
               );
           } 
-          else if (field.isSearchPageInTab) {
-            // 外部框架tab页打开
+          else if (field.isSearchPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
               .handler.openTabSearch(field, submitData);
           } 
-          else if (field.isBrowserNewTab) {
-            // 浏览器打开
+          else if (field.isBrowserNewTab) {// 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
             window.open(field.action + query, "_blank");
           } 
-          else if (field.isOpenUrlInBrowse) {
-            // 浏览器打开
+          else if (field.isOpenUrlInBrowse) {// 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");
           } 
-          else if (field.isSeeVoice) {
-            //看视频
+          else if (field.isSeeVoice) {//看视频
             self.$common.browseVideo(field, submitData);
           } 
           else {
             field.doAction(submitData, (data) => {
               self.model.doAction(data, field);
               if (callBack) {
-                callBack();
+                callBack(field);
               }
             });
           }
@@ -1217,6 +1223,7 @@ export default {
 
           .hous-t {
             width: 260px;
+			margin-top: 10px;
             .swiper-i {
               position: relative;
               width: 100%;

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

@@ -32,7 +32,7 @@
             style="font-weight: bold;font-size: 13px; margin-top: 10px;background: rgb(236, 249, 255); flex: 1;align-items: center;padding: 5px;border-radius: 5px;">
           </div>
         </div>
-        <div class="head-but">
+        <div class="head-but" :key="actionRoutersKey">
           <div>
             <component class="max-report w93"
               v-if=" model.actionRouters !== null && model.actionRouters[0] !== null"
@@ -545,7 +545,8 @@ export default {
       showData: [],
       FlagStatistics: false,
       dropDownSelected: false,
-	  iconSort: require("../../../assets/sort.png"),
+	    iconSort: require("../../../assets/sort.png"),
+      actionRoutersKey: Math.random(),
     };
   },
   mounted() {
@@ -652,10 +653,8 @@ export default {
             self.model.activeIndex1 = i.toString();
             if (self.model.tags1 && self.model.tags1[i]) {
               self.listKey = self.listKey + 1;
-              self.model.searchConditionApiTags1 =
-                self.model.tags1[i].searchConditionApiUrl || "";
-              self.model.searchDataApiTags1 =
-                self.model.tags1[i].searchDataApiUrl || "";
+              self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionApiUrl || "";
+              self.model.searchDataApiTags1 = self.model.tags1[i].searchDataApiUrl || "";
               self.model.paramDataTags1 = self.model.tags1[i].paramData || "";
             }
           }
@@ -725,8 +724,11 @@ export default {
     lookOwner() {
       this.codeOwner = true;
     },
-    loadBaseInfo() {
+    loadBaseInfo(field) {
       this.model.loadBaseInfo();
+      if(field.id == "PropertyChanceQuestion"){
+        this.loadOperation();
+      }
     },
     loadFavorite() {
       this.model.loadFavorite();
@@ -815,7 +817,12 @@ export default {
             submitData[v] = self.model.fields1Dic[v].value;
           });
         }
-        if (router.id == "PropertyEdit") {
+        if (router.id == "PropertyEdit" 
+          || router.id == "QuestionAppeal"
+          || router.id == "PropertyChanceQuestion"
+          || router.id == "TranToActive"
+          || router.id == "TranToNotActive"
+          || router.id == "PropertyChanceTipOff") {
           callBack = "loadBaseInfo"
         }
         else if (router.id == "Favorite") {
@@ -876,7 +883,7 @@ export default {
               self.$common.viewerfile(field, MediaAlbum, 0, 0);
             }
           }
-         else if (field.isOpenForm) {
+          else if (field.isOpenForm) {
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),
@@ -894,7 +901,7 @@ export default {
                     submit(ev) {
                       self.model.doAction(ev, field);
                       if (callBack) {
-                        callBack();
+                        callBack(field);
                       }
                       self.$common.closeDialog(dialogOption.dialog);
                     },
@@ -969,7 +976,7 @@ export default {
             field.doAction(submitData, (data) => {
               self.model.doAction(data, field);
               if (callBack) {
-                callBack();
+                callBack(field);
               }
             });
           }
@@ -977,8 +984,7 @@ export default {
         //执行客户端脚本
         else {
           submitData = field.getActionPara(submitData).para;
-          let title =
-            field.pageTitle == undefined ? field.label : field.pageTitle;
+          let title = field.pageTitle == undefined ? field.label : field.pageTitle;
           submitData.actionType = field.actionType;
           var fun = self.$common.getDataDrivenOpts().handler[field.action];
           fun(submitData, title, null);
@@ -1008,53 +1014,33 @@ export default {
     clickNextHandler() {
       let key = "chanceID";
       if (this.parentModel && this.parentModel.$refs.table) {
-        let oldValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let oldValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         this.parentModel.$refs.table.rowKeyDownHandle(null, 1);
-        let newValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let newValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         if (oldValue !== newValue) {
           let parm = this.$common.cloneObject(this.apiParam);
           parm[key] = newValue;
           // this.loaderObj.Detail(this.api, parm, this.load);
-          this.$common
-            .getDataDrivenOpts()
-            .handler.refreshPropertyDetail(parm, this.parentModel,"PropertyDetailRET");
+          this.$common.getDataDrivenOpts().handler.refreshPropertyDetail(parm, this.parentModel,"PropertyDetailRET");
         }
       }
     },
     clickPrevHandler() {
       let key = "chanceID";
       if (this.parentModel && this.parentModel.$refs.table) {
-        let oldValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let oldValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         this.parentModel.$refs.table.rowKeyDownHandle(null, -1);
-        let newValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let newValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         if (oldValue !== newValue) {
           let parm = this.$common.cloneObject(this.apiParam);
           parm[key] = newValue;
           // this.loaderObj.Detail(this.api, parm, this.load);
-          this.$common
-            .getDataDrivenOpts()
-            .handler.refreshPropertyDetail(parm, this.parentModel,"PropertyDetailRET");
+          this.$common.getDataDrivenOpts().handler.refreshPropertyDetail(parm, this.parentModel,"PropertyDetailRET");
         }
       }
     },
     scrollHandle(ev) {
-      this.$emit(
-        "scrollHandle",
-        this.$refs.detail.scrollTop,
-        this.$refs.detail.scrollLeft
-      );
+      this.$emit( "scrollHandle", this.$refs.detail.scrollTop, this.$refs.detail.scrollLeft);
       ev.cancelBubble = true;
       ev.stopPropagation();
     },
@@ -1269,6 +1255,7 @@ export default {
 
           .hous-t {
             width: 260px;
+			margin-top: 10px;
             .swiper-i {
               position: relative;
               width: 100%;

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

@@ -442,6 +442,9 @@
                           on: {
                             finished(data) {
                               self.$common.closeDialog(dialogOption.dialog);
+                              if(data.rtnMsg){
+                                self.$message.success(data.rtnMsg);
+                              }
                               if(field && field.changeCallBackFunName){
                                 self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
                               }
@@ -543,6 +546,9 @@
                 on: {
                   finished(data) {
                     self.$common.closeDialog(dialogOption.dialog);
+                    if(data.rtnMsg){
+                      self.$message.info(data.rtnMsg);
+                    }
                     if(field && field.changeCallBackFunName){
                       self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
                     }

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

@@ -1,9 +1,8 @@
 <template>
   <div v-loading="loading" style="width:100%">
     <div v-if="model !== null && !loading" class="ct-form">
-      <div class="ct-ptb5 max-flex">
+      <div ref="search" class="ct-ptb5 max-flex">
         <template v-for="(col, index) in model.fields" v-if="col.show !== false">
-         <!-- <br v-if="col.is === 'ct-linefeed'" /> -->
           <div v-if="col.is === 'ct-linefeed'" style="width: 100%;">
             <el-divider></el-divider>
           </div>
@@ -67,6 +66,7 @@
         }
         this.loadFields();
         this.$nextTick(() => {
+          this.$refs.table.setELTableHeight(this.$el.parentElement.clientHeight,this.$refs.search.clientHeight)
           this.$refs.table.searchComplate(this.model,this.model.flagSearch);
         });
         this.loading = false;

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

@@ -1,20 +1,12 @@
 <template>
   <div style="padding:0 8px 0 10px">
-    <div v-if="model !== null && !loading">
-      <el-table ref="multipleTable"
-                :data="tableData"
-                highlight-current-row
-                tooltip-effect="dark"
-                size="mini"
-                style="width: 100%;"
-                max-height="450"
-                fit
-                :row-class-name="tableRowClassName"
+    <div v-if="model !== null">
+      <el-table ref="multipleTable" :data="tableData"
+                highlight-current-row tooltip-effect="dark" size="mini" style="width: 100%;"  fit  :row-class-name="tableRowClassName"
+                :height="elTableHeight" v-loading="loading"
                 @selection-change="handleSelectionChange"
                 @current-change="handleCurrentChange">
-        <el-table-column type="selection"
-                         width="55" v-if="!singleSelectio">
-        </el-table-column>
+        <el-table-column type="selection" width="55" v-if="!singleSelectio"></el-table-column>
         <el-table-column v-for="(col, index) in model.columns" v-if="col.show" :key="index"
                          :prop="col.id" :label="col.name" :min-width="col.width">
         </el-table-column>
@@ -26,7 +18,7 @@
         <el-button size="mini" @click="confirmClickHandler()" class="max-search-btn" style="float:right;" type="primary">确认</el-button>
       </div>
     </div>
-    <div style="min-height:250px" v-loading="loading" v-if="loading"></div>
+    <div style="min-height:250px;" v-loading="loadingOne" v-if="loadingOne"></div>
     </div>
 </template>
 
@@ -52,16 +44,24 @@
         tableData: [],
         multipleSelection: [],
         currentRow: null,
+        loadingOne: true,
         loading: true,
-        jumpStr: ''
+        jumpStr: '',
+        isBusy:false,
+        elTableHeight:0,
       }
     },   
     methods: {
       load(data) {
+        this.loadingOne=false;
         this.model = data;
         this.loadFields();
         this.loading = false;
         this.resetTabelWidth();
+        this.$nextTick(() => {
+          var selectWrap = this.$refs.multipleTable.bodyWrapper;
+          selectWrap.addEventListener('scroll', this.scrollHandle);
+        });
 
         //通知父组件加载完成
         this.$emit('loaded');
@@ -82,7 +82,6 @@
           this.multipleSelection = [];
         }
 
-        //self.tableData.concat(this.model.listData);
         self.tableData.push.apply(self.tableData, this.model.listData);
       },
       //是否需要保留已选
@@ -215,7 +214,31 @@
             self.load(self.vmodel);
           }
         });
-      }
+      },
+      scrollHandle(ev) {
+        var self = this;
+        let selectWrap = this.$refs.multipleTable.bodyWrapper;
+        if (selectWrap.scrollTop +  selectWrap.clientHeight >= selectWrap.scrollHeight - 5) {
+          if (!self.isBusy) {
+            self.isBusy = true;
+            self.loading = true;
+            self.model.nextPage((rtn,response) => {
+              if (rtn) {
+                response.content.rows.forEach((nr) => {
+                  self.tableData.push(nr);
+                });
+              }
+              self.isBusy = false;
+              self.loading = false;
+            });
+          }
+        }
+        ev.cancelBubble = true;
+        ev.stopPropagation();
+      },
+      setELTableHeight(h0,h1){
+        this.elTableHeight=h0-h1-60-25;
+      },
     }
   }
 </script>

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

@@ -1,14 +1,14 @@
 <template>
   <div class="st-serach-screen">
     <div v-bind="model.attrs" style="width:100%" v-if="!isLoading">
-      <div class="ct-ptb5" v-if="showScreen">
+      <div class="ct-ptb5 max-ptb5" v-if="showScreen">
         <template v-for="(col, index) in model.screen" v-if="col.show !== false">
           <br v-if="col.is === 'ct-linefeed'" />
-          <component v-else class="list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
+          <component v-else class="list-field max-list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
         </template>
         <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
       </div>
-      <div class="shortcutFollow" style="padding-left: 20px;" v-if="model.shortcutForm">
+      <div class="shortcutFollow max-shortcutFollow" style="padding-left: 20px;" v-if="model.shortcutForm">
         <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut"></ct-form>
       </div>
       <el-popover class="SeachScreenPop max-seachpopper" placement="top" transition="el-zoom-in-top" v-model="highScreen" trigger="click" visible-arrow="false">

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

@@ -626,11 +626,7 @@ export default {
     },
     scrollHandle(ev) {
       var self = this;
-      if (
-        this.$refs.tableParent.scrollTop +
-          this.$refs.tableParent.clientHeight >=
-        this.$refs.tableParent.scrollHeight - 5
-      ) {
+      if ( this.$refs.tableParent.scrollTop +  this.$refs.tableParent.clientHeight >= this.$refs.tableParent.scrollHeight - 5) {
         if (!this.isBusy) {
           self.isBusy = true;
           self.tableLoading = true;
@@ -644,11 +640,7 @@ export default {
           });
         }
       }
-      this.$emit(
-        "scrollHandle",
-        this.$refs.tableParent.scrollTop,
-        this.$refs.tableParent.scrollLeft
-      );
+      this.$emit("scrollHandle", this.$refs.tableParent.scrollTop, this.$refs.tableParent.scrollLeft);
       ev.cancelBubble = true;
       ev.stopPropagation();
     },
@@ -914,8 +906,11 @@ export default {
                         height: '165px'
                       },
                       on: {
-                        finished() {
+                        finished(data) {
                           self.$common.closeDialog(dialogOption.dialog);
+                          if(data.rtnMsg){
+                            self.$message.success(data.rtnMsg);
+                          }
                           self.getPage(1);
                         },
                         error(data) {

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="ct-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
+  <div class="ct-tableToolbar max-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
   
 <div v-if="buttonsLeft&&buttonsLeft.length>0" class="bool_btn_l">
   <ul>