项目功能优化

src/views/modules/program/registered/ProjectArchiveForm.vue

@@ -62,25 +62,47 @@
             <el-col :span="12">
               <el-form-item label="年份" prop="year"
                             :rules="[
-                  {required: true, message:'年份不能为空', trigger:'blur'}
+
                  ]">
-                <el-date-picker
-                  v-model="inputForm.year"
-                  type="year"
-                  value-format="yyyy"
-                  placeholder="选择评年份"
-                  style="width:100%"
-                  placement="bottom-start"
-                  clearable>
-                </el-date-picker>
+                <el-input size="medium" :disabled="true" v-model="inputForm.year" placeholder="请输入年份" clearable></el-input>
+<!--                <el-date-picker-->
+<!--                  v-model="inputForm.year"-->
+<!--                  type="year"-->
+<!--                  value-format="yyyy"-->
+<!--                  placeholder="选择评年份"-->
+<!--                  style="width:100%"-->
+<!--                  placement="bottom-start"-->
+<!--                  clearable>-->
+<!--                </el-date-picker>-->
+              </el-form-item>
+            </el-col>
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="项目类型" prop="programType"-->
+<!--                            :rules="[-->
+<!--                        {required: true, message:'项目类型不能为空', trigger:'blur'}-->
+<!--                 ]">-->
+<!--                <el-input v-model="inputForm.programType" maxlength="64" placeholder="请填写项目类型"    clearable ></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+            <el-col :span="12">
+              <el-form-item label="项目类型" prop="programProjectListInfo.projectMould"
+                            :rules="[
+                 ]">
+                <el-select v-model="inputForm.programProjectListInfo.projectMould" :disabled="true" placeholder="请选择项目类型" clearable style="width: 100%;">
+                  <el-option
+                    v-for="item in $dictUtils.getDictList('program_registered_type')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="项目类型" prop="programType"
+              <el-form-item label="合同编号" prop="programProjectListInfo.contractNo"
                             :rules="[
-                        {required: true, message:'项目类型不能为空', trigger:'blur'}
                  ]">
-                <el-input v-model="inputForm.programType" maxlength="64" placeholder="请填写项目类型"    clearable ></el-input>
+                <el-input :disabled="true" v-model="inputForm.programProjectListInfo.contractNo" maxlength="64" placeholder="请填写合同编号"   clearable  ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -118,14 +140,7 @@
                 <UserSelect size="medium" :disabled="formReadOnly" :readonly="true" :limit='1' :value="inputForm.signatureEvaluatorSecond" @getValue='(value) => {inputForm.signatureEvaluatorSecond = value}'></UserSelect>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="协议号" prop="protocolNum"
-                            :rules="[
-                        {required: true, message:'协议号不能为空', trigger:'blur'}
-                 ]">
-                <el-input v-model="inputForm.protocolNum" maxlength="64" placeholder="请填写协议号"   clearable  ></el-input>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="12">
               <el-form-item label="废旧物资评估(万元)" prop="waystEvaluation"
                             :rules="[
@@ -192,11 +207,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="司法鉴定" prop="forensics"
+<!--              原司法鉴定-->
+              <el-form-item label="其他" prop="forensics"
                             :rules="[
-                        { message:'司法鉴定不能为空', trigger:'blur'}
                  ]">
-                <el-input v-model="inputForm.forensics" maxlength="64" placeholder="请填写司法鉴定"    clearable ></el-input>
+                <el-input v-model="inputForm.forensics" maxlength="64" placeholder="请填写其他"    clearable ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -510,7 +525,9 @@
           otherFileList: [],
           auditUserId: '',
           signatureEvaluatorFirst: '',
-          signatureEvaluatorSecond: ''
+          signatureEvaluatorSecond: '',
+          reportNo: '',
+          contractNo: ''
         },
         programId: '',
         supervisorList: [],
@@ -606,7 +623,9 @@
           otherFileList: [],
           auditUserId: '',
           signatureEvaluatorFirst: '',
-          signatureEvaluatorSecond: ''
+          signatureEvaluatorSecond: '',
+          reportNo: '',
+          contractNo: ''
         }
         if (this.commonJS.isEmpty(id)) {
           this.inputForm = {
@@ -647,7 +666,9 @@
             otherFileList: [],
             auditUserId: '',
             signatureEvaluatorFirst: '',
-            signatureEvaluatorSecond: ''
+            signatureEvaluatorSecond: '',
+            reportNo: '',
+            contractNo: ''
           }
           return
         }
@@ -660,6 +681,13 @@
           this.programProjectListInfoService.findByIdArchive(this.inputForm.id).then(({data}) => {
             this.inputForm = this.recover(this.inputForm, data)
             this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+            if (this.commonJS.isEmpty(this.inputForm.year)) {
+              if (this.commonJS.isNotEmpty(this.inputForm.reportNo)) {
+                let arr1 = this.inputForm.reportNo.split('【')
+                let arr2 = arr1[1].split('】')
+                this.inputForm.year = arr2[0]
+              }
+            }
             this.$refs.uploadComponentReport.clearUpload()
             this.$refs.uploadComponentExplain.clearUpload()
             this.$refs.uploadComponentDetail.clearUpload()
@@ -869,7 +897,9 @@
           otherFileList: [],
           auditUserId: '',
           signatureEvaluatorFirst: '',
-          signatureEvaluatorSecond: ''
+          signatureEvaluatorSecond: '',
+          reportNo: '',
+          contractNo: ''
         }
         this.$refs.inputForm.resetFields()
         this.visible = false

src/views/modules/program/registered/ProjectForm.vue

@@ -124,6 +124,67 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
+                    <el-form-item label="报告类型" prop="reportType"
+                                  :rules="[
+                          {required: true, message:'报告类型不能为空', trigger:'blur'}
+                 ]">
+                      <el-select v-model="inputForm.reportType" placeholder="请选择报告类型" clearable style="width: 100%;">
+                        <el-option
+                          v-for="item in $dictUtils.getDictList('program_registered_report_type')"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="评估目的" prop="assessmentObjective"
+                                  :rules="[
+                 ]">
+                      <el-input v-model="inputForm.assessmentObjective" placeholder="请输入评估目的"clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="评估方法" prop="assessmentWay"
+                                  :rules="[
+                 ]">
+                      <el-input v-model="inputForm.assessmentWay" placeholder="请输入评估方法"clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="12">
+                    <el-form-item label="评估基准日" prop="assessmentDate"
+                                  :rules="[
+                          {required: true, message:'评估基准日不能为空', trigger:'blur'}
+                 ]">
+                      <el-date-picker
+                        v-model="inputForm.assessmentDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择评估基准日"
+                        style="width:100%"
+                        placement="bottom-start"
+                        clearable>
+                      </el-date-picker>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="评估对象" prop="assessmentObject"
+                                  :rules="[
+                          {required: true, message:'评估对象不能为空', trigger:'blur'}
+                 ]">
+                      <el-select v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable style="width: 100%;">
+                        <el-option
+                          v-for="item in $dictUtils.getDictList('project_assessment_object')"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
                     <el-form-item label="执业机构" prop="company"
                                   :rules="[
                  ]">
