centaline-data-driven 1.5.42 → 1.5.44

package/package.json

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

package/release-log.md

@@ -1,3 +1,17 @@
+## v1.5.44
+2023-08-04
+
+优化
+
+列表底部右侧增加companyName
+
+## v1.5.43
+2023-08-03
+
+优化
+
+客户列表右侧边栏tabs和详情页tabs栏选中定位功能优化
+
 ## v1.5.42
 2023-07-31
 

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/data-driven-file/downTemplate'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/task'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "key":"excel:12be9cb7-fd3a-4f82-a583-d7e240dc7aab"
+          "stepId":"1686982560817586178","businessId":"1686982455918043138","actionType":1,"pageStyle":2,"pageOnly":true
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -62,11 +62,11 @@
       :searchStatsApi="'/PropertyRETList/getListStats'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyOFIList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyOFIList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
     
@@ -76,7 +76,7 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
     

package/src/centaline/dynamicDetail/src/dynamicCustomerSimpleDetail.vue

@@ -247,7 +247,7 @@ export default {
         this.model.getTags2List(0);
       }
       if (typeof window.localStorage !== 'undefined') {
-        var tagkey = window.localStorage.getItem('simpletagkey');
+        var tagkey = window.localStorage.getItem('simpleCustomertagkey');
         if (self.model.tags1) {
           for (var i = 0; i < self.model.tags1.length; i++) {
             if (tagkey == self.model.tags1[i].appID) {
@@ -270,13 +270,11 @@ export default {
             var nextWidth = 0;
             for (var i = 0; i < self.model.tags1.length; i++) {
               if (self.$refs["StatisticsItem" + i][0] && self.$refs["StatisticsItem" + i][0].offsetParent) {
-                sumWidth = sumWidth + self.$refs["StatisticsItem" + i][0].offsetParent.offsetWidth;
-                console.log('sumWidth',sumWidth);
+                sumWidth = sumWidth + self.$refs["StatisticsItem" + i][0].offsetParent.offsetWidth;;
               }
               if (i + 1 < self.model.tags1.length) {
                 try {
                   nextWidth = nextWidth + self.$refs["StatisticsItem" + (i + 1)][0].offsetParent.offsetWidth;
-                  console.log('nextWidth',nextWidth);
                 } catch (e) { }
               }
               else {
@@ -301,9 +299,31 @@ export default {
                 self.model.tags1.slice(0, tagShowIndex),
                 self.model.tags1.slice(tagShowIndex),
               ];
+              var tagkey = window.localStorage.getItem('simpleCustomertagkey');
+              var tagindex= self.model.tags1.findIndex(
+                (v) => v.appID === tagkey
+              );
+              if(tagindex>=tagShowIndex){
+                 //交换位置
+                  var col= self.showData[1].filter(
+                    (v) => v.appID === tagkey
+                  );
+                  if(col.length>0)
+                  {
+                    col=col[0];
+                  }
+                  var index=tagindex-tagShowIndex;
+                  let lastItemIndex = self.showData[0].length - 1;
+                  let lastItem = self.showData[0][lastItemIndex];
+                  self.showData[0][lastItemIndex]=col;
+                  self.showData[1][index]=lastItem;
+                  self.model.activeIndex1 = lastItemIndex.toString();
+                  self.model.tags1[lastItemIndex]=col;
+                  self.model.tags1[lastItemIndex +1 +index]=lastItem;
+              }
             }
             else {
-              self.showData = self.model.tags1;
+              self.showData = [self.model.tags1];
             }
           }
         });
@@ -424,14 +444,13 @@ export default {
         this.model.searchConditionApiTags1 = this.model.tags1[i].searchConditionAction || '';
         this.model.searchDataApiTags1 = this.model.tags1[i].searchDataAction || '';
         this.model.paramDataTags1 = this.model.tags1[i].paramData || '';
-        window.localStorage.setItem("simpletagkey", this.model.tags1[i].appID);//存储
+        window.localStorage.setItem("simpleCustomertagkey", this.model.tags1[i].appID);//存储
       }
     },
     handleDropDown(col, index) {
       let i = index;
       // this.model.activeIndex1 = (this.showData[0].length + i).toString();
       let dropDownData = this.showData[1];
-
       this.dropDownSelected = true;
       if (dropDownData && dropDownData[i]) {
         this.listKey = this.listKey + 1;
@@ -449,7 +468,7 @@ export default {
        this.model.tags1[lastItemIndex]=col;
        this.model.tags1[lastItemIndex +1 +index]=lastItem;
 
-        window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
+        window.localStorage.setItem("simpleCustomertagkey", col.appID); //存储
       }
     },
     fieldClickHandler(field) {
@@ -964,13 +983,13 @@ export default {
   right: -1px;
 }
 
-.el-dropdown-menu--mini .el-dropdown-menu__item {
+.tabsMore.el-dropdown-menu--mini .el-dropdown-menu__item {
   font-size: 14px;
   font-weight: 700;
   color: #303133;
 }
-.el-dropdown-menu__item:focus,
-.el-dropdown-menu__item:not(.is-disabled):hover {
+.tabsMore .el-dropdown-menu__item:focus,
+.tabsMore .el-dropdown-menu__item:not(.is-disabled):hover {
   background-color: #fff;
   color: var(--chinaRed);
   border-bottom: 3px solid var(--chinaRed);
@@ -981,13 +1000,13 @@ export default {
   color: var(--chinaRed);
   border-bottom: 3px solid var(--chinaRed);
 }
-.el-tabs__item {
+.base-box .el-tabs__item {
     padding: 0 15px;
 }
- .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
- .el-tabs--bottom .el-tabs__item.is-top:last-child,
- .el-tabs--top .el-tabs__item.is-bottom:last-child,
- .el-tabs--top .el-tabs__item.is-top:last-child {
+ .base-box .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+ .base-box .el-tabs--bottom .el-tabs__item.is-top:last-child,
+ .base-box .el-tabs--top .el-tabs__item.is-bottom:last-child,
+ .base-box .el-tabs--top .el-tabs__item.is-top:last-child {
   padding-right: 15px;
 }
 .svgIcon {

package/src/centaline/dynamicDetail/src/dynamicMatchCustomer.vue

@@ -88,7 +88,6 @@ export default {
           }
         };
         self.apiRouter.doSearch(submitData, (res) => {
-          console.log(res)
           if (res.rtnCode === 200 || res.isSuccess) {
             self.searchTable=res.content;
           }

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

@@ -562,6 +562,28 @@ export default {
               self.model.tags1.slice(0, showIndex),
               self.model.tags1.slice(showIndex),
             ];
+            var tagkey = window.localStorage.getItem('DetailOfiTagkey');
+              var tagindex= self.model.tags1.findIndex(
+                (v) => v.appID === tagkey
+              );
+              if(tagindex>=showIndex){
+                 //交换位置
+                  var col= self.showData[1].filter(
+                    (v) => v.appID === tagkey
+                  );
+                  if(col.length>0)
+                  {
+                    col=col[0];
+                  }
+                  var index=tagindex-showIndex;
+                  let lastItemIndex = self.showData[0].length - 1;
+                  let lastItem = self.showData[0][lastItemIndex];
+                  self.showData[0][lastItemIndex]=col;
+                  self.showData[1][index]=lastItem;
+                  self.model.activeIndex1 = lastItemIndex.toString();
+                  self.model.tags1[lastItemIndex]=col;
+                  self.model.tags1[lastItemIndex +1 +index]=lastItem;
+              }
           } 
           else {
             self.showData = [self.model.tags1];
@@ -579,7 +601,7 @@ export default {
         this.model.getTags2List(0);
       }
       if (typeof window.localStorage !== "undefined") {
-        var tagkey = window.localStorage.getItem("detailtagkey");
+        var tagkey = window.localStorage.getItem("DetailOfiTagkey");
         if(self.model.tags1){
           for (var i = 0; i < self.model.tags1.length; i++) {
             if (tagkey == self.model.tags1[i].appID) {
@@ -707,7 +729,7 @@ export default {
         this.model.searchDataApiTags1 = this.model.tags1[i].searchDataAction || "";
         this.model.paramDataTags1 = this.model.tags1[i].paramData || "";
         this.model.appIDTags1 = this.model.tags1[i].appID || "";
-        window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
+        window.localStorage.setItem("DetailOfiTagkey", this.model.tags1[i].appID); //存储
       }
     },
 	  handleDropDown(col, index) {
@@ -731,7 +753,7 @@ export default {
        this.model.tags1[lastItemIndex]=col;
        this.model.tags1[lastItemIndex +1 +index]=lastItem;
 
-        window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
+        window.localStorage.setItem("DetailOfiTagkey", col.appID); //存储
       }
     },
     fieldClickHandler(field) {

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

@@ -572,6 +572,28 @@ export default {
               self.model.tags1.slice(0, showIndex),
               self.model.tags1.slice(showIndex),
             ];
+            var tagkey = window.localStorage.getItem('DetailRetTagkey');
+              var tagindex= self.model.tags1.findIndex(
+                (v) => v.appID === tagkey
+              );
+              if(tagindex>=showIndex){
+                 //交换位置
+                  var col= self.showData[1].filter(
+                    (v) => v.appID === tagkey
+                  );
+                  if(col.length>0)
+                  {
+                    col=col[0];
+                  }
+                  var index=tagindex-showIndex;
+                  let lastItemIndex = self.showData[0].length - 1;
+                  let lastItem = self.showData[0][lastItemIndex];
+                  self.showData[0][lastItemIndex]=col;
+                  self.showData[1][index]=lastItem;
+                  self.model.activeIndex1 = lastItemIndex.toString();
+                  self.model.tags1[lastItemIndex]=col;
+                  self.model.tags1[lastItemIndex +1 +index]=lastItem;
+              }
           } 
           else {
             self.showData = [self.model.tags1];
@@ -589,7 +611,7 @@ export default {
         this.model.getTags2List(0);
       }
       if (typeof window.localStorage !== "undefined") {
-        var tagkey = window.localStorage.getItem("detailtagkey");
+        var tagkey = window.localStorage.getItem("DetailRetTagkey");
         if(self.model.tags1){
           for (var i = 0; i < self.model.tags1.length; i++) {
             if (tagkey == self.model.tags1[i].appID) {
@@ -717,7 +739,7 @@ export default {
         this.model.searchDataApiTags1 = this.model.tags1[i].searchDataAction || "";
         this.model.paramDataTags1 = this.model.tags1[i].paramData || "";
         this.model.appIDTags1 = this.model.tags1[i].appID || "";
-        window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
+        window.localStorage.setItem("DetailRetTagkey", this.model.tags1[i].appID); //存储
       }
     },
     handleDropDown(col, index) {
@@ -742,7 +764,7 @@ export default {
        this.model.tags1[lastItemIndex]=col;
        this.model.tags1[lastItemIndex +1 +index]=lastItem;
 
-        window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
+       window.localStorage.setItem("DetailRetTagkey", col.appID); //存储
       }
     },
     fieldClickHandler(field) {

package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue

@@ -92,7 +92,9 @@
       onChangeHandler: function (val) {
         this.changeHandler(this.model.value);
         this.isShowClear();
-        this.model.value.dispatchEvent(new Event("val")); //更新v-model的值
+        if(this.model.value.dispatchEvent){
+          this.model.value.dispatchEvent(new Event("val")); //更新v-model的值
+        }
       },
       onBlurHandler:function(event){
         this.model.value = this.$common.numToFloat(this.model.value, this.model.decimals);//保留n位小数

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

@@ -193,7 +193,7 @@
 
     <ct-tabletip ref="listFooter" class="ct-search-table-list-footer" :tip="model.listFooter"
                  v-if="!isLoading && !isLayout && model"></ct-tabletip>
-    <ct-tabletip ref="footer" class="ct-search-table-footer" :tip="model.footer"
+    <ct-tabletip ref="footer" class="ct-search-table-footer" style="width: 100%;" :tip="model.footer+model.companyName"
                  v-if="!isLoading && !isLayout && model"></ct-tabletip>
     <div ref="popupButton" v-if="flagPopupSearchlist"
          style="margin-top: 10px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">

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

@@ -329,22 +329,34 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
         this.screen.forEach((v) => {
           if (v.type !== Enum.ControlType.Hidden) {
             var tempObj = common.deepClone(v.searchObj);
-            if (that.isHandle(v.type)) {
-              tempObj.searchValue1 = that.getNewSearchValue(tempObj);
-            }
             if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
-              rtn.fields.push(tempObj);
+              if (that.isHandle(v.type)) {
+                tempObj.searchValue1 = that.getNewSearchValue(tempObj);
+                if(tempObj.searchValue1!==''){
+                  rtn.fields.push(tempObj);
+                }
+              }
+              else{
+                rtn.fields.push(tempObj);
+              }
+              
             }
           }
         });
         this.highScreen.forEach((v) => {
           if (v.type !== Enum.ControlType.Hidden) {
             var tempObj = common.deepClone(v.searchObj);
-            if (that.isHandle(v.type)) {
-              tempObj.searchValue1 = that.getNewSearchValue(tempObj);
-            }
             if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
-              rtn.fields.push(tempObj);
+              if (that.isHandle(v.type)) {
+                tempObj.searchValue1 = that.getNewSearchValue(tempObj);
+                if(tempObj.searchValue1!==''){
+                  rtn.fields.push(tempObj);
+                }
+              }
+              else {
+                rtn.fields.push(tempObj);
+              }
+             
             }
           }
         });

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

@@ -29,6 +29,12 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         if (source.flagShowTitle) v = source.flagShowTitle;
         return v;
       },
+      get companyName(){
+        if(source.companyName){
+          return '<span style="float: right;color:#999999;margin-right: 5px;">'+source.companyName+'</span>'|| '';
+        }
+        return '';
+      },
       get source() {
         return source;
       },

package/src/main.js

@@ -56,9 +56,9 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'f328eca3-7e3d-41ef-beff-5533e83a8bb9',
+        oldToken: 'cd6060fd-36e5-47f1-8cb9-7fc6f61e645c',
         token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
-        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVbyZ-2108V20nCICIMthQqRRAIh7k4Q0NEzxSumeXOHec3QQnKdoDhojL0ySIkNdgM7DNE5ERRrCm70H_DHfBmlJM_S9th5jkiWNDoZHUaykYbU6xgSNFCuZ2il9cIKZS03MO2XtzDSqpdY53LZlds_4k7LtN0eFVUjWGI1B49UNOOWW5BE5my4lpoVPJ4AAAD__w.OX5oLp238UuHYjqOl2oF0wSleZV7Y500kQSjeRpTOIw"}',
+        authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAMRe-SuZZsx0mcbk3SLhyiakWGMiFoJRDi7oCAjZ03_OEt79_MeZtNa4p2KHmwkHt2ICU46IagkLIqJg5Wko7xA_yYLyORxEC-hy6GDOLFglJWyOKzDKW3ORXTmHo5mpZ8JCaLpI1ZpvUtiL1_ie1cT7t6_ce5w7o8s6zsVLBCdAFBWBxMhAFktpFxbxmJzf0BAAD__w.8j17kTENd-vwsdYlFXYHupmajMNlLNuXVuY2nIjs_fo"}',
 
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',