付款管理

src/api/jy/PaymentService.js

@@ -0,0 +1,54 @@
+import request from '@/utils/httpRequest'
+import { BUSINESS_PATH as prefix } from "../AppPath";
+
+export default class PaymentService{
+	list (param) {
+		return request({
+			url: prefix +'/payment/findList',
+			method: 'get',
+			params: param
+		})
+	}
+
+	saveForm (inputForm) {
+		return request({
+			url: prefix + `/payment/saveForm`,
+			method: 'post',
+			data: inputForm
+		})
+	}
+
+	queryById (id) {
+		return request({
+			url: prefix +'/payment/findById',
+			method: 'get',
+			params: {id: id}
+		})
+	}
+
+	updateStatusById(data) {
+		return request({
+			url: prefix + "/payment/updateStatusById",
+			method: "post",
+			data: data,
+		})
+	}
+	delete (ids) {
+		return request({
+			url: prefix+"/payment/delete",
+			method: 'delete',
+			params: {id: ids}
+		})
+	}
+
+
+
+	adminEditForm(param){
+		return request({
+			url: prefix + "/payment/adminEditForm",
+			method: "post",
+			data: param,
+		})
+	}
+
+}

src/views/cw/projectRecords/ProjectRecordsForm.vue

@@ -209,7 +209,7 @@
                   <el-form-item label="现场负责人" prop="projectLeaderId"
                                 :rules="[
                    ]">
-                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modleValue="inputForm.projectLeaderId" @update:modelValue='(value) => {inputForm.projectLeaderId = value}'></UserSelect>
+                    <UserSelect :readonly="true" :disabled="method === 'view'" :limit='1' :modelValue="inputForm.projectLeaderId" @update:modelValue='(value) => {inputForm.projectLeaderId = value}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">

src/views/jy/payment/InputNumber.vue