@@ -147,6 +208,7 @@
                         url="/sys/area/treeData"
                         :value="inputForm.location"
                         :clearable="true"
+                        size="medium"
                         :accordion="true"
                         @getValue="(value) => {inputForm.location=value}"/>
                     </el-form-item>
@@ -161,6 +223,13 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
+                    <el-form-item label="企业类型" prop="enterpriseType"
+                                  :rules="[
+                 ]">
+                      <el-input maxlength="64" v-model="inputForm.enterpriseType" placeholder="请输入企业类型"clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
                     <el-form-item label="是否首次承做" prop="isFirst"
                                   :rules="[
                           {required: true, message:'是否首次承做不能为空', trigger:'blur'}
@@ -188,6 +257,45 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
+                    <el-form-item label="项目来源" prop="projectSource"
+                                  :rules="[
+                          {required: true, message:'项目来源不能为空', trigger:'blur'}
+                 ]">
+                      <el-select v-model="inputForm.projectSource" placeholder="请选择项目来源" clearable style="width: 100%;">
+                        <el-option
+                          v-for="item in $dictUtils.getDictList('program_registered_source')"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="被评估企业" prop="assessmentEnterpriseName"
+                                  :rules="[
+                          {required: true, message:'被评估企业不能为空', trigger:'blur'},
+                          {required: true, message:'被评估企业不能为空', trigger:'change'}
+                 ]">
+                      <el-input v-model="inputForm.assessmentEnterpriseName" @focus="openWorkClientForm('3')" placeholder="请输入被评估企业"clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="联系人及电话" prop="linkNum"
+                                  :rules="[
+                          {required: true, message:'联系人及电话不能为空', trigger:'blur'}
+                 ]">
+                      <el-input maxlength="64" v-model="inputForm.linkNum" placeholder="请输入联系人及电话"clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="委托人与被评估单位关系" prop="relationship"
+                                  :rules="[
+                 ]">
+                      <el-input v-model="inputForm.relationship" placeholder="请输入委托人与被评估单位关系"clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
                     <el-form-item label="评估费用核算年度" prop="checkYear"
                                   :rules="[
                           {required: true, message:'评估费用核算年度不能为空', trigger:'blur'}
@@ -223,21 +331,7 @@
                         @getValue="(value) => {inputForm.projectManager=value}"/>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="报告类型" prop="reportType"
-                                  :rules="[
-                          {required: true, message:'报告类型不能为空', trigger:'blur'}
-                 ]">
-                      <el-select v-model="inputForm.reportType" placeholder="请选择报告类型" clearable style="width: 100%;">
-                        <el-option
-                          v-for="item in $dictUtils.getDictList('program_registered_report_type')"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
+
                   <!--          <el-col :span="12">-->
                   <!--            <el-form-item label="所属行业" prop="industry"-->
                   <!--                          :rules="[-->
@@ -245,13 +339,7 @@
                   <!--              <el-input maxlength="64" v-model="inputForm.industry" placeholder="请输入所属行业"clearable></el-input>-->
                   <!--            </el-form-item>-->
                   <!--          </el-col>-->
-                  <el-col :span="12">
-                    <el-form-item label="企业类型" prop="enterpriseType"
-                                  :rules="[
-                 ]">
-                      <el-input maxlength="64" v-model="inputForm.enterpriseType" placeholder="请输入企业类型"clearable></el-input>
-                    </el-form-item>
-                  </el-col>
+
                   <el-col :span="12">
                     <el-form-item label="风险等级" prop="riskLevel"
                                   :rules="[
@@ -262,17 +350,22 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="项目来源" prop="projectSource"
+                    <el-form-item label="风险项目类型" prop="delegateProjectType"
                                   :rules="[
-                          {required: true, message:'项目来源不能为空', trigger:'blur'}
+                          {required: true, message:'风险项目类型不能为空', trigger:'blur'}
                  ]">
-                      <el-select v-model="inputForm.projectSource" placeholder="请选择项目来源" clearable style="width: 100%;">
-                        <el-option
-                          v-for="item in $dictUtils.getDictList('program_registered_source')"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
+                      <el-select v-model="inputForm.delegateProjectType" placeholder="请选择风险项目类型" clearable style="width: 100%">
+                        <el-option-group
+                          v-for="(type,index) in typeDictList"
+                          :key="type.id"
+                          :label="type.type">
+                          <el-option
+                            v-for="item in typeDictList[index].childrenList"
+                            :key="item.id"
+                            :label="item.type"
+                            :value="item.id">
+                          </el-option>
+                        </el-option-group>
                       </el-select>
                     </el-form-item>
                   </el-col>
@@ -362,142 +455,6 @@
                       </el-input-number>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="24">
