预开票

src/views/cw/invoice/InvoiceFormTask.vue

@@ -64,11 +64,11 @@
 						</el-input>
 					</template>
 				</vxe-table-column>
-<!--				<vxe-table-column field="isPreInvoice" align="center" title="是否预开票" :edit-render="{}">-->
-<!--					<template #default="scope">-->
-<!--						{{$dictUtils.getDictLabel('is_pre_invoice', scope.row.isPreInvoice, '')}}-->
-<!--					</template>-->
-<!--				</vxe-table-column>-->
+				<vxe-table-column field="isPreInvoice" align="center" title="是否预开票" :edit-render="{}">
+					<template #default="scope">
+						{{$dictUtils.getDictLabel('is_pre_invoice', scope.row.isPreInvoice, '')}}
+					</template>
+				</vxe-table-column>
 				<!--          <vxe-table-column field="clientName" title="委托方" :edit-render="{}">-->
 				<!--            <template v-slot:edit="scope">-->
 				<!--              <el-input :readonly="true" placeholder="请填写委托方" v-model="scope.row.clientName"/>-->

src/views/cw/invoice/InvoiceList.vue

@@ -561,12 +561,12 @@
             this.procDefInvalidKey = data.key
           }
         })
-		  // processService.getByName('会计-预开票申请').then((data) => {
-			//   if (!this.commonJS.isEmpty(data.id)) {
-			// 	  this.processDefinitionIdPreInvoice = data.id
-			// 	  this.procDefKeyPreInvoice = data.key
-			//   }
-		  // })
+		  processService.getByName('会计-预开票申请').then((data) => {
+			  if (!this.commonJS.isEmpty(data.id)) {
+				  this.processDefinitionIdPreInvoice = data.id
+				  this.procDefKeyPreInvoice = data.key
+			  }
+		  })
       },
       // 当前页
       currentChangeHandle ({ currentPage, pageSize }) {
@@ -656,52 +656,52 @@
 		  } else if (row.status === '4') {
 			  status = 'reapplyFlag'
 		  }
-      	// if (this.commonJS.isNotEmpty(row.isPreInvoice) && row.isPreInvoice === '1'){
-			// taskService.getTaskDef({ procDefId: this.processDefinitionIdPreInvoice,
-			// 	businessId: row.id,
-			// 	businessTable: 'cw_finance_invoice'}).then((data) => {
-			// 	this.$router.push({
-			// 		path: '/flowable/task/TaskForm',
-			// 		query: {
-			// 			...pick(data,  'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
-			// 			procDefId: this.processDefinitionIdPreInvoice,
-			// 			procDefKey: this.procDefKeyPreInvoice,
-			// 			title: title,
-			// 			formType: data.formType,
-			// 			formUrl: data.formUrl,
-			// 			formTitle: processTitle,
-			// 			businessTable: 'finance_invoice',
-			// 			businessId: row.id,
-			// 			isShow: 'false',
-			// 			status: status,
-			// 			routePath: '/cw/invoice/InvoiceList'
-			// 		}
-			// 	})
-			// })
-		// }else {
-		//
-		// }
-		  taskService.getTaskDef({ procDefId: this.processDefinitionId,
-			  businessId: row.id,
-			  businessTable: 'cw_finance_invoice'}).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,
-					  title: title,
-					  formType: data.formType,
-					  formUrl: data.formUrl,
-					  formTitle: processTitle,
-					  businessTable: 'finance_invoice',
-					  businessId: row.id,
-					  isShow: 'false',
-					  status: status,
-					  routePath: '/cw/invoice/InvoiceList'
-				  }
-			  })
-		  })
+      	if (this.commonJS.isNotEmpty(row.isPreInvoice) && row.isPreInvoice === '1'){
+			taskService.getTaskDef({ procDefId: this.processDefinitionIdPreInvoice,
+				businessId: row.id,
+				businessTable: 'cw_finance_invoice'}).then((data) => {
+				this.$router.push({
+					path: '/flowable/task/TaskForm',
+					query: {
+						...pick(data,  'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
+						procDefId: this.processDefinitionIdPreInvoice,
+						procDefKey: this.procDefKeyPreInvoice,
+						title: title,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessTable: 'finance_invoice',
+						businessId: row.id,
+						isShow: 'false',
+						status: status,
+						routePath: '/cw/invoice/InvoiceList'
+					}
+				})
+			})
+		}else {
+			taskService.getTaskDef({ procDefId: this.processDefinitionId,
+				businessId: row.id,
+				businessTable: 'cw_finance_invoice'}).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,
+						title: title,
+						formType: data.formType,
+						formUrl: data.formUrl,
+						formTitle: processTitle,
+						businessTable: 'finance_invoice',
+						businessId: row.id,
+						isShow: 'false',
+						status: status,
+						routePath: '/cw/invoice/InvoiceList'
+					}
+				})
+			})
+		}
+
 
       },
       // 发起发票作废审批
