فهرست منبع

Merge branch 'dev' of http://111.2.21.141:33001/ystl_myq/hospital-project into dev

username 3 ماه پیش
والد
کامیت
42b4dcfaf8

+ 5 - 1
Jenkinsfile

@@ -8,7 +8,11 @@ pipeline {
                 checkout scm
             }
         }
-
+     stage('Install pnpm') {
+            steps {
+                sh 'npm install -g pnpm'
+            }
+        }
         stage('Install Dependencies') {
             steps {
                 // 安装项目依赖

+ 4 - 4
src/views/evaluate/children/change/manage/addExam.vue

@@ -460,16 +460,16 @@ const idList = ref([]);
                   v-if="quarterValue"
                   class="flex justify-center align-center mt-5 mb-5"
                 >
-                  <el-dropdown-item @click="monthOne('一季度')">
+                  <el-dropdown-item @click="monthOne('一季度')">
                     一季度
                   </el-dropdown-item>
-                  <el-dropdown-item @click="monthOne('二季度')">
+                  <el-dropdown-item @click="monthOne('二季度')">
                     二季度
                   </el-dropdown-item>
-                  <el-dropdown-item @click="monthOne('三季度')">
+                  <el-dropdown-item @click="monthOne('三季度')">
                     三季度
                   </el-dropdown-item>
-                  <el-dropdown-item @click="monthOne('四季度')">
+                  <el-dropdown-item @click="monthOne('四季度')">
                     四季度
                   </el-dropdown-item>
                 </div>

+ 1 - 1
src/views/evaluate/children/change/mould/manageObject.vue

@@ -152,7 +152,7 @@ onMounted(async () => {
   await getAssessmentQuotaDetailsApi();
   await getTemplateInfoListApi();
   await getAssessmentObjectDetailsApi();
-  await alterFinishValueApi();
+  // await alterFinishValueApi();
 });
 const treeDeptList = ref([]);
 const assessmentTypeApi = async value => {

+ 1 - 0
src/views/indexData/components/addDialog.vue

@@ -135,6 +135,7 @@ const addSave = async () => {
       saveLoading.value = true;
       if (form.specificTime) {
         form.specificTime = dayjs(form.specificTime).format("YYYY-MM-DD");
+        form.source_time = dayjs(form.specificTime).valueOf();
       }
       const { code, msg } = await addListApi(form);
       saveLoading.value = false;

+ 1 - 1
src/views/indexData/components/indexImport.vue

@@ -64,7 +64,7 @@ const handleUploadChange = async (file: File) => {
         </el-button>
       </div>
       <div class="w-full mt-4 bg p-3">
-        <h5>2.上传完善后的模板1</h5>
+        <h5>2.上传完善后的模板</h5>
         <p class="text-xs mt-2 text mb-2">
           更新信息的模板中,如有空的数据列,则相应字段信息会被清空,请谨慎填写
         </p>