-                    <el-form-item label="备注" prop="remarks"
-                                  :rules="[
-                 ]">
-                      <el-input type="textarea" v-model="inputForm.remarks" maxlength="500" placeholder="请输入备注" show-word-limit></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row  :gutter="15">
-                  <el-col :span="12">
-                    <el-form-item label="被评估企业" prop="assessmentEnterpriseName"
-                                  :rules="[
-                          {required: true, message:'被评估企业不能为空', trigger:'blur'},
-                          {required: true, message:'被评估企业不能为空', trigger:'change'}
-                 ]">
-                      <el-input v-model="inputForm.assessmentEnterpriseName" @focus="openWorkClientForm('3')" placeholder="请输入被评估企业"clearable></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="联系人及电话" prop="linkNum"
-                                  :rules="[
-                          {required: true, message:'联系人及电话不能为空', trigger:'blur'}
-                 ]">
-                      <el-input maxlength="64" v-model="inputForm.linkNum" placeholder="请输入联系人及电话"clearable></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="委托人与被评估单位关系" prop="relationship"
-                                  :rules="[
-                 ]">
-                      <el-input v-model="inputForm.relationship" placeholder="请输入委托人与被评估单位关系"clearable></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="评估方法" prop="assessmentWay"
-                                  :rules="[
-                 ]">
-                      <el-input v-model="inputForm.assessmentWay" placeholder="请输入评估方法"clearable></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="评估目的" prop="assessmentObjective"
-                                  :rules="[
-                 ]">
-                      <el-input v-model="inputForm.assessmentObjective" placeholder="请输入评估目的"clearable></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="评估基准日" prop="assessmentDate"
-                                  :rules="[
-                          {required: true, message:'评估基准日不能为空', trigger:'blur'}
-                 ]">
-                      <el-date-picker
-                        v-model="inputForm.assessmentDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择评估基准日"
-                        style="width:100%"
-                        placement="bottom-start"
-                        clearable>
-                      </el-date-picker>
-                    </el-form-item>
-                  </el-col>
-                  <!--          <el-col :span="12">-->
-                  <!--            <el-form-item label="评估服务收费总额" prop="num"-->
-                  <!--                          :rules="[-->
-                  <!--                          {required: true, message:'评估服务收费总额不能为空', trigger:'blur'}-->
-                  <!--                 ]">-->
-                  <!--              <el-input-number-->
-                  <!--                v-model="inputForm.num"-->
-                  <!--                controls-position="right"-->
-                  <!--                style="width:100%;"-->
-                  <!--                :precision="2"-->
-                  <!--                placeholder="请输入评估服务收费总额"-->
-                  <!--                :controls="false"-->
-                  <!--                :step="0.01"-->
-                  <!--                :min="0"-->
-                  <!--                clearable>-->
-                  <!--              </el-input-number>-->
-                  <!--            </el-form-item>-->
-                  <!--          </el-col>-->
-                  <!--          <el-col :span="12">-->
-                  <!--            <el-form-item label="项目开发人" prop="projectDevelopment"-->
-                  <!--                          :rules="[-->
-                  <!--                          {required: true, message:'项目开发人不能为空', trigger:'blur'}-->
-                  <!--                 ]">-->
-                  <!--              <SelectUserTree-->
-                  <!--                ref="companyTree"-->
-                  <!--                size="medium"-->
-                  <!--                :props="{-->
-                  <!--                  value: 'id',             // ID字段名-->
-                  <!--                  label: 'name',         // 显示名称-->
-                  <!--                  children: 'children'    // 子级字段名-->
-                  <!--                }"-->
-                  <!--                :url="`/sys/user/treeUserDataAllOffice?type=2`"-->
-                  <!--                :value="inputForm.projectDevelopment"-->
-                  <!--                :clearable="true"-->
-                  <!--                :accordion="true"-->
-                  <!--                @getValue="(value) => {inputForm.projectDevelopment=value}"/>-->
-                  <!--            </el-form-item>-->
-                  <!--          </el-col>-->
-                  <el-col :span="12">
-                    <el-form-item label="项目类型" prop="delegateProjectType"
-                                  :rules="[
-                          {required: true, message:'项目类型不能为空', trigger:'blur'}
-                 ]">
-                      <el-select v-model="inputForm.delegateProjectType" placeholder="请选择项目类型" clearable style="width: 100%">
-                        <el-option-group
-                          v-for="(type,index) in typeDictList"
-                          :key="type.id"
-                          :label="type.type">
-                          <el-option
-                            v-for="item in typeDictList[index].childrenList"
-                            :key="item.id"
-                            :label="item.type"
-                            :value="item.id">
-                          </el-option>
-                        </el-option-group>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="评估对象" prop="assessmentObject"
-                                  :rules="[
-                          {required: true, message:'评估对象不能为空', trigger:'blur'}
-                 ]">
-                      <el-select v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable style="width: 100%;">
-                        <el-option
-                          v-for="item in $dictUtils.getDictList('project_assessment_object')"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
                   <el-col :span="12">
                     <el-form-item label="预计现场工作起止日期" prop="workBeginAndEndDate"
                                   :rules="[
@@ -532,39 +489,16 @@
                       </el-date-picker>
                     </el-form-item>
                   </el-col>
-
-
-                  <el-col :span="12">
-                    <el-form-item label="本所是否具备承接胜任能力" prop="isHave"
-                                  :rules="[
-                          {required: true, message:'本所是否具备承接胜任能力不能为空', trigger:'blur'}
-                 ]">
-                      <el-radio v-model="inputForm.isHave" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 20px">
-                        {{item.label}}</el-radio>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="是否影响本所承做人员独立性" prop="isInfluence"
-                                  :rules="[
-                          {required: true, message:'是否影响本所承做人员独立性不能为空', trigger:'blur'}
-                 ]">
-                      <el-radio v-model="inputForm.isInfluence" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 20px">
-                        {{item.label}}</el-radio>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="项目承做方式" prop="mode"
+                  <el-col :span="24">
+                    <el-form-item label="备注" prop="remarks"
                                   :rules="[
-                          {required: true, message:'项目承做方式不能为空', trigger:'blur'}
                  ]">
-                      <el-radio v-model="inputForm.mode" v-for="item in $dictUtils.getDictList('project_commitment_mode')" :label="item.value" size="small" style="margin-right: 20px">
-                        {{item.label}}</el-radio>
+                      <el-input type="textarea" v-model="inputForm.remarks" maxlength="500" placeholder="请输入备注" show-word-limit></el-input>
                     </el-form-item>
                   </el-col>
-
                 </el-row>
                 <el-divider content-position="left"><i class="el-icon-document"></i>
-                  委托人和对接人
+                  委托方联系人和项目直接对接人
                   <el-button style="margin-left: 20px" type="primary" :disabled="method==='view'" size="mini" @click="openContactForm('0')" plain>
                     新增
                   </el-button>

