Explorar el Código

审计收费模块

sangwenwei hace 1 año
padre
commit
470f5fdf6f

+ 16 - 0
src/api/cw/projectRecords/ProjectRecordsService.js

@@ -93,4 +93,20 @@ export default {
 			params: params,
 		});
 	},
+	getReportById: function (params) {
+		return request({
+			url:prefix + "/cwProjectRecords/getReportById",
+			params:params
+		})
+	},
+
+	getReportByProjectId:function (id) {
+		return request({
+			url:prefix + "/cwProjectRecords/getReportByProjectId",
+			params:{id:id}
+		})
+
+	}
+
+
 };

+ 11 - 6
src/views/cw/invoice/InvoiceFormTask.vue

@@ -42,7 +42,7 @@
 				<vxe-table-column   field="account" align="center" title="发票金额(元)" :edit-render="{}">
 					<template v-slot:edit="scope">
 						<el-input-number
-							style="width: 240px"
+							style="width: 200px"
 							:readonly="false"
 							:precision="2"
 							:max="9999999999"
@@ -720,7 +720,8 @@
           financeInvoiceReceivablesDTOList: [],
           financeInvoiceInvalidDTO: {},
           isMultiple: '',
-          billingId: ''
+          billingId: '',
+			reportType:''
         },
         programRow: '',
         bankList: [],
@@ -833,7 +834,8 @@
             remarks: ''
           },
           isMultiple: '',
-          billingId: ''
+          billingId: '',
+			reportType:''
         }
         // if (method === 'add') {
         //   this.title = `新建发票`
@@ -1154,7 +1156,8 @@
           financeInvoiceReceivablesDTOList: [],
           financeInvoiceInvalidDTO: {},
           isMultiple: '',
-          billingId: ''
+          billingId: '',
+			reportType:''
         }
         this.bankList = []
         this.visible = false
@@ -1225,7 +1228,8 @@
             r.programNo = item.projectNumber
             r.contractId = item.contractId
             r.programId = item.id