@@ -743,25 +743,25 @@
           if (row.status === '6' || row.status === '7' || row.status === '8' || row.status === '9') {
             this.invoiceInvalidDetail(row)
           } else {
-          	// if (this.commonJS.isNotEmpty(row.isPreInvoice) && row.isPreInvoice === '1'){
-				// taskService.getTaskDef({
-				// 	procInsId: row.procInsId,
-				// 	procDefId: this.processDefinitionIdPreInvoice
-				// }).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'
-				// 		}
-				// 	})
-				// })
-			// }else {
+          	if (this.commonJS.isNotEmpty(row.isPreInvoice) && row.isPreInvoice === '1'){
+				taskService.getTaskDef({
+					procInsId: row.procInsId,
+					procDefId: this.processDefinitionIdPreInvoice
+				}).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'
+						}
+					})
+				})
+			}else {
 				taskService.getTaskDef({
 					procInsId: row.procInsId,
 					procDefId: this.processDefinitionId
@@ -779,7 +779,7 @@
 						}
 					})
 				})
-			// }
+			}
 
           }
         }

src/views/cw/invoice/ProgramPageForm.vue

@@ -12,7 +12,7 @@
       <div v-if="isShow">
 	  	<el-radio v-model="checkType" label="2" style="margin-right: 20px">报告</el-radio>
         <el-radio v-model="checkType" label="1" style="margin-right: 20px">项目</el-radio>
-<!--        <el-radio v-model="checkType" label="4" style="margin-right: 20px">预开票项目</el-radio>-->
+        <el-radio v-model="checkType" label="4" style="margin-right: 20px">预开票项目</el-radio>
 	    <el-radio v-model="checkType" v-if="hasPermission('cw_finance:invoice:add:report')" label="3" style="margin-right: 20px">其他</el-radio>
       </div>
 		<!--报告        -->
@@ -332,7 +332,7 @@
         this.visible = true
         this.list()
 	    this.list1()
-	    // this.list2()
+	    this.list2()
       },
       // 表单提交
       getProgram () {

src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -191,15 +191,15 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-<!--				  <el-col :span="12">-->
-<!--					  <el-form-item label="是否预开票" prop="isPreInvoice"-->
-<!--									:rules="[-->
+				  <el-col :span="12">
+					  <el-form-item label="是否预开票" prop="isPreInvoice"
+									:rules="[
 
-<!--                  ]">-->
-<!--						  <el-radio :disabled="ifCheck" v-model="inputForm.isPreInvoice" v-for="item in $dictUtils.getDictList('is_pre_invoice')" :label="item.value" style="margin-right: 20px">-->
-<!--							  {{item.label}}</el-radio>-->
-<!--					  </el-form-item>-->
-<!--				  </el-col>-->
+                  ]">
+						  <el-radio :disabled="ifCheck" v-model="inputForm.isPreInvoice" v-for="item in $dictUtils.getDictList('is_pre_invoice')" :label="item.value" style="margin-right: 20px">
+							  {{item.label}}</el-radio>
+					  </el-form-item>
+				  </el-col>
                 <el-col :span="12">
                   <el-form-item label="审计期间" prop="auditYear"
                                 :rules="[