src/views/modules/program/registered/ProjectFormUpdate.vue

@@ -120,20 +120,71 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="执业机构" prop="company"
+            <el-form-item label="报告类型" prop="reportType"
                           :rules="[
+                          {required: true, message:'报告类型不能为空', trigger:'blur'}
                  ]">
-              <el-input :readonly="true" v-model="inputForm.company" placeholder="请输入执业机构" clearable></el-input>
+              <el-select v-model="inputForm.reportType" placeholder="请选择报告类型" clearable style="width: 100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('program_registered_report_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="评估目的" prop="assessmentObjective"
+                          :rules="[
+                 ]">
+              <el-input v-model="inputForm.assessmentObjective" placeholder="请输入评估目的"clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="评估方法" prop="assessmentWay"
+                          :rules="[
+                 ]">
+              <el-input v-model="inputForm.assessmentWay" placeholder="请输入评估方法"clearable></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="委托人" prop="propertyHolderName"
+            <el-form-item label="评估基准日" prop="assessmentDate"
                           :rules="[
-                          {required: true, message:'委托人不能为空', trigger:'blur'},
-                          {required: true, message:'委托人不能为空', trigger:'change'}
+                          {required: true, message:'评估基准日不能为空', trigger:'blur'}
                  ]">
-              <el-input v-model="inputForm.propertyHolderName" @focus="openWorkClientForm('2')" placeholder="请输入委托人" clearable></el-input>
+              <el-date-picker
+                v-model="inputForm.assessmentDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择评估基准日"
+                style="width:100%"
+                placement="bottom-start"
+                clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="评估对象" prop="assessmentObject"
+                          :rules="[
+                          {required: true, message:'评估对象不能为空', trigger:'blur'}
+                 ]">
+              <el-select v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable style="width: 100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('project_assessment_object')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="执业机构" prop="company"
+                          :rules="[
+                 ]">
+              <el-input :readonly="true" v-model="inputForm.company" placeholder="请输入执业机构" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -151,11 +202,28 @@
                 url="/sys/area/treeData"
                 :value="inputForm.location"
                 :clearable="true"
+                size="medium"
                 :accordion="true"
                 @getValue="(value) => {inputForm.location=value}"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="委托人" prop="propertyHolderName"
+                          :rules="[
+                          {required: true, message:'委托人不能为空', trigger:'blur'},
+                          {required: true, message:'委托人不能为空', trigger:'change'}
+                 ]">
+              <el-input v-model="inputForm.propertyHolderName" @focus="openWorkClientForm('2')" placeholder="请输入委托人" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业类型" prop="enterpriseType"
+                          :rules="[
+                 ]">
+              <el-input maxlength="64" v-model="inputForm.enterpriseType" placeholder="请输入企业类型"clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="是否首次承做" prop="isFirst"
                           :rules="[
                           {required: true, message:'是否首次承做不能为空', trigger:'blur'}
@@ -183,6 +251,45 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="项目来源" prop="projectSource"
+                          :rules="[
+                          {required: true, message:'项目来源不能为空', trigger:'blur'}
+                 ]">
+              <el-select v-model="inputForm.projectSource" placeholder="请选择项目来源" clearable style="width: 100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('program_registered_source')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="被评估企业" prop="assessmentEnterpriseName"
+                          :rules="[
+                          {required: true, message:'被评估企业不能为空', trigger:'blur'},
+                          {required: true, message:'被评估企业不能为空', trigger:'change'}
+                 ]">
+              <el-input v-model="inputForm.assessmentEnterpriseName" @focus="openWorkClientForm('3')" placeholder="请输入被评估企业"clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人及电话" prop="linkNum"
+                          :rules="[
+                          {required: true, message:'联系人及电话不能为空', trigger:'blur'}
+                 ]">
+              <el-input maxlength="64" v-model="inputForm.linkNum" placeholder="请输入联系人及电话"clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托人与被评估单位关系" prop="relationship"
+                          :rules="[
+                 ]">
+              <el-input v-model="inputForm.relationship" placeholder="请输入委托人与被评估单位关系"clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="评估费用核算年度" prop="checkYear"
                           :rules="[
                           {required: true, message:'评估费用核算年度不能为空', trigger:'blur'}
@@ -218,21 +325,7 @@
                 @getValue="(value) => {inputForm.projectManager=value}"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="报告类型" prop="reportType"
-                          :rules="[
-                          {required: true, message:'报告类型不能为空', trigger:'blur'}
-                 ]">
-              <el-select v-model="inputForm.reportType" placeholder="请选择报告类型" clearable style="width: 100%;">
-                <el-option
-                  v-for="item in $dictUtils.getDictList('program_registered_report_type')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+
           <!--          <el-col :span="12">-->
           <!--            <el-form-item label="所属行业" prop="industry"-->
           <!--                          :rules="[-->
@@ -240,13 +333,7 @@
           <!--              <el-input maxlength="64" v-model="inputForm.industry" placeholder="请输入所属行业"clearable></el-input>-->
           <!--            </el-form-item>-->
           <!--          </el-col>-->
-          <el-col :span="12">
-            <el-form-item label="企业类型" prop="enterpriseType"
-                          :rules="[
-                 ]">
-              <el-input maxlength="64" v-model="inputForm.enterpriseType" placeholder="请输入企业类型"clearable></el-input>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="12">
             <el-form-item label="风险等级" prop="riskLevel"
                           :rules="[
@@ -257,17 +344,22 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="项目来源" prop="projectSource"
+            <el-form-item label="风险项目类型" prop="delegateProjectType"
                           :rules="[
-                          {required: true, message:'项目来源不能为空', trigger:'blur'}
+                          {required: true, message:'风险项目类型不能为空', trigger:'blur'}
                  ]">
-              <el-select v-model="inputForm.projectSource" placeholder="请选择项目来源" clearable style="width: 100%;">
-                <el-option
-                  v-for="item in $dictUtils.getDictList('program_registered_source')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
+              <el-select v-model="inputForm.delegateProjectType" placeholder="请选择风险项目类型" clearable style="width: 100%">
+                <el-option-group
+                  v-for="(type,index) in typeDictList"
+                  :key="type.id"
+                  :label="type.type">
+                  <el-option
+                    v-for="item in typeDictList[index].childrenList"
+                    :key="item.id"
+                    :label="item.type"
+                    :value="item.id">
+                  </el-option>
+                </el-option-group>
               </el-select>
             </el-form-item>
           </el-col>
