签章、项目调整

src/views/modules/cw/projectRecords/ProjectRecordsForm.vue

@@ -204,24 +204,25 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
+
                 <el-col :span="12">
-                  <el-form-item label="项目经理" prop="projectMasterId"
+                  <el-form-item label="现场负责人" prop="projectLeaderId"
                                 :rules="[
-                                {required: true, message:'项目经理不能为空', trigger:'blur'}
                    ]">
-                    <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
-                    <UserSelect size="medium" :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.projectMasterId" @getValue='(value) => {inputForm.projectMasterId = value}'></UserSelect>
+                    <UserSelect size="medium" :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.projectLeaderId" @getValue='(value) => {inputForm.projectLeaderId = value}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="现场负责人" prop="projectLeaderId"
+                  <el-form-item label="项目经理1" prop="projectMasterId"
                                 :rules="[
+                                {required: true, message:'项目经理1不能为空', trigger:'blur'}
                    ]">
-                    <UserSelect size="medium" :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.projectLeaderId" @getValue='(value) => {inputForm.projectLeaderId = value}'></UserSelect>
+                    <!--                    <el-input v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>-->
+                    <UserSelect size="medium" :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.projectMasterId" @getValue='(value) => {inputForm.projectMasterId = value}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="项目实际责任人" prop="realHeader"
+                  <el-form-item label="项目经理2" prop="realHeader"
                                 :rules="[
                    ]">
                     <UserSelect size="medium" :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.realHeader" @getValue='(value) => {inputForm.realHeader = value}'></UserSelect>

src/views/modules/cw/projectRecords/ProjectRecordsList.vue

@@ -8,10 +8,14 @@
       <el-form-item label="项目编号" prop="projectNumber">
         <el-input size="small" v-model="searchForm.projectNumber" placeholder="请输入项目编号" clearable></el-input>
       </el-form-item>
-      <el-form-item label="项目经理" prop="projectMasterName">
+      <el-form-item label="项目经理1" prop="projectMasterName">
 <!--        <el-input size="small" v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
         <UserSelect :limit='1' :userName="searchForm.projectMasterName" @getValue='(value, label) => {searchForm.projectMasterName = label}'></UserSelect>
       </el-form-item>
+      <el-form-item label="项目经理2" prop="realHeaderName">
+        <!--        <el-input size="small" v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
+        <UserSelect :limit='1' :userName="searchForm.realHeaderName" @getValue='(value, label) => {searchForm.realHeaderName = label}'></UserSelect>
+      </el-form-item>
       <el-form-item label="创建时间" prop="createDates">
         <el-date-picker
           placement="bottom-start"
@@ -79,7 +83,8 @@
               <span v-else style="color: red">暂无合同</span>
             </template>
           </vxe-column>
-          <vxe-column min-width="160" align="center" title="项目经理" field="projectMasterName"></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="realHeaderName"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建人" field="createBy.name"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建时间" field="createDate"></vxe-column>
           <vxe-column title="操作" width="150px" fixed="right" align="center">
@@ -128,7 +133,8 @@
           projectNumber: '',
           projectName: '',
           createDates: [],
