Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js

@@ -312,7 +312,8 @@ export default {
         MobileOrPhoneOrNull: t => t.length <= 0 || /^1[0-9]{10}$/.test(t) || /^[+0-9- ]*$/.test(t) ||
           '须留空或符合手机/电话号码格式',
         Uri: t => /^[a-zA-z]+:\/\/[^\s]*$/.test(t) || '须符合网址Url格式',
-        UriOrNull: t => t.length <= 0 || /^[a-zA-z]+:\/\/[^\s]*$/.test(t) || '须留空或符合网址Url格式'
+        UriOrNull: t => t.length <= 0 || /^[a-zA-z]+:\/\/[^\s]*$/.test(t) || '须留空或符合网址Url格式',
+		TrueOrFalse:t => t===true || t===false || '不能为空',
       }
     }
   }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json

@@ -1079,6 +1079,24 @@
             }
             
         }
+		// 学员通讯录
+		,{
+		    "path" : "pages/EducationalAdministration/AddressBook/list",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "学员通讯录",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
+		,{
+		    "path" : "pages/EducationalAdministration/AddressBook/single",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "学员通讯录",
+		        "enablePullDownRefresh": false
+		    }
+		}
     ],
 
 	// 全局样式

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/AddressBook/list.vue

@@ -0,0 +1,303 @@
+<template> 
+  <view class="page"> 
+    <!-- 主列表页 --> 
+	 <!-- style="padding-top: 80rpx;" -->
+    <view :class="sideOpen ? 'show' : ''" class="mainpage"> 
+      <!-- 顶部条目/分页信息栏 --> 
+      <!-- <l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner> -->
+  
+      <!-- 滚动列表，跨端支持上拉/下拉 --> 
+      <l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list"> 
+        <l-customlist :tips="loadState" showTips> 
+          <!-- 单条记录 --> 
+          <view class="customlist-item" v-for="item of list" :key="item.AId"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">姓名：</text> 
+              {{ displayListItem(item, 'AName') }} 
+            </view> 
+			
+			<!-- <view class="customlist-item-field">
+			  <text class="customlist-item-field-title">性别：</text> 
+			  {{ displayListItem(item, 'AGender') }} 
+			</view> -->
+			
+			<view class="customlist-item-field">
+			  <text class="customlist-item-field-title">手机：</text> 
+			  {{ displayListItem(item, 'AMobile') }} 
+			</view>
+			
+            <l-customlist-action showEdit @edit="action('edit', item.AId)" showDelete @delete="action('delete', item.AId)" @view="action('view', item.AId)" /> 
+          </view> 
+        </l-customlist> 
+      </l-scroll-list> 
+    </view> 
+  
+    <!-- 关闭侧边抽屉按钮 --> 
+    <view @click="sideOpen = false" :class="sideOpen ? 'show' : ''" class="sideclose"> 
+      <l-icon type="pullright" color="blue" /> 
+    </view> 
+  
+    <!-- 侧边栏，用于设置查询条件 --> 
+    <scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y> 
+      <view v-if="ready" class="padding"> 
+  
+        <l-customlist-sidepage-datefilter 
+          v-model="dateRange"
+          @change="searchChange"
+          title="按时间日期查询: "
+          ref="datefilter"
+          class="margin-bottom"
+        /> 
+  
+        <l-input 
+          v-model="queryData.ADDate"
+          @change="searchChange"
+          title ="文本框"
+          placeholder="按文本框查询"
+        /> 
+        <l-select 
+          v-model="queryData.ClockStatus"
+          @change="searchChange"
+          :range="dataSource.ClockStatus"
+          title ="下拉框"
+          placeholder="按下拉框查询"
+        /> 
+  
+        <!-- 重置查询条件按钮 --> 
+        <view class="padding-tb"> 
+          <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button> 
+        </view> 
+      </view> 
+    </scroll-view> 
+  
+    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+  
+  </view> 
+</template> 
+  
+  
+<script> 
+/* 
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-09-02 09:09 
+ * 描  述：考勤记录 
+ */
+  
+/** 
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/LogisticsManagement/ADR_Record/list", "style": { "navigationBarTitleText": "表单列表页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+import moment from 'moment'
+import get from 'lodash/get'
+import set from 'lodash/set'
+import pickBy from 'lodash/pickBy'
+import mapValues from 'lodash/mapValues'
+  
+export default { 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        AName: { type: 'text' }, 
+        AGender: { type: 'text' }, 
+        AMobile: { type: 'text' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+        // ADDate: '', 
+        // ClockStatus: '', 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        ClockStatus: Object.values(this.GET_GLOBAL('dataDictionary').DbFieldType).map(t => ({ value: t.value, text: t.text })), 
+      }, 
+  
+      // 时间查询参数 
+      dateRange: null, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('LogisticsManagementADR_Record-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('LogisticsManagementADR_Record-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表
+    async fetchList(isConcat=true) {
+    	if (this.page > this.total) {
+    		return;
+    	}
+    	let _postParam = {
+    	    pagination: {
+    	        rows: 10,
+    	        page: this.page,
+    	        sord: 'ASC'
+    	    },
+    	    queryJson: JSON.stringify(this.queryData)
+    	};
+    	this.LOADING('加载数据中…');
+    	await this.HTTP_GET('Learun/adms/PersonnelManagement/AddressBook/pagelist', _postParam,'加载数据时出错').then(res => {
+    		this.HIDE_LOADING();
+    		this.total = res.total;
+    		this.page = res.page + 1;
+			res.rows.forEach(e=>{
+				e.AGender = e.AGender?'男':'女'
+			})
+    		this.list = isConcat?this.list.concat(res.rows):res.rows;
+    		
+    		this.tips = `已加载 ${Math.min(res.page, res.total)} / ${res.total} 页，共 ${res.records} 项`;
+    		this.loadState = res.page >= res.total ? '已加载所有项目' : '向下翻以加载更多';
+    	})
+    },
+    
+    // 刷新清空列表
+    async refreshList(isConcat=true) {
+    	this.page = 1;
+    	this.total = 2;
+    	this.list = [];
+    
+    	await this.fetchList(isConcat);
+    },
+  
+    // 列表下拉 
+    pullDown() { 
+      this.refreshList().then(() => { 
+        this.$refs.list.stopPullDown() 
+      }) 
+    }, 
+  
+    // 设置搜索条件 
+    async searchChange() { 
+      const result = {} 
+  
+      // 时间查询相关参数 
+      if (this.dateRange) { 
+        result.StartTime = this.dateRange.start 
+        result.EndTime = this.dateRange.end 
+      } 
+  
+      // 将其他查询项添加到查询 JSON 中 
+      const queryObj = pickBy(this.queryData, t => (Array.isArray(t) ? t.length > 0 : t)) 
+      Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) 
+  
+      this.searchData = result 
+      await this.refreshList() 
+    }, 
+  
+    // 点击「清空查询条件」按钮 
+    reset() { 
+      this.$refs.datefilter.changeDateRange('all') 
+      this.queryData = this.COPY(this.defaultQueryData) 
+      this.searchChange() 
+    }, 
+  
+    // 点击「编辑」、「查看」、「添加」、「删除」按钮 
+    async action(type, id = '') { 
+      switch (type) { 
+        case 'view': 
+          this.NAV_TO(`./single?type=view&id=${id}`) 
+          return
+  
+        case 'add': 
+          this.NAV_TO('./single?type=create') 
+          return
+  
+        case 'edit': 
+          this.NAV_TO(`./single?type=edit&id=${id}`) 
+          return
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) { 
+            return
+          } 
+  
+          this.HTTP_POST('Learun/adms/PersonnelManagement/AddressBook/delete', id, '删除失败').then(success => { 
+            if(!success) { return } 
+            this.TOAST('删除成功', 'success') 
+            this.refreshList() 
+          }) 
+          return
+  
+        default: 
+          return
+      } 
+    }, 
+  
+    // 显示列表中的标题项 
+    displayListItem(item, field) { 
+      const fieldItem = this.scheme[field] 
+      const value = item[field] 
+  
+      switch (fieldItem.type) { 
+        case 'currentInfo': 
+        case 'organize': 
+          return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType), `${value}.name`, '') 
+  
+        case 'radio': 
+        case 'select': 
+          const selectItem = this.dataSource[field].find(t => t.value === String(value)) 
+          return get(selectItem, 'text', '') 
+  
+        case 'checkbox': 
+          if (!value || value.split(',').length <= 0) { return '' } 
+          const checkboxItems = value.split(',') 
+          return this.dataSource[field].filter(t => checkboxItems.includes(t.value)).map(t => t.text).join('，') 
+  
+        case 'datetime': 
+          if (!value) { return '' } 
+          return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' : 'YYYY-MM-DD HH:mm') 
+  
+        default: return value === null || value === undefined ? '' : value 
+      } 
+    } 
+  
+  } 
+} 
+</script> 
+  
+  
+<style lang="less" scoped> 
+@import '~@/common/css/sidepage.less'; 
+@import '~@/common/css/customlist.less'; 
+</style> 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/AddressBook/single.vue

@@ -0,0 +1,208 @@
+<template> 
+  <view class="page"> 
+    <view v-if="ready"> 
+      <l-input 
+        @input="setValue('ClassWork.AName', $event)"
+        :value="getValue('ClassWork.AName')"
+        :disabled="!edit"
+        title="姓名"
+      />
+	  <!-- <l-select
+	    @input="setValue('ClassWork.AGender', $event)"
+	    :value="getValue('ClassWork.AGender')"
+	    :disabled="!edit"
+	    :range="dataSource.ClassWork.AGender"
+	    title="性别"
+	  /> -->
+	  <l-input
+	    @input="setValue('ClassWork.AMobile', $event)"
+	    :value="getValue('ClassWork.AMobile')"
+	    :disabled="!edit"
+	    title="手机号"
+	  />
+    </view> 
+  
+    <view v-if="ready" class="bg-white margin-tb padding"  style="padding-top: 0; overflow: hidden;"> 
+      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+        提交保存 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+        编辑本页 
+      </l-button> 
+      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+        取消编辑 
+      </l-button> 
+      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+        删除 
+      </l-button> 
+    </view> 
+  </view> 
+</template> 
+  
+  
+<script> 
+/* 
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-09-02 09:09 
+ * 描  述：考勤记录 
+ */
+  
+/** 
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/LogisticsManagement/ADR_Record/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+  
+import get from 'lodash/get'
+import set from 'lodash/set'
+import moment from 'moment'
+import customPageMixins from '@/common/custompage.js'
+  
+export default { 
+  mixins: [customPageMixins], 
+  
+  data() { 
+    return { 
+      // 页面相关参数 
+      id: null, 
+      mode: null, 
+      edit: null, 
+      ready: false, 
+  
+      // 表单数据 
+      current: {}, 
+      origin: {}, 
+  
+      // 表单项数据结构 
+      scheme: { 
+        ClassWork: { 
+          AName: { type: 'text',verify:'NotNull',title: '姓名', },
+          // AGender: { type: 'select', title: '性别',verify:'TrueOrFalse' }, 
+          AMobile: { type: 'text',title: '手机号', }, 
+        }, 
+  
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        ClassWork: { 
+          AGender: [{value:true,text:"男"},{value:false,text:"女"}], 
+        }, 
+  
+      } 
+    } 
+  }, 
+  
+  async onLoad({ type, id }) { 
+    await this.init(type, id) 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init(type, id) { 
+      this.LOADING('加载数据中...') 
+  
+      this.id = id 
+      this.mode = type 
+      this.edit = ['create', 'edit'].includes(this.mode) 
+  
+      // 拉取表单数据，同时拉取所有来自数据源的选单数据 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchForm() 
+  
+      this.ready = true
+      this.HIDE_LOADING() 
+    }, 
+  
+    // 加载表单数据 
+    async fetchForm() { 
+      if (this.mode === 'create') { 
+        this.origin = await this.getDefaultForm() 
+      } else { 
+        const result = await this.HTTP_GET('Learun/adms/PersonnelManagement/AddressBook/form', this.id) 
+        this.origin = await this.formatFormData(result) 
+      } 
+      this.current = this.COPY(this.origin) 
+    }, 
+  
+    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
+    async action(type) { 
+      switch (type) { 
+        case 'edit': 
+          this.edit = true
+          break
+  
+        case 'reset': 
+          this.current = this.COPY(this.origin) 
+          this.edit = false
+          break
+  
+        case 'save': 
+          const verifyResult = this.verifyForm() 
+          if (verifyResult.length > 0) { 
+            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
+            return
+          } 
+  
+          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('正在提交...') 
+          const postData = await this.getPostData(this.id) 
+  
+          this.HTTP_POST('Learun/adms/PersonnelManagement/AddressBook/save', postData, '表单提交保存失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('LogisticsManagementADR_Record-list-change') 
+            this.NAV_BACK() 
+            this.TOAST('提交保存成功') 
+          }) 
+          break
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
+            return
+          } 
+  
+          this.LOADING('提交删除中...') 
+          this.HTTP_POST('Learun/adms/PersonnelManagement/AddressBook/delete', this.id, '删除失败').then(success => { 
+            this.HIDE_LOADING() 
+            if (!success) { 
+              return
+            } 
+  
+            this.EMIT('LogisticsManagementADR_Record-list-change') 
+            this.NAV_BACK() 
+            this.this.TOAST('删除成功', 'success') 
+          }) 
+          break
+  
+        default: break
+      } 
+    }, 
+  
+    // 获取表单值 
+    getValue(path) { 
+      return get(this.current, path) 
+    }, 
+  
+    // 设置表单值 
+    setValue(path, val) { 
+      set(this.current, path, val) 
+    } 
+  } 
+} 
+</script>