Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/inventory/check/Add.vue

@@ -2,9 +2,23 @@
   <Mask :width="1200" :height="540" :is-show="isShow"  @close="exit" title="新增盘点" :show-footer="true">
     <div class="body_wrapper">
       <div class="top" style="width: 100%">
-        <el-form :model="form" style="width: 100%" label-width="auto" class="demo-ruleForm" label-position="top">
-          <el-form-item label="备注" style="width: 100%;margin-right: 0">
-            <el-input v-model="form.remark" placeholder="请输入单据编号"></el-input>
+        <el-form :model="form" :inline=true style="width: 100%" label-width="auto" class="demo-ruleForm" label-position="top">
+          <el-form-item label="盘点人">
+            <el-select
+                v-model="form.checkUserId"
+                placeholder="选择盘点人"
+                style="width: 240px"
+            >
+              <el-option
+                  v-for="item in managerUserList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="备注" style="width: 50%;margin-right: 0">
+            <el-input v-model="form.remark"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -302,7 +316,7 @@ let addRow = (goodsId: number) => {
   })
 }
 let save = () => {
-  post("inventory/check/save", {list: list.value, remark: form.value.remark}).then((res: any) => {
+  post("inventory/check/save", {list: list.value, remark: form.value.remark,checkUserId: form.value.checkUserId}).then((res: any) => {
     ElMessage.success('保存成功')
     exit()
   })
@@ -318,8 +332,24 @@ let exit = () => {
 const isShow = ref<any>(false)
 const init = () => {
   isShow.value = true
+  getManagerUserList()
+  getUserInfo()
 }
 defineExpose({init})
+
+
+const managerUserList: any = ref([])
+const getManagerUserList = () => {
+  post("manager/user/list", {}).then((res: any) => {
+    managerUserList.value = res
+  })
+}
+const getUserInfo = () => {
+  post("manager/user/verify", null).then((res: any) => {
+    form.value.useUserId = res.id;
+  })
+}
+
 </script>
 <style scoped lang="scss">
 .body_wrapper {

src/views/inventory/apply.vue

@@ -4,10 +4,15 @@
       <div class="search">
         <div class="left">
           <el-form :inline="true" :model="searchModel">
-            <el-form-item >
-              <el-input v-model="searchModel.code" placeholder="请输入单号" style="width: 180px;height: 42px" :prefix-icon="Search"></el-input>
-            </el-form-item>
             <el-form-item>
+              <el-date-picker
+                  v-model="selectedDate"
+                  type="daterange"
+                  range-separator="-"
+                  @change="handleDateChange"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+              />
             </el-form-item>
           </el-form>
         </div>
@@ -62,6 +67,7 @@ import {nextTick, onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import DetailApply from "@/components/inventory/apply/DetailApply.vue";
 import {Refresh,Search} from "@element-plus/icons-vue";
+import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
 
 const is_add = ref(false)
 const is_detail = ref(false)
@@ -70,6 +76,7 @@ const getList = () => {
   const query = {
     pageNum: page.value,
     pageSize: 20,
+    ...searchModel.value,
   }
   post("inventory/apply/list", {query: query}).then((res: any) => {
     dataList.value = res.list
@@ -111,23 +118,26 @@ const clickApply = () => {
     addApplyRef.value?.init()
   })
 }
-
+const selectedDate = ref<any>([])
+const handleDateChange = (date: any[]) => {
+  selectedDate.value = formatDateArray(date)
+  if (selectedDate.value[0] == selectedDate.value[1]) {
+    selectedDate.value[1] = getEndOfDay(selectedDate.value[1]); // 输出今天 23:59
+  }
+  searchModel.value.beginTime = selectedDate.value[0]
+  searchModel.value.endTime = selectedDate.value[1]
+}
 
 const searchModel=  ref({
-  code: "",
-  supplierIds: [],
-  managerUserIds: [],
-  startDate: "",
-  endDate: "",
+  beginTime: null,
+  endTime: null,
 })
 const resetSearch=  () => {
   searchModel.value = {
-    code: "",
-    supplierIds: [],
-    managerUserIds: [],
-    startDate: "",
-    endDate: "",
+    beginTime: null,
+    endTime: null,
   }
+  getList()
 }
 </script>
 

src/views/inventory/check.vue

@@ -5,10 +5,14 @@
         <div class="left">
           <el-form :inline="true" :model="searchModel">
             <el-form-item>
-              <el-input v-model="searchModel.code" placeholder="请输入单号" style="width: 180px;height: 42px"
-                        :prefix-icon="Search"></el-input>
-            </el-form-item>
-            <el-form-item>
+              <el-date-picker
+                  v-model="selectedDate"
+                  type="daterange"
+                  range-separator="-"
+                  @change="handleDateChange"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+              />
             </el-form-item>
           </el-form>
         </div>
@@ -65,12 +69,14 @@ import Mask from "@/components/common/Mask.vue";
 import Add from "@/components/inventory/check/Add.vue";
 import Detail from "@/components/inventory/check/Detail.vue";
 import {Plus, Refresh, Search} from "@element-plus/icons-vue";
+import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
 
 const tableData = ref([])
 const getCheck = () => {
   const query = {
     pageNum: page.value,
-    pageSize: 20
+    pageSize: 20,
+    ...searchModel.value,
   }
   post("inventory/check/list", {query: query}).then(
       (res: any) => {
@@ -112,12 +118,24 @@ const formatDate = (isoStr: any) => {
   const date = new Date(isoStr);
   return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
 }
+const selectedDate = ref<any>([])
+const handleDateChange = (date: any[]) => {
+  selectedDate.value = formatDateArray(date)
+  if (selectedDate.value[0] == selectedDate.value[1]) {
+    selectedDate.value[1] = getEndOfDay(selectedDate.value[1]); // 输出今天 23:59
+  }
+  searchModel.value.beginTime = selectedDate.value[0]
+  searchModel.value.endTime = selectedDate.value[1]
+}
+
 const searchModel = ref({
-  code: ''
+  beginTime: null,
+  endTime: null,
 })
 const resetSearch = () => {
   searchModel.value = {
-    code: ''
+    beginTime: null,
+    endTime: null,
   }
 }
 </script>