Merge branch 'master' into houxq

src/views/hdlb/sqjl/index.vue

@@ -29,7 +29,7 @@
             <el-table-column label="作者单位" width="200" prop="hb_hzdw"></el-table-column>
             <el-table-column label="论文类别" width="200">
               <template slot-scope="scope">
-                <span v-for="(item, index) in scope.row.cate_info">
+                <span v-for="(item, index) in scope.row.cate_info" :key="index">
                   {{ item.hh_name }}
                   <i v-if="index < scope.row.cate_info.length - 1">，</i>
                 </span>
@@ -68,7 +68,7 @@
             </el-table-column>
             <el-table-column label="论文类别" align="center" width="120">
               <template slot-scope="scope">
-                <span v-for="(item, index) in scope.row.cate_info">
+                <span v-for="(item, index) in scope.row.cate_info" :key="index">
                   {{ item.hh_name }}
                   <i v-if="index < scope.row.cate_info.length - 1">，</i>
                 </span>
@@ -85,7 +85,7 @@
                     </div>
                     <ul v-if="scope.row.pingfen_info.record_all && scope.row.pingfen_info.record_all.length > 0"
                       class="pop-list">
-                      <li v-for="item in scope.row.pingfen_info.record_all">
+                      <li v-for="(item,index) in scope.row.pingfen_info.record_all" :key="index">
                         <span class="font-size-13 text-light">{{ item.hbj_pfr }}</span>
                         <span class="font-size-13 text-light">{{ item.hpj_fs }}分</span>
                       </li>
@@ -96,6 +96,7 @@
                     </div>
                   </el-popover>
                 </template>
+
                 <template v-else>
                   --
                 </template>
@@ -104,9 +105,7 @@
             <el-table-column label="操作" width="120">
               <template slot-scope="scope">
                 <el-button type="text" v-if="btnCheck.pf" @click="toReview(scope.row.hb_id)">评分</el-button>
-                <el-button type="text" v-if="btnCheck.zc" :disabled="!scope.row.is_zc"
-                  @click="toReview(scope.row.hb_id)">仲裁
-                </el-button>
+                <el-button type="text" v-if="btnCheck.zc" :disabled="!scope.row.is_zc" @click="toReview(scope.row.hb_id)">仲裁</el-button>
               </template>
             </el-table-column>
           </template>
@@ -117,7 +116,7 @@
             <el-table-column label="作者单位" width="200" prop="hb_hzdw"></el-table-column>
             <el-table-column label="论文类别" width="200">
               <template slot-scope="scope">
-                <span v-for="(item, index) in scope.row.cate_info">
+                <span v-for="(item, index) in scope.row.cate_info" :key="index"> 
                   {{ item.hh_name }}
                   <i v-if="index < scope.row.cate_info.length - 1">，</i>
                 </span>
@@ -143,7 +142,7 @@
                   </div>
                   <ul v-if="scope.row.pingfen_info.record_all && scope.row.pingfen_info.record_all.length > 0"
                     class="pop-list">
-                    <li v-for="item in scope.row.pingfen_info.record_all">
+                    <li v-for="(item,index) in scope.row.pingfen_info.record_all" :key="index">
                       <span class="font-size-13 text-light">{{ item.hbj_pfr }}</span>
                       <span class="font-size-13 text-light">{{ item.hpj_fs }}分</span>
                     </li>

src/views/hdlb/sqjl/zjpf/index.vue

@@ -2,70 +2,46 @@
   <div class="content h100" v-cloak>
     <div
       class="left h100 pt10"
-      v-if="
-        signDetailInfo.pingfen_info &&
-        signDetailInfo.pingfen_info.pfmb_info.length > 0 &&
-        signDetailInfo.pingfen_info.pfmb_info[0].hp_cate == 0
-      "
-    >
+      v-if="  signDetailInfo.pingfen_info &&  signDetailInfo.pingfen_info.pfmb_info.length > 0 &&  signDetailInfo.pingfen_info.pfmb_info[0].hp_cate == 0 ">
       <nav class="nav">  <i class="d-in-block v-mid"></i>  <span class="ml10 d-in-block v-mid font-size-16 text-black lh20" >评分表</span  >
       </nav>
       <div class="info-line flex-row">
         <h3 class="font-size-14 text-lightdark">评分人：{{ real_name }}</h3>
-        <h4 class="font-size-14 color-1" v-if="ruleForm.score !== ''">
+        <h4 class="font-size-14 color-1" v-if="ruleForm.score !== '' ">
           总分：{{ ruleForm.score }}分
         </h4>
       </div>
-      <el-form
-        class="mt30"
-        :model="ruleForm"
-        :rules="rules"
-        ref="ruleForm"
-        label-width="70px"
-        v-loading.fullscreen.lock="fullscreenLoading"
-      >
-        <el-form-item label="分数" prop="score">
-          <el-input
-            v-model="ruleForm.score"
-            style="width: 100px"
-            oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')"
-          ></el-input>
+      <el-form class="mt30" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="70px" v-loading.fullscreen.lock="fullscreenLoading" >
+        <el-form-item label="总分" prop="score">
+          <el-input  v-model="ruleForm.score"  style="width: 100px"  oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')"></el-input>
         </el-form-item>