-			  r.reportNo = item.reportNo
+		    r.reportNo = item.reportNo
+			  r.reportType=item.reportType
             this.inputForm.financeInvoiceBaseDTOList[this.programRow] = r
           } else {
             let r = {
@@ -1234,7 +1238,8 @@
               programNo: item.projectNumber,
               contractId: item.contractId,
               programId: item.id,
-				reportNo: item.reportNo
+				reportNo: item.reportNo,
+				reportType:item.reportType
             }
             this.$refs.baseTable.insertAt(r)
             this.inputForm.financeInvoiceBaseDTOList.push(r)

+ 48 - 9
src/views/cw/invoice/InvoiceList.vue

@@ -149,6 +149,18 @@
           </el-date-picker>
         </el-form-item>
 
+		  <el-form-item
+			  v-if="showHideItem" label="报备类型" prop="reportType">
+			  <el-select v-model="searchForm.reportType" placeholder="请选择报备类型" clearable style="width: 100%;">
+				  <el-option
+					  v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
+					  :key="item.value"
+					  :label="item.label"
+					  :value="item.value">
+				  </el-option>
+			  </el-select>
+		  </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>
@@ -201,7 +213,7 @@
           <vxe-column type="checkbox" width="60" ></vxe-column>
           <vxe-column min-width="150" title="项目名称" align="center" field="programName">
             <template #default="scope">
-              <el-link  type="primary" :underline="false" @click="viewProject(scope.row.id)">{{scope.row.programName}}</el-link>
+              <el-link  type="primary" :underline="false" @click="viewProject(scope.row)">{{scope.row.programName}}</el-link>
             </template>
           </vxe-column>
           <vxe-column min-width="150" title="发票申请编号" align="center" field="no">
@@ -215,6 +227,16 @@
           <vxe-column min-width="150" title="经办人部门" align="center" field="operatorOffice"></vxe-column>
           <vxe-column min-width="150" title="开票总金额(元)" align="center" field="account"></vxe-column>
           <vxe-column min-width="150" title="发票金额(元)" align="center" field="accountDetail"></vxe-column>
+          <vxe-column min-width="150" title="报备类型" align="center" field="recordReportType">
+			  <template #default="scope">
+				  {{$dictUtils.getDictLabel('cw_work_client_report_type', scope.row.recordReportType, '')}}
+			  </template>
+		  </vxe-column>
+			<vxe-column min-width="150" title="报备类型(其他)" align="center" field="reportType">
+			  <template #default="scope">
+				  {{$dictUtils.getDictLabel('cw_work_client_report_type', scope.row.reportType, '')}}
+			  </template>
+		  </vxe-column>
           <vxe-column min-width="120" title="开票内容" align="center" field="billingContent">
             <template #default="scope">
               {{$dictUtils.getDictLabel('invoice_billing_content', scope.row.billingContent, '')}}
@@ -288,8 +310,9 @@
     </div>
     <InvoiceForm  ref="invoiceForm" @refreshDataList="refreshList"></InvoiceForm>
     <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>
-    <ProgramForm ref="programForm"></ProgramForm>
+<!--    <ProgramForm ref="programForm"></ProgramForm>-->
     <InvoiceUpdateForm ref="invoiceUpdateForm" @refreshDataList="refreshList"></InvoiceUpdateForm>
+	  <ProjectForm ref="projectForm"></ProjectForm>
   </div>
 </template>
 
@@ -305,6 +328,8 @@
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import ProgramPageForm from '@/views/finance/invoice/ProgramPageForm'
   import InvoiceUpdateForm from './InvoiceUpdateForm'
+  import ProjectForm from '@/views/cw/projectRecords/ProjectRecordsForm'
+  import projectPageForm from './ProgramPageForm'
   export default {
     data () {
       return {
@@ -323,10 +348,12 @@
           remittanceDateBegin: '',
           remittanceDateEnd: '',
           programName: '',
-          programId: '',
+		  programId: '',
           reconciliationPeopleName: '',
           operator: '',
-          operatorOffice: ''
+          operatorOffice: '',
+		  reportType:'',
+		  recordReportType:''
         },
         dataList: [],
         tablePage: {
@@ -340,7 +367,8 @@
         procDefKey: '',
         processDefinitionInvalidId: '',
         procDefInvalidKey: '',
-        isAdmin: false
+        isAdmin: false,
+	    financeInvoiceBaseDTOList:[]
       }
     },
     computed: {
@@ -356,7 +384,8 @@
       SelectTree,
       ProgramPageForm,
       ProgramForm,
-      InvoiceUpdateForm
+      InvoiceUpdateForm,
+	  ProjectForm
     },
     mounted () {
 		this.$nextTick(() => {
@@ -407,8 +436,8 @@
         this.$refs.invoiceForm.init(flag, id)
       },
       // 查看项目数据
-      viewProject (id) {
-        this.$refs.programForm.init(id)
+      viewProject (row) {
+		  this.$refs.projectForm.init('view', row.programId)
       },
       // 获取数据列表
       refreshList () {
@@ -543,7 +572,9 @@
           programId: '',
           reconciliationPeopleName: '',
           operator: '',
-          operatorOffice: ''
+          operatorOffice: '',
+		  reportType:'',
+			recordReportType:''
         }
         this.$refs.searchForm.resetFields()
         this.refreshList()
@@ -767,10 +798,18 @@
           this.searchForm.programId = rows[0].id
         }
       },
+	  getProgram1 (rowsType) {
+        if (this.commonJS.isNotEmpty(rowsType)) {
+          this.searchForm.rowsType = rows[0].rowsType
+        }
+      },
       clearProgram () {
         this.searchForm.programName = ''
         this.searchForm.programId = ''
       },
+	  clearProgram1 () {
+        this.searchForm.rowsType = ''
+      },
       // 自定义服务端导出
       exportMethod ({ options }) {
         // 传给服务端的参数

+ 9 - 4
src/views/cw/invoice/ProgramForm.vue

@@ -30,6 +30,8 @@
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="contractName" align="center" title="合同名称"></vxe-table-column>
+				  <vxe-table-column field="account" align="center" title="开票金额"></vxe-table-column>
+				  <vxe-table-column field="reportType" align="center" title="报备类型"></vxe-table-column>
 				  <vxe-table-column field="programNo" align="center" title="项目编号"></vxe-table-column>
 				  <!--            <vxe-table-column field="clientName" align="center" title="委托方"></vxe-table-column>-->
 				  <!--            <vxe-table-column field="reportNo" title="报告号" :edit-render="{}">-->
@@ -119,7 +121,8 @@
           workAttachmentDtoList: [],
           financeInvoiceDetailDTOList: [],
           financeInvoiceReceivablesDTOList: [],
-          financeInvoiceInvalidDTO: {}
+          financeInvoiceInvalidDTO: {},
+		  reportType:''
         },
         programRow: '',
         bankList: [],
@@ -143,7 +146,7 @@
     methods: {
       init (id) {
         this.method = 'view'
-        this.title = '查看项目信息'
+        this.title = '查看项目详情信息'
         this.inputForm = {
           id: '',
           financeInvoiceBaseDTOList: [],
@@ -186,7 +189,8 @@
             invalidStatus: '',
             invoiceId: '',
             remarks: ''
-          }
+          },
+		  reportType:''
         }
         this.baseFlag = false
         this.inputForm.id = id
@@ -346,7 +350,8 @@
           workAttachmentDtoList: [],
           financeInvoiceDetailDTOList: [],
           financeInvoiceReceivablesDTOList: [],
-          financeInvoiceInvalidDTO: {}
+          financeInvoiceInvalidDTO: {},
+			reportType:''
         }
         this.bankList = []
         this.detailFlag = false

+ 30 - 4
src/views/cw/invoice/ProgramPageForm.vue

@@ -12,7 +12,7 @@
       <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-if="hasPermission('cw_finance:invoice:add:report')" v-model="checkType" label="3" 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'" style="height: calc(100% - 80px);">
@@ -150,7 +150,22 @@
         </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="12">
+				<el-form-item label="报备类型" prop="reportType"
+							  :rules="[
+                                 {required: true, message:'报备类型不能为空', trigger:'blur'}
+                  ]">
+					<el-select v-model="reportType" placeholder="请选择报备类型" clearable style="width: 100%;">
+						<el-option
+							v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value">
+						</el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<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>
@@ -207,7 +222,8 @@
         checkType: '',
         detail: '',
         isShow: true,
-        num: true // num为true是多选,false是单选
+        num: true,// num为true是多选,false是单选
+		reportType:''
       }
     },
     created () {
@@ -263,6 +279,7 @@
       // 表单提交
       getProgram () {
         let rows
+	    let rowsType
         if (this.checkType === '1') {
           if (this.commonJS.isEmpty(this.$refs.projectTable.getCheckboxRecords())) {
             this.$message.error('请至少选择一条数据')
@@ -293,10 +310,19 @@
             return
           }
           rows = [{projectName: this.detail}]
-			rows.bj1 = 'bj1'
+		  rows.bj1 = 'bj1'
+		  if (this.commonJS.isEmpty(this.reportType)){
+		  	this.$message.error('请选择报备类型')
+		  	return;
+		  }
+		  rowsType=[{reportType: this.reportType}]
+		  rowsType.bj1='bj1'
+
         }
+
         this.close()
         this.$emit('getProgram', rows)
+        this.$emit('getProgram', rowsType)
       },
       list () {
         this.loading = true

+ 32 - 0
src/views/cw/projectReportArchive/ProjectReportArchiveForm.vue

@@ -108,6 +108,28 @@
                     </el-input-number>
                   </el-form-item>
                 </el-col>
+				  <el-col :span="12">
+					  <el-form-item
+						  label="审计收费(元)"
+						  prop="auditMoney"
+						  :rules="[
+                  {required: true, message:'请输入审计收费(元)', trigger:'blur'}
+               		]">
+						  <el-input-number
+							  @input="fixedAccount"
+							  :precision="2"
+							  v-model="inputForm.auditMoney"
+							  controls-position="right"
+							  :controls="false"
+							  style="width:100%;"
+							  :min="0.00"
+							  :max="9999999999999999"
+							  :step="0.01"
+							  placeholder="请输入审计收费(元)"
+							  clearable>
+						  </el-input-number>
+					  </el-form-item>
+				  </el-col>
                 <el-col :span="12">
                   <el-form-item label="档案年度" prop="year"
                                 :rules="[
@@ -258,6 +280,7 @@
     <WorkClientChooseByProjectCom ref="workClientChooseByProjectCom" @getClient="getClient"></WorkClientChooseByProjectCom>
     <ReportChooseByProjectCom ref="reportChooseByProjectCom" @getReport="getReport"></ReportChooseByProjectCom>
     </el-dialog>
+
   </div>
 </template>
 
@@ -287,6 +310,7 @@
         title: '',
         method: '',
         loading: false,
+	    dialogVisible:false,
         inputForm: {
           id: '',
           createDate: '',
@@ -300,6 +324,7 @@
           auditedUnits: '',
           reportNum: '',
           papersNum: '',
+		  auditMoney:'',
           year: '',
           number: '',
           isNumber: '',
@@ -405,6 +430,7 @@
           auditedUnits: '',
           reportNum: '',
           papersNum: '',
+		  auditMoney:'',
           year: '',
           number: '',
           isNumber: '',
@@ -610,6 +636,7 @@
           auditedUnits: '',
           reportNum: '',
           papersNum: '',
+			auditMoney:'',
           year: '',
           number: '',
           isNumber: '',
@@ -726,6 +753,11 @@
           }
         }
       },
