Parcourir la source

Merge branch 'dev_v1.0.0' of http://git.qmth.com.cn/sop/web into dev_v1.0.0

zhangjie il y a 1 an
Parent
commit
3af24bbf03

+ 1 - 1
src/views/my-workbenches/workbenches/message-reminder/index.vue

@@ -8,7 +8,7 @@
           'page-tab',
           {
             'is-active': params.status === item.value,
-            'is-mark': item.value === 'false' && workStore.counts.notice,
+            'is-mark': item.value === 'false' && workStore.counts.message,
           },
         ]"
         @click="switchTab(item)"

+ 18 - 8
src/views/sop/sop-monitor/violation-registration/index.vue

@@ -8,16 +8,26 @@
         ></select-service-unit>
       </template>
       <template #user="{ item, params }">
-        <select-filter-user
-          v-model="params[item.prop]"
-          clearable
-        ></select-filter-user>
+<!--        <select-filter-user-->
+<!--          v-model="params[item.prop]"-->
+<!--          clearable-->
+<!--        ></select-filter-user>-->
+        <select-url-user
+            v-model="params[item.prop]"
+            url="/api/admin/tb/violation/user/list"
+            clearable
+        ></select-url-user>
       </template>
       <template #creator="{ item, params }">
-        <select-filter-user
-          v-model="params[item.prop]"
-          clearable
-        ></select-filter-user>
+<!--        <select-filter-user-->
+<!--          v-model="params[item.prop]"-->
+<!--          clearable-->
+<!--        ></select-filter-user>-->
+        <select-url-user
+            v-model="params[item.prop]"
+            url="/api/admin/tb/violation/creator/list"
+            clearable
+        ></select-url-user>
       </template>
     </SearchForm>
     <div class="flex-1 page-wrap">