centaline-data-driven 1.2.83 → 1.2.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.2.83",
+  "version": "1.2.86",
   "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="'/example/readDetail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/finance/refund-apply/refundApplyView'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -18,7 +18,12 @@
         // apiParam: {originalTraId: "1475658732246241281", actionType: 2, chanceID: "1"} ,
         // apiParam: {originalTraId: "1516290587463507969", actionType: "3", pageStyle: "2", pageTitle: "成交报告",pageOnly: "true"}
         apiParam:{
-actionType: 2,
+actionType: 1,
+originalTraId: "1491279498301755394",
+pageOnly: true,
+pageStyle: 2,
+pageTitle: "放款申请查看",
+paymentId: "1524305327414583297"
           }
       }
     },

package/src/SearchList.vue

@@ -4,14 +4,14 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <ct-searchlist :searchConditionApi="'/api/distribution/agentRelationProperty/getLayoutOfSearch'" 
-    :searchDataApi="'/api/distribution/agentRelationProperty/list'" :apiParam="para"></ct-searchlist>
+    <!-- <ct-searchlist :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'" 
+    :searchDataApi="'/SystemParameterList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
                    :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
                     :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist> -->
+                   ></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> -->
@@ -26,11 +26,6 @@
     data() {
       return {
         para:{
-agentId: "1491335181504401409",
-delegateType: "1",
-estateId: "18721",
-estateName: "凯旋路1798号"
-
         },
         // para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
         // para: {publishID: "1503900718229229568"}

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

@@ -67,8 +67,11 @@
               </component>
             </div>
             <span :slot="showIndex>0?'reference':''" class="more" style="margin-left: 10px;"></span>
-          </el-popover>
+          </el-popover> 
         </div>
+        <!-- <div ref="shortcutFollow" v-if="model.shortcutFollowForm!==undefined && model.shortcutFollowForm!==null" style="margin-top: 16px;">
+          <ct-form :source="model.shortcutFollowForm"></ct-form>
+        </div> -->
         <div class="tablist-info base-box">
           <div class="details-tabs-box">
             <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
@@ -90,11 +93,13 @@
 <script>
   import dynamicElement from '../../mixins/dynamicElement';
   import dynamicContact from '../../dynamicContact/src/dynamicContact.vue';
+  import dynamicForm from '../../dynamicForm/src/dynamicForm.vue';
   export default {
     name: 'ct-PropertySimpleDetailRET',
     mixins: [dynamicElement],
     components: {
       'ct-contact': dynamicContact,
+      'ct-form': dynamicForm,
     },
     props: {
       vmodel: Object,

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

@@ -32,7 +32,7 @@
                 </span>
                 <!--可点击的列-->
                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">
-                  <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].label" :rowData="scope.row"
+                  <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].code1" :rowData="scope.row"
                                   @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                 </span>
@@ -52,7 +52,7 @@
                 <span v-else-if="scope.row.isSet" class="el-tag  el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,false)">
                   取消
                 </span>
-                <span v-for="(v,i) in model.buttons" v-if="!scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
+                <span v-for="(v,i) in model.buttons" v-if="!scope.row.isSet && v.show" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
                   {{v.label}}
                 </span>
               </template>
@@ -294,7 +294,7 @@
 
         var submitData = {};        
         field.submitListField.forEach((k) => {
-          submitData[k] = rowData[k];
+          submitData[k] = rowData[k].value;
         });
 
         this.$emit('tableButtonClick', field, submitData);

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

@@ -32,7 +32,7 @@ const Detail = function (source,para ,callBack) {
         _commissionList:null,
         get title() {
           return data.title;
-      },
+        },
         get fields1() {
             return data.fields1;
         },
@@ -370,6 +370,9 @@ const Detail = function (source,para ,callBack) {
           }
           return rtn._commissionList;
         },
+        get shortcutFollowForm() {          
+          return rtn.shortcutFollowForm;
+        },
         doAction(response,field) {
           if (response.responseData) {
             response = response.responseData;

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

@@ -609,7 +609,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                       rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
                     }
                   });
-                  if (rtn.cellLayout != "") {
+                  if (rtn.cellLayout) {
                     rtn.$vue.$set(rtn.listData, rtn.selectIndex, rtn.dataDictionary[searchValue1]);
                   }
                 }
@@ -764,7 +764,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
 
             source.page.rows = source.page.rows - deleteRow.length;
-            if (rtn.cellLayout != "") {
+            if (rtn.cellLayout) {
               rtn.$vue.$delete(rtn.listData, rtn.selectIndex);
             }
             break;

package/src/main.js

@@ -39,7 +39,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'd1963e4f-7ca7-4a39-b576-3b48f6a1ef0d',
+        oldToken: '5c3b43fb-5051-40e0-b9dc-577f37767af0',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"undefined"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijk4NGM0ZjJlLTRhNTgtNDM4YS1iNjkxLWQyMTI4ZjdlYjNlMyJ9.nxO4kEXzIM2RJTXuX_AOoctKFvBiTZUEwHTu1YSFMn8JBjM9p-RK31ZB8ckJvlwgjiDGdbuGt1QOZRRP9KS3qQ',