修改付款进度权限

oa-ui-app/pages/components/ProjectPicker.vue

@@ -1,38 +1,41 @@
 <!-- components/ProjectPicker.vue -->
 <template>
-		<uni-popup ref="popup" type="bottom" @maskClick="close">
-			<view class="modal-container">
-				<!-- 搜索框 -->
-				<view class="search-box">
-					<uni-icons type="search" size="18" color="#999" />
-					<input class="search-input" placeholder="输入项目编号/名称搜索" v-model="searchKeyword" @input="handleSearch" />
-				</view>
+	<uni-popup ref="popup" type="bottom" @maskClick="close">
+		<view class="modal-container">
+			<!-- 搜索框 -->
+			<view class="search-box">
+				<uni-data-select v-model="keyword" :localdata="keywordData" :clear="false" style="width: 30rpx;"></uni-data-select>
+				<uni-icons type="search" size="18" color="#999" />
+				<input class="search-input" placeholder="输入项目编号/名称搜索" v-model="searchKeyword" @input="handleSearch" />
+			</view>
 
-				<!-- 项目列表 -->
-				<scroll-view scroll-y class="list-container" @scrolltolower="loadMore" :scroll-top="scrollTop">
-					<view v-for="(item,index) in projectList" :key="'p' + index" class="list-item"
-						:class="{ selected: selectedProject && selectedProject.projectId === item.projectId }" @click="handleSelect(item)">
-						<view class="item-content">
-							<text class="project-id">{{ item.projectId }}</text>
-							<text class="project-name">{{ item.projectName }}</text>
-						</view>
-						<uni-icons v-if="selectedProject && selectedProject.projectId === item.projectId" type="checkmarkempty" color="#007AFF" size="18" />
+			<!-- 项目列表 -->
+			<scroll-view scroll-y class="list-container" @scrolltolower="loadMore" :scroll-top="scrollTop">
+				<view v-for="(item,index) in projectList" :key="'p' + index" class="list-item"
+					:class="{ selected: selectedProject && selectedProject.projectId === item.projectId }"
+					@click="handleSelect(item)">
+					<view class="item-content">
+						<text class="project-id">{{ item.projectNumber }}</text>
+						<text class="project-name">{{ item.projectName }}</text>
 					</view>
-					
-					<!-- 加载状态 -->
-					<view class="loading-status">
-						<text v-if="loading">加载中...</text>
-						<text v-else-if="!hasMore">没有更多了</text>
-					</view>
-				</scroll-view>
+					<uni-icons v-if="selectedProject && selectedProject.projectId === item.projectId" type="checkmarkempty"
+						color="#007AFF" size="18" />
+				</view>
 
-				<!-- 底部操作 -->
-				<view class="footer">
-					<button class="btn" @click="close">取消</button>
-					<button class="btn confirm-btn" @click="confirm">确定</button>
+				<!-- 加载状态 -->
+				<view class="loading-status">
+					<text v-if="loading">加载中...</text>
+					<text v-else-if="!hasMore">没有更多了</text>
 				</view>
+			</scroll-view>
+
+			<!-- 底部操作 -->
+			<view class="footer">
+				<button class="btn" @click="close">取消</button>
+				<button class="btn confirm-btn" @click="confirm">确定</button>
 			</view>
-		</uni-popup>
+		</view>
+	</uni-popup>
 </template>
 
 <script>
@@ -68,7 +71,17 @@
 				hasMore: true, // 是否还有更多
 				loading: false, // 加载状态
 				scrollTop: 0, // 滚动位置
