Merge remote-tracking branch 'origin/master'

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

@@ -369,6 +369,44 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="签字评估师1" prop="signatureEvaluatorFirst"
+              >
+                <SelectUserTree
+                  ref="companyTree"
+                  size="medium"
+                  :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+                  :url="`/sys/user/treeUserDataAllOffice?type=2`"
+                  :value="inputForm.signatureEvaluatorFirst"
+                  :disabled="true"
+                  :clearable="true"
+                  :accordion="true"
+                  @getValue="(value) => {inputForm.signatureEvaluatorFirst=value}"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="签字评估师2" prop="signatureEvaluatorSecond"
+              >
+                <SelectUserTree
+                  ref="companyTree"
+                  size="medium"
+                  :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+                  :url="`/sys/user/treeUserDataAllOffice?type=2`"
+                  :value="inputForm.signatureEvaluatorSecond"
+                  :disabled="true"
+                  :clearable="true"
+                  :accordion="true"
+                  @getValue="(value) => {inputForm.signatureEvaluatorSecond=value}"/>
+              </el-form-item>
+            </el-col>
           </el-row>
           <!--附件信息 - 评估报告-->
           <UpLoadComponent ref="uploadComponentReport"></UpLoadComponent>
@@ -448,7 +486,11 @@
           explainFileList: [],
           detailFileList: [],
           papersFileList: [],
-          otherFileList: []
+          otherFileList: [],
+          auditDate: '',
+          auditUserId: '',
+          signatureEvaluatorFirst: '',
+          signatureEvaluatorSecond: ''
         },
         programId: '',
         supervisorList: [],
@@ -541,7 +583,11 @@
           explainFileList: [],
           detailFileList: [],
           papersFileList: [],
-          otherFileList: []
+          otherFileList: [],
+          auditDate: '',
+          auditUserId: '',
+          signatureEvaluatorFirst: '',
+          signatureEvaluatorSecond: ''
         }
         if (this.commonJS.isEmpty(id)) {
           this.inputForm = {
@@ -579,7 +625,11 @@
             explainFileList: [],
             detailFileList: [],
             papersFileList: [],
-            otherFileList: []
+            otherFileList: [],
+            auditDate: '',
+            auditUserId: '',
+            signatureEvaluatorFirst: '',
+            signatureEvaluatorSecond: ''
           }
           return
         }
@@ -688,6 +738,7 @@
         } else if (status === 'agree') {
           // 审核同意
           this.inputForm.status = '5'
+          this.inputForm.auditUserId = JSON.parse(localStorage.getItem('user')).id
           this.inputForm.auditDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         }
         this.$refs['inputForm'].validate((valid) => {
@@ -797,7 +848,11 @@
           explainFileList: [],
           detailFileList: [],
           papersFileList: [],
-          otherFileList: []
+          otherFileList: [],
+          auditDate: '',
+          auditUserId: '',
+          signatureEvaluatorFirst: '',
+          signatureEvaluatorSecond: ''
         }
         this.$refs.inputForm.resetFields()
         this.visible = false