centaline-data-driven 1.3.88 → 1.3.89

package/package.json

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

package/src/SearchList.vue

@@ -12,10 +12,15 @@
     </ct-searchlist> -->
 
     <ct-searchlist 
+      :searchConditionApi="'/customermanage/MyCustomerList/getLayoutOfSearch'" 
+      :searchDataApi="'/customermanage/MyCustomerList/getList'">
+    </ct-searchlist>
+
+    <!-- <ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
       :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" 
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

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

@@ -75,7 +75,14 @@
                 </ct-albums>
               </div>
               <div class="hous-b">
-                <img :src="model.fields1Dic.ewmUrl.value" alt="" class="code-ewm"/>
+                <el-popover  v-if="model.routerForQRCode !== null" placement="left-start" trigger="hover" @show="fieldClickHandler(model.routerForQRCode, $event)">
+                  <div style="border-bottom:none">
+                    <div style="text-align: center;margin-bottom:10px;">APP扫码</div>
+                    <div style="width:200px; height:200px;"><img :src="model.QRCode"  @click="fieldClickHandler(model.routerForQRCode, $event)" /></div>
+                    <div style="text-align: center;margin-top:10px;">点击二维码刷新</div>
+                  </div>
+                  <img class="code-ewm" slot="reference" :src="model.fields1Dic.ewmUrl.value" />
+                </el-popover>
                 <div class="info-row mb20 mt5">
                   <div class="row-i">
                     <span>{{ model.fields1Dic.Price.label }}</span>
