项目类型功能调整

src/api/cw/invoice/CwFinanceInvoiceService.js

@@ -115,4 +115,16 @@ export default {
 			responseType: "blob",
 		});
 	},
+
+	getLabelById:function (param) {
+		return request({
+			url: prefix+"/cwProjectRecords/getLabelById",
+			method:"get",
+			params: {id: param}
+		})
+
+	}
+
+
+
 };

src/views/cw/invoice/InvoiceFormTask.vue

@@ -39,6 +39,11 @@
 						<el-input :readonly="true" placeholder="请填写项目编号" v-model="scope.row.programNo"/>
 					</template>
 				</vxe-table-column>
+				<vxe-table-column field="reportNo" align="center" title="报告号" :edit-render="{}">
+					<template v-slot:edit="scope">
+						<el-input :readonly="true" placeholder="请填写项目编号" v-model="scope.row.reportNo"/>
+					</template>
+				</vxe-table-column>
 				<vxe-table-column   field="account" align="center" title="发票金额(元)" :edit-render="{}">
 					<template v-slot:edit="scope">
 						<el-input-number
@@ -684,6 +689,7 @@
           programName: '',
           contractName: '',
           programNo: '',
+		  reportNo:'',
           clientName: '',
           reportNo: '',
           type: '1',
@@ -793,6 +799,7 @@
           programName: '',
           contractName: '',
           programNo: '',
+		  reportNo:'',
           clientName: '',
           reportNo: '',
           type: '1',
@@ -1126,6 +1133,7 @@
           programName: '',
           contractName: '',
           programNo: '',
+		  reportNo:'',
           clientName: '',
           reportNo: '',
           type: '1',
@@ -1579,4 +1587,7 @@
   /deep/ .el-input-number .el-input__inner {
     text-align: left;
   }
+  /deep/ .vxe-footer--row .vxe-footer--column:nth-child(1) .vxe-cell--item {
+	  font-weight:700;
+  }
 </style>

src/views/cw/invoice/InvoiceList.vue

@@ -227,15 +227,10 @@
           <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 min-width="150" title="报备类型" align="center" field="label">
+<!--			  <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">
@@ -333,6 +328,7 @@
   export default {
     data () {
       return {
+
 		searchVisible: true,
         showHideItem: false,
         showHideIcon: 'el-icon-arrow-down',
@@ -352,8 +348,8 @@
           reconciliationPeopleName: '',
           operator: '',
           operatorOffice: '',
-		  reportType:'',
-		  recordReportType:''
+		  label:'',
+		  loginName:this.$store.state.user.name,
         },
         dataList: [],
         tablePage: {
@@ -573,8 +569,7 @@
           reconciliationPeopleName: '',
           operator: '',
           operatorOffice: '',
-		  reportType:'',
-			recordReportType:''
+			recordreportType:'',
         }
         this.$refs.searchForm.resetFields()
         this.refreshList()

src/views/cw/invoice/ProgramPageForm.vue

@@ -15,7 +15,7 @@
 	    <el-radio v-model="checkType" label="3" style="margin-right: 20px">其他</el-radio>
       </div>
 		<!--报告        -->
-		<div v-if="checkType === '2'" style="height: calc(100% - 80px);">
+		<div v-if="checkType === '2'">
 			<el-form size="large" :inline="true" class="query-form" ref="searchForm" :model="searchForm"
 					 @submit.native.prevent>
 				<!-- 搜索框-->
@@ -48,7 +48,7 @@
 				border="inner"
 				auto-resize
 				resizable
-				height="850px"
+				height="550px"
 				:loading="loading"
 				size="large"
 				ref="projectTable1"
@@ -84,7 +84,7 @@
 				@page-change="currentChangeHandle1">
 			</vxe-pager>
 		</div>
-      <div v-if="checkType === '1'" style="height: calc(100% - 80px);">
+      <div v-if="checkType === '1'" >
           <el-form :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
             <!-- 搜索框-->
             <el-form-item label="项目名称" prop="projectName">
@@ -116,7 +116,7 @@
             border="inner"
             auto-resize
             resizable
-            height="870px"
+            height="550px"
             :loading="loading"
             ref="projectTable"
             show-header-overflow

src/views/cw/projectBusinessType/CwProjectBusinessTypeList.vue

@@ -50,6 +50,25 @@
           <vxe-column min-width="350" title="业务类型" field="name" align="left" tree-node></vxe-column>
           <vxe-column min-width="50" align="center" title="序号" field="sort"></vxe-column>
           <vxe-column min-width="50" align="center" title="级别" field="level"></vxe-column>
+		  <vxe-column title="排序号" field="sortMark" width="170px" align="center" >
+			<template #default="scope">
+				<el-input-number v-if="scope.row.parentId ==='0'" size="small" v-model="scope.row.sortMark" @change="sortChange(scope.row)" :step="10"  :min="0" :max="10000" label="描述文字"></el-input-number>
+			</template>
+		</vxe-column>
+		  <vxe-column title="是否显示" field="isShow" align="center">
+			<template #default="scope">
+				<el-switch
+					v-model="scope.row.isShow"
+					style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
+					v-if="scope.row.isShow === '0' || scope.row.isShow === '1'"
+					@change="statusChange(scope.row)"
+					active-color="#13ce66"
+					inactive-color="#ff4949"
+					active-value="1"
+					inactive-value="0">
+				</el-switch>
+			</template>
+		</vxe-column>
           <vxe-column min-width="50" align="center" title="备注" field="remarks"></vxe-column>
           <vxe-column title="操作" width="230px" fixed="right" align="center">
             <template  #default="scope">
@@ -149,6 +168,18 @@
         this.tablePage.pageSize = pageSize
         this.refreshList()
       },
+	  sortChange (row) {
+		this.loading = true
+		this.cwProjectBusinessTypeService.save({id: row.id, sortMark: row.sortMark}).then((data) => {
+			this.$message({
+				message: data,
+				type: 'success',
+				duration: 1500
+			})
+			this.loading = false
+			this.refreshList()
+		})
+	  },
       // 排序
       sortChangeHandle (column) {
         this.tablePage.orders = []
@@ -157,6 +188,23 @@
         }
         this.refreshList()
       },
