centaline-data-driven 1.5.68 → 1.5.69

package/build/centaline/centaline.path.js

@@ -60,6 +60,8 @@ const paths = {
     "dynamicEditPictures": "./src/centaline/dynamicEditPictures/index.js", //图片编辑组件
     "dynamicMapBaidu": "./src/centaline/dynamicMapBaidu/index.js", //地图
     "dynamicContainer": "./src/centaline/dynamicContainer/index.js", //容器控件
+    "dynamicSearch": "./src/centaline/dynamicSearch/index.js", //查询条件
+    "dynamicCalendar": "./src/centaline/dynamicCalendar/index.js", //日历控件
   },
   "plugs": {
     "api": "./src/centaline/api/index.js", //调用API插件

package/package.json

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

package/release-log.md

@@ -1,3 +1,14 @@
+## v1.5.69
+2023-10-25
+
+新增
+
+将查询条件包装成组件
+
+表单中打开link参数优化和列表打开一致
+
+列表多选按钮多个参数优化
+
 ## v1.5.68
 2023-10-08
 

package/src/EmployeeClassList.vue

@@ -0,0 +1,85 @@
+<template>
+  <div id="app-Class">
+    <el-container style="background-color: #ddd !important">
+      <el-header style="height: 60%; width: 100%; padding: 0 10px">
+        <ct-searchlist
+          :searchConditionApi="'/EmployeeClassList/getEmployeeLayoutOfSearch'"
+          :searchDataApi="'/EmployeeClassList/getEmployeeListOfSearchModel'"
+          @rowClickHandle="rowClickHandle"
+        ></ct-searchlist
+      ></el-header>
+      <el-container
+        style="height: 40%; margin-top: 10px; padding-left: 10px"
+        v-if="flagShow"
+      >
+        <el-aside width="50%" style="margin-right: 10px">
+          <ct-searchlist
+            :searchConditionApi="ClassSearch"
+            :searchDataApi="ClassModel"
+            :apiParam="classSearchPara"
+          ></ct-searchlist
+        ></el-aside>
+        <el-main width="50%" style="padding: 0 10px 10px 0">
+          <!-- <ct-searchlist
+            :searchConditionApi="'/EmployeeClassList/getEmployeeLayoutOfSearch'"
+            :searchDataApi="'/EmployeeClassList/getEmployeeListOfSearchModel'"
+          ></ct-searchlist> -->
+          <ct-calendar   :searchConditionApi="'/EmployeeClassCalenderList/getLayoutOfSearch'"
+            :searchDataApi="'/EmployeeClassCalenderList/getListOfSearchModel'"    :apiParam="classSearchPara" ></ct-calendar>
+        </el-main>
+      </el-container>
+    </el-container>
+
+    <ct-dialog-list></ct-dialog-list>
+  </div>
+</template>
+
+<script>
+import Vue from "vue";
+export default {
+  name: "DataDrivenEmployeeClassList",
+  data() {
+    return {
+      classSearchPara: {},
+      flagShow: false,
+      ClassSearch:'/EmployeeClassList/getLayoutOfSearch',
+      ClassModel:'/EmployeeClassList/getListOfSearchModel',
+    };
+  },
+  methods: {
+    rowClickHandle(data) {
+
+       this.flagShow = false;
+    
+
+      var self = this;
+      self.$nextTick(() => {
+  this.classSearchPara = data;
+      this.flagShow = true; 
+
+      });
+    },
+    loaded(data) {
+      debugger
+        var self = this;
+        self.isShowSearchlist = false;
+        self.apiParam = data;
+        self.$nextTick(() => {
+          self.isShowSearchlist = true;
+        });
+      }
+  },
+  mounted() {},
+  created() {},
+};
+</script>
+<style>
+body {
+  height: 100%;
+  overflow: hidden;
+}
+
+html {
+  height: 100%;
+}
+</style>

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/distribution/transactionCommAdjust/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "originalTraId":"1701804080706330626","actionType":"3","pageStyle":"2","pageTitle":"修改成交单","pageOnly":"true"
+          transactionId: "1699302916360077313", actionType: "1", pageStyle: "2", pageOnly: "true"
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -15,6 +15,7 @@
 
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/api/necessaryFile/importTransFile/getLayoutOfSearch'" :searchDataApi="'/api/necessaryFile/importTransFile/getTableList'"></ct-searchlist> -->
     
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/taskManagement/WorkingCalendarList/getLayoutOfSearch'" :searchDataApi="'//taskManagement/WorkingCalendarList/getList'"></ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/mainlandsecond/CustAndContractRegSumList/getLayoutOfSearch'"  :searchDataApi="'/mainlandsecond/CustAndContractRegSumList/getList'"></ct-searchlist> -->
 
@@ -90,8 +91,9 @@
     
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/AttendanceClassList/getLayoutOfSearch'" :searchDataApi="'/AttendanceClassList/getListOfSearchModel'"></ct-searchlist> -->
 
-    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ReportMonthAttendanceList/getLayoutOfSearch'" :searchDataApi="'/ReportMonthAttendanceList/getListOfSearchModel'"></ct-searchlist>
+    <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/ReportMonthAttendanceList/getLayoutOfSearch'" :searchDataApi="'/ReportMonthAttendanceList/getListOfSearchModel'"></ct-searchlist> -->
 
+    <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PersonHolidayList/getLayoutOfSearch'" :searchDataApi="'/PersonHolidayList/getListOfSearchModel'"></ct-searchlist>
 
 
     <ct-dialog-list></ct-dialog-list>

package/src/centaline/dynamicCalendar/index.js

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