财务-报告修改

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

@@ -129,7 +129,6 @@
           <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
@@ -180,26 +179,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="报告日期" prop="reportDate"
-                          :rules="[
-                   ]">
-              <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-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 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">
@@ -208,13 +194,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 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">
@@ -222,49 +208,6 @@
               </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"
                           :rules="[
@@ -356,10 +299,66 @@
             </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-col :span="12">
+            <el-form-item label="报告日期" prop="reportDate"
+                          :rules="[
+                   ]">
+              <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="0">
+          <el-col :span="12">
             <el-form-item label="公司注册地址" prop="registerAddress"
                           :rules="[
                    ]">
-              <el-input v-model="inputForm.servedUnitName" placeholder="请填写公司注册地址" clearable>
+              <el-input v-model="inputForm.registerAddress" placeholder="请填写公司注册地址" clearable>
               </el-input>
             </el-form-item>
           </el-col>
@@ -380,6 +379,81 @@
             </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="allPrintNum"
+                          :rules="[
+                   ]">
+              <el-input size="medium" v-model="inputForm.allPrintNum" placeholder="请输入本报告共印份数">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发出份数（大写）" prop="issueNum"
+                          :rules="[
+                   ]">
+              <el-input size="medium" v-model="inputForm.issueNum" placeholder="请输入发出份数">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="存档份数（大写）" prop="placeOnFileNum"
+                          :rules="[
+                   ]">
+              <el-input size="medium" v-model="inputForm.placeOnFileNum" placeholder="请输入发出份数">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="打印人签名" prop="printedBy"
+                          :rules="[
+                   ]">
+              <el-input size="medium" v-model="inputForm.printedBy" placeholder="请输入打印人签名">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="校对人签名" prop="checkAutograph"
+                          :rules="[
+                   ]">
+              <el-input size="medium" v-model="inputForm.checkAutograph" placeholder="请输入校对人签名">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计算机文号" prop="computerNo"
+                          :rules="[
+                   ]">
+              <el-input size="medium" v-model="inputForm.computerNo" placeholder="请输入校对人签名">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
       </el-form>
       <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
@@ -400,6 +474,7 @@
 </template>
 
 <script>
+  import ReportReviewService from '@/api/cw/reportManagement/ReportReviewService'
   import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
@@ -430,6 +505,13 @@
         method: '',
         loading: false,
         inputForm: {
+          reportReviewNo: '',
+          allPrintNum: '',
+          issueNum: '',
+          placeOnFileNum: '',
+          printedBy: '',
+          checkAutograph: '',
+          computerNo: '',
           opinionType: '',
           reportNo: '',
           reportNumber: '',
@@ -457,6 +539,7 @@
           signatureAnnotator1: '',
           signatureAnnotator2: '',
           signatureType: '',
+          projectMasterId: '',
           projectMasterName: '',
           cwProjectInfoList: [],
           cwFileInfoList: [],
@@ -471,10 +554,12 @@
         visible: false
       }
     },
+    ReportReviewService: null,
     projectRecordsService: null,
     ProjectReportService: null,
     enterpriseSearchService: null,
     created () {
+      this.reportReviewService = new ReportReviewService()
       this.enterpriseSearchService = new EnterpriseSearchService()
       this.projectRecordsService = new ProjectRecordsService()
       this.projectReportService = new ProjectReportService()
@@ -524,6 +609,16 @@
             this.$refs.userSelect1.clearSelectData()
             this.$forceUpdate()
           })
+        } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator2) && this.inputForm.projectMasterId !== this.inputForm.signatureAnnotator2 &&
+          this.inputForm.projectMasterId !== value && this.commonJS.isNotEmpty(value)) {
+          console.log('this.inputForm.projectMasterId', this.inputForm.signatureAnnotator2)
+          this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
+          this.$nextTick(() => {
+            this.inputForm.signatureAnnotator1 = ''
+            this.$refs.userSelect1.changeNameValue('')
+            this.$refs.userSelect1.clearSelectData()
+            this.$forceUpdate()
+          })
         } else {
           this.inputForm.signatureAnnotator1 = value
         }
@@ -537,6 +632,17 @@
             this.$refs.userSelect2.clearSelectData()
             this.$forceUpdate()
           })
