centaline-data-driven 1.2.24 → 1.2.27

package/package.json

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

package/src/Form.vue

@@ -8,7 +8,7 @@
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <!-- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'PropertyRealLook/getLayoutOfNew'" :apiParam="para"></ct-form>
+    <ct-form :api="'PropertyDuty/getLayoutOfClearDuty'" :apiParam="para"></ct-form>
     <!-- <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -25,7 +25,7 @@
         // apiParam: {actionType: 3,formId: "2c12649f-09c5-4aa9-8011-b6d1c7b56a41"} ,
         // apiParam: {chanceID: "1", actionType: 2} ,
         // apiParam: {worklistID: "1494206747714392064", actionType: 2}
-        para: {chanceID: "1", actionType: 2}
+        para: {propertyID: "1", actionType: 2}
         // apiParam: {
         //   actionType: 2,
         //   agentId: "1450283160825425922",

package/src/SearchList.vue

@@ -2,8 +2,8 @@
   <div id="app-search" style="height:100%;position: fixed;">
     <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist>
-    <!-- <ct-searchlist :searchConditionApi="'/WorklistList/getLayoutOfSearch'" :searchDataApi="'/WorklistList/getListOfSearchModel'" :searchCategoryApi="'/WorklistList/getLayoutOfSearchCategory'"></ct-searchlist> -->
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/exampleList/getLayoutOfSearch'" :searchDataApi="'/exampleList/getListOfSearchModel'"></ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

package/src/centaline/api/index.js

@@ -127,6 +127,10 @@ Axios.defaults.withCredentials = true;//允许带上跨域cookies
 
 const api = {
   get(url, params, callback) {
+    if(common.flagRouterSelf()){
+      url=url+params.action;
+      params=params.para;
+    }
     return Axios.get(url, params, {
       headers: {
         headers: common.getDataDrivenOpts().handler.getRequestHeaders()
@@ -138,6 +142,10 @@ const api = {
     );
   },
   post(url, params, callback) {
+    if(common.flagRouterSelf()){
+      url=url+params.action;
+      params=params.para;
+    }
     return Axios.post(url, params, {
       headers: {
         headers: common.getDataDrivenOpts().handler.getRequestHeaders()
@@ -230,6 +238,10 @@ const api = {
     return Promise.resolve(response.data);
   },
   postHandler(url, params, formData) {
+    if(common.flagRouterSelf()){
+      url=url+params.action;
+      params=params.para;
+    }
     return Axios.post(url, params, {
       headers: common.getDataDrivenOpts().handler.getRequestHeaders()
     }).then(this.postThenHandler).catch((ex) => {

package/src/centaline/common/index.js

@@ -487,6 +487,9 @@ const common = {
   globalUri() {
     return Vue.prototype.$dataDrivenOpts.baseUrl;
   },
+  flagRouterSelf() {
+    return Vue.prototype.$dataDrivenOpts.flagRouterSelf;
+  },
 
   /**
    * @method

package/src/centaline/dynamicComboBoxWithTextBox/src/dynamicComboBoxWithTextBox.vue

@@ -48,7 +48,7 @@
             <el-input v-if="model.id3" v-bind="model.attrs"
                       :placeholder="model.placeholder3" v-model="model.value3"
                       @input="inputHandler($event)" @change="changeHandler($event)"
-                      :disabled="model.lock" :maxlength="model.max"></el-input>
+                      :disabled="model.lock" :maxlength="maxlength4"></el-input>
           </div>
         </div>
       </div>
@@ -110,6 +110,15 @@
         set: function (v) {
 
         }
+      },
+      maxlength4()
+      {
+         if(this.model.max4)
+         {
+           return parseInt(this.model.max4)
+         }
+         return 99999
+
       }
     },
     mounted() {

package/src/centaline/dynamicD/src/dynamicD.vue

@@ -10,6 +10,7 @@
                         :picker-options="pickerOptions" :disabled="model.lock">
         </el-date-picker>
       </div>
+      <span v-if="model.sufLabel" class="spanMessage ct-flex-div-span">{{model.sufLabel}}</span>
       <transition name="el-fade-in">
         <span v-show="!valid" class="errorMessage">
           {{validMessage}}
@@ -50,6 +51,9 @@
         }
       },
       dateBlur(event) {
+        if(this.model.attrs && this.model.attrs.type && this.model.attrs.type=='month'){
+          return;
+        }
         var text = event.$el.querySelector("input").value;
         text = text.replace('-', '').replace('/', '').replace('\\', '');
         var nowDate = new Date();