Merge branch 'master' into 'master'

技术档案填写优化

See merge request lighter/vue-intergration-platform!107

src/views/technology-archives/TechnologyArchivesMain.vue

@@ -732,13 +732,23 @@
                     <span v-else>{{ scope.row.content }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column prop="mode" label="考核方式" width="200" show-overflow-tooltip>
+                <el-table-column prop="mode" label="考核方式" width="160">
                   <template v-slot="scope">
-                    <el-input v-if="scope.row.isEdit" size="small" v-model="scope.row.mode"></el-input>
-                    <span v-else>{{ scope.row.mode }}</span>
+                    <div v-if="scope.row.isEdit">
+                      <el-select v-model="scope.row.mode" clearable placeholder="请选择考核方式">
+                        <el-option v-for="option in assessOptions" :key="option.code" :label="option.name"
+                                   :value="option.code"></el-option>
+                      </el-select>
+                    </div>
+                    <div v-else>
+                      <el-select v-model="scope.row.mode" disabled placeholder="请选择考核方式">
+                        <el-option v-for="option in assessOptions" :key="option.code" :label="option.name"
+                                   :value="option.code"></el-option>
+                      </el-select>
+                    </div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="result" label="结果" width="100" show-overflow-tooltip>
+                <el-table-column prop="result" label="结果" width="120" show-overflow-tooltip>
                   <template v-slot="scope">
                     <div v-if="scope.row.isEdit">
                       <el-select v-model="scope.row.result" clearable placeholder="请选择结果">
@@ -1066,11 +1076,18 @@ const isEdit = ref(false)
 const dictData = ref([])
 const learnOptions = [{ code: '1', name: '讲座' }, { code: '2', name: '学习班' }, { code: '3', name: '培训班' }, { code: '4', name: '外出进修' }]
 const resultOptions = [{ code: '1', name: '通过' }, { code: '2', name: '不通过' }]
+const assessOptions = [{ code: '1', name: '笔试' }, { code: '2', name: '面试' }, { code: '3', name: '综合考评' }]
 const verifyOptions = [{ code: '1', name: '通过' }, { code: '2', name: '不通过' }, { code: '9', name: '其他' }]
 const userInfo = useUserStore().userInfo
 onMounted(() => {
   nextTick(() => {
     queryDictInfo()
+    selectEmployeeInfo(userInfo.code)
+      .then((res) => {
+        if(res){
+          baseInfoForm.value = res
+        }
+      })
   })
 })
 let baseInfoForm = ref({
@@ -1192,8 +1209,8 @@ const handleClick = (tab) => {
   // 查询哪个tab页面
   editableTabsValue.value = tab.props.name
   if (editableTabsValue.value === 'baseInfo') {
-    if(!userInfo.socialNo && userInfo.socialNo != null){
-      selectEmployeeInfo(userInfo.socialNo)
+    if(!userInfo.code && userInfo.code != null){
+      selectEmployeeInfo(userInfo.code)
           .then((res) => {
             if(res){
               baseInfoForm.value = res
@@ -1733,8 +1750,8 @@ const updateSecondInfo = (row) => {
     });
     return
   }
-
-  if (!row.no.match(/^[0-9]+$/) || row.no.length > 10000) {
+  let strNo = row.no + ''
+  if (!strNo.match(/^[0-9]+$/) || strNo.length > 10000) {
     ElMessage({
       type: "warning",
       message: "序号不是正整数或者超长，请检查!",