Merge remote-tracking branch 'origin/master'

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

@@ -171,7 +171,8 @@
           <el-col :span="12">
             <el-form-item label="被服务单位" prop="servedUnitName"
                           :rules="[
-                            {required: true, message:'被服务单位不能为空', trigger:'blur'}
+                            {required: true, message:'被服务单位不能为空', trigger:'blur'},
+                            {required: true, message:'被服务单位不能为空', trigger:'change'}
                    ]">
               <el-input :readonly="true" @focus="openWorkClient()" v-model="inputForm.servedUnitName" placeholder="请填写被服务单位" clearable>
                 <el-button slot="append" icon="el-icon-search" @click="openWorkClient()"></el-button>

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

@@ -87,7 +87,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+              <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
                 <el-form-item label="签字注师1" prop="signatureAnnotator1"
                               :rules="[
                    ]">
@@ -96,12 +96,12 @@
                 </el-form-item>
               </el-col>
 
-              <el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
+              <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
                 <el-form-item label="签字注师2" prop="signatureAnnotator2"
                               :rules="[
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                  <UserSelect size="medium" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                  <UserSelect size="medium" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
                 </el-form-item>
               </el-col>
 
@@ -111,7 +111,7 @@
                               {required: true, message:'签字注师1不能为空', trigger:'blur'}
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                  <UserSelect size="medium" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+                  <UserSelect size="medium" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
                 </el-form-item>
               </el-col>
               <el-col v-if="inputForm.signatureType === '2'" :span="12">
@@ -120,7 +120,21 @@
                               {required: true, message:'签字注师2不能为空', trigger:'blur'}
                    ]">
                   <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                  <UserSelect size="medium" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                  <UserSelect size="medium" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="审计意见类型" prop="opinionType"
+                              :rules="[
+                     ]">
+                  <el-select v-model="inputForm.opinionType" placeholder="请选择审计意见类型" style="width:100%;">
+                    <el-option
+                      v-for="item in $dictUtils.getDictList('cw_opinion_type')"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -156,33 +170,19 @@
                               :rules="[
                             {required: true, message:'被服务单位不能为空', trigger:'blur'}
                    ]">
-                  <el-input :disabled="true" :readonly="true" @focus="openWorkClient()" v-model="inputForm.servedUnitName" placeholder="请填写被服务单位" clearable>
+                  <el-input :readonly="true" @focus="openWorkClient()" v-model="inputForm.servedUnitName" placeholder="请填写被服务单位" clearable>
                     <el-button slot="append" icon="el-icon-search" @click="openWorkClient()"></el-button>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="报告日期" prop="reportDate"
-                              :rules="[
-                   ]">
-                  <el-date-picker
-                    :disabled="true"
-                    placement="bottom-start"
-                    value-format="yyyy-MM-dd"
-                    v-model="inputForm.reportDate"
-                    style="width: 100%"
-                    placeholder="选择日期">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="业务类型" prop="businessType"
+                <el-form-item label="报告类型" prop="reportType"
                               :rules="[
-                            {required: true, message:'业务类型不能为空', trigger:'blur'}
+                            {required: true, message:'报告类型不能为空', trigger:'blur'}
                    ]">
-                  <el-select :disabled="true" v-model="inputForm.businessType" placeholder="请选择业务类型" style="width:100%;">
+                  <el-select v-model="inputForm.reportType" placeholder="请选择报告类型" style="width:100%;">
                     <el-option
-                      v-for="item in $dictUtils.getDictList('cw_business_type')"
+                      v-for="item in $dictUtils.getDictList('cw_report_title_type')"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value">
@@ -191,13 +191,13 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="报告类型" prop="reportType"
+                <el-form-item label="业务类型" prop="businessType"
                               :rules="[
-                            {required: true, message:'报告类型不能为空', trigger:'blur'}
+                            {required: true, message:'业务类型不能为空', trigger:'blur'}
                    ]">
