centaline-data-driven 1.2.93 → 1.2.94

package/build/centaline/centaline.path.js

@@ -44,6 +44,7 @@ const paths = {
     "dynamicCompound": "./src/centaline/dynamicCompound/index.js",//复合控件
     "dynamicContact": "./src/centaline/dynamicContact/index.js",//联系人电话
     "dynamicLayout": "./src/centaline/dynamicLayout/index.js",//Layout组件
+    "browseVideo": "./src/centaline/browseVideo/index.js",//确认框组件
   },
   "plugs": {
     "api": "./src/centaline/api/index.js",//调用API插件

package/package.json

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

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="'/salematter/agent/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>  
@@ -13,23 +13,12 @@
     name: 'App',
     data() {
       return {
-        // apiParam: {profitReturnId: "1504359257134055426", actionType: 1, pageStyle: 2, pageTitle: "查看返利", pageOnly: true} ,
-        // 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:{
-actionType: 2,
-		jsonData: {
-			searchFields: {
-				fields: [{
-					fieldName1: "estateId",
-					groupName: "estateId",
-					operation: 2,
-					searchDataType: 3,
-					searchValue1: "201703020943128D8A8FCF463E4016D6"
-				}]
-			}
-		}
+actionType: 3,
+originalTraId: "1530076554013306882",
+pageOnly: true,
+pageStyle: 2,
+pageTitle: "成交报告",
           }
       }
     },

package/src/SearchList.vue

@@ -13,8 +13,6 @@
                     :searchStatsApi="'/exampleList/getListStats'"
                    ></ct-searchlist>
 
-    <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyStatusList/getLayoutOfSearch'" :searchDataApi="'/PropertyStatusList/getListOfSearchModel'"  :apiParam="para"></ct-searchlist> -->
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

package/src/centaline/browseVideo/index.js

@@ -0,0 +1,11 @@
+import browseVideo from './src/browseVideo'
+
+browseVideo.install = function (Vue) {
+  Vue.component(browseVideo.name, browseVideo);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(browseVideo);
+}
+
+export default browseVideo;

package/src/centaline/browseVideo/src/browseVideo.vue

