Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/views/base/information/index.vue

@@ -7,7 +7,7 @@
       :data="data"
       :option="option"
       v-model:page="page"
-      @row-save="createRow"
+      @row-save="addRow"
       @row-update="updateRow"
       @row-del="deleteRow"
       @search-change="searchChange"
@@ -94,7 +94,13 @@ const changeItem = (row) => {
     dataList();
   });
 };
-
+const form2 = ref(null);
+const addRow = (form2, done) => {
+  createRow(form, done, done);
+  pdfUrlList.value = [];
+  srcList.value = [];
+  fileNameList.value = [];
+};
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({

src/views/base/materials/components/drawing-page.vue

@@ -22,7 +22,7 @@
       :data="data"
       :option="option"
       v-model:page="page"
-      @row-save="createRow"
+      @row-save="addRow"
       @row-update="updateRow"
       @row-del="deleteRow"
       @search-change="searchChange"
@@ -122,6 +122,12 @@ const getVersionDrawing = () => {
     dataList();
   }
 };
+const addRow = (form2, done) => {
+  createRow(form, done, done);
+  pdfUrlList.value = [];
+  srcList.value = [];
+  fileNameList.value = [];
+};
 function rowSave(form, done) {
   form.associationCode = props.materialCode;
   form.associationName = props.materialName;

src/views/base/skill/components/edit-skill.vue

@@ -107,7 +107,7 @@ const addSkill = () => {
 };
 const employeeSkill = ref({});
 const onHandle = () => {
-  console.info(form.value);
+  console.info("dddd", data);
   if (
     form.value.userId === null ||
     form.value.userId === undefined ||
@@ -230,7 +230,7 @@ option2.value = {
         ctableRef.value.startSelect();
       },
     },
-   /* {
+    /* {
       label: "所属机构",
       prop: "institution",
       width: 130,
@@ -315,6 +315,22 @@ option.value = Object.assign(option.value, {
         label: "skillDictLabel", // 下拉菜单显示的字段
         value: "skillDictValue", // 下拉菜单值的字段
       },
+      change: (row) => {
+        console.log(row);
+        data.value.forEach((item, index) => {
+          console.log("aaa", index);
+          console.log("bbbb", item);
+          if (item.skillDictValue == row.value && index != row.index) {
+            row.row.skillDictValue = "";
+            row.value = "";
+            console.log("ccc", row);
+            ElMessage({
+              message: item.$skillDictValue + " 打分项重复",
+              type: "error",
+            });
+          }
+        });
+      },
     },
     {
       label: "分数",

src/views/base/skill/components/user-skill.vue

@@ -104,6 +104,16 @@ onMounted(() => {
   //dataNoPageList();
 });
 const skillChange = (row) => {
+  data.value.forEach((item, index) => {
+    if (item.skillDictValue == row.skillValue) {
+      row.skillValue = "";
+      ElMessage({
+        message: item.$skillDictValue + " 打分项重复",
+        type: "error",
+      });
+      return false;
+    }
+  });
   if (
     row.skillValue !== undefined &&
     row.skillValue !== null &&