Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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

@@ -1,3 +1,4 @@
+import { conforms, reject } from 'lodash'
 import get from 'lodash/get'
 import omit from 'lodash/omit'
 import moment from 'moment'
@@ -30,12 +31,13 @@ export default {
   methods: {
     // 获取表单默认值
     async getDefaultForm() {
+	  
       const result = {}
       for (const [tableName, tableItem] of Object.entries(this.scheme)) {
         const itemData = {}
         for (const [fieldName, scheme] of Object.entries(tableItem)) {
           if (fieldName !== '__GIRDTABLE__') {
-            itemData[fieldName] = await this.getDefaultValue(`${tableName}.${fieldName}`, scheme)
+            itemData[fieldName] = await this.getDefaultValue(`${tableName}.${fieldName}`, scheme,tableName,fieldName)
           }
         }
         result[tableName] = '__GIRDTABLE__' in tableItem ? [itemData] : itemData
@@ -45,7 +47,7 @@ export default {
     },
 
     // 获取单条表单项的默认值
-    async getDefaultValue(path, schemeItem) {
+    async getDefaultValue(path, schemeItem,tableName,fieldName) {
       switch (schemeItem.type) {
         case 'keyValue':
           return this.processId
@@ -91,6 +93,19 @@ export default {
           return result || ''
 
         case 'upload':
+			let folderIds = {}
+			let getstData = uni.getStorageSync('folderIds');
+			if(getstData){
+			  folderIds = JSON.parse(getstData)
+			}
+			if(folderIds[tableName]){
+			   folderIds[tableName][fieldName] = ''
+			}else{
+			   let obj = {}
+			   obj[fieldName] = ''
+			   folderIds[tableName] = obj
+			}
+			uni.setStorageSync('folderIds',JSON.stringify(folderIds));
           return []
 
         case 'guid':
@@ -103,6 +118,7 @@ export default {
 
     // 验证表单项输入是否正确，返回一个包含所有错误信息的数组
     verifyForm() {
+		console.log(this.scheme)
       const result = []
       Object.entries(this.scheme).forEach(([tableName, tableItem]) => {
         if ('__GIRDTABLE__' in tableItem) {
@@ -149,7 +165,7 @@ export default {
             const tableObj = {}
             for (const [fieldName, scheme] of Object.entries(tableItem)) {
               if (fieldName === '__GIRDTABLE__') { continue }
-              tableObj[fieldName] = await this.convertToPostData(scheme, tableValue[fieldName])
+              tableObj[fieldName] = await this.convertToPostData(scheme, tableValue[fieldName],tableName,fieldName)
             }
             tableArray.push(tableObj)
           }
@@ -159,7 +175,7 @@ export default {
           // 主表
           const strEntity = {}
           for (const [fieldName, scheme] of Object.entries(tableItem)) {
-            strEntity[fieldName] = await this.convertToPostData(scheme, this.current[tableName][fieldName])
+            strEntity[fieldName] = await this.convertToPostData(scheme, this.current[tableName][fieldName],tableName,fieldName)
           }
           result['strEntity'] = JSON.stringify(strEntity)
         }
@@ -171,9 +187,17 @@ export default {
 
       return result
     },
+	
+	newguid() {
+		return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+			var r = Math.random() * 16 | 0,
+				v = c == 'x' ? r : (r & 0x3 | 0x8);
+			return v.toString(16);
+		});
+	},
 
     // 将单项表单数据转为 post 数据（提交时使用）
-    async convertToPostData(scheme, val) {
+    async convertToPostData(scheme, val,tableName,fieldName) {
       switch (scheme.type) {
         case 'checkbox':
           return val ? val.join(',') : ''
@@ -191,37 +215,51 @@ export default {
           return val ? moment(val).format('YYYY-MM-DD HH:mm') : ''
 
         case 'upload':
-          // const uploadUid = []
-          // for (const entity of val) {
-          //   if (entity.uid) {
-          //     uploadUid.push(entity.uid)
-          //     continue
-          //   } else {
-
-          //     const fileId = await this.HTTP_UPLOAD(entity)
-          //     if (fileId) {
-          //       uploadUid.push(fileId)
-          //     }
-          //   }
-
-          // }
-
-          // return uploadUid.join(',')
+    //       let uploadUid = []
+		  // console.log(val)
+    //       for (const entity of val) {
+    //         if (entity.uid) {
+    //           uploadUid.push(entity.uid)
+    //           continue
+    //         } else {
+
+    //           const fileId = await this.HTTP_UPLOAD(entity)
+			 //  console.log(fileId)
+    //           if (fileId) {
+    //             uploadUid.push(fileId)
+    //           }
+    //         }
+
+    //       }
 		  
+		  // console.log(uploadUid.join(','))
+		  // reject()
+    //       return uploadUid.join(',')
+	
 		  var uploadUid = '';
 		  
+		  let folderIds = uni.getStorageSync('folderIds');
+		  if(folderIds){
+			  folderIds = JSON.parse(folderIds)
+			  if(folderIds[tableName]&&folderIds[tableName][fieldName]){
+			  	uploadUid = folderIds[tableName][fieldName]
+			  }
+		  }
+		  if(!uploadUid){
+			uploadUid = this.newguid()
+		  }
+		  
 		  for (const item of val) {
 		  	if (item.uid) {
-		  		uploadUid = item.uid
+		  		// uploadUid = item.uid
 		  		continue
 		  	}
-		  
-		  	const fileId = await this.HTTP_UPLOAD(item.path || item, undefined, guid || '')
+			
+		  	const fileId = await this.HTTP_UPLOAD(item.path || item, undefined, uploadUid)
 		  	if (fileId) {
 		  		uploadUid = fileId;
 		  	}
 		  }
-		  
 		  return uploadUid;
 
         default:
@@ -243,13 +281,13 @@ export default {
             for (const [fieldName, scheme] of Object.entries(schemeItem)) {
               if (fieldName === '__GIRDTABLE__') { continue }
               const dataSource = get(this.dataSource, `${tableName}.${fieldName}`)
-              tableValue[fieldName] = await this.convertToFormValue(scheme, tableValue[fieldName], dataSource)
+              tableValue[fieldName] = await this.convertToFormValue(scheme, tableValue[fieldName], dataSource,tableName,fieldName)
             }
           }
         } else {
           for (const [fieldName, scheme] of Object.entries(schemeItem)) {
             const dataSource = get(this.dataSource, `${tableName}.${fieldName}`)
-            data[tableName][fieldName] = await this.convertToFormValue(scheme, data[tableName][fieldName], dataSource)
+            data[tableName][fieldName] = await this.convertToFormValue(scheme, data[tableName][fieldName], dataSource,tableName,fieldName)
           }
         }
       }
@@ -258,7 +296,7 @@ export default {
     },
 
     // 将单项表单数据格式化（拉取时使用）
-    async convertToFormValue(scheme, val, dataSource) {
+    async convertToFormValue(scheme, val, dataSource,tableName,fieldName) {
       switch (scheme.type) {
         case 'upload':
    //        if (!val) { return [] }
@@ -277,6 +315,20 @@ export default {
    //          fileList.push({ path, type: fileType, uid, size: fileSize, name:fileName })
    //        }
    //        return fileList
+           let folderIds = {}
+		   let getstData = uni.getStorageSync('folderIds');
+		   if(getstData){
+			  folderIds = JSON.parse(getstData)
+		   }
+		   if(folderIds[tableName]){
+			   folderIds[tableName][fieldName] = val
+		   }else{
+			   let obj = {}
+			   obj[fieldName] = val
+			   folderIds[tableName] = obj
+		   }
+           uni.setStorageSync('folderIds',JSON.stringify(folderIds));
+		   
 		   if (!val) {
 			return []
 		   }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue

@@ -7,7 +7,12 @@
 
   <!-- #ifndef MP-DINGTALK -->
   <l-label @click="click" :arrow="!readonly" :required="required" :title="title">
-    {{ display || displayPlaceholder }}
+    <!-- {{ display || displayPlaceholder }} -->
+	<view style="white-space: normal;min-height: 54px;display: flex;align-items: center;justify-content: right;">
+		<view style="line-height: 24px;">
+			{{ display || displayPlaceholder }}
+		</view>
+	</view>
   </l-label>
   <!-- #endif -->
 </template>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-single-item.vue

@@ -10,32 +10,80 @@
     ></image>
 
     <!-- 名称 -->
-    <text class="tree-item-title">{{ item.name }}</text>
+    <text class="tree-item-title">{{ item.name + (item.mobile ? '(' +item.mobile + ')' : "")  }}</text>
 
     <!-- 用户标签 -->
     <l-tag :line="tagColor" size="sm" class="margin-left-sm">{{ tagName }}</l-tag>
+	
+	<uni-view v-if="item.type === 'user' && item.mobile" class="margin-left-sm sm line-gray cu-tag" style="z-index: 1;" @tap="copy(item.mobile)">复制</uni-view>
 
     <!-- 如果开启选择按钮显示，并且级别符合，则显示按钮 -->
     <view v-if="button" class="tree-item-action">
-      <l-button @click="$emit('buttonClick', item)" line="green" size="sm">选择</l-button>
+	  <l-button v-if="!selectIds.includes(item.id)" @click="itemClick(item)" line="green" size="sm">选择</l-button>
+	  <l-button v-else @click="itemClick(item)" line="blue" size="sm">取消选择</l-button>
     </view>
   </view>
 </template>
 
 <script>
+import uniCopy from "@/common/js/uni-copy.js"
 export default {
   name: 'l-organize-single-item',
 
   props: {
     item: {},
-    button: {}
+    button: {},
+	value:{},
+  },
+  
+  data(){
+	  return{
+		selectIds:[],
+	  }
+  },
+  
+  created() {
+  	this.init()
   },
 
   methods: {
+	init(){
+		if(this.value){
+			this.selectIds = this.value.split(",")
+		}
+	},
     // 点击事件
     click(e) {
       this.$emit('click', e)
-    }
+    },
+	itemClick(root){
+		if(this.selectIds.indexOf(root.id) !== -1){
+			this.selectIds.splice(this.selectIds.indexOf(root.id),1)
+		}else{
+			this.selectIds.push(root.id)
+		}
+		this.$emit('buttonClick', root)
+	},
+	
+	copy(mobile){
+		uniCopy({
+			content:mobile,
+			success:(res)=>{
+				uni.showToast({
+					title: "复制手机号成功~",
+					icon: 'none',
+					duration:3000,
+				})
+			},
+			error:(e)=>{
+				uni.showToast({
+					title: e,
+					icon: 'none',
+					duration:3000,
+				})
+			}
+		})
+	}
   },
 
   computed: {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="page">
     <!-- 主列表页 -->
     <view
@@ -41,33 +41,38 @@
               {{ displayListItem(item, "EndTime") }}
             </view>
 
-            <view class="customlist-item-field">
+           <!-- <view class="customlist-item-field">
               <text class="customlist-item-field-title">申请人：</text>
               {{ displayListItem(item, "CreateUser") }}
-            </view>
-
-            <view class="customlist-item-field">
+            </view> -->
+			
+			<view class="customlist-item-field">
+			  <text class="customlist-item-field-title">会议状态：</text>
+			  {{ displayListItem(item, "CheckStatus") }}
+			</view>
+
+          <!--  <view class="customlist-item-field">
               <text class="customlist-item-field-title">会议记录者：</text>
               {{ displayListItem(item, "RecordPerson") }}
-            </view>
+            </view> -->
 
-            <view class="customlist-item-field">
+         <!--   <view class="customlist-item-field">
               <text class="customlist-item-field-title">会议内容：</text>
               {{ displayListItem(item, "Content") }}
-            </view>
+            </view> -->
 
-            <view class="customlist-item-field">
+          <!--  <view class="customlist-item-field">
               <text class="customlist-item-field-title">附件上传：</text>
               {{ displayListItem(item, "Files") }}
-            </view>
+            </view> -->
 
+              <!-- showButton
+              buttonText="会议纪要" -->
             <l-customlist-action
-              showButton
-              buttonText="会议纪要"
               @join="action('join', item.Id)"
-              showEdit
+              :showEdit="item.CheckStatus=='0'"
               @edit="action('edit', item.Id)"
-              showDelete
+              :showDelete="item.CheckStatus=='0'"
               @delete="action('delete', item.Id)"
               @view="action('view', item.Id)"
             />
@@ -153,12 +158,13 @@ export default {
       scheme: {
         MeetingTitle: { type: "text" },
         MeetingPlace: { type: "select", dataSource: "0" },
-        BeginTime: { type: "datetime", dateformat: "0" },
-        EndTime: { type: "datetime", dateformat: "0" },
+        BeginTime: { type: "datetime", dateformat: "1" },
+        EndTime: { type: "datetime", dateformat: "1" },
         RecordPerson: { type: "organize", dataType: "user" },
         Content: { type: "texteditor" },
         Files: { type: "upload" },
-        CreateUser: { type: "organize", dataType: "user" },
+        // CreateUser: { type: "organize", dataType: "user" },
+		CheckStatus:{ type: "select"},
       },
 
       // 查询条件
@@ -167,12 +173,30 @@ export default {
       queryData: {
         MeetingTitle: "",
         MeetingPlace: "",
-        CreateUser: "",
+        // CreateUser: "",
       },
 
       // 数据源
       dataSource: {
         MeetingPlace: [],
+		CheckStatus:[
+		  {
+			value:'0',
+			text:"未审核"
+		  },
+		  {
+			value:'1',
+			text:"已通过"
+		  },
+		  {
+			value:'2',
+			text:"未通过"
+		  },
+		  {
+			value:'3',
+			text:"审核中"
+		  },
+		]
       },
 
       // 页面相关参数
@@ -204,7 +228,11 @@ export default {
       );
 
       // 拉取加载列表和数据源
-      await Promise.all([() => {}]);
+      await Promise.all([
+		  this.FETCH_DATASOURCE('ConferenceRoom').then(result => {
+		    this.dataSource.MeetingPlace = result.data.map(t => ({ text: t.name, value: t.id }))
+		  }),
+	  ]);
       await this.fetchList();
       // 初始化查询条件
       this.defaultQueryData = this.COPY(this.queryData);
@@ -212,7 +240,7 @@ export default {
     },
 
     // 拉取列表
-    async fetchList() {
+    async fetchList(isConcat=true) {
       if (this.page > this.total) {
         return;
       }
@@ -222,7 +250,7 @@ export default {
         {
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序)
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序
-          pagination: { rows: 10, page: this.page, sidx: "Id", sord: "DESC" },
+          pagination: { rows: 10, page: this.page, sidx: "CreateTime", sord: "DESC" },
           queryJson: JSON.stringify(this.searchData),
         },
         "加载数据时出错"
@@ -234,7 +262,7 @@ export default {
 
       this.total = result.total;
       this.page = result.page + 1;
-      this.list = this.list.concat(result.rows);
+      this.list = isConcat?this.list.concat(result.rows):result.rows;
 
       this.tips = `已加载 ${Math.min(result.page, result.total)} / ${
         result.total
@@ -244,12 +272,12 @@ export default {
     },
 
     // 刷新清空列表
-    async refreshList() {
+    async refreshList(isConcat=true) {
       this.page = 1;
       this.total = 2;
       this.list = [];
 
-      await this.fetchList();
+      await this.fetchList(isConcat);
     },
 
     // 列表下拉
@@ -273,7 +301,7 @@ export default {
       );
 
       this.searchData = result;
-      await this.refreshList();
+      await this.refreshList(false);
     },
 
     // 点击「清空查询条件」按钮

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="page">
     <view v-if="ready">
       <l-input
@@ -14,18 +14,45 @@
         :range="dataSource.MeetingManagement.MeetingPlace"
         title="会议地点"
       />
-      <l-date-picker
+      <l-datetime-picker
         @input="setValue('MeetingManagement.BeginTime', $event)"
         :value="getValue('MeetingManagement.BeginTime')"
         :disabled="!edit"
         title="开始时间"
       />
-      <l-date-picker
+      <l-datetime-picker
         @input="setValue('MeetingManagement.EndTime', $event)"
         :value="getValue('MeetingManagement.EndTime')"
         :disabled="!edit"
         title="结束时间"
       />
+      <!-- <l-organize-picker
+        @input="setValue('MeetingManagement.CreateUser', $event)"
+        :value="getValue('MeetingManagement.CreateUser')"
+        :readonly="!edit"
+        type="user"
+        title="申请人"
+      /> -->
+	  <l-input
+	    @input="setValue('MeetingManagement.Linkman', $event)"
+	    :value="getValue('MeetingManagement.Linkman')"
+	    :readonly="!edit"
+	    title="联系人"
+	  />
+	  <l-input
+	    @input="setValue('MeetingManagement.LinkPhone', $event)"
+	    :value="getValue('MeetingManagement.LinkPhone')"
+	    :readonly="!edit"
+	    title="联系方式"
+	  />
+	  <l-organize-picker
+	    @input="setValue('MeetingManagement.InternalParticipants', $event)"
+	    :value="getValue('MeetingManagement.InternalParticipants')"
+	    :readonly="!edit"
+	    type="user"
+	    title="参会人员"
+	  	multiple
+	  />
       <l-organize-picker
         @input="setValue('MeetingManagement.RecordPerson', $event)"
         :value="getValue('MeetingManagement.RecordPerson')"
@@ -46,18 +73,11 @@
         :number="9"
         title="附件上传"
       />
-      <l-organize-picker
-        @input="setValue('MeetingManagement.CreateUser', $event)"
-        :value="getValue('MeetingManagement.CreateUser')"
-        :readonly="!edit"
-        type="user"
-        title="申请人"
-      />
     </view>
 
-    <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
+    <view v-if="ready&&(origin.MeetingManagement.CheckStatus=='0'||edit)" 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>
         编辑本页
@@ -114,14 +134,17 @@ export default {
       // 表单项数据结构
       scheme: {
         MeetingManagement: {
-          MeetingTitle: { type: 'text', title: '会议主题' },
-          MeetingPlace: { type: 'select', title: '会议地点', dataSource: '0' },
-          BeginTime: { type: 'datetime', title: '开始时间', dateformat: '0' },
-          EndTime: { type: 'datetime', title: '结束时间', dateformat: '0' },
+          MeetingTitle: { type: 'text', title: '会议主题' ,verify:"NotNull"},
+          MeetingPlace: { type: 'select', title: '会议地点', dataSource: '0',verify:"NotNull" },
+          BeginTime: { type: 'datetime', title: '开始时间', dateformat: '1',verify:"NotNull"  },
+          EndTime: { type: 'datetime', title: '结束时间', dateformat: '1',verify:"NotNull"  },
+		  InternalParticipants: { type: 'organize', title: '参会人员', dataType: 'user',verify:"NotNull" },
           RecordPerson: { type: 'organize', title: '会议记录者', dataType: 'user' },
-          Content: { type: 'texteditor', title: '会议内容' },
+          Content: { type: 'texteditor', title: '会议内容',verify:"NotNull" },
+		  Linkman: { type: 'text', title: '联系人',verify:"NotNull" },
+		  LinkPhone: { type: 'text', title: '联系方式',verify:"Mobile" },
           Files: { type: 'upload', title: '附件上传' },
-          CreateUser: { type: 'organize', title: '申请人', dataType: 'user' },
+          // CreateUser: { type: 'organize', title: '申请人', dataType: 'user',verify:"NotNull"  },
         },
 
       },
@@ -151,9 +174,9 @@ export default {
 
       // 拉取表单数据，同时拉取所有来自数据源的选单数据
       await Promise.all([
-
-
-        () => {}
+		  this.FETCH_DATASOURCE('ConferenceRoom').then(result => {
+		    this.dataSource.MeetingManagement.MeetingPlace = result.data.map(t => ({ text: t.name, value: t.id }))
+		  }),
       ])
       await this.fetchForm()
 
@@ -165,9 +188,11 @@ export default {
     async fetchForm() {
       if (this.mode === 'create') {
         this.origin = await this.getDefaultForm()
+		console.log(this.origin)
       } else {
         const result = await this.HTTP_GET('learun/adms/PersonnelManagement/MeetingManagement/form', this.id)
         this.origin = await this.formatFormData(result)
+		console.log(this.origin)
       }
       this.current = this.COPY(this.origin)
     },

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue

@@ -2,24 +2,28 @@
   <view id="contact" class="page">
     <!-- 顶部搜索栏 -->
 	<view class="topSearch">
-		<l-banner v-model="searchText" :placeholder="placeholder" type="search" noSearchButton fill fixed />
-		<view class="">
+		<!-- <view style="padding-top: 54px;"> -->
+			<l-banner v-model="searchText" :placeholder="placeholder" type="search" noSearchButton fill />
+		<!-- </view> -->
+		<view>
 			<view class="pearson">
 				已选择人员：{{names||'暂无'}}
 			</view>
 			<view style="display: flex;justify-content: center;">
-				<view class="cu-btn sm line-green" @tap="itemConfirm" style="font-size: 16px;">
+				<view class="cu-btn sm line-red" @tap="itemClear" style="font-size: 16px;margin: 4px;">
+					清空选择
+				</view>
+				<view class="cu-btn sm line-green" @tap="itemConfirm" style="font-size: 16px;margin: 4px;">
 					确定选择
 				</view>
 			</view>
 		</view>
-		
 	</view>
 
     <!-- 树形列表 -->
-    <l-organize-tree v-if="type && !searchText" @buttonClick="itemClick" :level="type" :root="root" button :value="ids" />
+    <l-organize-tree v-if="type && !searchText && refreshFlag" @buttonClick="itemClick" :level="type" :root="root" button :value="ids" />
     <!-- 如果用户输入了搜索关键字，只列出用户 -->
-    <view v-else-if="type" class="user-item-list">
+    <view v-else-if="type && refreshFlag" class="user-item-list">
       <l-organize-single-item v-for="item of searchList" @buttonClick="itemClick" :key="item.id" :item="item" button :value="ids" />
     </view>
   </view>
@@ -36,6 +40,7 @@ export default {
       root: { type: 'company', id: '0' },
 	  items:[],
 	  ids:'',
+	  refreshFlag:true,
     }
   },
 
@@ -89,10 +94,20 @@ export default {
 		}
 		return arr
 	},
+	
+	itemClear(){
+		this.items = []
+		this.ids = ''
+		this.refreshFlag = false
+		this.$nextTick(()=>{
+			this.refreshFlag = true
+		})
+	},
 
     // 某一项被点击，触发事件
     itemClick(item) {
 	  this.items = this.findItem(this.items,item)
+	  this.ids = this.items.map(t=>t.id).toString()
       // this.EMIT('select-organize', item)
       // this.NAV_BACK()
     },
@@ -129,13 +144,14 @@ export default {
 </script>
 
 <style lang="scss">
-page {
-  padding-top: 100rpx;
-}
+// page {
+//   padding-top: 100rpx;
+// }
 .topSearch{
 	.pearson{
 		color: #606266;
 		line-height: 32px;
+		padding: 6px 8px;
 	}
 }
 </style>