centaline-data-driven 1.2.69 → 1.2.72

package/package.json

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

package/src/Form.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
-    <ct-form :api="'/salematter/agentcontract/readDetail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/third-dept-tran/tran-comm-adjust/create'" :apiParam="apiParam"></ct-form>
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
@@ -18,7 +18,12 @@
         // apiParam: {headerParam: {}, urlParam: {contractID: "06cad32e-4d0d-4b6f-bd24-16a28629a550", actionType: "0"}}
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
-        apiParam:{acId:"220422141624917EB85D143D438CB8E5",actionType:3}
+        apiParam:{actionType: 2
+,commAdjustCategory: "6"
+,originalTraId: "1478187254032572417"
+,pageOnly: true
+,pageStyle: 2
+,pageTitle: "新增业绩调整"}
       }
     },
     methods: {

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -303,7 +303,7 @@
           if (this.$refs.contact) {
             var w1 = this.$refs.contact.clientWidth | 0;
             var w2 = this.$refs.routers.clientWidth | 0;
-            this.inputLinewidth=w1-w2-50;
+            this.inputLinewidth=w1-w2-80;
           }
         });
       }, 

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

@@ -1,8 +1,11 @@
 <template>
     <div>
-      <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailOFI" v-if="pageType=='PropertyDetailOFI'"></ct-PropertyDetailOFI>
-      <ct-PropertyDetailRET :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailRET" v-if="pageType=='PropertyDetailRET'"></ct-PropertyDetailRET>
+      <ct-PropertyDetailOFI :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailOFI" v-if="pageType=='PropertyDetailOFI'" 
+      @loaded="loaded"></ct-PropertyDetailOFI>
+      <ct-PropertyDetailRET :api="api" :apiParam="apiParam" :parentModel="parentModel" class="ct-PropertyDetailRET" v-if="pageType=='PropertyDetailRET'" 
+      @loaded="loaded"></ct-PropertyDetailRET>
       <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-PropertySimpleDetailRET"  
+      @loaded="loaded"
       @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
       v-if="pageType=='PropertySimpleDetailRET'" @closeSideHandler="closeSideHandler"></ct-PropertySimpleDetailRET>
     </div>
@@ -49,6 +52,10 @@
       simpleRouterclickHandler(field,data) {
         this.$emit('simpleRouterclickHandler',field,data);
       },
+      loaded(model) {        
+        //通知父组件加载完成
+        this.$emit('loaded',model);
+      },
     }
   }
 </script>

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

@@ -27,28 +27,32 @@
             </div>           
             <div class="head-but">
               <div>
-                <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default"
+                <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default w93"
                 :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" @click="fieldClickHandler(model.otherTradeActionRouter,$event)"></component>
-                <img :class="{'domDisabled':parentModel && parentModel.selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:11px;cursor: pointer">
-                <img :class="{'domDisabled':parentModel && parentModel.listData && parentModel.selectIndex===parentModel.listData.length-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px;cursor: pointer">
+                <img v-if="parentModel && parentModel.$refs && parentModel.$refs.table"
+                  :class="{'domDisabled':parentModel && parentModel.$refs.table && parentModel.$refs.table.model.selectIndex<=0}" 
+                  @click="clickPrevHandler" src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 20px;cursor: pointer">
+                <img v-if="parentModel && parentModel.$refs && parentModel.$refs.table"
+                  :class="{'domDisabled':parentModel && parentModel.$refs.table && parentModel.$refs.table.model.listData && parentModel.$refs.table.model.selectIndex===parentModel.$refs.table.model.listData.length-1}" 
+                  @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 15px;margin-right: 13px;cursor: pointer">
               </div>
               <div class="mt5">
                 <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
                 :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[0],$event)"></component>
-                <component class="max-report" v-if="model.actionRouters!==null && model.actionRouters[1]!==null"
+                <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[1]!==null"
                 :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[1],$event)"></component>                
               </div>
               <div class="mt5">
