评估项目资产评估校对功能调整

.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 #Jeeplus快速开发平台/后台地址
-#VUE_APP_SERVER_URL = 'http://pg.xgccpm.com/jeeplus-vue'
+#VUE_APP_SERVER_URL = 'http://cpa.xgccpm.com/jeeplus-vue'
 VUE_APP_SERVER_URL = 'http://3081089em4.wicp.vip:36186/jeeplus-vue'
 #单点登录设置
 VUE_APP_SSO_LOGIN  = 'false'

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

@@ -4,7 +4,7 @@
       title="资产评估项目（校对）审核记录表"
       :close-on-click-modal="false"
       v-dialogDrag
-      width="1300px"
+      width="1500px"
       @close="close"
       @keyup.enter.native=""
       :visible.sync="visible">
@@ -86,9 +86,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -98,6 +98,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" 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>
         </el-row>
 
@@ -144,9 +149,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -156,6 +161,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" 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>
         </el-row>
 
@@ -200,9 +210,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -212,6 +222,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" 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>
         </el-row>
 
@@ -256,9 +271,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -268,6 +283,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" 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>
         </el-row>
 
@@ -312,9 +332,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -324,6 +344,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" 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>
         </el-row>
 
@@ -368,9 +393,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -380,6 +405,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" 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>
         </el-row>
 
@@ -424,9 +454,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -436,6 +466,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" 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>
         </el-row>
 
@@ -480,9 +515,9 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
                     v-for="item in $dictUtils.getDictList('yes_no_flag')"
                     :key="item.value"
@@ -492,6 +527,11 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
+            <vxe-table-column width="350px" 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>
         </el-row>
 

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

@@ -84,18 +84,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    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="350px" 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>
         </el-row>
 
@@ -142,18 +147,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    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="350px" 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>
         </el-row>
 
@@ -198,18 +208,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    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="350px" 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>
         </el-row>
 
@@ -254,18 +269,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    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="350px" 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>
         </el-row>
 
@@ -310,18 +330,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    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="350px" 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>
         </el-row>
 
@@ -366,18 +391,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    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="350px" 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>
         </el-row>
 
@@ -422,18 +452,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    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="350px" 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>
         </el-row>
 
@@ -478,18 +513,23 @@
                 </vxe-select>
               </template>
             </vxe-table-column>
-            <vxe-table-column width="150px" field="replyComments" title="回复意见（√/×）" :edit-render="{}">
+            <vxe-table-column width="150px" field="isApply" title="是否适用（√/×）" :edit-render="{}">
               <template v-slot:edit="scope">
-                <vxe-select v-model="scope.row.replyComments" transfer>
+                <vxe-select v-model="scope.row.isApply" transfer>
                   <vxe-option
-                          v-for="item in $dictUtils.getDictList('yes_no_flag')"
-                          :key="item.value"
-                          :value="item.label"
-                          :label="item.label">
+                    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="350px" 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>
         </el-row>
 

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

@@ -473,6 +473,7 @@
                           :rules="[
                  ]">
               <el-switch
+                style="display: block;margin-top: 10px;margin-bottom: 10px;"
                 v-model="inputForm.generateReportNumber"
                 active-color="#13ce66"
                 active-text="是"
@@ -1481,51 +1482,6 @@
   .el-input-number .el-input__inner {
     text-align: left;
   }
-  /**
-  设置框
-   */
-  .el-switch__core{
-    width: 70px!important;
-    height: 30px;
-  }
-  /**
-  设置园
-   */
-  .el-switch__core::after{
-    width: 14px;
-    height: 14px;
-    margin-top: -1px;
-    margin-bottom: 2px;
-  }
-
-  .el-switch__label--left {
-    position: relative;
-    left: 45px;
-    color: #fff;
-    z-index: -1111;
-  }
-  .el-switch__core{
-    width: 50px !important;
-  }
-  .el-switch__label--right {
-    position: relative;
-    right: 46px;
-    color: #fff;
-    z-index: -1111;
-  }
-  .el-switch__label--right.is-active {
-    z-index: 1111;
-    color: #fff !important;
-  }
-  .el-switch__label--left.is-active {
-    z-index: 1111;
-    color: #9c9c9c !important;
-  }
-  .el-switch__label * {
-    line-height: 1;
-    font-size: 18px;
-    display: inline-block;
-  }
 
 
 </style>

src/views/modules/sys/login/login.vue

@@ -46,12 +46,15 @@
                   </el-col>
                 </el-row>
               </el-form-item>
-              <div style ="margin: 20px">
+              <div style ="margin-left: 20px;margin-bottom: 20px; float: left;height: 40px;line-height:40px;">
                 <!-- 记住我 -->
                 <el-checkbox v-model="checked" class="rememberMe">记住我</el-checkbox>
-                <!-- 找回密码 -->
-                <!--<el-button type="text" @click="open()" class="forgetPw">忘记密码？</el-button>-->
               </div>
+              <!--<div style ="margin-right: 20px;margin-bottom: 20px; float: right; position: relative; z-index:99">
+                &lt;!&ndash; 找回密码 &ndash;&gt;
+                <el-button type="text" @click="open()">忘记密码？</el-button>
+                &lt;!&ndash;<el-button type="text" @click="open()" class="forgetPw">忘记密码？</el-button>&ndash;&gt;
+              </div>-->
               <el-form-item>
                 <el-button type="primary" :loading="loading" class="login-submit" @click="login">登录</el-button>
               </el-form-item>
@@ -227,6 +230,9 @@
             }
           }
         }
+      },
+      open () {
+        console.log(321312)
       }
     }
   }