Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/components/AutoSelect/src/AutoSelect.vue

@@ -28,6 +28,7 @@ const props = defineProps({
 interface ListItem {
   value: string
   label: string
+  checked: boolean
 }
 
 const list = ref<ListItem[]>([])
@@ -66,7 +67,7 @@ const remoteMethod = (query: string) => {
           loading.value = false
           if (res.code == 200) {
             list.value = res.data.map((item: any) => {
-              return { value: item, label: item }
+              return { value: item, label: item, checked: value.value?.includes(item) }
             })
             options.value = list.value.filter((item) => {
               return item.label.toLowerCase().includes(query.toLowerCase())
@@ -112,8 +113,9 @@ const removeClass = () => {
       :loading="loading"
     >
       <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-        <el-checkbox :checked="value?.includes(item.value)"></el-checkbox>
-        <div class="label">{{ item.value }}</div>
+        <el-checkbox :checked="item.checked">
+          <span class="label" @click="item.checked = !item.checked">{{ item.value }}</span>
+        </el-checkbox>
       </el-option>
     </el-select>
   </div>

src/components/selectAutoSelect/src/selectAutoSelect.vue

@@ -24,6 +24,7 @@ interface Props {
 interface optionsItem {
   value: string
   label: string
+  checked: boolean
 }
 
 const list = ref<ListItem[]>([])
@@ -92,9 +93,10 @@ const remoteMethod = (query: string) => {
         })
         .then((res: any) => {
           if (res.code == 200) {
+            console.log(testAuto.value)
             loading.value = false
             list.value = res.data.map((item: any) => {
-              return { value: item, label: item }
+              return { value: item, label: item, checked: testAuto.value?.includes(item) }
             })
             options.value = list.value.filter((item) => {
               return item.label.toLowerCase().includes(query.toLowerCase())
@@ -119,7 +121,9 @@ const changeSelect = (val: any) => {
 const emit = defineEmits(['changeAutoSelectAddType', 'delSelect', 'changeAutoSelect'])
 let AutoSelectObj: any = {}
 let AutoSelectObj2: any = {}
+const testAuto = ref()
 const changeAutoSelect = (val: any, value: any) => {
+  testAuto.value = value
   AutoSelectObj[val] = value.join()
   AutoSelectObj2[val] = value
   if (value.length) {
@@ -235,8 +239,9 @@ const typeSelectClick = (index: any, val: any) => {
           :label="item.label"
           :value="item.value"
         >
-          <el-checkbox :checked="AddType[index].partyname?.includes(item.value)"></el-checkbox>
-          <div class="label">{{ item.value }}</div>
+          <el-checkbox :checked="item.checked">
+            <span class="label" @click="item.checked = !item.checked">{{ item.value }}</span>
+          </el-checkbox>
         </el-option>
       </el-select>
       <div