@@ -0,0 +1,202 @@
+<template>
+  <div>
+    <div class="input-number-range" :class="{ 'is-disabled': disabled }">
+      <div class="flex">
+        <div class="from">
+          <el-input
+            ref="input_from"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            v-model="userInputForm"
+            :disabled="disabled"
+            placeholder="最小值"
+            @blur="handleBlurFrom"
+            @focus="handleFocusFrom"
+            @input="handleInputFrom"
+            @change="handleInputChangeFrom"
+          ></el-input>
+        </div>
+        <div class="center">
+          <span>至</span>
+        </div>
+        <div class="to">
+          <el-input
+            ref="input_to"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            v-model="userInputTo"
+            :disabled="disabled"
+            placeholder="最大值"
+            @blur="handleBlurTo"
+            @focus="handleFocusTo"
+            @input="handleInputTo"
+            @change="handleInputChangeTo"
+          ></el-input>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'InputNumber',
+
+    props: {
+      // 初始化范围
+      value: { required: true },
+
+      // 是否禁用
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+
+      // 精度参数
+      precision: {
+        type: Number,
+        default: 0,
+        validator (val) {
+          return val >= 0 && val === parseInt(val, 10)
+        }
+      }
+    },
+
+    data () {
+      return {
+        userInputForm: null,
+        userInputTo: null
+      }
+    },
+
+    watch: {
+      value: {
+        immediate: true,
+        handler (value) {
+          /** 初始化范围 */
+          if (value instanceof Array && this.precision !== undefined) {
+            this.userInputForm = typeof value[0] === 'number' ? value[0] : null
+            this.userInputTo = typeof value[1] === 'number' ? value[1] : null
+          }
+        }
+      }
+    },
+
+    methods: {
+      // 根据精度保留数字
+      toPrecision (num, precision) {
+        if (precision === undefined) precision = 0
+        return parseFloat(
+          Math.round(num * Math.pow(10, precision)) / Math.pow(10, precision)
+        )
+      },
+
+      handleBlurFrom (event) {
+        this.$emit('blurfrom', event)
+      },
+
+      handleFocusFrom (event) {
+        this.$emit('focusfrom', event)
+      },
+
+      handleBlurTo (event) {
+        this.$emit('blurto', event)
+      },
+
+      handleFocusTo (event) {
+        this.$emit('focusto', event)
+      },
+
+      handleInputFrom (value) {
+        this.$emit('inputfrom', value)
+      },
+
+      handleInputTo (value) {
+        this.$emit('inputto', value)
+      },
+
+      // from输入框change事件
+      handleInputChangeFrom (value) {
+        // 如果是非数字空返回null
+        if (isNaN(value) || value === '') {
+          this.$emit('input', [null, this.userInputTo])
+          this.$emit('changefrom', this.userInputForm)
+          return
+        }
+
+        // 初始化数字精度
+        this.userInputForm = this.setPrecisionValue(value)
+
+        // 如果from > to 将from值替换成to
+        if (typeof this.userInputTo === 'number') {
+          this.userInputForm =
+            parseFloat(this.userInputForm) <= parseFloat(this.userInputTo)
+              ? this.userInputForm
+              : this.userInputTo
+        }
+        this.$emit('input', [this.userInputForm, this.userInputTo])
+        this.$emit('changefrom', this.userInputForm)
+      },
+
+      // to输入框change事件
+      handleInputChangeTo (value) {
+        // 如果是非数字空返回null
+        if (isNaN(value) || value === '') {
+          this.$emit('input', [this.userInputForm, null])
+          this.$emit('changefrom', this.userInputTo)
+          return
+        }
+
+        // 初始化数字精度
+        this.userInputTo = this.setPrecisionValue(value)
+
+        // 如果to < tfrom 将to值替换成from
+        if (typeof this.userInputForm === 'number') {
+          this.userInputTo =
+            parseFloat(this.userInputTo) >= parseFloat(this.userInputForm)
+              ? this.userInputTo
+              : this.userInputForm
+        }
+        this.$emit('input', [this.userInputForm, this.userInputTo])
+        this.$emit('changeto', this.userInputTo)
+      },
+
+      // 设置成精度数字
+      setPrecisionValue (value) {
+        if (this.precision !== undefined) {
+          const val = this.toPrecision(value, this.precision)
+          return val
+        }
+        return null
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  /*// 取消element原有的input框样式*/
+  ::v-deep .el-input--mini .el-input__inner {
+    border: 0px;
+    margin: 0;
+    padding: 0 15px;
+    background-color: transparent;
+  }
+  .input-number-range {
+    background-color: #fff;
+    /*border: 1px solid #dcdfe6;*/
+    border-radius: 4px;
+  }
+  .flex {
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    justify-content: center;
+    align-items: center;
+    .center {
+      margin-top: 1px;
+    }
+  }
+  .is-disabled {
+    background-color: #eef0f6;
+    border-color: #e4e7ed;
+    color: #c0c4cc;
+    cursor: not-allowed;
+  }
+</style>

src/views/jy/payment/PaymentDia.vue

@@ -0,0 +1,751 @@
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
+	<div>
+		<el-dialog
+			:title="title"
+			:close-on-click-modal="false"
+			draggable
+			append-to-body
+			width="1300px"
+			@close="close"
+			@keyup.enter.native="doSubmit"
+			v-model="visible">
+		<el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'"
+				 label-width="160px" @submit.native.prevent>
+			<el-divider content-position="left"><i class="el-icon-document"></i>
+				<span style="color: red;border-top: 20px">*</span>项目
+				<el-button style="margin-left: 20px" type="primary" :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @click="insertEvent('base')"  plain>
+					新增
+				</el-button>
+			</el-divider>
+			<el-row  :gutter="15">
+				<el-col :span="24">
+					<vxe-table
+						border
+						:footer-method="footerMethod2"
+						show-overflow
+						show-footer
+						ref="baseTable"
+						:key="baseKey"
+						class="vxe-table-element"
+						:data="inputForm.projectDTOList"
+						style="margin-left: 5em"
+						@cell-click=""
+						@edit-closed=""
+						keep-source
+						:readonly="true"
+						highlight-current-row
+						:edit-rules="tableRules"
+						:edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true, icon: '-'}"
+					>
+						<vxe-table-column field="name" align="center" title="项目名称" :edit-render="{}" show-overflow="title">
+							<template v-slot:edit="scope">
+								<el-input  :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :readonly="true" v-model="scope.row.name"/>
+							</template>
+						</vxe-table-column>
+						<vxe-table-column field="contractNo" align="center" title="合同编号" :edit-render="{}">
+							<template v-slot:edit="scope">
+								<el-input :disabled="true" :readonly="true" placeholder="请填写合同编号" v-model="scope.row.ncontractNo"/>
+							</template>
+						</vxe-table-column>
+						<vxe-table-column  field="contractAmount" align="center" title="合同金额" :edit-render="{}">
+							<template v-slot:edit="scope">
+								<el-input :disabled="true" placeholder="请填写合同金额" v-model="scope.row.contractAmount"/>
+							</template>
+						</vxe-table-column>
+						<vxe-table-column title="操作" align="center" width="100">
+							<template v-slot="scope">
+								<el-button :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'base')">删除</el-button>
+							</template>
+						</vxe-table-column>
+					</vxe-table>
+				</el-col>
+			</el-row>
+			<el-divider content-position="left"><i class="el-icon-document"></i>
+				付款信息
+			</el-divider>
+			<el-row  :gutter="15">
+				<el-col :span="12">
+					<el-form-item label="付款编号" prop="no"
+								  :rules="[ ]">
+						<el-input :disabled="true" placeholder="编号自动生成" v-model="inputForm.no" ></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="收款类别" prop="proceedType"
+								  :rules="[{required: true, message:'收款类别不能为空', trigger:'blur'}]">
+						<el-radio-group v-model="inputForm.proceedType">
+							<el-radio label="0">单位</el-radio>
+							<el-radio label="1">个人</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="收款单位" prop="proceedOfficeName"
+								  :rules="[
+                        {required: true, message:'收款单位不能为空', trigger:'blur'},{required: true, message:'收款单位不能为空', trigger:'change'}
+               ]">
+						<el-input :readonly="true" placeholder="请填写收款单位" v-model="inputForm.proceedOfficeName" @focus="openWorkClientForm()" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="开户银行" prop="ourBank"
+								  :rules="[
+                      {required: true, message:'开户银行不能为空', trigger:'blur'},{required: true, message:'开户银行不能为空', trigger:'change'}
+             		]">
+						<el-select v-model="inputForm.ourBank" @change="changeBank" placeholder="请选择开户银行" clearable style="width: 100%;">
+							<el-option
+								v-for="item in bankList"
+								:key="item.id"
+								:label="item.ourBank"
+								:value="item.id">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="开户账号" prop="bankNumber"
+								  :rules="[{required: true, message:'开户账号不能为空', trigger:'blur'}]">
+						<el-input :disabled="true" placeholder="请输入开户账号"  v-model="inputForm.bankNumber"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="税号" prop="dutyNumber"
+								  :rules="[]">
+						<el-input  placeholder="请输入税号"  v-model="inputForm.dutyNumber"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="累计已支付金额" prop="amountPaid"
+								  :rules="[{required: true, message:'请输入累计已支付金额', trigger:'blur'}]">
+						<el-input v-on:input="inputForm.amountPaid=inputForm.amountPaid.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" placeholder="请输入累计已支付金额" v-model="inputForm.amountPaid" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="付款人" prop="paymentUser"
+								  :rules="[]">
+						<!--						<UserSelectSignatory style="width: 100%" ref="userSelect2" :limit="1"-->
+						<!--											 :readonly="true" :modelValue="inputForm.paymentUser"-->
+						<!--											 @update:modelValue='(value) => {inputForm.paymentUser = value}'></UserSelectSignatory>-->
+						<UserSelect :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.paymentUser" @update:modelValue='(value,label) => {inputForm.paymentUser = value}'></UserSelect>
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12">
+					<el-form-item label="付款时间" prop="paymentTime"
+								  :rules="[]">
+						<el-date-picker
+							style="width: 100%"
+							v-model="inputForm.paymentTime"
+							type="date"
+							value-format="YYYY-MM-DD"
+							placeholder="请选择时间"
+							:default-value="new Date()"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="付款方式" prop="paymentType"
+								  :rules="[{required: true, message:'请选择付款方式', trigger:'blur'}]"
+					>
+						<el-select v-model="inputForm.paymentType" placeholder="请选择付款方式" clearable style="width: 100%;">
+							<el-option
+								v-for="item in $dictUtils.getDictList('jy_payment_type')"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="付款理由或用途" prop="reason"
+								  :rules="[{required: true, message:'请输入付款理由或用途', trigger:'blur'} ]">
+						<el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="textarea" placeholder="请输入付款理由或用途"  maxlength="500"  style="width:100%" v-model="inputForm.reason" show-word-limit></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="付款金额(小写)" prop="paymentLower"
+								  :rules="[{required: true, message:'请输入付款金额(小写)', trigger:'blur'}]">
+						<el-input v-on:input="inputForm.paymentLower=inputForm.paymentLower.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" @blur="convert(this.inputForm.paymentLower)" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" placeholder="请输入付款金额" v-model="inputForm.paymentLower" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="付款金额(大写)" prop="payment"
+								  :rules="[]">
+						<el-input :disabled="true" placeholder="请输入付款金额"  v-model="inputForm.payment"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="付款项目摘要" prop="remarks"
+								  :rules="[]">
+						<el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="textarea" placeholder="请输入付款项目摘要"  maxlength="500"  style="width:100%" v-model="inputForm.remarks" show-word-limit></el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<ProjectForm ref="projectForm" @getProgram="getProgram"></ProjectForm>
+		<WorkClientChooseRadio ref="workClientChooseRadio" @getWorkClientRadioChoose="getWorkClientRadioChoose"></WorkClientChooseRadio>
+			<template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="close()" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button type="primary" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+			</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import XEUtils from 'xe-utils'
+	import PaymentService from '@/api/jy/PaymentService'
+	import { ElDatePicker } from 'element-plus';
+	import CommonApi from '@/api/cw/common/CommonApi'
+	import ProjectForm from './ProjectForm'
+	import WorkClientChooseRadio from '../workClientInfo/WorkClientChooseRadio'
+	import UserSelectSignatory from '../workClientInfo/clientUserSelect'
+	import WorkClientService from '@/api/jy/WorkClientService'
+	import UserSelect from '@/components/userSelect'
+	export default {
+		props: {
+			businessId: {
+				type: String,
+				default: ''
+			},
+			formReadOnly: {
+				type: Boolean,
+				default: false
+			},
+			status: {
+				type: String,
+				default: ''
+			}
+		},
+		data () {
+			return {
+				title: '',
+				method: '',
+				loading: false,
+				visible: false,
+				inputForm: {
+					id: '',
+					no: '',
+					paymentUser: this.$store.state.user.id,
+					paymentTime:this.moment(new Date()).format('YYYY-MM-DD'),
+					reason: '',
+					paymentLower:'', // 付款金额小写
+					payment:'', //付款金额大写
+					procInsId:'',
+					status:'',
+					projectDTOList:[],
+					ourBank:'', //开户银行
+					bankNumber:'', // 银行账号
+					dutyNumber:'', //税号
+					remarks:'',//摘要
+					proceedOfficeId:'',//收款单位id
+					proceedOfficeName:'',//收款单位名称
+					amountPaid:'', //累计已支付金额
+					proceedType:'', //收款类别
+					paymentType:'' //付款方式
+				},
+				baseKey: '',
+				keyWatch: '',
+				dateList:[],
+				programRow:'',
+				bankList:[]
+			}
+		},
+		PaymentService:null,
+		CommonApi:null,
+		workClientService: null,
+		created () {
+			console.log('jld ')
+			this.paymentService=new PaymentService()
+			this.commonApi = new CommonApi()
+			this.workClientService = new WorkClientService()
+		},
+		mounted () {
+		},
+		activated () {
+		},
+		components: {
+			ElDatePicker,
+			ProjectForm,
+			WorkClientChooseRadio,
+			UserSelectSignatory,
+			UserSelect,
+		},
+		computed: {
+			bus: {
+				get () {
+					return this.businessId
+				},
+				set (val) {
+					this.businessId = val
+				}
+			}
+		},
+		watch: {
+			'keyWatch': {
+				handler (newVal) {
+					console.log('几里路')
+					if (this.bus) {
+						if (this.bus !== 'false') {
+							this.init('', this.bus)
+						}
+					} else {
+						this.$nextTick(() => {
+							this.$refs.inputForm.resetFields()
+						})
+					}
+				}
+			},
+			'loading': {
+				handler (newVal) {
+					this.$emit('changeLoading', newVal)
+				}
+			}
+		},
+		methods: {
+			getKeyWatch(keyWatch) {
+				this.keyWatch = keyWatch
+			},
+			init(method, id) {
+				this.method = method
+				this.inputForm={
+					id: '',
+					no: '',
+					paymentUser: this.$store.state.user.id,
+					paymentTime:'',
+					reason: '',
+					paymentLower:'', // 付款金额小写
+					payment:'', //付款金额大写
+					procInsId:'',
+					status:'',
+					projectDTOList:[],
+					ourBank:'', //开户银行
+					bankNumber:'', // 银行账号
+					dutyNumber:'', //税号
+					remarks:'',//摘要
+					proceedOfficeId:'',//收款单位id
+					proceedOfficeName:'',//收款单位名称
+					amountPaid:'', //累计已支付金额
+					proceedType:'', //收款类别
+					paymentType:'' //付款方式
+				}
+				this.inputForm.id = id
+				this.loading = false
+				this.visible = true
+				this.$nextTick(() => {
+					this.$refs.inputForm.resetFields()
+					this.loading = true
+					if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+						console.log('this.inputForm.id', this.inputForm.id)
+						this.paymentService.queryById(this.inputForm.id).then((data)=>{
+							this.inputForm = this.recover(this.inputForm, data)
+							if (this.commonJS.isEmpty(data.projectDTOList)){
+								this.inputForm.projectDTOList=[]
+							}
+							if (this.commonJS.isEmpty(this.inputForm.paymentUser)){
+								this.inputForm.paymentUser== this.$store.state.user.id
+							}
+							if (this.commonJS.isNotEmpty(this.inputForm.proceedOfficeId)){
+								this.workClientService.findById(this.inputForm.proceedOfficeId).then((da)=>{
+									console.log('da',da)
+									this.inputForm.proceedOfficeName=da.workClientInfo.name
+									this.inputForm.proceedOfficeId=da.workClientInfo.Id
+									if (this.commonJS.isNotEmpty(da.workClientBank)){
+										da.workClientBank.forEach(item => {
+											item.ourBank=item.ourBank
+											this.bankList.push(item)
+											this.inputForm.ourBank=item.id
+											this.inputForm.bankNumber=item.bankNumber
+										})
+									}else {
+										this.bankList = []
+									}
+								})
+							}
+
+						})
+						this.loading = false
+					}
+				})
+			},
+			saveForm(callback) {
+				this.doSubmit('save', callback)
+			},
+			startForm(callback) {
+				this.loading = true
+				if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+					this.paymentService.queryById(this.inputForm.id).then((data) => {
+						if (data.status !== '0' && data.status !== '1' && data.status !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							this.doSubmit('start', callback)
+						}
+					})
+				} else {
+					this.doSubmit('start', callback)
+				}
+			},
+			async agreeForm(callback) {
+				console.log('进入方法')
+				this.loading = true
+				await this.paymentService.queryById(this.inputForm.id).then((data) => {
+					if (data.status !== '2' ) { // status的值不等于“审核中”，就弹出提示
+						this.loading = false
+						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+						throw new Error()
+					} else {
+						this.inputForm.status= '2'
+						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data)=>{
+							if (this.commonJS.isNotEmpty(data)) {
+								if (data === '总经理审核') {
+									this.inputForm.status = '5'
+								}
+							}
+							let param = {status: this.inputForm.status, id: this.inputForm.id}
+							this.paymentService.updateStatusById(param).then(() => {
+								callback(data.businessTable, data.businessId, this.inputForm)
+								this.loading = false
+							}).catch(() => {
+								this.loading = false
+							})
+						})
+					}
+				})
+			},
+			reapplyForm(callback) {
+				this.loading = true
+				this.paymentService.queryById(this.inputForm.id).then((data) => {
+					if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+						this.loading = false
+						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+					} else {
+						this.doSubmit('reapply', callback)
+					}
+				})
+			},
+			// 表单提交
+			async doSubmit(status, callback) {
+				this.loading = true
+				if (this.commonJS.isEmpty(this.inputForm.paymentUser)){
+					this.inputForm.paymentUser== this.$store.state.user.id
+				}
+				console.log('5',this.inputForm)
+				if (status === 'save') {
+					// 暂存
+					this.loading = true
+					this.inputForm.status = '1'
+
+					this.paymentService.saveForm(this.inputForm).then((data) => {
+						callback(data.businessTable, data.businessId, this.inputForm)
+						this.loading = false
+					}).catch(() => {
+						this.loading = false
+					})
+					return
+				} else if (status === 'start') {
+					if (this.commonJS.isEmpty(this.inputForm.projectDTOList)) {
+						this.$message.error('请选择项目')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.proceedOfficeName)) {
+						this.$message.error('请选择收款单位')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.proceedType)) {
+						this.$message.error('请选择收款类别')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.amountPaid)) {
+						this.$message.error('请输入累计已支付金额')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.reason)) {
+						this.$message.error('请输入付款用途')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.paymentLower)) {
+						this.$message.error('请输入付款金额')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.paymentType)) {
+						this.$message.error('请选择付款方式')
+						this.loading = false
+					}
+					// 送审  待审核
+					this.inputForm.status = '2'
+				} else if (status === 'agree') {
+					this.inputForm.status= '5'
+				} else if (status === 'reapply') {
+					this.inputForm.status = '2'
+				}
+				this.$refs['inputForm'].validate((valid) => {
+					if (valid) {
+						this.loading = true
+						console.log('form',this.inputForm)
+						this.paymentService.adminEditForm(this.inputForm).then((data) => {
+							this.visible=false
+							this.$emit('refreshList')
+						}).catch(() => {
+							this.$refs.inputForm.resetFields()
+							this.loading = false
+						})
+					} else {
+						this.loading = false
+					}
+				})
+			},
+			close() {
+				this.inputForm = {
+					id: '',
+					no: '',
+					paymentUser: this.$store.state.user.id,
+					paymentTime:'',
+					reason: '',
+					paymentLower:'', // 付款金额小写
+					payment:'', //付款金额大写
+					procInsId:'',
+					status:'',
+					projectDTOList:[],
+					ourBank:'', //开户银行
+					bankNumber:'', // 银行账号
+					dutyNumber:'', //税号
+					remarks:'',//摘要
+				}
+				this.visible = false
+			},
+			async updateStatusById(type, callback) {
+				this.loading = true
+				if (type === 'reject' || type === 'reback') {
+					this.paymentService.queryById(this.inputForm.id).then((data) => {
+						if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							// if (type === 'agree') {
+							//   // 同意
+							//   this.inputForm.status = '5'
+							// }
+							if (type === 'reject') {
+								// 驳回
+								this.inputForm.status = '4'
+							}
+							if (type === 'reback') {
+								// 撤回
+								this.inputForm.status = '3'
+							}
+							if (type === 'reject' || type === 'reback') {
+								let param = {status: this.inputForm.status, id: this.inputForm.id}
+								this.paymentService.updateStatusById(param).then(() => {
+									this.loading = false
+									callback()
+								})
+							}
+						}
+					})
+				} else if (type === 'hold') {
+					this.paymentService.queryById(this.inputForm.id).then((data) => {
+						if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							// 终止
+							let param = {status: '1', id: this.inputForm.id}
+							this.paymentService.updateStatusById(param).then(() => {
+								this.loading = false
+								callback()
+							})
+						}
+					})
+				}
+
+			},
+			convert(money){
+				if (!money) { return this.inputForm.payment='';}
+				//数字的汉字数组
+				let numberCNList = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+				//数字的基础单位汉字数组
+				let numberBaseUnit = ['', '拾', '佰', '仟'];
+				//数字的高级单位汉字数组
+				let numberHighUnit = ['', '万', '亿', '兆'];// 一兆等于一万亿
+				//小数部分单位汉字数组
+				let floatUnit = ['角', '分', '毫', '厘'];
+				//整数金额时后面跟的字符
+				let integerLastCN = '整';
+				//整数后的单位汉字
+				let integerLastUnit = '元';
+				//最大处理的数字
+				let maxNum = 999999999999999.9999;
+				//以小数点拆分金额产生的数组
+				let decimalPointSplitList;
+				//金额整数部分
+				let integerNum;
+				//金额小数部分
+				let decimalNum;
+				//返回的大写金额
+				let moneyCNString = '';
+				money = parseFloat(money);// 转为数字
+				if(typeof money !== 'number' || isNaN(money)){this.$message('检测到非数字字符');return '';}
+				//超出最大处理数字
+				if (money >= maxNum) {this.$message('超出最大处理数字');return '';}
+				// 等于0时 返回零元整
+				if (money === 0) {
+					moneyCNString = numberCNList[0] + integerLastUnit + integerLastCN;
+					return moneyCNString;
+				}
+				//转换为字符串
+				money = money.toString();
+				/******金额数字的处理，转为字符串，判断有没有小数位，获取整数部分和小数部分*******/
+				if (money.indexOf('.') === -1) {// 如果没有小数点
+					integerNum = money;// money就都等于整数部分，小数部分为空
+					decimalNum = '';
+				} else {// 有小数点
+					decimalPointSplitList = money.split('.');// 以小数点拆分数组
+					if(decimalPointSplitList[1].length > 4)this.$message('金额精确仅支持到厘');
+					integerNum = decimalPointSplitList[0];// 整数部分
+					decimalNum = decimalPointSplitList[1].substr(0, 4);// 小数部分只支持4位
+				}
+				/******整数部分处理*******/
+				if (parseInt(integerNum, 10) > 0) {// 以十进制转为int类型 大于零
+					let zeroCount = 0;// 记录零的个数
+					for (let i = 0; i < integerNum.length; i++) {
+						let p = integerNum.length - 1 - i;// 当前数字的位数, 比如10000 ，1的位数是4 ， 10001000，第一个1的位数是7，第二个1的位数是3
+						console.log(p,integerNum[i]);
+						let q = p / 4;// 当前数字位数 除以 4 商0余1，则值为0，控制其高级单位
+						let m = p % 4;// 取余,比如1%4 商0余1 ，则值为1， 控制其基础单位
+						// 如果当前数字等于零 则++
+						if (integerNum[i] === '0') {zeroCount++;}
+						// 否则当前数字不等于零时
+						else {
+							// 如果记录的零的个数大于0 返回结果中加一个汉字零
+							if (zeroCount > 0) {moneyCNString += numberCNList[0];}
+							//把零的个数归零，重新计算零的个数
+							zeroCount = 0;
+							// 然后把返回结果 加上 当前数字的汉字以及其基础单位
+							moneyCNString += numberCNList[parseInt(integerNum[i])] + numberBaseUnit[m];
+						}
+						// 如果当前数字所在位数取余4等于0时，那么除以4一定是整数，并且记录的零的个数小于4个,则拼接当前位数对应的高级单位
+						if (m === 0 && zeroCount < 4) {moneyCNString += numberHighUnit[q];}
+					}
+					moneyCNString += integerLastUnit;// 整数部分结束后 拼接上整数部分单位 元
+				}
+				/******小数部分处理 --- 小数部分只考虑是否有值，以及当前值所在单位，没有零的概念，所以只需拼接当前值对应的汉字，以及当前值的单位即可*******/
+				if (decimalNum !== '') {
+					for (let i = 0; i < decimalNum.length; i++) {
+						if (decimalNum[i] !== '0') {// 如果当前数字不等于零 则加上当前数字的汉字 以及 其小数单位
+							moneyCNString += numberCNList[Number(decimalNum[i])] + floatUnit[i];
+						}
+					}
+				}else {// 如果没有小数部分则加上汉字 整
+					moneyCNString += integerLastCN;
+				}
+
+				this.inputForm.payment= moneyCNString;
+			},
+			insertEvent(type) {
+				if (type === 'base') {
+					if (this.inputForm.projectDTOList.length>=1){
+						if (this.commonJS.isEmpty(this.inputForm.projectDTOList[0].projectId)){
+							this.$message.error('第一行不能为空')
+							return
+						}
+					}
+					this.$refs.baseTable.insertAt({})
+					this.inputForm.projectDTOList.push({})
+					this.baseKey = Math.random()
+				}
+				console.log('22',this.inputForm.projectDTOList)
+			},
+			// 删除
+			removeEvent(row, rowIndex, type) {
+				if (type === 'base') {
+					this.$refs.baseTable.remove(row)
+					this.inputForm.projectDTOList.splice(rowIndex, 1)
+				}
+			},
+			openProgramPageForm(rowIndex) {
+				this.$refs.projectForm.init()
+				this.programRow = rowIndex
+				console.log('11',this.programRow)
+			},
+			getProgram(rows) {
+				console.log('1',rows)
+				rows.forEach((item, index) => {
+					this.inputForm.programId = item.id
+					if (index === 0) {
+						let r = this.inputForm.projectDTOList[this.programRow]
+						r.projectId=item.id
+						r.name = item.name
+						r.contractNo = item.contractNo
+						r.contractAmount = item.contractAmount
+						console.log('2',this.inputForm.projectDTOList[this.programRow])
+					} else {
+						let r = {
+							projectId: item.id,
+							name: item.name,
+							contractNo: item.contractNo,
+							contractAmount: item.contractAmount,
+						}
+						this.$refs.baseTable.insertAt(r)
+						this.inputForm.projectDTOList.push(r)
+						this.baseKey = Math.random()
+					}
+
+				})
+				this.$forceUpdate()
+				this.programRow = ''
+				// this.inputForm.reconciliationArea = this.inputForm.financeInvoiceBaseDTOList[0].location
+			},
+			openWorkClientForm() {
+				this.$refs.workClientChooseRadio.init()
+			},
+			getWorkClientRadioChoose(row){
+				console.log('row',row)
+				console.log('row1',row.backs)
+				this.bankList=[]
+				this.inputForm.proceedOfficeId=row.id
+				this.inputForm.proceedOfficeName=row.name
+				row.backs.forEach(item => {
+					item.ourBank=item.ourBank
+					this.bankList.push(item)
+				})
+			},
+			changeBank(value){
+				this.bankList.forEach(item=>{
+					console.log('item',item)
+					if (item.id === value){
+						this.inputForm.bankNumber=item.bankNumber
+					}
+				})
+				console.log('this.inputForm.bankNumber',this.inputForm.bankNumber)
+			}
+
+
+
+		}
+
+	}
+</script>
+<style scoped>
+	/deep/ .el-input-number .el-input__inner {
+		text-align: left;
+	}
+	/deep/ .vxe-footer--row .vxe-footer--column:nth-child(1) .vxe-cell--item {
+		font-weight:700;
+	}
+</style>

