Przeglądaj źródła

会计项目项目执行人添加修改功能。项目框架梳理文档提交

徐滕 11 godzin temu
rodzic
commit
8a06573b8f

Plik diff jest za duży
+ 1093 - 0
PROJECT_ARCHITECTURE_WIKI.md


+ 33 - 0
src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -246,6 +246,25 @@
               </el-col>
 
 
+				<!-- 审核阶段:渲染可编辑版本 -->
+				<el-col :span="12">
+					<el-form-item
+						label="项目执行人"
+						prop="projectExecutorName"
+						:rules="[{ required: true, message: '请选择项目执行人', trigger: 'blur' }]"
+					>
+						<el-input @click="openProjectExecutorDia1"
+								  v-model="inputForm.projectExecutorName" placeholder="请选择项目执行人" @clear="clearUser2" clearable>
+							<template #suffix>
+								<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary"
+										   slot="append" icon="el-icon-search" @click.stop="openProjectExecutorDia1">
+								</el-button>
+							</template>
+						</el-input>
+					</el-form-item>
+				</el-col>
+
+
               <el-col :span="12">
                 <el-form-item label="创建人" prop="createBy.name" :rules="[
                 ]">
@@ -399,6 +418,7 @@
     <ContractNameForm ref="contractNameForm"></ContractNameForm>
     <CwClientPageForm ref="cwClientPageForm" @getProgram="getProgram"></CwClientPageForm>
     <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
+	<user-select1 ref="selectProjectExecutorUser" @doSubmit="selectProjectExecutorUser"></user-select1>
     <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
     <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
   </div>
@@ -427,6 +447,7 @@ import cwFinanceInvoiceService from "@/api/cw/invoice/CwFinanceInvoiceService";
 import UserSelect1 from '@/views/utils/UserTreeSelect'
 import UserSelect2 from '@/views/utils/UserTreeSelectBySignatureScribe'
 import UserSelect3 from '@/views/utils/UserTreeSelectBySignatureScribe'
+import SelectProjectExecutorUser from "@/views/utils/UserTreeSelect.vue";
 export default {
   props: {
     businessId: {
@@ -468,6 +489,8 @@ export default {
         projectMasterName: '',
         projectLeaderId: '',
         projectLeaderName: '',
+		projectExecutor: '',
+		projectExecutorName: '',
         procInsId: '',
         processDefinitionId: '',
         status: '',
@@ -573,6 +596,7 @@ export default {
     UserSelect1,
     UserSelect2,
     UserSelect3,
+    SelectProjectExecutorUser,
   },
   methods: {
     getKeyWatch(keyWatch) {
@@ -1055,6 +1079,15 @@ export default {
         this.inputForm.realHeader = value
       }
     },
+
+	  selectProjectExecutorUser(user) {
+		  console.log(user[0].name)
+		  this.inputForm.projectExecutor = user[0].id
+		  this.inputForm.projectExecutorName = user[0].name
+	  },
+	  openProjectExecutorDia1() {
+		  this.$refs.selectProjectExecutorUser.init()
+	  },
     blurEmail(index) {
       if (this.commonJS.isNotEmpty(this.inputForm.cwProjectClientContactDTOList[index].email)) {
         if (!this.validateXG.isEmail(this.inputForm.cwProjectClientContactDTOList[index].email)) {

+ 0 - 2
src/views/cw/projectReportArchive/ProjectReportArchiveDia.vue

@@ -193,7 +193,6 @@
 
               <el-col :span="12">
                 <el-form-item label="盒号" prop="number" :rules="[
-                  { required: true, message: '盒号不能为空', trigger: 'blur' }
                 ]">
                   <el-input style="width: 100%" :disabled="false" v-model="inputForm.number" placeholder="请填写盒号"
                     clearable></el-input>
@@ -203,7 +202,6 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="确认盒号" prop="isNumber" :rules="[
-                  { required: true, message: '确认盒号不能为空', trigger: 'blur' }
                 ]">
                   <el-input :disabled="false" style="width: 100%" v-model="inputForm.isNumber" placeholder="请填写确认盒号"
                     clearable></el-input>

+ 5 - 2
src/views/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -531,7 +531,7 @@
               @submit.native.prevent> -->
             <el-col :span="12" v-if="status === 'audit'">
               <el-form-item label="盒号" prop="number" :rules="[
-                { required: true, message: '盒号不能为空', trigger: 'blur' }
+                { required: isBoxNumberRequired, message: '盒号不能为空', trigger: 'blur' }
               ]">
                 <el-input style="width: 100%" :disabled="false" v-model="inputForm.number" placeholder="请填写盒号"
                   clearable></el-input>
@@ -541,7 +541,7 @@
             </el-col>
             <el-col :span="12" v-if="status === 'audit'">
               <el-form-item label="确认盒号" prop="isNumber" :rules="[
-                { required: true, message: '确认盒号不能为空', trigger: 'blur' }
+                { required: isBoxNumberRequired, message: '确认盒号不能为空', trigger: 'blur' }
               ]">
                 <el-input :disabled="false" style="width: 100%" v-model="inputForm.isNumber" placeholder="请填写确认盒号"
                   clearable></el-input>
@@ -1235,6 +1235,9 @@ export default {
     this.projectReportArchiveService = new ProjectReportArchiveService()
   },
   computed: {
+    isBoxNumberRequired() {
+      return !(this.inputForm.reportNo && this.inputForm.reportNo.includes('苏兴会咨字'))
+    },
     bus: {
       get() {
         this.$refs.uploadComponent.setDividerName('附件', false)