@@ -658,6 +665,9 @@ export default {
     loadFavorite() {
       this.model.loadFavorite();
     },
+    loadqrCode() {
+      this.model.loadqrCode();
+    },
     handleClick(tab, event) {
       let i = tab.index;
       if (this.model.tags2 && this.model.tags2[i]) {
@@ -728,6 +738,12 @@ export default {
           router = this.model.actionRouterFavorite;
         }
       }
+      if (router == undefined && this.model.routerForQRCode) {
+        if (field.id === this.model.routerForQRCode.id) {
+          router = this.model.routerForQRCode;
+        }
+      }
+
       if (router) {
         if (field.isSubmitDataFromSelf) {
           router.submitFormField.forEach((v) => {
@@ -750,6 +766,9 @@ export default {
         else if (router.id == "Favorite") {
           callBack = "loadFavorite"
         }
+        else if (router.id == "qrCode") {
+          callBack = "loadqrCode"
+        }
       }
 
       if (callBack) {
@@ -762,6 +781,9 @@ export default {
         else if (callBack == 'loadFavorite') {
           this.routerClickHandler(router, submitData, self.loadFavorite);
         }
+        else if (callBack == 'loadqrCode') {
+          self.loadqrCode();
+        }
       } 
       else {
         this.routerClickHandler(router, submitData);

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

@@ -74,15 +74,22 @@
                 </ct-albums>
               </div>
               <div class="hous-b">
-                <img :src="model.fields1Dic.ewmUrl.value" alt="" class="code-ewm"/>
+                <el-popover v-if="model.routerForQRCode !== null" placement="left-start" trigger="hover" @show="fieldClickHandler(model.routerForQRCode, $event)">
+                  <div style="border-bottom:none">
+                    <div style="text-align: center;margin-bottom:10px;">APP扫码</div>
+                    <div style="width:200px; height:200px;"><img :src="model.QRCode" @click="fieldClickHandler(model.routerForQRCode, $event)" /></div>
+                    <div style="text-align: center;margin-top:10px;">点击二维码刷新</div>
+                  </div>
+                  <img class="code-ewm" slot="reference" :src="model.fields1Dic.ewmUrl.value" />
+                </el-popover>
                 <div class="info-row mb20 mt5">
                   <div class="row-i">
                     <span>{{ model.fields1Dic.Price.label }}</span>
                     <span class="base-clolr expand-f" v-html="model.fields1Dic.Price.value"></span>
                     <span class="base-clolr">{{ model.fields1Dic.Price.unitName}}</span>
                     <component v-if="model.actionRouterPrice" class="ml10" style="display: flex;"
-                      :is="model.actionRouterPrice.is" :vmodel="model.actionRouterPrice" :api="model.optionApi" 
-                      @click="fieldClickHandler(model.actionRouterPrice, $event)">
+                               :is="model.actionRouterPrice.is" :vmodel="model.actionRouterPrice" :api="model.optionApi"
+                               @click="fieldClickHandler(model.actionRouterPrice, $event)">
                     </component>
                   </div>
                   <div class="row-i">
@@ -648,6 +655,9 @@ export default {
     loadFavorite() {
       this.model.loadFavorite();
     },
+    loadqrCode() {
+      this.model.loadqrCode();
+    },
     handleClick(tab, event) {
       let i = tab.index;
       if (this.model.tags2 && this.model.tags2[i]) {
@@ -720,6 +730,11 @@ export default {
           router = this.model.actionRouterFavorite;
         }
       }
+      if (router == undefined && this.model.routerForQRCode) {
+        if (field.id === this.model.routerForQRCode.id) {
+          router = this.model.routerForQRCode;
+        }
+      }
 
       if (router) {
         if (field.isSubmitDataFromSelf) {
@@ -743,6 +758,9 @@ export default {
         else if (router.id == "Favorite") {
           callBack = "loadFavorite"
         }
+        else if (router.id == "qrCode") {
+          callBack = "loadqrCode"
+        }
       }
 
       if (callBack) {
@@ -755,6 +773,9 @@ export default {
         else if (callBack == 'loadFavorite') {
           this.routerClickHandler(router, submitData, self.loadFavorite);
         }
+        else if (callBack == 'loadqrCode') {
+          self.loadqrCode();
+        }
       }
       else {
         this.routerClickHandler(router, submitData);

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -59,7 +59,7 @@
             </el-dropdown>
           </span>
         </div>
-        <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress" :width="96" :height="96" class="file-cirle"></el-progress>
+        <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress" :width="96" :height="96" class="file-cirle"></el-progress>        
       </div>
     </el-upload>
   </div>
@@ -215,20 +215,6 @@
       },
       //上传之前的钩子
       beforeUploadProcess(files) {
-        let that = this;
-
-        // if (this.model.max) {
-        //    console.log('beforeUploadProcess')
-        //   console.log(this.model.fileList)
-        //   if (this.model.getfileListLength() >= this.model.max) {
-        //     this.validMessage = "附件最多" + this.model.max + "个";
-        //     this.valid = false;
-        //     setTimeout(() => {
-        //       that.valid = true;
-        //      }, 3000)
-        //     return false;
-        //   }
-        // }
         return true;
       },
       //文件上传时的钩子

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

@@ -278,8 +278,13 @@
           self.model.searchModel = this.tempSearchModel;
         }
         //自动查询 调用合并列
-        if (self.model.rowMergedColumns.length > 0 && self.model.listData.length > 0) {
-          self.model.setRow(self.model.listData);
+        if (self.model.listData.length > 0) {
+          if(self.model.rowMergedColumns.length > 0){
+            self.model.setRow(self.model.listData);
+          }
+          else{
+            self.model.setStyleRow(self.model.listData);
+          }
         }
         self.tableComplate = true;
         self.setTableHeight();

package/src/centaline/dynamicTree/src/dynamicSearchTree.vue

@@ -35,10 +35,11 @@ export default {
   },
   methods: {
     setTreeHeight() {
-      this.$nextTick(() => {
-        if (this.$refs.treescreen) {
-          let searchHeight = this.$refs.treescreen.$el.offsetHeight;
-          this.treeHeight = this.searchtreeHeight - searchHeight;
+      let self = this;
+      self.$nextTick(() => {
+        if (self.$refs.treescreen) {
+          let searchHeight = self.$refs.treescreen.$el.offsetHeight;
+          self.treeHeight = self.searchtreeHeight - searchHeight;
         }
       });
     },

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

@@ -21,6 +21,8 @@ const Detail = function (source, para, callBack) {
       _commissionApiRouter: null,//查看角色
       _actionRouterFavorite: null,//收藏动作行为
       _matchCustomerApiRouter: null,//匹配客户
+      _routerForQRCode: null,//二维码
+      QRCode:"",
       detailHeight: 750,
       midlWidth: 1200,
       activeIndex1: '0',
@@ -194,6 +196,20 @@ const Detail = function (source, para, callBack) {
           return rtn._contactApiRouter;
         }
       },
+      get routerForQRCode() {
+        if (rtn._routerForQRCode !== null) {
+          return rtn._routerForQRCode;
+        }
+        else {
+          if (data.routerForQRCode) {
+            var router = Router(data.routerForQRCode);
+            router.is = "ct-btn";
+            router.attrs = { size: "mini" }
+            rtn._routerForQRCode = router;
+          }
+          return rtn._routerForQRCode;
+        }
+      },
       get matchCustomerApiRouter() {
         if (rtn._matchCustomerApiRouter !== null) {
           return rtn._matchCustomerApiRouter;
@@ -597,6 +613,25 @@ const Detail = function (source, para, callBack) {
           }
         );
       },
+      loadqrCode() {
+        var action;
+        if (data.routerForQRCode) {
+          var router = Router(data.routerForQRCode);
+          if (router) {
+            action = router.action;
+          }
+        }
+        Vue.prototype.$api.postHandler(common.globalUri(), { action: action, para: para }).then(
+          function (response) {
+            if (response.rtnCode === Enum.ReturnCode.Successful) {
+              if (response.content) {
+                Vue.set(rtn._routerForQRCode, "imgUrl", response.content);
+                rtn.QRCode = response.content;
+              }
+            }
+          }
+        );
+      },
     };
     return rtn;
   }

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

@@ -28,8 +28,7 @@
     </div>
     <div v-else>
       <img v-if="router.imgUrl && isShowImg" class="ct-tablecurrencyImg ct-tablecurrencyItem" :src="router.imgUrl" :title="router.label"  @click="!isOperationalColumn?clickHandler($event):null"/>
-      <a v-else href="javascript:void(0);" class="ct-tablecurrencyItem"  @click="!isOperationalColumn?clickHandler($event):null">
-        {{label}}
+      <a v-else href="javascript:void(0);" class="ct-tablecurrencyItem" @click="!isOperationalColumn?clickHandler($event):null" v-html="label">
       </a>
     </div>
   </div>

package/src/main.js

@@ -13,8 +13,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://10.88.23.25:9999/v1/form/router",
-  // baseUrl: "http://10.88.22.44:9999/v1/form/router", 
+  // baseUrl: "http://10.25.10.67:9999/v1/form/router",
+  // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.40:8080/", 
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // flagRouterSelf: true,
@@ -43,14 +43,14 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZh7_b27uj0wMaPIEs8EqyMQKIx_rsYoaP3FZPMa2ZeMM4dVOBXcCc22riCO7HREnH0JA0eok_IwhYDpYCJJfGpbmw61lBAftygIhHh0lG0BQw6_YSl4L9iHvP9nJ__OHedhmWWXci9CqNxJiOrCaidWarPpFEu2pcM7w8AAAD__w.JeIxQIdxvfdXeznKFoGbBpDvbEZYK_5QcpXp3XNAG4c',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzrEOgkAQBNB_2ZpNWFh2Fzo9sPEjyJ0HCVZGINEY_12J0NH7iimmmXnBOAeoQFe4E5u2XOFObFoiLpWkwUOpDlk4RyNn6Fgcn-omd8caEugeN6hIFpSqJjD46VcUyrIU89jdz93zH-eu0_CdJTXvxQxjroJ8SQsMlgX0mUXTmPbSF_D-AAAA__8.sdQBmdkYKUL9c9NLyUbjFEl3_SQ-e2f51rR4llSHFPM',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
         estateId: '20210729104021C49F04B55C50F6AF58',
 
-        authObject: '{"currentEstate":{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D"},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
-        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdiMzUxY2QyLWE3ZTctNDdlNi05NGM1LTM1YmUwNWM1NjYzNCJ9.FpN_FJqya2oewIkrwlCgzeFu7bk_kCoKrgOxd5rqVIx8FgF7OyWq72rNpuhrsWnsnUF9WwqfVa98jTVuR4EPbQ',
+        authObject: '{"currentEstate":{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImVmNjc2YjhmLThhM2ItNGQzMy05NGMxLWYzNWUxM2Q1MTc2MyJ9.eaCMvEh4HzqQPy6YRd4DWZx6hEvqagHebzSj_yeMKZy-hPXYMA6EXXauhEMoRIkB2df4l2viZ5-BD8l-nCv65A',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作