src/views/jy/payment/PaymentForm.vue

@@ -0,0 +1,734 @@
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
+	<div>
+		<el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
+				 label-width="160px" @submit.native.prevent>
+			<el-divider content-position="left"><i class="el-icon-document"></i>
+				<span style="color: red;border-top: 20px">*</span>项目
+				<el-button style="margin-left: 20px" type="primary" :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @click="insertEvent('base')"  plain>
+					新增
+				</el-button>
+			</el-divider>
+			<el-row  :gutter="15">
+				<el-col :span="24">
+					<vxe-table
+						border
+						:footer-method="footerMethod2"
+						show-overflow
+						show-footer
+						ref="baseTable"
+						:key="baseKey"
+						class="vxe-table-element"
+						:data="inputForm.projectDTOList"
+						style="margin-left: 5em"
+						@cell-click=""
+						@edit-closed=""
+						keep-source
+						:readonly="true"
+						highlight-current-row
+						:edit-rules="tableRules"
+						:edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true, icon: '-'}"
+					>
+						<vxe-table-column field="name" align="center" title="项目名称" :edit-render="{}" show-overflow="title">
+							<template v-slot:edit="scope">
+								<el-input  :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :readonly="true" v-model="scope.row.name"/>
+							</template>
+						</vxe-table-column>
+						<vxe-table-column field="contractNo" align="center" title="合同编号" :edit-render="{}">
+							<template v-slot:edit="scope">
+								<el-input :disabled="true" :readonly="true" placeholder="请填写合同编号" v-model="scope.row.ncontractNo"/>
+							</template>
+						</vxe-table-column>
+						<vxe-table-column  field="contractAmount" align="center" title="合同金额" :edit-render="{}">
+							<template v-slot:edit="scope">
+								<el-input :disabled="true" placeholder="请填写合同金额" v-model="scope.row.contractAmount"/>
+							</template>
+						</vxe-table-column>
+						<vxe-table-column title="操作" align="center" width="100">
+							<template v-slot="scope">
+								<el-button :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'base')">删除</el-button>
+							</template>
+						</vxe-table-column>
+					</vxe-table>
+				</el-col>
+			</el-row>
+			<el-divider content-position="left"><i class="el-icon-document"></i>
+				付款信息
+			</el-divider>
+			<el-row  :gutter="15">
+				<el-col :span="12">
+					<el-form-item label="付款编号" prop="no"
+								  :rules="[ ]">
+						<el-input :disabled="true" placeholder="编号自动生成" v-model="inputForm.no" ></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="收款类别" prop="proceedType"
+								  :rules="[{required: true, message:'收款类别不能为空', trigger:'blur'}]">
+						<el-radio-group v-model="inputForm.proceedType">
+							<el-radio label="0">单位</el-radio>
+							<el-radio label="1">个人</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="收款单位" prop="proceedOfficeName"
+								  :rules="[
+                        {required: true, message:'收款单位不能为空', trigger:'blur'},{required: true, message:'收款单位不能为空', trigger:'change'}
+               ]">
+						<el-input :readonly="true" placeholder="请填写收款单位" v-model="inputForm.proceedOfficeName" @focus="openWorkClientForm()" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="开户银行" prop="ourBank"
+								  :rules="[
+                      {required: true, message:'开户银行不能为空', trigger:'blur'},{required: true, message:'开户银行不能为空', trigger:'change'}
+             		]">
+						<el-select v-model="inputForm.ourBank" @change="changeBank" placeholder="请选择开户银行" clearable style="width: 100%;">
+							<el-option
+								v-for="item in bankList"
+								:key="item.id"
+								:label="item.ourBank"
+								:value="item.id">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="开户账号" prop="bankNumber"
+								  :rules="[{required: true, message:'开户账号不能为空', trigger:'blur'}]">
+						<el-input :disabled="true" placeholder="请输入开户账号"  v-model="inputForm.bankNumber"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="税号" prop="dutyNumber"
+								  :rules="[]">
+						<el-input  placeholder="请输入税号"  v-model="inputForm.dutyNumber"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="累计已支付金额" prop="amountPaid"
+								  :rules="[{required: true, message:'请输入累计已支付金额', trigger:'blur'}]">
+						<el-input v-on:input="inputForm.amountPaid=inputForm.amountPaid.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" placeholder="请输入累计已支付金额" v-model="inputForm.amountPaid" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="付款人" prop="paymentUser"
+								  :rules="[]">
+<!--						<UserSelectSignatory style="width: 100%" ref="userSelect2" :limit="1"-->
+<!--											 :readonly="true" :modelValue="inputForm.paymentUser"-->
+<!--											 @update:modelValue='(value) => {inputForm.paymentUser = value}'></UserSelectSignatory>-->
+						<UserSelect :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.paymentUser" @update:modelValue='(value,label) => {inputForm.paymentUser = value}'></UserSelect>
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12">
+					<el-form-item label="付款时间" prop="paymentTime"
+								  :rules="[]">
+						<el-date-picker
+							style="width: 100%"
+							v-model="inputForm.paymentTime"
+							type="date"
+							value-format="YYYY-MM-DD"
+							placeholder="请选择时间"
+							:default-value="new Date()"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="付款方式" prop="paymentType"
+								  :rules="[{required: true, message:'请选择付款方式', trigger:'blur'}]"
+					>
+						<el-select v-model="inputForm.paymentType" placeholder="请选择付款方式" clearable style="width: 100%;">
+							<el-option
+								v-for="item in $dictUtils.getDictList('jy_payment_type')"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="付款理由或用途" prop="reason"
+								  :rules="[{required: true, message:'请输入付款理由或用途', trigger:'blur'} ]">
+						<el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="textarea" placeholder="请输入付款理由或用途"  maxlength="500"  style="width:100%" v-model="inputForm.reason" show-word-limit></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="付款金额(小写)" prop="paymentLower"
+								  :rules="[{required: true, message:'请输入付款金额(小写)', trigger:'blur'}]">
+						<el-input v-on:input="inputForm.paymentLower=inputForm.paymentLower.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3').replace(/^0+/, '0')" @blur="convert(this.inputForm.paymentLower)" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" placeholder="请输入付款金额" v-model="inputForm.paymentLower" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="付款金额(大写)" prop="payment"
+								  :rules="[]">
+						<el-input :disabled="true" placeholder="请输入付款金额"  v-model="inputForm.payment"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="付款项目摘要" prop="remarks"
+								  :rules="[]">
+						<el-input :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'" type="textarea" placeholder="请输入付款项目摘要"  maxlength="500"  style="width:100%" v-model="inputForm.remarks" show-word-limit></el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<ProjectForm ref="projectForm" @getProgram="getProgram"></ProjectForm>
+		<WorkClientChooseRadio ref="workClientChooseRadio" @getWorkClientRadioChoose="getWorkClientRadioChoose"></WorkClientChooseRadio>
+	</div>
+</template>
+
+<script>
+	import XEUtils from 'xe-utils'
+	import PaymentService from '@/api/jy/PaymentService'
+	import { ElDatePicker } from 'element-plus';
+	import CommonApi from '@/api/cw/common/CommonApi'
+	import ProjectForm from './ProjectForm'
+	import WorkClientChooseRadio from '../workClientInfo/WorkClientChooseRadio'
+	import UserSelectSignatory from '../workClientInfo/clientUserSelect'
+	import WorkClientService from '@/api/jy/WorkClientService'
+	import UserSelect from '@/components/userSelect'
+	export default {
+		props: {
+			businessId: {
+				type: String,
+				default: ''
+			},
+			formReadOnly: {
+				type: Boolean,
+				default: false
+			},
+			status: {
+				type: String,
+				default: ''
+			}
+		},
+		data () {
+			return {
+				title: '',
+				method: '',
+				loading: false,
+				inputForm: {
+					id: '',
+					no: '',
+					paymentUser: this.$store.state.user.id,
+					paymentTime:this.moment(new Date()).format('YYYY-MM-DD'),
+					reason: '',
+					paymentLower:'', // 付款金额小写
+					payment:'', //付款金额大写
+					procInsId:'',
+					status:'',
+					projectDTOList:[],
+					ourBank:'', //开户银行
+					bankNumber:'', // 银行账号
+					dutyNumber:'', //税号
+					remarks:'',//摘要
+					proceedOfficeId:'',//收款单位id
+					proceedOfficeName:'',//收款单位名称
+					amountPaid:'', //累计已支付金额
+					proceedType:'', //收款类别
+					paymentType:'' //付款方式
+				},
+				baseKey: '',
+				keyWatch: '',
+				dateList:[],
+				programRow:'',
+				bankList:[]
+			}
+		},
+		PaymentService:null,
+		CommonApi:null,
+		workClientService: null,
+		created () {
+			console.log('jld ')
+			this.paymentService=new PaymentService()
+			this.commonApi = new CommonApi()
+			this.workClientService = new WorkClientService()
+		},
+		mounted () {
+		},
+		activated () {
+		},
+		components: {
+			ElDatePicker,
+			ProjectForm,
+			WorkClientChooseRadio,
+			UserSelectSignatory,
+			UserSelect,
+		},
+		computed: {
+			bus: {
+				get () {
+					return this.businessId
+				},
+				set (val) {
+					this.businessId = val
+				}
+			}
+		},
+		watch: {
+			'keyWatch': {
+				handler (newVal) {
+					console.log('几里路')
+					if (this.bus) {
+						if (this.bus !== 'false') {
+							this.init('', this.bus)
+						}
+					} else {
+						this.$nextTick(() => {
+							this.$refs.inputForm.resetFields()
+						})
+					}
+				}
+			},
+			'loading': {
+				handler (newVal) {
+					this.$emit('changeLoading', newVal)
+				}
+			}
+		},
+		methods: {
+			getKeyWatch(keyWatch) {
+				this.keyWatch = keyWatch
+			},
+			init(method, id) {
+				this.method = method
+				this.inputForm={
+					id: '',
+					no: '',
+					paymentUser: this.$store.state.user.id,
+					paymentTime:'',
+					reason: '',
+					paymentLower:'', // 付款金额小写
+					payment:'', //付款金额大写
+					procInsId:'',
+					status:'',
+					projectDTOList:[],
+					ourBank:'', //开户银行
+					bankNumber:'', // 银行账号
+					dutyNumber:'', //税号
+					remarks:'',//摘要
+					proceedOfficeId:'',//收款单位id
+					proceedOfficeName:'',//收款单位名称
+					amountPaid:'', //累计已支付金额
+					proceedType:'', //收款类别
+					paymentType:'' //付款方式
+				}
+				this.inputForm.id = id
+				this.loading = false
+				this.$nextTick(() => {
+					this.$refs.inputForm.resetFields()
+					this.loading = true
+					if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+						console.log('this.inputForm.id', this.inputForm.id)
+						this.paymentService.queryById(this.inputForm.id).then((data)=>{
+							this.inputForm = this.recover(this.inputForm, data)
+							if (this.commonJS.isEmpty(data.projectDTOList)){
+								this.inputForm.projectDTOList=[]
+							}
+							if (this.commonJS.isEmpty(this.inputForm.paymentUser)){
+								this.inputForm.paymentUser== this.$store.state.user.id
+							}
+							if (this.commonJS.isNotEmpty(this.inputForm.proceedOfficeId)){
+								this.workClientService.findById(this.inputForm.proceedOfficeId).then((da)=>{
+									console.log('da',da)
+									this.inputForm.proceedOfficeName=da.workClientInfo.name
+									this.inputForm.proceedOfficeId=da.workClientInfo.Id
+									if (this.commonJS.isNotEmpty(da.workClientBank)){
+										da.workClientBank.forEach(item => {
+											item.ourBank=item.ourBank
+											this.bankList.push(item)
+											this.inputForm.ourBank=item.id
+											this.inputForm.bankNumber=item.bankNumber
+										})
+									}else {
+										this.bankList = []
+									}
+								})
+							}
+
+						})
+						this.loading = false
+					}
+				})
+			},
+			saveForm(callback) {
+				this.doSubmit('save', callback)
+			},
+			startForm(callback) {
+				this.loading = true
+				if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+					this.paymentService.queryById(this.inputForm.id).then((data) => {
+						if (data.status !== '0' && data.status !== '1' && data.status !== '3') { // 审核状态不是“未发起”或“暂存”或“撤回”，就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							this.doSubmit('start', callback)
+						}
+					})
+				} else {
+					this.doSubmit('start', callback)
+				}
+			},
+			async agreeForm(callback) {
+				console.log('进入方法')
+				this.loading = true
+				await this.paymentService.queryById(this.inputForm.id).then((data) => {
+					if (data.status !== '2' ) { // status的值不等于“审核中”，就弹出提示
+						this.loading = false
+						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+						throw new Error()
+					} else {
+						this.inputForm.status= '2'
+						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data)=>{
+							if (this.commonJS.isNotEmpty(data)) {
+								if (data === '总经理审核') {
+									this.inputForm.status = '5'
+								}
+							}
+							let param = {status: this.inputForm.status, id: this.inputForm.id}
+							this.paymentService.updateStatusById(param).then(() => {
+								callback(data.businessTable, data.businessId, this.inputForm)
+								this.loading = false
+							}).catch(() => {
+								this.loading = false
+							})
+						})
+					}
+				})
+			},
+			reapplyForm(callback) {
+				this.loading = true
+				this.paymentService.queryById(this.inputForm.id).then((data) => {
+					if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示
+						this.loading = false
+						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+					} else {
+						this.doSubmit('reapply', callback)
+					}
+				})
+			},
+			// 表单提交
+			async doSubmit(status, callback) {
+				this.loading = true
+				if (this.commonJS.isEmpty(this.inputForm.paymentUser)){
+					this.inputForm.paymentUser== this.$store.state.user.id
+				}
+				console.log('5',this.inputForm)
+				if (status === 'save') {
+					// 暂存
+					this.loading = true
+					this.inputForm.status = '1'
+
+					this.paymentService.saveForm(this.inputForm).then((data) => {
+						callback(data.businessTable, data.businessId, this.inputForm)
+						this.loading = false
+					}).catch(() => {
+						this.loading = false
+					})
+					return
+				} else if (status === 'start') {
+					if (this.commonJS.isEmpty(this.inputForm.projectDTOList)) {
+						this.$message.error('请选择项目')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.proceedOfficeName)) {
+						this.$message.error('请选择收款单位')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.proceedType)) {
+						this.$message.error('请选择收款类别')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.amountPaid)) {
+						this.$message.error('请输入累计已支付金额')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.reason)) {
+						this.$message.error('请输入付款用途')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.paymentLower)) {
+						this.$message.error('请输入付款金额')
+						this.loading = false
+					}
+					if (this.commonJS.isEmpty(this.inputForm.paymentType)) {
+						this.$message.error('请选择付款方式')
+						this.loading = false
+					}
+					// 送审  待审核
+					this.inputForm.status = '2'
+				} else if (status === 'agree') {
+					this.inputForm.status= '5'
+				} else if (status === 'reapply') {
+					this.inputForm.status = '2'
+				}
+				this.$refs['inputForm'].validate((valid) => {
+					if (valid) {
+						this.loading = true
+						console.log('form',this.inputForm)
+						this.paymentService.saveForm(this.inputForm).then((data) => {
+							callback(data.businessTable, data.businessId, this.inputForm)
+							this.$refs.inputForm.resetFields()
+							this.loading = false
+						}).catch(() => {
+							this.$refs.inputForm.resetFields()
+							this.loading = false
+						})
+					} else {
+						this.loading = false
+					}
+				})
+			},
+			close() {
+				this.inputForm = {
+					id: '',
+					no: '',
+					paymentUser: this.$store.state.user.id,
+					paymentTime:'',
+					reason: '',
+					paymentLower:'', // 付款金额小写
+					payment:'', //付款金额大写
+					procInsId:'',
+					status:'',
+					projectDTOList:[],
+					ourBank:'', //开户银行
+					bankNumber:'', // 银行账号
+					dutyNumber:'', //税号
+					remarks:'',//摘要
+				}
+				this.visible = false
+			},
+			async updateStatusById(type, callback) {
+				this.loading = true
+				if (type === 'reject' || type === 'reback') {
+					this.paymentService.queryById(this.inputForm.id).then((data) => {
+						if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							// if (type === 'agree') {
+							//   // 同意
+							//   this.inputForm.status = '5'
+							// }
+							if (type === 'reject') {
+								// 驳回
+								this.inputForm.status = '4'
+							}
+							if (type === 'reback') {
+								// 撤回
+								this.inputForm.status = '3'
+							}
+							if (type === 'reject' || type === 'reback') {
+								let param = {status: this.inputForm.status, id: this.inputForm.id}
+								this.paymentService.updateStatusById(param).then(() => {
+									this.loading = false
+									callback()
+								})
+							}
+						}
+					})
+				} else if (type === 'hold') {
+					this.paymentService.queryById(this.inputForm.id).then((data) => {
+						if (data.status !== '4') { // status的值不等于“驳回”就弹出提示
+							this.loading = false
+							this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+							throw new Error()
+						} else {
+							// 终止
+							let param = {status: '1', id: this.inputForm.id}
+							this.paymentService.updateStatusById(param).then(() => {
+								this.loading = false
+								callback()
+							})
+						}
+					})
+				}
+
+			},
+			convert(money){
+				if (!money) { return this.inputForm.payment='';}
+				//数字的汉字数组
+				let numberCNList = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+				//数字的基础单位汉字数组
+				let numberBaseUnit = ['', '拾', '佰', '仟'];
+				//数字的高级单位汉字数组
+				let numberHighUnit = ['', '万', '亿', '兆'];// 一兆等于一万亿
+				//小数部分单位汉字数组
+				let floatUnit = ['角', '分', '毫', '厘'];
+				//整数金额时后面跟的字符
+				let integerLastCN = '整';
+				//整数后的单位汉字
+				let integerLastUnit = '元';
+				//最大处理的数字
+				let maxNum = 999999999999999.9999;
+				//以小数点拆分金额产生的数组
+				let decimalPointSplitList;
+				//金额整数部分
+				let integerNum;
+				//金额小数部分
+				let decimalNum;
+				//返回的大写金额
+				let moneyCNString = '';
+				money = parseFloat(money);// 转为数字
+				if(typeof money !== 'number' || isNaN(money)){this.$message('检测到非数字字符');return '';}
+				//超出最大处理数字
+				if (money >= maxNum) {this.$message('超出最大处理数字');return '';}
+				// 等于0时 返回零元整
+				if (money === 0) {
+					moneyCNString = numberCNList[0] + integerLastUnit + integerLastCN;
+					return moneyCNString;
+				}
+				//转换为字符串
+				money = money.toString();
+				/******金额数字的处理，转为字符串，判断有没有小数位，获取整数部分和小数部分*******/
+				if (money.indexOf('.') === -1) {// 如果没有小数点
+					integerNum = money;// money就都等于整数部分，小数部分为空
+					decimalNum = '';
+				} else {// 有小数点
+					decimalPointSplitList = money.split('.');// 以小数点拆分数组
+					if(decimalPointSplitList[1].length > 4)this.$message('金额精确仅支持到厘');
+					integerNum = decimalPointSplitList[0];// 整数部分
+					decimalNum = decimalPointSplitList[1].substr(0, 4);// 小数部分只支持4位
+				}
+				/******整数部分处理*******/
+				if (parseInt(integerNum, 10) > 0) {// 以十进制转为int类型 大于零
+					let zeroCount = 0;// 记录零的个数
+					for (let i = 0; i < integerNum.length; i++) {
+						let p = integerNum.length - 1 - i;// 当前数字的位数, 比如10000 ，1的位数是4 ， 10001000，第一个1的位数是7，第二个1的位数是3
+						console.log(p,integerNum[i]);
+						let q = p / 4;// 当前数字位数 除以 4 商0余1，则值为0，控制其高级单位
+						let m = p % 4;// 取余,比如1%4 商0余1 ，则值为1， 控制其基础单位
+						// 如果当前数字等于零 则++
+						if (integerNum[i] === '0') {zeroCount++;}
+						// 否则当前数字不等于零时
+						else {
+							// 如果记录的零的个数大于0 返回结果中加一个汉字零
+							if (zeroCount > 0) {moneyCNString += numberCNList[0];}
+							//把零的个数归零，重新计算零的个数
+							zeroCount = 0;
+							// 然后把返回结果 加上 当前数字的汉字以及其基础单位
+							moneyCNString += numberCNList[parseInt(integerNum[i])] + numberBaseUnit[m];
+						}
+						// 如果当前数字所在位数取余4等于0时，那么除以4一定是整数，并且记录的零的个数小于4个,则拼接当前位数对应的高级单位
+						if (m === 0 && zeroCount < 4) {moneyCNString += numberHighUnit[q];}
+					}
+					moneyCNString += integerLastUnit;// 整数部分结束后 拼接上整数部分单位 元
+				}
+				/******小数部分处理 --- 小数部分只考虑是否有值，以及当前值所在单位，没有零的概念，所以只需拼接当前值对应的汉字，以及当前值的单位即可*******/
+				if (decimalNum !== '') {
+					for (let i = 0; i < decimalNum.length; i++) {
+						if (decimalNum[i] !== '0') {// 如果当前数字不等于零 则加上当前数字的汉字 以及 其小数单位
+							moneyCNString += numberCNList[Number(decimalNum[i])] + floatUnit[i];
+						}
+					}
+				}else {// 如果没有小数部分则加上汉字 整
+					moneyCNString += integerLastCN;
+				}
+
+				this.inputForm.payment= moneyCNString;
+			},
+			insertEvent(type) {
+				if (type === 'base') {
+					if (this.inputForm.projectDTOList.length>=1){
+						if (this.commonJS.isEmpty(this.inputForm.projectDTOList[0].projectId)){
+							this.$message.error('第一行不能为空')
+							return
+						}
+					}
+					this.$refs.baseTable.insertAt({})
+					this.inputForm.projectDTOList.push({})
+					this.baseKey = Math.random()
+				}
+				console.log('22',this.inputForm.projectDTOList)
+			},
+			// 删除
+			removeEvent(row, rowIndex, type) {
+				if (type === 'base') {
+					this.$refs.baseTable.remove(row)
+					this.inputForm.projectDTOList.splice(rowIndex, 1)
+				}
+			},
+			openProgramPageForm(rowIndex) {
+				this.$refs.projectForm.init()
+				this.programRow = rowIndex
+				console.log('11',this.programRow)
+			},
+			getProgram(rows) {
+				console.log('1',rows)
+				rows.forEach((item, index) => {
+					this.inputForm.programId = item.id
+					if (index === 0) {
+						let r = this.inputForm.projectDTOList[this.programRow]
+						r.projectId=item.id
+						r.name = item.name
+						r.contractNo = item.contractNo
+						r.contractAmount = item.contractAmount
+						console.log('2',this.inputForm.projectDTOList[this.programRow])
+					} else {
+						let r = {
+							projectId: item.id,
+							name: item.name,
+							contractNo: item.contractNo,
+							contractAmount: item.contractAmount,
+						}
+						this.$refs.baseTable.insertAt(r)
+						this.inputForm.projectDTOList.push(r)
+						this.baseKey = Math.random()
+					}
+
+				})
+				this.$forceUpdate()
+				this.programRow = ''
+				// this.inputForm.reconciliationArea = this.inputForm.financeInvoiceBaseDTOList[0].location
+			},
+			openWorkClientForm() {
+				this.$refs.workClientChooseRadio.init()
+			},
+			getWorkClientRadioChoose(row){
+				console.log('row',row)
+				console.log('row1',row.backs)
+				this.bankList=[]
+				this.inputForm.proceedOfficeId=row.id
+				this.inputForm.proceedOfficeName=row.name
+				row.backs.forEach(item => {
+					item.ourBank=item.ourBank
+					this.bankList.push(item)
+				})
+			},
+			changeBank(value){
+				this.bankList.forEach(item=>{
+					console.log('item',item)
+					if (item.id === value){
+						this.inputForm.bankNumber=item.bankNumber
+					}
+				})
+				console.log('this.inputForm.bankNumber',this.inputForm.bankNumber)
+			}
+
+
+
+		}
+
+	}
+</script>
+<style scoped>
+	/deep/ .el-input-number .el-input__inner {
+		text-align: left;
+	}
+	/deep/ .vxe-footer--row .vxe-footer--column:nth-child(1) .vxe-cell--item {
+		font-weight:700;
+	}
+</style>