+        } else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator1) && this.inputForm.projectMasterId !== this.inputForm.signatureAnnotator1 &&
+          this.inputForm.projectMasterId !== value && this.commonJS.isNotEmpty(value)) {
+          console.log('this.inputForm.projectMasterId', value)
+          console.log('this.inputForm.projectMasterId', this.inputForm.projectMasterId)
+          this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
+          this.$nextTick(() => {
+            this.inputForm.signatureAnnotator2 = ''
+            this.$refs.userSelect2.changeNameValue('')
+            this.$refs.userSelect2.clearSelectData()
+            this.$forceUpdate()
+          })
         } else {
           this.inputForm.signatureAnnotator2 = value
         }
@@ -544,6 +650,7 @@
       init (method, id) {
         this.visible = true
         this.activeName = 'archiveFile'
+        this.reportReviewService = new ReportReviewService()
         this.projectRecordsService = new ProjectRecordsService()
         this.projectReportService = new ProjectReportService()
         this.method = method
@@ -552,6 +659,13 @@
           this.method = method
         }
         this.inputForm = {
+          reportReviewNo: '',
+          allPrintNum: '',
+          issueNum: '',
+          placeOnFileNum: '',
+          printedBy: '',
+          checkAutograph: '',
+          computerNo: '',
           servedUnitId: '',  // 被服务单位id
           opinionType: '',
           reportNo: '',
@@ -581,6 +695,7 @@
           signatureAnnotator2: '',
           signatureType: '',
           projectMasterName: '',
+          projectMasterId: '',
           cwProjectInfoList: [],
           realCreate: ''
         }
@@ -632,11 +747,12 @@
         }
       },
       getContract (row) {
-        // console.log('row', row)
+        console.log('row', row)
         this.inputForm.projectName = row.projectName // 项目名称
         this.inputForm.projectId = row.id // 项目id
         this.inputForm.projectNumber = row.projectNumber // 项目编号
         this.inputForm.projectMasterName = row.projectMasterName // 项目经理
+        this.inputForm.projectMasterId = row.projectMasterId // 项目经理id
         this.clearClientList()
         this.$forceUpdate()
         this.inputForm.cwProjectInfoList = []
@@ -687,6 +803,20 @@
               let _num = 0
               const wait = function () {
                 return new Promise((resolve, reject) => {
+                  if (_this.commonJS.isNotEmpty(_this.inputForm.signatureAnnotator1) &&
+                    _this.commonJS.isEmpty(_this.inputForm.signatureAnnotator2) &&
+                    _this.inputForm.signatureAnnotator1 !== _this.inputForm.projectMasterId) {
+                    _this.$message.error('签字注师1和签字注师2至少有一个与项目经理相同')
+                    _num = 1
+                    _this.loading = false
+                  }
+                  if (_this.commonJS.isNotEmpty(_this.inputForm.signatureAnnotator2) &&
+                    _this.commonJS.isEmpty(_this.inputForm.signatureAnnotator1) &&
+                    _this.inputForm.signatureAnnotator2 !== _this.inputForm.projectMasterId) {
+                    _this.$message.error('签字注师1和签字注师2至少有一个与项目经理相同')
+                    _num = 1
+                    _this.loading = false
+                  }
                   _this.$refs.archiveFile.getDataList().then((data) => {
                     _this.inputForm.cwFileInfoList = data
                     if (_this.commonJS.isNotEmpty(_this.inputForm.cwFileInfoList)) {
@@ -717,11 +847,6 @@
                   if (this.commonJS.isEmpty(this.inputForm.createDate)) {
                     this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
                   }
-                  if (status === 'agree' && this.commonJS.isEmpty(this.inputForm.opinionType)) {
-                    this.$message.error('意见类型不能为空')
-                    this.loading = false
-                    throw new Error('意见类型不能为空')
-                  }
                   this.projectReportService.saveForm(this.inputForm).then(({data}) => {
                     callback(data.businessTable, data.businessId, this.inputForm)
                     this.close()
@@ -786,11 +911,6 @@
                 if (this.commonJS.isEmpty(this.inputForm.createDate)) {
                   this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
                 }
-                if (status === 'agree' && this.commonJS.isEmpty(this.inputForm.opinionType)) {
-                  this.$message.error('意见类型不能为空')
-                  this.loading = false
-                  throw new Error('意见类型不能为空')
-                }
                 this.projectReportService.saveForm(this.inputForm).then(({data}) => {
                   callback(data.businessTable, data.businessId, this.inputForm)
                   this.loading = false

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

@@ -92,7 +92,7 @@
                               :rules="[
                    ]">
                   <!--                <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>
 
@@ -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='1' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+                  <UserSelect size="medium" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='10' :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,7 @@
                               {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='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                  <UserSelect size="medium" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -950,7 +950,6 @@
             // callback(data.businessTable, data.businessId, this.inputForm)
             this.close()
             this.loading = false
-            this.$emit('refreshList')
           }).catch(() => {
             this.loading = false
           })
@@ -1179,34 +1178,6 @@
           // console.log('list.length', list.length)
           // console.log(list)
         })
-      },
-      // 签字注师1改变事件
-      changeSignatory1 (value) {
-        if (this.inputForm.signatureAnnotator2 === value && this.commonJS.isNotEmpty(value)) {
-          this.$message.warning('签字注师1和签字注师2不可以相同')
-          this.$nextTick(() => {
-            this.inputForm.signatureAnnotator1 = ''
-            this.$refs.userSelect1.changeNameValue('')
-            this.$refs.userSelect1.clearSelectData()
-            this.$forceUpdate()
-          })
-        } else {
-          this.inputForm.signatureAnnotator1 = value
-        }
-      },
-      // 签字注师2改变事件
-      changeSignatory2 (value) {
-        if (this.inputForm.signatureAnnotator1 === value && this.commonJS.isNotEmpty(value)) {
-          this.$message.warning('签字注师1和签字注师2不可以相同')
-          this.$nextTick(() => {
-            this.inputForm.signatureAnnotator2 = ''
-            this.$refs.userSelect2.changeNameValue('')
-            this.$refs.userSelect2.clearSelectData()
-            this.$forceUpdate()
-          })
-        } else {
-          this.inputForm.signatureAnnotator2 = value
-        }
       }
     }
   }

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

@@ -143,7 +143,7 @@
 <!--              <el-button v-if="hasPermission('cwProjectReport:del')&&scope.row.createById === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>-->
               <el-button v-else-if="hasPermission('cwProjectReport:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
 <!--              复核流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '4' || scope.row.reviewStatus === undefined)" type="text" size="small" @click="pushF(scope.row)">复核</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '4' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" type="text" size="small" @click="pushF(scope.row)">复核</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'&& scope.row.reviewStatus === '2'" type="text" size="small" @click="rebackF(scope.row)">撤回复核申请</el-button>
 <!--              公章流程-->
               <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3')" type="text" size="small" @click="pushS(scope.row)">公章</el-button>

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

@@ -172,27 +172,13 @@
               </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 :disabled="true" 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">
@@ -201,13 +187,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 :disabled="true" 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">
@@ -215,51 +201,8 @@
                 </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'}
                    ]">
@@ -274,7 +217,7 @@
               </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'}
                    ]">
@@ -289,7 +232,7 @@
               </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'}
                    ]">
