centaline-data-driven 1.5.31 → 1.5.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.5.31",
+  "version": "1.5.33",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,
@@ -24,7 +24,8 @@
     "vue-baidu-map": "^0.21.22",
     "vue-cropper": "^0.5.8",
     "vue-ueditor-wrap": "^2.5.6",
-    "vuedraggable": "^2.24.3"
+    "vuedraggable": "^2.24.3",
+    "js-cookie": "^3.0.1"
   },
   "peerDependencies": {
     "element-ui": "^2.15.7",

package/release-log.md

@@ -1,4 +1,11 @@
-## v1.5.30
+## v1.5.32
+2023-07-11
+
+bug修复
+
+快捷跟进保存后会关闭tab处理
+
+## v1.5.31
 2023-07-11
 
 新增

package/src/SearchList.vue

@@ -2,7 +2,7 @@
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/transaction-workflow/getLayoutOfSearch'" :searchDataApi="'/api/third-dept-tran/transaction-workflow/list'"></ct-searchlist> -->
 
-     <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> 
+     <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> 
     
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -115,7 +115,7 @@
       <div ref="shortcutFollow"
         v-if="!model.flagHiddenSensitiveInfo && model.shortcutFollowForm !== undefined && model.shortcutFollowForm !== null"
         class="shortcutFollow" style="margin-top: 16px;">
-        <ct-form :source="model.shortcutFollowForm" @submit="saveShortcutFollow"></ct-form>
+        <ct-form :source="model.shortcutFollowForm" @submit="saveShortcutFollow" :openType="'detail'"></ct-form>
       </div>
       <div v-if="!model.flagHiddenSensitiveInfo" class="tablist-info base-box">
         <div class="details-tabs-box">

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -64,7 +64,7 @@
   .wb {
     word-break: break-all;
   }
-  .mazarine{
-    color: #541a8b;
+  .mazarine {
+    color: #cb452f;
   }
 </style>

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

@@ -11,7 +11,7 @@
                    @click="clickHandler(col)" @change="changeHandler(col,$event)" @SaveSearchWhere="SaveSearchWhere" @SearchWhereManage="SearchWhereManage" @clichSearchWhere="clichSearchWhere"></component>
       </div>
       <div class="shortcutFollow max-shortcutFollow" style="padding-left: 20px;" v-if="model.shortcutForm">
-        <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut"></ct-form>
+        <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut" :openType="'detail'"></ct-form>
       </div>
       <div class="SeachScreenPop max-seachpopper" placement="top" transition="el-zoom-in-top" v-show="highScreen" trigger="click" visible-arrow="false">
         <div style="width:100%">
@@ -46,7 +46,7 @@ import dynamicElement from '../../mixins/dynamicElement';
       },
     },
     data() {
-      return {
+      return {
         LabelName:'',
         isLoading: true,
         screenRow: [],
@@ -59,7 +59,7 @@ import dynamicElement from '../../mixins/dynamicElement';
     mounted() {
       var self = this;
       if(self.categoryLoaded){
-        this.$nextTick(function () {
+        this.$nextTick(function () {
           if (typeof self.api !== 'undefined') {
             self.loaderObj.SearchScreen(self.api, self.load, self.screenPara);
           }
@@ -73,7 +73,7 @@ import dynamicElement from '../../mixins/dynamicElement';
       }
     },
     methods: {
-      clickHandler(model) {
+      clickHandler(model) {
         switch (model.action) {
           case 'showHigh':
             this.$set(this, 'highScreen', !this.highScreen);
@@ -99,44 +99,44 @@ import dynamicElement from '../../mixins/dynamicElement';
             }
             break;
         }
-      },
-      clichSearchWhere(col) {
-        if (typeof col.scripts !== 'undefined') {
-          this.model.reset();
-          this.model.scripts.formData = this.model.formData;
-          this.model.scripts.formData.form = this.model;
-          this.model.scripts.formData.excuteData = this.model.screen;
-          this.model.scripts.formData.fieldsDic = this.model.screenDic;
-          this.$common.excute.call(this.model.scripts, col.scripts);
-          this.$emit('search', this.model.scripts.formData.form);
-        }
-      },
-      SaveSearchWhere(field) {
-        if (this.model.searchDataOfShow.fields.length == 0) {
+      },
+      clichSearchWhere(col) {
+        if (typeof col.scripts !== 'undefined') {
+          this.model.reset();
+          this.model.scripts.formData = this.model.formData;
+          this.model.scripts.formData.form = this.model;
+          this.model.scripts.formData.excuteData = this.model.screen;
+          this.model.scripts.formData.fieldsDic = this.model.screenDic;
+          this.$common.excute.call(this.model.scripts, col.scripts);
+          this.$emit('search', this.model.scripts.formData.form);
+        }
+      },
+      SaveSearchWhere(field) {
+        if (this.model.searchDataOfShow.fields.length == 0) {
           this.$message({
             message: "没有选择任何搜索条件，无需保存！",
             type: 'warning',
             showClose: true,
-          });
-          return;
-        }
-        var submitData = {};
-        submitData["jsonData"] = JSON.stringify(this.model.searchData.fields);
-        this.clickHandlerfield(field, submitData)
-      },
-      SearchWhereManage(model) {
+          });
+          return;
+        }
+        var submitData = {};
+        submitData["jsonData"] = JSON.stringify(this.model.searchData.fields);
+        this.clickHandlerfield(field, submitData)
+      },
+      SearchWhereManage(model) {
         let field = this.model.actionRouters.find((b) => {
           return b.id === model.routerKey;
-        });
-        this.clickHandlerfieldManage(field);
-      },
+        });
+        this.clickHandlerfieldManage(field);
+      },
       clickHandlerfield(field, submitData) {
         var self = this;
         this.model.scripts.$fd = field.id;
         this.model.scripts.$result = [];
 
         var clickAcion = function (field) {
-          //若不是客户端方法，则直接访问接口
+          //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
             let verified = true;
             if (field.isSubmit) {
@@ -545,19 +545,19 @@ import dynamicElement from '../../mixins/dynamicElement';
         else {
           clickAcion(field, submitData);
         }
-      },
+      },
       clickHandlerfieldManage(field, submitData) {
         var self = this;
-        var clickAcion = function (field) {
+        var clickAcion = function (field) {
           //若不是客户端方法，则直接访问接口
-          if (!field.isClientFuntion) {
-            if (!submitData) {
+          if (!field.isClientFuntion) {
+            if (!submitData) {
               submitData = {};
-              field.getSearchPara().fields.forEach((f) => {
+              field.getSearchPara().fields.forEach((f) => {
                 submitData[common.initialsToLowerCase(f.fieldName1)] = f.searchValue1;
-              });
+              });
               submitData["sourceFrom"] = "setting";
-            }
+            }
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),
@@ -604,7 +604,7 @@ import dynamicElement from '../../mixins/dynamicElement';
         else {
           clickAcion(field, submitData);
         }
-      },
+      },
       loadScreen() {
         var self = this;
         var hasParent = self.model.screen.filter((v) => {
@@ -669,17 +669,17 @@ import dynamicElement from '../../mixins/dynamicElement';
         self.model.$vue = self;
         self.loadScreen();
         self.loadHighScreen();
-        self.setScreenShow();
-        if (self.model.onload) {
-          self.model.scripts.formData = self.model.formData;
-          self.model.scripts.formData.form = self.model;
-          self.model.scripts.formData.excuteData = self.model.screen;
+        self.setScreenShow();
+        if (self.model.onload) {
+          self.model.scripts.formData = self.model.formData;
+          self.model.scripts.formData.form = self.model;
+          self.model.scripts.formData.excuteData = self.model.screen;
           self.model.scripts.formData.fieldsDic = self.model.screenDic;
           self.$common.excute.call(self.model.scripts, self.model.onload);
-        }
+        }
         self.isLoading = false;
         self.$emit('loaded', self.model.defaultSearch);
-        self.$emit('showTitle');
+        self.$emit('showTitle');
       },
       searchComplate() {
         var self = this;

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

@@ -210,7 +210,8 @@ import dynamicElement from "../../mixins/dynamicElement";
 import dynamicTableTip from "./dynamicTableTip.vue";
 import dynamicTableToolbar from "./dynamicTableToolbar.vue";
 import dynamicTableStats from "./dynamicTableStats.vue";
-import dynamicLayout from "../../dynamicLayout/src/dynamicLayout.vue";
+  import dynamicLayout from "../../dynamicLayout/src/dynamicLayout.vue";
+  import Cookies from 'js-cookie';
 export default {
   name: "ct-searchtable",
   mixins: [dynamicElement],
@@ -983,7 +984,7 @@ export default {
     routerClickHandler(field, submitData, action) {
       let self = this;
       action = action || field.action;
-      var clickAcion = function () {
+      var clickAcion = function () {
         self.$emit('doClosePopoverHandle');
         //若不是客户端方法，则直接访问接口
         if (!field.isClientFuntion) {
@@ -1359,6 +1360,9 @@ export default {
           var fun = self.$common.getDataDrivenOpts().handler[action];
           if (self.isIframe) {
             submitData.isIframe = self.isIframe;
+          }
+          if (action == "openPropertyDetailRET" || action == "openPropertyDetailOFI") {
+            self.setCookies(action + submitData.chanceID);
           }
           fun(submitData, title, self.$parent);
         }
@@ -1709,7 +1713,21 @@ export default {
       this.model.setSelectAll();
       this.selectAllType = this.model.getSelectAll();
       this.$forceUpdate();
-    },
+    },
+    setCookies(key) {
+      var curDate = new Date();
+      //当前时间戳
+      var curTamp = curDate.getTime();
+      //当日凌晨的时间戳,减去一毫秒是为了防止后续得到的时间不会达到00:00:00的状态
+      var curWeeHours = new Date(curDate.toLocaleDateString()).getTime() - 1;
+      //当日已经过去的时间（毫秒）
+      var passedTamp = curTamp - curWeeHours;
+      //当日剩余时间
+      var leftTamp = 24 * 60 * 60 * 1000 - passedTamp;
+      var expires = new Date();
+      expires.setTime(leftTamp + curTamp);
+      return Cookies.set(key, "", { expires: expires })
+    },
     calculatingRowHeight() {
       let self = this;
 

package/src/centaline/dynamicSearchListTab/src/dynamicSearchListTab.vue

@@ -65,6 +65,10 @@
       flagPopupSearchlist:{
         Boolean,
         default:false,
+      },      
+      openMultiListIndex:{
+        Number,
+        default: -1,
       },
     },
     created() {
@@ -73,6 +77,9 @@
       if(this.apiParam && this.apiParam.isIframe && this.apiParam.isIframe=='true'){
         this.isIframe=true;
       }
+      if(this.openMultiListIndex>-1){
+        this.activeIndex=this.openMultiListIndex;
+      }
     },
     activated() {
       this.$nextTick(() => {
@@ -117,9 +124,9 @@
               let parm={};
               parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
               self.label=self.categorySource.selectItems1[self.activeIndex].displayName;
-              self.categorySource.selectItems1[0].screenPara=parm;
+              self.categorySource.selectItems1[self.activeIndex].screenPara=parm;
               self.listHeight=(self.$refs.main.offsetHeight-42)+'px';
-              self.categorySource.selectItems1[0].loaded=true;              
+              self.categorySource.selectItems1[self.activeIndex].loaded=true;              
               window.addEventListener("resize", (ev) => {
                 self.resize();
               });
@@ -131,6 +138,12 @@
         );
       },
       categorychangeHandler() {
+        if(this.categorySource.routerKey && this.categorySource.routerKey=='openMultiList1212'){
+          this.activeIndex=this.openMultiListIndex>-1?this.openMultiListIndex:0;
+          this.$common.getDataDrivenOpts().handler.openTabRouter('ofi_propertyList', '');
+          return;
+        }
+
         let i = this.activeIndex;
         let parm={};
         parm[this.categorySource.fieldName1]=this.categorySource.selectItems1[i].code;

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -34,7 +34,8 @@
   </div>
 </template>
 
-<script>
+<script>
+  import Cookies from 'js-cookie';
   export default {
     name: 'ct-tablecurrency',
     props: {
@@ -64,9 +65,10 @@
           return true
         }
         return false;
-      }
+      },
     },
-    created() {
+    created() {
+      this.isVisited();
     },    
     data() {
       return {
@@ -96,6 +98,12 @@
         }
         this.labelColor='mazarine'
 
+      },
+      isVisited() {
+        var key = this.router.action + this.rowData.chanceID;
+        if (typeof Cookies.get(key) !== "undefined") {
+          this.labelColor = 'mazarine'
+        }
       },
       closeListenVoice() {
         this.$refs.video.pause();
@@ -140,7 +148,7 @@
     width: 24px;
     margin-top: 2px;
   }
-  .mazarine{
-    color: #541a8b;
+  .mazarine {
+    color: #cb452f;
   }
 </style>