Kaynağa Gözat

功能调整

wangqiang 1 yıl önce
ebeveyn
işleme
c7c8ea8424

+ 21 - 46
src/layout/components/userbar.vue

@@ -3,52 +3,10 @@
 		<div>
 			<search></search>
 		</div>
-<!--		<div class="screen panel-item hidden-sm-and-down" @click="screen">-->
-<!--			<el-icon size="20px"><el-icon-full-screen /></el-icon>-->
-<!--		</div>-->
-<!--		<div class="screen panel-item hidden-sm-and-down" @click="showMsg">-->
-<!--			&lt;!&ndash; <el-badge :hidden="msgList.length==0" :value="msgList.length"  type="danger"> &ndash;&gt;-->
-<!--			<el-icon size="20px"><bell></bell></el-icon>-->
-<!--			&lt;!&ndash; </el-badge> &ndash;&gt;-->
-<!--		</div>-->
-		<!--<el-dropdown class="user panel-item" trigger="hover">
-			<div class="user-avatar">
-				<el-icon size="20px">
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						xmlns:xlink="http://www.w3.org/1999/xlink"
-						aria-hidden="true"
-						role="img"
-						width="1em"
-						height="1em"
-						preserveAspectRatio="xMidYMid meet"
-						viewBox="0 0 512 512"
-					>
-						<path
-							d="M478.33 433.6l-90-218a22 22 0 0 0-40.67 0l-90 218a22 22 0 1 0 40.67 16.79L316.66 406h102.67l18.33 44.39A22 22 0 0 0 458 464a22 22 0 0 0 20.32-30.4zM334.83 362L368 281.65L401.17 362z"
-							fill="currentColor"
-						></path>
-						<path
-							d="M267.84 342.92a22 22 0 0 0-4.89-30.7c-.2-.15-15-11.13-36.49-34.73c39.65-53.68 62.11-114.75 71.27-143.49H330a22 22 0 0 0 0-44H214V70a22 22 0 0 0-44 0v20H54a22 22 0 0 0 0 44h197.25c-9.52 26.95-27.05 69.5-53.79 108.36c-31.41-41.68-43.08-68.65-43.17-68.87a22 22 0 0 0-40.58 17c.58 1.38 14.55 34.23 52.86 83.93c.92 1.19 1.83 2.35 2.74 3.51c-39.24 44.35-77.74 71.86-93.85 80.74a22 22 0 1 0 21.07 38.63c2.16-1.18 48.6-26.89 101.63-85.59c22.52 24.08 38 35.44 38.93 36.1a22 22 0 0 0 30.75-4.9z"
-							fill="currentColor"
-						></path>
-					</svg>
-				</el-icon>
-			</div>
-			<template #dropdown>
-				<el-dropdown-menu>
-					<el-dropdown-item @click="changeLanguage('zh')"
-						>中文</el-dropdown-item
-					>
-					<el-dropdown-item @click="changeLanguage('en')"
-						>EngLish</el-dropdown-item
-					>
-					<el-dropdown-item @click="changeLanguage('ja')"
-						>日本語</el-dropdown-item
-					>
-				</el-dropdown-menu>
-			</template>
-		</el-dropdown>-->
+		<div @click="backlogClick()" class="panel-item">
+			<span :style="{ fontSize: '15px' }">待办</span>
+			<el-badge class="mark" v-if="backlogCount !== 0" :value="backlogCount" :max="99" style="top:-10px;left: -8px;"/>
+		</div>
 
 		<el-dropdown
 			class="user panel-item"
@@ -130,6 +88,7 @@
 </template>
 
 <script>
+import taskService from "@/api/flowable/taskService.js";
 import search from "./search.vue";
 import loginService from "@/api/auth/loginService";
 import setting from "./../components/setting.vue";
@@ -144,6 +103,7 @@ export default {
 			msg: false,
 			searchVisible: false,
 			msgList: [],
+			backlogCount: 0
 		};
 	},
 	async created() {
@@ -158,6 +118,12 @@ export default {
 			readFlag: "0",
 		});
 		this.msgList = data.records;
