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

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

@@ -226,8 +226,8 @@ export default {
   
     // 点击「清空查询条件」按钮 
     reset() { 
-      this.$refs.datefilter.changeDateRange('all') 
       this.queryData = this.COPY(this.defaultQueryData) 
+      this.$refs.datefilter.changeDateRange('all') 
       // this.searchChange() 
     }, 
   

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

@@ -40,7 +40,20 @@
         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> 
   

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

@@ -42,7 +42,7 @@
             </view> 
   
   
-            <l-customlist-action showEdit @edit="action('edit', item.RFileId)" showDelete @delete="action('delete', item.RFileId)" @view="action('view', item.RFileId)" /> 
+            <l-customlist-action :showEdit="false" @edit="action('edit', item.RFileId)" showDelete @delete="action('delete', item.RFileId)" @view="action('view', item.RFileId)" /> 
           </view> 
         </l-customlist> 
       </l-scroll-list> 
@@ -85,7 +85,7 @@
       </view> 
     </scroll-view> 
   
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   
   </view> 
 </template> 
@@ -242,8 +242,8 @@ this.searchData.ReceiverId=this.GET_GLOBAL('loginUser').userId;
   
     // 点击「清空查询条件」按钮 
     reset() { 
+	  this.queryData = this.COPY(this.defaultQueryData) 
       this.$refs.datefilter.changeDateRange('all') 
-      this.queryData = this.COPY(this.defaultQueryData) 
       // this.searchChange() 
     }, 
   

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

@@ -1,12 +1,19 @@
 <template>
     <view class="page">
         <view v-if="ready">
-            <l-input
+           <l-input
         @input="setValue('Sys_ReceiveFile.Sender', $event)"
         :value="getValue('Sys_ReceiveFile.Sender')"
         :disabled="!edit"
         title="发送人"
       />
+	 <!-- <l-organize-picker
+	    @input="setValue('Sys_ReceiveFile.Sender', $event)"
+	    :value="getValue('Sys_ReceiveFile.Sender')"
+	    :readonly="!edit"
+	    type="user"
+	    title="发送人"
+	  /> -->
             <l-input
         @input="setValue('Sys_ReceiveFile.Title', $event)"
         :value="getValue('Sys_ReceiveFile.Title')"
@@ -26,16 +33,33 @@
         :range="dataSource.Sys_ReceiveFile.SendType"
         title="接收对象"
       />
-            <l-textarea
+         <!--   <l-textarea
         @input="setValue('Sys_ReceiveFile.Contents', $event)"
         :value="getValue('Sys_ReceiveFile.Contents')"
         :disabled="!edit"
         readonly="readonly"
         :range="dataSource.Sys_ReceiveFile.Contents"
         title="内容"
-      />
-          </view
-    >
+      /> -->
+		<view class="bg-white" style="padding: 15px;color: #333333;font-size: 15px;">内容</view>
+		<view class="bg-white" style="padding: 15px;padding-top: 0px;">
+			<u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="getValue('Sys_ReceiveFile.Contents')" noData="暂无内容"></u-parse>
+		</view>
+    </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> 
@@ -151,7 +175,7 @@ export default {
           }
           this.LOADING("正在提交...");
           const postData = await this.getPostData(this.id);
-          adms(
+          this.HTTP_POST(
             "learun/adms/EducationalAdministration/Sys_ReceiveFile/save",
             postData,
             "表单提交保存失败"

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

@@ -2,9 +2,8 @@
   <view class="page"> 
     <!-- 主列表页 --> 
     <view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx;"> 
-      <!-- 顶部条目/分页信息栏 --> 
-	  <!-- sideOpen = true -->
-      <l-customlist-banner @buttonClick="">{{ tips }}</l-customlist-banner> 
+      <!-- 顶部条目/分页信息栏 -->
+      <l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner> 
   
       <!-- 滚动列表，跨端支持上拉/下拉 --> 
       <l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list"> 
@@ -44,8 +43,20 @@
     <!-- 侧边栏，用于设置查询条件 --> 
     <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.keyword"
+			@change="searchChange"
+			title ="值班人"
+			placeholder="按值班人查询"
+		  /> 
         <!-- 重置查询条件按钮 --> 
         <view class="padding-tb"> 
           <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button> 
@@ -114,7 +125,9 @@ export default {
       // 列表与分页信息 
       page: 1, 
       total: 2, 
-      list: [] 
+      list: [] ,
+	  
+	  dateRange:null
     } 
   }, 
   
@@ -186,6 +199,12 @@ export default {
     // 设置搜索条件 
     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)) 
@@ -198,7 +217,8 @@ export default {
     // 点击「清空查询条件」按钮 
     reset() { 
       this.queryData = this.COPY(this.defaultQueryData) 
-      this.searchChange() 
+	  this.$refs.datefilter.changeDateRange('all') 
+      // this.searchChange() 
     }, 
   
     // 点击「编辑」、「查看」、「添加」、「删除」按钮