-        <el-form-item
-          prop="type"
-          v-if="
-            signDetailInfo.pingfen_info &&
-            signDetailInfo.pingfen_info.pfmb_items &&
-            signDetailInfo.pingfen_info.pfmb_items.length > 0
-          "
-        >
-          <label
-            class="el-checkbox d-block"
-            v-for="(item ,index) in signDetailInfo.pingfen_info.pfmb_items"
-            :key="index"
-          >
-            <span
-              class="el-checkbox__input v-mid"
-              :class="
-                ruleForm.score !== '' &&
-                Number(ruleForm.score) >= Number(item.hp_affw) &&
-                Number(ruleForm.score) <= Number(item.hp_dffw)
-                  ? 'is-checked'
-                  : ''
-              "
-            >
+        <el-form-item prop="type"
+          v-if="  signDetailInfo.pingfen_info &&  signDetailInfo.pingfen_info.pfmb_items &&  signDetailInfo.pingfen_info.pfmb_items.length > 0" >
+          <!-- <label  class="el-checkbox d-block"  v-for="(item ,index) in signDetailInfo.pingfen_info.pfmb_items"  :key="index">
+            <span class="el-checkbox__input v-mid" :class="ruleForm.score !== '' && Number(ruleForm.score) >= Number(item.hp_affw) &&   Number(ruleForm.score) <= Number(item.hp_dffw)     ? 'is-checked'     : '' ">
               <span class="el-checkbox__inner"></span>
             </span>
             <span class="el-checkbox__label v-mid">{{
               item.hp_name + "（" + item.hp_affw + "~" + item.hp_dffw + "）"
             }}</span>
+          </label> -->
+
+          <label  class="el-checkbox d-block"  v-for="(item ,index) in signDetailInfo.pingfen_info.pfmb_items"  :key="index">
+            <!-- <span class="el-checkbox__input v-mid">
+              <span class="el-checkbox__inner"></span>
+            </span> -->
+            <span class="el-checkbox__label v-mid">{{
+              item.hp_name + "（" + item.hp_affw + "~" + item.hp_dffw + "）"
+            }}</span>
           </label>
+
         </el-form-item>
         <el-form-item>
           <el-button type="primary" :disabled="signDetailInfo.pingfen_info.pfmb_info.length == 0" @click="submitForm('ruleForm')" >提交</el-button>
         </el-form-item>
       </el-form>
     </div>
+
     <div class="left h100" v-else>
       <el-form  :model="ruleForm"  ref="ruleForm"  label-width="70px"  v-loading.fullscreen.lock="fullscreenLoading">
         <nav class="nav flex-row">
@@ -85,7 +61,7 @@
           </h4>
         </div>
         <!-- 普通评分 -->
-        <div v-if="signDetailInfo.pingfen_info.pfmb_info['hp_cate']==0">
+        <div v-if="signDetailInfo.pingfen_info.pfmb_info[0].hp_cate==0">
           <ul v-if=" signDetailInfo.pingfen_info && signDetailInfo.pingfen_info.pfmb_items && signDetailInfo.pingfen_info.pfmb_items.length > 0">
           <li class="info-line list" v-for="(item, index) in signDetailInfo.pingfen_info.pfmb_items" :key="index" >
             <div class="info-title">{{ index + 1 }}.{{ item.hp_name }}</div>
@@ -161,24 +137,19 @@
         </h4>
         <div class="el-divider el-divider--horizontal"></div>
         <div class="right-content" v-html="signDetailInfo.hb_content"></div>
-        <div class="mt10 flex-row">
+        <div class="mt10 flex-row" v-show="signDetailInfo.pingfen_info.pfmb_info[0].hp_cate!=0">
           <h3 class="font-size-16 ml10">详情</h3>
           <h3 class="font-size-16 mr50">分数</h3>
         </div>
         <!-- 普通评分 -->
-        <div v-if="signDetailInfo.pingfen_info.pfmb_info['hp_cate']==0">
+        <div v-if="signDetailInfo.pingfen_info.pfmb_info[0].hp_cate==0">
           <div class="flex-row">
             <div >
-              <p style="font-size: 16px;font-family: Segoe UI, Segoe UI-Regular;color: #7c7c7c;">评分项目</p>
+              <p style="font-size: 16px;font-family: Segoe UI, Segoe UI-Regular;color: #7c7c7c;" >附件：</p>
               <a  style="display: block"  :href="item.link"  target="_blank"  class="d-in-block mr30 mb15"  v-for="(item,index) in fileList" :key="index"  >{{ item.title }}</a
               >
             </div>
-            <input
-              type="text"
-              class="f-input f-inputAdd"
-              v-model="ruleForm.score"
-              oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')"
-            />
+            <input type="text" class="f-input" v-show="false" v-model="ruleForm.score" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')"/>
           </div>
           <!-- <div class="flex-1" v-else>无</div> -->
         </div>
@@ -499,7 +470,6 @@ export default {
       console.log(limitScore, "00")
       let curScore = Number(this.recordMine_pfxz[index].hx_fs);
       let maxScore = Number(limitScore);
-      console.log(curScore, "11")
       if (curScore < maxScore) {
         this.totalScore = 0;
         this.recordMine_pfxz.forEach(item => {