Merge branch 'master' into liua

* master:
  fix icon display
  提交
  ==
  fix pfmb form-rule valid error
  hdfq add/edit zzjg>dept_id=1

src/views/hdlb/hdfq/edit.vue

@@ -9,97 +9,50 @@
                             <el-input v-model="form.hhg_name" style="width: 100%;"></el-input>
                         </el-form-item>
                         <el-form-item label="活动类型" prop="hhg_cate">
-                            <el-cascader
-                                v-model="form.hhg_cate"
-                                :props="{ multiple: true, emitPath: false }"
-                                clearable
-                                style="width: 100%;"
-                                :options="hdlxOptions"
-                                :placeholder="''"
-                            ></el-cascader>
+                            <el-cascader v-model="form.hhg_cate" :props="{ multiple: true, emitPath: false }" clearable
+                                style="width: 100%;" :options="hdlxOptions" :placeholder="''"></el-cascader>
                         </el-form-item>
                         <el-form-item label="活动级别" prop="hhg_level">
-                            <el-select
-                                v-model="form.hhg_level"
-                                placeholder
-                                filterable
-                                remote
-                                :remote-method="handleQueryHdjb"
-                                style="width: 100%;"
-                                clearable
-                            >
-                                <el-option
-                                    v-for="({ cs_name }) in hdjbOptions"
-                                    :key="cs_name"
-                                    :label="cs_name"
-                                    :value="cs_name"
-                                ></el-option>
+                            <el-select v-model="form.hhg_level" placeholder filterable remote
+                                :remote-method="handleQueryHdjb" style="width: 100%;" clearable>
+                                <el-option v-for="({ cs_name }) in hdjbOptions" :key="cs_name" :label="cs_name"
+                                    :value="cs_name"></el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="设置参与用户" prop="hhg_set_user">
-                            <el-cascader
-                                v-model="form.hhg_set_user"
-                                :props="cyyhProps"
-                                :show-all-levels="false"
-                                clearable
-                                style="width: 100%;"
-                                :placeholder="''"
-                                :options="initCyyhOptions"
-                                :key="timestamp"
-                            >
+                            <el-cascader v-model="form.hhg_set_user" :props="cyyhProps" :show-all-levels="false"
+                                clearable style="width: 100%;" :placeholder="''" :options="initCyyhOptions"
+                                :key="timestamp">
                                 <template slot-scope="{  data }">
-                                    <i
-                                        v-if="data.leaf"
-                                        class="el-icon-user-solid"
-                                        style="margin-right: 4px;"
-                                    ></i>
+                                    <i v-if="data.leaf" class="el-icon-user-solid" style="margin-right: 4px;"></i>
                                     <span>{{ data.label }}</span>
                                 </template>
                             </el-cascader>
                         </el-form-item>
                         <el-form-item label="报名开始时间" prop="hhg_kssj">
-                            <el-date-picker
-                                type="date"
-                                v-model="form.hhg_kssj"
-                                style="width: 100%;"
-                                value-format="yyyy-MM-dd"
-                            ></el-date-picker>
+                            <el-date-picker type="date" v-model="form.hhg_kssj" style="width: 100%;"
+                                value-format="yyyy-MM-dd"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="资料上传截止时间" prop="hhg_jzsj">
-                            <el-date-picker
-                                type="date"
-                                v-model="form.hhg_jzsj"
-                                style="width: 100%;"
-                                value-format="yyyy-MM-dd"
-                            ></el-date-picker>
+                            <el-date-picker type="date" v-model="form.hhg_jzsj" style="width: 100%;"
+                                value-format="yyyy-MM-dd"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="报名结束时间" prop="hhg_jssj">
-                            <el-date-picker
-                                type="date"
-                                v-model="form.hhg_jssj"
-                                style="width: 100%;"
-                                value-format="yyyy-MM-dd"
-                            ></el-date-picker>
+                            <el-date-picker type="date" v-model="form.hhg_jssj" style="width: 100%;"
+                                value-format="yyyy-MM-dd"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="活动内容" prop="hhg_content">
                             <Tinymce v-model="form.hhg_content" :height="300"></Tinymce>
                         </el-form-item>
                         <el-form-item label="活动封面" prop="hhg_img">
-                            <FileUpload
-                                :part.sync="form.hhg_img"
-                                :limit="1"
-                                :size="2"
-                                accept=".jpg, .png, .jpeg"
-                            >
+                            <FileUpload :part.sync="form.hhg_img" :limit="1" :size="2" accept=".jpg, .png, .jpeg">
                                 <div slot="tip" class="el-upload__tip">非必填项，支持格式：jpg,png,jpeg（2M以内）</div>
                             </FileUpload>
                         </el-form-item>
                         <el-form-item label="其他附件">
                             <FileUpload :limit="5" :full.sync="form.hhg_files" multiple>