@@ -304,7 +247,7 @@
               </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'}
                    ]">
@@ -319,7 +262,7 @@
               </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'}
                    ]">
@@ -333,7 +276,7 @@
                 </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'}
@@ -349,10 +292,67 @@
               </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-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-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">
               <el-form-item label="公司注册地址" prop="registerAddress"
                             :rules="[
                    ]">
-                <el-input :disabled="true" v-model="inputForm.servedUnitName" placeholder="请填写公司注册地址" clearable>
+                <el-input :disabled="true" v-model="inputForm.registerAddress" placeholder="请填写公司注册地址" clearable>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -375,32 +375,40 @@
           </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="reportTitleType"
+              <el-form-item label="报告编号" prop="reportReviewNo"
                             :rules="[
                    ]">
-                <el-input size="medium" v-model="inputForm.reportTitleType" placeholder="请填写报告类型及标题"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="报告编号" prop="reportNo"
-                            :rules="[
-                   ]">
-                <el-input size="medium" :disabled="true" v-model="inputForm.reportNo" placeholder="自动生成">
+                <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="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="请输入本报告共印份数">
@@ -408,7 +416,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="请输入发出份数">
@@ -416,7 +424,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="请输入发出份数">
@@ -683,6 +691,7 @@
           },
           remarks: '',
           reportNo: '',
+          reportReviewNo: '',
           allPrintNum: '',
           issueNum: '',
           placeOnFileNum: '',
@@ -806,6 +815,7 @@
           },
           remarks: '',
           reportNo: '',
+          reportReviewNo: '',
           allPrintNum: '',
           issueNum: '',
           placeOnFileNum: '',
@@ -1027,6 +1037,7 @@
           },
           remarks: '',
           reportNo: '',
+          reportReviewNo: '',
           allPrintNum: '',
           issueNum: '',
           placeOnFileNum: '',