+	  //打开开票列表页面
+	  openInvoice(){
+		  this.dialogVisible=true
+  	  },
+
     }
   }
 </script>

+ 265 - 29
src/views/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -107,22 +107,40 @@
 						  :rules="[
                   {required: true, message:'请输入审计收费(元)', trigger:'blur'}
                		]">
-						  <el-input-number
-							  @input="fixedAccount"
-							  :precision="2"
+						  <el-input
+							  type="text"
+							  v-on:input="inputForm.auditMoney=inputForm.auditMoney.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
 							  v-model="inputForm.auditMoney"
 							  controls-position="right"
 							  :controls="false"
 							  style="width:100%;"
-							  :min="0.00"
-							  :max="9999999999999999"
-							  :step="0.01"
 							  placeholder="请输入审计收费(元)"
-							  clearable>
-						  </el-input-number>
+							  :disabled="this.inputForm.auditMoney==this.accountTotal && this.accountTotal != 0?true:false"
+							  clearable
+							  @keyup="inputMoney"
+						  >
+							  <template #suffix>
+								  <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" @click="openInvoice(this.inputForm.id)" icon="el-icon-search"></el-button>
+							  </template>
+						  </el-input>
 					  </el-form-item>
-
 				  </el-col>
+				  <el-col :span="12" v-if="isShow">
+					  <el-form-item label="关联报告" prop="connectReport"
+									:rules="[
+                                {required: true, message:'关联报告不能为空', trigger:'blur'},
+                                {required: true, message:'关联报告不能为空', trigger:'change'}
+                   ]">
+						  <el-input :readonly="true" v-model="inputForm.connectReport" @focus="openReport"  placeholder="请填写关联报告" clearable>
+							  <el-button slot="append"   @focus="openReport" icon="el-icon-search"></el-button>
+						  </el-input>
+					  </el-form-item>
+				  </el-col>
+
                 <el-col :span="12">
                   <el-form-item label="档案年度" prop="year"
                                 :rules="[