+
+		// 是否显示
+		statusChange (row) {
+			this.loading = true
+			this.cwProjectBusinessTypeService.save({id: row.id, isShow: row.isShow}).then((data) => {
+				this.$message({
+					message: data,
+					type: 'success',
+					duration: 1500
+				})
+				this.loading = false
+				this.refreshList()
+			})
+		},
+
+
+
       // 删除
       del (id) {
         let ids = id || this.$refs.businessTypeTable.getCheckboxRecords().map(item => {

src/views/cw/projectBusinessType/CwProjectBusinessTypeListForm.vue

@@ -11,14 +11,14 @@
       @keyup.enter.native="getBusinessType"
       v-model="visible">
       <div style="height: calc(100% - 50px);">
-        <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm"  @submit.native.prevent>
+        <el-form size="large" :inline="true" class="query-form" ref="searchForm" :model="searchForm"  @submit.native.prevent>
           <el-form-item label="业务类型" prop="name">
-            <el-input size="small" v-model="searchForm.name" placeholder="请输入业务类型" clearable></el-input>
+            <el-input size="large" v-model="searchForm.name" placeholder="请输入业务类型" clearable></el-input>
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
-            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+            <el-button type="primary" @click="list()" size="large" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="large" icon="el-icon-refresh-right">重置</el-button>
           </el-form-item>
         </el-form>
 
@@ -58,8 +58,8 @@
 <!--        </vxe-pager>-->
       </div>
       <span slot="footer" class="dialog-footer">
-      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
-      <el-button size="small" type="primary" v-if="method != 'view'" @click="getBusinessType()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+      <el-button size="large" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="large" type="primary" v-if="method != 'view'" @click="getBusinessType()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
     </span>
     </el-dialog>
   </div>

src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -113,13 +113,13 @@
                       @getValue="(value) => {inputForm.officeId=value}"/>
                   </el-form-item>
                 </el-col>
-<!--                <el-col :span="12">-->
-<!--                  <el-form-item label="业务类型" prop="businessTypeName"-->
-<!--                                :rules="[-->
-<!--                   ]">-->
-<!--                    <el-input :readonly="true" @focus="openBusinessTypeForm" v-model="inputForm.businessTypeName" placeholder="请填写业务类型" clearable></el-input>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
+                <el-col :span="12">
+                  <el-form-item label="业务类型" prop="businessTypeName"
+                                :rules="[
+                   ]">
+                    <el-input :readonly="true" @focus="openBusinessTypeForm" v-model="inputForm.businessTypeName" placeholder="请填写业务类型" clearable></el-input>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item label="风险等级" prop="riskLevel"
                                 :rules="[

src/views/cw/projectRecords/ProjectRecordsList.vue

@@ -32,6 +32,21 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
+		<el-form-item v-if="showHideItem" label="业务类型" prop="businessType">
+<!--			<SelectTree-->
+<!--				ref="typeTree"-->
+<!--				:props="{-->
+<!--                    value: 'id',             // ID字段名-->
+<!--                    label: 'name',         // 显示名称-->
+<!--                    children: 'children'    // 子级字段名-->
+<!--                  }"-->
+<!--				:url="'/finance-server/projectRecords/cw_project_business_type/queryById'"-->
+<!--				:value="searchForm.businessType"-->
+<!--				:clearable="true"-->
+<!--				:accordion="true"-->
+<!--				size="default"-->
+<!--				@getValue="(value) => {searchForm.businessType=value}"/>-->
+		</el-form-item>
 
       <el-form-item>
         <el-button type="default" @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>
