centaline-data-driven 1.3.76 → 1.3.77

package/package.json

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

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

@@ -1,6 +1,56 @@
 <template>
   <div>
-    
+    <div class="customer-title">匹配客户</div>
+    <div class="customre-line"></div>
+    <div class="mt10 clearfix">
+      <div class="match-customre rel">
+        <div class="customre-name">崔新河先生</div>
+        <div class="t-tag">A级</div>
+        <div class="user-but customr-name">私客</div>
+      </div>
+      <div style="width: 100%">
+        <div class="customre-l">
+          <div class="row-i"><span>交易：</span><span>求购</span></div>
+          <div class="row-i">
+            <span>意向物业：</span><span>商铺</span>
+          </div>
+          <div class="row-i">
+            <span>意向售价：</span><span>100.00-150.00</span>
+          </div>
+          <div class="row-i">
+            <span>下次联络：</span><span>2020/11/16 14:30</span>
+          </div>
+          <div class="row-i">
+            <span>租期到期：</span><span>求购</span>
+          </div>
+          <div class="row-i">
+            <span>最后跟进时间：</span><span>2020/11/16 14:30</span>
+          </div>
+          <div class="row-i">
+            <span>最后跟进内容：</span><span>2020/11/16 14:30</span>
+          </div>
+          <div class="row-i mt10">
+            <span>员工：</span><span>中原找房 蔡传兴</span>
+          </div>
+          <div class="row-i pb10"><span>备注：</span><span></span></div>
+        </div>
+        <div class="customre-r">
+          <div class="row-i"><span>交易：</span><span>预定</span></div>
+          <div class="row-i">
+            <span>意向面积：</span><span>商铺</span>
+          </div>
+          <div class="row-i">
+            <span>意向租价：</span><span>100.00-150.00</span>
+          </div>
+          <div class="row-i">
+            <span>委托日期：</span><span>2020/11/16 14:30</span>
+          </div>
+          <div class="row-i">
+            <span>推荐项目：</span><span>求购</span>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -8,8 +58,6 @@ export default {
   name: 'ct-MatchCustomer',
   props: {
     vmodel: Object,
-    api: String,
-    apiParam: Object,
     apiRouter: {
       Object,
       default:{}
@@ -17,7 +65,7 @@ export default {
   },
   data() {
     return {
-      
+      customerList:[],
     };
   },
   created() {
@@ -25,10 +73,86 @@ export default {
   },
   methods: {
     init() {
-      
-    },
+      var self=this;
+      self.apiRouter.doAction({}, (data) => {
+        console.log(data)
+        if (data.rtnCode === 200 || data.isSuccess) {
+          self.customerList=data.content;
+        }
+      });
+    }
   },
 };
 </script>
 <style lang="scss" scoped>
+  .customer {
+        background: #fff;
+        border-radius: 6px;
+        width: 100%;
+        .customer-title {
+          font-weight: Bold;
+          font-size: 16px;
+          color: #333;
+        }
+        .customre-line {
+          width: 100%;
+          height: 1px;
+          margin-top: 10px;
+          background: #e0e0e0;
+        }
+        .match-customre {
+          display: flex;
+          margin-top: 10px;
+          .customre-name {
+            font-weight: Bold;
+            font-size: 14px;
+            color: #333333;
+            margin-right: 10px;
+          }
+          .t-tag {
+            width: 41px;
+            color: #999;
+            background: #f3f3f3;
+            border: 1px solid #d8d8d8;
+            padding: 2px 9px;
+            border-radius: 3px;
+            margin-right: 10px;
+          }
+        }
+        .user-but {
+          cursor: pointer;
+          font-size: 12px;
+          color: #ffffff;
+          background: #fbd46d;
+          height: 20px;
+          line-height: 20px;
+          border-radius: 3px;
+          text-align: center;
+          padding: 0 10px;
+        }
+        .customr-name {
+          position: absolute;
+          right: 0;
+        }
+        .clearfix {
+          clear: both;
+        }
+        .customre-l {
+          float: left;
+          width: 50%;
+          margin-top: 10px;
+          .row-i {
+            padding: 5px 0;
+          }
+        }
+
+        .customre-r {
+          float: right;
+          width: 50%;
+          margin-top: 10px;
+          .row-i {
+            padding: 5px 0;
+          }
+        }
+      }
 </style>

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

@@ -314,8 +314,9 @@
               </el-tab-pane>
             </el-tabs>
           </div>
-          <div class="customer">
-            <div class="customer-title">匹配客户</div>
+          <div ref="MatchCustomer" v-if="model.matchCustomerApiRouter !== null" class="customer">
+            <ct-MatchCustomer :apiRouter="model.matchCustomerApiRouter"></ct-MatchCustomer>
+            <!-- <div class="customer-title">匹配客户</div>
             <div class="mt10 clearfix">
               <div class="customre-line"></div>
               <div class="match-customre rel">
@@ -416,7 +417,7 @@
                   </div>
                 </div>
               </div>
-            </div>
+            </div> -->
           </div>
         </div>
       </div>
@@ -429,6 +430,7 @@ import dynamicElement from "../../mixins/dynamicElement";
 import dynamicSearchList from "../../dynamicSearchList/src/dynamicSearchList.vue";
 import dynamicContactList from "./dynamicContactList.vue";
 import dynamicAlbums from "./dynamicAlbums.vue";
+import dynamicMatchCustomer from "./dynamicMatchCustomer.vue";
 export default {
   name: "ct-PropertyDetailRET",
   mixins: [dynamicElement],
@@ -436,6 +438,7 @@ export default {
     "ct-searchlist": dynamicSearchList,
     "ct-contactList": dynamicContactList,
     "ct-albums": dynamicAlbums,
+    "ct-MatchCustomer": dynamicMatchCustomer,
   },
   props: {
     vmodel: Object,

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

@@ -27,7 +27,7 @@
         <div class="cover-list-item">
           <el-image fit="fill" :src="file.url" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
           </el-image>
-          <span class="cover-list-item-span-Default" v-if="model.rightDefault&&model.rightDefault==1">
+          <span class="cover-list-item-span-Default" v-if="model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2">
             <i>
               <el-radio v-model="file.flagDefault" :label="true" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
             </i>
@@ -256,14 +256,6 @@
       },
       //不能共用的数据校验
       selfValidExcute: function (eventName) {
-        if (this.model.required) {
-          if (this.model.getfileListLength() === 0) {
-            this.validMessage = "必须上传附件";
-            this.valid = false;
-            return false;
-          }
-        }
-
         if (this.model.max && this.model.max > 0) {
           if (this.model.getfileListLength() >= this.model.max) {
             this.disableUpload = true;
@@ -272,6 +264,13 @@
             this.disableUpload = false;
           }
         }
+        if (this.model.required) {
+          if (this.model.getfileListLength() === 0) {
+            this.validMessage = "必须上传附件";
+            this.valid = false;
+            return false;
+          }
+        }
         if (this.model.min) {
           if (this.model.getfileListLength() < this.model.min) {
             //change时需要判断有没有上传图片如果没有图片则不提示

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -377,11 +377,21 @@
                     },
                     on: {
                       submit(ev) {
-                        self.model.updateFields(ev, () => {
-                          self.$refs.Fields.forEach((fd) => {
-                            fd.$forceUpdate();
+                        if(ev.responseData && ev.responseData.notification===10){
+                          self.collapse.splice(0, self.collapse.length);
+                          self.collapseActiveNames.splice(0, self.collapseActiveNames.length);
+                          self.collapseFieldsRow.splice(0, self.collapseFieldsRow.length);
+                          self.independentItem.splice(0, self.independentItem.length);
+                          self.load(self.loaderObj.Form(ev.responseData.content));
+                          self.formKey=self.formKey+1;
+                        }
+                        else{
+                          self.model.updateFields(ev, () => {
+                            self.$refs.Fields.forEach((fd) => {
+                              fd.$forceUpdate();
+                            });
                           });
-                        });
+                        }
                         self.$common.closeDialog(dialogOption.dialog);
                       }
                     }

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -29,7 +29,6 @@
     },
     created() {
       this.model = this.loaderObj.CellLayout(this.vmodel, this.actionRouter, this.rowdata, this.forname, this.forrowindex);
-      console.log(this.model);
     },
    
     methods: {

package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -142,7 +142,7 @@
                   </a>
                 </template>
                 <a v-if="itemFile.rightDownload"
-                   :href="resultObject" target="_blank"
+                   :href="resultObject.replace(/\/preview$/,'download')" target="_blank"
                    class="magnify-btn el-icon-download"
                    title="下载"
                    :download="(itemFile.mediaLabelName || itemFile.fileName)"></a>
@@ -418,6 +418,10 @@
     border-right: solid 2px #e6e6e6 !important;
   }
 
+    .viewerMenu .el-submenu > .el-submenu__title {
+      display: inline !important;
+    }
+
     .viewerMenu .el-submenu__title,
     .viewerMenu .el-menu-item {
       height: 30px !important;

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

@@ -56,7 +56,7 @@ const box = function (source, fileSourceList, router, optionApi) {
           return 0;
         }
         let fileList = fileSourceList.filter(item => {
-          return item.flagDeleted != true && item.flagDefault == true
+          return item.flagDeleted != true && item.flagDefault == true && item.mediaTypeID == 2
         })
         return fileList.length;
       },
@@ -242,7 +242,8 @@ const box = function (source, fileSourceList, router, optionApi) {
           Vue.set(file, "source", data.source);
           Vue.set(file, "mediaUrl", data.mediaUrl);
           Vue.set(file, "fileName", data.fileName);
-          Vue.set(file, "flagDefault", data.flagDefault); 
+          Vue.set(file, "flagDefault", data.flagDefault);
+          Vue.set(file, "mediaTypeID", data.mediaTypeID); 
           Vue.set(file, "flagDeleted", data.flagDeleted);
           Vue.set(file, "actionType", data.actionType);
           Vue.set(file, "rightDel", data.rightDel);

package/src/main.js

@@ -43,7 +43,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOgzAQBe-yNSt5Ydf20gVDmhwC2ZGRSBUFkBJFuXs-go4-U0wxzXtPmJYENbgV3NFGryu4o42eiNWR7fCgLiBbrtBT8BjYBj62XRWaFgrI9yvUZC0bIhUuYIzzL1RainzDMuXbKT_-ce4yj59ZToNkZwVNNIJsOKMvHSGpijvzQLFM8HoDAAD__w.oL7EuvqdNI897LQ8xYA5OxABY0HKVGn7gf7vD--ANLg',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPsssMMQ6cLNh6C7JrdBCsjkGiMdxcjdPS-4hWv-f8F4xyhAVnBHW30uoI72uitJRXLHR5UPBKTw9r6Gj2xp1PbOX9soYD0uEFjmYnIVc4UMITpF1wl9hvmMd3P6fmPc9dpWGarXCrFdEGSsEg5Y5Ayo4RsWDmaFB28PwAAAP__.w5mWprhhjba8AajUN0TX7xdpyBXYO8-T44jeXfbz0h8',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',