@@ -357,142 +449,6 @@
               </el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remarks"
-                          :rules="[
-                 ]">
-              <el-input type="textarea" v-model="inputForm.remarks" maxlength="500" placeholder="请输入备注" show-word-limit></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row  :gutter="15">
-          <el-col :span="12">
-            <el-form-item label="被评估企业" prop="assessmentEnterpriseName"
-                          :rules="[
-                          {required: true, message:'被评估企业不能为空', trigger:'blur'},
-                          {required: true, message:'被评估企业不能为空', trigger:'change'}
-                 ]">
-              <el-input v-model="inputForm.assessmentEnterpriseName" @focus="openWorkClientForm('3')" placeholder="请输入被评估企业"clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系人及电话" prop="linkNum"
-                          :rules="[
-                          {required: true, message:'联系人及电话不能为空', trigger:'blur'}
-                 ]">
-              <el-input maxlength="64" v-model="inputForm.linkNum" placeholder="请输入联系人及电话"clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="委托人与被评估单位关系" prop="relationship"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.relationship" placeholder="请输入委托人与被评估单位关系"clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估方法" prop="assessmentWay"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.assessmentWay" placeholder="请输入评估方法"clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估目的" prop="assessmentObjective"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.assessmentObjective" placeholder="请输入评估目的"clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估基准日" prop="assessmentDate"
-                          :rules="[
-                          {required: true, message:'评估基准日不能为空', trigger:'blur'}
-                 ]">
-              <el-date-picker
-                v-model="inputForm.assessmentDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择评估基准日"
-                style="width:100%"
-                placement="bottom-start"
-                clearable>
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="评估服务收费总额" prop="num"-->
-          <!--                          :rules="[-->
-          <!--                          {required: true, message:'评估服务收费总额不能为空', trigger:'blur'}-->
-          <!--                 ]">-->
-          <!--              <el-input-number-->
-          <!--                v-model="inputForm.num"-->
-          <!--                controls-position="right"-->
-          <!--                style="width:100%;"-->
-          <!--                :precision="2"-->
-          <!--                placeholder="请输入评估服务收费总额"-->
-          <!--                :controls="false"-->
-          <!--                :step="0.01"-->
-          <!--                :min="0"-->
-          <!--                clearable>-->
-          <!--              </el-input-number>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <!--          <el-col :span="12">-->
-          <!--            <el-form-item label="项目开发人" prop="projectDevelopment"-->
-          <!--                          :rules="[-->
-          <!--                          {required: true, message:'项目开发人不能为空', trigger:'blur'}-->
-          <!--                 ]">-->
-          <!--              <SelectUserTree-->
-          <!--                ref="companyTree"-->
-          <!--                size="medium"-->
-          <!--                :props="{-->
-          <!--                  value: 'id',             // ID字段名-->
-          <!--                  label: 'name',         // 显示名称-->
-          <!--                  children: 'children'    // 子级字段名-->
-          <!--                }"-->
-          <!--                :url="`/sys/user/treeUserDataAllOffice?type=2`"-->
-          <!--                :value="inputForm.projectDevelopment"-->
-          <!--                :clearable="true"-->
-          <!--                :accordion="true"-->
-          <!--                @getValue="(value) => {inputForm.projectDevelopment=value}"/>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <el-col :span="12">
-            <el-form-item label="项目类型" prop="delegateProjectType"
-                          :rules="[
-                          {required: true, message:'项目类型不能为空', trigger:'blur'}
-                 ]">
-              <el-select v-model="inputForm.delegateProjectType" placeholder="请选择项目类型" clearable style="width: 100%">
-                <el-option-group
-                  v-for="(type,index) in typeDictList"
-                  :key="type.id"
-                  :label="type.type">
-                  <el-option
-                    v-for="item in typeDictList[index].childrenList"
-                    :key="item.id"
-                    :label="item.type"
-                    :value="item.id">
-                  </el-option>
-                </el-option-group>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估对象" prop="assessmentObject"
-                          :rules="[
-                          {required: true, message:'评估对象不能为空', trigger:'blur'}
-                 ]">
-              <el-select v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable style="width: 100%;">
-                <el-option
-                  v-for="item in $dictUtils.getDictList('project_assessment_object')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="预计现场工作起止日期" prop="workBeginAndEndDate"
                           :rules="[
@@ -527,10 +483,16 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remarks"
+                          :rules="[
+                 ]">
+              <el-input type="textarea" v-model="inputForm.remarks" maxlength="500" placeholder="请输入备注" show-word-limit></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-divider content-position="left"><i class="el-icon-document"></i>
-          委托人和对接人
+          委托方联系人和项目直接对接人
           <el-button style="margin-left: 20px" type="primary" :disabled="method==='view'" size="mini" @click="openContactForm('0')" plain>
             新增
           </el-button>

src/views/modules/program/registered/ProofreadForm.vue

@@ -64,14 +64,38 @@
                 <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">
+<!--            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.reviewComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+<!--            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.replyComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+            <vxe-table-column width="150px" field="reviewComments" title="审核意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.reviewComments" ></el-input>
+                <vxe-select v-model="scope.row.reviewComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">
+            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.replyComments" ></el-input>
+                <vxe-select v-model="scope.row.replyComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
           </vxe-table>
@@ -98,14 +122,38 @@
                 <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">
+<!--            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.reviewComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+<!--            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.replyComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+            <vxe-table-column width="150px" field="reviewComments" title="审核意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.reviewComments" ></el-input>
+                <vxe-select v-model="scope.row.reviewComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">
+            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.replyComments" ></el-input>
+                <vxe-select v-model="scope.row.replyComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
           </vxe-table>
@@ -130,14 +178,38 @@
                 <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">
