Explorar el Código

bug 1125下午

dengrui hace 6 meses
padre
commit
f8c9448c4d

+ 5 - 1
src/views/base/apply/apply.vue

@@ -80,7 +80,11 @@
                   :rules="[{ required: true }]"
                   prop="userName"
                 >
-                  <el-select v-model="item.userName" :disabled="showStatus">
+                  <el-select
+                    v-model="item.userName"
+                    filterable
+                    :disabled="showStatus"
+                  >
                     <el-option
                       v-for="items in userList"
                       :key="items.userName"

+ 16 - 0
src/views/base/apply/index.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="mainContentBox">
+    <el-tabs v-model="activeName" type="card">
+      <el-tab-pane label="未完成" name="no" />
+      <el-tab-pane label="已完成" name="ok" />
+    </el-tabs>
     <avue-crud
       ref="crudRef"
       v-model:search="search"
@@ -53,6 +57,7 @@ import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import Apply from "./apply.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+const activeName = ref("no");
 // 数据字典相关
 const { dicts } = useDictionaryStore();
 const getList = () => {
@@ -206,6 +211,17 @@ option.value = Object.assign(option.value, {
     },
   ],
 });
+watch(
+  () => activeName.value,
+  (val) => {
+    if (val == "ok") {
+      search.value.isComplete = "1";
+    } else {
+      search.value.isComplete = "0";
+    }
+    dataList();
+  }
+);
 onMounted(() => {
   search.value.isExamine = "0";
   dataList();

+ 5 - 1
src/views/base/check/check.vue

@@ -74,7 +74,11 @@
                   :label="item.positionName + ':'"
                   prop="userName"
                 >
-                  <el-select v-model="item.userName" :disabled="true">
+                  <el-select
+                    v-model="item.userName"
+                    filterable
+                    :disabled="true"
+                  >
                     <el-option
                       v-for="items in userList"
                       :key="items.userName"

+ 2 - 0
src/views/storage/semi/components/details.vue

@@ -34,6 +34,7 @@
         :rules="[
           {
             required: true,
+            message: '请选择流转卡号',
             trigger: 'blur',
           },
         ]"
@@ -53,6 +54,7 @@
         :rules="[
           {
             required: true,
+            message: '请选择出库工单号',
             trigger: 'blur',
           },
         ]"