centaline-data-driven 1.3.45 → 1.3.48

package/package.json

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

package/src/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="appDetail" style="height:100%;">
-    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
+    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

package/src/Form.vue

@@ -1,9 +1,7 @@
 <template>
   <div id="form-app" 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="'/PropertyTrust/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
-    <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -14,7 +12,11 @@
     data() {
       return {
         apiParam:{
-          chanceID: "1508323251514904576", actionType: 2
+          actionType: 3,
+originalTraId: "1556877589776220161",
+pageOnly: true,
+pageStyle: 2,
+pageTitle: "成交报告"
         },
         topHeight:10,
       }

package/src/centaline/css/max.css

@@ -275,4 +275,8 @@
     background-color: #409EFF !important;
     border-color: #409EFF !important;
 } */
-
+.ct-inputNumber .el-input-group {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+}

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

@@ -32,7 +32,7 @@
               flex: 1; align-items: center; padding: 5px; border-radius: 5px;">
           </div>
         </div>
-        <div class="head-but">
+        <div class="head-but" :key="actionRoutersKey">
           <div>
             <component class="max-report w93"
               v-if="model.actionRouters !== null && model.actionRouters[0] !== null"
@@ -553,6 +553,7 @@ export default {
       FlagStatistics: false,
       dropDownSelected: false,
       iconSort: require("../../../assets/sort.png"),
+      actionRoutersKey: Math.random(),
     };
   },
   mounted() {
@@ -588,7 +589,7 @@ export default {
     });
   },
   methods: {
-  showStats() {
+    showStats() {
       var self = this;
       this.$nextTick(function () {
         if (self.model.tags1.length > 0) {
@@ -625,7 +626,6 @@ export default {
         }
       });
     },
-
     load(data) {
       var self = this;
       this.model = data;
@@ -672,7 +672,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 = [];
@@ -681,7 +682,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) {
@@ -689,7 +691,8 @@ export default {
             collapseItemArr = [];
             col = 0;
           }
-        } else {
+        } 
+        else {
           collapseItemArr.push(v);
           col = col + 1;
           if (col === colCount || index === self.model.fields2Dic.length - 1) {
@@ -711,8 +714,11 @@ export default {
     lookOwner() {
       this.codeOwner = true;
     },
-    loadBaseInfo() {
+    loadBaseInfo(field) {
       this.model.loadBaseInfo();
+      if(field.id == "PropertyChanceQuestion"){
+        this.loadOperation();
+      }
     },
     loadFavorite() {
       this.model.loadFavorite();
@@ -751,7 +757,7 @@ export default {
         window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
       }
     },
-	 handleDropDown(key, index) {
+	  handleDropDown(key, index) {
       let i = index;
       this.model.activeIndex1 = (this.showData[0].length + i).toString();
       let dropDownData = this.showData[1];
@@ -798,7 +804,12 @@ export default {
             submitData[v] = self.model.fields1Dic[v].value;
           });
         }
-        if(router.id=="PropertyEdit"){
+        if (router.id == "PropertyEdit" 
+          || router.id == "QuestionAppeal"
+          || router.id == "PropertyChanceQuestion"
+          || router.id == "TranToActive"
+          || router.id == "TranToNotActive"
+          || router.id == "PropertyChanceTipOff") {
           callBack="loadBaseInfo"
         }
         else if (router.id == "Favorite") {
@@ -856,7 +867,7 @@ export default {
                     submit(ev) {
                       self.model.doAction(ev, field);
                       if (callBack) {
-                        callBack();
+                        callBack(field);
                       }
                       self.$common.closeDialog(dialogOption.dialog);
                     },
@@ -900,8 +911,7 @@ export default {
             };
             self.$common.openDialog(dialogOption);
           } 
-          else if (field.isFormPageInTab) {
-            // 外部框架tab页打开
+          else if (field.isFormPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
@@ -913,32 +923,28 @@ export default {
                 field.dialogWidth
               );
           } 
-          else if (field.isSearchPageInTab) {
-            // 外部框架tab页打开
+          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 {
             field.doAction(submitData, (data) => {
               self.model.doAction(data, field);
               if (callBack) {
-                callBack();
+                callBack(field);
               }
             });
           }

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

@@ -32,7 +32,7 @@
             style="font-weight: bold;font-size: 13px; margin-top: 10px;background: rgb(236, 249, 255); flex: 1;align-items: center;padding: 5px;border-radius: 5px;">
           </div>
         </div>
-        <div class="head-but">
+        <div class="head-but" :key="actionRoutersKey">
           <div>
             <component class="max-report w93"
               v-if=" model.actionRouters !== null && model.actionRouters[0] !== null"
@@ -155,11 +155,7 @@
             </div>
           </div>
           <div class="contacts-info base-box">
-            <ct-contactList
-              v-if="model.contactApiRouter !== null"
-              :apiRouter="model.contactApiRouter"
-              :key="'contact' + refershKey"
-            ></ct-contactList>
+            <ct-contactList v-if="model.contactApiRouter !== null" :apiRouter="model.contactApiRouter" :key="'contact' + refershKey"></ct-contactList>
           </div>
           <div class="tablist-info base-box">
             <div class="details-tabs-box">
@@ -549,7 +545,8 @@ export default {
       showData: [],
       FlagStatistics: false,
       dropDownSelected: false,
-	  iconSort: require("../../../assets/sort.png"),
+	    iconSort: require("../../../assets/sort.png"),
+      actionRoutersKey: Math.random(),
     };
   },
   mounted() {
@@ -656,10 +653,8 @@ export default {
             self.model.activeIndex1 = i.toString();
             if (self.model.tags1 && self.model.tags1[i]) {
               self.listKey = self.listKey + 1;
-              self.model.searchConditionApiTags1 =
-                self.model.tags1[i].searchConditionApiUrl || "";
-              self.model.searchDataApiTags1 =
-                self.model.tags1[i].searchDataApiUrl || "";
+              self.model.searchConditionApiTags1 = self.model.tags1[i].searchConditionApiUrl || "";
+              self.model.searchDataApiTags1 = self.model.tags1[i].searchDataApiUrl || "";
               self.model.paramDataTags1 = self.model.tags1[i].paramData || "";
             }
           }
@@ -729,8 +724,11 @@ export default {
     lookOwner() {
       this.codeOwner = true;
     },
-    loadBaseInfo() {
+    loadBaseInfo(field) {
       this.model.loadBaseInfo();
+      if(field.id == "PropertyChanceQuestion"){
+        this.loadOperation();
+      }
     },
     loadFavorite() {
       this.model.loadFavorite();
@@ -819,7 +817,12 @@ export default {
             submitData[v] = self.model.fields1Dic[v].value;
           });
         }
-        if (router.id == "PropertyEdit") {
+        if (router.id == "PropertyEdit" 
+          || router.id == "QuestionAppeal"
+          || router.id == "PropertyChanceQuestion"
+          || router.id == "TranToActive"
+          || router.id == "TranToNotActive"
+          || router.id == "PropertyChanceTipOff") {
           callBack = "loadBaseInfo"
         }
         else if (router.id == "Favorite") {
@@ -880,7 +883,7 @@ export default {
               self.$common.viewerfile(field, MediaAlbum, 0, 0);
             }
           }
-         else if (field.isOpenForm) {
+          else if (field.isOpenForm) {
             var dialogOption = {
               title: field.pageTitle,
               pane: self.$common.getParentPane(self),
@@ -898,7 +901,7 @@ export default {
                     submit(ev) {
                       self.model.doAction(ev, field);
                       if (callBack) {
-                        callBack();
+                        callBack(field);
                       }
                       self.$common.closeDialog(dialogOption.dialog);
                     },
@@ -973,7 +976,7 @@ export default {
             field.doAction(submitData, (data) => {
               self.model.doAction(data, field);
               if (callBack) {
-                callBack();
+                callBack(field);
               }
             });
           }
@@ -981,8 +984,7 @@ export default {
         //执行客户端脚本
         else {
           submitData = field.getActionPara(submitData).para;
-          let title =
-            field.pageTitle == undefined ? field.label : field.pageTitle;
+          let title = field.pageTitle == undefined ? field.label : field.pageTitle;
           submitData.actionType = field.actionType;
           var fun = self.$common.getDataDrivenOpts().handler[field.action];
           fun(submitData, title, null);
@@ -1012,53 +1014,33 @@ export default {
     clickNextHandler() {
       let key = "chanceID";
       if (this.parentModel && this.parentModel.$refs.table) {
-        let oldValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let oldValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         this.parentModel.$refs.table.rowKeyDownHandle(null, 1);
-        let newValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let newValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         if (oldValue !== newValue) {
           let parm = this.$common.cloneObject(this.apiParam);
           parm[key] = newValue;
           // this.loaderObj.Detail(this.api, parm, this.load);
-          this.$common
-            .getDataDrivenOpts()
-            .handler.refreshPropertyDetail(parm, this.parentModel,"PropertyDetailRET");
+          this.$common.getDataDrivenOpts().handler.refreshPropertyDetail(parm, this.parentModel,"PropertyDetailRET");
         }
       }
     },
     clickPrevHandler() {
       let key = "chanceID";
       if (this.parentModel && this.parentModel.$refs.table) {
-        let oldValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let oldValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         this.parentModel.$refs.table.rowKeyDownHandle(null, -1);
-        let newValue =
-          this.parentModel.$refs.table.model.listData[
-            this.parentModel.$refs.table.model.selectIndex
-          ][key];
+        let newValue = this.parentModel.$refs.table.model.listData[this.parentModel.$refs.table.model.selectIndex][key];
         if (oldValue !== newValue) {
           let parm = this.$common.cloneObject(this.apiParam);
           parm[key] = newValue;
           // this.loaderObj.Detail(this.api, parm, this.load);
-          this.$common
-            .getDataDrivenOpts()
-            .handler.refreshPropertyDetail(parm, this.parentModel,"PropertyDetailRET");
+          this.$common.getDataDrivenOpts().handler.refreshPropertyDetail(parm, this.parentModel,"PropertyDetailRET");
         }
       }
     },
     scrollHandle(ev) {
-      this.$emit(
-        "scrollHandle",
-        this.$refs.detail.scrollTop,
-        this.$refs.detail.scrollLeft
-      );
+      this.$emit( "scrollHandle", this.$refs.detail.scrollTop, this.$refs.detail.scrollLeft);
       ev.cancelBubble = true;
       ev.stopPropagation();
     },

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

@@ -63,7 +63,7 @@
                        @tableButtonClick="clickHandler"></component>
           </el-col>
         </el-row>
-        <el-row v-if="model.links.findIndex((v)=>{return v.show}).length > -1" style="margin-top: 8px;">
+        <el-row v-if="model.links.findIndex((v)=>{return v.show}) > -1" style="margin-top: 8px;">
           <el-col :span="24" style="text-align:left">
             <component v-for="(btn, index) in model.links" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
           </el-col>
@@ -543,6 +543,9 @@
                 on: {
                   finished(data) {
                     self.$common.closeDialog(dialogOption.dialog);
+                    if(data.rtnMsg){
+                      self.$message.info(data.rtnMsg);
+                    }
                     if(field && field.changeCallBackFunName){
                       self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
                     }
@@ -722,13 +725,13 @@
         self.$refs.Fields.forEach((f) => {
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
-              if(i===0 && f.model.label){
+              if(i===0){
                 if(f.model.is=="ct-file"){
                   self.$message.error(f.validMessage);
                 }
                 else{
                   if(f.validMessage){
-                    if(f.validMessage=='必填'){
+                    if(f.validMessage=='必填' && f.model.label){
                       self.$message.error('【'+f.model.label+'】'+f.validMessage);
                     }
                     else{
@@ -736,7 +739,9 @@
                     }
                   }
                   else{
-                    self.$message.error('【'+f.model.label+'】不能为空！');
+                    if(f.model.label){
+                      self.$message.error('【'+f.model.label+'】不能为空！');
+                    }
                   }
                 }
               }

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -916,6 +916,9 @@ export default {
                       on: {
                         finished() {
                           self.$common.closeDialog(dialogOption.dialog);
+                          if(data.rtnMsg){
+                            self.$message.info(data.rtnMsg);
+                          }
                           self.getPage(1);
                         },
                         error(data) {

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

@@ -80,6 +80,9 @@ const Detail = function (source, para, callBack) {
       get labels() {
         return data.labels;
       },
+      set labels(v) {
+        data.labels=v;
+      },
       get fields1Dic() {
         if (rtn._fields1Dic !== null) {
           return rtn._fields1Dic;
@@ -207,6 +210,9 @@ const Detail = function (source, para, callBack) {
         }
         return rtn._actionRoutersAll;
       },
+      set actionRoutersAll(v) {
+        data.actionRouters=v;
+      },
       get actionRoutersShow() {        
         if (rtn._actionRoutersShow !== null) {
           return rtn._actionRoutersShow;
@@ -535,6 +541,23 @@ const Detail = function (source, para, callBack) {
               rtn.fields1=response.content.fields1;
               rtn.fields2=response.content.fields2;
               rtn.$vue.loadFields();
+
+              rtn._actionRouterLabel=null;
+              rtn.labels=response.content.labels;
+
+              rtn._actionRoutersAll=null;
+              rtn._actionRoutersShow=null;
+              rtn._actionRouters=null;
+              rtn._actionRoutersMoreList=null;
+              rtn.actionRoutersAll=response.content.actionRouters;    
+              rtn._actionRoutersAll = [];
+              response.content.actionRouters.forEach((v, i) => {
+                var router = Router(v);
+                router.is = "ct-btn";
+                router.attrs = { size: "mini" }
+                rtn._actionRoutersAll.push(router);
+              });          
+              rtn.$vue.actionRoutersKey=Math.random();
             }
           }
         );

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

@@ -59,6 +59,9 @@ const box = function (source, fileSourceList, router, optionApi) {
       //简单分类
       getOptions(callBack) {
         var self = this;
+        if(!source.paramName1){
+          return false;
+        }
         if (self.optionModel.isInit) {
           return self.optionModel.options;
         }

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

@@ -90,8 +90,6 @@ const So = function (source, moreActionRouter) {
       //});
       Vue.prototype.$api.postHandler(common.globalUri(), params).then((response) => {
         if (response.rtnCode === 200) {
-          response.content[0].toolTip="XXXXXXXXXXXXXXXXXXXX";
-          response.content[1].toolTip="CCCCCCCCCCCCCCCCCCCC";
           self.options = response.content;
         }
       });

package/src/main.js

@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'daed21af-8ae7-4bc0-8eb5-b6ae137c8e9c',
+        oldToken: '8ce4e917-2183-40d9-8b87-53ae45e1fc59',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE2OGI1YThjLThiZTUtNDQyZi04NTA4LWMyODY4N2NkYmEzMSJ9.Rk26QdZSUzDVdjdRxGxDApOt5W6KYjmyjmsXpWeZb5E5NwZjpXnHYwhYkKjNxIeyg--OV2UrzFa2SxGzZ-Wneg',