centaline-data-driven 1.1.38 → 1.1.43

package/package.json

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

package/src/Detail.vue

@@ -1,14 +1,13 @@
 <template>
-    <ct-Detail :pageType="'PropertyDetailOFI'"></ct-Detail>
+    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
 </template>
 
 <script>
-  import Vue from 'vue'
   export default {
     name: 'App',
     data() {
       return {        
-        para: {}
+        apiParam: {actionType: 1,chanceID: "1"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -1,11 +1,12 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
+    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!--:api="'FormSample/formdata'"-->
     <!--<ct-form :source="formdata.content"></ct-form>-->
     <!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
+    <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -15,9 +16,10 @@
     name: 'App',
     data() {
       return {
-        apiParam: {originalTraId: "1481454808274235394", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
+        // apiParam: {originalTraId: "1481454808274235394", actionType: 3, pageTitle: "成交报告", pageOnly: true} ,
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {SN: "13557_132", UserID: "wuhan3"},
+        apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
       }
     },
     methods: {

package/src/SearchTree.vue

@@ -1,8 +1,9 @@
 <template>
-  <div id="app-Tree" style="height:100%;position: fixed;">
+  <div id="app-Tree" style="height:100%;position: fixed;width:100%">
     <ct-treelist :flagsearch="true" :apiParam="apiParam"
-    :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'" 
-    :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
+                 :searchConditionApi="'/SystemParameterCatalogList/getLayoutOfSearch'"
+                 :searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
+    <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
 

package/src/centaline/common/index.js

@@ -650,6 +650,7 @@ const common = {
       reg = /^(\-)?\d*$/;
     }
     else{
+      if(dc===-1)dc=12;
       reg = new RegExp("^(\\-)?\\d*[.]{0,1}(\\d{1," + dc + "})?$");
     }
     if (value === '' || reg.test(value)) {

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

@@ -1,7 +1,7 @@
 <template>
     <div>
-      <ct-PropertyDetailOFI class="ct-PropertyDetailOFI"  v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
-      <ct-PropertyDetailRET class="ct-PropertyDetailRET"  v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
+      <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" class="ct-PropertyDetailOFI"  v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
+      <ct-PropertyDetailRET :api="api" :apiParam="apiParam" class="ct-PropertyDetailRET"  v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
     </div>
 </template>
 
@@ -17,6 +17,7 @@
     props: {
       vmodel: Object,
       api: String,
+      apiParam: Object,
       pageType: String,
     },
     data() {

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

@@ -1,27 +1,22 @@
 <template>
-    <div class="main">
+    <div class="main" v-if="model!==null">
       <div class="details-content">
         <div class="details-head base-box mb10">
-            <div class="head-type">售</div>
+            <div class="head-type">{{model.fields1Dic.Trade.value}}</div>
             <div class="head-info">
                 <div class="title">
-                  <span>有效</span>
+                  <span>{{model.fields1Dic.StatusName.value}}</span>
                   <span class="head-line"></span>
-                  <span>珠江丽景花园 红帆阁1122</span>
-                  <img src="../../../assets/collection.png" alt="" class="collection">
-                </div>
-
-                 <div class="title-other">
-                  <span>产证名:{{'珠江丽景A-BB珠江08'}}</span>
-                  <span>房源编号:{{'F20210909103029394160'}}</span>
-                  <span class="mr10">楼盘地址:{{'宝安区新安街道新安二路'}}</span>
-                  <img src="../../../assets/location.png" alt="" class="location">
+                  <span>{{model.fields1Dic.EstateName.value}}</span>
+                  <span> {{model.fields1Dic.BuildingName.value}}</span>
+                  <span>{{model.fields1Dic.RoomNo.value}}</span>
+                  <img :src="model.fields1Dic.FavoriteUrl.value" alt="" class="collection">
                 </div>
                 <div class="title-other">
-                  <span>产证名:{{'珠江丽景A-BB珠江08'}}</span>
-                  <span>房源编号:{{'F20210909103029394160'}}</span>
-                  <span class="mr10">楼盘地址:{{'宝安区新安街道新安二路'}}</span>
-                 <img src="../../../assets/location.png" alt="" class="location">
+                  <span>{{model.fields1Dic.PropertyNo.label}}{{model.fields1Dic.PropertyNo.value}}</span>
+                  <span>{{model.fields1Dic.GovNo.label}}{{model.fields1Dic.GovNo.value}}</span>
+                  <span class="mr10">{{model.fields1Dic["DistrictName"].value+model.fields1Dic.AreaName.value}}</span>
+                 <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location">
                 </div>
                 <div class="title-tags"> 
                   <div  class="t-tag">联卖</div>
@@ -95,18 +90,17 @@
                   </div>
                 </div>
                 <div class="hous-b">
-                  <img src="../../../assets/ewm.png" 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>售总价：</span><span class="base-clolr expand-f">1400.00</span><span class="base-clolr">万</span>
+                      <div class="row-i"><span>{{model.fields1Dic.Price.label}}</span><span class="base-clolr expand-f">{{model.fields1Dic.Price.value}}</span><span class="base-clolr">{{model.fields1Dic.Price.unitName}}</span>
                       <img src="" alt="">
                       </div>
-                      <div class="row-i"><span>售单价：</span><span class="base-clolr">3621</span><span class="base-clolr">元/平</span></div>
-                      <div class="row-i"><span>售底价：</span><div>2732.99元/平</div></div></div>
+                      <div class="row-i"><span>{{model.fields1Dic.PriceUnit.label}}</span><span class="base-clolr">{{model.fields1Dic.PriceUnit.value}}</span><span class="base-clolr">{{model.fields1Dic.PriceUnit.unitName}}</span></div>
+                      <div class="row-i"><span>{{model.fields1Dic.PriceLine.label}}</span><div>{{model.fields1Dic.PriceLine.value}}{{model.fields1Dic.PriceLine.unitName}}</div></div></div>
                    <div class="info-row">
                       <div class="row-i">
-                        <span >评估价：</span><span>318.4 </span><span>万</span>
-                      </div>
-                     
+                        <span >{{model.fields1Dic.AssessPrice.label}}</span><span>{{model.fields1Dic.AssessPrice.value}} </span><span>{{model.fields1Dic.AssessPrice.unitName}}</span>
+                      </div>                     
                       <div class="row-i"><span>预估租总价：</span><div>4621
                   <span>万</span></div></div>
                    <div class="row-i"><span>预估租单价：</span><span>11.00</span><span>元/平</span></div>
@@ -217,7 +211,7 @@
                         <el-form
                           class="follow-search-bar"
                         >
-                              <el-select
+                              <!-- <el-select
                                 v-model="value"
                                 placeholder="跟进类型"
                                 class="mr10"
@@ -229,7 +223,7 @@
                                   :value="item.value"
                                 >
                                 </el-option>
-                              </el-select>
+                              </el-select> -->
                               <el-input
                                 class="w300 mr10"
                                 placeholder="请输入"
@@ -500,19 +494,18 @@
     </div>
 </template>
 
-
 <script>
-// import max from '../../css/max';
-
+  import dynamicElement from '../../mixins/dynamicElement';
   export default {
-    name: 'ct-PropertyDetailOFI',
+    name: 'ct-PropertyDetailRET',
+    mixins: [dynamicElement],
     props: {
       vmodel: Object,
-      api: String
+      api: String,
+      apiParam: Object,
     },
     data() {
       return {
-        model:null,
         PropertyInfo: {
         swiper: [
           { name: '客厅', url: 'http://10.5.10.44:13031/Images/20210705/112133_b62d7a78-96b3-4801-b94c-47b83263a001.jpg?width=140&height=135&mode=stretch', isVr: true, type: 'vr' },
@@ -564,60 +557,71 @@
           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,
-        },
-      ],
-      follow:'first',
-      followData:[
-        {
-          date:'20/12/2020',
-          name:'出售',
-          address:'kenly',
-
-        }
-      ],
+        ],
+        tableData: [
+          {
+            name: '王建国先生',
+            type: '业主',
+            phone: '13866668888',
+            tel: '0275-55556666-5896',
+            wx: '555566665896',
+            entTime: '2021-10-26 29:27:25',
+            entUser: '王天',
+            remarks: '删除',
+            isIcon: true,
+          },
+        ],
+        follow:'first',
+        followData:[
+          {
+            date:'20/12/2020',
+            name:'出售',
+            address:'kenly',
 
-      options: [{
-        value: '选项1',
-        label: '本盘跟进'
-      }, {
-        value: '选项2',
-        label: '全部跟进'
-      }, {value: '选项3',
-        label: '合开盘跟进'
-      },
-      
-      ],
-      opening:'first',
-      
+          }
+        ],
+        options: [{
+          value: '选项1',
+          label: '本盘跟进'
+        }, {
+          value: '选项2',
+          label: '全部跟进'
+        }, {value: '选项3',
+          label: '合开盘跟进'
+        },
+        
+        ],
+        opening:'first',      
       }
     },
-    created() {
-      this.model = this.vmodel;
+    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);
+        }
+      });
     },
     methods: {
-      //查看业主
-    lookOwner() {
-      this.codeOwner = true
-    },
-     onSearch() {
-      console.log('submit!');
-    },
-    handleClick(tab, event) {
-        console.log(tab, event);
-      }
-    }
+      load(data) {
+        this.model = data;
+      },
+      lookOwner() {
+        this.codeOwner = true
+      },
+      onSearch() {
+        console.log('submit!');
+      },
+      handleClick(tab, event) {
+          console.log(tab, event);
+        }
+      },
   }
 </script>
 <style lang="scss" scoped>

package/src/centaline/dynamicTree/src/dynamicTree.vue

@@ -109,7 +109,9 @@
   }
 </script>
 <style lang="scss">
-
+  .tree-line:first-child div{
+    overflow: hidden;
+  }
     .el-tree-node {
       position: relative;
       padding-left: 16px;
@@ -129,13 +131,27 @@
       width: 1px;
       position: absolute;
       left: 27px;
-      top: -33px;
+      top: -1px;
+      border-width: 1px;
+      border-left: 1px dashed #52627C;
+    }
+
+    .tree-line .el-tree-node:before:last-child{
+      top: -35px;
+    }
+    .el-tree-node__children .el-tree-node::before {
+      content: "";
+      height: 100%;
+      width: 1px;
+      position: absolute;
+      left: 27px;
+      top: -2px;
       border-width: 1px;
       border-left: 1px dashed #52627C;
     }
     /* 当前最后一个接点的竖线高度 */
     .el-tree-node:last-child::before {
-      height: 46px; /*可以自己调整 */
+      height: 15px; /*可以自己调整 */
     }
 
     /* 横线 */
@@ -152,7 +168,7 @@
     }
 
     .el-tree:first-child .el-tree-node:before {
-      height: 46px; /*可以自己调整 */
+      // height: 46px; /*可以自己调整 */
     }
 
     .el-tree-node__expand-icon {
@@ -164,7 +180,7 @@
     }
 
     .el-tree > .el-tree-node:first-child:before {
-      border-left: none;
+      // border-left: none;
     }
 
     .tree > .is-leaf {

package/src/centaline/dynamicTree/src/dynamicTreeList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-Tree" style="height:100%;">
     <el-container style="height:  calc(100vh - 98px);border: 1px solid #eee">
-      <el-aside width="14%" style="background-color:white">
+      <el-aside width="15%" style="background-color:white">
         <ct-searchtree :flagsearch="true" :searchConditionApi="searchConditionApi" :searchDataApi="searchDataApi" @loaded="loaded"></ct-searchtree>
       </el-aside>
       <el-main v-if="isShowSearchlist">

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

@@ -0,0 +1,50 @@
+import base from '../../index';
+import Base from './Base';
+import valid from '../../../validate/index';
+import Enum from './lib/Enum';
+import common from '../../../common';
+import Vue from 'vue';
+const Detail = function (source,para ,callBack) {
+  var init = function (data) {
+    var rtn = {
+        _fields1Dic: null,//字典，方便取值
+        get fields1Dic() {
+            if (rtn._fields1Dic !== null) {
+                return rtn._fields1Dic;
+            }
+            rtn._fields1Dic = {};
+            if (rtn.fields1) {
+                rtn.fields1.forEach((f) => {
+                    rtn._fields1Dic[f.fieldName1] = Base(f);
+                });
+            }
+            return rtn._fields1Dic;
+        },
+        get fields1() {
+            return data.fields1;
+        },    
+        get fields2() {
+            return data.fields2;
+        },
+    };
+    // rtn = base.copy(Base(data), rtn);
+    // rtn = base.copy(rtn, valid.Init(rtn));
+    return rtn;
+  }
+  if (typeof source === 'string') {
+    Vue.prototype.$api.postHandler(common.globalUri(), { action: source,para:para}).then(
+      function (response) {
+        if (response.rtnCode === Enum.ReturnCode.Successful) {
+          var rtn = init(response.content);
+          if (callBack) {
+            callBack(rtn);
+          }
+        }
+      }
+    );
+  }
+  else {
+    return init(source);
+  }
+}
+export default Detail;

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

@@ -2,14 +2,11 @@ import base from '../../index';
 import Base from './Base';
 import valid from '../../../validate/index';
 import Axios from 'axios';
-import Vue from 'vue';
 const box = function (source, callBack) {
   var self = this;
   var init = function (data) {
     var rtn = {
-
-      get clearable() {
-        
+      get clearable() {        
         if (typeof source.clear === 'undefined'&&!source.locked) {
           return true;
         }
@@ -22,11 +19,16 @@ const box = function (source, callBack) {
       },
       set clearable(v) {
         source.clear = v;
-      },
-      
+      },      
       get decimals() {
         return data.decimals1;
-      }
+      },
+      get value() {
+        return source.code1;
+      },
+      set value(v) {
+        source.code1 = v;
+      },
     };
     rtn = base.copy(Base(data), rtn);
     rtn = base.copy(rtn, valid.Init(rtn));

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

@@ -16,7 +16,13 @@ const Iti = function (source) {
     },
     set clearable(v) {
       source.clear = v;
-    },    
+    }, 
+    get value() {
+      return source.code1;
+    },
+    set value(v) {
+      source.code1 = v;
+    },   
     get value1() {
       return source.code2||'';
     },

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

@@ -105,6 +105,16 @@ const SearchScreen = function (source, callBack, screenPara) {
         var advIndex = rtn.sourceFieldsArr.findIndex((v) => {
           return v.controlType === Enum.ControlType.ButtonAdvancedSearch;
         });
+        if(advIndex === -1){
+          advIndex = rtn.sourceFieldsArr.findIndex((v) => {
+            return v.controlType === Enum.ControlType.ButtonReset;
+          });
+        }
+        if(advIndex === -1){
+          advIndex = rtn.sourceFieldsArr.findIndex((v) => {
+            return v.controlType === Enum.ControlType.ButtonSearch;
+          });
+        }
         var screens = rtn.sourceFieldsArr.filter((v, i) => {
           return advIndex !== -1 && i > advIndex;
         });

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

@@ -29,6 +29,7 @@ const loader = {
   File: require("./ctl/File.js").default,
   Tree: require("./ctl/Tree.js").default,
   SearchCategory: require("./ctl/SearchCategory.js").default,
+  Detail: require("./ctl/Detail.js").default,
 };
 
 export default loader;

package/src/centaline/validate/index.js

@@ -69,6 +69,7 @@ const actions = {
       reg = /^(\-)?\d*$/;
     }
     else{
+      if(dc===-1)dc=12;
       reg = new RegExp("^(\\-)?\\d*[.]{0,1}(\\d{1," + dc + "})?$");
     }
     if (v.value === '') {
@@ -102,6 +103,7 @@ const actions = {
       reg = /^(\-)?\d*$/;
     }
     else{
+      if(dc===-1)dc=12;
       reg = new RegExp("^(\\-)?\\d*[.]{0,1}(\\d{1," + dc + "})?$");
     }    
     if (v.value === '' && v.value1 === '') {

package/src/main.js

@@ -12,7 +12,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: process.env.BASE_API,
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -35,6 +35,8 @@ Vue.use(centaline, {
       return {
         oldToken: '2db49cf6-0026-428b-9167-4273376a076f',
         estateId: '20210729104021C49F04B55C50F6AF58',
+        originalRequestURL: 'http://10.88.22.67:8080',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作