-                <button type="button" class="el-button el-button--info el-button--mini max-report rel w64"
+                <button type="button" class="el-button el-button--info el-button--mini max-report rel w93"
                 v-if="model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length>0">
                   <img src="../../../assets/dian.png" alt="" class="report">
                   <ul class="report-cont">
                       <li v-for="(col, index) in model.actionRoutersMoreList" :key="index"  v-if="col.show !== false">
-                        <component class="max-report" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col,$event)"></component>
+                        <component class="max-report w93" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col,$event)"></component>
                       </li>
                   </ul>
                 </button>
-                <component v-else-if="model.actionRouters!==null && model.actionRouters.length===3" class="max-report"
+                <component v-else-if="model.actionRouters!==null && model.actionRouters.length===3" class="max-report w93"
                 :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi" @click="fieldClickHandler(model.actionRouters[2],$event)">
                 </component>
               </div>
@@ -358,6 +362,8 @@
             self.setDetailHeight();
           });
         });
+        //通知父组件加载完成
+        this.$emit('loaded', this.model);
       },
       loadFields() {
         var self = this;
@@ -552,7 +558,7 @@
             }
             else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
-              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
+              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
@@ -598,31 +604,28 @@
         }
       },
       clickNextHandler() {
-        if(this.parentModel){
-          console.log(this.parentModel)
-          let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
-          this.parentModel.$vue.rowKeyDownHandle(null,1);
-          let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
+        let key='chanceID';        
+        if(this.parentModel && this.parentModel.$refs.table){
+          let oldValue=this.parentModel.$refs.table.model.listData[this.parentModel.selectIndex][key];
+          this.parentModel.$refs.table.rowKeyDownHandle(null,1);
+          let newValue=this.parentModel.$refs.table.model.listData[this.parentModel.selectIndex][key];
           if(oldValue!==newValue){
             let parm=this.apiParam;
-            parm[this.parentModel.primaryKey]=newValue;
-            // this.loaderObj.Detail(this.api,parm, this.load);
-            var fun =self.$common.getDataDrivenOpts().handler['refreshPropertyDetailRET'];
-            fun(parm,parm.pageTitle,self.parentModel);            
+            parm[key]=newValue;
+            this.loaderObj.Detail(this.api,parm, this.load);    
           }
         }
       },
       clickPrevHandler() {
-        if(this.parentModel){
-          let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
-          this.parentModel.$vue.rowKeyDownHandle(null,-1);
-          let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
+        let key='chanceID';
+        if(this.parentModel && this.parentModel.$refs.table){
+          let oldValue=this.parentModel.$refs.table.model.listData[this.parentModel.selectIndex][key];
+          this.parentModel.$refs.table.rowKeyDownHandle(null,-1);
+          let newValue=this.parentModel.$refs.table.model.listData[this.parentModel.selectIndex][key];
           if(oldValue!==newValue){
             let parm=this.apiParam;
-            parm[this.parentModel.primaryKey]=newValue;
-            // this.loaderObj.Detail(this.api,parm, this.load);
-            var fun =self.$common.getDataDrivenOpts().handler['refreshPropertyDetailRET'];
-            fun(parm,parm.pageTitle,self.parentModel);            
+            parm[key]=newValue;
+            this.loaderObj.Detail(this.api,parm, this.load);   
           }
         }
       },

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

@@ -49,7 +49,7 @@
           </div>
         </div>
         <div ref="contact" id="contact" style="margin-top: 16px;" v-if="model.contactApiRouter!==null" >
-          <ct-contact :apiRouter="model.contactApiRouter" :api="model.contactApiRouter.action" :apiParam="model.contactApiRouter.getSearchPara()"></ct-contact>
+          <ct-contact :key="refreshKey" :apiRouter="model.contactApiRouter" :api="model.contactApiRouter.action" :apiParam="model.contactApiRouter.getSearchPara()"></ct-contact>
         </div>
         <div ref="routers" style="margin-top: 16px;display: flex;">
           <component v-for="(router, index) in model.actionRoutersSimple.slice(0,showIndex>0?showIndex:model.actionRoutersSimple.length-1)" :key="index" 
@@ -66,7 +66,7 @@
                 :is="router.is" :vmodel="router" :api="model.optionApi" @click="fieldClickHandler(router)">
               </component>
             </div>
-            <span :slot="showIndex>0?'reference':''" class="icon-more" style="margin-left: 10px;"></span>
+            <span :slot="showIndex>0?'reference':''" class="more" style="margin-left: 10px;"></span>
           </el-popover>
         </div>
       </div>
@@ -93,6 +93,7 @@
     },
     data() {
       return {
+        refreshKey:0,
         topWidth:300,
         showIndex:0,
         option: {
@@ -166,7 +167,12 @@
             }
           });
         });
