讲师管理新增讲师修改bug

src/components/Grateful/UploadDragger.vue

@@ -56,6 +56,10 @@ const props = defineProps({
     accept: {
         type: String,
         default: ''
+    },
+    size: {
+        type: Number,
+        default: 0
     }
 })
 const emit = defineEmits(['update:value', 'change'])
@@ -67,6 +71,12 @@ const handleUploadChange = ({ file, fileList }) => {
         fileList.value = [];
         return message.error("请上传正确的文件格式");
     }
+    if(props.size && file.size > props.size){
+        removeUpload()
+        message.destroy();
+        message.error("文件大小超过5MB!");
+        return
+    }
     emit('update:value', fileList)
     emit('change', fileList)
 }

src/components/project/AddContent.vue

@@ -102,6 +102,9 @@ export default {
         expandedKeys.value = []
         selectedKeys.value = []
         checkedKeys.value = []
+      }else{
+        state.treeAddData = props?.AddContentList
+        checkedKeys.value = props?.AddContentList?.map(item=>item.id)
       }
     });
     const onCheck = (checkedKeys, {checked: bool, checkedNodes, node, event}) => {
@@ -117,7 +120,7 @@ export default {
       checkedKeys.value = [];
     }
     const queryCreate = () => {
-      ctx.emit("AddContentList", state.treeAddData);
+      ctx.emit("update:AddContentList", state.treeAddData);
       closeCodeModal()
     }
     const closeCodeModal = () => {

src/components/project/AddOrgContent.vue

@@ -8,7 +8,7 @@
       wrapClassName="codeModal"
       style="margin-top: 400px"
       :zIndex="9999"
-      @cancel="qr_exit"
+      @cancel="closeCodeModal"
     >
       <div class="QR">
         <div class="qr_header"></div>

src/components/project/SearchTeacher.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <a-popover v-model:visible="visible"  placement="bottom" trigger="click">
-      <template #content>
+      <template #content v-if="!disabled">
         <div class="pover">
           <div class="search">
             <a-select
@@ -53,6 +53,7 @@
         :filter-option="false"
         :open="false"
         :defaultOpen="false"
+        :disabled="disabled"
       >
         <template v-if="loading" #notFoundContent>
           <a-spin size="small"/>
@@ -106,6 +107,10 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  disabled: {
+    type: Boolean,
+    default: false,
+  }
 })
 const emit = defineEmits(['update:value','update:lable','update:system','update:level','update:newlable','update:orgId','update:id','update:payrollPlaceCode','update:payrollPlaceName'])
 const visible = ref(false);

src/views/lecturer/InsideLecturer.vue

@@ -144,7 +144,7 @@
         <a-row :gutter="16">
           <a-col :span="24">
             <a-form-item label="讲师名称" name="name">
-                <SearchTeacher v-model:value="formParam.name" v-model:lable="formParam.orgNames" v-model:orgId="formParam.orgId" v-model:id="formParam.id"
+                <SearchTeacher :disabled="!!id" v-model:value="formParam.name" v-model:lable="formParam.orgNames" v-model:orgId="formParam.orgId" v-model:id="formParam.id"
                 v-model:system="tSystemNames" v-model:level="formParam.tlevelId"></SearchTeacher>
             </a-form-item>
           </a-col>
@@ -183,23 +183,23 @@
           </a-col>
         <a-row :gutter="16">
           <a-col :span="24">
-            <a-form-item label="初始授课时长" name="defaultteachingTime">
+            <a-form-item label="初始授课时长" name="defaultTeachingTime">
-              <a-input v-model:value="formParam.defaultteachingTime" style="width:80%; height: 40px; border-radius: 8px; "
+              <a-input v-model:value="formParam.defaultTeachingTime" style="width:80%; height: 40px; border-radius: 8px; "
                 @blur="clearNonNumber" placeholder="0" allowClear showSearch suffix="分钟">
               </a-input>
-               <span style="margin-left: 5px ;" v-if="formParam.defaultteachingTime == null">0.00小时</span>
+               <span style="margin-left: 5px ;" v-if="formParam.defaultTeachingTime == null">0.00小时</span>
-              <span style="margin-left: 5px ;" v-if="formParam.defaultteachingTime != null">{{
+              <span style="margin-left: 5px ;" v-if="formParam.defaultTeachingTime != null">{{
-                (formParam.defaultteachingTime / 60).toFixed(2) }}小时</span>
+                (formParam.defaultTeachingTime / 60).toFixed(2) }}小时</span>
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="认证状态" name="certStatus">
+            <a-form-item label="认证状态" name="certStatus" style="display:flex;">
               <a-radio-group v-model:value="formParam.certStatus" class="draitem">
                 <a-radio :value="0">未认证</a-radio>
                 <a-radio :value="1">已认证</a-radio>
                 <span>
                   <a-button type="text" class="moreidbtn" v-if="formParam.certStatus == 1"