@@ -277,6 +295,126 @@
     <WorkClientChooseByProjectCom ref="workClientChooseByProjectCom" @getClient="getClient"></WorkClientChooseByProjectCom>
     <ReportChooseByProjectCom ref="reportChooseByProjectCom" @getReport="getReport"></ReportChooseByProjectCom>
   </div>
+
+	<el-dialog
+		title="开票信息选择"
+		:close-on-click-modal="false"
+		draggable
+		width="1100px"
+		height="500px"
+		@close="closeTable"
+		append-to-body
+		destroy-on-close="true"
+		:visible.sync="dialogTableVisible"
+		v-if="dialogTableVisible"
+		v-model="dialogTableVisible">
+		<div style="height: calc(100% - 80px);">
+			<el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
+				<!-- 搜索框-->
+				<el-form-item label="发票号" prop="number">
+					<el-input v-model="searchForm.number" 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="reportNo">
+					<el-input v-model="searchForm.reportNo" placeholder="请输入报告号" clearable></el-input>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="getReport(this.inputForm.id)" 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="400px"
+				:loading="loading"
+				ref="auditData"
+				show-header-overflow
+				show-overflow="title"
+				highlight-hover-row
+				@checkbox-change="selectionChangeHandle"
+				:menu-config="{}"
+				:print-config="{}"
+				:sort-config="{remote:true}"
+				:data="dataList"
+				:row-config="{isCurrent: true}"
+				:radio-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"></vxe-column>
+				<vxe-column min-width="160" align="center" title="报告号" field="reportNo"></vxe-column>
+				<vxe-column min-width="160" align="center" title="开票申请编号" field="no"></vxe-column>
+				<vxe-column min-width="160" align="center" title="发票号" field="number"></vxe-column>
+				<vxe-column min-width="160" align="center" title="开票金额(元)" field="account"></vxe-column>
+				<vxe-column min-width="160" align="center" title="开票申请人" field="billingPeople"></vxe-column>
+				<vxe-column min-width="160" align="center" title="开票时间" field="billingDate"></vxe-column>
+
+			</vxe-table>
+		</div>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="closeReport" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button type="primary" @click="getData()" icon="el-icon-circle-check" :disabled="this.searchForm.totalAudit==0?true:false" v-noMoreClick>({{this.searchForm.totalAudit}})确定</el-button>
+			</span>
+		</template>
+	</el-dialog>
+
+	<el-dialog
+		title="关联报告信息"
+		:close-on-click-modal="false"
+		draggable
+		width="1100px"
+		height="500px"
+		@close="close1"
+		append-to-body
+		:visible.sync="reportVisible"
+		v-if="reportVisible"
+		v-model="reportVisible">
+		<div style="height: calc(100% - 80px);">
+			<vxe-table
+				border="inner"
+				auto-resize
+				resizable
+				height="400px"
+				:loading="loading"
+				ref="clientTable"
+				show-header-overflow
+				show-overflow
+				highlight-hover-row
+				:menu-config="{}"
+				:print-config="{}"
+				:sort-config="{remote:true}"
+				:data="reportData"
+				:row-config="{isCurrent: true}"
+				:radio-config="{trigger: 'row'}"
+			>
+				<vxe-column type="seq" width="60" title="序号"></vxe-column>
+				<vxe-column type="radio" width="60px"></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="auditFees">
+				</vxe-column>
+				<vxe-column min-width="160" align="center" title="创建人" field="loginName"></vxe-column>
+				<vxe-column min-width="160" align="center" title="创建时间" field="createTime">
+				</vxe-column>
+
+			</vxe-table>
+		</div>
+		<template #footer>
+			<span class="dialog-footer">
+			  <el-button @click="close1()" icon="el-icon-circle-close">关闭</el-button>
+			  <el-button type="primary" v-if="method != 'view'" @click="getClient1()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+			</span>
+		</template>
+	</el-dialog>
+
+
+
 </template>
 
 <script>
