调整

src/api/jy/KnowledgeShareInfoService.js

@@ -44,4 +44,11 @@ export default class KnowledgeShareInfoService {
       params: {id: id}
     })
   }
+  getComments(id){
+	  return request({
+		  url: prefix +'/knowledgeShare/info/getComments',
+		  method: 'get',
+		  params: {id: id}
+	  })
+  }
 }

src/api/sys/OSSService.js

@@ -238,6 +238,12 @@ export async function openWindowOnUrl (row) {
 }
 
 export async function toHref (row) {
+	let name
+	if (row.attachmentName === '' || row.attachmentName === null ||row.attachmentName === undefined){
+		name = row.name
+	}else {
+		name = row.attachmentName
+	}
   if (row.url === null || row.url === undefined || row.url === '') {
     // Message.error('没有获取到文件的url')
     return
@@ -248,7 +254,7 @@ export async function toHref (row) {
     // 这里是将url转成blob地址，
     fetch(url).then(res => res.blob()).then(blob => { // 将链接地址字符内容转变成blob地址
       link.href = URL.createObjectURL(blob)
-      link.download = row.name || '' // 下载文件的名字
+      link.download = name || '' // 下载文件的名字
       // a.download = url.split('/')[url.split('/').length -1] //  // 下载文件的名字
       document.body.appendChild(link)
       link.click()

src/views/common/InscriptionUpLoadComponent.vue

@@ -70,6 +70,7 @@
     // eslint-disable-next-line no-unused-vars
     handleRemove,
     fileName,
+	  exnameFix,
     // eslint-disable-next-line no-unused-vars
     beforeAvatarUpload,
     // eslint-disable-next-line no-unused-vars
@@ -277,6 +278,15 @@
         // if (file.status !== 'ready') {
         //   return
         // }
+		  if (!exnameFix(file, '1', 'doc,docx,pdf,xls,xlsx')) {
+			  for (let i = 0; i <this.dataListNew.length ; i++) {
+				  this.deleteById(this.dataListNew[i],i,this.dataListNew)
+			  }
+			  this.fileList = []
+			  this.dataListNew = []
+			  // this.$message.error('文件仅支持 xml 格式!')
+			  return
+		  }
 		  fileList.forEach((item)=>{
 			  let suffix = item.name.substring(item.name.lastIndexOf('.') + 1)
 				  if (suffix === 'pdf' || suffix === 'doc' || suffix === 'docx' || suffix === 'xls' || suffix === 'xlsx') {

src/views/dashboard/widgets/components/MyFlowCopyList.vue

@@ -40,7 +40,7 @@
 						text
 						icon="view-filled"
 						@click="detail(scope.row)"
-					>查阅审批</el-button
+					>查阅</el-button
 					>
 				</template>
 			</el-table-column>

src/views/flowable/extension/FlowCopyList.vue

@@ -17,6 +17,15 @@
 					clearable
 				></el-input>
 			</el-form-item>
+			<el-form-item label="抄送发起人" prop="createBy.name">
+				<el-input  v-model="searchForm.createBy.name" placeholder="请选择抄送发起人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+							<!--						<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value, label) => {searchForm.assigneeId = value}'></UserSelect2>-->
+						</el-button>
+					</template>
+				</el-input>
+			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" @click="refreshList()" icon="search"
 					>查询</el-button
@@ -148,6 +157,10 @@
 				</vxe-pager>
 			</div>
 		</div>
+		<user-select2
+			ref="userSelect2"
+			@doSubmit="selectUser">
+		</user-select2>
 	</div>
 </template>
 
@@ -156,12 +169,16 @@
 import pick from "lodash.pick";
 import taskService from "@/api/flowable/taskService";
 import flowCopyService from "@/api/flowable/flowCopyService";
+import UserSelect2 from '@/components/userSelect2/UserSelectDialog';
 export default {
 	data() {
 		return {
 			searchVisible: true,
 			searchForm: {
 				procInsName: "",
+				createBy:{
+					name:""
+				}
 			},
 			tablePage: {
 				total: 0,
@@ -174,6 +191,9 @@ export default {
 			visible: false,
 		};
 	},
+	components: {
+		UserSelect2
+	},
 	mounted() {
 		this.$nextTick(() => {
 			// 将表格和工具栏进行关联
@@ -197,6 +217,7 @@ export default {
 					...this.searchForm,
 				})
 				.then((data) => {
+					console.log('data',data.records)
 					this.dataList = data.records;
 					this.tablePage.total = data.total;
 					this.loading = false;
@@ -285,6 +306,13 @@ export default {
 			this.$refs.searchForm.resetFields();
 			this.refreshList();
 		},
+		openUserDia(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser(user){
+			console.log(user[0].name)
+			this.searchForm.createBy.name=user[0].name
+		}
 	},
 };
 </script>

src/views/jy/borrowMoney/BorrowDia.vue

@@ -67,6 +67,8 @@
 				</el-col>
 			</el-row>
 		</el-form>
+			<!-- 附件 -->
+			<UpLoadComponent ref="uploadComponent"></UpLoadComponent>
 			<template #footer>
 			<span class="dialog-footer">
 			  <el-button @click="close()" icon="el-icon-circle-close">关闭</el-button>
@@ -82,6 +84,7 @@
 	import BorrowService from '@/api/jy/BorrowService'
 	import { ElDatePicker } from 'element-plus';
 	import CommonApi from '@/api/cw/common/CommonApi'
+	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	export default {
 		props: {
 			businessId: {
@@ -118,7 +121,8 @@
 					status:'',
 					finalMoney:'',
 					endMoney:'',
-					refundId:''
+					refundId:'',
+					files:[]
 				},
 				baseKey: '',
 				keyWatch: '',
@@ -137,11 +141,13 @@
 		activated () {
 		},
 		components: {
-			ElDatePicker
+			ElDatePicker,
+			UpLoadComponent,
 		},
 		computed: {
 			bus: {
 				get () {
+					this.$refs.uploadComponent.setDividerName('附件')
 					return this.businessId
 				},
 				set (val) {
@@ -167,6 +173,7 @@
 			'loading': {
 				handler (newVal) {
 					this.$emit('changeLoading', newVal)
+					this.$refs.uploadComponent.changeLoading(newVal)
 				}
 			}
 		},
@@ -190,7 +197,8 @@
 					moneyLower:'', // 借款金额小写
 					money:'', // 借款金额小写
 					endMoney:'',
-					refundId:''
+					refundId:'',
+					files:[]
 				}
 				this.inputForm.id = id
 				this.loading = false
@@ -202,6 +210,7 @@
 						console.log('this.inputForm.id', this.inputForm.id)
 						this.borrowService.getByReId(this.inputForm.id).then((data)=>{
 							console.log('this.inputForm', this.inputForm)
+							this.$refs.uploadComponent.clearUpload()
 							this.inputForm = this.recover(this.inputForm, data)
 							if (this.commonJS.isEmpty(this.inputForm.createName)){
 								this.inputForm.createName=this.$store.state.user.name
@@ -214,7 +223,11 @@
 							if (this.commonJS.isNotEmpty(this.inputForm.refundLower)){
 								this.convert(this.inputForm.refundLower)
 							}
+							if (this.commonJS.isEmpty(this.inputForm.files)) {
+								this.inputForm.files = []
+							}
 							this.inputForm.endMoney=data.finalMoney
+							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'borrowMoney')
 						})
 						this.loading = false
 					}

src/views/jy/borrowMoney/BorrowForm.vue

@@ -1,6 +1,6 @@
 <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'"
+		<el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
 				 label-width="160px" @submit.native.prevent>
 			<el-divider content-position="left"><i class="el-icon-document"></i>
 				借款申请
@@ -27,7 +27,7 @@
 				<el-col :span="12">
 					<el-form-item label="借款金额(小写)" prop="moneyLower"
 								  :rules="[{required: true, message:'请输入借款金额(小写)', trigger:'blur'}]">
-						<el-input v-on:input="inputForm.moneyLower=inputForm.moneyLower.replace(/[^\d.]/g,'')
+						<el-input  v-on:input="inputForm.moneyLower=inputForm.moneyLower.replace(/[^\d.]/g,'')
 							  .replace(/^\./g,'')
 							  .replace(/\.{2,}/g,'.')
 							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
@@ -47,6 +47,8 @@
 					</el-form-item>
 				</el-col>
 			</el-row>
+			<!-- 附件 -->
+			<UpLoadComponent ref="uploadComponent"></UpLoadComponent>
 		</el-form>
 	</div>
 </template>
@@ -56,6 +58,7 @@
 	import BorrowService from '@/api/jy/BorrowService'
 	import { ElDatePicker } from 'element-plus';
 	import CommonApi from '@/api/cw/common/CommonApi'
+	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	export default {
 		props: {
 			businessId: {
@@ -86,7 +89,8 @@
 					moneyLower:'', // 借款金额小写
 					money:'', //借款金额大写
 					procInsId:'',
-					status:''
+					status:'',
+					files:[]
 				},
 				baseKey: '',
 				keyWatch: '',
@@ -105,11 +109,13 @@
 		activated () {
 		},
 		components: {
-			ElDatePicker
+			ElDatePicker,
+			UpLoadComponent,
 		},
 		computed: {
 			bus: {
 				get () {
+					this.$refs.uploadComponent.setDividerName('附件')
 					return this.businessId
 				},
 				set (val) {
@@ -135,6 +141,7 @@
 			'loading': {
 				handler (newVal) {
 					this.$emit('changeLoading', newVal)
+					this.$refs.uploadComponent.changeLoading(newVal)
 				}
 			}
 		},
@@ -153,7 +160,8 @@
 					reason: '',
 					moneyLower:'', // 借款金额小写
 					money:'', //借款金额大写
-					procInsId:''
+					procInsId:'',
+					files:[]
 				}
 				this.inputForm.id = id
 				this.loading = false
@@ -161,8 +169,8 @@
 					this.$refs.inputForm.resetFields()
 					this.loading = true
 					if (this.commonJS.isNotEmpty(this.inputForm.id)) {
-						console.log('this.inputForm.id', this.inputForm.id)
 						this.borrowService.queryById(this.inputForm.id).then((data)=>{
+							this.$refs.uploadComponent.clearUpload()
 							this.inputForm = this.recover(this.inputForm, data)
 							if (this.commonJS.isEmpty(this.inputForm.createName)){
 								this.inputForm.createName=this.$store.state.user.name
@@ -172,7 +180,16 @@
 							if (this.commonJS.isEmpty(this.inputForm.createTime)){
 								this.inputForm.createTime=this.moment(new Date()).format('YYYY-MM-DD')
 							}
+							if (this.commonJS.isEmpty(this.inputForm.files)) {
+								this.inputForm.files = []
+							}
+							if (this.status === 'audit' || this.status === 'taskFormDetail') {
+								method = 'view'
+							}
+							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'borrowMoney')
 						})
+						console.log('this.inputForm', this.inputForm)
+
 						this.loading = false
 					}
 				})
@@ -206,6 +223,11 @@
 						throw new Error()
 					} else {
 						this.inputForm.status= '2'
+						if (this.$refs.uploadComponent.checkProgress()) {
+							this.loading = false
+							return
+						}
+						this.inputForm.files = this.$refs.uploadComponent.getDataList()
 						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data)=>{
 							if (this.commonJS.isNotEmpty(data)) {
 								if (data === '总经理审核') {
@@ -238,12 +260,20 @@
 			// 表单提交
 			async doSubmit(status, callback) {
 				this.loading = true
+				if (this.$refs.uploadComponent.checkProgress()) {
+					this.loading = false
+					return
+				}
 				console.log('5',this.inputForm)
 				if (status === 'save') {
 					// 暂存
 					this.loading = true
 					this.inputForm.status = '1'
 					this.inputForm.createTime=''
+					if (this.commonJS.isEmpty(this.inputForm.files)) {
+						this.inputForm.files = []
+					}
+					this.inputForm.files = this.$refs.uploadComponent.getDataList()
 					this.borrowService.saveForm(this.inputForm).then((data) => {
 						callback(data.businessTable, data.businessId, this.inputForm)
 						this.loading = false
@@ -272,6 +302,10 @@
 					if (valid) {
 						this.loading = true
 						console.log('form',this.inputForm)
+						if (this.commonJS.isEmpty(this.inputForm.files)) {
+							this.inputForm.files = []
+						}
+						this.inputForm.files = this.$refs.uploadComponent.getDataList()
 						this.borrowService.saveForm(this.inputForm).then((data) => {
 							callback(data.businessTable, data.businessId, this.inputForm)
 							this.$refs.inputForm.resetFields()
@@ -302,6 +336,7 @@
 					number:'', //用印份数
 					projectId:'',
 				}
+				this.$refs.uploadComponent.clearUpload()
 				this.visible = false
 			},
 			async updateStatusById(type, callback) {

src/views/jy/borrowMoney/BorrowMoneyList.vue

@@ -136,7 +136,7 @@
 								<el-button v-if="hasPermission('borrow:edit')&&scope.row.status === '4'&&scope.row.createById === $store.state.user.id" text type="primary" size="small" @click="adjust(scope.row)">驳回调整</el-button>
 								<el-button v-if="hasPermission('borrow:edit')&&scope.row.status === '5'&&scope.row.createById === $store.state.user.id &&(commonJS.isEmpty(scope.row.refundStatus) ||scope.row.refundStatus === '0' || scope.row.refundStatus === '1' || scope.row.refundStatus === '5' || scope.row.refundStatus=== '3')" text type="primary" size="small" @click="addRefund(scope.row)">还款申请</el-button>
 								<el-button v-if="hasPermission('borrow:edit')&&scope.row.createById === $store.state.user.id && scope.row.refundStatus==='2'" text type="primary" size="small" @click="rebackAccount(scope.row)">还款撤回</el-button>
-								<el-button v-if="scope.row.createById === $store.state.user.id && scope.row.refundStatus==='3'" text type="primary" size="small" @click="rebackRequest(scope.row)">取消还款</el-button>
+								<el-button v-if="scope.row.createById === $store.state.user.id && (scope.row.refundStatus==='3' || scope.row.refundStatus === '1')" text type="primary" size="small" @click="rebackRequest(scope.row)">取消还款</el-button>
 
 								<el-button v-if="hasPermission('borrow:edit')&&scope.row.refundStatus==='2' && checkIsAudit(scope.row)" text type="primary" size="small" @click="examineAccount(scope.row)">还款审核</el-button>
 								<el-button v-if="hasPermission('borrow:edit')&&scope.row.refundStatus === '4'&&scope.row.createById === $store.state.user.id" text type="primary" size="small" @click="adjustAccount(scope.row)">还款驳回调整</el-button>
@@ -670,7 +670,8 @@
 			//取消还款
 			rebackRequest (row) {
 				this.borrowService.queryById(row.refundId).then((data) => {
-					if (data.refundStatus !== '3') { // status的值不等于“撤回”，就弹出提示
+					console.log('data.refundStatus',data.refundStatus)
+					if (data.refundStatus !== '1' && data.refundStatus !== '3') { // status的值不等于“撤回”,"暂存"，就弹出提示
 						this.$message.error('数据已发生改变或不存在，请刷新数据')
 						this.refreshList()
 					} else {

src/views/jy/borrowMoney/RefundForm.vue

@@ -177,13 +177,32 @@
 							}
 							this.inputForm.endMoney=data.finalMoney
 							console.log('data',data)
-							if (data.boMoney<data.finalMoney){
+							if (data.boMoney<data.finalMoney ){
 								this.inputForm.finalMoney = data.boMoney
 								this.inputForm.endMoney=data.boMoney
 							}
 							if (data.refundStatus === '5'){
 								this.inputForm.refundLower = ''
 							}
+							if (data.refundStatus === '1'){
+								this.borrowService.findByBorId(data.refundId).then((da)=>{
+									console.log('da',da)
+									if (da.length === 0){
+										this.inputForm.finalMoney = data.moneyLower
+										this.inputForm.endMoney=data.moneyLower
+									}else {
+										let money = 0
+										for (let i = 0; i < da.length; i++) {
+											money += parseFloat(da[i].refundMoney)
+										}
+										 let money1=parseFloat(data.moneyLower)
+										let money2 = money1 - money
+										this.inputForm.finalMoney = money2
+										this.inputForm.endMoney=money2
+									}
+								})
+
+							}
 						})
 						this.loading = false
 					}

src/views/jy/driveMaintain/DriveMaintain.vue

@@ -325,7 +325,7 @@
 					type: 'warning'
 				}).then(() => {
 					this.loading = true
-					this.driveService.delete(ids).then((data) => {
+					this.driveMaintainService.delete(ids).then((data) => {
 						this.$message.success(data)
 						this.refreshList()
 						this.loading = false

src/views/jy/humanResources/EntryList.vue

@@ -147,7 +147,8 @@
 					</vxe-column>
 					<vxe-column  min-width="150px" align="center" title="转正状态" field="type" fixed="right">
 						<template #default="scope">
-							<el-button @click="detailApply(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.applyStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.applyStatus, '未登记')}} </el-button>
+							<el-button v-if="scope.row.applyStatus === '5' && scope.row.isPass ==='1' && scope.row.isEmploy === '0' && scope.row.isPostpone ==='0'" @click="detailApply(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.applyStatus, '')" effect="dark" >顺延完成 </el-button>
+							<el-button v-else @click="detailApply(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.applyStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.applyStatus, '未登记')}} </el-button>
 						</template>
 					</vxe-column>
 					<vxe-column title="操作"  min-width="150" fixed="right" align="center">
@@ -170,7 +171,7 @@
 								<el-button v-if="hasPermission('entry:edit') && scope.row.type==='2' && checkIsAudit(scope.row)" text type="primary" size="small" @click="examine(scope.row)">审核</el-button>
 								<el-button v-if="hasPermission('entry:edit') && scope.row.type === '4'&&scope.row.createById === $store.state.user.id" text type="primary" size="small" @click="adjust(scope.row)">驳回调整</el-button>
 								<!--转正申请								-->
-								<el-button v-if="hasPermission('entry:edit') && scope.row.userId === $store.state.user.id && scope.row.type === '5' && scope.row.onJobStatus === '1' &&(scope.row.applyStatus === '0'||scope.row.applyStatus === '1'|| scope.row.applyStatus === '3')" text type="primary" size="small" @click="apply(scope.row)">转正申请</el-button>
+								<el-button v-if="hasPermission('entry:edit') && scope.row.userId === $store.state.user.id && scope.row.type === '5' && scope.row.onJobStatus === '1' &&(scope.row.applyStatus === '0'||scope.row.applyStatus === '1'|| scope.row.applyStatus === '3' ||(scope.row.applyStatus === '5' && scope.row.isPass ==='1' && scope.row.isEmploy === '0' && scope.row.isPostpone ==='0'))" text type="primary" size="small" @click="apply(scope.row)">转正申请</el-button>
 								<el-button v-if="hasPermission('entry:edit') && scope.row.applyStatus==='2'" text type="primary" size="small" @click="rebackApply(scope.row)">撤回</el-button>
 
 								<el-button v-if="hasPermission('entry:edit') && scope.row.applyStatus==='2' && checkIsAudit(scope.row)" text type="primary" size="small" @click="examineApply(scope.row)">审核</el-button>
@@ -647,25 +648,26 @@
 			// 查看修改流程结果
 			detailApply (row) {
 				if (row.applyStatus !== '0' && row.applyStatus !== '1') {
-					this.entryService.queryByApplyId(row.applyId).then((da)=>{
-						// eslint-disable-next-line eqeqeq
-						taskService.getTaskDef({
-							procInsId: row.procInsIdApply,
-							procDefId: this.processDefinitionIdApply
-						}).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.applyId,
-									status: 'reback',
-									method: 'view'
-								}
-							})
+					// this.entryService.queryByApplyId(row.applyId).then((da)=>{
+					// 	// eslint-disable-next-line eqeqeq
+					//
+					// })
+					taskService.getTaskDef({
+						procInsId: row.procInsIdApply,
+						procDefId: this.processDefinitionIdApply
+					}).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.applyId,
+								status: 'reback',
+								method: 'view'
+							}
 						})
 					})
 				}

src/views/jy/humanResources/RegularForm.vue

@@ -75,7 +75,7 @@
 				</el-col>
 			</el-row>
 		</el-form>
-<!--		<UpLoadComponent ref="uploadComponent"></UpLoadComponent>-->
+		<UpLoadComponent ref="uploadComponent"></UpLoadComponent>
 
 	</div>
 </template>
@@ -118,6 +118,7 @@
 					isPass:'',
 					isEmploy:'',
 					isPostpone:'',
+					files:[]
 				},
 				baseKey: '',
 				keyWatch: '',
@@ -144,7 +145,7 @@
 		computed: {
 			bus: {
 				get () {
-					// this.$refs.uploadComponent.setDividerName('附件')
+					this.$refs.uploadComponent.setDividerName('附件')
 					return this.businessId
 				},
 				set (val) {
@@ -170,7 +171,7 @@
 			'loading': {
 				handler (newVal) {
 					this.$emit('changeLoading', newVal)
-					// this.$refs.uploadComponent.changeLoading(newVal)
+					this.$refs.uploadComponent.changeLoading(newVal)
 				}
 			}
 		},
@@ -190,6 +191,7 @@
 					isPass:'',
 					isEmploy:'',
 					isPostpone:'',
+					files:[]
 				}
 				this.inputForm.id = id
 				this.loading = false
@@ -201,6 +203,14 @@
 						console.log('this.inputForm.id', this.inputForm.id)
 						this.entryService.queryByApplyId(this.inputForm.id).then((data)=>{
 							this.inputForm = this.recover(this.inputForm, data)
+							if ('5' === data.status){
+								this.inputForm.reason = ''
+								this.inputForm.files = []
+								this.inputForm.isPass = ''
+								this.inputForm.isEmploy = ''
+								this.inputForm.isPostpone = ''
+							}
+
 							console.log('s',this.inputForm)
 							if (this.commonJS.isEmpty(this.inputForm.createName)){
 								this.inputForm.createName = this.$store.state.user.name
@@ -211,11 +221,14 @@
 							if (this.commonJS.isEmpty(this.inputForm.createTime)){
 								this.inputForm.createTime=this.moment(new Date()).format('YYYY-MM-DD')
 							}
+							if (this.commonJS.isEmpty(this.inputForm.files)){
+								this.inputForm.files=[]
+							}
 							if (this.status === 'audit' || this.status === 'taskFormDetail') {
 								method = 'view'
 							}
 							console.log('me',method)
-							// this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'jyHoliday',null,null,null,null,null)
+							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'regular',null,null,null,null,null)
 							this.loading = false
 						})
 						userService.isBmzr().then((data)=>{
@@ -229,20 +242,21 @@
 				this.doSubmit('save', callback)
 			},
 			startForm(callback) {
-				this.loading = true
-				if (this.commonJS.isNotEmpty(this.inputForm.id)) {
-					this.entryService.queryByApplyId(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)
-				}
+				this.doSubmit('start', callback)
+				// this.loading = true
+				// if (this.commonJS.isNotEmpty(this.inputForm.id)) {
+				// 	this.entryService.queryByApplyId(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 {
+				//
+				// }
 			},
 			async agreeForm(callback) {
 				console.log('进入方法')
@@ -296,6 +310,7 @@
 						}
 					} else {
 						this.inputForm.status= '2'
+						this.inputForm.createTime = ''
 						if (this.inputForm.isPass ==='0'){
 							this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((da)=>{
 								if (this.commonJS.isNotEmpty(da)) {
@@ -364,12 +379,17 @@
 			// 表单提交
 			async doSubmit(status, callback) {
 				this.loading = true
+				if (this.$refs.uploadComponent.checkProgress()) {
+					this.loading = false
+					return
+				}
 				console.log('5',this.inputForm)
 				if (status === 'save') {
 					// 暂存
 					this.loading = true
 					this.inputForm.status = '1'
-					// this.inputForm.files = this.$refs.uploadComponent.getDataList()
+					this.inputForm.createTime = ''
+					this.inputForm.files = this.$refs.uploadComponent.getDataList()
 					this.entryService.saveApplyForm(this.inputForm).then((data) => {
 						callback(data.businessTable, data.businessId, this.inputForm,data.isPass,data.isEmploy)
 						this.loading = false
@@ -378,7 +398,8 @@
 					})
 					return
 				} else if (status === 'start') {
-					// this.inputForm.files = this.$refs.uploadComponent.getDataList()
+					this.inputForm.createTime = ''
+					this.inputForm.files = this.$refs.uploadComponent.getDataList()
 					// 送审  待审核
 					this.inputForm.status = '2'
 				} else if (status === 'agree') {

src/views/jy/knowledgeShare/InfoForm.vue

@@ -65,26 +65,26 @@
 					@cell-click=""
 					@edit-closed=""
 					highlight-current-row
-					:edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
+
 				>
 					<vxe-table-column field="userName" title="访问人" :edit-render="{}">
 						<template #default="scope">
-							<el-input :disbale="method === 'view'" v-model="scope.row.userName" ></el-input>
+							<el-input :readonly="true" :disbale="method === 'view'" v-model="scope.row.userName" >{{scope.row.userName}}</el-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="firstTime" title="首次访问时间" :edit-render="{}">
 						<template #default="scope">
-							<el-input :disbale="method === 'view'" v-model="scope.row.firstTime" ></el-input>
+							<el-input :readonly="true" :disbale="method === 'view'" v-model="scope.row.firstTime" >{{scope.row.firstTime}}</el-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="lastTime" title="最近访问时间" :edit-render="{}">
 						<template #default="scope">
-							<el-input :disbale="method === 'view'" v-model="scope.row.lastTime" ></el-input>
+							<el-input :readonly="true" :disbale="method === 'view'" v-model="scope.row.lastTime" >{{scope.row.lastTime}}</el-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="num" title="访问次数" :edit-render="{}">
 						<template #default="scope">
-							<el-input :disbale="method === 'view'" v-model="scope.row.num" ></el-input>
+							<el-input :readonly="true" :disbale="method === 'view'" v-model="scope.row.num" >{{scope.row.num}}</el-input>
 						</template>
 					</vxe-table-column>
 				</vxe-table>
@@ -136,10 +136,12 @@
 
         <KnowledgeShareTypePageForm ref="knowledgeShareTypePageForm" @getProgram="getProgram"></KnowledgeShareTypePageForm>
       </el-form>
+		<template #footer>
       <span slot="footer" class="dialog-footer" style="float: right">
-      <el-button size="primary" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button  @click="close()" icon="el-icon-circle-close">关闭</el-button>
       <el-button size="primary" type="primary" v-if="method != 'view'" @click="doSubmit()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
-    </span>
+	  </span>
+		</template>
     </el-dialog>
   </div>
 </template>
@@ -359,9 +361,12 @@
         }
         this.loading = true
         this.knowledgeShareInfoService.addComment(this.commentForm).then((data) => {
-          this.init('view', this.inputForm.id)
-          this.$message.success(data)
-          this.loading = false
+			this.knowledgeShareInfoService.getComments(this.inputForm.id).then((da)=>{
+				this.inputForm.comments = da.comments
+				this.$message.success(data)
+				this.loading = false
+			})
+
         })
       },
       cleanComment () {

src/views/jy/payment/PaymentDia.vue

@@ -191,6 +191,8 @@
 				</el-col>
 			</el-row>
 		</el-form>
+			<!-- 附件 -->
+			<UpLoadComponent ref="uploadComponent"></UpLoadComponent>
 		<ProjectForm ref="projectForm" @getProgram="getProgram"></ProjectForm>
 		<WorkClientChooseRadio ref="workClientChooseRadio" @getWorkClientRadioChoose="getWorkClientRadioChoose"></WorkClientChooseRadio>
 			<template #footer>
@@ -213,6 +215,7 @@
 	import UserSelectSignatory from '../workClientInfo/clientUserSelect'
 	import WorkClientService from '@/api/jy/WorkClientService'
 	import UserSelect from '@/components/userSelect'
+	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	export default {
 		props: {
 			businessId: {
@@ -253,7 +256,8 @@
 					proceedOfficeName:'',//收款单位名称
 					amountPaid:'', //累计已支付金额
 					proceedType:'', //收款类别
-					paymentType:'' //付款方式
+					paymentType:'', //付款方式
+					files:[]
 				},
 				baseKey: '',
 				keyWatch: '',
@@ -281,10 +285,12 @@
 			WorkClientChooseRadio,
 			UserSelectSignatory,
 			UserSelect,
+			UpLoadComponent,
 		},
 		computed: {
 			bus: {
 				get () {
+					this.$refs.uploadComponent.setDividerName('附件')
 					return this.businessId
 				},
 				set (val) {
@@ -310,6 +316,7 @@
 			'loading': {
 				handler (newVal) {
 					this.$emit('changeLoading', newVal)
+					this.$refs.uploadComponent.changeLoading(newVal)
 				}
 			}
 		},
@@ -338,7 +345,8 @@
 					proceedOfficeName:'',//收款单位名称
 					amountPaid:'', //累计已支付金额
 					proceedType:'', //收款类别
-					paymentType:'' //付款方式
+					paymentType:'', //付款方式
+					files:[]
 				}
 				this.inputForm.id = id
 				this.loading = false
@@ -349,6 +357,7 @@
 					if (this.commonJS.isNotEmpty(this.inputForm.id)) {
 						console.log('this.inputForm.id', this.inputForm.id)
 						this.paymentService.queryById(this.inputForm.id).then((data)=>{
+							this.$refs.uploadComponent.clearUpload()
 							this.inputForm = this.recover(this.inputForm, data)
 							if (this.commonJS.isEmpty(data.projectDTOList)){
 								this.inputForm.projectDTOList=[]
@@ -373,7 +382,10 @@
 									}
 								})
 							}
-
+							if (this.commonJS.isEmpty(this.inputForm.files)) {
+								this.inputForm.files = []
+							}
+							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'paymentMoney')
 						})
 						this.loading = false
 					}

src/views/jy/payment/PaymentForm.vue

@@ -184,6 +184,8 @@
 		</el-form>
 		<ProjectForm ref="projectForm" @getProgram="getProgram"></ProjectForm>
 		<WorkClientChooseRadio ref="workClientChooseRadio" @getWorkClientRadioChoose="getWorkClientRadioChoose"></WorkClientChooseRadio>
+		<!-- 附件 -->
+		<UpLoadComponent ref="uploadComponent"></UpLoadComponent>
 	</div>
 </template>
 
@@ -197,6 +199,7 @@
 	import UserSelectSignatory from '../workClientInfo/clientUserSelect'
 	import WorkClientService from '@/api/jy/WorkClientService'
 	import UserSelect from '@/components/userSelect'
+	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	export default {
 		props: {
 			businessId: {
@@ -236,7 +239,8 @@
 					proceedOfficeName:'',//收款单位名称
 					amountPaid:'', //累计已支付金额
 					proceedType:'', //收款类别
-					paymentType:'' //付款方式
+					paymentType:'', //付款方式
+					files:[]
 				},
 				baseKey: '',
 				keyWatch: '',
@@ -264,10 +268,12 @@
 			WorkClientChooseRadio,
 			UserSelectSignatory,
 			UserSelect,
+			UpLoadComponent,
 		},
 		computed: {
 			bus: {
 				get () {
+					this.$refs.uploadComponent.setDividerName('附件')
 					return this.businessId
 				},
 				set (val) {
@@ -293,6 +299,7 @@
 			'loading': {
 				handler (newVal) {
 					this.$emit('changeLoading', newVal)
+					this.$refs.uploadComponent.changeLoading(newVal)
 				}
 			}
 		},
@@ -321,7 +328,8 @@
 					proceedOfficeName:'',//收款单位名称
 					amountPaid:'', //累计已支付金额
 					proceedType:'', //收款类别
-					paymentType:'' //付款方式
+					paymentType:'', //付款方式
+					files:[]
 				}
 				this.inputForm.id = id
 				this.loading = false
@@ -331,6 +339,7 @@
 					if (this.commonJS.isNotEmpty(this.inputForm.id)) {
 						console.log('this.inputForm.id', this.inputForm.id)
 						this.paymentService.queryById(this.inputForm.id).then((data)=>{
+							this.$refs.uploadComponent.clearUpload()
 							this.inputForm = this.recover(this.inputForm, data)
 							if (this.commonJS.isEmpty(this.inputForm.projectDTOList)){
 								this.inputForm.projectDTOList=[]
@@ -355,6 +364,13 @@
 									}
 								})
 							}
+							if (this.commonJS.isEmpty(this.inputForm.files)) {
+								this.inputForm.files = []
+							}
+							if (this.status === 'audit' || this.status === 'taskFormDetail') {
+								method = 'view'
+							}
+							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'paymentMoney')
 
 						})
 						this.loading = false
@@ -390,6 +406,11 @@
 						throw new Error()
 					} else {
 						this.inputForm.status= '2'
+						if (this.$refs.uploadComponent.checkProgress()) {
+							this.loading = false
+							return
+						}
+						this.inputForm.files = this.$refs.uploadComponent.getDataList()
 						this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data)=>{
 							if (this.commonJS.isNotEmpty(data)) {
 								if (data === '总经理审核') {
@@ -425,12 +446,19 @@
 				if (this.commonJS.isEmpty(this.inputForm.paymentUser)){
 					this.inputForm.paymentUser== this.$store.state.user.id
 				}
+				if (this.$refs.uploadComponent.checkProgress()) {
+					this.loading = false
+					return
+				}
 				console.log('5',this.inputForm)
 				if (status === 'save') {
 					// 暂存
 					this.loading = true
 					this.inputForm.status = '1'
-
+					if (this.commonJS.isEmpty(this.inputForm.files)) {
+						this.inputForm.files = []
+					}
+					this.inputForm.files = this.$refs.uploadComponent.getDataList()
 					this.paymentService.saveForm(this.inputForm).then((data) => {
 						callback(data.businessTable, data.businessId, this.inputForm)
 						this.loading = false
@@ -479,6 +507,10 @@
 					if (valid) {
 						this.loading = true
 						console.log('form',this.inputForm)
+						if (this.commonJS.isEmpty(this.inputForm.files)) {
+							this.inputForm.files = []
+						}
+						this.inputForm.files = this.$refs.uploadComponent.getDataList()
 						this.paymentService.saveForm(this.inputForm).then((data) => {
 							callback(data.businessTable, data.businessId, this.inputForm)
 							this.$refs.inputForm.resetFields()
@@ -509,6 +541,7 @@
 					dutyNumber:'', //税号
 					remarks:'',//摘要
 				}
+				this.$refs.uploadComponent.clearUpload()
 				this.visible = false
 			},
 			async updateStatusById(type, callback) {

src/views/jy/project/ProjectAuditForm.vue

@@ -324,9 +324,9 @@
 							this.inputForm.auditLevel=data.auditLevel
 							this.inputForm.no = data.jyProjectList.no
 							console.log('this.inputForm',this.inputForm)
-							if (this.commonJS.isNotEmpty(this.inputForm.auditPeople)){
-								this.isEdit=true
-							}
+							// if (this.commonJS.isNotEmpty(this.inputForm.auditPeople)){
+							// 	this.isEdit=true
+							// }
 
 							if (this.commonJS.isNotEmpty(data.initialAuditOpinion)){
 								this.inputForm.initialAuditOpinion=data.initialAuditOpinion.replace(/<br\/>/g, "\n")