+		this.fetchBacklogCount();
+		const fetchInterval = 30000;
+		this.fetchIntervalId = setInterval(this.fetchBacklogCount, fetchInterval);
+	},
+	beforeDestroy() {
+		clearInterval(this.fetchIntervalId);
 	},
 	components: {
 		setting,
@@ -178,6 +144,10 @@ export default {
 		},
 	},
 	methods: {
+		async fetchBacklogCount() {
+			const data = await taskService.todoList({ current: 1, size: 10 });
+			this.backlogCount = data.total;
+		},
 		//个人信息
 		handleUser(command) {
 			if (command == "uc") {
@@ -252,6 +222,11 @@ export default {
 		search() {
 			this.searchVisible = true;
 		},
+		backlogClick () {
+			this.$router.push({
+				path: '/flowable/task/TodoList',
+			})
+		},
 	},
 };
 </script>

+ 133 - 16
src/views/cw/invoice/ProgramPageForm.vue

@@ -11,8 +11,75 @@
       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="2" style="margin-right: 20px">报告</el-radio>
+		  <el-radio v-if="hasPermission('cw_finance:invoice:add:report')" v-model="checkType" label="3" style="margin-right: 20px">其他</el-radio>
       </div>
+		<!--报告        -->
+		<div v-if="checkType === '2'" style="height: calc(100% - 80px);">
+			<el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm"
+					 @submit.native.prevent>
+				<!-- 搜索框-->
+				<el-form-item label="项目名称" prop="projectName">
+					<el-input v-model="searchForm.projectName" placeholder="请输入项目名称" clearable></el-input>
+				</el-form-item>
+				<el-form-item label="报告编号" prop="reportNo">
+					<el-input 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()" icon="el-icon-search">查询</el-button>
+					<el-button @click="resetSearch1()" icon="el-icon-refresh-right">重置</el-button>
+				</el-form-item>
+			</el-form>
+
+			<vxe-table
+				border="inner"
+				auto-resize
+				resizable
+				height="400px"
+				:loading="loading"
+				ref="projectTable1"
+				show-header-overflow
+				show-overflow
+				highlight-hover-row
+				:menu-config="{}"
+				:print-config="{}"
+				: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="40px"></vxe-column>
+				<vxe-column min-width="230" align="center" title="项目名称" field="projectName"></vxe-column>
+				<vxe-column min-width="160" 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
+				: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'" style="height: calc(100% - 80px);">
           <el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
             <!-- 搜索框-->
@@ -25,8 +92,8 @@
             <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"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 v-model="searchForm.createDates"
                 type="datetimerange"
                 range-separator="至"
@@ -77,7 +144,7 @@
             @page-change="currentChangeHandle">
           </vxe-pager>
         </div>
-      <div style="height: 500px;" v-if="checkType === '2'">
+      <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">
@@ -114,7 +181,14 @@
           pageSize: 10,
           orders: []
         },
+		  tablePage1: {
+			  total: 0,
+			  currentPage: 1,
+			  pageSize: 10,
+			  orders: []
+		  },
         dataList: [],
+        dataList1: [],
         searchForm: {
           name: '',
           no: '',
@@ -123,6 +197,7 @@
           projectNumber: '',
           projectName: '',
           createDates: [],
+		  reportNo: '',
           status: ''
         },
         checkType: '',
@@ -151,17 +226,23 @@
           this.isShow = true
           this.checkType = '1'
         } else {
-          if (isShow === false || isShow === 'false') {
-            this.isShow = false
-            this.checkType = '1'
-            this.$message({message: '第一条为项目后面新增只能选择项目', type: 'warning', customClass: 'messageZindex'})
-          } else if (isShow === '1') {
-            this.isShow = false
-            this.checkType = '1'
-          } else {
-            this.isShow = false
-            this.checkType = '2'
-          }
+			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 {
+				this.isShow = false
+				this.checkType = '3'
+			}
         }
         if (this.commonJS.isEmpty(num) || num === true) {
           this.num = true // num为true是多选,false是单选
@@ -186,12 +267,25 @@
             }
           }
           rows = this.$refs.projectTable.getCheckboxRecords()
-        } else {
+        } 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)
@@ -210,6 +304,20 @@
           this.loading = false
         })
       },
