From 7dc69894ea89eb237351706c375d20f3c88a7a17 Mon Sep 17 00:00:00 2001
From: lb01 <Vimicro@lb>
Date: Fri, 2 Dec 2022 17:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E5=BC=80=E6=94=AF=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=B7=BB=E5=8A=A0=E5=AD=90=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=E7=BB=8F=E8=B4=B9=E5=BC=80=E6=94=AF?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97=EF=BC=8C=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=AD=97=E6=AE=B5=E5=BF=85=E5=A1=AB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Audit_Expenditures/single.vue             | 110 ++++++++++++++++--
 .../FundsApply/single.vue                     |   6 +-
 .../pages/nworkflow/myflow/sign.vue           |  15 ++-
 3 files changed, 114 insertions(+), 17 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue
index 25d002468..29f5ed93c 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue	
@@ -12,15 +12,27 @@
 	  <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>
-	  <!-- <l-select v-model="formData.F_IsSendFX" :range="[{value:true,text:'是'},{value:false,text:'否'}]" title="下发飞星" disabled></l-select> -->
-	  <!-- <l-upload-file
-	    :value="fileList"
-	    :readonly="true"
-	    title="标题图片"
-	  /> -->
-	    <!-- :number="9" -->
-	    <!-- @input="setValue('MeetingManagement.Files', $event)" -->
-	  <!-- <l-input title="公告内容" disabled style="border-bottom: none;"></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"
@@ -67,6 +79,16 @@ export default {
 		ApplyUser: [],
 		IsFixedAssets: []
 	  },
+	  
+	  FundsApplyDetail: [],
+	  FundsApplyDetails: {
+	  	ProjectContent: '',
+	  	Number: '',
+	  	Price: '',
+	  	Amount: ''
+	  },
+	  
+	  
     }
   },
 
@@ -122,11 +144,12 @@ export default {
       // this.HIDE_LOADING()
     },
 	// 获取表单数据
-	getFormData(ProgressId){
-		return this.HTTP_GET("learun/adms/FundsApply/shList",{ProgressId},"加载数据时出错").then(async res=>{
+	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]]
@@ -255,3 +278,68 @@ export default {
   }
 }
 </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>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue
index f55367a6f..acc3eb81a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue	
+++ b/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>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue
index d95524206..93ee08962 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue	
+++ b/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,