-                    @click="handleupdialog">上传凭证</a-button>
+                    @click="handleupdialog">{{formParam.certificationName?formParam.certificationName:'上传凭证'}}</a-button>
                   </span>
                 </a-radio-group>
             </a-form-item>
@@ -231,6 +231,7 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <div style="margin-bottom: 6px;">教师专长</div>
         <a-row :gutter="50" style="margin-bottom: 50px;">
           <a-col :span="4">
             <a-tag color="blue" style="line-height: 40px; ">管理业务</a-tag>
@@ -246,33 +247,38 @@
         </a-row>
       </a-form>
       <div>
-        <a-modal v-model:visible="updialog" :footer="null" closable="false" centered="true">
+        <a-modal 
-          <div class="delete" style="width:600px;">
+          v-model:visible="updialog"
-            <div class="del_header"></div>
+          :footer="null"
-            <div class="del_main">
+          closable="false"
-              <div class="header">
+          style="margin-top: 400px"
-                <img src="@/assets/images/coursewareManage/QR.png" alt="" style="margin-right:10px" />
+          @cancel="cancelupdialog"
-                <span>导入</span>
+        >
+          <div class="selectonlineface" style="width: 660px;" :style="{ display: updialog ? 'block' : 'none' }">
+            <div class="bg_headers"></div>
+            <div class="bg_main">
+              <div class="bg_main_header">
+                <div class="bg_main_header_close" @click="cancelupdialog"></div>
               </div>
-              <a-form style="margin-left:20px; margin-top:10px ;padding-left:50px">
+              <div class="bg_body">
-                <a-form-item style="color: #999999;">注意 :文件仅支持PDF格式 ,文件大小不可超过500KB</a-form-item>
+                <div>导入</div>
+                <a-form style="margin-top:30px ;">
+                  <a-form-item style="color: #999999;">注意 :文件支持PDF、PNG、JPG ,文件大小不可超过5MB</a-form-item>
                   <a-form-item label="上传文件">
-                  <!-- <a-upload multiple :headers="headers" :show-upload-list="false" :before-upload="beforeUpload2">
+                    <UploadDragger :size="5000000" ref="uploadRef" style="width:80%;" @change="changeUpload" :accept="accept"
-                    <a-button type="primary">上传导入文件</a-button>
-                  </a-upload> -->
-                  <UploadDragger ref="uploadRef" v-model:value="files" @change="changeUpload" :accept="accept"
                           :uploadUrl="uploadUrl" :params="folderId" />
                   </a-form-item>
-                <a-form-item>{{ formParam.filesList }}</a-form-item>
-                <!-- <a-form-item style="color: #999999;" v-for="(item, index) in formParam.filesList">{{ item }}</a-form-item> -->
-                <span></span>
                 </a-form>
-              <div class="del_btnbox">
+                <div class="bg_footer" style="margin-left: 160px;margin-top: 30px">
-                <div class="del_btn btn2" @click="cancelupdialog" style="margin-right: 32px">
+                  <div class="btn btn6" @click="cancelupdialog">
                     <div class="btnText">取消</div>
                   </div>
-                <div class="del_btn btn2" @click="createupdialog">
+                  <a-button
-                  <div class="btnText">确定</div>
+                    class="btn btn6"
+                    @click="createupdialog"
+                  >
+                    确定
+                  </a-button>
                 </div>
               </div>
             </div>
@@ -350,7 +356,7 @@
         </div>
       </a-modal>
     </div>
-    <AddContent v-model:showContent="showContent" @AddContentList="AddContentList" :Addtitle="Addtitle" />
+    <AddContent v-model:showContent="showContent" v-model:AddContentList="formParam.orgLists" :Addtitle="Addtitle" />
     <!-- <div> <Upload/> </div>         -->
   </div>
 </template>