+<!--            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.reviewComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+<!--            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.replyComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+            <vxe-table-column width="150px" field="reviewComments" title="审核意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.reviewComments" ></el-input>
+                <vxe-select v-model="scope.row.reviewComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">
+            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.replyComments" ></el-input>
+                <vxe-select v-model="scope.row.replyComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
           </vxe-table>
@@ -162,14 +234,38 @@
                 <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">
+<!--            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.reviewComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+<!--            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.replyComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+            <vxe-table-column width="150px" field="reviewComments" title="审核意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.reviewComments" ></el-input>
+                <vxe-select v-model="scope.row.reviewComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">
+            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.replyComments" ></el-input>
+                <vxe-select v-model="scope.row.replyComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
           </vxe-table>
@@ -194,14 +290,38 @@
                 <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">
+<!--            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.reviewComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+<!--            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.replyComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+            <vxe-table-column width="150px" field="reviewComments" title="审核意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.reviewComments" ></el-input>
+                <vxe-select v-model="scope.row.reviewComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">
+            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.replyComments" ></el-input>
+                <vxe-select v-model="scope.row.replyComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
           </vxe-table>
@@ -226,14 +346,38 @@
                 <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">
+<!--            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.reviewComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+<!--            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.replyComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+            <vxe-table-column width="150px" field="reviewComments" title="审核意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.reviewComments" ></el-input>
+                <vxe-select v-model="scope.row.reviewComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">
+            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.replyComments" ></el-input>
+                <vxe-select v-model="scope.row.replyComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
           </vxe-table>
@@ -258,14 +402,38 @@
                 <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">
+<!--            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.reviewComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+<!--            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.replyComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+            <vxe-table-column width="150px" field="reviewComments" title="审核意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.reviewComments" ></el-input>
+                <vxe-select v-model="scope.row.reviewComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">
+            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.replyComments" ></el-input>
+                <vxe-select v-model="scope.row.replyComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
           </vxe-table>
@@ -290,14 +458,38 @@
                 <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">
+<!--            <vxe-table-column width="150px" field="reviewComments" title="审核意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.reviewComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+<!--            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">-->
+<!--              <template v-slot:edit="scope">-->
+<!--                <el-input v-model="scope.row.replyComments" ></el-input>-->
+<!--              </template>-->
+<!--            </vxe-table-column>-->
+            <vxe-table-column width="150px" field="reviewComments" title="审核意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.reviewComments" ></el-input>
+                <vxe-select v-model="scope.row.reviewComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见" :edit-render="{}">
+            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.replyComments" ></el-input>
+                <vxe-select v-model="scope.row.replyComments" transfer>
+                  <vxe-option
+                    v-for="item in $dictUtils.getDictList('yes_no_flag')"
+                    :key="item.value"
+                    :value="item.label"
+                    :label="item.label">
+                  </vxe-option>
+                </vxe-select>
               </template>
             </vxe-table-column>
           </vxe-table>

src/views/modules/program/registered/ProofreadIssuedForm.vue

@@ -7,7 +7,7 @@
       <el-divider content-position="left"><i class="el-icon-document"></i> 报告签发单</el-divider>
     </div>
     <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
-             label-width="125px" @submit.native.prevent>
+             label-width="150px" @submit.native.prevent>
       <el-row  :gutter="15">
         <el-col :span="24">
           <el-form-item label="项目名称" prop="projectName">
@@ -111,7 +111,7 @@
         </vxe-table>
       </el-row>
 
-      <el-row :gutter="15">
+      <el-row :gutter="15" style="margin-top: 20px">
 
         <el-col :span="12">
           <el-form-item label="是否已填写台账" prop="isTxtz" :rules="[{required: true, message:'请选择是否已填写台账', trigger:'blur'}]">
@@ -144,30 +144,59 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
+<!--        评估报告-->
+        <div v-if="inputForm.reportType === '1'">
+          <el-col :span="12">
+            <el-form-item label="评估报告(份)" prop="assessmentReport" :rules="[{required: true, message:'请输入评估报告（份）', trigger:'blur'}]">
+              <el-input size="medium" v-model="inputForm.assessmentReport" clearable></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="评估报告(份)" prop="assessmentReport" :rules="[{required: true, message:'请输入评估报告（份）', trigger:'blur'}]">
-            <el-input size="medium" v-model="inputForm.assessmentReport" clearable></el-input>
-          </el-form-item>
-        </el-col>
+          <el-col :span="12">
+            <el-form-item label="评估说明(份)" prop="assessmentExplain" :rules="[{required: true, message:'请输入评估说明（份）', trigger:'blur'}]">
+              <el-input size="medium" v-model="inputForm.assessmentExplain" clearable></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="评估说明(份)" prop="assessmentExplain" :rules="[{required: true, message:'请输入评估说明（份）', trigger:'blur'}]">
-            <el-input size="medium" v-model="inputForm.assessmentExplain" clearable></el-input>
-          </el-form-item>
-        </el-col>
+          <el-col :span="12">
+            <el-form-item label="评估明细表(份)" prop="assessmentDetail" :rules="[{required: true, message:'请输入评估明细表（份）', trigger:'blur'}]">
+              <el-input size="medium" v-model="inputForm.assessmentDetail" clearable></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="评估明细表(份)" prop="assessmentDetail" :rules="[{required: true, message:'请输入评估明细表（份）', trigger:'blur'}]">
-            <el-input size="medium" v-model="inputForm.assessmentDetail" clearable></el-input>
-          </el-form-item>
-        </el-col>
+          <el-col :span="12">
+            <el-form-item label="咨询报告(份)" prop="consultingReport" :rules="[]">
+              <el-input size="medium" v-model="inputForm.consultingReport" clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </div>
+<!--        咨询报告-->
+        <div v-if="inputForm.reportType === '2'">
+          <el-col :span="12">
+            <el-form-item label="评估报告(份)" prop="assessmentReport" :rules="[]">
+              <el-input size="medium" v-model="inputForm.assessmentReport" clearable></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="评估说明(份)" prop="assessmentExplain" :rules="[]">
+              <el-input size="medium" v-model="inputForm.assessmentExplain" clearable></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="评估明细表(份)" prop="assessmentDetail" :rules="[]">
+              <el-input size="medium" v-model="inputForm.assessmentDetail" clearable></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="咨询报告(份)" prop="consultingReport" :rules="[{required: true, message:'请输入咨询报告（份）', trigger:'blur'}]">
+              <el-input size="medium" v-model="inputForm.consultingReport" clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </div>
 
