centaline-data-driven 1.3.17 → 1.3.20

package/package.json

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

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1"} ,
+        apiParam: {actionType: 1,chanceID: "1524555083688316928"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/salemanage/adjust/point/readDetail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,7 +14,7 @@
     data() {
       return {
         apiParam:{
-actionType:2,
+originalTraId: "1542431606998347777", actionType: 3, pageStyle: 2, pageTitle: "成交报告", pageOnly: true
           }
       }
     },

package/src/centaline/api/index.js

@@ -180,7 +180,7 @@ const api = {
     }
 
     if (data.rtnCode === Enum.ReturnCode.Successful) {
-      if (data.rtnMsg) {
+      if (data.rtnMsg && common.getDataDrivenOpts().showRequestSuccessMessage) {
         if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {
           common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
         }

package/src/centaline/common/index.js

@@ -687,6 +687,18 @@ const common = {
     str = charUpper + str.slice(1);
     return str;
   },
+  getDataOfUpperLower(model,key){
+    if(model[key]){
+      return model[key];
+    }
+    else if(model[this.initialsToUpperCase(key)]){
+      return model[this.initialsToUpperCase(key)];
+    }
+    else if(model[this.initialsToLowerCase(key)]){
+      return model[this.initialsToLowerCase(key)];
+    }
+    return '';
+  },
 
   /**
    * @method
@@ -733,7 +745,18 @@ const common = {
    */
   numToFloat(value, num) {
     if (value && num && num > 0) {
-      value = parseFloat(value).toFixed(num);
+      let ls=value.toString().split('.');
+      let l1=0;
+      value=ls[0]+'.';
+      if(ls.length>1){
+        value=value+ls[1];
+        l1=ls[1].length;
+      }
+      if(num>l1){
+        for(var i=0;i<num-l1;i++){
+          value=value+'0';
+        }
+      }
     }
     return value.toString();
   },

package/src/centaline/css/common.css

@@ -360,7 +360,10 @@ html {
    color: #303133;
    line-height: 1.769230769230769;
  }
- 
+ .el-collapse-item__content [class*=el-col-] {
+  float: none;
+  display: inline-block;
+}
  .ct-text .ct-text-label-div {
    display: flex;
    justify-content: left;
@@ -377,8 +380,14 @@ html {
  
  .ct-flex-div .ct-flex-div-input {
    flex: 1;
+   
  }
- 
+  .el-textarea .el-input__count {
+  /* right: 24px; */
+}
+.ct-flex-div-input input.el-input__inner {
+  /* width: 100%; */
+}
  .ct-flex-div .ct-flex-div-span {
    display: flex;
    justify-content: left;
@@ -815,4 +824,8 @@ html {
 .shortcutFollow .el-collapse{
   border-bottom: none;
 }
+.ct-form .el-tabs__content .el-row [class*=el-col-]{
+  float: none;
+  display: inline-block;
+}
 

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -170,6 +170,14 @@
           if(data.content.imgUrl)this.tellImgUrl=data.content.imgUrl;
         }
       },
+      closeCallTel(){
+        if(this.model.isCallTel){
+          if(this.visible){
+            this.visible=false;
+            this.tellImgUrl='';
+          }
+        }
+      },
     }
   }
 </script>

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

@@ -418,6 +418,10 @@
                   self.$forceUpdate();
                 }
                 else if(field.actionType===19){
+                  if(self.model.currentCallTel){
+                    self.$refs[self.model.currentCallTel][0].closeCallTel()
+                  }
+                  self.model.currentCallTel='router'+field.id+field.rowindex;
                   self.$refs['router'+field.id+field.rowindex][0].callTelClick(data);
                 }
               })

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

@@ -10,30 +10,13 @@
             <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"
-            />
+            <img :src="model.fields1Dic.FavoriteUrl.value" alt="" class="collection"/>
           </div>
           <div class="title-other">
-            <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"
-            />
+            <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
@@ -170,21 +153,8 @@
           </div>
         </div>
       </div>
-      <div
-        ref="detail"
-        class="details-mid y-auto"
-        @scroll="scrollHandle($event)"
-        :style="{
-          height: model.detailHeight ? model.detailHeight + 'px' : '780px',
-        }"
-      >
-        <div
-          ref="midl"
-          class="mid-l"
-          :style="{
-            width: model.midlWidth ? model.midlWidth + 'px' : '1200px',
-          }"
-        >
+      <div ref="detail" class="details-mid y-auto" @scroll="scrollHandle($event)" :style="{height: model.detailHeight ? model.detailHeight + 'px' : '780px',}">
+        <div ref="midl" class="mid-l" :style="{ width: model.midlWidth ? model.midlWidth + 'px' : '1200px',}">
           <!-- 图片内容部分 -->
           <div class="hous-info base-box">
             <div class="info-conten">
