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

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

@@ -36,7 +36,7 @@ const formLabelAlign = reactive({
   dimWeight: 0,
   dimWeightBol: false,
   mode: 1,
-  showIndicRemark: 1,
+  showIndicRemark: 0,
   showScoreRule: 1,
   showDatasource: 0,
   showTargetValue: 0,
@@ -79,7 +79,7 @@ const open = (row: any, title: string, order: number) => {
       dimName: "",
       dimWeight: 0,
       mode: 1,
-      showIndicRemark: 1,
+      showIndicRemark: 0,
       showScoreRule: 1,
       showDatasource: 0,
       showTargetValue: 0,
@@ -181,9 +181,9 @@ const showStartValueValue = computed({
   }
 });
 const remarkValueValue = computed({
-  get: () => formLabelAlign.showRemark === 1,
+  get: () => formLabelAlign.showIndicRemark === 1,
   set: value => {
-    formLabelAlign.showRemark = value ? 1 : 0;
+    formLabelAlign.showIndicRemark = value ? 1 : 0;
   }
 });
 // 分割————————————————————————————————————————————
@@ -228,10 +228,9 @@ const handClose = (indName, ind, indId) => {
     formLabelAlign.tableData.push(newIndName);
     indexList.value[ind].splice(indId, 1);
     if (indexList.value[ind].length == 0) {
-      console.log("oldIndexList", oldIndexList.indLimitScore);
-      oldIndexList.indLimitScore[ind] = 1;
+      // oldIndexList.indLimitScore[ind] = 1;
+      oldIndexList.indLimitScore.splice(ind, 1);
       indexList.value.splice(ind, 1);
-      console.log("newold", oldIndexList.indLimitScore);
     }
     if (indexList.value[ind]?.length > 0 && !indexList.value[ind][0].id) {
       indexList.value[ind].splice(0, 1);
@@ -290,30 +289,6 @@ const handChangeIndex = (ind, val) => {
     watchTableData();
   });
 };
-// const postUpdateApi = async () => {
-//   let codeList = [];
-//   let successList = [];
-//   indexList.value.map((item, index) => {
-//     item.map(async (item1, index1, arr1) => {
-//       if (item1.id) {
-//         item1.indLimitScore = oldIndexList.indLimitScore[index];
-//         const { code } = await postUpdate(item1);
-//         codeList.push(item1.id);
-//         if (code == 200) {
-//           successList.push(code);
-//         }
-//       }
-//     });
-//   });
-//   if (successList.length == codeList.length) {
-//     ElMessage({
-//       message: "更新成功",
-//       type: "success"
-//     });
-//     $emit("handClick", formLabelAlign.tpId);
-//     drawer.value = false;
-//   }
-// };
 const postUpdateApi = async () => {
   let codeList = [];
   let successList = [];
@@ -326,7 +301,6 @@ const postUpdateApi = async () => {
         codeList.push(item1.id);
         if (code === 200) {
           successList.push(code);
-          console.log("更新成功codecodecode");
         }
       }
     }

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

@@ -636,12 +636,13 @@ const titleShowClick = () => {
                 title="门槛值"
                 :edit-render="{ name: 'input' }"
               />
-              <vxe-column
-                v-if="item.showRRemark"
+              <!-- 后端字段搞错了，上面指标说明和备注字段估计都要换 -->
+              <!-- <vxe-column
+                v-if="item.showIndicRemark"
                 field="remark"
                 title="备注"
                 :edit-render="{ name: 'input' }"
-              />
+              /> -->
               <vxe-column field="age" fixed="right" title="操作">
                 <template #default="{ row }">
                   <el-icon class="mr-3" @click="settingIndex(row)">