@@ -0,0 +1,30 @@
+<template>
+  <div>
+    <div class="alert fade in" role="alert" style="padding:0px;border-bottom:none;display: table-caption;margin-left: 5px;">
+      <video :src="submitData[router.submitFormField]" controls="true" autoplay controlslist="nodownload" 
+        :height="router.dialogHeight?router.dialogHeight-10:'40'" :width="router.dialogWidth?router.dialogWidth-10:'100%'">您的浏览器不支持 video 标签。
+      </video>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'ct-video',
+    props: {
+      router: Object,
+      submitData: Object,
+    },
+    data() {
+      return {
+
+      };
+    },
+    methods: {
+      clickHandler(ev, v) {        
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

package/src/centaline/common/index.js

@@ -215,7 +215,10 @@ const common = {
    */
   closeDialog(vmodel) {
     if (vmodel) {
-      if (vmodel.name === 'ct-comfirm' || vmodel.$options.name === 'ctDialog' || vmodel.$options.name === 'ct-dialog') {
+      if (vmodel.name === 'ct-comfirm' 
+      || vmodel.$options.name === 'ctDialog' 
+      || vmodel.$options.name === 'ct-dialog' 
+      || vmodel.$options.name === 'ct-video') {
         this.dialogList.deleteDialog(vmodel);
         return;
       }
@@ -269,6 +272,30 @@ const common = {
 
   },
 
+  browseVideo(router, submitData) {
+    let self = this;
+
+    return new Promise((resolve, reject) => {
+      var dialogOption = {
+        title: router.pageTitle,
+        name: 'ct-video',
+        vmodel: {},
+        content: [{
+          component: 'ct-video',
+          attrs: {
+            router: router,
+            submitData: submitData,
+            width: router.dialogWidth + 'px',
+            height: router.dialogHeight + 'px'
+          },
+          on: {
+          }
+        }]
+      };
+      this.openDialog(dialogOption);
+    })
+  },
+
   /**
    * @method
    * @param {Object} evControl 指定Vue对象

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

@@ -261,6 +261,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

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

@@ -402,6 +402,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

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

@@ -217,7 +217,18 @@
                         </div>
                     </div>
                     <div v-else class="el-tabs__content" :key="model.tags2Key">
-                      <div v-for="(m, i) in col.list" class="text" :key="i">{{m.dutyEmpName}}</div>
+                      <div v-if="col.list" role="tabpanel" aria-labelledby="tab-first" class="el-tab-pane">
+                        <div v-for="(info, i) in col.list" :key="i" class="tab-conten">
+                          <img :src="info.dutyEmpUrl">
+                          <div class="user-name" style="display: block;padding-top: 5px;">
+                            <div style="display: flex;">
+                              <div class="text">{{info.dutyEmpName}}</div>
+                              <span class="user-but">{{info.dutyDeptName}}</span>
+                            </div>
+                            <div class="text">{{info.mobileNo}}</div>
+                          </div>
+                        </div>
+                      </div>
                     </div>
                   </el-tab-pane>
                 </el-tabs>
@@ -587,6 +598,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

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

@@ -401,6 +401,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else{
               field.doAction(submitData, (data) => {
                 self.model.doAction(data,field);

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

@@ -402,6 +402,9 @@
               else if (field.isOpenUrlInBrowse) {// 浏览器打开
                 window.open(submitData[field.submitFormField], "_blank");
               }
+              else if (field.isSeeVoice) {//看视频              
+                self.$common.browseVideo(field,submitData)
+              }
               else if (field.isExport) {
                 submitData = field.getActionPara(submitData).para;
                 self.model.export(field, submitData);

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchList.vue

@@ -64,7 +64,7 @@
         }
         this.loadFields();
         this.$nextTick(() => {
-          this.$refs.table.searchComplate(this.model);
+          this.$refs.table.searchComplate(this.model,this.model.flagSearch);
         });
         this.loading = false;
         

package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue

@@ -182,9 +182,10 @@
           c.width = (c.maxLen + 2) * 6;
         });
       },
-      searchComplate(searchModel) {
+      searchComplate(searchModel,flagSearch) {
         var self = this;
         this.loading = true;
+        if(flagSearch==undefined)flagSearch=true;
         this.$nextTick(function () {
           if (typeof self.api !== 'undefined' && typeof searchModel !== 'undefined') {
             var postData;
@@ -205,7 +206,9 @@
               }
               postData.fields.push(retains);
             }
-            self.loaderObj.SearchTable(self.api, self.load, searchModel, true, postData);
+            self.loaderObj.SearchTable(self.api, self.load, searchModel, flagSearch, postData,function(){
+              self.loading = false;
+            });
           }
           if (typeof self.source !== 'undefined') {
             self.load(self.loaderObj.SearchTable(self.source));

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

@@ -757,34 +757,8 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
-            else if (field.isSeeVoice && false) {//看视频
-              var dialogOption = {
-                title: field.pageTitle,
-                pane: self.$common.getParentPane(self),
-                content: [{
-                  component: 'ct-form',
-                  attrs: {
-                    //ssource: data.content,
-                    api: field.action,
-                    apiParam: field.getActionPara(submitData).para,
-                    showTitle: false,
-                    width: field.dialogWidth + 'px',
-                    height: field.dialogHeight + 'px'
-                  },
-                  on: {
-                    submit(ev) {
-                      self.model.updateFields(ev, () => {
-                        self.$refs.Fields.forEach((fd) => {
-                          fd.$forceUpdate();
-                        });
-                      });
-                      self.$common.closeDialog(dialogOption.dialog);
-                    }
-                  }
-                }]
-              };
-              self.$common.openDialog(dialogOption);
-              window.open(submitData[field.submitFormField], "_blank");
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
             }
             else {
               //self.operationLoading = true;
@@ -967,6 +941,9 @@
             else if (field.isOpenUrlInBrowse) {// 浏览器打开
               window.open(submitData[field.submitFormField], "_blank");
             }
+            else if (field.isSeeVoice) {//看视频              
+              self.$common.browseVideo(field,submitData)
+            }
             else {
               //self.operationLoading = true;
 

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

@@ -13,6 +13,12 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
       get source() {
         return source;
       },
+      get flagSearch() {
+        if(source.flagSearch!=undefined){
+          return source.flagSearch;
+        }
+        return true;
+      },
       get title() {
         return source.title;
       },

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

@@ -4,7 +4,7 @@ import Router from './Router';
 import Vue from 'vue';
 import Enum from './lib/Enum';
 import formData from '../../../formData';
-const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSearchData) {
+const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSearchData,postThenHandler) {
   var init = function (source) {
     var rtn = {
       $vue: null,
@@ -890,6 +890,11 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             callBack(rtn);
           }
         }
+        else{
+          if(postThenHandler){
+            postThenHandler();
+          }
+        }
       }
     );
   }

package/src/main.js

@@ -12,10 +12,10 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.13:7070/v1/form/router",
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.88.23.22:9999/v1/form/router",
-  // baseUrl: "http://10.88.22.69:8080/", 
-  // flagRouterSelf: true,
+  baseUrl: "http://10.88.22.69:8080/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -39,7 +39,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'd7a1705d-d8f4-4fee-9778-f9f6e402eacd',
+        oldToken: '059a0de9-385e-49d1-85a7-c04e4c1c0a18',
         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.eyJsb2dpbl91c2VyX2tleSI6Ijc4N2U5ZDA1LThlMGItNDY0ZS1iMThjLTQzNjEyZWIyZDQ1ZCJ9.1W1c_YwAF9jfjAtOq9twaB6FH4KiySPuZmWIzcLSDxjfJTgXu7fcf4Cu8kyWcRC2bXrzNQoOYsHAR1vfMAQvGA',