@@ -287,6 +425,7 @@
   import ReportChooseByProjectCom from '@/views/cw/projectReportArchive/ReportChooseByProjectCom'
   import officeService from '@/api/sys/officeService'
   import processService from '@/api/flowable/processService'
+  import ProjectRecordsService from "../../../api/cw/projectRecords/ProjectRecordsService";
   export default {
     props: {
       businessId: {
@@ -304,6 +443,8 @@
     },
     data () {
       return {
+		  reportVisible:false,
+	    dialogTableVisible:false,
         title: '',
         method: '',
         loading: false,
@@ -346,6 +487,7 @@
             status: '',
             contractId: ''
           },
+		  connectReport:'',
           auditedUnitsName: '',
           fileNumber: '',
           reportDate: '',
@@ -364,7 +506,31 @@
         },
         keyWatch: '',
         activeName: 'files',
-        tableKeyReport: ''
+        tableKeyReport: '',
+	    dataList:[],
+	    searchForm:{
+			projectName:'',
+			reportNo:'',
+			no:'',
+			number:'',
+			billingPeople:'',
+			account:'',
+			billingDate:'',
+			totalAudit:''
+	    },
+	    accountTotal:'',
+	   	reportData:[],
+	    reportInno:{
+			projectName:'',
+			reportNo:'',
+			auditFees:'',
+			createTime:'',
+			loginName:''
+		},
+		  selectRecord:[],
+		  isShow:false,
+
+
       }
     },
     projectReportArchiveService: null,
@@ -380,7 +546,8 @@
         set (val) {
           this.businessId = val
         }
-      }
+      },
+
     },
     watch: {
       'keyWatch': {
@@ -399,14 +566,15 @@
           console.log(newVal)
           this.$emit('changeLoading', newVal)
           this.$refs.uploadComponent.changeLoading(newVal)
-        }
+        },
+
       }
     },
     components: {
       UpLoadComponent,
       ProjectRecordsChooseCom,
       WorkClientChooseByProjectCom,
-      ReportChooseByProjectCom
+      ReportChooseByProjectCom,
     },
     methods: {
       getKeyWatch (keyWatch) {
@@ -456,6 +624,7 @@
             contractId: ''
           },
           auditedUnitsName: '',
+			connectReport:'',
           fileNumber: '',
           reportDate: '',
           reportNo: '',
@@ -469,8 +638,9 @@
           procDefId: '',
           procDefKey: '',
           formTitle: '',
-          title: ''
+          title: '',
         }
