centaline-data-driven 1.2.22 → 1.2.25

package/package.json

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

package/src/centaline/api/index.js

@@ -127,6 +127,10 @@ Axios.defaults.withCredentials = true;//允许带上跨域cookies
 
 const api = {
   get(url, params, callback) {
+    if(common.flagRouterSelf()){
+      url=url+params.action;
+      params=params.para;
+    }
     return Axios.get(url, params, {
       headers: {
         headers: common.getDataDrivenOpts().handler.getRequestHeaders()
@@ -138,6 +142,10 @@ const api = {
     );
   },
   post(url, params, callback) {
+    if(common.flagRouterSelf()){
+      url=url+params.action;
+      params=params.para;
+    }
     return Axios.post(url, params, {
       headers: {
         headers: common.getDataDrivenOpts().handler.getRequestHeaders()
@@ -214,6 +222,14 @@ const api = {
         }
         else {
           Vue.prototype.$message.error(response.data.rtnMsg);
+          // Vue.prototype.$message({
+          //   message: response.data.rtnMsg,//消息文字
+          //   dangerouslyUseHTMLString: false,
+          //   type: 'error',//主题:success/warning/info/error
+          //   center: true,//是否居中
+          //   duration: 0, //显示时间, 毫秒。设为 0 则不会自动关闭
+          //   showClose: true,//是否显示关闭按钮
+          // });
         }
       }
       return Promise.reject(response);
@@ -222,6 +238,10 @@ const api = {
     return Promise.resolve(response.data);
   },
   postHandler(url, params, formData) {
+    if(common.flagRouterSelf()){
+      url=url+params.action;
+      params=params.para;
+    }
     return Axios.post(url, params, {
       headers: common.getDataDrivenOpts().handler.getRequestHeaders()
     }).then(this.postThenHandler).catch((ex) => {

package/src/centaline/common/index.js

@@ -487,6 +487,9 @@ const common = {
   globalUri() {
     return Vue.prototype.$dataDrivenOpts.baseUrl;
   },
+  flagRouterSelf() {
+    return Vue.prototype.$dataDrivenOpts.flagRouterSelf;
+  },
 
   /**
    * @method

package/src/centaline/css/common.css

@@ -768,4 +768,12 @@ html {
 }
 .ct-table-content .checkbox-td .el-checkbox{
   min-width: initial;
-}
+}
+
+.el-message__content{
+  white-space: pre-line;
+  line-height: 20px!important;
+}
+.details-mid .st-serach-screen,.details-mid .ct-searchtable{
+  border-radius: initial;
+}

package/src/centaline/dynamicComboBoxWithTextBox/src/dynamicComboBoxWithTextBox.vue

@@ -48,7 +48,7 @@
             <el-input v-if="model.id3" v-bind="model.attrs"
                       :placeholder="model.placeholder3" v-model="model.value3"
                       @input="inputHandler($event)" @change="changeHandler($event)"
-                      :disabled="model.lock" :maxlength="model.max"></el-input>
+                      :disabled="model.lock" :maxlength="maxlength4"></el-input>
           </div>
         </div>
       </div>
@@ -110,6 +110,15 @@
         set: function (v) {
 
         }
+      },
+      maxlength4()
+      {
+         if(this.model.max4)
+         {
+           return parseInt(this.model.max4)
+         }
+         return 99999
+
       }
     },
     mounted() {

package/src/centaline/dynamicDetail/src/dynamicContactList.vue

@@ -3,41 +3,30 @@
         <!-- 联系人 -->
         <div class="contacts-head">
             <div class="title-l">联系人信息</div>
-            <button type="button"  v-if="!codeOwner"  @click="lookOwner" class="el-button contacts-but el-button--info el-button--mini max-info">查看业主</button>
+            <component class="el-button contacts-but el-button--info el-button--mini max-info" 
+                v-if="apiRouter!==null && !flagLook" :is="apiRouter.is" :vmodel="apiRouter" 
+                @click="lookOwner(apiRouter,$event)"></component>
             <div class="contacts-tips" v-else>
-                <button class="el-button el-button--primary el-button--mini max-btn-add">新增联系人</button>
-                <button class="el-button el-button--primary el-button--mini max-btn-add">通话记录</button>
-                <button class="el-button el-button--primary el-button--mini max-btn-add">查看历史号码</button>
+                <component class="el-button el-button--primary el-button--mini max-btn-add" 
+                v-if="model && model.buttons!==null && model.buttons.length>0" 
+                v-for="(col, index) in model.buttons" :key="index"
+                :is="col.is" :vmodel="col" 
+                @click="fieldClickHandler(col,$event)"></component>
             </div>
         </div>
         <!-- 表格 -->
-        <div class="contacts-table" v-show="codeOwner">
-            <el-table
-                :data="tableData"
-                stripe
-                fit
-                style="width: 100%"
-                :header-cell-style="{background:'#f3f3f3',color:'#333333'}">
-            <el-table-column
-            v-for="(item,index) in columnList"
-            :key="index"
-            :property="item.prop"
-            :label="item.label"
-            :min-width="item.width"
-        >
-            <template slot-scope="scope">
-            <span v-if="scope.column.property=='phone'">{{ scope.row.phone }}
-                
-            </span>
-            <span v-else-if="scope.column.property=='tel'">
-                {{scope.row.tel}}
-                
-            </span>
-            <span v-else>
-                {{scope.row[scope.column.property]}}
-            </span>
-            </template>
-        </el-table-column>
+        <div class="contacts-table" v-show="flagLook">
+            <el-table :data="tableData" stripe fit style="width: 100%" :header-cell-style="{background:'#f3f3f3',color:'#333333'}">
+                <el-table-column v-for="(item,index) in columnList" :key="index"
+                    :property="item.prop" :label="item.label" :min-width="item.width" >
+                    <template slot-scope="scope">
+                    <span v-if="scope.column.property=='phone'">{{scope.row.phone }}</span>
+                    <span v-else-if="scope.column.property=='tel'">{{scope.row.tel}}</span>
+                    <span v-else>
+                        {{scope.row[scope.column.property]}}
+                    </span>
+                    </template>
+                </el-table-column>
             </el-table>
         </div>
     </div>
@@ -53,10 +42,14 @@
       vmodel: Object,
       api: String,
       apiParam: Object,
+      apiRouter: {
+        Object,
+        default:{}
+      },
     },
     data() {
       return {
-        codeOwner: false,
+        flagLook: false,
         columnList: [
         {
           prop: 'name',
@@ -115,40 +108,31 @@
         opening:'first',      
       }
     },
-    mounted() {
-      var self = this;
-      this.$nextTick(function () {
-        if (self.vmodel) {
-          self.load(self.vmodel);
-        }
-        else if (typeof self.source !== 'undefined') {
-          self.loaderObj.Detail(self.source,null,self.load);
-        }
-        else if (typeof self.api !== 'undefined') {
-          self.loaderObj.Detail(self.api,self.apiParam, self.load);
-        }
-      });
+    mounted() {    
     },
     activated() {
       this.$nextTick(() => {
-        this.setDetailHeight();
+          this.setDetailHeight();
       })
     },
     methods: {
       load(data) {
         var self = this;
-        this.model = data; 
+        this.model = data;
         this.model.$vue = self;
-        
       },
       loadFields() {
         var self = this;        
       },
-      lookOwner() {
-        this.codeOwner = true
-      },
-      onSearch() {
-        console.log('submit!');
+      lookOwner(router) {
+        var self = this; 
+        var submitData=router.getActionPara({}).para;
+        router.doAction(submitData, (res) => {
+          if (res.rtnCode === 200) {
+            self.loaderObj.ContactList(res,null,self.load);
+            self.flagLook = true;
+          }
+        });
       },
       setDetailHeight() {
         this.$nextTick(() => {
@@ -164,11 +148,11 @@
         var self = this;
         var callBack=null;
         let submitData={};
-        var router = this.model.actionRouters.find((v) => {
+        var router = this.model.buttons.find((v) => {
           return v.id === field.id;
         });
-        if(router==undefined && this.model.actionRoutersMoreList){
-          router = this.model.actionRoutersMoreList.find((v) => {
+        if(router==undefined && this.model.actionRouter){
+          router = this.model.actionRouter.find((v) => {
             return v.id === field.id;
           });
         }
@@ -320,53 +304,6 @@
   }
 </script>
 <style lang="scss" scoped>
-.main{
-  background: #ECEFF2;  
-}
-.rel{
-  position: relative;
-}
-.y-auto {
-    overflow-y: auto;
-    overflow-x: auto;
-}
-.w64{width: 64px!important}
-.w93{width: 93px!important}
-.w300 {
-  width: 300px;
-}
-.mt5{
-  margin-top: 5px;
-}
-.mt10{
-  margin-top: 10px;
-}
-.mt15{
-  margin-top: 15px;
-}
-.mb10{
-  margin-bottom: 10px;
-}
-.mb20 {
-    margin-bottom: 20px;
-}
-.mr10{
-  margin-right: 10px;
-}
-.p0 {
-    padding: 0 !important;
-  }
-  .pb10{
-    padding-bottom: 10px!important;
-  }
-  .f-wb {
-    font-weight: bold;
-}
-  .base-box {
-    background: #FFFFFF;
-    border-radius: 6px;
-    width: 100%;
-  }
   .details-content{
     font-size: 12px;
     .title-l{
@@ -963,36 +900,33 @@
     }
   }
   // 按钮
-        .max-info{
-          height: 26px;
-          color: #333333;
-          background-color: #FFFFFF;
-          border: 1px solid #E0E0E0;
-          border-radius: 6px;
-          font-size: 12px;
-        }
-        .max-default{
-          border: 1px solid #EE6B6B;
-          color: #EE6B6B;
-          height: 26px;
-          
-          border-radius: 6px;
-          font-size: 12px;
-        }
-        .max-info:hover,.max-default:hover{
-           background-color:#FF9393;
-            border-color: #FF9393;
-            color: #fff;
-        }
-        // .max-infon:hover.report,.max-info:active.report{
-        //   color: #fff;
-        // }
-        .max-info:active,.max-default:active{
-            background-color: #B33136;
-            border-color: #B33136;
-            color: #fff;
-        }
-        .max-btn-add button{ /*list-button*/
+.max-info{
+  height: 26px;
+  color: #333333;
+  background-color: #FFFFFF;
+  border: 1px solid #E0E0E0;
+  border-radius: 6px;
+  font-size: 12px;
+}
+.max-default{
+  border: 1px solid #EE6B6B;
+  color: #EE6B6B;
+  height: 26px;
+  
+  border-radius: 6px;
+  font-size: 12px;
+}
+.max-info:hover,.max-default:hover{
+    background-color:#FF9393;
+    border-color: #FF9393;
+    color: #fff;
+}
+.max-info:active,.max-default:active{
+    background-color: #B33136;
+    border-color: #B33136;
+    color: #fff;
+}
+.max-btn-add button{ /*list-button*/
     height: 26px;
     background: #EE6B6B;
     box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
@@ -1010,11 +944,7 @@
     height: 26px;
     border-radius: 6px;
 }
-.follow-search-bar{
-  display: flex;
-}
 .r{
   float: right;
 }
-
 </style>

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

@@ -135,12 +135,11 @@
                   </div>
               </div>
               <div class="open-mero" @click="allInfo=!allInfo">{{allInfo?'收起全部':'查看全部'}}
-                <!-- <img src="../../../assets/mero.png" alt="" class="mero" >  :class="allInfo?'more-colose':'more-open'" -->
                 <i :class="allInfo?'more-colose':'mero-open'"></i>
               </div>
             </div>
             <div class="contacts-info base-box">
-              <ct-contactList v-if="model.searchConditionApiTags1" :key="model.searchlistKey" :apiParam="model.paramDataTags1" ></ct-contactList>
+              <ct-contactList v-if="model.contactApiRouter!==null" :apiRouter="model.contactApiRouter" ></ct-contactList>
             </div>
             <div class="tablist-info base-box">
                 <div class="details-tabs-box">
@@ -190,6 +189,17 @@
                   <div>该房源共<span class="red-text">{{model.fields1Dic.LookCustomerCount.value}}</span>位客户看房</div>
                   <div>最近7天带看<span class="red-text">{{model.fields1Dic.CustomerLookCount7.value}}</span>次,总带看<span class="red-text">{{model.fields1Dic.CustomerLookCountAll.value}}</span>次。</div>
               </div>
+              <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
+                <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
+                  <div class="t-item">
+                    <span class="i">{{col.operationName}}</span>
+                  </div>
+                  <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
+                  <div class="t-item" style="height: 50px;">
+                    <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
+                  </div>
+                </div>                  
+              </div>
               <div class="staff-info base-box">
                 <el-tabs :value="model.activeIndex2" @tab-click="handleClick">
                   <el-tab-pane v-for="(col, index) in model.tags2" :key="col.appID" 
@@ -222,17 +232,6 @@
                   </el-tab-pane>
                 </el-tabs>
               </div>
-              <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
-                <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
-                  <div class="t-item">
-                    <span class="i">{{col.operationName}}</span>
-                  </div>
-                  <div class="t-item"><span class="i" :class="'operation'+col.flagKey">{{col.desc}}</span></div>
-                  <div class="t-item" style="height: 50px;">
-                    <component class="el-button t-but el-button--info max-info" v-if="col.router && col.router.show" :is="col.router.is" :vmodel="col.router" :api="model.optionApi" @click="fieldClickHandler(col.router,$event)"></component>
-                  </div>
-                </div>                  
-              </div>
               <div class="customer">
                   <div class="customer-title">
                       匹配客户
@@ -327,66 +326,10 @@
           { name: '餐厅', url: 'http://10.5.10.44:13031/Images/20210705/112124_4f83c6d5-36bd-444f-9ea1-fa4e3f4de5e0.jpg?width=140&height=135&mode=stretch', isVr: false, type: 'img' },
           { name: '户型图', url: 'http://10.5.10.44:13031/Images/20210705/112505_6a3cb2d4-c773-4aba-91af-df6721eadb34.jpg?width=140&height=135&mode=stretch', isVr: false, type: 'video' },
           { name: '其它', url: 'http://10.5.10.44:13031/Images/20210705/112133_b62d7a78-96b3-4801-b94c-47b83263a001.jpg?width=140&height=135&mode=stretch', isVr: false, type: 'video' },
-        ],},
-        allInfo: false,
-        allIn:false,
-        codeOwner: false,
-        columnList: [
-        {
-          prop: 'name',
-          label: '联系人',
-          width: '80'
-        },
-        {
-          prop: 'type',
-          label: '类型',
-          width: '60'
+          ],
         },
-        {
-          prop: 'phone',
-          label: '手机',
-          width: '125'
-        },
-        {
-          prop: 'tel',
-          label: '座机',
-          width: '170'
-        },
-        {
-          prop: 'wx',
-          label: '微信',
-          width: '150'
-        },
-        {
-          prop: 'entTime',
-          label: '录入时间',
-          width: '150'
-        },
-        {
-          prop: 'entUser',
-          label: '录入人',
-          width: '80'
-        },
-        {
-          prop: 'remarks',
-          label: '操作',
-          // width:'180'
-        },
-        ],
-        tableData: [
-          {
-            name: '王建国先生',
-            type: '业主',
-            phone: '13866668888',
-            tel: '0275-55556666-5896',
-            wx: '555566665896',
-            entTime: '2021-10-26 29:27:25',
-            entUser: '王天',
-            remarks: '删除',
-            isIcon: true,
-          },
-        ],
-        opening:'first',      
+        allInfo: false,
+        allIn:false, 
       }
     },
     mounted() {

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

@@ -248,11 +248,33 @@
             return false;
           }
         }
-
+        if(eventName=='valid'&&!this.validFileClass())
+        {
+          this.validMessage="请选择附件分类";
+          this.valid = false;
+          return false;
+        }
         this.valid = true;
         return this.valid;
       },
-
+      //验证附件分类是否必填
+      validFileClass()
+      {
+        if(this.model.paramName)
+        {
+          if(this.model.sourceList&&this.model.sourceList.length>0)
+          {
+            let notClass= this.model.sourceList.filter(item=>{
+              return item.mediaLabelID==undefined||item.mediaLabelID=="";
+            })
+            if(notClass.length>0)
+            {
+              return false
+            }
+          }
+        }
+        return true;
+      },
       classifyClickHandle: function () {
         var self = this;
         this.model.getOptions(() => {
@@ -263,12 +285,28 @@
         classify.file.mediaLabelName = classify.option[this.model.optionModel.optionAttrs.label];
         classify.file.mediaLabelID = classify.option[this.model.optionModel.optionAttrs.value];
         this.model.setClassify(classify);
+        if(!this.validFileClass())
+        {
+          this.validMessage="请选择附件分类";
+          this.valid = false;
+        }else
+        {
+           this.valid = true;
+        }
       },
       classifyFormClickHandle: function (file) {
         var self = this;
         this.model.updateClassify(file, () => {
           //self.$forceUpdate();
         });
+         if(!this.validFileClass())
+        {
+          this.validMessage="请选择附件分类";
+          this.valid = false;
+        }else
+        {
+           this.valid = true;
+        }
       },
     }
   }

package/src/centaline/dynamicPhotoSelectList/src/dynamicPhotoSelectList.vue

@@ -107,6 +107,7 @@
           });
           self.FlagPhoto = true;
           self.imageList = sourceRows;
+          //self.imageList=[{thumbnailUrl:'lmg.jj20.com/up/allimg/tp01/1ZZH250054149-0-lp.jpg',mediaUrl:'lmg.jj20.com/up/allimg/tp01/1ZZH250054149-0-lp.jpg'}];
         } catch (e) {
           self.$message.warning(e);
         }
@@ -139,7 +140,7 @@
         if (this.chooseList && this.chooseList.length > 0) {
           this.$emit('handlePhoto', this.chooseList);
         } else {
-          self.$message.warning("请选择至少一张图片");
+          this.$message.warning("请选择至少一张图片");
         }
         
       },

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

@@ -32,6 +32,24 @@ const cbwt = function (source) {
     set value3(v) {
       source.code4 = v;
     },
+    get max2() {
+      return source.maxValue2;
+    },
+    set max2(v) {
+      source.maxValue2 = v;
+    },
+    get max3() {
+      return source.maxValue3;
+    },
+    set max3(v) {
+      source.maxValue3 = v;
+    },
+    get max4() {
+      return source.maxValue4;
+    },
+    set max4(v) {
+      source.maxValue4 = v;
+    },
     get optionColCount() {
       return parseInt(source.optCount) || 5;
     },