-          status: ''
+          status: '',
+          realHeaderName: ''
         },
         dataList: [],
         tablePage: {

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -165,7 +165,7 @@
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && scope.row.status1 === '2'" type="text" size="small" @click="rebackS(scope.row)">撤回签章申请</el-button>
 <!--              实体章流程-->
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3')" type="text" size="small" @click="pushS3(scope.row)">实体章</el-button>
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && scope.row.status3 === '2'" type="text" size="small" @click="rebackS3(scope.row)">撤回签章申请</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '2' || scope.row.status3 === '6' || scope.row.status3 === '7')" type="text" size="small" @click="rebackS3(scope.row)">撤回签章申请</el-button>
 <!--              公章+执业章流程-->
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3')" type="text" size="small" @click="pushS2(scope.row)">公章+执业章</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '2' || scope.row.status2 === '6' || scope.row.status2 === '7')" type="text" size="small" @click="rebackS2(scope.row)">撤回签章申请</el-button>
@@ -728,7 +728,7 @@
           type: 'warning'
         }).then(async () => {
           await this.projectReportService.findBySignatureId(row.sid3).then(({data}) => {
-            if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
+            if (data.status !== row.status3) { // status的值不等于“审核中”，就弹出提示
               this.$message.error('数据已发生改变或不存在，请刷新数据')
               this.refreshList()
             } else {

src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -1,7 +1,7 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
   <div>
     <el-row>
-      <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'taskFormDetail'"
+      <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'taskFormDetail' || status === 'audit'"
                label-width="135px" @submit.native.prevent>
 
         <el-divider content-position="left"><i class="el-icon-document"></i> 项目信息</el-divider>
@@ -295,6 +295,7 @@
                           {required: true, message:'报告日期不能为空', trigger:'blur'}
                    ]">
               <el-date-picker
+                :disabled="status === 'taskFormDetail' || status === 'audit'"
                 placement="bottom-start"
                 value-format="yyyy-MM-dd"
                 v-model="inputForm.reportDate"
@@ -318,7 +319,7 @@
             <el-form-item label="公司注册地址" prop="registerAddress"
                           :rules="[
                    ]">
-              <el-input v-model="inputForm.registerAddress" placeholder="请填写公司注册地址" clearable>
+              <el-input :disabled="status === 'taskFormDetail' || status === 'audit'" v-model="inputForm.registerAddress" placeholder="请填写公司注册地址" clearable>
               </el-input>
             </el-form-item>
           </el-col>
@@ -326,7 +327,7 @@
             <el-form-item label="业务所在地" prop="businessLocation"
                           :rules="[
                    ]">
-              <el-input v-model="inputForm.businessLocation" placeholder="请填写业务所在地" clearable>
+              <el-input :disabled="status === 'taskFormDetail' || status === 'audit'" v-model="inputForm.businessLocation" placeholder="请填写业务所在地" clearable>
               </el-input>
             </el-form-item>
           </el-col>
@@ -334,7 +335,7 @@
             <el-form-item label="是否数据证券业务" prop="securityBusiness"
                           :rules="[
                    ]">
-              <el-select v-model="inputForm.securityBusiness" placeholder="请选择是否数据证券业务" style="width:100%;">
+              <el-select :disabled="status === 'taskFormDetail' || status === 'audit'" v-model="inputForm.securityBusiness" placeholder="请选择是否数据证券业务" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('cw_report_negotiable')"
                   :key="item.value"
@@ -377,7 +378,7 @@
                           :rules="[
                           {required: true, message:'共印份数不能为空', trigger:'blur'}
                    ]">
-              <el-input size="medium" v-model="inputForm.allPrintNum" placeholder="请输入本报告共印份数">
+              <el-input size="medium" :disabled="status === 'taskFormDetail' || status === 'audit'" v-model="inputForm.allPrintNum" placeholder="请输入本报告共印份数">
               </el-input>
             </el-form-item>
           </el-col>
@@ -386,7 +387,7 @@
                           :rules="[
                           {required: true, message:'发出份数不能为空', trigger:'blur'}
                    ]">
-              <el-input size="medium" v-model="inputForm.issueNum" placeholder="请输入发出份数">
+              <el-input size="medium" :disabled="status === 'taskFormDetail' || status === 'audit'" v-model="inputForm.issueNum" placeholder="请输入发出份数">
               </el-input>
             </el-form-item>
           </el-col>
@@ -395,7 +396,7 @@
                           :rules="[
                           {required: true, message:'存档份数不能为空', trigger:'blur'}
                    ]">
-              <el-input size="medium" v-model="inputForm.placeOnFileNum" placeholder="请输入存档份数">
+              <el-input size="medium" :disabled="status === 'taskFormDetail' || status === 'audit'" v-model="inputForm.placeOnFileNum" placeholder="请输入存档份数">
               </el-input>
             </el-form-item>
           </el-col>
@@ -404,7 +405,7 @@
                           :rules="[
                           {required: true, message:'打印人签名不能为空', trigger:'blur'}
                    ]">
-              <el-input size="medium" v-model="inputForm.printedBy" placeholder="请输入打印人签名">
+              <el-input size="medium" :disabled="status === 'taskFormDetail' || status === 'audit'" v-model="inputForm.printedBy" placeholder="请输入打印人签名">
               </el-input>
             </el-form-item>
           </el-col>
@@ -413,7 +414,7 @@
                           :rules="[
                           {required: true, message:'校对人签名不能为空', trigger:'blur'}
                    ]">
-              <el-input size="medium" v-model="inputForm.checkAutograph" placeholder="请输入校对人签名">
+              <el-input size="medium" :disabled="status === 'taskFormDetail' || status === 'audit'" v-model="inputForm.checkAutograph" placeholder="请输入校对人签名">
               </el-input>
             </el-form-item>
           </el-col>
@@ -422,7 +423,7 @@
                           :rules="[
                           {required: true, message:'计算机文号不能为空', trigger:'blur'}
                    ]">
-              <el-input size="medium" v-model="inputForm.computerNo" placeholder="请输入计算机文号">
+              <el-input size="medium" :disabled="status === 'taskFormDetail' || status === 'audit'" v-model="inputForm.computerNo" placeholder="请输入计算机文号">
               </el-input>
             </el-form-item>
           </el-col>
@@ -737,7 +738,7 @@
             } else {
               this.inputForm.cwFileInfoList = []
             }
-            if (this.status === 'taskFormDetail') {
+            if (this.status === 'taskFormDetail' || this.status === 'audit') {
               this.method = 'view'
             } else {
               this.method = 'false'