Merge remote-tracking branch 'origin/master'

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

@@ -174,14 +174,23 @@
                                   :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-input v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable></el-input>
+<!--                      <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="assessmentRange"
+                                  :rules="[
+                          {required: true, message:'评估范围不能为空', trigger:'blur'}
+                 ]">
+                      <el-input v-model="inputForm.assessmentRange" placeholder="请输入评估范围" clearable></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -472,7 +481,20 @@
                       </el-date-picker>
                     </el-form-item>
                   </el-col>
-
+                  <el-col :span="12">
+                    <el-form-item label="是否生成报告号" prop="generateReportNumber"
+                                  :rules="[
+                 ]">
+                      <el-switch
+                        style="display: block;margin-top: 10px;margin-bottom: 10px;"
+                        v-model="inputForm.generateReportNumber"
+                        active-color="#13ce66"
+                        active-text="是"
+                        inactive-text="否"
+                      >
+                      </el-switch>
+                    </el-form-item>
+                  </el-col>
                   <el-col :span="12">
                     <el-form-item label="预计出报告时间" prop="reportingDate"
                                   :rules="[
@@ -740,10 +762,12 @@
           projectDevelopment: '', // 项目开发人
           delegateProjectType: '', // 项目类型
           assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
           workBeginAndEndDate: [], // 预计现场工作起止时间
           workBeginDate: '', // 预计现场工作开始时间
           workEndDate: '', // 预计现场工作结束时间
           reportingDate: '', // 预计出报告日期
+          generateReportNumber: false, // 是否生成报告号
           isHave: '', // 本所是否具备承接胜任能力
           isInfluence: '', // 是否影响本所乘坐人员独立性
           mode: '', // 项目承接方式
@@ -831,6 +855,7 @@
         this.archiveIdA = archiveId
         this.method = method
         this.inputForm = {
+          generateReportNumber: '', // 是否生成报告号
           id: '', // 主键值（新增不传，修改必传）
           no: '', // 编号（新增不传，修改必传）
           contractId: '', // 合同id
@@ -872,6 +897,7 @@
           projectDevelopment: '', // 项目开发人
           delegateProjectType: '', // 项目类型
           assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
           workBeginAndEndDate: [], // 预计现场工作起止时间
           workBeginDate: '', // 预计现场工作开始时间
           workEndDate: '', // 预计现场工作结束时间
@@ -908,6 +934,13 @@
             this.loading = true
             this.programProjectListInfoService.queryById(this.inputForm.id).then(({data}) => {
               this.inputForm = this.recover(this.inputForm, data)
+              if (data.generateReportNumber === 'true') {
+                this.inputForm.generateReportNumber = true
+              } else if (data.generateReportNumber === 'false') {
+                this.inputForm.generateReportNumber = false
+              } else if (this.commonJS.isEmpty(data.generateReportNumber)) {
+                this.inputForm.generateReportNumber = false
+              }
               this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
               if (!this.commonJS.isEmpty(this.inputForm.workBeginDate) && !this.commonJS.isEmpty(this.inputForm.workEndDate)) {
                 this.inputForm.workBeginAndEndDate = []

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

@@ -170,14 +170,23 @@
                           :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-input v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable></el-input>
+<!--              <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="assessmentRange"
+                          :rules="[
+                          {required: true, message:'评估范围不能为空', trigger:'blur'}
+                 ]">
+              <el-input v-model="inputForm.assessmentRange" placeholder="请输入评估范围" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -466,7 +475,20 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
+          <el-col :span="12">
+            <el-form-item label="是否生成报告号" prop="generateReportNumber"
+                          :rules="[
+                 ]">
+              <el-switch
+                style="display: block;margin-top: 10px;margin-bottom: 10px;"
+                v-model="inputForm.generateReportNumber"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-text="否"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="预计出报告时间" prop="reportingDate"
                           :rules="[
@@ -657,6 +679,7 @@
         loading: false,
         typeDictList: [],
         inputForm: {
+          generateReportNumber: false, // 是否生成报告号
           id: '', // 主键值（新增不传，修改必传）
           no: '', // 编号（新增不传，修改必传）
           contractId: '', // 合同id
@@ -699,6 +722,7 @@
           projectDevelopment: '', // 项目开发人
           delegateProjectType: '', // 项目类型
           assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
           workBeginAndEndDate: [], // 预计现场工作起止时间
           workBeginDate: '', // 预计现场工作开始时间
           workEndDate: '', // 预计现场工作结束时间
@@ -741,6 +765,7 @@
       init (method, id) {
         this.method = method
         this.inputForm = {
+          generateReportNumber: '', // 是否生成报告号
           id: '', // 主键值（新增不传，修改必传）
           no: '', // 编号（新增不传，修改必传）
           contractId: '', // 合同id
@@ -782,6 +807,7 @@
           projectDevelopment: '', // 项目开发人
           delegateProjectType: '', // 项目类型
           assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
           workBeginAndEndDate: [], // 预计现场工作起止时间
           workBeginDate: '', // 预计现场工作开始时间
           workEndDate: '', // 预计现场工作结束时间
@@ -818,6 +844,13 @@
             this.loading = true
             this.programProjectListInfoService.queryById(this.inputForm.id).then(({data}) => {
               this.inputForm = this.recover(this.inputForm, data)
+              if (data.generateReportNumber === 'true') {
+                this.inputForm.generateReportNumber = true
+              } else if (data.generateReportNumber === 'false') {
+                this.inputForm.generateReportNumber = false
+              } else if (this.commonJS.isEmpty(data.generateReportNumber)) {
+                this.inputForm.generateReportNumber = false
+              }
               this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
               if (!this.commonJS.isEmpty(this.inputForm.workBeginDate) && !this.commonJS.isEmpty(this.inputForm.workEndDate)) {
                 this.inputForm.workBeginAndEndDate = []