+		list1 () {
+			this.loading = true
+			this.searchForm.status = '5'
+			this.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
@@ -220,6 +328,15 @@
         this.$refs.searchForm.resetFields()
         this.list()
       },
+		resetSearch1 () {
+			this.$refs.searchForm.resetFields()
+			this.list1()
+		},
+		currentChangeHandle1 ({currentPage, pageSize}) {
+			this.tablePage1.currentPage = currentPage
+			this.tablePage1.pageSize = pageSize
+			this.list1()
+		},
       close () {
         this.detail = ''
         this.visible = false

+ 19 - 1
src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -182,6 +182,7 @@
 <script>
   // import ProjectReportService from '@/api/cw/reportManagement/ProjectReportService'
   // import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
+  import officeService from '@/api/sys/officeService'
   import ReportCancellApplyArchivedService from '@/api/cw/reportCancellApplyArchived/ReportCancellApplyArchivedService'
   import taskService from '@/api/flowable/taskService'
   import processService from '@/api/flowable/processService'
@@ -222,6 +223,8 @@
         loading: false,
         processDefinitionAuditId: '',
         procDefAuditKey: '',
+		  processDefinitionAuditIdSZ: '',
+		  procDefAuditKeySZ: '',
         isAdmin: false,
         create: ''
       }
@@ -246,6 +249,7 @@
       },
       user () {
         this.createName = this.$store.state.user.name
+
         return this.$store.state.user
       }
     },
@@ -334,6 +338,12 @@
             this.procDefAuditKey = data.key
           }
         })