src/views/cw/projectRecords/ProjectRecordsForm.vue

@@ -194,15 +194,15 @@
 						  </el-select>
 					  </el-form-item>
 				  </el-col>
-<!--				  <el-col :span="12">-->
-<!--					  <el-form-item label="是否预开票" prop="isPreInvoice"-->
-<!--									:rules="[-->
+				  <el-col :span="12">
+					  <el-form-item label="是否预开票" prop="isPreInvoice"
+									:rules="[
 
-<!--                  ]">-->
-<!--						  <el-radio v-model="inputForm.isPreInvoice" v-for="item in $dictUtils.getDictList('is_pre_invoice')" :label="item.value" style="margin-right: 20px">-->
-<!--							  {{item.label}}</el-radio>-->
-<!--					  </el-form-item>-->
-<!--				  </el-col>-->
+                  ]">
+						  <el-radio v-model="inputForm.isPreInvoice" v-for="item in $dictUtils.getDictList('is_pre_invoice')" :label="item.value" style="margin-right: 20px">
+							  {{item.label}}</el-radio>
+					  </el-form-item>
+				  </el-col>
                 <el-col :span="12">
                   <el-form-item label="审计期间" prop="auditYear"
                                 :rules="[

src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue

@@ -187,13 +187,13 @@
 								<el-input :disabled="true" v-model="inputForm.createDate" placeholder="请填写创建时间" clearable></el-input>
 							</el-form-item>
 						</el-col>
-<!--						<el-col :span="12">-->
-<!--							<el-form-item label="开票编号" prop="invoiceNumber"-->
-<!--										  :rules="[{required: true, message:'开票编号不能为空', trigger:'change'}-->
-<!--                   ]">-->
-<!--								<el-input v-if="preInvoice" @focus="openInoviceForm()" :disabled="status === 'audit' || status === 'taskFormDetail'"  v-model="inputForm.invoiceNumber" placeholder="请填写开票编号" clearable></el-input>-->
-<!--							</el-form-item>-->
-<!--						</el-col>-->
+						<el-col :span="12">
+							<el-form-item label="开票编号" prop="invoiceNumber"
+										  :rules="[{required: true, message:'开票编号不能为空', trigger:'change'}
+                   ]">
+								<el-input v-if="preInvoice" @focus="openInoviceForm()" :disabled="status === 'audit' || status === 'taskFormDetail'"  v-model="inputForm.invoiceNumber" placeholder="请填写开票编号" clearable></el-input>
+							</el-form-item>
+						</el-col>
 
 					</el-row>
 					<el-divider content-position="left"><i class="el-icon-document"></i> 报告信息</el-divider>
@@ -487,19 +487,19 @@
 		<user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
 		<user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
 		<!--    <ReportCancellApplyChooseCom  ref="reportCancellApplyChooseCom" @getProject="getContract"></ReportCancellApplyChooseCom>-->
-<!--		<el-dialog v-model="visible" title="Warning" width="300" center>-->
-<!--    <span>-->
-<!--      该项目是否已完成预开票关联-->
-<!--    </span>-->
-<!--			<template #footer>-->
-<!--				<div class="dialog-footer">-->
-<!--					<el-button @click="noComplete">否</el-button>-->
-<!--					<el-button type="primary" @click="complete">-->
-<!--						是-->
-<!--					</el-button>-->
-<!--				</div>-->
-<!--			</template>-->
-<!--		</el-dialog>-->
+		<el-dialog v-model="visible" title="Warning" width="300" center>
+    <span>
+      该项目是否已完成预开票关联
+    </span>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button @click="noComplete">否</el-button>
+					<el-button type="primary" @click="complete">
+						是
+					</el-button>
+				</div>
+			</template>
+		</el-dialog>
 	</div>
 </template>
 