-      }, 
+      },
+      refreshPage(){
+        this.refreshKey=this.refreshKey+1;
+        this.showIndex=0;
+        this.setDetailStyle();
+      },
       loadFields() {
         var self = this;
         self.collapse=[];
@@ -345,7 +351,7 @@
             }
             else if (field.isFormPageInTab || field.isSearchPageInTab) {// 外部框架tab页打开
               submitData = field.getActionPara(submitData).para;
-              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle);
+              self.$common.getDataDrivenOpts().handler.openTab(field.action, submitData, field.pageTitle, self.model,field.dialogWidth);
             }
             else if (field.isBrowserNewTab) {// 浏览器打开
               submitData = field.getActionPara(submitData).para;
@@ -417,6 +423,14 @@
     margin-right: 10px;
     font-size: 12px;
 }
+.more{
+    background: url('../../../assets/more.png')no-repeat;
+    background-size: 100% 100%;
+    width: 26px;
+    height: 26px;
+    display: table-caption;
+    cursor: pointer;
+}
 </style>
 
 

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

@@ -262,8 +262,8 @@
         var clickAcion = function (field) {
           //若不是客户端方法，则直接访问接口
           if (!field.isClientFuntion) {
+            let verified = true;
             if (field.isSubmit) {
-              let verified = true;
               if(field.flagVerifyData){
                 verified=self.validExcute();
               }

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

@@ -14,9 +14,9 @@
         <el-col :span="24">
           <el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
             <!--数据列-->
-            <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false" header-align="center">
+            <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false">
               <template slot="header" slot-scope="scope">
-                <div class="cell" :class="{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled}">
+                <div  :class="[{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled},getHeadClass(v)]">
                   {{v.label}}
                 </div>
               </template>
@@ -34,7 +34,7 @@
             </el-table-column>
 
             <!--操作列-->
-            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" header-align="center">
+            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0">
               <template slot-scope="scope">
                 <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
                   {{scope.row.isSet?'保存':"修改"}}
@@ -105,6 +105,11 @@
       });
     },
     methods: {
+      getHeadClass(v) {
+        if (v.is === "ct-inputNumber") {
+          return 'ct-table-inputnumber';
+        }
+      },
       //添加账号
       addRow() {
         var app = this;

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

@@ -14,7 +14,7 @@
 
       <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" @loaded="tableLoaded"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
-      @rowClickHandle="rowClickHandle"
+      @rowClickHandle="rowClickHandle" 
       @showTitle="showTitleHandler"></ct-searchtable>
     </div>
     <div v-if="flagSideBar && flagSideBarOfData" 
@@ -203,13 +203,15 @@
       },
       rowClickHandle() {
         var self = this;
-        if(self.selectIndex!==self.$refs.table.model.selectIndex){
+        if(self.selectIndex!==self.$refs.table.model.selectIndex && self.$refs.table.model.rowSelectRouter){
           self.selectIndex=self.$refs.table.model.selectIndex;
           self.rowCount=self.$refs.table.model.listData.length;
           self.sideBarApiParam = {};
-          self.$refs.table.model.rowSelectRouter.submitListField.forEach((k) => {
-            self.sideBarApiParam[k] = self.$refs.table.model.listData[self.selectIndex][k];
-          });
+          if(self.$refs.table.model.rowSelectRouter.submitListField){
+            self.$refs.table.model.rowSelectRouter.submitListField.forEach((k) => {
+              self.sideBarApiParam[k] = self.$refs.table.model.listData[self.selectIndex][k];
+            });
+          }
           self.sideBarApiParam.actionType = self.$refs.table.model.rowSelectRouter.actionType;
           self.detailKey = self.detailKey+1;
         }
@@ -236,6 +238,11 @@
           for(var i=0;i<popoverCallTels.length;i++){
             popoverCallTels[i].style.display='block';
           }
+          if(this.$refs.detail){
+            if(this.$refs.detail.$children && this.$refs.detail.$children.length>0){
+              this.$refs.detail.$children[0].refreshPage();
+            }
+          }
         }
       },
       closeSideHandler() {

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

@@ -253,7 +253,7 @@
           window.addEventListener("resize", (ev) => {
             self.setTableHeight();
           });
-          //self.rowColorChange();
+          self.rowColorChange();
           self.fiexdHead();
 
           //当表格没有占满表格框时，主动请求下一页
@@ -535,7 +535,7 @@
             });
           }
         });