@@ -92,6 +107,7 @@
             </template>
           </vxe-column>
           <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
+          <vxe-column min-width="160" align="center" title="业务类型" field="businessType"></vxe-column>
           <vxe-column min-width="230" align="center" title="合同名称" field="contractName">
             <template #default="scope">
               <el-link  type="primary" :underline="false" v-if="commonJS.isNotEmpty(scope.row.contractId)&&commonJS.isNotEmpty(scope.row.contractName)" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>
@@ -128,6 +144,7 @@
     <ProjectRecordsForm ref="projectRecordsForm" @refreshList="refreshList"></ProjectRecordsForm>
     <ContractNameForm ref="contractNameForm"></ContractNameForm>
     <ProjectRecordsAddForm ref="projectRecordsAddForm" @refreshList="refreshList"></ProjectRecordsAddForm>
+	  <CwProjectBusinessTypeListForm ref="cwProjectBusinessTypeListForm"></CwProjectBusinessTypeListForm>
   </div>
 </template>
 
@@ -142,7 +159,8 @@
   import UserSelect from '@/views/cw/workClientInfo/clientUserSelect'
   import ContractNameForm from '../workContract/ContractNameForm'
   import ProjectRecordsAddForm from './ProjectRecordsAddForm'
-  export default {
+
+	export default {
     data () {
       return {
 		searchVisible: true,
@@ -152,6 +170,7 @@
         searchForm: {
           projectMasterName: '',
           projectNumber: '',
+		  businessType:'',
           projectName: '',
           createDates: [],
           status: '',
@@ -182,7 +201,7 @@
       UserSelect,
       ContractNameForm,
       ProjectRecordsAddForm,
-	  UserSelect2
+	  UserSelect2,
     },
     computed: {
       userName () {
@@ -438,7 +457,7 @@
             console.log(err.response)
           }
         })
-      }
+      },
     }
   }
 </script>

src/views/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -1111,7 +1111,7 @@
 				return
 			}
 			this.reportVisible = false
-			this.inputForm.connectReport=row.projectName
+			this.inputForm.connectReport=row.reportNo
 		},
 		closeTable(){
 			this.$refs.searchForm.resetFields()

src/views/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -95,6 +95,7 @@
           </vxe-column>
           <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目名称" field="projectName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="报告号" field="projectNo"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告所属部门" field="departmentName"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目经理1" field="projectMasterName"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目经理2" field="projectMaster2Name"></vxe-column>
@@ -160,6 +161,7 @@
         searchForm: {
           projectNumber: '',
           projectName: '',
+			projectNo:'',
           projectMasterId: '',
           projectMaster2Id: '',
           createBy: '',

src/views/program/registered/ProjectFormUpdate.vue

@@ -605,7 +605,7 @@
 					  <template v-slot:edit="scope">
 						  <vxe-input v-model="scope.row.name" :disabled="commonJS.isNotEmpty(scope.row.userId)"  style="width: 100%" class="my-search">
 							  <template #suffix>
-								                      <i class="el-icon-search" @click="openUserSearch(scope.$rowIndex)"></i>
+								  <i class="el-icon-search" @click="openUserSearch(scope.$rowIndex)"></i>
 <!--								  <vxe-button  @click="openUserSearch(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></vxe-button>-->
 							  </template>
 						  </vxe-input>