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

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

@@ -31,15 +31,15 @@
 							{{ displayListItem(item, 'ApplyUser') }}
 						</view>
 
-						<!-- <view class="customlist-item-field">
+						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">备注：</text>
 							{{ displayListItem(item, 'Remark') }}
-						</view> -->
+						</view>
 						
-						<view class="customlist-item-field">
+						<!-- <view class="customlist-item-field">
 							<text class="customlist-item-field-title">申请人：</text>
 							{{ displayListItem(item, 'Remark') }}
-						</view>
+						</view> -->
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">总金额：</text>

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

@@ -25,10 +25,10 @@
 			<l-select @input="setValue('FundsApply.IsFixedAssets', $event)"
 				:value="getValue('FundsApply.IsFixedAssets')" :range="dataSource.FundsApply.IsFixedAssets"
 				title="是否固定资产" :disabled="!edit" /> <!-- v-if="!edit" -->
-			<!-- <l-textarea @input="setValue('FundsApply.Remark', $event)" :value="getValue('FundsApply.Remark')" title="备注"
-				:readonly="!edit" /> --> <!-- v-if="!edit" :readonly="!edit" -->
-			<l-input @input="setValue('FundsApply.Remark', $event)" :value="getValue('FundsApply.Remark')"
-				title="申请人" :disabled="!edit" />
+			<l-textarea @input="setValue('FundsApply.Remark', $event)" :value="getValue('FundsApply.Remark')" title="备注"
+				:readonly="!edit" /> <!-- v-if="!edit" :readonly="!edit" -->
+			<!-- <l-input @input="setValue('FundsApply.Remark', $event)" :value="getValue('FundsApply.Remark')"
+				title="申请人" :disabled="!edit" /> -->
 			<l-input @input="Statusitem(setValue('FundsApply.Status', $event)) "
 				:value="Statusitem(getValue('FundsApply.Status'))" title="审批状态" disabled v-if="!edit" />
 			<!--  :disabled="!edit" -->
@@ -43,8 +43,22 @@
 			<view class="welCon" v-for="(item, i) in FundsApplyDetail" :key='i'>
 				<l-input v-model="item.ProjectContent" title="项目内容" placeholder="请填写" right :disabled="!edit" />
 				<l-input v-model="item.Number" type="number" @change="SumAmountChange(item,'Number')" title="数量" :disabled="!edit" placeholder="请填写" right />
+				<l-label title="单位">
+				  <picker
+				    @change="changeitem($event,item)"
+				    :range="dataSource.FundsApply.Unit"
+				    :disabled="!edit"
+					range-key="text"
+				  >
+				    <view class="picker">{{ item.Unit ? mapitem(item.Unit)  : '请选择单位' }}</view>
+				  </picker>
+				</l-label>
 				<l-input v-model="item.Price" type="number"  @blur="blurChange(item)" title="单价（元）" :disabled="!edit" placeholder="请填写" right />
 				<l-input v-model="item.Amount" title="金额（元）" disabled placeholder="请填写" right />
+				<!-- <l-select  @input="setValue('item.Unit', $event)" :value="getValue('item.Unit')" :range="dataSource.FundsApply.Unit" title="单位" :disabled="!edit" /> -->
+				
+				
+				
 				<view v-if="edit||create" class="welDel" @click="del('FundsApplyDetails', i)"><text
 						class="text-xxl cuIcon cuIcon-move"></text></view>
 						
@@ -129,7 +143,8 @@
 					ProjectContent: '',
 					Number: '',
 					Price: '',
-					Amount: ''
+					Amount: '',
+					Unit:''
 				},
 				// 表单项数据结构
 				scheme: {
@@ -161,14 +176,14 @@
 							dataSourceId: 'IsFixedAssets',
 							verify: 'NotNull'
 						},
-						// Remark: {
-						// 	type: 'texteditor',
-						// 	title: '备注',
-						// },
 						Remark: {
-							type: 'text',
-							title: '申请人',
+							type: 'texteditor',
+							title: '备注',
 						},