-                                <div
-                                    slot="tip"
-                                    class="el-upload__tip"
-                                >支持文件类型:doc(.docx)、.ppt(.pptx)、.xls(.xlsx)、.pps、.wps、.pdf、.txt文件格式。</div>
+                                <div slot="tip" class="el-upload__tip">
+                                    支持文件类型:doc(.docx)、.ppt(.pptx)、.xls(.xlsx)、.pps、.wps、.pdf、.txt文件格式。</div>
                             </FileUpload>
                         </el-form-item>
 
@@ -112,9 +65,8 @@
                                 <el-radio :label="0">终评</el-radio>
                                 <el-radio :label="1">初评+终评</el-radio>
                             </el-radio-group>
-                            <div
-                                style="color: #97a8be;"
-                            >*初评可以由学校管理员评审（通过或不通过），初评通过后自动进入终评，专家才能看该报名作品并进行评分（本活动的专家只能是从专家库选择设置的专家）</div>
+                            <div style="color: #97a8be;">
+                                *初评可以由学校管理员评审（通过或不通过），初评通过后自动进入终评，专家才能看该报名作品并进行评分（本活动的专家只能是从专家库选择设置的专家）</div>
                         </el-form-item>
 
                         <el-form-item>
@@ -179,7 +131,7 @@ export default defineComponent({
 
         Promise.all([
             detailApi(props.hhg_id),
-            queryZzjgApi({ limit: 99 }).then(({ data }) => {
+            queryZzjgApi({ limit: 99, dept_id: 1 }).then(({ data }) => {
                 initCyyhOptions.value = (data.one_info)
             })
         ]).then(([{ data }, useless]) => {
@@ -304,7 +256,7 @@ export default defineComponent({
             lazyLoad(node, resolve) {
                 console.log('node :>> ', (node));
                 if (node.level === 0) {
-                    queryZzjgApi({ limit: 99 }).then(({ data }) => {
+                    queryZzjgApi({ limit: 99, dept_id: 1 }).then(({ data }) => {
                         resolve(handleChildren(data.one_info))
                     })
                 } else {
@@ -352,6 +304,7 @@ export default defineComponent({
         border-bottom: 1px solid #dcdfe6;
         color: #606266;
     }
+
     .form_wrapper {
         padding: 16px;
     }

src/views/hdlb/hdfq/index.vue

@@ -29,15 +29,19 @@
                                     <span>{{ data.label }}</span>
                                 </template>
                             </el-cascader>
+                            <!-- <RemoteCascaderUser v-model="form.hhg_set_user" :d1="{ dept_id: 1 }"></RemoteCascaderUser> -->
                         </el-form-item>
-                        <el-form-item label="报名开始时间" prop="hhg_kssj" >
-                          <el-date-picker type="date" v-model="form.hhg_kssj" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+                        <el-form-item label="报名开始时间" prop="hhg_kssj">
+                            <el-date-picker type="date" v-model="form.hhg_kssj" style="width: 100%;"
+                                value-format="yyyy-MM-dd"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="资料上传截止时间" prop="hhg_jzsj">
-                            <el-date-picker type="date" v-model="form.hhg_jzsj" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+                            <el-date-picker type="date" v-model="form.hhg_jzsj" style="width: 100%;"
+                                value-format="yyyy-MM-dd"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="报名结束时间" prop="hhg_jssj">
-                            <el-date-picker type="date" v-model="form.hhg_jssj" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+                            <el-date-picker type="date" v-model="form.hhg_jssj" style="width: 100%;"
+                                value-format="yyyy-MM-dd"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="活动内容" prop="hhg_content">
                             <Tinymce v-model="form.hhg_content" :height="300"></Tinymce>
@@ -45,7 +49,7 @@
                         <el-form-item label="活动封面" prop="hhg_img">
                             <FileUpload :part.sync="form.hhg_img" :limit="1" :size="2" accept=".jpg, .png, .jpeg">
                                 <div slot="tip" class="el-upload__tip">非必填项，支持格式：jpg,png,jpeg（2M以内）</div>
-                            </FileUpload> 
+                            </FileUpload>
                         </el-form-item>
                         <el-form-item label="其他附件">
                             <FileUpload :limit="5" :full.sync="form.hhg_files" multiple>
@@ -84,11 +88,13 @@ import { addApi, queryHdlxApi, queryHdjbApi } from '../api'
 import { queryZzjgApi, queryUserApi } from './api'
 import Tinymce from "@/components/Tinymce/index.vue";
 import FileUpload from "@/components/FileUpload/index.vue";
+import RemoteCascaderUser from "@/components/RemoteCascaderUser/index.vue";
 
 export default defineComponent({
     components: {
         Tinymce,
-        FileUpload
+        FileUpload,
+        RemoteCascaderUser
     },
     setup() {
         const _this = getCurrentInstance().proxy
@@ -188,7 +194,7 @@ export default defineComponent({
             lazy: true,
             lazyLoad(node, resolve) {
                 if (node.level === 0) {
-                    queryZzjgApi({ limit: 999 }).then(({ data }) => {
+                    queryZzjgApi({ limit: 999,dept_id:1 }).then(({ data }) => {
                         resolve(handleChildren(data.one_info))
                     })
                 } else {

src/views/hdlb/sqjl/index.vue

@@ -77,7 +77,7 @@
 
             <el-table-column label="平均分" align="center" v-if="btnCheck.zc">
               <template slot-scope="scope">
-                <template v-if="scope.row.is_zc">
+                <template>
                   <el-popover placement="bottom" width="150" trigger="hover">
                     <div class="pt5 font-size-14 text-light flex-row">
                       <span>专家平均打分</span>
@@ -85,27 +85,30 @@
                     </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,index) in scope.row.pingfen_info.record_all" :key="index">
+                      <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>
                     </ul>
                     <div slot="reference" class="hand">
                       <span class="d-in-block v-mid">{{ scope.row.hb_pjf }}</span>
-                      <span class="d-in-block v-mid icon-more ml10"></span>
+                      <span class="d-in-block v-mid icon-more ml10">
+                        <img src="@/assets/icon/more.png" alt="">
+                      </span>
                     </div>
                   </el-popover>
                 </template>
 
-                <template v-else>
+                <!-- <template v-else>
                   --
-                </template>
+                </template> -->
               </template>
             </el-table-column>
             <el-table-column label="操作" width="120">
               <template slot-scope="scope">
-                <el-button type="text" v-if="btnCheck.pf" @click="toReview(scope.row.hb_id ,'pf')">评分</el-button>
-                <el-button type="text" v-if="btnCheck.zc" :disabled="!scope.row.is_zc" @click="toReview(scope.row.hb_id , 'zc')">仲裁</el-button>
+                <el-button type="text" v-if="btnCheck.pf" @click="toReview(scope.row.hb_id, 'pf')">评分</el-button>
+                <el-button type="text" v-if="btnCheck.zc" :disabled="!scope.row.is_zc"
+                  @click="toReview(scope.row.hb_id, 'zc')">仲裁</el-button>
               </template>
             </el-table-column>
           </template>
@@ -116,7 +119,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" :key="index"> 
+                <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>
@@ -142,7 +145,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,index) in scope.row.pingfen_info.record_all" :key="index">
+                    <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>
@@ -198,6 +201,8 @@ export default defineComponent({
   setup(props) {
     const _this = getCurrentInstance().proxy
 
+    // const icon_more = import('@/assets/icon/more')
+
     const currentRole = Object.keys(RoleMap).find(k => RoleMap[k].includes(role))
     const searchText = ref('')
     const total = ref(0)
@@ -246,8 +251,8 @@ export default defineComponent({
         handleQuery()
       })
     }
-    function toReview(id,difMark) {
-      _this.$router.push({ name: 'zjpf', params: { id, difMark} })
+    function toReview(id, difMark) {
+      _this.$router.push({ name: 'zjpf', params: { id, difMark } })
     }
     function handleCommand(command) {
       let z_data = {};
@@ -370,9 +375,15 @@ export default defineComponent({
 
 .icon-more {
   width: 3px;
-  height: 12px;
-  background: url("src/assets/icon/more.png") center no-repeat;
-  background-size: 3px 12px;
+  // height: 12px;
+  // display:flex;
+  // align-items: center;
+  // background: url("src/assets/icon/more.png") center no-repeat;
+  // background-size: 3px 12px;
+  img{
+    width: 100%;
+    // height: 100%;
+  }
 }
 
 .pop-list {

src/views/xtgl/pfmb/edit/index.vue

@@ -86,8 +86,8 @@
 
                     <el-dialog v-if="visibleRight" :visible.sync="visibleRight" width="360" append-to-body>
                         <el-form :model="rightForm" label-width="120px" ref="rightFormRef">
-                            <el-form-item label="评分模板名称" :rules="{ required: true, message: '评分模板名称不能为空', tigger: 'submit' }"
-                                prop="hp_name">
+                            <el-form-item label="评分模板名称"
+                                :rules="{ required: true, message: '评分模板名称不能为空', tigger: 'submit' }" prop="hp_name">
                                 <el-input v-model="rightForm.hp_name"></el-input>
                             </el-form-item>
                             <el-form-item label="评分方式" prop="hp_pfzbsz">
@@ -98,19 +98,22 @@
                             </el-form-item>
 
                             <template v-if="rightForm.hp_pfzbsz === '1'">
-                                <el-form-item label="最高分" :rules="{ required: true, message: '最高分不能为空', tigger: 'submit' }"
+                                <el-form-item label="最高分"
+                                    :rules="{ type: 'number', required: true, message: '最高分不能为空', tigger: 'submit' }"
                                     prop="hp_dffw">
                                     <el-input-number :min="rightForm.hp_affw || -Infinity" controls-position="right"
                                         v-model="rightForm.hp_dffw"></el-input-number>
                                 </el-form-item>
-                                <el-form-item label="最低分" :rules="{ required: true, message: '最低分不能为空', tigger: 'submit' }"
+                                <el-form-item label="最低分"
+                                    :rules="{ type: 'number', required: true, message: '最低分不能为空', tigger: 'submit' }"
                                     prop="hp_affw">
                                     <el-input-number :max="rightForm.hp_dffw || Infinity" controls-position="right"
                                         v-model="rightForm.hp_affw"></el-input-number>
                                 </el-form-item>
                             </template>
                             <template v-if="rightForm.hp_pfzbsz === '2'">
-                                <el-form-item label="占比(%)" :rules="{ required: true, message: '占比不能为空', tigger: 'submit' }"
+                                <el-form-item label="占比(%)"
+                                    :rules="{ type: 'number', required: true, message: '占比不能为空', tigger: 'submit' }"
                                     prop="hp_zbsz">
                                     <el-input-number controls-position="right" :min="0" :max="100"
                                         v-model="rightForm.hp_zbsz"></el-input-number>
@@ -163,8 +166,8 @@
 
                     <el-dialog v-if="visibleRight" :visible.sync="visibleRight" width="360" append-to-body>
                         <el-form :model="rightForm" label-width="120px" ref="rightFormRef">
-                            <el-form-item label="考试细则" :rules="{ required: true, message: '考试细则不能为空', tigger: 'submit' }"
-                                prop="hp_name">
+                            <el-form-item label="考试细则"
+                                :rules="{ required: true, message: '考试细则不能为空', tigger: 'submit' }" prop="hp_name">
                                 <el-input v-model="rightForm.hp_name"></el-input>
                             </el-form-item>
                             <el-form-item label="专家" :rules="{ required: true, message: '专家不能为空', tigger: 'submit' }"
@@ -184,19 +187,23 @@
                             </el-form-item>
 
                             <template v-if="rightForm.hp_pfzbsz === '1'">
-                                <el-form-item label="最高分" :rules="{ required: true, message: '最高分不能为空', tigger: 'submit' }"
+                                <el-form-item label="最高分"
+                                    :rules="{ type: 'number', required: true, message: '最高分不能为空', tigger: 'submit' }"
                                     prop="hp_dffw">
                                     <el-input-number :min="rightForm.hp_affw || -Infinity" controls-position="right"
                                         v-model="rightForm.hp_dffw"></el-input-number>
                                 </el-form-item>
-                                <el-form-item label="最低分" :rules="{ required: true, message: '最低分不能为空', tigger: 'submit' }"
+                                <el-form-item label="最低分"
+                                    :rules="{ type: 'number', required: true, message: '最低分不能为空', tigger: 'submit' }"
                                     prop="hp_affw">
                                     <el-input-number :max="rightForm.hp_dffw || Infinity" controls-position="right"
                                         v-model="rightForm.hp_affw"></el-input-number>
                                 </el-form-item>
                             </template>
-                            <template v-if="rightForm.hp_pfzbsz === '2'" prop="hp_zbsz">
-                                <el-form-item label="占比(%)" :rules="{ required: true, message: '占比不能为空', tigger: 'submit' }">
+                            <template v-if="rightForm.hp_pfzbsz === '2'">
+                                <el-form-item label="占比(%)"
+                                    :rules="{ type: 'number', required: true, message: '占比不能为空', tigger: 'submit' }"
+                                    prop="hp_zbsz">
                                     <el-input-number controls-position="right" :min="0" :max="100"
                                         v-model="rightForm.hp_zbsz"></el-input-number>
                                 </el-form-item>

src/views/xtgl/zzjg/index.vue

@@ -397,18 +397,18 @@ export default {
     },
     loadingCascadeData() {
       let data = {
-        dept_id: "1",
+        dept_id: "1,2",
       };
-      list_tree().then((res) => {
+      list_tree(data).then((res) => {
         if (res.code === "1") {
           this.deptOptions = res.data.one_info;
         }
       });
-      hdlx_list_tree().then((res) => {
-        if (res.code === "1") {
-          this.hdlxOptions = res.data.one_info;
-        }
-      });
+      // hdlx_list_tree().then((res) => {
+      //   if (res.code === "1") {
+      //     this.hdlxOptions = res.data.one_info;
+      //   }
+      // });
     },
     updateDeptId(data) {
       this.activeDeptName = data.msg.label;