src/views/jy/payment/PaymentList.vue

@@ -0,0 +1,465 @@
+<template>
+	<div class="page">
+		<el-form :inline="true"  v-if="searchVisible" class="query-form m-b-10" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+			<!-- 搜索框-->
+			<el-form-item label="付款编号" prop="no">
+				<el-input v-model="searchForm.no" placeholder="请输入付款编号" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="付款用途" prop="reason">
+				<el-input v-model="searchForm.reason" placeholder="请输入付款用途" clearable></el-input>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="付款人" prop="paymentUser">
+				<UserSelectSignatory style="width: 100%" ref="userSelect2" :limit="1"
+									 :readonly="true" :modelValue="searchForm.paymentUser"
+									 @update:modelValue='(value) => {searchForm.paymentUser = value}'></UserSelectSignatory>			</el-form-item>
+			<el-form-item v-if="showHideItem"  prop="paymentOffice" label="付款人部门">
+				<SelectTree
+					ref="officeTree"
+					:props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+
+					:url="`/system-server/sys/office/treeData?type=2`"
+					:value="searchForm.paymentOffice"
+					size="default"
+					:accordion="true"
+					@getValue="(value) => {searchForm.paymentOffice=value}"/>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="付款时间" prop="createDates">
+				<el-date-picker
+					placement="bottom-start"
+					v-model="searchForm.createDates"
+					type="datetimerange"
+					format="YYYY-MM-DD HH:mm:ss"
+					value-format="YYYY-MM-DD HH:mm:ss"
+					range-separator="至"
+					start-placeholder="开始日期"
+					end-placeholder="结束日期">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item v-if="showHideItem" label="借款金额" prop="paymentAmounts">
+				<InputNumber :disabled="false" :precision="num"
+							 :value="searchForm.paymentAmounts"
+							 @changefrom="(val) => {searchForm.paymentAmounts[0] = val}"
+							 @changeto="(val) => {searchForm.paymentAmounts[1] = val}"
+				>
+				</InputNumber>
+			</el-form-item>
+
+			<el-form-item>
+				<el-button type="default" @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>
+				<el-button type="primary" @click="refreshList()" icon="el-icon-search">查询</el-button>
+				<el-button @click="resetSearch()" icon="el-icon-refresh-right">重置</el-button>
+			</el-form-item>
+		</el-form>
+		<div class="jp-table top" style="">
+			<vxe-toolbar :refresh="{query: refreshList}" custom>
+				<template #buttons>
+					<el-button v-if="hasPermission('borrow:add')" :disabled="isAdmin" type="primary" icon="el-icon-plus" @click="add()">新建</el-button>
+				</template>
+				<template #tools>
+					<vxe-button
+						text
+						type="primary"
+						:title="searchVisible ? '收起检索' : '展开检索'"
+						icon="vxe-icon-search"
+						class="tool-btn"
+						@click="searchVisible = !searchVisible"
+					></vxe-button>
+				</template>
+			</vxe-toolbar>
+			<div style="height: calc(100% - 90px)">
+				<vxe-table
+					border="inner"
+					auto-resize
+					resizable
+					height="auto"
+					:loading="loading"
+					ref="clientTable"
+					show-header-overflow
+					show-overflow
+					highlight-hover-row
+					:menu-config="{}"
+					@sort-change="sortChangeHandle"
+					:sort-config="{remote:true}"
+					:data="dataList"
+					:checkbox-config="{}">
+					<vxe-column type="seq" width="60" title="序号"></vxe-column>
+					<vxe-column min-width="160" align="center" title="付款编号" field="no">
+						<template  #default="scope">
+							<el-link  type="primary" :underline="false"  @click="view(scope.row)">{{scope.row.no}}</el-link>
+						</template>
+					</vxe-column>
+					<vxe-column min-width="160" align="center" title="付款用途" field="reason"></vxe-column>
+					<vxe-column min-width="160" align="center" title="付款人" field="paymentUser"></vxe-column>
+					<vxe-column min-width="160" align="center" title="付款人部门" field="paymentOffice"></vxe-column>
+					<vxe-column min-width="160" align="center" title="付款时间" field="paymentTime"></vxe-column>
+					<vxe-column min-width="160" align="center" title="付款金额" field="paymentLower"></vxe-column>
+					<vxe-column min-width="160" align="center" title="对冲金额" field="refund"></vxe-column>
+					<vxe-column min-width="160" align="center" title="剩余付款金额" field="finalMoney"></vxe-column>
+					<vxe-column  min-width="150px" align="center" title="付款状态" field="status" fixed="right">
+						<template #default="scope">
+							<el-button @click="detail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.status, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.status, '未登记')}} </el-button>
+						</template>
+					</vxe-column>
+					<vxe-column title="操作" width="150px" fixed="right" align="center">
+						<template  #default="scope">
+							<div v-if="isAdmin">
+								<el-button text type="primary" size="small" v-if="scope.row.status==='0' || scope.row.status==='5'" @click="del(scope.row.id)">删除</el-button>
+								<el-button  size="small" text type="primary"  @click="adminEdit(scope.row)">修改</el-button>
+							</div>
+							<div v-else>
+								<el-button text type="primary" size="small" v-if="scope.row.status==='0' || scope.row.status==='1'|| scope.row.status==='3'" @click="del(scope.row.id)">删除</el-button>
+								<el-button v-if="(scope.row.status === '0'||scope.row.status === '1'|| scope.row.status === '3')" size="small" text type="primary"  @click="edit(scope.row)">修改</el-button>
+								<!--              当前申请人撤回-->
+								<el-button v-if="scope.row.createById === $store.state.user.id && scope.row.status==='2'" text type="primary" size="small" @click="reback(scope.row)">撤回</el-button>
+
+								<el-button v-if="scope.row.status==='2' && checkIsAudit(scope.row)" text type="primary" size="small" @click="examine(scope.row)">审核</el-button>
+								<el-button v-if="scope.row.status === '4'&&scope.row.createById === $store.state.user.id" text type="primary" size="small" @click="adjust(scope.row)">驳回调整</el-button>
+							</div>
+						</template>
+					</vxe-column>
+				</vxe-table>
+				<vxe-pager
+					background
+					:current-page="tablePage.currentPage"
+					:page-size="tablePage.pageSize"
+					:total="tablePage.total"
+					:page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+					:layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+					@page-change="currentChangeHandle">
+				</vxe-pager>
+
+			</div>
+		</div>
+		<PaymentDia ref="paymentDia" @refreshList="refreshList"></PaymentDia>
+	</div>
+
+</template>
+
+<script>
+	import InputNumber from './InputNumber.vue'
+	import UserSelect from '@/components/userSelect'
+	import SelectTree from '@/components/treeSelect/treeSelect.vue'
+	import PaymentService from '@/api/jy/PaymentService'
+	import taskService from '@/api/flowable/taskService'
+	import processService from '@/api/flowable/processService'
+	import userService from '@/api/sys/userService'
+	import pick from 'lodash.pick'
+	import SupplierChooseForm from '@/views/materialManagement/supplier/SupplierChooseForm'
+	import UserSelectSignatory from '../workClientInfo/clientUserSelect'
+	import PaymentDia from './PaymentDia'
+	export default {
+		data () {
+			return {
+				dialogTableVisible:false,
+				searchVisible: true,
+				showHideItem: false,
+				showHideIcon: 'el-icon-arrow-down',
+				showHideName: '展示',
+				num: 0,
+				searchForm: {
+					no: '',
+					reason: '',
+					paymentUser: '',
+					paymentOffice: '',
+					paymentAmounts:[],
+					createDates:[]
+				},
+				dataList: [],
+				tablePage: {
+					total: 0,
+					currentPage: 1,
+					pageSize: 10,
+					orders: []
+				},
+				tableKey: '',
+				loading: false,
+				processDefinitionId: '',
+				processDefinitionIdAccount:'',
+				procDefKey: '',
+				procDefKeyAccount: '',
+				isAdmin: false,
+				create: '',
+				gridData:[],
+				typeData:[]
+			}
+		},
+		PaymentService:null,
+		created () {
+			this.paymentService=new PaymentService()
+		},
+		components: {
+			SelectTree,
+			UserSelect,
+			SupplierChooseForm,
+			UserSelectSignatory,
+			InputNumber,
+			PaymentDia
+		},
+		computed: {
+			userName () {
+				return this.$store.state.user.name
+			},
+			user () {
+				this.createName = this.$store.state.user.name
+				return this.$store.state.user
+			}
+		},
+		mounted () {
+			this.refreshList()
+		},
+		activated () {
+			this.refreshList()
+		},
+		methods: {
+			showHide () {
+				if (this.showHideItem === false) {
+					this.showHideItem = true
+					this.showHideIcon = 'el-icon-arrow-up'
+					this.showHideName = '隐藏'
+				} else {
+					this.showHideItem = false
+					this.showHideIcon = 'el-icon-arrow-down'
+					this.showHideName = '展示'
+				}
+			},
+			// 新增
+			add () {
+				// 读取流程表单
+				let tabTitle = `发起流程【嘉溢-付款管理】`
+				let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [嘉溢-付款管理]`
+				taskService.getTaskDef({ procDefId: this.processDefinitionId,
+					status: 'startAndHold'}).then((data) => {
+					this.$router.push({
+						path: '/flowable/task/TaskForm',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+							procDefId: this.processDefinitionId,
+							procDefKey: this.procDefKey,
+							status: 'startAndHold',
+							title: tabTitle,
+							formType: data.formType,
+							formUrl: data.formUrl,
+							formTitle: processTitle,
+							businessId: 'false',
+							isShow: false,
+							routePath: '/jy/payment/PaymentList'
+						}
+					})
+				})
+			},
+			// 修改
+			edit (row) {
+				let tabTitle = `发起流程【嘉溢-付款管理】`
+				let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [嘉溢-付款管理]`
+				taskService.getTaskDef({ procDefId: this.processDefinitionId,
+					businessId: row.id,
+					businessTable: 'jy_borrow_money',
+					status: 'startAndHold'}).then((data) => {
+					this.$router.push({
+						path: '/flowable/task/TaskForm',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+							procDefId: this.processDefinitionId,
+							procDefKey: this.procDefKey,
+							status: 'startAndHold',
+							title: tabTitle,
+							formType: data.formType,
+							formUrl: data.formUrl,
+							formTitle: processTitle,
+							businessId: row.id,
+							businessTable: 'jy_borrow_money',
+							isShow: false,
+							routePath: '/jy/payment/PaymentList'
+						}
+					})
+				})
+			},
+			// 查看
+			view (row) {
+				this.$refs.paymentDia.init('view',row.id);
+
+			},
+			// 查询当前用户是否是管理员用户
+			checkIsAdmin () {
+				userService.is().then((data) => {
+					this.isAdmin = data
+				})
+			},
+			// 获取数据列表
+			refreshList () {
+				this.loading = true
+				this.paymentService.list({
+					'current': this.tablePage.currentPage,
+					'size': this.tablePage.pageSize,
+					'orders': this.tablePage.orders,
+					...this.searchForm
+				}).then((data) => {
+					console.log('x',data.records)
+					this.dataList = data.records
+					this.tablePage.total = data.total
+					this.tableKey = Math.random()
+					this.loading = false
+				})
+				this.checkIsAdmin()
+				processService.getByName('嘉溢-付款管理').then((data) => {
+					if (!this.commonJS.isEmpty(data.id)) {
+						this.processDefinitionId = data.id
+						this.procDefKey = data.key
+					}
+				})
+			},
+			// 当前页
+			currentChangeHandle ({ currentPage, pageSize }) {
+				this.tablePage.currentPage = currentPage
+				this.tablePage.pageSize = pageSize
+				this.refreshList()
+			},
+			// 排序
+			sortChangeHandle (column) {
+				this.tablePage.orders = []
+				if (column.order != null) {
+					this.tablePage.orders.push({column: this.$utils.toLine(column.property), asc: column.order === 'asc'})
+				}
+				this.refreshList()
+			},
+			// 删除
+			del (id) {
+				let ids = id || this.$refs.clientTable.getCheckboxRecords().map(item => {
+					return item.id
+				}).join(',')
+				this.$confirm(`确定删除所选项吗?`, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.loading = true
+					this.paymentService.delete(ids).then((data) => {
+						this.$message.success(data)
+						this.refreshList()
+						this.loading = false
+					})
+				})
+			},
+			resetSearch () {
+				this.$refs.searchForm.resetFields()
+				this.searchForm.projectId = '' // 重置时清空项目id
+				this.refreshList()
+			},
+
+			// 查看修改流程结果
+			detail (row) {
+				if (row.status !== '0' && row.status !== '1') {
+					this.paymentService.queryById(row.id).then((da)=>{
+						// eslint-disable-next-line eqeqeq
+						taskService.getTaskDef({
+							procInsId: row.procInsId,
+							procDefId: this.processDefinitionId
+						}).then((data) => {
+							this.$router.push({
+								path: '/flowable/task/TaskFormDetail',
+								query: {
+									...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+									isShow: 'false',
+									readOnly: true,
+									title: '付款申请' + '流程详情',
+									formTitle: '付款申请' + '流程详情',
+									businessId: row.id,
+									status: 'reback',
+									method: 'view'
+								}
+							})
+						})
+					})
+				}
+			},
+			// 撤回入库修改
+			reback (row) {
+				this.$confirm(`确定要撤回该申请吗?`, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.paymentService.queryById(row.id).then((data) => {
+						if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+							this.$message.error('数据已发生改变或不存在，请刷新数据')
+							this.refreshList()
+						} else {
+							processService.revokeProcIns(row.procInsId).then((data) => {
+								let form = {status: '3', id: row.id}
+								this.paymentService.updateStatusById(form)
+								this.$message.success(data)
+								this.refreshList()
+							})
+						}
+					})
+				})
+			},
+			// 驳回后调整
+			adjust (row) {
+				this.paymentService.queryById(row.id).then((data) => {
+					if (data.status !== '4') { // status的值不等于“驳回”，就弹出提示
+						this.$message.error('数据已发生改变或不存在，请刷新数据')
+						this.refreshList()
+					} else {
+						this.todo(row)
+					}
+				})
+			},
+			// 审核
+			examine (row) {
+				this.paymentService.queryById(row.id).then((data) => {
+					if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+						this.$message.error('数据已发生改变或不存在，请刷新数据')
+						this.refreshList()
+					} else {
+						this.todo(row)
+					}
+				})
+			},
+			// 审核或重新调整跳转
+			todo (row) {
+				let cUser = false
+				taskService.getTaskDefInfo({
+					taskId: row.taskId
+				}).then((data) => {
+					this.$router.push({
+						path: '/flowable/task/TaskForm',
+						query: {
+							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId'),
+							isShow: false,
+							formReadOnly: true,
+							formTitle: `${data.taskName}`,
+							cUser: cUser,
+							title: `审批【${data.taskName || ''}】`,
+							routePath: '/jy/payment/PaymentList',   // 数据处理后需要跳转的页面路径
+						}
+					})
+				})
+			},
+			// 查询当前登录人是否是数据的审核人
+			checkIsAudit (row) {
+				let loginUserId = this.$store.state.user.id  // 获取当前登录用户id
+				if (this.commonJS.isNotEmpty(row.auditUserIds)) {
+					for (const userId of row.auditUserIds) {
+						if (userId === loginUserId) {  // 当数据的审核人中包含当前登录人id时，返回true
+							return true
+						}
+					}
+				}
+				return false
+			},
+			adminEdit(row){
+				this.$refs.paymentDia.init('edit',row.id);
+			},
+
+
+
+
+
+		}
+	}
+</script>