-      },
+      },      
       scrollHandle(ev) {
         var self = this;
         if ((this.$refs.tableParent.scrollTop + this.$refs.tableParent.clientHeight) >= (this.$refs.tableParent.scrollHeight - 5)) {
@@ -817,12 +817,12 @@
           else {
             // let parm={submitData:submitData,field:field}
             // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
+            // var fun = self.model.scripts.formData[action];
+            // fun(submitData,field);
             let title = field.pageTitle == undefined ? field.label : field.pageTitle;
             submitData.actionType = field.actionType;
             var fun = self.$common.getDataDrivenOpts().handler[action];
-            fun(submitData, title, self.model);
-            // var fun = self.model.scripts.formData[action];
-            // fun(submitData,field);
+            fun(submitData, title, self.$parent);
           }
         }
 

package/src/centaline/dynamicSearchList/src/dynamicTableStats.vue

@@ -176,6 +176,10 @@
 </style>
 
 <style>
+.ct-table-Statistics{
+  height: 20px;
+  margin-bottom: 10px;
+}
   .tab-list {
     position: relative;
     margin-bottom: 10px;

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

@@ -30,6 +30,9 @@ const Detail = function (source,para ,callBack) {
         _operationList:null,
         _operationRouters:[],
         _commissionList:null,
+        get title() {
+          return data.title;
+      },
         get fields1() {
             return data.fields1;
         },

package/src/centaline/selectOption/src/selectOptionVertical.vue

@@ -49,6 +49,10 @@
   }
 </script>
 <style>
+.ct-input_inner .el-popover__reference span{
+  margin-left: 0!important;
+}
+
   .ct-selectOptionVertical {
     width: 100%;
     max-height: 250px;
@@ -77,4 +81,8 @@
           -webkit-font-smoothing: antialiased;
           -moz-osx-font-smoothing: grayscale;
         }
+        .ct-selectOptionVertical li div img{
+              vertical-align: -8px;
+        }
 </style>
+

package/src/main.js

@@ -14,7 +14,7 @@ Vue.config.productionTip = false;
 Vue.use(centaline, {
   baseUrl: "http://10.88.22.13:7070/v1/form/router",
   // baseUrl: "http://10.88.23.22:9999/v1/form/router",
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
+  // baseUrl: "http://10.1.245.111:38028/api", 
   // flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
@@ -36,7 +36,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '1c37d6b7-9259-4835-88f6-a389900244f7',
+        oldToken: '6613f67c-ba83-4065-9570-175c2f74e6d5',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjgyZjdlZWUzLTY1ODctNDk4NS1hMTE3LTE3ODQxNDUxYzY5MCJ9.d8lc203lFjHqjJ6mboxSD7Eo2nJBYyynY9MtH5L0N3L9fYVedUhhvscnaxw08fITffWLxH4Mc7kP7qvHbJ3I8A',