centaline-data-driven 1.3.78 → 1.3.80

package/package.json

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

package/src/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="appDetail" style="height:100%;">
-    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
+    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1"} ,
+        apiParam: {actionType: 1,chanceID: "1557658519623307264"} ,
       }
     },
     mounted() {

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

@@ -54,8 +54,10 @@
   </div>
 </template>
 <script>
+import dynamicElement from "../../mixins/dynamicElement";
 export default {
   name: 'ct-MatchCustomer',
+  mixins: [dynamicElement],
   props: {
     vmodel: Object,
     apiRouter: {
@@ -65,7 +67,8 @@ export default {
   },
   data() {
     return {
-      customerList:[],
+      searchTable:null,
+      searchModel:null,
     };
   },
   created() {
@@ -74,12 +77,23 @@ export default {
   methods: {
     init() {
       var self=this;
-      self.apiRouter.doAction({}, (data) => {
-        console.log(data)
-        if (data.rtnCode === 200 || data.isSuccess) {
-          self.customerList=data.content;
-        }
-      });
+      self.loaderObj.SearchScreen(self.apiRouter.actionForSearchLayout, function(data){
+        self.searchModel = data;
+        var submitData={
+          action: self.apiRouter.actionForSearch,
+          para: {
+            searchFields: self.searchModel.searchData,
+            pageAttribute: { pageIndex: 1,flagPage:false },
+            flagSearch: true
+          }
+        };
+        self.apiRouter.doSearch(submitData, (res) => {
+          console.log(res)
+          if (res.rtnCode === 200 || res.isSuccess) {
+            self.searchTable=res.content;
+          }
+        });
+      }, self.apiRouter.queryPara);      
     }
   },
 };

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

@@ -35,12 +35,12 @@
         <div class="head-but" :key="actionRoutersKey">
           <div>
             <component class="max-report w93"
-              v-if="model.actionRouters !== null && model.actionRouters[0] !== null"
+              v-if="model.actionRouters !== null && model.actionRouters[0]"
               :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi"
               @click="fieldClickHandler(model.actionRouters[0], $event)">
             </component>
             <component class="max-report w93"
-              v-if="model.actionRouters !== null && model.actionRouters[1] !== null"
+              v-if="model.actionRouters !== null && model.actionRouters[1]"
               :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi"
               @click="fieldClickHandler(model.actionRouters[1], $event)">
             </component>
@@ -71,20 +71,11 @@
           <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>
@@ -131,7 +122,6 @@
                     <span>{{ model.fields1Dic.EstimatePriceRentUnit.unitName }}</span>
                   </div>
                 </div>
-
                 <div class="info-mid">
                   <div class="mid-i" v-if="model.fields1Dic.Area">
                     <div>{{ model.fields1Dic.Area.label }}</div>
@@ -223,25 +213,17 @@
                 </ct-searchlist>
               </div>
             </div>
-</div>
+          </div>
 
           <div class="contribute-info base-box" v-if="model._commissionList !== null">
             <div class="title-l">贡献人信息</div>
             <div class="contribute-list">
-              <div
-                class="contribute-i"
-                v-for="(m, index) in model._commissionList"
-                :key="index"
-              >
+              <div class="contribute-i" v-for="(m, index) in model._commissionList" :key="index">
                 <img :src="m.regEmpImgUrl" alt="图片" />
                 <div>
                   <div style="display: flex">
                     <div class="user-title" v-html="m.empNameCN"></div>
-                    <div
-                      class="user-title"
-                      style="margin-left: 10px"
-                      v-html="m.commissionPercentDesc"
-                    ></div>
+                    <div class="user-title" style="margin-left: 10px" v-html="m.commissionPercentDesc"></div>
                   </div>
                   <div class="user-but w56" v-html="m.commissionRoleName"></div>
                 </div>

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

@@ -35,11 +35,11 @@
         <div class="head-but" :key="actionRoutersKey">
           <div>
             <component class="max-report w93"
-              v-if=" model.actionRouters !== null && model.actionRouters[0] !== null"
+              v-if=" model.actionRouters !== null && model.actionRouters[0]"
               :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi"
               @click="fieldClickHandler(model.actionRouters[0], $event)"></component>
             <component class="max-report w93"
-              v-if="model.actionRouters !== null && model.actionRouters[1] !== null"
+              v-if="model.actionRouters !== null && model.actionRouters[1]"
               :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi"
               @click="fieldClickHandler(model.actionRouters[1], $event)"></component>
             <button type="button" class="el-button el-button--info el-button--mini max-report rel w93"

package/src/centaline/dynamicT/src/dynamicT.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="field-top">
     <div style="width:100%;" :style="{ display: (model.inputType === 'textarea' ? 'block' : 'flex') }">
-    <div v-if="model !== null" class="ct-text ct-flex-div max-flex-div"  style="flex:1;"
+    <div v-if="model !== null" class="ct-text ct-flex-div max-flex-div hoverColor"  style="flex:1;"
     :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'',model.attrs.size?'ct-font-size-'+model.attrs.size:'']"
     @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
       <div v-if="model.showLabel && model.label" class="el-input-group__prepend field-label-div max-input-group" :class="[model.labelClass]">
@@ -13,7 +13,7 @@
                 @keyup.enter.native="search()">
         <span slot="suffix" v-if="model.unitName" class="ct-unitname" :class="showClear?'unitName-20':'unitName-0'">{{model.unitName}}</span>
 
-        <span slot="suffix" class="el-input__suffix el-input--mini" v-if="!model.isPassword&&showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
+        <span slot="suffix" class="el-input__suffix el-input--mini is-show-Span" v-if="!model.isPassword&&showClear" :class="model.unitName?'ct-right-10':'ct-right-0'">
           <span class="el-input__suffix-inner ct-close">
             <i class="el-select__caret el-input__icon el-icon-circle-close is-show-close" @click="clearClickHandle($event)"></i>
           </span>
@@ -108,4 +108,16 @@
 .errorMessageMarginLeft {
   margin-left: 108px;
 }
+
+.hoverColor:hover {
+  border-color: #409EFF;
+}
+
+.is-show-Span {
+  display: none;
+}
+
+.hoverColor:hover .is-show-Span {
+  display: inline-block;
+}
 </style>

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

@@ -304,7 +304,8 @@ const Router = function (source) {
         }).catch((ex) => {
           callback(ex); //里面需要有data.rtnCode === 200的处理
         });
-      } else {
+      } 
+      else {
         callback({
           rtnCode: Enum.ReturnCode.Successful
         });

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZM48Hd3hk4XbDwEgbAmWBmBRGO8uxqho_cVr3jN_08a545KCgu8oZXGFnhDK40ILIiveW8hMjwKVonKET7iWNVFPFSUUbpfqRTv4XbwOTIa2ukXIJp_wzym2yk9_nHuMg2fWWhwDqllUdcxehirOcepOAdr806lN3q9AQAA__8.YOFPhpo9pAAnZWPXv2oF6G8D9zEEo05LGtJVh38mj4w',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPswDC7Q6cLNh6CrOtugpURSDTGu6sROnpf8YrX_P-EcT5BA3YBN7TS6wJuaKUnYrUkHe7UemThCh15h57F86HtKr9voYB0v0JDIixGykoKGML0CzWp-4Z5TLdjevzj3GUaPrPKQbmsDaZAZ-Q6ZwxOHRqV6HIkiinD6w0AAP__.wPEHSZ2zu23Cf4v2l_KHdhstyAgBFY54UciD69X-TgM',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',