@@ -430,10 +436,12 @@ export default {
       formParam: {
         name: null,
         certStatus: 0,//认证状态
-        defaultteachingTime: null,
+        defaultTeachingTime: null,
         teacherType:1,
         photo: '',
         orgLists: [],
+        certification: null,
+        certificationName: null,
       },
       searchParam: { 
         teacherType:1,
@@ -511,16 +519,14 @@ export default {
     //附件上传
     const uploadRef = ref()
     const uploadUrl = ref("/systemapi/api/m/xfile/base/file/upload");
-    const accept = ".pdf"
+    const accept = ".pdf,.jpg,.png,"
     const folderId = ref({ folderId: process.env.VUE_APP_COURSE_FOLDERID })
     const changeUpload = (newValue) => {
       if (newValue[0].status == 'done' && newValue[0]?.response?.status == 200) {
-          // const { id, folderId, path } = files.value[0].response.result
+          const { id, name, path } = newValue[0].response.result
-          // console.log(newValue[0].response.result.path, 9999999999999);
+          console.log(id,name,path)
-          // params.value.picPath = path
+          state.formParam.certification = path
-          // params.value.folderId = folderId
+          state.formParam.certificationName = name
-          // params.value.pid = id
-          console.log(newValue,'newValue')
       }
     }
 
@@ -554,10 +560,11 @@ export default {
       state.updialog = true
     }
     const cancelupdialog = () => {
+      uploadRef.value.removeUpload()
       state.updialog = false
     }
     const createupdialog = () => {
-      state.updialog = false
+      cancelupdialog()
     }
     const LecturerSystemList = ref([
     ]);
@@ -589,9 +596,12 @@ export default {
     const addContentData = () => {
       state.showContent = true
     }
+    watch(()=>state.showContent, (newVal)=>{
+      console.log(state.formParam.orgLists,'xixixixixi')
+    })
     const AddContentList = (data) => {
-      console.log(data, 'treedatalist')
+      // console.log(data, 'treedatalist')
-      state.formParam.orgLists = data
+      // state.formParam.orgLists = data
     }
     LecturerSystemLista()
     //获取内部讲师级别
@@ -900,6 +910,7 @@ export default {
     const createTeacherDialog = async () => {
       state.formParam.tsystemName = state.tSystemNames?.systemName
       state.formParam.tsystemId = state.tSystemNames?.systemId
+      state.formParam.defaultTeachingTime = String(state.formParam.defaultTeachingTime)
       const formItemNames = Object.keys(rules);
       for(let i=0;i<formItemNames.length;i++){
         const result = await validateField(formItemNames[i]);
@@ -1005,6 +1016,7 @@ export default {
           getTableDate();
         }
       }).catch((err)=>{
+        message.error(err.data.msg)
         state.deleteInTeacherdialog = false
       })
     }
@@ -1040,6 +1052,12 @@ export default {
       state.editTeacher = false
       state.tagsshow = 1
     };
+    watch(() => state.formParam.certStatus,(val)=>{
+      if(!val){
+        state.formParam.certification = null
+        state.formParam.certificationName = null
+      }
+    })
     //清空数据
     const cancel = () => {
       state.formParam = {
@@ -1050,29 +1068,32 @@ export default {
         name: null,
         newdepartId: null,
         tlevelId: null,
-        defaultteachingTime:null,
+        defaultTeachingTime:null,
         tsystemName: null,
         certStatus: 0,
         description: '',
         workExperience: '',
         courses: '',
-        orgLists: []
+        orgLists: [],
+        certification: null,
+        certificationName: null,
       }
       state.tSystemNames = {
         systemName:null,
         systemId: null,
         levelVoList: []
       }
+      state.id = null
     }
     const clearNonNumber = () => {
-      state.formParam.defaultteachingTime = state.formParam.defaultteachingTime.replace(/\D/g, '');
+      state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime.replace(/\D/g, '');
     }
     const rules = {
       name: [{ required: true, message: '',log:'讲师不能为空' }],
       // newdepartId: [{ required: true, message: '组织不能为空' }],
       tsystemName: [{ required: true, message: '',log:'讲师体系不能为空' }],
       tlevelId: [{ required: true, message: '',log:'讲师级别不能为空' }],
-      defaultteachingTime: [{ required: true, message: '',log:'初始授课时长不能为空' }],
+      defaultTeachingTime: [{ required: true, message: '',log:'初始授课时长不能为空' }],
       // certStatus: [{ required: true, message: '认证状态不能为空' }],
 
     }
@@ -1097,7 +1118,7 @@ export default {
     //     message.warning('讲师体系不能为空')
     //     return
     //   }
-    //   if (state.formParam.defaultteachingTime == null) {
+    //   if (state.formParam.defaultTeachingTime == null) {
     //     state.log = true
     //     message.warning('授课时长不能为空')
     //     return
@@ -1134,12 +1155,25 @@ export default {
           state.tSystemNames.systemId = res.data.data.tsystemId
           state.tSystemNames.systemCode = res.data.data.systemCode
           state.tSystemNames.systemId = res.data.data.systemId
-          state.tSystemNames.levelVoList = res.data.data.levelVoList
+          state.tSystemNames.levelVoList = res.data.data?.levelList?.map(item=>{
+            return {
+              label: item.levelName,
+              value: item.id,
+              levelName: item.levelName,
+              id: item.id,
+            }
+          })
           state.formParam.tlevelName = res.data.data.tlevelName
           state.formParam.tlevelId = res.data.data.tlevelId
           state.formParam.name = res.data.data.name+'/'+res.data.data.userNo
           state.formParam.orgNames =  state.formParam.orgName
-          state.formParam.orgLists = res.data.data.expertiseNames?.split(',').map(item=>({ name: item }))
+          // state.formParam.orgLists = res.data.data.expertiseNames?.split(',').map(item=>({ name: item }))
+          const ids = res.data.data?.expertise?.trim().split(',').filter(id => id !== '');
+          const names = res.data.data?.expertiseNames?.split(',');
+          state.formParam.orgLists = ids?.map((id, index) => ({
+            name: names[index],
+            id: id
+          }));
         }
 
 
@@ -1245,6 +1279,357 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.selectonlineface{
+  z-index: 999;
+  width: 679px;
+  background: #ffffff;
+  box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+  position: absolute;
+  left: 50%;
+  top: -100%;
+  transform: translate(-50%, -50%);
+  .bg_headers {
+    position: absolute;
+    width: 100%;
+    height: 40px;
+    background: linear-gradient(
+      rgba(78, 166, 255, 0.2) 0%,
+      rgba(78, 166, 255, 0) 100%
+    );
+  }
+  .bg_main {
+    width: 100%;
+    position: relative;
+    .bg_main_header {
+      display: flex;
+      align-items: center;
+      padding-top: 20px;
+      padding-left: 26px;
+      font-size: 16px;
+      .bg_main_header_icon {
+        width: 16px;
+        height: 16px;
+        margin-right: 10px;
+        background-image: url(@/assets/images/evaluation/uploads.png);
+        background-size: 100% 100%;
+      }
+      .bg_main_header_close {
+        position: absolute;
+        right: 42px;
+        cursor: pointer;
+        width: 20px;
+        height: 20px;
+        background-image: url(@/assets/images/coursewareManage/close.png);
+        background-size: 100% 100%;
+      }
+    }
+    .text_color{
+      color:#d9d9d9;
+    }
+    .bg_body {
+      width: 80%;
+      margin: 3px auto;
+
+      .bg_body_bt {
+        display: flex;
+        align-items: center;
+        justify-content: end;
+        margin: 14px auto;
+
+        .bg_body_bttext {
+          width: 110px;
+          display: flex;
+          justify-content: end;
+          margin-right: 20px;
+          .bg_body_btimg{
+            width: 10px;
+            height: 10px;
+            margin-top: -3px;
+            margin-right: 6px;
+            background-size: 100% 100%;
+          }
+        }
+        .mbl_items12 {
+          width: 333px;
+          margin-left: 128px;
+          .item_text{
+            width: 300px;
+            white-space: nowrap; /* 不换行 */
+            overflow: hidden; /* 超出部分隐藏 */
+            text-overflow: ellipsis; /* 使用省略号表示被隐藏的部分 */
+          }
+          .i12_box1 {
+            display: flex;
+            align-items: center;
+            padding: 10px 0px 17px 21px;
+            border: 1px solid #eff4fc;
+            border-radius: 8px;
+            margin-bottom: 10px;
+
+            .file_img {
+              width: 27px;
+              height: 32px;
+              background-image: url(@/assets/images/coursewareManage/imgs.png);
+              margin-right: 22px;
+
+              img {
+                width: 100%;
+                height: 100%;
+              }
+            }
+
+            .file_detail {
+              width: 250px;
+              margin-right: 21px;
+
+              .file_updata {
+                display: flex;
+                align-items: center;
+
+                .updatabox {
+                  position: relative;
+                  width: 230px;
+                  height: 5px;
+                  background-color: rgba(192, 192, 192, 0.25);
+                  border-radius: 3px;
+
+                  .updatacolor {
+                    position: absolute;
+                    left: 0;
+                    width: 100%;
+                    height: 5px;
+                    background-color: #57c887;
+                    border-radius: 3px;
+                  }
+
+                  .updatacolor2 {
+                    position: absolute;
+                    left: 0;
+                    width: 80%;
+                    height: 5px;
+                    background-color: #ff7474;
+                    border-radius: 3px;
+                  }
+
+                  .updatacolor3 {
+                    position: absolute;
+                    left: 0;
+                    width: 60%;
+                    height: 5px;
+                    background-color: #4ea6ff;
+                    border-radius: 3px;
+                  }
+                  .updataxq1{
+                    margin-top: 7px;
+                  }
+
+                  .updataxq {
+                    position: absolute;
+                    right: 2px;
+                    top: -37px;
+                    color: #57c887;
+                  }
+
+                  .updataxq2 {
+                    position: absolute;
+                    right: 2px;
+                    top: -35px;
+                    color: #ff7474;
+                  }
+
+                  .updataxq3 {
+                    position: absolute;
+                    right: 2px;
+                    top: -30px;
+                    color: #4ea6ff;
+                  }
+                }
+              }
+            }
+
+            .file_operation {
+              display: flex;
+
+              .fobox {
+                margin-right: 5px;
+                cursor: pointer;
+              }
+            }
+          }
+        }
+      }
+      .bg_body_input {
+        flex: 1;
+        position: relative;
+        .ant-upload-picture-card-wrapper{
+          width: 200px;
+          margin-right: 18px;
+        }
+        .i_upload_img {
+            width: 200px;
+            height: 112px;
+          }
+          ::v-deep .ant-upload.ant-upload-select-picture-card{
+            width: 200px;
+            height: 112px;
+          }
+          .i_upload {
+            width: 200px;
+            height: 112px;
+            text-align: center;
+            align-items: center;
+            cursor: pointer;
+
+            .addimg {
+              position: relative;
+
+              .heng {
+                position: absolute;
+                top: 59px;
+                left: 71px;
+                width: 60px;
+                border: 1px solid #d9d9d9;
+              }
+
+              .shu {
+                position: absolute;
+                top: 30px;
+                left: 100px;
+                height: 60px;
+                border: 1px solid #d9d9d9;
+              }
+            }
+          }
+        .upload_box{
+          border: 1px solid #d9d9d9;
+          padding: 2px 5px;
+          background-color: #d9d9d9;
+          border-radius: 2px;
+          cursor: pointer;
+        }
+        .error-message{
+          color: red;
+          font-size: 11px;
+          margin-top: 2px;
+          margin-bottom: 0;
+        }
+      }
+      .bg_footer {
+        width: 100%;
+        margin-left: 174px;
+        margin-top: 25px;
+        margin-bottom: 20px;
+        display: flex;
+
+        .btn {
+          width: 100px;
+          height: 40px;
+          background: rgba(64, 158, 255, 0);
+          border-radius: 8px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-right: 14px;
+          flex-shrink: 0;
+          cursor: pointer;
+
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 40px;
+          }
+        }
+
+        .btn5 {
+          border: 1px solid rgba(64, 158, 255, 1);
+          color: #4ea6ff;
+        }
+
+        .btn6 {
+          background-color: #4ea6ff;
+          color: #ffffff;
+        }
+        .btndesign {
+          background-color: #eff4fc;
+          color: #ffffff;
+        }
+      }
+    }
+    .headers{
+      margin-left: 38px;
+      margin-right: 38px;
+      margin-top: 30px;
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+      .btn{
+        display: flex;
+      }
+      .headers_item{
+        margin-right: 20px;
+        margin-bottom: 20px;
+        .headers_item_text{
+          margin-right: 15px;
+        }
+        .headers_item_btn {
+          padding: 0px 26px 0px 26px;
+          height: 38px;
+          background: #4ea6ff;
+          border-radius: 8px;
+          border: 1px solid rgba(64, 158, 255, 1);
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-right: 14px;
+          flex-shrink: 0;
+          cursor: pointer;
+
+          .search {
+            background-size: 100%;
+          }
+
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            color: #ffffff;
+            line-height: 36px;
+            margin-left: 5px;
+          }
+        }
+        .btn1 {
+          .search {
+            width: 15px;
+            height: 17px;
+            background-image: url("../../assets/images/courseManage/search0.png");
+          }
+        }
+        .btn2 {
+          .search {
+            width: 16px;
+            height: 18px;
+            background-image: url("../../assets/images/courseManage/reset0.png");
+          }
+        }
+        ::v-deep .ant-select {
+          border-radius: 5px;
+          width: 100%;
+          height: 40px;
+          .ant-select-selector {
+            border-radius: 8px;
+            width: 100%;
+            height: 40px;
+          }
+          .ant-select-selection-placeholder{
+            line-height: 40px;
+          }
+          .ant-select-selection-item{
+            line-height: 40px;
+          }
+        }
+      }
+    }
+  }
+}
 ::v-deep .ant-upload.ant-upload-select-picture-card {
   border-radius: 50% !important;
 }