完善移动端，新增合同列表回款进度、付款进度

oa-ui-app/App.vue

@@ -1,34 +1,45 @@
 <script>
-  import config from './config'
-  import store from '@/store'
-  import { getToken } from '@/utils/auth'
+	import config from './config'
+	import store from '@/store'
+	import {
+		getToken
+	} from '@/utils/auth'
 
-  export default {
-    onLaunch: function() {
-      this.initApp()
-    },
-    methods: {
-      // 初始化应用
-      initApp() {
-        // 初始化应用配置
-        this.initConfig()
-        // 检查用户登录状态
-        //#ifdef H5
-        this.checkLogin()
-        //#endif
-      },
-      initConfig() {
-        this.globalData.config = config
-      },
-      checkLogin() {
-        if (!getToken()) {
-          this.$tab.reLaunch('/pages/login') 
-        }
-      }
-    }
-  }
+	export default {
+		onLaunch: function() {
+			this.initApp();
+			uni.addInterceptor("reLaunch", {
+				invoke(e) {
+					// 因为刷新后进行后退会调用这个路径，所以需要劫持然后调用back方法。
+					if (e.url == "/") {
+						history.back();
+						return false;
+					}
+				},
+			});
+		},
+		methods: {
+			// 初始化应用
+			initApp() {
+				// 初始化应用配置
+				this.initConfig()
+				// 检查用户登录状态
+				//#ifdef H5
+				this.checkLogin()
+				//#endif
+			},
+			initConfig() {
+				this.globalData.config = config
+			},
+			checkLogin() {
+				if (!getToken()) {
+					this.$tab.reLaunch('/pages/login')
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-  @import '@/static/scss/index.scss'
-</style>
+	@import '@/static/scss/index.scss'
+</style>

oa-ui-app/api/system/user.js

@@ -1,5 +1,6 @@
 import upload from '@/utils/upload'
 import request from '@/utils/request'
+import { parseStrEmpty } from '@/utils/common.js'
 
 // 用户密码重置
 export function updateUserPwd(oldPassword, newPassword) {
@@ -22,6 +23,14 @@ export function getUserProfile() {
   })
 }
 
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/system/user/' + parseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
 // 修改用户个人信息
 export function updateUserProfile(data) {
   return request({

oa-ui-app/config.js

@@ -1,7 +1,7 @@
 // 应用全局配置
 module.exports = {
   // baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  baseUrl: 'http://localhost:8080',
+  baseUrl: 'http://192.168.28.119:8080',
   // 应用信息
   appInfo: {
     // 应用名称

oa-ui-app/main.js

@@ -3,7 +3,10 @@ import App from './App'
 import store from './store' // store
 import plugins from './plugins' // plugins
 import './permission' // permission
+import uView from './uni_modules/uview-ui'
+
 Vue.use(plugins)
+Vue.use(uView)
 
 Vue.config.productionTip = false
 Vue.prototype.$store = store

oa-ui-app/pages.json

@@ -1,97 +1,132 @@
 {
-  "pages": [{
-    "path": "pages/login",
-    "style": {
-      "navigationBarTitleText": "登录"
-    }
-  }, {
-    "path": "pages/index",
-    "style": {
-      "navigationBarTitleText": "CMC综合办公系统移动端",
-      "navigationStyle": "custom"
-    }
-  }, {
-    "path": "pages/work/index",
-    "style": {
-      "navigationBarTitleText": "工作台"
-    }
-  }, {
-    "path": "pages/mine/index",
-    "style": {
-      "navigationBarTitleText": "我的"
-    }
-  }, {
-    "path": "pages/mine/avatar/index",
-    "style": {
-      "navigationBarTitleText": "修改头像"
-    }
-  }, {
-    "path": "pages/mine/info/index",
-    "style": {
-      "navigationBarTitleText": "个人信息"
-    }
-  }, {
-    "path": "pages/mine/info/edit",
-    "style": {
-      "navigationBarTitleText": "编辑资料"
-    }
-  }, {
-    "path": "pages/mine/pwd/index",
-    "style": {
-      "navigationBarTitleText": "修改密码"
-    }
-  }, {
-    "path": "pages/mine/setting/index",
-    "style": {
-      "navigationBarTitleText": "应用设置"
-    }
-  }, {
-    "path": "pages/mine/help/index",
-    "style": {
-      "navigationBarTitleText": "常见问题"
-    }
-  }, {
-    "path": "pages/mine/about/index",
-    "style": {
-      "navigationBarTitleText": "关于我们"
-    }
-  }, {
-    "path": "pages/common/webview/index",
-    "style": {
-      "navigationBarTitleText": "浏览网页"
-    }
-  }, {
-    "path": "pages/common/textview/index",
-    "style": {
-      "navigationBarTitleText": "浏览文本"
-    }
-  }],
-  "tabBar": {
-    "color": "#000000",
-    "selectedColor": "#000000",
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "list": [{
-        "pagePath": "pages/index",
-        "iconPath": "static/images/tabbar/home.png",
-        "selectedIconPath": "static/images/tabbar/home_.png",
-        "text": "首页"
-      }, {
-        "pagePath": "pages/work/index",
-        "iconPath": "static/images/tabbar/work.png",
-        "selectedIconPath": "static/images/tabbar/work_.png",
-        "text": "工作台"
-      }, {
-        "pagePath": "pages/mine/index",
-        "iconPath": "static/images/tabbar/mine.png",
-        "selectedIconPath": "static/images/tabbar/mine_.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "RuoYi",
-    "navigationBarBackgroundColor": "#FFFFFF"
-  }
-}
+	"pages": [{
+			"path": "pages/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		}, {
+			"path": "pages/index",
+			"style": {
+				"navigationBarTitleText": "CMC综合办公系统移动端",
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/work/index",
+			"style": {
+				"navigationBarTitleText": "工作台"
+			}
+		}, {
+			"path": "pages/mine/index",
+			"style": {
+				"navigationBarTitleText": "我的"
+			}
+		}, {
+			"path": "pages/mine/avatar/index",
+			"style": {
+				"navigationBarTitleText": "修改头像"
+			}
+		}, {
+			"path": "pages/mine/info/index",
+			"style": {
+				"navigationBarTitleText": "个人信息"
+			}
+		}, {
+			"path": "pages/mine/info/edit",
+			"style": {
+				"navigationBarTitleText": "编辑资料"
+			}
+		}, {
+			"path": "pages/mine/pwd/index",
+			"style": {
+				"navigationBarTitleText": "修改密码"
+			}
+		}, {
+			"path": "pages/mine/setting/index",
+			"style": {
+				"navigationBarTitleText": "应用设置"
+			}
+		}, {
+			"path": "pages/mine/help/index",
+			"style": {
+				"navigationBarTitleText": "常见问题"
+			}
+		}, {
+			"path": "pages/mine/about/index",
+			"style": {
+				"navigationBarTitleText": "关于我们"
+			}
+		}, {
+			"path": "pages/common/webview/index",
+			"style": {
+				"navigationBarTitleText": "浏览网页"
+			}
+		}, {
+			"path": "pages/common/textview/index",
+			"style": {
+				"navigationBarTitleText": "浏览文本"
+			}
+		},
+		{
+			"path": "pages/message/index",
+			"style": {
+				"navigationBarTitleText": "消息",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/message/apply/apply",
+			"style": {
+				"navigationBarTitleText": "待审列表",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/message/apply/detail",
+			"style" : 
+			{
+				"navigationBarTitleText" : "表单信息"
+			}
+		},
+		{
+			"path" : "pages/message/apply/components/declare/declare",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		}
+	],
+	"tabBar": {
+		"color": "#000000",
+		"selectedColor": "#000000",
+		"borderStyle": "white",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/message/index",
+				"iconPath": "static/images/tabbar/msg_1.png",
+				"selectedIconPath": "static/images/tabbar/msg_2.png",
+				"text": "消息"
+			},
+			{
+				"pagePath": "pages/index",
+				"iconPath": "static/images/tabbar/home.png",
+				"selectedIconPath": "static/images/tabbar/home_.png",
+				"text": "项目"
+			}, {
+				"pagePath": "pages/work/index",
+				"iconPath": "static/images/tabbar/apply_1.png",
+				"selectedIconPath": "static/images/tabbar/apply_2.png",
+				"text": "工作台"
+			}, {
+				"pagePath": "pages/mine/index",
+				"iconPath": "static/images/tabbar/my_1.png",
+				"selectedIconPath": "static/images/tabbar/my_2.png",
+				"text": "我的"
+			}
+		]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "RuoYi",
+		"navigationBarBackgroundColor": "#FFFFFF"
+	}
+}

oa-ui-app/pages/login.vue

@@ -14,23 +14,23 @@
         <view class="iconfont icon-password icon"></view>
         <input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
       </view>
-      <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
+      <!-- <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
         <view class="iconfont icon-code icon"></view>
         <input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
         <view class="login-code"> 
           <image :src="codeUrl" @click="getCode" class="login-code-img"></image>
         </view  >
-      </view>
+      </view> -->
       <view class="action-btn">
         <button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
       </view>
     </view>
 
-    <view class="xieyi text-center">
+    <!-- <view class="xieyi text-center">
       <text class="text-grey1">登录即代表同意</text>
       <text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
       <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
-    </view>
+    </view> -->
   </view>
 </template>
 
@@ -81,9 +81,11 @@
           this.$modal.msgError("请输入您的账号")
         } else if (this.loginForm.password === "") {
           this.$modal.msgError("请输入您的密码")
-        } else if (this.loginForm.code === "" && this.captchaEnabled) {
-          this.$modal.msgError("请输入验证码")
-        } else {
+        } 
+				// else if (this.loginForm.code === "" && this.captchaEnabled) {
+    //       this.$modal.msgError("请输入验证码")
+    //     } 
+				else {
           this.$modal.loading("登录中，请耐心等待...")
           this.pwdLogin()
         }
@@ -103,7 +105,7 @@
       loginSuccess(result) {
         // 设置用户信息
         this.$store.dispatch('GetInfo').then(res => {
-          this.$tab.reLaunch('/pages/index')
+          this.$tab.reLaunch('/pages/message/index')
         })
       }
     }

oa-ui-app/static/scss/global.scss

@@ -20,7 +20,9 @@
 .text-grey2 {
 	color: #aaa;
 }
-
+.text-justify{
+	text-align:justify;
+}
 .list-cell-arrow::before {
     content: ' ';
     height: 10px;
@@ -88,3 +90,27 @@
       }
     }
   }
+
+
+	::v-deep .uni-input-input:disabled{
+		-webkit-text-fill-color: #333333;
+	}
+	
+	::v-deep .uni-textarea-textarea:disabled{
+		-webkit-text-fill-color: #333333;
+	}
+	
+	
+	// 提交按钮
+	.submit-btn {
+		border-radius: 8px;
+		background-color: #007AFF;
+		font-size: 16px;
+	}
+	// 保存按钮
+	.save-btn {
+		border-radius: 8px;
+		background-color: #f9ae3d;
+		color:#fff;
+		font-size: 16px;
+	}

oa-ui-app/static/scss/index.scss

@@ -3,4 +3,6 @@
 // color-ui
 @import "@/static/scss/colorui.css";
 // iconfont
-@import "@/static/font/iconfont.css";
+@import "@/static/font/iconfont.css";
+
+@import "./uni_modules/uview-ui/index.scss";

oa-ui-app/uni.scss

@@ -1,7 +1,7 @@
 /**
  * uni-app内置的常用样式变量
  */
-
+@import './uni_modules/uview-ui/theme.scss';
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
 $uni-color-success: #4cd964;

oa-ui-app/utils/common.js

@@ -51,4 +51,55 @@ export function tansParams(params) {
     }
   }
   return result
+}
+
+
+
+// 转换字符串，undefined,null等转化为""
+export function parseStrEmpty(str) {
+  if (!str || str == "undefined" || str == "null") {
+    return "";
+  }
+  return str;
+}
+
+
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
 }

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-13 14:47:16
+ * @LastEditTime: 2025-02-13 11:22:54
 -->
 
 <template>
@@ -218,12 +218,12 @@ export default {
           privilege: ['oa:device:list']
         }, {
           id: 7,
-          name: '投标管理',
-          icon: 'example',
+          name: '承接合同',
+          icon: 'contractSign',
           bgColor: '#F7C59F',
           boxShadow: '0 5px 20px rgba(247,197,159,0.5)',
-          path: '/business/tender',
-          privilege: ['oa:tender:query']
+          path: '/business/contract/contract',
+          privilege: ['oa:contract:list']
         }, {
           id: 8,
           name: '人事管理',
@@ -232,6 +232,22 @@ export default {
           boxShadow: '0 5px 20px rgba(32,178,170,0.5)',
           path: '/oa/staff/people',
           privilege: ['oa:salary:list']
+        },{
+          id: 9,
+          name: '项目结算',
+          icon: 'buy',
+          bgColor: '#ff6f61',
+          boxShadow: '0 5px 20px rgba(255,111,97,0.5)',
+          path: '/product/settle/project',
+          privilege: ['oa:settle:list']
+        },{
+          id: 10,
+          name: '借款管理',
+          icon: 'borrow',
+          bgColor: '#001a6e',
+          boxShadow: '0 5px 20px rgba(0,26,110,0.5)',
+          path: '/product/budget/borrow',
+          privilege: ['oa:borrow:list']
         },
         // {
         //   id: 9,

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-01-02 14:05:40
+ * @LastEditTime: 2025-02-13 11:07:30
 -->
 <template>
   <div class="app-container">
@@ -200,7 +200,7 @@ export default {
           this.queryParams.undertakingDept = null;
         }
       }
-      if (this.roles.some(e => e === 'leader')) {
+      if (this.roles.some(e => e === 'leader' || e=== 'finance')) {
         this.queryParams.applyDept = null;
         this.queryParams.undertakingDept = null;
       }

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

@@ -0,0 +1,231 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-02-12 13:40:48
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-13 10:29:05
+-->
+<template>
+  <div>
+    <el-form ref="form" :model="form" label-width="130px" :disabled="isDisabled">
+      <el-form-item label="合同名称" prop="contractName">
+        <el-input style="width: 100%;" disabled v-model="form.contractName" placeholder="请输入合同名称"></el-input>
+      </el-form-item>
+      <el-form-item label="甲方单位" prop="partyAId">
+        <el-select v-model="form.partyAId" filterable placeholder="请选择" disabled style="width: 100%;">
+          <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="合同编码" prop="contractCode">
+        <el-input style="width: 100%;" disabled v-model="form.contractCode" placeholder="请输入合同编码"></el-input>
+      </el-form-item>
+      <el-form-item label="合同编号" prop="contractNumber">
+        <el-input style="width:  100%;" disabled v-model="form.contractNumber" placeholder="请输入合同编号"></el-input>
+      </el-form-item>
+      <el-form-item label="合同金额" prop="amount">
+        <el-input style="width:50%;" disabled v-model="form.amount" placeholder="请输入合同金额">
+          <template slot="append">元</template>
+        </el-input>
+      </el-form-item>
+      <el-form-item style="text-align: left;" label="履约保证金" prop="deposit">
+        <el-input style="width:50%;" disabled v-model="form.deposit" placeholder="请输入履约保证金">
+          <template slot="append">元</template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="合同备注" prop="remark">
+        <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">
+          <tr>
+            <td style="width: 50px;">序号</td>
+            <td>回款金额</td>
+            <td>回款比例（%）</td>
+            <td>回款时间</td>
+            <td style="width: 150px;">备注</td>
+          </tr>
+          <tr v-for="(paid, index) in paidList" :key="index">
+            <td>
+              {{ index + 1 }}
+            </td>
+            <td>
+              <el-input-number style="width:100%" :controls="false" v-model="paid.paidAmount" clearable
+                @blur="changePercentage(paid)"></el-input-number>
+            </td>
+            <td>
+              <!-- <el-input-number style="width:100%" :controls="false" v-model="paid.paidPercentage" clearable
+                @blur=""></el-input-number> -->
+              {{ paid.paidPercentage }}
+            </td>
+            <td>
+              <el-date-picker style="width:100%" v-model="paid.paidTime" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期">
+              </el-date-picker>
+            </td>
+            <td>
+              <el-input v-model="paid.remark" type="textarea" clearable :autosize="{ minRows: 2 }"></el-input>
+            </td>
+            <td v-show="!isDisabled">
+              <div class="delete-btn" @click="deletPaiItem(index)">
+                <i class="el-icon-circle-close"></i>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              合计
+            </td>
+            <td>
+              {{ sumAmount.toFixed(2) }}
+            </td>
+            <td>
+              {{ sumPercent.toFixed(2) }}
+            </td>
+          </tr>
+        </table>
+        <el-button icon="el-icon-plus" size="mini" @click="addPaiList()" type="primary" plain></el-button>
+      </el-form-item>
+    </el-form>
+    <el-row class="text-center">
+      <el-button type="primary" @click="confirm">确定</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { listPartyA } from "@/api/oa/partyA/partyA";
+import { listContractPaid, getContractPaid, addContractPaid, updateContractPaid, delContractPaid } from "@/api/oa/contract/contractPaid";
+export default {
+  props: {
+    form: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      partyAList: [],
+      paidList: [{
+        paidPercentage: 0,
+        paidAmount: 0,
+        paidTime: '',
+        remark: ''
+      }],
+      sumAmount: 0,
+      sumPercent: 0,
+      loading: true,
+      isDisabled:true,
+    }
+  },
+  watch: {
+    'form.contractId'(newVal) {
+      this.getPaidList();
+    }
+  },
+  created() {
+    this.getPartyAList();
+    this.getPaidList();
+    this.isDisabledFn();
+  },
+  methods: {
+    isDisabledFn(){
+      if(this.$store.getters.roles.includes('finance')){
+        this.isDisabled = false
+      }else{
+        this.isDisabled = true
+      }
+    },
+    // 查询业主单位列表
+    getPartyAList() {
+      listPartyA({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.partyAList = response.rows;
+      })
+    },
+    getPaidList() {
+      this.loading = true;
+      listContractPaid({ contractId: this.form.contractId }).then(res => {
+        if (res.total > 0) {
+          this.paidList = res.rows;
+        } else {
+          this.paidList = [{
+            paidPercentage: 0,
+            paidAmount: 0,
+            paidTime: '',
+            remark: ''
+          }]
+        }
+        this.getSum();
+        this.loading = false;
+      })
+    },
+    getSum() {
+      this.sumAmount = this.paidList.reduce((sum, item) => sum + Number(item.paidAmount), 0);
+      this.sumPercent = this.paidList.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
+    },
+    addPaiList() {
+      this.paidList.push({
+        paidPercentage: 0,
+        paidAmount: 0,
+        paidTime: '',
+        remark: ''
+      });
+    },
+    deletPaiItem(index) {
+      let arr = this.paidList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+      this.getSum();
+    },
+    changePercentage(paid) {
+      let percent = ((paid.paidAmount / this.form.amount) * 100).toFixed(2);
+      paid.paidPercentage = percent;
+      this.getSum();
+    },
+    async confirm() {
+      const contractId = this.form.contractId
+      await delContractPaid(contractId);
+      for (let p of this.paidList) {
+        p.contractId = contractId
+        await addContractPaid(p);
+      }
+      this.$message.success('回款进度已更新');
+      this.$emit('cancel')
+      this.$emit('getList')
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
+.delete-btn {
+  color: #F56C6C;
+  cursor: pointer;
+
+  i {
+    font-size: 25px;
+  }
+}
+
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  border: 1px solid #a5abb0;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+</style>

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

@@ -0,0 +1,225 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-02-12 13:40:48
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-13 10:33:15
+-->
+<template>
+  <div>
+    <el-form ref="form" :model="form" label-width="130px" :disabled="isDisabled">
+      <el-form-item label="合同名称" prop="subContractName">
+        <el-input style="width: 100%;" v-model="form.subContractName" disabled placeholder="请输入合同名称"></el-input>
+      </el-form-item>
+      <el-form-item label="承接单位" prop="partnerId">
+        <el-select style="width:84%;" v-model="form.partnerId" filterable placeholder="请选择" disabled clearable>
+          <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName" :value="item.partnerId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系人" prop="contactPerson">
+        <el-input v-model="form.contactPerson" disabled placeholder="请输入联系人" />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="telephone">
+        <el-input v-model="form.telephone" disabled placeholder="请输入联系电话" />
+      </el-form-item>
+      <el-form-item label="分包合同金额" prop="subAmount">
+        <el-input-number :controls="false" disabled v-model="form.subAmount" placeholder="请输入分包合同金额" />(元)
+      </el-form-item>
+      <el-form-item label="合同备注" prop="remark">
+        <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">
+          <tr>
+            <td style="width: 50px;">序号</td>
+            <td>付款金额</td>
+            <td>付款比例（%）</td>
+            <td>付款时间</td>
+            <td style="width: 150px;">备注</td>
+          </tr>
+          <tr v-for="(paid, index) in paidList" :key="index">
+            <td>
+              {{ index + 1 }}
+            </td>
+            <td>
+              <el-input-number style="width:100%" :controls="false" v-model="paid.paidAmount" clearable
+                @blur="changePercentage(paid)"></el-input-number>
+            </td>
+            <td>
+              <!-- <el-input-number style="width:100%" :controls="false" v-model="paid.paidPercentage" clearable
+                @blur=""></el-input-number> -->
+              {{ paid.paidPercentage }}
+            </td>
+            <td>
+              <el-date-picker style="width:100%" v-model="paid.paidTime" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期">
+              </el-date-picker>
+            </td>
+            <td>
+              <el-input v-model="paid.remark" type="textarea" clearable :autosize="{ minRows: 2 }"></el-input>
+            </td>
+            <td v-show="!isDisabled">
+              <div class="delete-btn" @click="deletPaiItem(index)">
+                <i class="el-icon-circle-close"></i>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              合计
+            </td>
+            <td>
+              {{ sumAmount.toFixed(2) }}
+            </td>
+            <td>
+              {{ sumPercent.toFixed(2) }}
+            </td>
+          </tr>
+        </table>
+        <el-button icon="el-icon-plus" size="mini" @click="addPaiList()" type="primary" plain></el-button>
+      </el-form-item>
+    </el-form>
+    <el-row class="text-center">
+      <el-button type="primary" @click="confirm">确定</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { listPartner } from "@/api/oa/partner/partner";
+import { listContractPaid, addContractPaid, delContractPaid } from "@/api/oa/contract/contractPaid";
+export default {
+  props: {
+    form: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      partnerList: [],
+      paidList: [{
+        paidPercentage: 0,
+        paidAmount: 0,
+        paidTime: '',
+        remark: ''
+      }],
+      sumAmount: 0,
+      sumPercent: 0,
+      loading: true,
+      isDisabled:true,
+    }
+  },
+  watch: {
+    'form.subContractId'(newVal) {
+      this.getPaidList();
+    }
+  },
+  created() {
+    this.getPartnerList();
+    this.getPaidList();
+    this.isDisabledFn();
+    
+  },
+  methods: {
+    isDisabledFn(){
+      if(this.$store.getters.roles.includes('finance')){
+        this.isDisabled = false
+      }else{
+        this.isDisabled = true
+      }
+    },
+    // 查询承接单位列表
+    getPartnerList() {
+      listPartner({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.partnerList = response.rows;
+      })
+    },
+    getPaidList() {
+      this.loading = true;
+      listContractPaid({ contractId: this.form.subContractId }).then(res => {
+        if (res.total > 0) {
+          this.paidList = res.rows;
+        } else {
+          this.paidList = [{
+            paidPercentage: 0,
+            paidAmount: 0,
+            paidTime: '',
+            remark: ''
+          }]
+        }
+        this.getSum();
+        this.loading = false;
+      })
+    },
+    getSum() {
+      this.sumAmount = this.paidList.reduce((sum, item) => sum + Number(item.paidAmount), 0);
+      this.sumPercent = this.paidList.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
+    },
+    addPaiList() {
+      this.paidList.push({
+        paidPercentage: 0,
+        paidAmount: 0,
+        paidTime: '',
+        remark: ''
+      });
+    },
+    deletPaiItem(index) {
+      let arr = this.paidList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+      this.getSum();
+    },
+    changePercentage(paid) {
+      let percent = ((paid.paidAmount / this.form.subAmount) * 100).toFixed(2);
+      paid.paidPercentage = percent;
+      this.getSum();
+    },
+    async confirm() {
+      const contractId = this.form.subContractId
+      await delContractPaid(contractId);
+      for (let p of this.paidList) {
+        p.contractId = contractId
+        await addContractPaid(p);
+      }
+      this.$message.success('付款进度已更新');
+      this.$emit('cancel')
+      this.$emit('getList')
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
+.delete-btn {
+  color: #F56C6C;
+  cursor: pointer;
+
+  i {
+    font-size: 25px;
+  }
+}
+
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  border: 1px solid #a5abb0;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-06 16:19:55
+ * @LastEditTime: 2025-02-13 09:56:22
 -->
 <template>
   <div class="app-container">
@@ -67,21 +67,27 @@
           <span>{{ parseTime(scope.row.signDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="percentage" align="center" label="回款进度" width="120px" sortable>
+        <template slot-scope="scope">
+          <el-progress :text-inside="true" :stroke-width="26" :status="formatStatus(scope.row.percentage)"
+            :percentage="scope.row.percentage" text-color="#fff"></el-progress>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="签订备注" align="center" prop="signRemark" /> -->
-      <el-table-column label="签订扫描件" align="center" prop="signScan" show-overflow-tooltip>
+      <!-- <el-table-column label="签订扫描件" align="center" prop="signScan" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.signScan}`)">
             {{ getFileName(scope.row.signScan) }}
           </el-link>
         </template>
-      </el-table-column>
-      <el-table-column label="评审方式" align="center" prop="commentType">
+      </el-table-column> -->
+      <!-- <el-table-column label="评审方式" align="center" prop="commentType">
         <template slot-scope="scope">
           <el-tag :type="scope.row.commentType == '2' ? 'success' : 'warning'">
             {{ getCommentType(scope.row.commentType) }}
           </el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column label="合同备注" align="center" prop="remark" /> -->
       <el-table-column label="拟稿人" align="center" prop="drafter">
         <template slot-scope="scope">
@@ -94,6 +100,8 @@
             v-hasPermi="['oa:contract:query']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:contract:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleProgress(scope.row)"
+            v-hasPermi="['oa:contract:paid']">回款进度</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -109,6 +117,10 @@
     <el-dialog :title="title" :visible.sync="openInfo" width="60%" append-to-body>
       <contract-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></contract-form>
     </el-dialog>
+    <!-- 回款进度 -->
+    <el-dialog :title="title" :visible.sync="progressOpen" width="50%" append-to-body>
+      <payment-progress :form="progressContract" @cancel="progressOpen = false" @getList="getList"></payment-progress>
+    </el-dialog>
   </div>
 </template>
 
@@ -123,8 +135,10 @@ import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
 import { listContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
 import contractEdit from './components/edit.vue'
+import PaymentProgress from './components/paymentProgress.vue';
+import { listContractPaid } from "@/api/oa/contract/contractPaid";
 export default {
-  components: { contractInfo, ContractForm, contractEdit },
+  components: { contractInfo, ContractForm, contractEdit, PaymentProgress },
   name: "Contract",
   data() {
     return {
@@ -172,8 +186,10 @@ export default {
       taskForm: {},
       commentList: [],
       commentOpen: false,
-      queryPartyAList:[],
-      queryLoading:true,
+      queryPartyAList: [],
+      queryLoading: true,
+      progressContract: {},
+      progressOpen: false,
     };
   },
   created() {
@@ -185,9 +201,18 @@ export default {
       this.loading = true;
       listContract(this.queryParams).then(response => {
         this.contractList = response.rows;
-
         this.total = response.total;
-        this.loading = false;
+        for (let contract of this.contractList) {
+          listContractPaid({ contractId: contract.contractId }).then(res => {
+            if (res.total > 0) {
+              let percentage = res.rows.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
+              this.$set(contract, 'percentage', Number(percentage.toFixed(2)))
+            } else {
+              this.$set(contract, 'percentage', 0)
+            }
+            this.loading = false;
+          })
+        }
       });
     },
     // 取消按钮
@@ -266,6 +291,12 @@ export default {
         })
       });
     },
+    // 回款进度操作
+    handleProgress(row) {
+      this.progressContract = row;
+      this.title = '回款进度';
+      this.progressOpen = true;
+    },
     // 登记合同
     async handleRegister() {
       let response = await listDefinition({
@@ -367,7 +398,7 @@ export default {
         ...this.queryParams
       }, `contract_${new Date().getTime()}.xlsx`)
     },
-    remoteMethod(val){
+    remoteMethod(val) {
       listPartyA({
         pageNum: 1,
         pageSize: 30,
@@ -376,7 +407,22 @@ export default {
         this.queryPartyAList = res.rows;
         this.queryLoading = false;
       })
-    }
+    },
+    formatStatus(row) {
+      if (!row) {
+        row = 0
+        return 'exception'
+      }
+      if (row <= 20) {
+        return 'exception'
+      } else if (row > 20 && row <= 50) {
+        return 'warning'
+      } else if (row > 50 && row <= 80) {
+        return null
+      } else {
+        return 'success'
+      }
+    },
   }
 };
 </script>

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: 2024-09-04 15:47:18
+ * @LastEditTime: 2025-02-13 10:40:03
 -->
 <template>
   <div class="app-container">
@@ -68,8 +68,14 @@
           <span>{{ parseTime(scope.row.signDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="percentage" align="center" label="付款进度" width="120px" sortable>
+        <template slot-scope="scope">
+          <el-progress :text-inside="true" :stroke-width="26" :status="formatStatus(scope.row.percentage)"
+            :percentage="scope.row.percentage" text-color="#fff"></el-progress>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="签订备注" align="center" prop="signRemark" /> -->
-      <el-table-column label="签订扫描件" align="center" prop="signScan">
+      <!-- <el-table-column label="签订扫描件" align="center" prop="signScan">
         <template slot-scope="scope">
           <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.signScan}`)">
             {{ getFileName(scope.row.signScan) }}
@@ -82,7 +88,7 @@
             {{ setCommentType(scope.row.commentType) }}
           </el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="拟稿人" align="center" prop="drafter">
         <template slot-scope="scope">
           {{ getUserName(scope.row.drafter) }}
@@ -95,6 +101,8 @@
             v-hasPermi="['oa:subContract:query']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:subContract:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleProgress(scope.row)"
+            v-hasPermi="['oa:contract:paid']">付款进度</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -110,6 +118,10 @@
     <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>
+    </el-dialog>
   </div>
 </template>
 
@@ -123,9 +135,11 @@ import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
 import { listContractComment, addContractComment, updateContractComment, delContractComment } from "@/api/oa/contract/contractComment";
 import SubEdit from './components/subEdit.vue';
+import SubProgress from "./components/subProgress.vue";
+import { listContractPaid } from "@/api/oa/contract/contractPaid";
 
 export default {
-  components: { subContract, SubEdit },
+  components: { subContract, SubEdit, SubProgress },
   name: "SubContract",
   data() {
     return {
@@ -170,13 +184,15 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        
+
       },
       taskForm: {
         formId: ''
       },
       commentList: [],
       commentOpen: false,
+      progressOpen: false,
+      progressContract: {}
     };
   },
   created() {
@@ -189,7 +205,17 @@ export default {
       listSubContract(this.queryParams).then(response => {
         this.subContractList = response.rows;
         this.total = response.total;
-        this.loading = false;
+        for (let subContract of this.subContractList) {
+          listContractPaid({ contractId: subContract.subContractId }).then(res => {
+            if (res.total > 0) {
+              let percentage = res.rows.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
+              this.$set(subContract, 'percentage', Number(percentage.toFixed(2)))
+            } else {
+              this.$set(subContract, 'percentage', 0)
+            }
+            this.loading = false;
+          })
+        }
       });
     },
     remoteMethod(val) {
@@ -268,6 +294,12 @@ export default {
         })
       });
     },
+    // 回款进度操作
+    handleProgress(row) {
+      this.progressContract = row;
+      this.title = '付款进度';
+      this.progressOpen = true;
+    },
     async handleRegister() {
       let response = await listDefinition({
         pageNum: 1,
@@ -376,7 +408,22 @@ export default {
       } else {
         return '会议评审'
       }
-    }
+    },
+    formatStatus(row) {
+      if (!row) {
+        row = 0
+        return 'exception'
+      }
+      if (row <= 20) {
+        return 'exception'
+      } else if (row > 20 && row <= 50) {
+        return 'warning'
+      } else if (row > 50 && row <= 80) {
+        return null
+      } else {
+        return 'success'
+      }
+    },
   }
 };
 </script>

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

@@ -547,7 +547,6 @@ export default {
       return path
     },
     sortIsFinshed(a,b){
-      console.log(a,b);
       return Number(a.isFinished) - Number(b.isFinished)
     }
   },

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

@@ -185,7 +185,7 @@ export default {
       if (this.roles.some(element => element === "dept")) {
         this.queryParams.undertakingDept = this.deptId;
       }
-      if (this.roles.some(e => e === 'leader')) {
+      if (this.roles.some(e => e === 'leader'  || e=== 'finance' )) {
         this.queryParams.undertakingDept = null;
       }
       if (this.queryProjectIdByName) {