-                  <el-select :disabled="true" v-model="inputForm.reportType" placeholder="请选择报告类型" style="width:100%;">
+                  <el-select v-model="inputForm.businessType" placeholder="请选择业务类型" style="width:100%;">
                     <el-option
-                      v-for="item in $dictUtils.getDictList('cw_report_type')"
+                      v-for="item in $dictUtils.getDictList('cw_business_type')"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value">
@@ -205,55 +205,12 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="报告流水号" prop="reportNumber"
-                              :rules="[
-                   ]">
-                  <el-input :disabled="true" v-model="inputForm.reportNumber" placeholder="自动生成" clearable></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="报告文号" prop="reportNo"
-                              :rules="[
-                   ]">
-                  <el-input :disabled="true" v-model="inputForm.reportNo" placeholder="自动生成" clearable></el-input>
-                </el-form-item>
-              </el-col>
-              <!--<el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status !== 'audit' && status !== 'taskFormDetail'"
-                       label-width="135px" @submit.native.prevent>
-                <el-col :span="12">
-                  <el-form-item label="意见类型" prop="opinionType"
-                                :rules="[
-                                  {required: true, message:'意见类型不能为空', trigger:'blur'}
-                         ]">
-                    <el-select v-model="inputForm.opinionType" placeholder="请选择意见类型" style="width:100%;">
-                      <el-option
-                        v-for="item in $dictUtils.getDictList('cw_opinion_type')"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-form>-->
-              <el-col :span="12">
-                <el-form-item label="盖章状态" prop="sealType"
-                              :rules="[
-                   ]">
-                  <el-input :disabled="true" v-model="inputForm.sealType" placeholder="请填写盖章状态" clearable></el-input>
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-            <el-divider content-position="left"><i class="el-icon-document"></i> 其他信息</el-divider>
-            <el-row  :gutter="0">
               <el-col :span="12" v-if="inputForm.businessType === '1'">
-                <el-form-item label="审计业务类型" prop="auditBusinessType" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_audit_business_type1')}"
+                <el-form-item label="审计业务类型" prop="auditBusinessType"
                               :rules="[
                             {required: true, message:'审计业务类型不能为空', trigger:'blur'}
                    ]">
-                  <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                  <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                     <el-option
                       v-for="item in $dictUtils.getDictList('cw_audit_business_type1')"
                       :key="item.value"
@@ -264,11 +221,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="inputForm.businessType === '2'">
-                <el-form-item label="审计业务类型" prop="auditBusinessType" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_audit_business_type2')}"
+                <el-form-item label="审计业务类型" prop="auditBusinessType"
                               :rules="[
                             {required: true, message:'审计业务类型不能为空', trigger:'blur'}
                    ]">
-                  <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                  <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                     <el-option
                       v-for="item in $dictUtils.getDictList('cw_audit_business_type2')"
                       :key="item.value"
@@ -279,11 +236,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="inputForm.businessType === '3'">
-                <el-form-item label="审计业务类型" prop="auditBusinessType" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_audit_business_type3')}"
+                <el-form-item label="审计业务类型" prop="auditBusinessType"
                               :rules="[
                             {required: true, message:'审计业务类型不能为空', trigger:'blur'}
                    ]">
-                  <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                  <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                     <el-option
                       v-for="item in $dictUtils.getDictList('cw_audit_business_type3')"
                       :key="item.value"
@@ -294,11 +251,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="inputForm.businessType === '4'">
-                <el-form-item label="审计业务类型" prop="auditBusinessType" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_audit_business_type4')}"
+                <el-form-item label="审计业务类型" prop="auditBusinessType"
                               :rules="[
                             {required: true, message:'审计业务类型不能为空', trigger:'blur'}
                    ]">
-                  <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                  <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                     <el-option
                       v-for="item in $dictUtils.getDictList('cw_audit_business_type4')"
                       :key="item.value"