+		  this.processService.getByName('会计-报告作废归档-苏州').then(({data}) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionAuditIdSZ = data.id
+				  this.procDefAuditKeySZ = data.key
+			  }
+		  })
       },
       // 当前页
       currentChangeHandle ({ currentPage, pageSize }) {
@@ -435,12 +445,20 @@
       detail (row) {
         console.log('row', row)
         if (row.applyFileType !== '0' && row.applyFileType !== '1') {
+			officeService.queryById(this.$store.state.user.office.id).then((byId) => {
+				// 判断当前人的所属部门是否为苏州分部,根据部门的机构编码(szfb)来判断是不是苏州分部
+				if (byId.code === 'szfb') {
+					this.procDefId = this.processDefinitionAuditIdSZ
+				} else {
+					this.procDefId = this.processDefinitionAuditId
+				}
+			})
           this.reportCancellApplyArchivedService.findByContractInfoId(row.id).then((data) => {
             if (!this.commonJS.isEmpty(data.id)) {
               console.log('data', data)
               taskService.getTaskDef({
                 procInsId: data.cwProcInsId,
-                procDefId: data.cwProDefId
+                procDefId: this.procDefId
               }).then((data) => {
                 this.$router.push({
                   path: '/flowable/task/TaskFormDetail',

+ 43 - 13
src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedTaskForm.vue

@@ -272,6 +272,8 @@
   import ProjectRecordsChooseCom from '@/views/cw/projectRecords/ProjectRecordsChooseCom'
   // import WorkClientChooseByProjectCom from '@/views/modules/cw/projectReportArchive/WorkClientChooseByProjectCom'
   import ReportChooseByProjectCom from '@/views/cw/projectReportArchive/ReportChooseByProjectCom'
+  import officeService from '@/api/sys/officeService'
+  import processService from '@/api/flowable/processService'
   export default {
     props: {
       businessId: {
@@ -578,17 +580,6 @@
                     }
                   }
                   _this.inputForm.workAttachmentDtoList = _this.$refs.uploadComponent.getDataList()
-                  // await _this.$refs.uploadComponent.getDataList().then((list) => {
-                  //   // list为返回数据
-                  //   _this.inputForm.workAttachmentDtoList = list
-                  //   list.forEach(item => {
-                  //     if (_this.commonJS.isEmpty(item.fileType)) {
-                  //       _this.$message.error('附件中的文件类型不可以为空')
-                  //       _this.loading = false
-                  //       throw new Error('附件中的文件类型不可以为空')
-                  //     }
-                  //   })
-                  // })
                   if (_this.commonJS.isEmpty(_this.inputForm.createDate)) {
                     _this.inputForm.createDate = _this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
                   }
@@ -596,8 +587,47 @@
                 })
               }
               wait().then(() => {
-                this.reportCancellApplyArchivedService.saveForm(this.inputForm).then((data) => {
-                  callback(data.businessTable, data.businessId, this.inputForm)
+				  this.reportCancellApplyArchivedService.saveForm(this.inputForm).then((saveDate) => {
+					  if (status === 'start') {
+						  officeService.queryById(this.$store.state.user.office.id).then((byId) => {
+							  // 判断当前人的所属部门是否为苏州分部,根据部门的机构编码(szfb)来判断是不是苏州分部
+							  if (byId.code === 'szfb') { // 当前人的所属部门为苏州分部
+								  processService.getByName('会计-报告作废归档-苏州').then((data) => {
+									  if (!this.commonJS.isEmpty(data.id)) {
+										  if (status === 'start' || status === 'reapply') {
+											  if (status === 'start') {
+												  this.inputForm.procDefId = data.id
+												  this.inputForm.procDefKey = data.key
+											  }
+											  let processTitle = `${this.$store.state.user.name} 发起了 ${this.inputForm.reportNo} - ${this.inputForm.cwProjectRecordsDTO.projectName} ` + `[会计-报告作废归档-苏州分部]`
+											  this.inputForm.formTitle = processTitle
+											  this.inputForm.title = `发起流程【会计-报告作废归档-苏州分部】`
+										  }
+										  callback(saveDate.businessTable, saveDate.businessId, this.inputForm)
+										  this.loading = false
+									  }
+								  })
+							  } else {
+								  processService.getByName('会计-报告作废归档').then((data) => {
+									  if (!this.commonJS.isEmpty(data.id)) {
+										  if (status === 'start' || status === 'reapply') {
+											  if (status === 'start') {
+												  this.inputForm.procDefId = data.id
+												  this.inputForm.procDefKey = data.key
+											  }
+											  let processTitle = `${this.$store.state.user.name} 发起了 ${this.inputForm.reportNo} - ${this.inputForm.cwProjectRecordsDTO.projectName} ` + `[会计-报告作废归档]`
+											  this.inputForm.formTitle = processTitle
+											  this.inputForm.title = `发起流程【会计-报告作废归档】`
+										  }
+										  callback(saveDate.businessTable, saveDate.businessId, this.inputForm)
+										  this.loading = false
+									  }
+								  })
+							  }
+						  })
+					  } else {
+						  callback(saveDate.businessTable, saveDate.businessId, this.inputForm)
+					  }
                   this.loading = false
                 }).catch(() => {
                   this.loading = false

+ 4 - 4
src/views/cw/workContract/ContractFilePaperForm.vue

@@ -196,8 +196,8 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="合同金额(元)" prop="contractAmount" v-if="inputForm.contractAmountType === '1'"
+        <el-col :span="12" v-if="inputForm.contractAmountType === '1'">
+          <el-form-item label="合同金额(元)" prop="contractAmount"
                         :rules="[
                   {required: true, message:'请输入合同金额(元)', trigger:'blur'}
                ]">
@@ -207,8 +207,8 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="预计金额(元)" prop="predictAmount" v-if="inputForm.contractAmountType === '2'"
+        <el-col :span="12" v-if="inputForm.contractAmountType === '2'">
+          <el-form-item label="预计金额(元)" prop="predictAmount"
                         :rules="[
                   /*{required: true, message:'请输入预计金额(元)', trigger:'blur'}*/
                ]">

+ 4 - 1
src/views/dashboard/widgets/components/MyNoticePageList.vue

@@ -2,7 +2,10 @@
 	<el-card class="box-card">
 		<template #header>
 			<div class="card-header">
-				<span>我的通知</span>
+				<span>
+				我的通知
+				<el-badge class="mark" v-if="tablePage.total !== 0" :value="tablePage.total" :max="99" style="line-height: 0;margin-top: 8px"/>
+				</span>
 				<div style="float:right;">
 					<el-button type="text" @click="refreshList()">刷新</el-button>
 					<el-button type="text" @click="toPendingList()">更多>></el-button>

+ 5 - 1
src/views/dashboard/widgets/components/TodoList.vue

@@ -2,7 +2,10 @@
 	<el-card class="box-card">
 		<template #header>
 			<div class="card-header">
-				<span>我的待办</span>
+				<span>我的待办
+				<el-badge class="mark" v-if="tablePage.total !== 0" :value="tablePage.total" :max="99" style="line-height: 0;margin-top: 8px"/>
+				</span>
+
 				<div style="float:right;">
 					<el-button type="text" @click="refreshList()">刷新</el-button>
 					<el-button type="text" @click="toPendingList()">更多>></el-button>
@@ -315,4 +318,5 @@
 	.box-card {
 		height: 100%;
 	}
+
 </style>

+ 2 - 0
src/views/flowable/task/TaskForm.vue

@@ -654,6 +654,7 @@ export default {
 		// Process_1670486210438 报告复核
 		// Process_1668759076824 报告作废申请
 		// Process_1670548572652 报告作废归档
+		// Process_1670548572655 报告作废归档-苏州
 		// Process_1669700915383 合同登记纸质归档
 		// Process_1669271524486 报销审批
 		// Process_1669275081328 发票申请
@@ -690,6 +691,7 @@ export default {
 				this.procDefId.includes('Process_1670486210438') ||
 				this.procDefId.includes('Process_1668759076824') ||
 				this.procDefId.includes('Process_1670548572652') ||
+				this.procDefId.includes('Process_1670548572655') ||
 				this.procDefId.includes('Process_1669700915383') ||
 				this.procDefId.includes('Process_1669271524486') ||
 				this.procDefId.includes('Process_1669275081328') ||

+ 3 - 1
src/views/home/components/MyNoticePageList2.vue

@@ -2,7 +2,9 @@
 	<el-card class="box-card">
 		<template #header>
 			<div class="card-header">
-				<span>我的通知</span>
+				<span>我的通知
+				<el-badge class="mark" v-if="tablePage.total !== 0" :value="tablePage.total" :max="99" style="line-height: 0;margin-top: 8px"/>
+				</span>
 				<div style="float:right;">
 					<el-button type="text" @click="refreshList()">刷新</el-button>
 					<el-button type="text" @click="toPendingList()">更多>></el-button>

+ 3 - 1
src/views/home/components/TodoList2.vue

@@ -2,7 +2,9 @@
 	<el-card class="box-card">
 		<template #header>
 			<div class="card-header">
-				<span>我的待办</span>
+				<span>我的待办
+				<el-badge class="mark" v-if="tablePage.total !== 0" :value="tablePage.total" :max="99" style="line-height: 0;margin-top: 8px"/>
+				</span>
 				<div style="float:right;">
 					<el-button type="text" @click="refreshList()">刷新</el-button>
 					<el-button type="text" @click="toPendingList()">更多>></el-button>

+ 1 - 1
src/views/materialManagement/collect/CollectForm.vue

@@ -106,7 +106,7 @@
 						<el-input v-model="scope.row.collectNumber" @blur="scope.row.collectNumber = twoDecimalPlaces2(scope.row.collectNumber)" maxlength="10"></el-input>
 					</template>
 				</vxe-table-column>
-				<vxe-table-column v-if="this.status === 'audit'" field="surplusNumber" title="库存数量" :edit-render="{}">
+				<vxe-table-column field="surplusNumber" title="库存数量" :edit-render="{}">
 					<template v-slot:edit="scope">
 						<el-input :disabled="true" v-model="scope.row.surplusNumber" maxlength="10"></el-input>
 					</template>

+ 1 - 2
src/views/program/registered/ProjectArchiveForm.vue

@@ -265,10 +265,9 @@
 				  </el-form-item>
 			  </el-col>
 
-            <el-col :span="12">
+            <el-col :span="12" v-else>
               <el-form-item label="租金类型" prop="rentType"
                             :rules=" [
-                        {required: true, message:'租金类型不能为空', trigger:'blur'}
                         ]" >
                 <el-input v-model="inputForm.rentType" maxlength="64" placeholder="请填写租金类型"   clearable  ></el-input>
               </el-form-item>