-				selectedProject: null // 当前选中项目
+				selectedProject: null, // 当前选中项目
+				keyword: 'projectNumber',
+				keywordData: [{
+						text: '项目编号',
+						value: 'projectNumber',
+					},
+					{
+						text: '项目名称',
+						value: 'projectName'
+					}
+				]
 			};
 		},
 		watch: {
@@ -107,11 +120,22 @@
 
 				this.loading = true;
 				try {
-					const res = await listProject({
-						keyword: this.searchKeyword,
-						pageNum: this.pageNum,
-						pageSize: this.pageSize
-					});
+					const keyword = this.keyword
+					let res;
+					if (keyword == 'projectNumber') {
+						res = await listProject({
+							projectNumber: this.searchKeyword,
+							pageNum: this.currentPage,
+							pageSize: this.pageSize
+						});
+					}else{
+						res = await listProject({
+							projectName: this.searchKeyword,
+							pageNum: this.currentPage,
+							pageSize: this.pageSize
+						});
+					}
+
 					console.log(res)
 					this.projectList = this.currentPage === 1 ?
 						res.rows : [...this.projectList, ...res.rows];
@@ -145,7 +169,7 @@
 
 			// 选择项目
 			handleSelect(item) {
-				this.selectedProject = this.selectedProject?.id === item.id ? null : item;
+				this.selectedProject = this.selectedProject?.projectId === item.projectId ? null : item;
 			},
 
 			// 确认选择
@@ -166,79 +190,79 @@
 </script>
 
 <style lang="scss" scoped>
-.modal-container {
-  background: #fff;
-  border-radius: 16px 16px 0 0;
-  max-height: 70vh;
-  padding: 20px;
-}
-
-.search-box {
-  display: flex;
-  align-items: center;
-  padding: 10px;
-  background: #f5f5f5;
-  border-radius: 8px;
-  margin-bottom: 15px;
-
-  .search-input {
-    flex: 1;
-    margin-left: 8px;
-    font-size: 14px;
-  }
-}
-
-.list-container {
-  max-height: 50vh;
-  margin-bottom: 15px;
-
-  .list-item {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 12px;
-    border-bottom: 1px solid #eee;
-
-    &.selected {
-      background-color: #f8f8f8;
-    }
-
-    .item-content {
-      flex: 1;
-
-      .project-id {
-        color: #666;
-        font-size: 12px;
-        margin-right: 8px;
-      }
-
-      .project-name {
-        color: #333;
-        font-size: 14px;
-      }
-    }
-  }
-
-  .loading-status {
-    text-align: center;
-    padding: 10px;
-    color: #999;
-    font-size: 12px;
-  }
-}
-
-.footer {
-  display: flex;
-  gap: 15px;
-
-  .btn {
-    flex: 1;
-    border-radius: 8px;
-
-    &.confirm-btn {
-      background-color: #007AFF;
-      color: #fff;
-    }
-  }
-}
+	.modal-container {
+		background: #fff;
+		border-radius: 16px 16px 0 0;
+		max-height: 70vh;
+		padding: 20px;
+	}
+
+	.search-box {
+		display: flex;
+		align-items: center;
+		padding: 10px;
+		background: #f5f5f5;
+		border-radius: 8px;
+		margin-bottom: 15px;
+
+		.search-input {
+			flex: 1;
+			margin-left: 8px;
+			font-size: 14px;
+		}
+	}
+
+	.list-container {
+		max-height: 50vh;
+		margin-bottom: 15px;
+
+		.list-item {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 12px;
+			border-bottom: 1px solid #eee;
+
+			&.selected {
+				background-color: #f8f8f8;
+			}
+
+			.item-content {
+				flex: 1;
+
+				.project-id {
+					color: #666;
+					font-size: 12px;
+					margin-right: 8px;
+				}
+
+				.project-name {
+					color: #333;
+					font-size: 14px;
+				}
+			}
+		}
+
+		.loading-status {
+			text-align: center;
+			padding: 10px;
+			color: #999;
+			font-size: 12px;
+		}
+	}
+
+	.footer {
+		display: flex;
+		gap: 15px;
+
+		.btn {
+			flex: 1;
+			border-radius: 8px;
+
+			&.confirm-btn {
+				background-color: #007AFF;
+				color: #fff;
+			}
+		}
+	}
 </style>

oa-ui-app/pages/message/apply/components/declare/declare.vue

@@ -24,17 +24,18 @@
 			</uni-forms-item>
 			<!-- 是否零星项目 -->
 			<uni-forms-item label="是否零星项目" required class="form-item" name="isScattered">
-				<uni-data-checkbox v-model="formData.isScattered" :localdata="isScatteredOptions"></uni-data-checkbox>
+				<uni-data-checkbox v-model="isScattered" :localdata="isScatteredOptions"></uni-data-checkbox>
 			</uni-forms-item>
 
 			<!-- 选择项目 -->
-			<uni-forms-item label="选择项目" required class="form-item" v-if="!formData.isScattered" name="projectId">
+			<uni-forms-item label="选择项目" required class="form-item" v-if="!isScattered" name="projectId">
 				<!-- <ProjectPicker v-model="formData.projectId" placeholder="请选择项目" :labelKey="'projectName'"
 					:valueKey="'projectId'" @change="handleProjectChange"
 					:customStyle="{ borderColor: '#e5e5e5', borderRadius: '8px' }" v-if="taskName == '工作填报'" /> -->
 				<!-- <ProjectInfo :project="projectObj" v-else></ProjectInfo> -->
-				<button @click="openProject = true">选择项目</button>
+				<u-button type="primary" @click="openProject = true" v-if="taskName == '工作填报'">选择项目</u-button>
 				<ProjectPicker :visible.sync="openProject" :selected.sync="selectedProject" @confirm="handleConfirm" />
+				<ProjectInfo :project="projectObj"></ProjectInfo>
 			</uni-forms-item>
 
 			<!-- 工作类别 -->
@@ -68,6 +69,19 @@
 				</uni-easyinput>
 			</uni-forms-item>
 
+			<uni-forms-item label="系数" required class="form-item" name="coefficient" v-if="taskName != '工作填报'">
+				<uni-easyinput type="number" v-model="formData.coefficient" placeholder="请输入系数" :styles="inputStyle"
+					@input="countMoney">
+				</uni-easyinput>
+			</uni-forms-item>
+
+			<uni-forms-item label="工天单价" class="form-item" v-if="taskName != '工作填报'">
+				<u-tag :text="formData.price+'/人天'" type="success" plain></u-tag>
+			</uni-forms-item>
+
+			<uni-forms-item label="预估绩效" class="form-item" v-if="taskName != '工作填报'">
+				<u-tag :text="'¥'+money" type="primary" plain></u-tag>
+			</uni-forms-item>
 			<!-- 提交按钮 -->
 			<button class="save-btn" @click="save">保存</button>
 			<button class="submit-btn margin-top-xs" type="primary" @click="submitForm">提交</button>
@@ -119,15 +133,18 @@
 			return {
 				openProject: false,
 				selectedProject: null,
+				isScattered: 0,
 				formData: {
-					isScattered: 0,
+					userId: null,
 					projectId: '',
 					workType: '',
 					workItem: '',
 					workContent: '',
 					workLoad: '',
-					submitTime: parseTime(new Date(), "{y}-{m}-{d}")
+					price: 216,
+					submitTime: ''
 				},
+				money: '',
 				rules: {
 					isScattered: {
 						rules: [{
@@ -204,24 +221,33 @@
 		methods: {
 			handleConfirm(project) {
 				console.log('选中的项目:', project);
-				this.selectedProject = project
+				this.selectedProject = project;
+				this.projectObj = project;
 			},
 			initForm() {
 				getDeclare(this.taskForm.formId).then(res => {
 					if (res.data) {
 						this.hasForm = true;
 						this.formData = res.data;
+						console.log(res.data)
 						if (res.data.projectId) {
-							this.formData.isScattered = 0;
+							this.isScattered = 0;
 						} else {
-							this.formData.isScattered = 1;
+							this.isScattered = 1;
 						}
 						res.data.project.projectLeader = res.data.projectLeader
 						this.projectObj = res.data.project;
+						this.selectedProject = res.data.project;
 						this.bindWorkTypeChange(this.formData.workType);
+						this.countMoney();
 					} else {
 						this.hasForm = false;
 					}
+					if (this.taskName == '工作填报') {
+						this.formData.submitTime = parseTime(new Date(), "{y}-{m}-{d}");
+						this.formData.userId = this.$store.getters.userId;
+						console.log(this.$store.getters)
+					}
 				})
 			},
 			bindProjectChange(e) {
@@ -265,12 +291,27 @@
 					this.projects = res.rows
 				})
 			},
+			countMoney() {
+				let result = parseFloat(this.formData.price * this.formData.workLoad * this.formData.coefficient)
+				console.log(result)
+				this.money = result.toFixed(2)
+			},
 			async save() {
+				if (!this.isScattered) {
+					this.formData.projectId = this.projectObj.projectId;
+				} else {
+					this.formData.projectId = ''
+				}
 				if (this.hasForm) {
 					let updateRes = await updateDeclare(this.formData);
 				} else {
 					this.formData.formId = this.taskForm.formId;
 					let addRes = await addDeclare(this.formData);
+					if (addRes.code == 200) {
+						this.hasForm = true;
+					} else {
+						this.hasForm = false;
+					}
 				}
 				uni.showToast({
 					title: '保存成功',

oa-ui-app/store/getters.js

@@ -1,8 +1,9 @@
 const getters = {
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  roles: state => state.user.roles,
-  permissions: state => state.user.permissions
+	token: state => state.user.token,
+	avatar: state => state.user.avatar,
+	name: state => state.user.name,
+	roles: state => state.user.roles,
+	permissions: state => state.user.permissions,
+	userId: state => state.user.id,
 }
-export default getters
+export default getters

oa-ui-app/store/modules/user.js

@@ -12,7 +12,8 @@ const user = {
     name: storage.get(constant.name),
     avatar: storage.get(constant.avatar),
     roles: storage.get(constant.roles),
-    permissions: storage.get(constant.permissions)
+    permissions: storage.get(constant.permissions),
+    id: storage.get(constant.id),
   },
 
   mutations: {
@@ -34,7 +35,11 @@ const user = {
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
       storage.set(constant.permissions, permissions)
-    }
+    },
+    SET_ID: (state, id) => {
+      state.id = id
+      storage.set(constant.id, id)
+    },
   },
 
   actions: {
@@ -61,13 +66,14 @@ const user = {
         getInfo().then(res => {
           const user = res.user
           const avatar = (user == null || user.avatar == "" || user.avatar == null) ? require("@/static/images/profile.jpg") : baseUrl + user.avatar
-          const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName
+          const username = (user == null || user.nickName == "" || user.nickName == null) ? "" : user.nickName
           if (res.roles && res.roles.length > 0) {
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
+					commit('SET_ID', user.userId)
           commit('SET_NAME', username)
           commit('SET_AVATAR', avatar)
           resolve(res)

oa-ui/src/views/flowable/form/components/print/projectPrint.vue

@@ -82,7 +82,7 @@
             </el-row>
           </td>
         </tr>
-        <tr>
+        <!-- <tr>
           <td class="fontbold">
             生产部门确认
           </td>
@@ -97,7 +97,7 @@
               </el-col>
             </el-row>
           </td>
-        </tr>
+        </tr> -->
       </table>
     </div>
     <div class="text-center mt20">

oa-ui/src/views/oa/contract/components/paymentProgress.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-12 13:40:48
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-13 10:29:05
+ * @LastEditTime: 2025-02-14 15:32:51
 -->
 <template>
   <div>
@@ -33,7 +33,7 @@
         </el-input>
       </el-form-item>
       <el-form-item label="合同备注" prop="remark">
-        <el-input type="textarea" disabled v-model="form.remark" :autosize="{minRows:4}" />
+        <el-input type="textarea" disabled v-model="form.remark" :autosize="{ minRows: 4 }" />
       </el-form-item>
       <el-form-item style="text-align: left;" label="回款进度">
         <table border="1" style="width:100%" v-loading="loading">
@@ -114,7 +114,7 @@ export default {
       sumAmount: 0,
       sumPercent: 0,
       loading: true,
-      isDisabled:true,
+      isDisabled: true,
     }
   },
   watch: {
@@ -128,10 +128,11 @@ export default {
     this.isDisabledFn();
   },
   methods: {
-    isDisabledFn(){
-      if(this.$store.getters.roles.includes('finance')){
+    isDisabledFn() {
+      let roles = ['finance', 'nfinance']
+      if (this.$store.getters.roles.some(e => roles.includes(e))) {
         this.isDisabled = false
-      }else{
+      } else {
         this.isDisabled = true
       }
     },
@@ -185,7 +186,7 @@ export default {
     },
     changePercentage(paid) {
       let percent = ((paid.paidAmount / this.form.amount) * 100).toFixed(2);
-      paid.paidPercentage = percent;
+      paid.paidPercentage = Number(percent);
       this.getSum();
     },
     async confirm() {

oa-ui/src/views/oa/contract/components/subProgress.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-12 13:40:48
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-13 10:33:15
+ * @LastEditTime: 2025-02-14 15:34:18
 -->
 <template>
   <div>
@@ -123,7 +123,8 @@ export default {
   },
   methods: {
     isDisabledFn(){
-      if(this.$store.getters.roles.includes('finance')){
+      let roles = ['finance', 'nfinance']
+      if(this.$store.getters.roles.some(e => roles.includes(e))){
         this.isDisabled = false
       }else{
         this.isDisabled = true
@@ -179,7 +180,7 @@ export default {
     },
     changePercentage(paid) {
       let percent = ((paid.paidAmount / this.form.subAmount) * 100).toFixed(2);
-      paid.paidPercentage = percent;
+      paid.paidPercentage = Number(percent);
       this.getSum();
     },
     async confirm() {

oa-ui/src/views/oa/contract/index.vue

@@ -50,13 +50,13 @@
       <el-table-column label="合同编码（公司）" align="center" prop="contractCode" />
       <el-table-column label="合同编号（业主）" align="center" prop="contractNumber" />
       <!-- <el-table-column label="履约保证金" align="center" prop="deposit" /> -->
-      <el-table-column label="合同文件" align="center" prop="contractDocument" show-overflow-tooltip>
+      <!-- <el-table-column label="合同文件" align="center" prop="contractDocument" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.contractDocument}`)">
             {{ getFileName(scope.row.contractDocument) }}
           </el-link>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="拟稿日期" align="center" prop="draftTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>

oa-ui/src/views/oa/contract/subContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-13 10:40:03
+ * @LastEditTime: 2025-02-14 15:25:53
 -->
 <template>
   <div class="app-container">
@@ -50,13 +50,13 @@
       <el-table-column label="分包合同金额" align="center" prop="subAmount" />
       <el-table-column label="承接单位" align="center" prop="partner.partnerName" />
       <!-- <el-table-column label="承接单位联系人" align="center" prop="contactPerson" /> -->
-      <el-table-column label="合同文件" align="center" prop="contractDocument" show-overflow-tooltip>
+      <!-- <el-table-column label="合同文件" align="center" prop="contractDocument" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.contractDocument}`)">
             {{ getFileName(scope.row.contractDocument) }}
           </el-link>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="拟稿日期" align="center" prop="draftTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
@@ -118,6 +118,7 @@
     <el-dialog :title="title" :visible.sync="openInfo" append-to-body width="60%">
       <sub-contract :taskForm="taskForm" :taskName="''" :flowDisabled="false"></sub-contract>
     </el-dialog>
+    
     <!-- 回款进度 -->
     <el-dialog :title="title" :visible.sync="progressOpen" width="50%" append-to-body>
       <sub-progress :form="progressContract" @cancel="progressOpen = false" @getList="getList"></sub-progress>