@@ -309,11 +266,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="inputForm.businessType === '5'">
-                <el-form-item label="审计业务类型" prop="auditBusinessType" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_audit_business_type5')}"
+                <el-form-item label="审计业务类型" prop="auditBusinessType"
                               :rules="[
                             {required: true, message:'审计业务类型不能为空', trigger:'blur'}
                    ]">
-                  <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                  <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                     <el-option
                       v-for="item in $dictUtils.getDictList('cw_audit_business_type5')"
                       :key="item.value"
@@ -323,12 +280,12 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12" v-if="inputForm.businessType === '6'" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_audit_business_type6')}">
+              <el-col :span="12" v-if="inputForm.businessType === '6'">
                 <el-form-item label="审计业务类型" prop="auditBusinessType"
                               :rules="[
                             {required: true, message:'审计业务类型不能为空', trigger:'blur'}
                    ]">
-                  <el-select :disabled="true" v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
+                  <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                     <el-option
                       v-for="item in $dictUtils.getDictList('cw_audit_business_type6')"
                       :key="item.value"
@@ -339,58 +296,122 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="公司注册地址" prop="registerAddress"
+                <el-form-item label="报告流水号" prop="reportNumber"
                               :rules="[
                    ]">
-                  <el-input :disabled="true" v-model="inputForm.servedUnitName" placeholder="请填写公司注册地址" clearable>
-                  </el-input>
+                  <el-input :disabled="true" v-model="inputForm.reportNumber" placeholder="自动生成" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="业务所在地" prop="businessLocation"
+                <el-form-item label="报告文号" prop="reportNo"
                               :rules="[
                    ]">
-                  <el-input :disabled="true" v-model="inputForm.businessLocation" placeholder="请填写业务所在地" clearable>
-                  </el-input>
+                  <el-input :disabled="true" v-model="inputForm.reportNo" placeholder="自动生成" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="是否数据证券业务" prop="securityBusiness"
+                <el-form-item label="报告日期" prop="reportDate"
                               :rules="[
                    ]">
-                  <el-input :disabled="true" v-model="inputForm.securityBusiness" placeholder="请填写是否数据证券业务" clearable>
-                  </el-input>
+                  <el-date-picker
+                    placement="bottom-start"
+                    value-format="yyyy-MM-dd"
+                    v-model="inputForm.reportDate"
+                    style="width: 100%"
+                    placeholder="选择日期">
+                  </el-date-picker>
                 </el-form-item>
               </el-col>
+              <!--<el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status !== 'audit' && status !== 'taskFormDetail'"
+                       label-width="135px" @submit.native.prevent>
+                <el-col :span="12">
+                  <el-form-item label="意见类型" prop="opinionType"
+                                :rules="[
+                                  {required: true, message:'意见类型不能为空', trigger:'blur'}
+                         ]">
+                    <el-select v-model="inputForm.opinionType" placeholder="请选择意见类型" style="width:100%;">
+                      <el-option
+                        v-for="item in $dictUtils.getDictList('cw_opinion_type')"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-form>-->
+              <el-col :span="12">
+                <el-form-item label="盖章状态" prop="sealType"
+                              :rules="[
+                   ]">
+                  <el-input :disabled="true" v-model="inputForm.sealType" placeholder="请填写盖章状态" clearable></el-input>
+                </el-form-item>
+              </el-col>
+
             </el-row>
-            <el-divider content-position="left"><i class="el-icon-document"></i> 报告审核信息</el-divider>
-            <el-row  :gutter="15">
+            <el-divider content-position="left"><i class="el-icon-document"></i> 其他信息</el-divider>
+            <el-row  :gutter="0">
               <el-col :span="12">
-                <el-form-item label="报告类型及标题" prop="reportTitleType"
+                <el-form-item label="公司注册地址" prop="registerAddress"
                               :rules="[
                    ]">