@@ -822,15 +822,15 @@
 							this.inputForm.signatureType = '1'
 						}
 						this.$refs.enclosure.newUpload(this.method, data.cwFileInfoList3, 'cwWorkContract', null, null, null, null, false)
-						// this.checkIsPreInvoice()
-						// if (this.preInvoice = true){
-						// 	financeInvoiceService.listByProgramId({
-						// 		...this.searchForm,
-						// 	}).then((data) => {
-						// 		this.total = data.total
-						// 		console.log('total',this.total)
-						// 	})
-						// }
+						this.checkIsPreInvoice()
+						if (this.preInvoice = true){
+							financeInvoiceService.listByProgramId({
+								...this.searchForm,
+							}).then((data) => {
+								this.total = data.total
+								console.log('total',this.total)
+							})
+						}
 
 						this.loading = false
 					})
@@ -1180,7 +1180,7 @@
 				this.$forceUpdate()
 				this.inputForm.cwProjectInfoList = []
 				//校验当前项目是否预开票及项目下是否存在已开票信息
-				// this.checkIsPreInvoice()
+				this.checkIsPreInvoice()
 			},
 			openWorkClient () {
 				this.$refs.reportServiceUnitForm.init(this.inputForm.projectId)

src/views/program/registered/RegisItemForm.vue

@@ -645,9 +645,9 @@
 				>
 					<vxe-table-column field="name" title="姓名" :edit-render="{name: '$input'}" align="center">
 						<template v-slot:edit="scope">
-							<vxe-input v-model="scope.row.name" :disabled="commonJS.isNotEmpty(scope.row.userId) || status === 'audit' || status === 'taskFormDetail'"  style="width: 100%">
+							<vxe-input @focus="openUserDia2(scope.$rowIndex)" v-model="scope.row.name" :disabled="commonJS.isNotEmpty(scope.row.userId) || status === 'audit' || status === 'taskFormDetail'"  style="width: 100%">
 								<template #suffix>
-									<el-button :disabled="status === 'audit' || status === 'taskFormDetail'"  @click="openUserSearch(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></el-button>
+									<el-button :disabled="status === 'audit' || status === 'taskFormDetail'"  @click="openUserDia2(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></el-button>
 								</template>
 							</vxe-input>
 						</template>
@@ -702,8 +702,9 @@
       <ContractForm  ref="contractForm" @getContract="getContract"></ContractForm>
       <WorkClientForm  ref="workClientForm" @getWorkClient="getWorkClient"></WorkClientForm>
       <ContactForm  ref="contactForm" @getContact="getContact"></ContactForm>
-    <UserSelectDialog ref="userSelectDialog" @doSubmit="getMember" :limit="1"></UserSelectDialog>
+<!--    <UserSelectDialog ref="userSelectDialog" @doSubmit="getMember" :limit="1"></UserSelectDialog>-->
 	  <user-select ref="userSelect2" @doSubmit="selectUser"></user-select>
+	  <user-select2 ref="userSelect3" @doSubmit="getMember"></user-select2>
 
 
   </div>
@@ -721,6 +722,7 @@
   import XEUtils from 'xe-utils'
   import UserSelectDialog from '@/components/userSelect/UserSelectDialog'
   import UserSelect from '@/views/utils/UserTreeSelect'
+  import UserSelect2 from '@/views/utils/UserTreeSelect'
 
   export default {
     props: {
@@ -877,7 +879,8 @@
       ContactForm,
       SelectTree,
       UserSelectDialog,
-		UserSelect
+		UserSelect,
+		UserSelect2
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -1554,9 +1557,9 @@
         this.inputForm.propertyHolder = ''
       },
       // 打开用户选择组件
-      openUserSearch (index) {
+		openUserDia2 (index) {
         this.tableIndex = index
-	    this.$refs.userSelectDialog.open()
+	    this.$refs.userSelect3.init()
       },
       // 用户选择组件回显
       getMember (member) {