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

Jenkinsfile

@@ -2,6 +2,12 @@ pipeline {
     agent any
 
     stages {
+          stage('whoami') {
+                steps {
+                    // 从版本控制系统中检出代码
+                   sh 'whoami'
+                }
+            }
         stage('Checkout') {
             steps {
                 // 从版本控制系统中检出代码

src/components/formula/manyFormula.vue

@@ -487,6 +487,7 @@ const countComputed = async () => {
                 ref="jishuanqiRef"
                 :index="index"
                 :outerConditionValue="item.innerScore"
+                :testString="index + 1"
                 class="ml-2 mr-6"
                 style="width: 100px"
                 @handClick="countNoConditionFormulaInnerScore"

src/views/evaluate/children/change/components/editMould.vue

@@ -297,6 +297,7 @@ const postUpdateApi = async () => {
     for (const item1 of item) {
       if (item1.id) {
         item1.indLimitScore = oldIndexList.indLimitScore[index];
+        item1.indLimitScore = Number(item1.indLimitScore);
         const { code } = await postUpdate(item1);
         codeList.push(item1.id);
         if (code === 200) {

src/views/evaluate/children/change/components/jishuanqi.vue

@@ -208,12 +208,19 @@ const $props = defineProps({
   },
   outerConditionValue: {
     type: String
+  },
+  testString: {
+    type: [String, Number, Boolean, Array, Object, Function],
+    default: ""
   }
 });
+
 onMounted(() => {
-  if ($props.outerConditionValue) {
-    params.formula.noConditionFormula = $props.outerConditionValue;
-  }
+  setTimeout(() => {
+    if ($props.outerConditionValue) {
+      params.formula.noConditionFormula = $props.outerConditionValue;
+    }
+  }, 200);
 });
 const bgColor = ref(null);
 const rolesList = reactive({

src/views/evaluate/children/change/manage/addExam.vue

@@ -164,6 +164,7 @@ const quarterValue = ref(true);
 const format = ref<any>("YYYY-MM");
 const pickerType = ref<any>("month");
 const handleRegionChange = (value: any) => {
+  console.log("value", value);
   timeType.value = value;
   console.log("timeType.value", timeType.value);
   switch (value) {
@@ -196,6 +197,11 @@ const handleRegionChange = (value: any) => {
       break;
   }
 };
+// 关闭弹框-考核
+const handleCloseKH = () => {
+  console.log("关闭弹框", "月度");
+  handleRegionChange("月度");
+};
 const yearTime = ref<any>(dayjs(new Date()).format("YYYY"));
 const decreaseYear = () => {
   yearTime.value = dayjs().year(yearTime.value).subtract(1, "year").year(); // 减一年
@@ -393,7 +399,12 @@ const idList = ref([]);
 
 <template>
   <div>
-    <el-dialog v-model="dialogVisibleAdd" :title="titleHeader" width="500">
+    <el-dialog
+      v-model="dialogVisibleAdd"
+      :title="titleHeader"
+      width="500"
+      @close="handleCloseKH"
+    >
       <el-form
         ref="formRef"
         :model="form"

src/views/evaluate/children/change/mould/manageObject.vue

@@ -539,7 +539,7 @@ const editVxe = reactive({
   upperValue: null,
   agupperValue: null,
   assessmentId: null,
-  remark: null
+  indicRemark: null
 });
 // 编辑前面
 const editOpenEvent = data => {
@@ -562,7 +562,7 @@ const hangdleOpenClick = row => {
     id: null,
     dimId: null,
     assessmentId: null,
-    remark: null
+    indicRemark: null
   });
   console.log("hangdleOpenClick", row);
   editVxe.finalValue = row?.finalValue;
@@ -595,7 +595,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.targetValue = null;
           editVxe.agupperValue = null;
-          editVxe.remark = null;
+          editVxe.indicRemark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
           // }
         }
@@ -614,7 +614,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.targetValue = null;
           editVxe.agupperValue = null;
-          editVxe.remark = null;
+          editVxe.indicRemark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
         // }
@@ -635,7 +635,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.targetValue = null;
           editVxe.agupperValue = null;
-          editVxe.remark = null;
+          editVxe.indicRemark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
         // }
@@ -654,7 +654,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.targetValue = null;
           editVxe.agupperValue = null;
-          editVxe.remark = null;
+          editVxe.indicRemark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
         // }
@@ -672,7 +672,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.targetValue = null;
           editVxe.agupperValue = null;
-          editVxe.remark = null;
+          editVxe.indicRemark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
       }
@@ -689,7 +689,7 @@ const editClosedEvent = row => {
           editVxe.upperValue = null;
           editVxe.agupperValue = null;
           editVxe.targetValue = null;
-          editVxe.remark = null;
+          editVxe.indicRemark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
       }
@@ -706,7 +706,7 @@ const editClosedEvent = row => {
           editVxe.decValue = null;
           editVxe.agupperValue = null;
           editVxe.targetValue = null;
-          editVxe.remark = null;
+          editVxe.indicRemark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
       }
@@ -725,7 +725,7 @@ const editClosedEvent = row => {
           editVxe.decValue = null;
           editVxe.upperValue = null;
           editVxe.targetValue = null;
-          editVxe.remark = null;
+          editVxe.indicRemark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
       }
@@ -744,15 +744,17 @@ const editClosedEvent = row => {
           editVxe.addValue = null;
           editVxe.decValue = null;
           editVxe.upperValue = null;
-          editVxe.remark = null;
+          editVxe.indicRemark = null;
           updateAssessmentQuotaDetailsApi(editVxe);
         }
       }
     }
     if (row.column.title == "备注") {
-      if (row.row?.remark) {
-        if (editVxe.remark != row.row?.remark) {
-          editVxe.remark = convertToNumberIfPercentage(row.row?.remark);
+      if (row.row?.indicRemark) {
+        if (editVxe.indicRemark != row.row?.indicRemark) {
+          editVxe.indicRemark = convertToNumberIfPercentage(
+            row.row?.indicRemark
+          );
           editVxe.startValue = null;
           editVxe.agupperValue = null;
           editVxe.score = null;
@@ -959,7 +961,9 @@ const setTableHeaderApi = async () => {
       ? showColEvent("agupperValue")
       : hideColEvent("agupperValue");
     // 备注
-    aa.showRemark == 1 ? showColEvent("remark") : hideColEvent("remark");
+    aa.showRemark == 1
+      ? showColEvent("indicRemark")
+      : hideColEvent("indicRemark");
     Object.assign(showAssessmentHeader, aa);
     ElMessage.success("表头设置成功");
   } else {
@@ -1006,7 +1010,9 @@ const getAssessmentDetailsApi = async () => {
       ? showColEvent("agupperValue")
       : hideColEvent("agupperValue");
     // 备注
-    aa.showRemark == 1 ? showColEvent("remark") : hideColEvent("remark");
+    aa.showRemark == 1
+      ? showColEvent("indicRemark")
+      : hideColEvent("indicRemark");
     Object.assign(showAssessmentHeader, aa);
   }
 };
@@ -1682,7 +1688,7 @@ const selectAllChangeEvent = row => {
             </template>
           </vxe-column>
           <vxe-column
-            field="remark"
+            field="indicRemark"
             fixed
             title="备注"
             :edit-render="{
@@ -1692,7 +1698,7 @@ const selectAllChangeEvent = row => {
           >
             <template #default="{ row }">
               <div @click="hangdleOpenClick(row)">
-                {{ row.remark }}
+                {{ row.indicRemark }}
               </div>
             </template>
           </vxe-column>
@@ -1794,12 +1800,12 @@ const selectAllChangeEvent = row => {
                         <div class="w-full flex justify-evenly items-center">
                           <div class="w-24">
                             <el-text type="info" size="small">备注</el-text>
-                            <el-switch
-                              v-model="remarkValueValue"
-                              size="small"
-                              class="ml-2"
-                            />
                           </div>
+                          <el-switch
+                            v-model="remarkValueValue"
+                            size="small"
+                            class="ml-2"
+                          />
                         </div>
                       </div>
                     </div>

src/views/indexData/components/addDialog.vue

@@ -135,7 +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();
+        form.sourceTime = dayjs(form.specificTime).valueOf();
       }
       const { code, msg } = await addListApi(form);
       saveLoading.value = false;