+        this.selectRecord=[]
         this.inputForm.id = id
         this.loading = false
         this.$nextTick(() => {
@@ -777,6 +947,7 @@
             contractId: ''
           },
           auditedUnitsName: '',
+			connectReport:'',
           fileNumber: '',
           reportDate: '',
           reportNo: '',
@@ -870,24 +1041,89 @@
           }
         }
       },
-		fixedAccount () {
-			if (isNaN(this.inputForm.auditMoney) && !/^-$/.test(this.inputForm.auditMoney)) {
-				this.inputForm.auditMoney = ''
-			}
-			if (!/^[+-]?\d*\.{0,1}\d{0,1}$/.test(this.inputForm.auditMoney)) {
-				this.inputForm.auditMoney = this.inputForm.auditMoney.replace(/\.\d{2,}$/, this.inputForm.auditMoney.substr(this.inputForm.account.indexOf('.'), 3))
+		openInvoice(id){
+      		this.$nextTick(()=>{
+				this.getReportList(id)
+				// this.$refs.searchForm.resetFields()
+				this.searchForm.totalAudit=0
+			})
+      		this.dialogTableVisible=true
+
+		},
+		getReportList(id){
+			console.log(id)
+			ProjectRecordsService.getReportById({
+				id:this.inputForm.id,
+				cwProjectRecordsDTO:this.searchForm
+			}).then((data)=>{
+				this.dataList=data
+			})
+		},
+		resetSearch () {
+      		this.dataListAllSelections=[]
+			this.$refs.searchForm.resetFields()
+			this.getReportList(this.inputForm.id)
+		},
+		getData(){
+			this.accountTotal = this.countTotal(this.selectRecord, 'account')
+			this.dialogTableVisible = false
+			this.inputForm.auditMoney=this.accountTotal
+		},
+		countTotal: function (arr, keyName) {
+			let total1 = 0
+			let number = 0;
+			for (var i = 0;i<arr.length;i++){
+				number = parseFloat(arr[i].account);
+				total1 = number+total1;
 			}
-			// 禁止录入整数部分两位以上,但首位为0
-			var regStrs = [
-				['^(\\-)?0(\\d+)$', '$1']
-			]
-			for (var i = 0; i < regStrs.length; i++) {
-				var reg = new RegExp(regStrs[i][0])
-				var result = this.inputForm.auditMoney.replace(reg, regStrs[i][1])
-				this.inputForm.auditMoney = result
+			return total1
+		},
+		closeReport () {
+			this.dialogTableVisible = false
+			this.inputForm.auditMoney=''
+		},
+		selectionChangeHandle(){
+			this.selectRecord = this.$refs.auditData.getCheckboxRecords()
+			this.searchForm.totalAudit=this.countTotal(this.selectRecord, 'account')
+		},
+		getReportByProjectId(id){
+			this.loading=true
+			ProjectRecordsService.getReportByProjectId(id).then(data=>{
+				this.reportData=data
+				this.loading=false
+			})
+		},
+		openReport(){
+      		this.reportVisible=true
+			this.$nextTick(()=>{
+				this.getReportByProjectId(this.inputForm.projectId)
+			})
+		},
+
+		close1(){
+			this.reportVisible = false
+		},
+		getClient1(){
+			let row = this.$refs.clientTable.getRadioRecord()
+			console.log(row)
+			if (this.commonJS.isEmpty(row)) {
+				this.$message.error('请选择一条数据')
+				return
 			}
+			this.reportVisible = false
+			this.inputForm.connectReport=row.projectName
+		},
+		closeTable(){
+			this.$refs.searchForm.resetFields()
+			this.dialogTableVisible = false
 		},
-    }
+		inputMoney(){
+      	if (this.inputForm.auditMoney==0 || this.inputForm.auditMoney==''){
+      		this.isShow=!this.isShow
+			this.inputForm.connectReport=''
+		}
+		}
+	}
   }
 </script>
 <style scoped>

+ 1 - 1
src/views/cw/workClientInfo/WorkClientForm.vue

@@ -20,7 +20,7 @@
 						<el-form-item label="客户名称" prop="name" :rules="[
                    ]">
 							<template #label>
-								<span style="color: red;border-top: 20px">*</span> 客户名称
+								<span style="color: #ff0000;border-top: 20px">*</span> 客户名称
 							</template>
 							<el-input maxlength="64" v-model="inputForm.name" placeholder="请输入客户名称" clearable></el-input>
 						</el-form-item>