-        <el-col :span="12">
-          <el-form-item label="咨询报告(份)" prop="consultingReport" :rules="[{required: true, message:'请输入咨询报告（份）', trigger:'blur'}]">
-            <el-input size="medium" v-model="inputForm.consultingReport" clearable></el-input>
-          </el-form-item>
-        </el-col>
 
         <el-col :span="12">
           <el-form-item label="用印类型" prop="sealType" :rules="[{required: true, message:'请输入用印类型', trigger:'blur'}]">
@@ -221,7 +250,8 @@
           sealType: '',
           status: '',
           agreeTime: '',
-          agreeUserId: ''
+          agreeUserId: '',
+          reportType: ''
         },
         keyWatch: '',
         yesOrNo: [
@@ -315,7 +345,8 @@
           sealType: '',
           status: '',
           agreeTime: '',
-          agreeUserId: ''
+          agreeUserId: '',
+          reportType: ''
         }
         this.inputForm.projectId = id
         this.visible = true
@@ -433,7 +464,8 @@
           sealType: '',
           status: '',
           agreeTime: '',
-          agreeUserId: ''
+          agreeUserId: '',
+          reportType: ''
         }
         this.$refs.inputForm.resetFields()
         this.visible = false

src/views/modules/program/registered/RegisItemForm.vue

@@ -112,6 +112,67 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="报告类型" prop="reportType"
+                          :rules="[
+                          {required: true, message:'报告类型不能为空', trigger:'blur'}
+                 ]">
+              <el-select v-model="inputForm.reportType" placeholder="请选择报告类型" clearable style="width: 100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('program_registered_report_type')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="评估目的" prop="assessmentObjective"
+                          :rules="[
+                 ]">
+              <el-input v-model="inputForm.assessmentObjective" placeholder="请输入评估目的"clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="评估方法" prop="assessmentWay"
+                          :rules="[
+                 ]">
+              <el-input v-model="inputForm.assessmentWay" placeholder="请输入评估方法"clearable></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="评估基准日" prop="assessmentDate"
+                          :rules="[
+                          {required: true, message:'评估基准日不能为空', trigger:'blur'}
+                 ]">
+              <el-date-picker
+                v-model="inputForm.assessmentDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择评估基准日"
+                style="width:100%"
+                placement="bottom-start"
+                clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="评估对象" prop="assessmentObject"
+                          :rules="[
+                          {required: true, message:'评估对象不能为空', trigger:'blur'}
+                 ]">
+              <el-select v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable style="width: 100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('project_assessment_object')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="执业机构" prop="company"
                           :rules="[
                  ]">
@@ -133,6 +194,7 @@
                 url="/sys/area/treeData"
                 :value="inputForm.location"
                 :clearable="true"
+                size="medium"
                 :accordion="true"
                 @getValue="(value) => {inputForm.location=value}"/>
             </el-form-item>
@@ -146,7 +208,13 @@
               <el-input v-model="inputForm.propertyHolderName" @focus="openWorkClientForm('2')" @clear="clearPropertyHolder" placeholder="请输入委托人" clearable></el-input>
             </el-form-item>
           </el-col>
-
+          <el-col :span="12">
+            <el-form-item label="企业类型" prop="enterpriseType"
+                          :rules="[
+                 ]">
+              <el-input maxlength="64" v-model="inputForm.enterpriseType" placeholder="请输入企业类型"clearable></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="是否首次承做" prop="isFirst"
                           :rules="[
@@ -175,6 +243,45 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="项目来源" prop="projectSource"
+                          :rules="[
+                          {required: true, message:'项目来源不能为空', trigger:'blur'}
+                 ]">
+              <el-select v-model="inputForm.projectSource" placeholder="请选择项目来源" clearable style="width: 100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('program_registered_source')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="被评估企业" prop="assessmentEnterpriseName"
+                          :rules="[
+                          {required: true, message:'被评估企业不能为空', trigger:'blur'},
+                          {required: true, message:'被评估企业不能为空', trigger:'change'}
+                 ]">
+              <el-input v-model="inputForm.assessmentEnterpriseName" @focus="openWorkClientForm('3')" placeholder="请输入被评估企业"clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人及电话" prop="linkNum"
+                          :rules="[
+                          {required: true, message:'联系人及电话不能为空', trigger:'blur'}
+                 ]">
+              <el-input maxlength="64" v-model="inputForm.linkNum" placeholder="请输入联系人及电话"clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托人与被评估单位关系" prop="relationship"
+                          :rules="[
+                 ]">
+              <el-input v-model="inputForm.relationship" placeholder="请输入委托人与被评估单位关系"clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="评估费用核算年度" prop="checkYear"
                           :rules="[
                           {required: true, message:'评估费用核算年度不能为空', trigger:'blur'}
@@ -210,21 +317,7 @@
                 @getValue="(value) => {inputForm.projectManager=value}"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="报告类型" prop="reportType"
-                          :rules="[
-                          {required: true, message:'报告类型不能为空', trigger:'blur'}
-                 ]">
-              <el-select v-model="inputForm.reportType" placeholder="请选择报告类型" clearable style="width: 100%;">
-                <el-option
-                  v-for="item in $dictUtils.getDictList('program_registered_report_type')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+
 <!--          <el-col :span="12">-->
 <!--            <el-form-item label="所属行业" prop="industry"-->
 <!--                          :rules="[-->
@@ -232,13 +325,7 @@
 <!--              <el-input maxlength="64" v-model="inputForm.industry" placeholder="请输入所属行业"clearable></el-input>-->
 <!--            </el-form-item>-->
 <!--          </el-col>-->
-          <el-col :span="12">
-            <el-form-item label="企业类型" prop="enterpriseType"
-                          :rules="[
-                 ]">
-              <el-input maxlength="64" v-model="inputForm.enterpriseType" placeholder="请输入企业类型"clearable></el-input>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="12">
             <el-form-item label="风险等级" prop="riskLevel"
                           :rules="[
