centaline-data-driven 1.3.89 → 1.3.91

package/package.json

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

package/src/SearchList.vue

@@ -11,16 +11,16 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlist> -->
 
-    <ct-searchlist 
+    <!-- <ct-searchlist 
       :searchConditionApi="'/customermanage/MyCustomerList/getLayoutOfSearch'" 
       :searchDataApi="'/customermanage/MyCustomerList/getList'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
-    <!-- <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/css/max.css

@@ -83,7 +83,7 @@
     padding: 0 10px;
 }
 .max-flex-div{
-    display: flex;
+    display: flex !important;
 }
 
 .max-input input{ /*el-input__inner*/

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

@@ -1092,6 +1092,8 @@ export default {
       margin-left: 10px;
       cursor: pointer;
       vertical-align: -2.85px;
+	  width: 18px;
+      height: 18px;
     }
     .title-other {
       color: #999999;

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

@@ -1084,6 +1084,8 @@ export default {
       margin-left: 10px;
       cursor: pointer;
       vertical-align: -2.85px;
+      width: 18px;
+      height: 18px;
     }
     .title-other {
       color: #999999;

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

@@ -1,15 +1,22 @@
 <template>
     <div ref="main" class="main" v-if="model!==null">
-      <div style="height:36px;margin-top: 10px;display: flex;border-bottom: solid 2px #EE6B6B;">        
-        <img :src="model.fields1Dic.ewmUrl.value" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:22px;cursor: pointer">
+      <div style="height:36px;margin-top: 10px;display: flex;border-bottom: solid 2px #EE6B6B;">
+        <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" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:22px;" />
+        </el-popover>
         <div :style="{'width':topWidth+'px'}" style="font-size: 14px;color: #333333;padding-left: 10px;line-height: 26px;">
           <span>{{model.fields1Dic.PropertyNo.label}}</span>
           <span>{{model.fields1Dic.PropertyNo.value}}</span>
         </div>
-        <img :class="{'domDisabled':selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt="" 
-        style="width: 26px;height: 26px;vertical-align: bottom;margin-right:11px;cursor: pointer">
-        <img :class="{'domDisabled':selectIndex===rowCount-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" 
-        style="width: 26px;height: 26px;vertical-align: bottom;margin-right:8px;cursor: pointer">
+        <img :class="{'domDisabled':selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt=""
+             style="width: 26px;height: 26px;vertical-align: bottom;margin-right:11px;cursor: pointer">
+        <img :class="{'domDisabled':selectIndex===rowCount-1}" @click="clickNextHandler" src="../../../assets/B.png" alt=""
+             style="width: 26px;height: 26px;vertical-align: bottom;margin-right:8px;cursor: pointer">
         <div class="el-icon-close cursor" style="padding-top: 5px;" @click="closeSideHandler"></div>
       </div>
       <div style="padding-left: 20px;padding-right: 20px;">
@@ -253,6 +260,9 @@
       loadBaseInfo() {
         this.model.loadBaseInfo();
       },
+      loadqrCode() {
+        this.model.loadqrCode();
+      },
       handleClick(tab, event) {
         let i=tab.index;
         if(this.model.tags2 && this.model.tags2[i]){
@@ -297,6 +307,11 @@
             });
             callBack="loadOperation";
         }
+        if (router == undefined && this.model.routerForQRCode) {
+          if (field.id === this.model.routerForQRCode.id) {
+            router = this.model.routerForQRCode;
+          }
+        }
 
         if(router){
           if(field.isSubmitDataFromSelf){
@@ -312,6 +327,9 @@
           if(router.id=="PropertyEdit"){
             callBack="loadBaseInfo"
           }
+          else if (router.id == "qrCode") {
+            callBack = "loadqrCode"
+          }
         }
 
         if(callBack){
@@ -321,6 +339,9 @@
           else if(callBack=='loadBaseInfo'){
             this.routerClickHandler(router, submitData, self.loadBaseInfo);
           }
+          else if (callBack == 'loadqrCode') {
+            self.loadqrCode();
+          }
         }
         else{
           this.routerClickHandler(router,submitData);

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

@@ -115,7 +115,7 @@
         self.$emit('popupSearchList', false, self.model, self.model.moreActionRouter, (optionArr) => {
           optionArr.forEach(row => {
             if(self.model.type===3){
-              self.model.value=self.model.value+row[self.model.optionAttrs.label];
+              self.model.value=self.model.value+(self.model.value?'\r\n':'')+row[self.model.optionAttrs.label];
             }
             else {
               self.model.value=row[self.model.optionAttrs.label];

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

@@ -625,7 +625,6 @@ const Detail = function (source, para, callBack) {
           function (response) {
             if (response.rtnCode === Enum.ReturnCode.Successful) {
               if (response.content) {
-                Vue.set(rtn._routerForQRCode, "imgUrl", response.content);
                 rtn.QRCode = response.content;
               }
             }

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzrEOgkAQBNB_2ZpNWFh2Fzo9sPEjyJ0HCVZGINEY_12J0NH7iimmmXnBOAeoQFe4E5u2XOFObFoiLpWkwUOpDlk4RyNn6Fgcn-omd8caEugeN6hIFpSqJjD46VcUyrIU89jdz93zH-eu0_CdJTXvxQxjroJ8SQsMlgX0mUXTmPbSF_D-AAAA__8.sdQBmdkYKUL9c9NLyUbjFEl3_SQ-e2f51rR4llSHFPM',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMws8PsLJ0u2HgIIrgkWBmBRGO8uxqho_cVr3jN_08Y5xZK8Au4oZUmLOCGVhoiCZ60xl3wEUXFoVE0jKJRDlXt4r6CDNL9CiWpqpfC5SGD4TT9ghYWvmEe0-2YHv84d5mGz6wzJm65R9flhNJxwLYXxs6YkybLz2bwegMAAP__.kXabWRcQeD3SN72lRH5vYtNPDARnnOR7ZJd9joFcSyE',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',