-                  <el-input size="medium" v-model="inputForm.reportTitleType" placeholder="请填写报告类型及标题"></el-input>
+                  <el-input v-model="inputForm.registerAddress" placeholder="请填写公司注册地址" clearable>
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="报告编号" prop="reportNo"
+                <el-form-item label="业务所在地" prop="businessLocation"
                               :rules="[
                    ]">
-                  <el-input size="medium" :disabled="true" v-model="inputForm.reportNo" placeholder="自动生成">
-                    <!--                  <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>-->
+                  <el-input v-model="inputForm.businessLocation" placeholder="请填写业务所在地" clearable>
                   </el-input>
                 </el-form-item>
               </el-col>
-
               <el-col :span="12">
-                <el-form-item label="创建人" prop="userName"
+                <el-form-item label="是否数据证券业务" prop="securityBusiness"
                               :rules="[
                    ]">
-                  <el-input :disabled="true" v-model="inputForm.userName" placeholder="请填写创建人" clearable></el-input>
+                  <el-input v-model="inputForm.securityBusiness" placeholder="请填写是否数据证券业务" clearable>
+                  </el-input>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-divider content-position="left"><i class="el-icon-document"></i> 报告审核信息</el-divider>
+            <el-row  :gutter="15">
+<!--              <el-col :span="12">-->
+<!--                <el-form-item label="报告类别" prop="reportTitleType"-->
+<!--                              :rules="[-->
+<!--                   ]">-->
+<!--                  <el-select v-model="inputForm.reportTitleType" placeholder="请选择报告类别" style="width:100%;">-->
+<!--                    <el-option-->
+<!--                      v-for="item in $dictUtils.getDictList('cw_report_title_type')"-->
+<!--                      :key="item.value"-->
+<!--                      :label="item.label"-->
+<!--                      :value="item.value">-->
+<!--                    </el-option>-->
+<!--                  </el-select>-->
+<!--                  &lt;!&ndash;                <el-input size="medium" v-model="inputForm.reportTitleType" placeholder="请填写报告类型及标题"></el-input>&ndash;&gt;-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+              <el-col :span="12">
+                <el-form-item label="报告编号" prop="reportReviewNo"
+                              :rules="[
+                   ]">
+                  <el-input size="medium" :disabled="true" v-model="inputForm.reportReviewNo" placeholder="自动生成">
+                    <!--                  <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>-->
+                  </el-input>
+                </el-form-item>
+              </el-col>
+
+<!--              <el-col :span="12">-->
+<!--                <el-form-item label="创建人" prop="userName"-->
+<!--                              :rules="[-->
+<!--                   ]">-->
+<!--                  <el-input :disabled="true" v-model="inputForm.userName" placeholder="请填写创建人" clearable></el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
               <el-col :span="12">
-                <el-form-item label="本报告共印份数" prop="allPrintNum"
+                <el-form-item label="共印份数（大写）" prop="allPrintNum"
                               :rules="[
                    ]">
                   <el-input size="medium" v-model="inputForm.allPrintNum" placeholder="请输入本报告共印份数">
@@ -398,7 +419,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="发出份数" prop="issueNum"
+                <el-form-item label="发出份数（大写）" prop="issueNum"
                               :rules="[
                    ]">
                   <el-input size="medium" v-model="inputForm.issueNum" placeholder="请输入发出份数">
@@ -406,7 +427,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="存档份数" prop="placeOnFileNum"
+                <el-form-item label="存档份数（大写）" prop="placeOnFileNum"
                               :rules="[
                    ]">
                   <el-input size="medium" v-model="inputForm.placeOnFileNum" placeholder="请输入发出份数">
@@ -696,6 +717,7 @@
           userName: '',
           opinionType: '',
           reportNo: '',
+          reportReviewNo: '',
           projectId: '',
           id: '',
           createDate: '',