+						// Remark: {
+						// 	type: 'text',
+						// 	title: '申请人',
+						// },
 						SumAmount: {
 							type: 'text',
 							title: '总金额'
@@ -194,10 +209,15 @@
 						IsFixedAssets: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({
 							value: t.value,
 							text: t.text
-						}))
+						})),
+						Unit:Object.values(this.GET_GLOBAL('dataDictionary').sldw).map(t => ({
+							value: t.value,
+							text: t.text
+						})),
 					}
 				},
-				EnCode: ''
+				EnCode: '',
+				index:0
 			}
 		},
 
@@ -206,6 +226,7 @@
 			id
 		}) {
 			await this.init(type, id)
+			console.log(this.dataSource.FundsApply.Unit)
 		},
 
 		methods: {
@@ -304,7 +325,10 @@
 							this.CONFIRM('表单验证失败', '明细单价不能为空')
 						    return;
 						}
-						
+						if (this.FundsApplyDetail.some((val) => val.Unit== '')) {
+							this.CONFIRM('表单验证失败', '明细单位不能为空')
+						    return;
+						}
 						
 						if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) {
 							return
@@ -383,6 +407,7 @@
 			add(str) {
 				let jsons = this.COPY(this[str]);
 				this.FundsApplyDetail.push(jsons)
+				// console.log(this.FundsApplyDetail)
 			},
 			del(str, num) {
 				let _this = this
@@ -479,6 +504,16 @@
 				}
 				return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整');
 			},
+			changeitem(e,item){
+				// console.log(item)
+				item.Unit = this.dataSource.FundsApply.Unit[e.detail.value].value
+				// item.Unit = 
+			},
+			mapitem(data){
+				return this.dataSource.FundsApply.Unit.filter(item=>{
+					return item.value == data
+				})[0].text
+			}
 		},
 		computed: {
 			// Price(){

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

@@ -36,15 +36,34 @@
 
             <!-- 主标题和副标题 -->
             <view class="item-main">
-              <view :class="item.F_Title ? 'text-black' : ''">
-                {{ item.F_Title || '(草稿 · 待编辑)' }}
-                <l-icon v-if="item.F_EnabledMark === 2" type="edit" />
-              </view>
-              <view class="item-desc">
-				{{ item.F_SchemeName }}	
-				<text style="margin-left: 15px;">{{item.F_CreateUserName}}</text>
-				<text style="margin-left: 15px;">{{ displayListItem(item, 'F_DepartmentId')}}</text>
-			  </view>
+				<view style="display: flex;">
+					<view>
+						<view :class="item.F_Title ? 'text-black' : ''">
+						  {{ item.F_Title || '(草稿 · 待编辑)' }}
+						  <l-icon v-if="item.F_EnabledMark === 2" type="edit" />
+						</view>
+						<view class="item-desc">
+							<!-- {{ item.F_SchemeName }}	 -->
+							<text class="item-desc" style="color: #000;">填报人</text>
+							<text class="item-desc" style="margin-left: 8px;">{{item.F_CreateUserName}}</text>
+							<text class="item-desc" style="color: #000;margin-left: 8px;">部门</text>
+							<text class="item-desc" style="margin-left: 8px;">{{displayListItem(item, 'F_DepartmentId')}}</text>
+						</view>
+					</view>
+					<!-- <view style="display: flex;">
+						<view  style="margin-left: 8px;">
+							<view class="text-black">填报人</view>
+							<view class="item-desc">{{item.F_CreateUserName}}</view>
+						</view>
+						<view  style="margin-left: 8px;">
+							<view class="text-black">部门</view>
+							<view class="item-desc">{{ displayListItem(item, 'F_DepartmentId')}}</view>
+						</view>
+						
+					</view> -->
+					
+				</view>
+              
 
               <!-- tag 区 -->
               <view class="tag-bar">
@@ -58,11 +77,6 @@
                 </view>
               </view>
 			  
-			  
-			  
-			  
-			  
-			  
             </view>
           </l-list-item>
         </l-list>
@@ -387,7 +401,6 @@ export default {
 			case 'radio':
 			case 'select':
 				const selectItem = this.dataSource[field].find(t => t.value === String(value))
-				console.log(selectItem)
 				return get(selectItem, 'text', '')
 	
 			case 'checkbox':