@@ -293,20 +263,10 @@
                 </div>
               </div>
             </div>
-            <div
-              v-for="(col, index) in collapse"
-              :key="index"
-              class="info-conten-b"
-              v-show="allInfo"
-            >
+            <div v-for="(col, index) in collapse" :key="index" class="info-conten-b" v-show="allInfo">
               <div class="info-row mb20">
-                <div
-                  v-for="(c, i) in col"
-                  :key="i"
-                  :class="c.singleLine === true ? 'row-i100' : 'row-i'"
-                >
-                  <span>{{ c.label }}</span
-                  ><span>{{ c.value }}</span>
+                <div v-for="(c, i) in col" :key="i" :class="c.singleLine === true ? 'row-i100' : 'row-i'">
+                  <span>{{ c.label }}</span><span>{{ c.value }}</span>
                 </div>
               </div>
             </div>
@@ -737,31 +697,28 @@ export default {
       }
     );
     this.$nextTick(function () {
-      if (
-        self.parentModel &&
-        self.parentModel.$refs &&
-        self.parentModel.$refs.table
-      ) {
+      if ( self.parentModel && self.parentModel.$refs && self.parentModel.$refs.table ) {
         if (self.parentModel.$refs.table.model.selectIndex <= 0) {
           self.flagDisabledPrev = true;
         }
-        if (
-          self.parentModel.$refs.table.model.listData &&
-          self.parentModel.$refs.table.model.selectIndex ===
-            self.parentModel.$refs.table.model.listData.length - 1
+        if ( self.parentModel.$refs.table.model.listData 
+        && self.parentModel.$refs.table.model.selectIndex === self.parentModel.$refs.table.model.listData.length - 1
         ) {
           self.flagDisabledNext = true;
         }
-      } else {
+      } 
+      else {
         self.flagDisabledPrev = true;
         self.flagDisabledNext = true;
       }
 
       if (self.vmodel) {
         self.load(self.vmodel);
-      } else if (typeof self.source !== "undefined") {
+      } 
+      else if (typeof self.source !== "undefined") {
         self.loaderObj.Detail(self.source, null, self.load);
-      } else if (typeof self.api !== "undefined") {
+      } 
+      else if (typeof self.api !== "undefined") {
         self.loaderObj.Detail(self.api, self.apiParam, self.load);
       }
     });
@@ -860,7 +817,8 @@ export default {
         if (v.type === 13) {
           collapseItemArr = [];
           col = 0;
-        } else if (v.singleLine) {
+        } 
+        else if (v.singleLine) {
           if (collapseItemArr.length > 0) {
             self.collapse.push(collapseItemArr);
             collapseItemArr = [];
@@ -869,7 +827,8 @@ export default {
           self.collapse.push(collapseItemArr);
           collapseItemArr = [];
           col = 0;
-        } else if (v.spanCols) {
+        } 
+        else if (v.spanCols) {
           collapseItemArr.push(v);
           col = col + v.spanCols;
           if (col === colCount || index === self.model.fields2Dic.length - 1) {
@@ -877,7 +836,8 @@ export default {
             collapseItemArr = [];
             col = 0;
           }
-        } else {
+        } 
+        else {
           collapseItemArr.push(v);
           col = col + 1;
           if (col === colCount || index === self.model.fields2Dic.length - 1) {
@@ -899,6 +859,9 @@ export default {
     lookOwner() {
       this.codeOwner = true;
     },
+    loadBaseInfo() {
+      this.model.loadBaseInfo();
+    },
     handleClick(tab, event) {
       let i = tab.index;
       if (this.model.tags2 && this.model.tags2[i]) {
@@ -977,16 +940,26 @@ export default {
           router.submitFormField.forEach((v) => {
             submitData[v] = field.list[field.listIndex].code;
           });
-        } else {
+        } 
+        else {
           router.submitFormField.forEach((v) => {
             submitData[v] = self.model.fields1Dic[v].value;
           });
         }
+        if(router.id=="PropertyEdit"){
+          callBack="loadBaseInfo"
+        }
       }
 
-      if (callBack && callBack == "loadOperation") {
-        this.routerClickHandler(router, submitData, self.loadOperation);
-      } else {
+      if (callBack) {
+        if(callBack=='loadOperation'){
+          this.routerClickHandler(router, submitData, self.loadOperation);
+        }
+        else if(callBack=='loadBaseInfo'){
+          this.routerClickHandler(router, submitData, self.loadBaseInfo);
+        }
+      } 
+      else {
         this.routerClickHandler(router, submitData);
       }
     },
@@ -1034,7 +1007,8 @@ export default {
               ],
             };
             self.$common.openDialog(dialogOption);
-          } else if (field.isOpenList) {
+          } 
+          else if (field.isOpenList) {
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),
@@ -1062,7 +1036,8 @@ export default {
               ],
             };
             self.$common.openDialog(dialogOption);
-          } else if (field.isFormPageInTab) {
+          } 
+          else if (field.isFormPageInTab) {
             // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
@@ -1074,24 +1049,29 @@ export default {
                 self.model,
                 field.dialogWidth
               );
-          } else if (field.isSearchPageInTab) {
+          } 
+          else if (field.isSearchPageInTab) {
             // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
               .handler.openTabSearch(field, submitData);
-          } else if (field.isBrowserNewTab) {
+          } 
+          else if (field.isBrowserNewTab) {
             // 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
             window.open(field.action + query, "_blank");
-          } else if (field.isOpenUrlInBrowse) {
+          } 
+          else if (field.isOpenUrlInBrowse) {
             // 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");
-          } else if (field.isSeeVoice) {
+          } 
+          else if (field.isSeeVoice) {
             //看视频
             self.$common.browseVideo(field, submitData);
-          } else {
+          } 
+          else {
             field.doAction(submitData, (data) => {
               self.model.doAction(data, field);
               if (callBack) {
@@ -1116,8 +1096,7 @@ export default {
       }
 
       if (field.alert) {
-        self.$common
-          .confirm(field.alertMsg, field.alertCaption, {
+        self.$common.confirm(field.alertMsg, field.alertCaption, {
             confirmButtonText: field.alertOKButtonText,
             cancelButtonText: field.alertCancelButtonText,
             //type: 'warning'
@@ -1127,7 +1106,8 @@ export default {
             clickAcion(field, submitData);
           })
           .catch(() => {});
-      } else {
+      } 
+      else {
         clickAcion(field, submitData);
       }
     },

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

@@ -254,6 +254,9 @@
         this.model._operationRouters=[];
         this.model.getOperationList();
       },
+      loadBaseInfo() {
+        this.model.loadBaseInfo();
+      },
       handleClick(tab, event) {
         let i=tab.index;
         if(this.model.tags2 && this.model.tags2[i]){
@@ -310,10 +313,18 @@
               submitData[v] = self.model.fields1Dic[v].value;
             });
           }
+          if(router.id=="PropertyEdit"){
+            callBack="loadBaseInfo"
+          }
         }
 
-        if(callBack && callBack=='loadOperation'){
-          this.routerClickHandler(router,submitData,self.loadOperation);  
+        if(callBack){
+          if(callBack=='loadOperation'){
+            this.routerClickHandler(router, submitData, self.loadOperation);
+          }
+          else if(callBack=='loadBaseInfo'){
+            this.routerClickHandler(router, submitData, self.loadBaseInfo);
+          }
         }
         else{
           this.routerClickHandler(router,submitData);

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

@@ -1,10 +1,5 @@
 <template>
-  <div
-    style="width: 100%"
-    v-if="model !== null"
-    class="block ct-file"
-    :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']"
-  >
+  <div style="width: 100%" v-if="model !== null" class="block ct-file" :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']">
     <el-upload
       :class="disableUpload ? 'ct-upload-display-none' : ''"
       :disabled="model.lock"
@@ -32,73 +27,36 @@
       </div>
       <div slot="file" slot-scope="{ file }" :title="file.fileName">
         <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 fit="fill" :src="file.url" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
           </el-image>
-          <span
-            class="cover-list-item-span-delete"
-            v-if="!model.lock && file.rightDel"
-          >
+          <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
             <i class="el-icon-delete" @click="handleRemove(file)"></i>
           </span>
-          <span
-            class="cover-list-item-span"
-            v-if="model.lock || model.paramName"
-          >
+          <span class="cover-list-item-span" v-if="model.lock || model.paramName">
             <!--锁定-->
             <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
-              <span style="width: 80px; height: 26px; display: inline-flex"
-                >&nbsp;{{ file.mediaLabelName }}</span
-              >
+              <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
             </span>
             <!--复杂分类-->
-            <span
-              v-else-if="model.isComplexClassify"
-              class="el-dropdown-link"
-              @click="classifyFormClickHandle(file)"
-            >
-              <span style="width: 80px; height: 26px; display: inline-flex"
-                >&nbsp;{{ file.mediaLabelName }}</span
-              ><i class="el-icon-arrow-down el-icon--right"></i>
+            <span v-else-if="model.isComplexClassify" class="el-dropdown-link" @click="classifyFormClickHandle(file)">
+              <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+              <i class="el-icon-arrow-down el-icon--right"></i>
             </span>
             <!--简单分类-->
-            <el-dropdown
-              v-else
-              class="el-upload-list__item-preview"
-              trigger="click"
-              placement="top"
-              @command="classifySelectedClickHandle"
-            >
+            <el-dropdown v-else class="el-upload-list__item-preview"  trigger="click" placement="top" @command="classifySelectedClickHandle">
               <span class="el-dropdown-link" @click="classifyClickHandle">
-                <span style="width: 80px; height: 26px; display: inline-flex"
-                  >&nbsp;{{ file.mediaLabelName }}</span
-                ><i class="el-icon-arrow-down el-icon--right"></i>
+                <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+                <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
-              <el-dropdown-menu
-                slot="dropdown"
-                class="el-upload-list__item-preview"
-              >
-                <el-dropdown-item
-                  v-for="(option, index) in model.optionModel.options"
-                  :key="index"
-                  :command="{ option: option, file: file }"
-                >
+              <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
+                <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{ option: option, file: file }">
                   {{ option[model.optionModel.optionAttrs.label] }}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </span>
         </div>
-        <el-progress
-          type="circle"
-          v-if="file.progressFlag"
-          :percentage="file.loadProgress"
-        ></el-progress>
+        <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress"></el-progress>
       </div>
     </el-upload>
   </div>
@@ -149,17 +107,14 @@ export default {
     },
     //删除
     handleRemove(file) {
-      this.$common
-        .confirm("确定删除该附件？", "提示", {
+      this.$common.confirm("确定删除该附件？", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           //type: 'warning'
-        })
-        .then(() => {
+        }).then(() => {
           this.model.deleteFile(file, false);
           this.selfValidExcute("remove");
-        })
-        .catch(() => {});
+        }).catch(() => {});
     },
     handlePictureCardPreview(file) {
       if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {
@@ -302,7 +257,8 @@ export default {
       if (this.model.max) {
         if (this.model.getfileListLength() >= this.model.max) {
           this.disableUpload = true;
-        } else {
+        } 
+        else {
           this.disableUpload = false;
         }
       }
@@ -310,18 +266,14 @@ export default {
         if (this.model.getfileListLength() < this.model.min) {
           //change时需要判断有没有上传图片如果没有图片则不提示
           if (eventName == "change" && this.model.getfileListLength() > 0) {
-            this.validMessage =
-              "附件数量还差" +
-              (parseInt(this.model.min) - this.model.getfileListLength()) +
-              "张";
+            this.validMessage = "附件数量还差" + (parseInt(this.model.min) - this.model.getfileListLength()) + "张";
             this.valid = false;
-          } else if (eventName == "valid") {
-            this.validMessage =
-              "附件数量还差" +
-              (parseInt(this.model.min) - this.model.getfileListLength()) +
-              "张";
+          } 
+          else if (eventName == "valid") {
+            this.validMessage = "附件数量还差" + (parseInt(this.model.min) - this.model.getfileListLength()) + "张";
             this.valid = false;
-          } else if (eventName == "remove") {
+          } 
+          else if (eventName == "remove") {
             this.valid = true;
           }
           return false;