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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js

@@ -203,15 +203,18 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\">审批中</span>';
                             } else if (cellvalue === 2) {
                                 return '<span class=\"label label-success\">审批通过</span>';
-                            } else {
+                            } else if (cellvalue === 0){
                                 return '<span class=\"label label-default\" >草稿</span>';
+                            } else {
+                                return "<span class=\"label label-danger\">作废</span>";
                             }
                         }
                     }
 
                 ],
                 mainId: 'Id',
-                isPage: true
+                isPage: true,
+                sidx: 'ApplyTime desc, Status desc'
             });
             //page.search();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml

@@ -9,7 +9,7 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="FundsApplyDetail" >
         <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
-        <input id="Number" type="number" class="form-control calcul" isvalid="yes" checkexpession="Num" />
+        <input id="Number" type="number" class="form-control calcul" isvalid="yes" checkexpession="PositiveInteger" />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="FundsApplyDetail" >
         <div class="lr-form-item-title">单价（元）<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/FundsApplyApi.cs

@@ -33,6 +33,7 @@ namespace Learun.Application.WebApi
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
             Post["/submit"] = Submit;
+            Get["/shList"] = GetshList;
         }
         #region 获取数据
 
@@ -71,7 +72,7 @@ namespace Learun.Application.WebApi
             };
             return Success(jsonData);
         }
-        
+
         /// <summary>
         /// 获取申请单号
         /// <summary>
@@ -85,6 +86,24 @@ namespace Learun.Application.WebApi
             };
             return Success(jsonData);
         }
+
+        /// <summary> 
+        /// 获取页面显示列表数据 
+        /// <summary> 
+        /// <param name="_"></param> 
+        /// <returns></returns> 
+        public Response GetshList(dynamic _)
+        {
+            FundsApplyEntity parameter = this.GetReqData<FundsApplyEntity>();
+            var FundsApplyData = fundsApplyIBLL.GetEntityByProcessId(parameter.ProcessId);
+            var FundsApplyDetailData = fundsApplyDetailIBLL.GetListByApplyId(FundsApplyData.Id);
+            var jsonData = new
+            {
+                FundsApply = FundsApplyData,
+                FundsApplyDetail = FundsApplyDetailData,
+            };
+            return Success(jsonData);
+        }
         #endregion
 
         #region 提交数据

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

@@ -1012,6 +1012,13 @@
 				"navigationBarTitleText": "通知公告"
 			}
 		},