@@ -807,8 +829,10 @@
         this.projectReportService = new ProjectReportService()
         this.method = method
         this.inputForm = {
+          auditBusinessType: '',
           opinionType: '',
           reportNo: '',
+          reportReviewNo: '',
           reportNumber: '',
           reportType: '',
           reportDate: '',
@@ -934,17 +958,14 @@
           // 暂存
           // this.inputForm.status = '1'
           this.loading = true
-          if (this.commonJS.isEmpty(this.inputForm.opinionType)) {
-            this.$message.error('意见类型不能为空')
-            this.loading = false
-            throw new Error('意见类型不能为空')
-          }
           this.$refs.archiveFile.getDataList().then((data) => {
             this.inputForm.cwFileInfoList = data
           })
-          // this.$refs.signatureFile.getDataList().then((data) => {
-          //   this.inputForm.signatureFileList = data
-          // })
+          if (this.commonJS.isNotEmpty(this.$refs.signatureFile.getDataList())) {
+            this.$refs.signatureFile.getDataList().then((data) => {
+              this.inputForm.signatureFileList = data
+            })
+          }
           this.reportReviewService.save(this.inputForm)
           this.projectReportService.saveForm(this.inputForm).then(({data}) => {
             // callback(data.businessTable, data.businessId, this.inputForm)
@@ -984,11 +1005,6 @@
               this.loading = false
               throw new Error('报告类型不能为空')
             }
-            if (this.commonJS.isEmpty(this.inputForm.opinionType)) {
-              this.$message.error('意见类型不能为空')
-              this.loading = false
-              throw new Error('意见类型不能为空')
-            }
             this.$refs.archiveFile.getDataList().then((data) => {
               this.inputForm.cwFileInfoList = data
             })

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -343,6 +343,20 @@
           <el-divider content-position="left"><i class="el-icon-document"></i> 报告审核信息</el-divider>
           <el-row  :gutter="15">
             <el-col :span="12">
+              <el-form-item label="下一节点审核人" prop="reviewBy"
+                            :rules="[
+                   ]">
+                <el-select v-model="inputForm.reviewBy" placeholder="请选择下一节点审核人" style="width:100%;">
+                  <el-option
+                    v-for="item in reviewBys"
+                    :key="item.index"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="报告编号" prop="reportReviewNo"
                             :rules="[
                    ]">
@@ -597,8 +611,10 @@
         title: '',
         method: '',
         loading: false,
+        reviewBys: [],
         inputForm: {
           sealType: '',
+          reviewBy: '', // 下一个节点审核人
           reportNumber: '',
           reportType: '',
           businessType: '',
@@ -722,6 +738,7 @@
         this.projectReportService = new ProjectReportService()
         this.method = method
         this.inputForm = {
+          reviewBy: '', // 下一个节点审核人
           sealType: '',
           reportNumber: '',
           reportType: '',
@@ -782,6 +799,7 @@
         this.inputForm.id = id
         this.loading = false
         this.$refs.archiveFile.clearUpload()
+        this.reviewBys = []
         this.$nextTick(() => {
           // this.$refs.inputForm.resetFields()
           this.loading = true
@@ -802,6 +820,13 @@
                 this.inputForm.taskName = data
               })
             }
+            data.reviewBys.forEach(re => {
+              let va = {
+                label: re.name,
+                value: re.sysUserId
+              }
+              this.reviewBys.push(va)
+            })
             this.$refs.archiveFile.newUpload('view', data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             this.loading = false
           })
@@ -908,6 +933,8 @@
             if (this.commonJS.isEmpty(this.inputForm.createDate)) {
               this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             }
+            console.log('this.inputForm.reviewBy', this.inputForm.reviewBy)
+            this.inputForm.assignee = this.inputForm.reviewBy
             // 列表处理
             this.inputForm.details = []
             this.inputForm.detailFor1010.forEach(item => { this.inputForm.details.push(item) })
@@ -992,6 +1019,7 @@
           projectMasterName: '',
           tableKeyClient: '1'
         }
+        this.reviewBys = []
         // this.$refs.uploadComponent.clearUpload()
         // this.$refs.inputForm.resetFields()
         this.$refs.archiveFile.clearUpload()