src/views/jy/payment/ProjectForm.vue

@@ -0,0 +1,365 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+	  draggable
+      width="1100px"
+      height="500px"
+      @close="close"
+      append-to-body
+      v-model="visible">
+      <div v-if="isShow">
+<!--        <el-radio v-model="checkType" label="1" style="margin-right: 20px">项目</el-radio>-->
+<!--        <el-radio v-model="checkType" label="2" style="margin-right: 20px">报告</el-radio>-->
+<!--	    <el-radio v-model="checkType" label="3" style="margin-right: 20px">其他</el-radio>-->
+      </div>
+		<!--报告        -->
+		<div v-if="checkType === '2'">
+			<el-form size="large" :inline="true" class="query-form" ref="searchForm" :model="searchForm"
+					 @submit.native.prevent>
+				<!-- 搜索框-->
+				<el-form-item label="项目名称" prop="projectName">
+					<el-input size="large" v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
+				</el-form-item>
+				<el-form-item label="报告号" prop="reportNo">
+					<el-input size="large" v-model="searchForm.reportNo" placeholder="请输入报告号" clearable></el-input>
+				</el-form-item>
+				<el-form-item label="报告创建时间" prop="createDates">
+					<el-date-picker
+						placement="bottom-start"
+						format="YYYY-MM-DD HH:mm:ss"
+						value-format="YYYY-MM-DD HH:mm:ss"
+						v-model="searchForm.createDates"
+						type="datetimerange"
+						range-separator="至"
+						start-placeholder="开始日期"
+						end-placeholder="结束日期">
+					</el-date-picker>
+				</el-form-item>
+
+				<el-form-item>
+					<el-button type="primary" @click="list1()" size="large" icon="el-icon-search">查询</el-button>
+					<el-button @click="resetSearch1()" size="large" icon="el-icon-refresh-right">重置</el-button>
+				</el-form-item>
+			</el-form>
+
+			<vxe-table
+				border="inner"
+				auto-resize
+				resizable
+				height="550px"
+				:loading="loading"
+				size="large"
+				ref="projectTable1"
+				show-header-overflow
+				show-overflow
+				highlight-hover-row
+				:menu-config="{}"
+				:print-config="{}"
+				@sort-change=""
+				:sort-config="{remote:true}"
+				:data="dataList1"
+				:row-config="{isCurrent: true}"
+				:checkbox-config="{trigger: 'row'}"
+			>
+				<vxe-column type="seq" width="60" title="序号"></vxe-column>
+				<vxe-column type="checkbox" width="60px"></vxe-column>
+				<vxe-column min-width="230" align="center" title="项目名称" field="projectName" show-overflow="title"></vxe-column>
+				<vxe-column min-width="230" align="center" title="项目编号" field="projectNumber"></vxe-column>
+				<vxe-column min-width="230" align="center" title="报告文号" field="reportNo"></vxe-column>
+				<vxe-column min-width="160" align="center" title="合同名称" field="contractName"></vxe-column>
+				<vxe-column min-width="160" align="center" title="报告创建人" field="userName"></vxe-column>
+				<vxe-column min-width="160" align="center" title="报告创建时间" field="createTime"></vxe-column>
+
+			</vxe-table>
+			<vxe-pager
+				background
+				size="large"
+				:current-page="tablePage1.currentPage"
+				:page-size="tablePage1.pageSize"
+				:total="tablePage1.total"
+				:page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+				:layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+				@page-change="currentChangeHandle1">
+			</vxe-pager>
+		</div>
+      <div v-if="checkType === '1'" >
+          <el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
+            <!-- 搜索框-->
+            <el-form-item label="项目名称" prop="name">
+              <el-input v-model="searchForm.name" placeholder="请输入项目名称" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="项目编号" prop="no">
+              <el-input v-model="searchForm.no" placeholder="请输入项目编号" clearable></el-input>
+            </el-form-item>
+            <el-form-item label="创建时间" prop="createDates">
+              <el-date-picker
+                placement="bottom-start"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="searchForm.createDates"
+                type="datetimerange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+
+            <el-form-item>
+              <el-button type="primary" @click="list()"  icon="el-icon-search">查询</el-button>
+              <el-button @click="resetSearch()" icon="el-icon-refresh-right">重置</el-button>
+            </el-form-item>
+          </el-form>
+
+          <vxe-table
+            border="inner"
+            auto-resize
+            resizable
+            height="550px"
+            :loading="loading"
+            ref="projectTable"
+            show-header-overflow
+            show-overflow
+            highlight-hover-row
+            :menu-config="{}"
+            :print-config="{}"
+            :sort-config="{remote:true}"
+            :data="dataList"
+            :row-config="{isCurrent: true}"
+            :checkbox-config="{trigger: 'row'}"
+          >
+            <vxe-column type="seq" width="60" title="序号"></vxe-column>
+            <vxe-column type="checkbox" width="60px"></vxe-column>
+            <vxe-column min-width="160" align="center" title="项目名称" field="name" show-overflow="title"></vxe-column>
+            <vxe-column min-width="160" align="center" title="项目编号" field="no"></vxe-column>
+            <vxe-column min-width="160" align="center" title="合同名称" field="contractName"></vxe-column>
+            <vxe-column min-width="160" align="center" title="创建人" field="createById"></vxe-column>
+            <vxe-column min-width="160" align="center" title="创建时间" field="createTime"></vxe-column>
+
+          </vxe-table>
+          <vxe-pager
+            background
+            :current-page="tablePage.currentPage"
+            :page-size="tablePage.pageSize"
+            :total="tablePage.total"
+            :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+            :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+            @page-change="currentChangeHandle">
+          </vxe-pager>
+        </div>
+      <div style="height: 500px;" v-if="checkType === '3'">
+        <el-form  label-width="80px" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
+			<el-row  :gutter="15">
+            <el-col :span="21">
+              <el-form-item label="详情" prop="detail">
+                <el-input style="width: 100%" type="textarea" maxlength="500" v-model="detail" placeholder="请输入详情" show-word-limit></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="close()" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button type="primary" v-if="method != 'view'" @click="getProgram()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+			</span>
+		</template>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import ProjectInfoService from '@/api/jy/ProjectInfoService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+	    tablePage1: {
+		  total: 0,
+		  currentPage: 1,
+		  pageSize: 10,
+		  orders: []
+	    },
+        dataList: [],
+        dataList1: [],
+        searchForm: {
+          name: '',
+          no: '',
+          createBy: '',
+          projectMasterName: '',
+          projectNumber: '',
+          projectName: '',
+          createDates: [],
+		  reportNo: '',
+          status: ''
+        },
+        checkType: '',
+        detail: '',
+        isShow: true,
+        num: true,// num为true是多选，false是单选
+		reportType:''
+      }
+    },
+	  ProjectInfoService:null,
+    created () {
+    	this.projectInfoService=new ProjectInfoService()
+    },
+    components: {
+    },
+    methods: {
+      /**
+       * @param isShow
+       *      isShow为空，则可以选择“项目”或填写“其他”
+       *      isShow为false，则只可以选择“项目”，并且弹出提示
+       *      isShow为‘1’，则只可以选择“项目”，不弹出提示
+       *      isShow为其他任何值，则只可以填写“其他”
+       * @param num
+       *      num为空或者true，则允许多选
+       *      num为其他任何值，则只可以单选
+       */
+      init (isShow, num) {
+        if (this.commonJS.isEmpty(isShow)) {
+          this.isShow = true
+          this.checkType = '1'
+        } else {
+			if (isShow === false || isShow === 'false') {
+				if (this.checkType === '1') {
+					this.isShow = false
+					this.checkType = '1'
+					this.$message({message: '第一条为项目后面新增只能选择项目', type: 'warning', customClass: 'messageZindex'})
+				} else if (this.checkType === '2') {
+					this.isShow = false
+					this.checkType = '2'
+					this.$message({message: '第一条为报告后面新增只能选择报告', type: 'warning', customClass: 'messageZindex'})
+				}
+			} else if (isShow === '1') {
+				this.isShow = false
+				this.checkType = '1'
+			}else if (isShow === '2') {
+				this.isShow = false
+				this.checkType = '2'
+			} else {
+				this.isShow = false
+				this.checkType = '3'
+			}
+        }
+        if (this.commonJS.isEmpty(num) || num === true) {
+          this.num = true // num为true是多选，false是单选
+        } else {
+          this.num = false
+        }
+        this.visible = true
+        this.list()
+	    // this.list1()
+      },
+      // 表单提交
+      getProgram () {
+        let rows
+	    let rowsType
+        if (this.checkType === '1') {
+          if (this.commonJS.isEmpty(this.$refs.projectTable.getCheckboxRecords())) {
+            this.$message.error('请至少选择一条数据')
+            return
+          }
+          if (this.num === false) {
+            if (this.$refs.projectTable.getCheckboxRecords().length > 1) {
+              this.$message.error('最多选择一条数据')
+              return
+            }
+          }
+          rows = this.$refs.projectTable.getCheckboxRecords()
+        } else if (this.checkType === '2') {
+			if (this.commonJS.isEmpty(this.$refs.projectTable1.getCheckboxRecords())) {
+				this.$message.error('请至少选择一条数据')
+				return
+			}
+			if (this.num === false) {
+				if (this.$refs.projectTable1.getCheckboxRecords().length > 1) {
+					this.$message.error('最多选择一条数据')
+					return
+				}
+			}
+			rows = this.$refs.projectTable1.getCheckboxRecords()
+		} else {
+          if (this.commonJS.isEmpty(this.detail)) {
+            this.$message.error('请填写开票详情')
+            return
+          }
+          rows = [{projectName: this.detail}]
+		  rows.bj1 = 'bj1'
+        }
+
+        this.close()
+        this.$emit('getProgram', rows)
+      },
+      list () {
+        this.loading = true
+        this.searchForm.status = '5'
+		  this.projectInfoService.listByCreateId({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then((data) => {
+        	console.log('aa',data.records)
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+	  // list1 () {
+		//   this.loading = true
+		//   this.searchForm.status = '5'
+		//   projectRecordsService.list1({
+		// 	'current': this.tablePage1.currentPage,
+		// 	'size': this.tablePage1.pageSize,
+		// 	'orders': this.tablePage1.orders,
+		// 	...this.searchForm
+		//   }).then((data) => {
+		// 	this.dataList1 = data.records
+		// 	this.tablePage1.total = data.total
+		// 	this.loading = false
+		//   })
+	  // },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.list()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.list()
+      },
+	  currentChangeHandle1 ({currentPage, pageSize}) {
+		this.tablePage1.currentPage = currentPage
+		this.tablePage1.pageSize = pageSize
+		this.list1()
+	  },
+	  resetSearch1 () {
+		this.$refs.searchForm.resetFields()
+		this.list1()
+	  },
+      close () {
+        this.detail = ''
+        this.visible = false
+      }
+    }
+  }
+</script>
+<style>
+  .messageZindex {
+    z-index:9999 !important;
+  }
+</style>

src/views/materialManagement/userSeal/SignetAddForm.vue

@@ -399,7 +399,7 @@
 			insertEvent(type) {
 				if (type === 'base') {
 					if (this.inputForm.projectList.length>=1){
-						if (this.commonJS.isEmpty(this.inputForm.projectList[0].id)){
+						if (this.commonJS.isEmpty(this.inputForm.projectList[0].projectId)){
 							this.$message.error('第一行不能为空')
 							return
 						}