+		//经费开支审核
+		{
+			"path": "pages/AssetManagementSystem/Audit_Expenditures/single",
+			"style": {
+				"navigationBarTitleText": "经费开支审核"
+			}
+		},
 		//会议工作管理
 		{
 			"path": "pages/PersonnelManagement/MeetingManagement/list",

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue

@@ -0,0 +1,345 @@
+<template>
+  <view id="notice" class="page">
+    <!-- 顶部页签 -->
+    <l-nav v-model="tab" :items="['表单信息', '流程信息']" type="flex" class="solid-bottom" />
+	<view v-if="ready && tab == 0">
+	  <!-- <l-input v-model="formData.FundsApply.ApplyUser"  title="填报人" disabled></l-input> -->
+	  <l-select v-model="formData.FundsApply.ApplyUser" :range="dataSource.ApplyUser" title="填报人" disabled></l-select>
+	  <l-select v-model="formData.FundsApply.ApplyDept" :range="dataSource.ApplyDept" title="申报部门" disabled></l-select>
+	  <l-input v-model="formData.FundsApply.ApplyTime" title="时间" disabled></l-input>
+	  <!-- <l-select v-model="formData.FundsApply.IsFixedAssets" :range="dataSource.IsFixedAssets"  title="固定资产" disabled></l-select> -->
+	  <l-input :value="IsFixedAssetsitem(formData.FundsApply.IsFixedAssets)" title="固定资产" disabled></l-input>
+	  <l-textarea v-model="formData.FundsApply.Remark" title="备注" readonly/>
+	  <l-input v-model="formData.FundsApply.SumAmount" title="总金额" disabled></l-input>
+	  <l-input v-model="formData.FundsApply.UpperAmount" title="人民币大写" disabled></l-input>
+	 
+	 
+	 <view class="welT" style="padding-top: 10px;">
+	 	明细
+	 </view>
+	 
+	 <view class="welBox" id="StuInfoFreshEmergePeople" v-show="FundsApplyDetail.length != 0">
+	 	<view class="welCon" v-for="(item, i) in FundsApplyDetail" :key='i'>
+	 		<l-input v-model="item.ProjectContent" title="项目内容" placeholder="请填写" disabled right />
+	 		<l-input v-model="item.Number" type="number" @change="SumAmountChange(item)" title="数量" disabled  placeholder="请填写" right />
+	 		<l-input v-model="item.Price" type="number" @change="SumAmountChange(item)" title="单价（元）" disabled placeholder="请填写" right />
+	 		<l-input v-model="item.Amount" title="金额（元）" disabled placeholder="请填写" right />
+	 	</view>
+	 </view>
+	 
+	 
+		
+	 
+	 
+	 
+	 
+	  <l-workflow-action
+	    @audit="audit"
+	    @action="action"
+	    :type="type"
+	    :currentNode="currentNode"
+	    :currentTask="currentTask"
+	  />
+	</view>
+	<view v-if="ready && tab == 1" class="progress"><l-workflow-timeline :processList="processList" /></view>
+    <!-- <view class="padding-sm text-grey notice-info">
+      <view class="text-right">本页内容发布于 {{ time }}</view>
+      <view class="text-right">{{ date }}</view>
+    </view> -->
+  </view>
+</template>
+
+<script>
+import moment from 'moment'
+import workflowFormMixins from '@/pages/nworkflow/workflow.js'
+
+export default {
+  mixins: [workflowFormMixins],
+  data() {
+    return {
+	  tab:0,
+	  type:'view',
+	  currentNode:null,
+	  currentTask:null,
+	  taskId:'',
+	  processId:'',
+	  processInfo:null,
+	  processList:[],
+	  formData:{},
+      ready: false,
+      content: '',
+	  
+      time: '',
+      date: '',
+	  fileList:[],
+	  
+	  // 数据源
+	  dataSource: {
+		ApplyDept: [],
+		ApplyUser: [],
+		IsFixedAssets: []
+	  },
+	  
+	  FundsApplyDetail: [],
+	  FundsApplyDetails: {
+	  	ProjectContent: '',
+	  	Number: '',
+	  	Price: '',
+	  	Amount: ''
+	  },
+	  
+	  
+    }
+  },
+
+  async onLoad({type}) {
+    await this.init(type)
+  },
+
+  methods: {
+    async init(type) {
+	  if(type){this.type = type}
+	  
+	  
+	  await Promise.all([
+	  	this.FETCH_DATASOURCE('classdata').then(result => {
+	  		this.dataSource.ApplyDept = result.data.map(t => ({
+	  			text: t.name,
+	  			value: t.id
+	  		}));
+	  	}),
+	  	this.FETCH_DATASOURCE('teacheruserdata').then(result => {
+	  		this.dataSource.ApplyUser = result.data.map(t => ({
+	  			text: t.f_realname,
+	  			value: t.f_userid
+	  		}));
+	  	}),
+		this.dataSource.IsFixedAssets = Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({
+			value: t.value,
+			text: t.text
+		}))
+		
+	  ])
+	  
+	  console.log(this.dataSource.IsFixedAssets)
+      this.LOADING('加载中…')
+      const noticeItem = this.GET_PARAM()
+	  this.processList = noticeItem.logList
+	  this.currentNode = noticeItem.currentNode
+	  this.currentTask = noticeItem.currentTask
+	  this.processInfo = noticeItem.processInfo
+	  this.taskId = this.currentTask.F_TaskId
+	  this.processId = this.currentTask.F_Id
+	  this.formValue = noticeItem.formValue
+	  this.scheme = noticeItem.scheme
+	  console.log(this.processList[0].F_ProcessId)
+	  await this.getFormData(this.processList[0].F_ProcessId)
+	  this.HIDE_LOADING();
+	  
+      // this.content = this.CONVERT_HTML(noticeItem.f_content)
+
+      // this.time = moment(noticeItem.f_time).format('HH : mm')
+      // this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日')
+      // this.SET_TITLE(noticeItem.f_title)
+      // this.HIDE_LOADING()
+    },
+	// 获取表单数据
+	getFormData(ProcessId){
+		return this.HTTP_GET("learun/adms/FundsApply/shList",{ProcessId},"加载数据时出错").then(async res=>{
+			if(res){
+				// res.F_SourceName =  res.F_SourceName&&this.GET_GLOBAL('department')[res.F_SourceName]? this.GET_GLOBAL('department')[res.F_SourceName].name : res.F_SourceName
+				this.formData = res
+				this.FundsApplyDetail = res.FundsApplyDetail
+				let fileList = await this.getFileListById(res.F_NewsImage)
+				if(fileList&&fileList.length){
+					this.fileList = [fileList[0]]
+				}
+				this.content = res.F_NewsContent
+				this.ready = true
+			}
+		})
+	},
+	
+	// 点击审批相关按钮
+	async audit(action) {
+	  this.LOADING('加载中…')
+	  const currentTask = this.processInfo.task.find(t => t.F_NodeId === this.currentNode.id)
+	  const postData = await this.getPostData(this.formValue, this.scheme)
+	  const pageParam = {
+	    type: 'sign',
+	    processId: currentTask.F_ProcessId,
+	    taskId: currentTask.F_Id,
+	    formreq: postData.formreq,
+	    taskName: this.currentTask.F_Title,
+		currentNode:this.currentNode,
+		code:this.code||''
+	  }
+	  // 不是加签
+	  if (action.code !== '__sign__') {
+	    Object.assign(pageParam, action)
+	    pageParam.type = 'verify'
+	    pageParam.auditors = JSON.stringify({})
+	    pageParam.isFromSignAudit = Number(this.currentTask.F_TaskType) === 3
+	  }
+	  this.HIDE_LOADING()
+	  this.NAV_TO('/pages/nworkflow/myflow/sign', pageParam, true)
+	},
+	// 点击操作按钮（非审批类按钮）
+	async action(taskType) {
+	  switch (taskType) {
+	    // 点击「催办」/「撤销流程」/「标记已阅」按钮
+	    case 'urge':
+	    case 'revoke':
+	    case 'refer':
+	      const actionText = { urge: '催办', revoke: '撤销', refer: '已阅' }[taskType]
+	      const actionUrl = { urge: '/urge', revoke: '/revoke', refer: '/refer' }[taskType]
+	      
+	      let actionData = this.processId
+	      if (taskType === 'refer') {
+	        actionData = { processId: this.processId, taskId: this.taskId }
+	      }
+	
+	      if (!(await this.CONFIRM(`${actionText}确认`, `确定要提交${actionText}吗？`, true))) {
+	        return
+	      }
+	      this.LOADING(`提交${actionText}中…`)
+	      this.HTTP_POST(`/newwf${actionUrl}`, actionData, `提交${actionText}失败`).then(success => {
+	        this.HIDE_LOADING()
+	        if (success) {
+	          this.EMIT('task-list-change')
+	          this.TOAST(`成功提交${actionText}`, 'success')
+	          if (taskType === 'revoke') {
+	            this.NAV_BACK()
+	          }
+	        }
+	      })
+	      break
+	    // 点击「提交草稿」按钮
+	    case 'draft':
+		  this.CONFIRM('不支持此操作')
+		  return
+	      if (!(await this.CONFIRM('提交确认', '确定要提交草稿吗？', true))) {
+	        return
+	      }
+	      this.LOADING('正在提交…')
+	      const draftFormValue = this.$refs.form.getFormValue()
+	      const draftPostData = await this.getPostData(draftFormValue, this.scheme)
+	      this.HTTP_POST('/newwf​/draft', draftPostData, '提交草稿失败').then(success => {
+	        this.HIDE_LOADING()
+	        if (success) {
+	          this.EMIT('task-list-change')
+	          this.NAV_BACK()
+	          this.TOAST('草稿已保存', 'success')
+	        }
+	      })
+	      break
+	    // 点击「发起流程」按钮
+	    case 'submit':
+		  this.CONFIRM('不支持此操作')
+		  return
+	      const verifyResult = this.$refs.form.verifyValue()
+	      if (verifyResult.length > 0) {
+	        this.CONFIRM('表单验证失败', verifyResult.join('\n'))
+	        return
+	      }
+	      if (!(await this.CONFIRM('提交确认', '确定要发起流程吗？', true))) {
+	        return
+	      }
+	      this.LOADING('正在提交…')
+	      const formValue = this.$refs.form.getFormValue()
+	      const postData = await this.getPostData(formValue, this.scheme)
+	      postData.auditors = JSON.stringify({})
+	
+	      if (this.type === 'child') {
+	        postData.parentProcessId = this.processId
+	        postData.parentTaskId = this.taskId
+	      }
+	      const errorTips = '流程发起失败'
+	      this.HTTP_POST('/newwf/createchildflow', postData, errorTips).then(success => {
+	        this.HIDE_LOADING()
+	        if (success) {
+	          this.EMIT('task-list-change')
+	          this.NAV_BACK()
+	          this.TOAST('流程发起成功', 'success')
+	        }
+	      })
+	      break
+	    default:
+	      break
+	  }
+	},
+	IsFixedAssetsitem(data){
+		if(data == 0){
+			return '否'
+		}else{
+			return '是'
+		}
+	}
+  }
+}
+</script>
+
+<style lang="less" scoped>
+	.welT {
+		font-size: 16px;
+		line-height: 26px;
+		padding: 0 12px;
+		background-color: #ffffff;
+		padding-bottom: 12px;
+	}
+
+	.welT text {
+		width: 26px;
+		height: 26px;
+		line-height: 24px;
+		border: 1px solid #efefef;
+		border-radius: 4px;
+		float: right;
+		text-align: center;
+		color: #999;
+	}
+
+	.welBox {
+		// margin-top: 10px;
+	}
+
+	.welCon {
+		padding: 10px;
+		border: 1px solid #efefef;
+		padding-top: 18px;
+		border-radius: 4px;
+		position: relative;
+		// background-color: #ffffff;
+		margin-top: 15px;
+	}
+
+	.welDel {
+		border-radius: 50%;
+		position: absolute;
+		top: 4px;
+		left: 0px;
+		background: #fff;
+	}
+
+	.welDel text {
+		text-align: center;
+		width: 26px;
+		height: 26px;
+		display: block;
+		line-height: 24px;
+		border: 1px solid #efefef;
+		border-radius: 50%;
+	}
+
+	.welImgAdd {
+		text-align: center;
+		line-height: 0;
+	}
+
+	.passwordDes {
+		color: #606266;
+		font-size: 14px;
+		padding: 8px;
+		text-indent: 2em;
+	}
+</style>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue

@@ -31,9 +31,9 @@
 
 		<view class="welBox" id="StuInfoFreshEmergePeople" v-show="FundsApplyDetail.length != 0">
 			<view class="welCon" v-for="(item, i) in FundsApplyDetail" :key='i'>
-				<l-input v-model="item.ProjectContent" title="项目内容" placeholder="请填写" right />
-				<l-input v-model="item.Number" @change="SumAmountChange(item)" title="数量" placeholder="请填写" right />
-				<l-input v-model="item.Price" @change="SumAmountChange(item)" title="单价（元）" placeholder="请填写" right />
+				<l-input v-model="item.ProjectContent" title="项目内容" placeholder="请填写" right :disabled="!edit" />
+				<l-input v-model="item.Number" type="number" @change="SumAmountChange(item)" title="数量" :disabled="!edit" placeholder="请填写" right />
+				<l-input v-model="item.Price" type="number" @change="SumAmountChange(item)" title="单价（元）" :disabled="!edit" placeholder="请填写" right />
 				<l-input v-model="item.Amount" title="金额（元）" disabled placeholder="请填写" right />
 				<view v-if="edit||create" class="welDel" @click="del('FundsApplyDetails', i)"><text
 						class="text-xxl cuIcon cuIcon-move"></text></view>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue

@@ -33,7 +33,7 @@
       </view>
     </template>
 
-    <l-textarea v-model="remark" :placeholder="`输入${typeText}意见`" title="审核意见：" />
+    <l-textarea v-model="remark" :placeholder="`输入${typeText}意见`" title="审核意见：" required />
 	
 	<!-- 弹层 -->
 	<l-modal v-model="modal" @close="reviewer = ''" title="指派审核人">
@@ -142,7 +142,12 @@ export default {
         this.CONFIRM('请补全必填项', '必须指定一个加签用户')
         return
       }
-
+		
+		if(!this.remark){
+			this.TOAST(`请签署审批意见`)
+			return false;	 
+		}
+		
       const postData = {
         operationCode: this.taskParam.code,
         operationName: this.taskParam.name,
@@ -254,7 +259,11 @@ export default {
 		}
 					
 	  }
-
+	
+	
+	 
+	
+	
       const success = await this.HTTP_POST(
         this.type === 'sign' ? 'learun/adms/newwf/sign' : 'learun/adms/newwf/audit',
         postData,