centaline-data-driven 1.3.20 → 1.3.21

package/package.json

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

package/src/SearchList.vue

@@ -8,11 +8,13 @@
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
     :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyWashList/getLayoutOfSearch'" :searchDataApi="'/PropertyWashList/getListOfSearchModel'"></ct-searchlist>
+
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
                    :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
                     :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist>
+                   ></ct-searchlist> -->
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/common/index.js

@@ -7,11 +7,11 @@ const common = {
     }
   },
   /**
- * @method
- * @param {String} flag 按钮类别标识
- * @returns {String} 对应Element按钮的Type
- * @desc 根据按钮标识获取按钮类别
- */
+   * @method
+   * @param {String} flag 按钮类别标识
+   * @returns {String} 对应Element按钮的Type
+   * @desc 根据按钮标识获取按钮类别
+   */
   getBtnType(flag) {
     switch (flag) {
       case 'e':
@@ -43,8 +43,7 @@ const common = {
     var elements = [];
     if (type) {
       elements = document.getElementsByTagName(type);
-    }
-    else {
+    } else {
       elements = document.getElementsByTagName('*');
     }
 
@@ -52,27 +51,26 @@ const common = {
       if (elements[i].className.indexOf(className) >= 0) {
         if (isFirst) {
           return elements[i];
-        }
-        else {
+        } else {
           rtn.push(elements[i]);
         }
       }
     }
     return rtn;
   },
-/**
-  * @method
-  * @param {Object}去重数组 
-  * @desc 将数组去重并合并
-  * @returns {Object} 去重合并的对像
-  */
+  /**
+   * @method
+   * @param {Object}去重数组 
+   * @desc 将数组去重并合并
+   * @returns {Object} 去重合并的对像
+   */
   MergeArray() {
     var _arr = new Array();
     var _arr1 = new Array();
     for (x in arguments) {
       _arr1.concat(arguments[x]);
     }
-    for (var i = 0; i < _arr1.length; i++) { 
+    for (var i = 0; i < _arr1.length; i++) {
       if (_arr.indexOf(array[i]) == -1) _arr.push(array[i]);
     }
     return _arr;
@@ -111,15 +109,13 @@ const common = {
         var hisIndex = sourceHistory.indexOf(obj);
         if (hisIndex >= 0) {
           rtn = cloneHistory[hisIndex];
-        }
-        else {
+        } else {
           if (Object.prototype.toString.call(obj) === '[object Object]') {
             rtn = {};
             for (var keyObj in obj) {
               rtn[keyObj] = this.CloneCode(obj[keyObj], sourceHistory, cloneHistory);
             }
-          }
-          else if (Object.prototype.toString.call(obj) === '[object Array]') {
+          } else if (Object.prototype.toString.call(obj) === '[object Array]') {
             rtn = [];
             for (var keyArray in obj) {
               rtn.push(this.CloneCode(obj[keyArray], sourceHistory, cloneHistory));
@@ -171,17 +167,18 @@ const common = {
    * @returns {Number} 滚动条宽度
    */
   getScrollbarWidth() {
-    var odiv = document.createElement('div'),//创建一个div
+    var odiv = document.createElement('div'), //创建一个div
       styles = {
         width: '100px',
         height: '100px',
-        overflowY: 'scroll'//让他有滚动条
-      }, i, scrollbarWidth;
+        overflowY: 'scroll' //让他有滚动条
+      },
+      i, scrollbarWidth;
     for (i in styles) odiv.style[i] = styles[i];
-    document.body.appendChild(odiv);//把div添加到body中
-    scrollbarWidth = odiv.offsetWidth - odiv.clientWidth;//相减
+    document.body.appendChild(odiv); //把div添加到body中
+    scrollbarWidth = odiv.offsetWidth - odiv.clientWidth; //相减
     document.body.removeChild(odiv);
-    return scrollbarWidth;//返回滚动条宽度
+    return scrollbarWidth; //返回滚动条宽度
   },
 
   /**
@@ -215,29 +212,27 @@ const common = {
    */
   closeDialog(vmodel) {
     if (vmodel) {
-      if (vmodel.name === 'ct-comfirm' 
-      || vmodel.$options.name === 'ctDialog' 
-      || vmodel.$options.name === 'ct-dialog' 
-      || vmodel.$options.name === 'ct-video') {
+      if (vmodel.name === 'ct-comfirm' ||
+        vmodel.$options.name === 'ctDialog' ||
+        vmodel.$options.name === 'ct-dialog' ||
+        vmodel.$options.name === 'ct-video') {
         this.dialogList.deleteDialog(vmodel);
         return;
-      }
-      else {
+      } else {
         this.closeDialog(vmodel.$parent);
       }
-    }
-    else {
+    } else {
       return;
     }
   },
 
   /**
- * @method
- * @param {Object} message 提示信息
- * @param {Object} title 提示框标题
- * @param {Object} options 参数 如confirmButtonText，cancelButtonText
- * @desc 确认框
- */
+   * @method
+   * @param {Object} message 提示信息
+   * @param {Object} title 提示框标题
+   * @param {Object} options 参数 如confirmButtonText，cancelButtonText
+   * @desc 确认框
+   */
   confirm(message, title, options) {
     let self = this;
 
@@ -288,8 +283,34 @@ const common = {
             width: router.dialogWidth + 'px',
             height: router.dialogHeight + 'px'
           },
-          on: {
-          }
+          on: {}
+        }]
+      };
+      this.openDialog(dialogOption);
+    })
+  },
+  viewerfile(router, MediaAlbum, groupIndex, index) {
+    var self = this;
+    var width = parseInt(window.document.body.clientWidth * 0.8);
+    width = width > 1160 ? 1160 : width;
+    return new Promise((resolve, reject) => {
+      var dialogOption = {
+        title: router.pageTitle,
+        name: 'ct-viewerfile',
+        content: [{
+          component: 'ct-viewerfile',
+          attrs: {
+            showTitle: false,
+            MediaAlbum: MediaAlbum,
+            groupIndex: groupIndex || 0,
+            index: index || 0,
+            // width: self.modelPhotoselect.router.pageWidth + 'px',
+            // height: self.modelPhotoselect.router.pageHeight+'px',
+            width: width + "px",
+            height: parseInt(window.document.body.clientHeight * 0.8).toString() +
+              "px"
+          },
+          on: {}
         }]
       };
       this.openDialog(dialogOption);
@@ -307,20 +328,15 @@ const common = {
     if (parent) {
       if (parent.$options.name === 'ElTabPane') {
         return parent;
-      }
-      else if (evControl.$options.name === 'ctDialog') {
+      } else if (evControl.$options.name === 'ctDialog') {
         return evControl.vmodel.pane;
-      }
-      else if (parent.$options.name === 'DataDrivenSearch') {
+      } else if (parent.$options.name === 'DataDrivenSearch') {
         return parent;
-      }
-      else if (parent.$options.name === 'DataDrivenForm') {
+      } else if (parent.$options.name === 'DataDrivenForm') {
         return parent;
-      }
-      else if (parent.$options.name === 'DataDrivendetail') {
+      } else if (parent.$options.name === 'DataDrivendetail') {
         return parent;
-      }
-      else {
+      } else {
         return this.getParentPane(parent);
       }
     }
@@ -356,8 +372,7 @@ const common = {
       if (currentKey.indexOf(j) < 0) {
         if (typeof window[j] === 'function') {
           rtn[j] = common.initFunction(window[j]);
-        }
-        else {
+        } else {
           rtn[j] = window[j];
         }
         delete window[j];
@@ -376,16 +391,14 @@ const common = {
   initFunction(f) {
     return function () {
       if (arguments.length === 0) {
-        return f(typeof $fd!='undefined'?$fd:'');
-      }
-      else {
+        return f(typeof $fd != 'undefined' ? $fd : '');
+      } else {
         var exStr = 'f(';
         for (var i = 0; i < arguments.length; i++) {
           exStr += 'arguments[' + i + ']';
           if (i !== arguments.length - 1) {
             exStr += ',';
-          }
-          else {
+          } else {
             exStr += ');';
           }
         }
@@ -410,12 +423,12 @@ const common = {
   },
 
   /**
- * @method
- * @param {Function} fun 执行方法
- * @param {Object} para 执行方法的参数
- * @desc 执行方法，装载自定义方法和参数在window上
- * @returns {obj} 返回值
- */
+   * @method
+   * @param {Function} fun 执行方法
+   * @param {Object} para 执行方法的参数
+   * @desc 执行方法，装载自定义方法和参数在window上
+   * @returns {obj} 返回值
+   */
   excuteFun(fun, para) {
     var self = this;
     common.with(self);
@@ -426,12 +439,12 @@ const common = {
   },
 
   /**
- * @method
- * @param {String} fun 执行方法字符串
- * @param {Object} para 执行方法的参数
- * @desc 执行方法，装载自定义方法和参数在window上
- * @returns {obj} 返回值
- */
+   * @method
+   * @param {String} fun 执行方法字符串
+   * @param {Object} para 执行方法的参数
+   * @desc 执行方法，装载自定义方法和参数在window上
+   * @returns {obj} 返回值
+   */
   excuteFunStr(funStr, para) {
     var self = this;
     common.with(self);
@@ -480,7 +493,9 @@ const common = {
       byteArr[i] = fileContent.charCodeAt(i);
     }
 
-    var blob = new Blob([new Uint8Array(byteArr)], { type: "application/ms-excel" });
+    var blob = new Blob([new Uint8Array(byteArr)], {
+      type: "application/ms-excel"
+    });
     var url = window.URL.createObjectURL(blob);
 
     var a = document.createElement("a");
@@ -494,8 +509,7 @@ const common = {
       //revokeObjectURL会导致firefox不能下载。。。
       //window.URL.revokeObjectURL(url);
       document.body.removeChild(a);
-    }
-    else { //IE 10+
+    } else { //IE 10+
       if (typeof navigator !== "undefined" && navigator.msSaveOrOpenBlob) {
         return navigator.msSaveOrOpenBlob(blob, name);
       }
@@ -537,8 +551,7 @@ const common = {
         //单字节加1
         if ((c >= 0x0001 && c <= 0x007e) || (0xff60 <= c && c <= 0xff9f)) {
           len++;
-        }
-        else {
+        } else {
           len += 2;
         }
       }
@@ -572,11 +585,9 @@ const common = {
   setScrollTop(total) {
     if (document.getElementById("form-app")) {
       document.getElementById("form-app").scrollTop = total;
-    }
-    else if (window.scrollTo) {
+    } else if (window.scrollTo) {
       window.scrollTo(0, total)
-    }
-    else {
+    } else {
       // Chrome
       document.body.scrollTop = total
       // Firefox
@@ -587,11 +598,11 @@ const common = {
   },
 
   /** 
-     * 格式化日期 
-     * @param date 日期 
-     * @param format 格式化样式,例如yyyy-MM-dd HH:mm:ss E 
-     * @return 格式化后的日期
-     */
+   * 格式化日期 
+   * @param date 日期 
+   * @param format 格式化样式,例如yyyy-MM-dd HH:mm:ss E 
+   * @return 格式化后的日期
+   */
   formatDate: function (date, format) {
     var v = "";
     if (typeof date === "string" || typeof date !== "object") {
@@ -687,14 +698,12 @@ const common = {
     str = charUpper + str.slice(1);
     return str;
   },
-  getDataOfUpperLower(model,key){
-    if(model[key]){
+  getDataOfUpperLower(model, key) {
+    if (model[key]) {
       return model[key];
-    }
-    else if(model[this.initialsToUpperCase(key)]){
+    } else if (model[this.initialsToUpperCase(key)]) {
       return model[this.initialsToUpperCase(key)];
-    }
-    else if(model[this.initialsToLowerCase(key)]){
+    } else if (model[this.initialsToLowerCase(key)]) {
       return model[this.initialsToLowerCase(key)];
     }
     return '';
@@ -720,8 +729,7 @@ const common = {
     var reg = '';
     if (dc == undefined || dc == "" || dc === "0") {
       reg = /^(\-)?\d*$/;
-    }
-    else {
+    } else {
       if (dc === -1) dc = 12;
       reg = new RegExp("^(\\-)?\\d*[.]{0,1}(\\d{1," + dc + "})?$");
     }
@@ -729,8 +737,7 @@ const common = {
       // if (value.indexOf(".") !== -1 && value.indexOf(".") !== value.length - 1 && value.indexOf(".") < value.length - num - 1 && num && num > 0) {
       //   value = oldValue;
       // }
-    }
-    else {
+    } else {
       value = oldValue;
     }
 
@@ -745,16 +752,16 @@ const common = {
    */
   numToFloat(value, num) {
     if (value && num && num > 0) {
-      let ls=value.toString().split('.');
-      let l1=0;
-      value=ls[0]+'.';
-      if(ls.length>1){
-        value=value+ls[1];
-        l1=ls[1].length;
+      let ls = value.toString().split('.');
+      let l1 = 0;
+      value = ls[0] + '.';
+      if (ls.length > 1) {
+        value = value + ls[1];
+        l1 = ls[1].length;
       }
-      if(num>l1){
-        for(var i=0;i<num-l1;i++){
-          value=value+'0';
+      if (num > l1) {
+        for (var i = 0; i < num - l1; i++) {
+          value = value + '0';
         }
       }
     }
@@ -769,8 +776,9 @@ const common = {
    */
   isAssetTypeAnImage(ext) {
     return [
-      'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].
-      indexOf(ext.toLowerCase()) !== -1;
+      'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'
+    ].
+    indexOf(ext.toLowerCase()) !== -1;
   },
 
   /**

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

@@ -651,6 +651,9 @@ export default {
     lookOwner() {
       this.codeOwner = true;
     },
+    loadBaseInfo() {
+      this.model.loadBaseInfo();
+    },
     handleClick(tab, event) {
       let i = tab.index;
       if (this.model.tags2 && this.model.tags2[i]) {
@@ -713,16 +716,26 @@ export default {
           router.submitFormField.forEach((v) => {
             submitData[v] = field.list[field.listIndex].code;
           });
-        } else {
+        } 
+        else {
           router.submitFormField.forEach((v) => {
             submitData[v] = self.model.fields1Dic[v].value;
           });
         }
+        if(router.id=="PropertyEdit"){
+          callBack="loadBaseInfo"
+        }
       }
 
-      if (callBack && callBack == "loadOperation") {
-        this.routerClickHandler(router, submitData, self.loadOperation);
-      } else {
+      if (callBack) {
+        if(callBack=='loadOperation'){
+          this.routerClickHandler(router, submitData, self.loadOperation);
+        }
+        else if(callBack=='loadBaseInfo'){
+          this.routerClickHandler(router, submitData, self.loadBaseInfo);
+        }
+      } 
+      else {
         this.routerClickHandler(router, submitData);
       }
     },

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

@@ -32,20 +32,9 @@
               {{ tag.label }}
             </div>
           </div>
-          <div
-            v-if="model.fields1Dic.PropertyDepict"
-            v-html="model.fields1Dic.PropertyDepict.value"
-            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 v-if="model.fields1Dic.PropertyDepict" v-html="model.fields1Dic.PropertyDepict.value"
+            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>
@@ -159,81 +148,48 @@
           <div class="hous-info base-box">
             <div class="info-conten">
               <div class="hous-t">
-                <ct-albums
-                  :mediaAlbums="model.mediaAlbums"
-                  :noMediaUrl="model.noMediaUrl"
-                  @addMedia="addMedia"
-                  :title="model.title"
-                >
+                <ct-albums :mediaAlbums="model.mediaAlbums" :noMediaUrl="model.noMediaUrl" @addMedia="addMedia" :title="model.title">
                 </ct-albums>
               </div>
               <div class="hous-b">
-                <img
-                  :src="model.fields1Dic.ewmUrl.value"
-                  alt=""
-                  class="code-ewm"
-                />
+                <img :src="model.fields1Dic.ewmUrl.value" alt="" class="code-ewm"/>
                 <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>
+                    <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>
                     <img src="../../../assets/jsq.png" class="img-jsq" alt="" />
                   </div>
                   <div class="row-i">
-                    <span>{{ model.fields1Dic.PriceUnit.label }}</span
-                    ><span
-                      class="base-clolr expand-f"
-                      v-html="model.fields1Dic.PriceUnit.value"
-                    ></span
-                    ><span class="base-clolr">{{
-                      model.fields1Dic.PriceUnit.unitName
-                    }}</span>
+                    <span>{{ model.fields1Dic.PriceUnit.label }}</span>
+                    <span class="base-clolr expand-f" v-html="model.fields1Dic.PriceUnit.value">
+                    </span>
+                    <span class="base-clolr">{{ model.fields1Dic.PriceUnit.unitName}}</span>
                   </div>
                   <div v-if="model.fields1Dic.PriceLine" class="row-i">
                     <span>{{ model.fields1Dic.PriceLine.label }}</span>
                     <div>
-                      {{ model.fields1Dic.PriceLine.value
-                      }}{{ model.fields1Dic.PriceLine.unitName }}
+                      {{ model.fields1Dic.PriceLine.value}}{{ model.fields1Dic.PriceLine.unitName }}
                     </div>
                   </div>
                 </div>
                 <div class="info-row">
                   <div v-if="model.fields1Dic.PriceLine" class="row-i">
-                    <span>{{ model.fields1Dic.MarketRateOfReturn.label }}</span
-                    ><span
-                      >{{ model.fields1Dic.MarketRateOfReturn.value }} </span
-                    ><span>{{
-                      model.fields1Dic.MarketRateOfReturn.unitName
-                    }}</span>
+                    <span>{{ model.fields1Dic.MarketRateOfReturn.label }}</span>
+                    <span>{{ model.fields1Dic.MarketRateOfReturn.value }}</span>
+                    <span>{{model.fields1Dic.MarketRateOfReturn.unitName}}</span>
                   </div>
                   <div v-if="model.fields1Dic.EstimatePriceRent" class="row-i">
                     <span>{{ model.fields1Dic.EstimatePriceRent.label }}</span>
                     <div>
-                      {{ model.fields1Dic.EstimatePriceRent.value
-                      }}<span>{{
-                        model.fields1Dic.EstimatePriceRent.unitName
-                      }}</span>
+                      {{ model.fields1Dic.EstimatePriceRent.value}}
+                      <span>{{model.fields1Dic.EstimatePriceRent.unitName}}</span>
                     </div>
                   </div>
-                  <div
-                    v-if="model.fields1Dic.EstimatePriceRentUnit"
-                    class="row-i"
-                  >
-                    <span>{{
-                      model.fields1Dic.EstimatePriceRentUnit.label
-                    }}</span
-                    ><span>{{
-                      model.fields1Dic.EstimatePriceRentUnit.value
-                    }}</span
-                    ><span>{{
-                      model.fields1Dic.EstimatePriceRentUnit.unitName
-                    }}</span>
+                  <div v-if="model.fields1Dic.EstimatePriceRentUnit" class="row-i">
+                    <span>{{model.fields1Dic.EstimatePriceRentUnit.label}}</span>
+                    <span>{{model.fields1Dic.EstimatePriceRentUnit.value}}</span>
+                    <span>{{ model.fields1Dic.EstimatePriceRentUnit.unitName}}</span>
                   </div>
                 </div>
 
@@ -241,15 +197,13 @@
                   <div class="mid-i">
                     <div>{{ model.fields1Dic.Area.label }}</div>
                     <div>
-                      {{ model.fields1Dic.Area.value
-                      }}{{ model.fields1Dic.Area.unitName }}
+                      {{ model.fields1Dic.Area.value}}{{ model.fields1Dic.Area.unitName }}
                     </div>
                   </div>
                   <div class="mid-i">
                     <div>{{ model.fields1Dic.AreaNet.label }}</div>
                     <div>
-                      {{ model.fields1Dic.AreaNet.value
-                      }}{{ model.fields1Dic.AreaNet.unitName }}
+                      {{ model.fields1Dic.AreaNet.value}}{{ model.fields1Dic.AreaNet.unitName }}
                     </div>
                   </div>
                   <div class="mid-i">

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

@@ -52,7 +52,7 @@
           <ct-contact :key="refreshKey" :apiRouter="model.contactApiRouter" :api="model.contactApiRouter.action" :apiParam="model.contactApiRouter.getSearchPara()"></ct-contact>
         </div>
         <div ref="routers" style="margin-top: 16px;display: flex;">
-          <component v-for="(router, index) in model.actionRoutersSimple.slice(0,showIndex>0?showIndex:model.actionRoutersSimple.length-1)" :key="index"
+          <component v-for="(router, index) in model.actionRoutersSimple.slice(0,showIndex>0?showIndex:model.actionRoutersSimple.length)" :key="index"
                      :ref="'routers'+index"
                      v-if="!router.rightField || (model.fields1Dic[router.rightField] && model.fields1Dic[router.rightField].value == 1)"
                      :is="router.is" :vmodel="router" :api="model.optionApi" @click="fieldClickHandler(router)">
@@ -168,7 +168,6 @@
             }
           }
         }
-        // this.loadOperation();
         this.setDetailStyle();
         this.$nextTick(() => {
           window.addEventListener("resize", (ev) => {
@@ -249,11 +248,6 @@
           }
         });
       },
-      loadOperation() {
-        this.model._operationList=null;        
-        this.model._operationRouters=[];
-        this.model.getOperationList();
-      },
       loadBaseInfo() {
         this.model.loadBaseInfo();
       },