user5 hace 2 años
padre
commit
05042d3d26

+ 23 - 2
src/views/modules/program/registered/ProjectArchiveForm.vue

@@ -98,6 +98,26 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+
+
+            <el-col :span="12">
+              <el-form-item label="签字评估师1" prop="signatureEvaluatorFirst"
+                            :rules=" [
+                        {required: true, message:'签字评估师1不能为空', trigger:'blur'}
+                        ]" >
+                <UserSelect size="medium" :disabled="formReadOnly" :readonly="true" :limit='1' :value="inputForm.signatureEvaluatorFirst" @getValue='(value) => {inputForm.signatureEvaluatorFirst = value}'></UserSelect>
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="12">
+              <el-form-item label="签字评估师2" prop="signatureEvaluatorSecond"
+                            :rules=" [
+                        {required: true, message:'签字评估师2不能为空', trigger:'blur'}
+                        ]" >
+                <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="[
@@ -369,7 +389,8 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+
+            <!--<el-col :span="12">
               <el-form-item label="签字评估师1" prop="signatureEvaluatorFirst"
               >
                 <SelectUserTree
@@ -406,7 +427,7 @@
                   :accordion="true"
                   @getValue="(value) => {inputForm.signatureEvaluatorSecond=value}"/>
               </el-form-item>
-            </el-col>
+            </el-col>-->
           </el-row>
           <!--附件信息 - 评估报告-->
           <UpLoadComponent ref="uploadComponentReport"></UpLoadComponent>

+ 10 - 1
src/views/modules/program/registered/ProofreadBrowseForm.vue

@@ -76,7 +76,7 @@
                 </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="{name: '$select', options: yesOrNo}">
               <template v-slot:edit="scope">
                 <vxe-select v-model="scope.row.replyComments" transfer>
                   <vxe-option
@@ -396,3 +396,12 @@
     text-align: left;
   }
 </style>
+
+<style>
+  .vxe-select--panel {
+    z-index: 9997 !important
+  }
+  .vxe-input--panel.type--date, .vxe-input--panel.type--month, .vxe-input--panel.type--week, .vxe-input--panel.type--year {
+    z-index: 9998 !important
+  }
+</style>