@@ -249,17 +336,22 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="项目来源" prop="projectSource"
+            <el-form-item label="风险项目类型" prop="delegateProjectType"
                           :rules="[
-                          {required: true, message:'项目来源不能为空', trigger:'blur'}
+                          {required: true, message:'风险项目类型不能为空', trigger:'blur'}
                  ]">
-              <el-select v-model="inputForm.projectSource" placeholder="请选择项目来源" clearable style="width: 100%;">
-                <el-option
-                  v-for="item in $dictUtils.getDictList('program_registered_source')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
+              <el-select v-model="inputForm.delegateProjectType" placeholder="请选择风险项目类型" clearable style="width: 100%">
+                <el-option-group
+                  v-for="(type,index) in typeDictList"
+                  :key="type.id"
+                  :label="type.type">
+                  <el-option
+                    v-for="item in typeDictList[index].childrenList"
+                    :key="item.id"
+                    :label="item.type"
+                    :value="item.id">
+                  </el-option>
+                </el-option-group>
               </el-select>
             </el-form-item>
           </el-col>
@@ -349,69 +441,49 @@
               </el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remarks"
-                          :rules="[
-                 ]">
-              <el-input type="textarea" v-model="inputForm.remarks" maxlength="500" placeholder="请输入备注" show-word-limit></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row  :gutter="15">
           <el-col :span="12">
-            <el-form-item label="被评估企业" prop="assessmentEnterpriseName"
-                          :rules="[
-                          {required: true, message:'被评估企业不能为空', trigger:'blur'},
-                          {required: true, message:'被评估企业不能为空', trigger:'change'}
-                 ]">
-              <el-input v-model="inputForm.assessmentEnterpriseName" @focus="openWorkClientForm('3')" placeholder="请输入被评估企业"clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系人及电话" prop="linkNum"
-                          :rules="[
-                          {required: true, message:'联系人及电话不能为空', trigger:'blur'}
-                 ]">
-              <el-input maxlength="64" v-model="inputForm.linkNum" placeholder="请输入联系人及电话"clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="委托人与被评估单位关系" prop="relationship"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.relationship" placeholder="请输入委托人与被评估单位关系"clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估方法" prop="assessmentWay"
-                          :rules="[
-                 ]">
-              <el-input v-model="inputForm.assessmentWay" placeholder="请输入评估方法"clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估目的" prop="assessmentObjective"
+            <el-form-item label="预计现场工作起止日期" prop="workBeginAndEndDate"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.assessmentObjective" placeholder="请输入评估目的"clearable></el-input>
+              <el-date-picker
+                size="medium"
+                v-model="inputForm.workBeginAndEndDate"
+                type="daterange"
+                range-separator="至"
+                style="width: 100%  "
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                placement="bottom-start"
+                clearabl>
+              </el-date-picker>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="评估基准日" prop="assessmentDate"
+            <el-form-item label="预计出报告时间" prop="reportingDate"
                           :rules="[
-                          {required: true, message:'评估基准日不能为空', trigger:'blur'}
+                          {required: true, message:'预计出报告时间不能为空', trigger:'blur'}
                  ]">
               <el-date-picker
-                v-model="inputForm.assessmentDate"
+                v-model="inputForm.reportingDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="选择评估基准日"
+                placeholder="选择预计出报告时间"
                 style="width:100%"
                 placement="bottom-start"
                 clearable>
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remarks"
+                          :rules="[
+                 ]">
+              <el-input type="textarea" v-model="inputForm.remarks" maxlength="500" placeholder="请输入备注" show-word-limit></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+<!--        <el-row  :gutter="15">-->
 <!--          <el-col :span="12">-->
 <!--            <el-form-item label="评估服务收费总额" prop="num"-->
 <!--                          :rules="[-->
@@ -450,79 +522,9 @@
 <!--                @getValue="(value) => {inputForm.projectDevelopment=value}"/>-->
 <!--            </el-form-item>-->
 <!--          </el-col>-->
-          <el-col :span="12">
-            <el-form-item label="项目类型" prop="delegateProjectType"
-                          :rules="[
-                          {required: true, message:'项目类型不能为空', trigger:'blur'}
-                 ]">
-              <el-select v-model="inputForm.delegateProjectType" placeholder="请选择项目类型" clearable style="width: 100%">
-                <el-option-group
-                  v-for="(type,index) in typeDictList"
-                  :key="type.id"
-                  :label="type.type">
-                  <el-option
-                    v-for="item in typeDictList[index].childrenList"
-                    :key="item.id"
-                    :label="item.type"
-                    :value="item.id">
-                  </el-option>
-                </el-option-group>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="评估对象" prop="assessmentObject"
-                          :rules="[
-                          {required: true, message:'评估对象不能为空', trigger:'blur'}
-                 ]">
-              <el-select v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable style="width: 100%;">
-                <el-option
-                  v-for="item in $dictUtils.getDictList('project_assessment_object')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="预计现场工作起止日期" prop="workBeginAndEndDate"
-                          :rules="[
-                 ]">
-              <el-date-picker
-                size="medium"
-                v-model="inputForm.workBeginAndEndDate"
-                type="daterange"
-                range-separator="至"
-                style="width: 100%  "
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                placement="bottom-start"
-                clearabl>
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="预计出报告时间" prop="reportingDate"
-                          :rules="[
-                          {required: true, message:'预计出报告时间不能为空', trigger:'blur'}
-                 ]">
-              <el-date-picker
-                v-model="inputForm.reportingDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择预计出报告时间"
-                style="width:100%"
-                placement="bottom-start"
-                clearable>
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-        </el-row>
+<!--        </el-row>-->
         <el-divider content-position="left"><i class="el-icon-document"></i>
-          委托人和对接人
+          委托方联系人和项目直接对接人
           <el-button style="margin-left: 20px" type="primary" :disabled="formReadOnly" size="mini" @click="openContactForm('0')" plain>
             新增
           </el-button>
@@ -1031,6 +1033,7 @@
           this.inputForm.agreeTime = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
           let userId = JSON.parse(localStorage.getItem('user')).id
           this.inputForm.agreeUserId = userId
+          this.inputForm.createContractNo = '1'
         }
         this.inputForm.links = []
         if (!this.commonJS.isEmpty(this.inputForm.clientList)) {