perf(views/stock): 改进日期查询

+ 将入库与物资两个页面的日期输入从input更变为date-picker
+ 移除了饲喂管理页面中的批号查询(无使用必要)

src/views/feed/FormulaManagement/index.vue

@@ -4,9 +4,9 @@
       <el-form-item label="饲养阶段" prop="feedStage">
         <el-input v-model="queryParams.feedStage" placeholder="请输入饲养阶段" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="批号" prop="batchId">
+      <!-- <el-form-item label="批号" prop="batchId">
         <el-input v-model="queryParams.batchId" placeholder="请输入批号" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>

src/views/stock/in/index.vue

@@ -2,7 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="单据日期" prop="docDate">
-        <el-input v-model="queryParams.docDate" placeholder="请输入单据日期" clearable @keyup.enter="handleQuery" />
+        <!-- <el-input v-model="queryParams.docDate" placeholder="请输入单据日期" clearable @keyup.enter="handleQuery" /> -->
+        <el-date-picker clearable v-model="queryParams.docDate" type="date" value-format="YYYY-MM-DD"
+          placeholder="请选择时间" @change="handleQuery">
+        </el-date-picker>
       </el-form-item>
       <el-form-item label="业务类型" prop="businessType">
         <el-input v-model="queryParams.businessType" placeholder="请输入业务类型" clearable @keyup.enter="handleQuery" />
@@ -20,8 +23,9 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5" >
+      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['stock:in:add']" v-show="false">新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['stock:in:add']"
+          v-show="false">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
@@ -119,7 +123,7 @@
 <script setup name="In">
   import { listIn, getIn, delIn, addIn, updateIn } from "@/api/stock/in"
   import { getToken } from "@/utils/auth"
-import { isVisible } from "element-plus/es/utils/index.mjs"
+  import { isVisible } from "element-plus/es/utils/index.mjs"
   const { proxy } = getCurrentInstance()
 
   const inList = ref([])

src/views/stock/management/index.vue

@@ -2,20 +2,13 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="存货" prop="materialName">
-        <el-input
+        <el-input v-model="queryParams.materialName" placeholder="请输入存货" clearable @keyup.enter="handleQuery" />
-          v-model="queryParams.materialName"
-          placeholder="请输入存货"
-          clearable
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="生产日期" prop="productionDate">
-        <el-input
+        <!-- <el-input v-model="queryParams.productionDate" placeholder="请输入生产日期" clearable @keyup.enter="handleQuery" /> -->
-          v-model="queryParams.productionDate"
+        <el-date-picker clearable v-model="queryParams.productionDate" type="date" value-format="YYYY-MM-DD"
-          placeholder="请输入生产日期"
+          placeholder="请输入生产日期" @change="handleQuery">
-          clearable
+        </el-date-picker>
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -25,45 +18,24 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
-          type="primary"
+          v-hasPermi="['stock:management:add']">新增</el-button>
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['stock:management:add']"
-        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          type="success"
+          v-hasPermi="['stock:management:edit']">修改</el-button>
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['stock:management:edit']"
-        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-          type="danger"
+          v-hasPermi="['stock:management:remove']">删除</el-button>
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['stock:management:remove']"
-        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="Download" @click="handleExport"
-          type="warning"
+          v-hasPermi="['stock:management:export']">导出</el-button>
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['stock:management:export']"
-        >导出</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['stock:management:import']">导入</el-button>
+        <el-button type="info" plain icon="Upload" @click="handleImport"
+          v-hasPermi="['stock:management:import']">导入</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -83,19 +55,16 @@
       <el-table-column label="失效预警" align="center" prop="expirationAlarm" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['stock:management:edit']">修改</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['stock:management:remove']">删除</el-button>
+            v-hasPermi="['stock:management:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['stock:management:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      v-show="total>0"
+      @pagination="getList" />
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改饲喂计划对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
@@ -119,18 +88,12 @@
           <el-input v-model="form.currentStock" placeholder="请输入现存量" />
         </el-form-item>
         <el-form-item label="生产日期" prop="productionDate">
-          <el-date-picker clearable
+          <el-date-picker clearable v-model="form.productionDate" type="date" value-format="YYYY-MM-DD"
-            v-model="form.productionDate"
-            type="date"
-            value-format="YYYY-MM-DD"
             placeholder="请选择生产日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="失效日期" prop="expirationDate">
-          <el-date-picker clearable
+          <el-date-picker clearable v-model="form.expirationDate" type="date" value-format="YYYY-MM-DD"
-            v-model="form.expirationDate"
-            type="date"
-            value-format="YYYY-MM-DD"
             placeholder="请选择失效日期">
           </el-date-picker>
         </el-form-item>
@@ -169,21 +132,21 @@
 </template>
 
 <script setup name="Management">
-import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
+  import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
-import { getToken } from "@/utils/auth"
+  import { getToken } from "@/utils/auth"
-const { proxy } = getCurrentInstance()
+  const { proxy } = getCurrentInstance()
 
-const managementList = ref([])
+  const managementList = ref([])
-const open = ref(false)
+  const open = ref(false)
-const loading = ref(true)
+  const loading = ref(true)
-const showSearch = ref(true)
+  const showSearch = ref(true)
-const ids = ref([])
+  const ids = ref([])
-const single = ref(true)
+  const single = ref(true)
-const multiple = ref(true)
+  const multiple = ref(true)
-const total = ref(0)
+  const total = ref(0)
-const title = ref("")
+  const title = ref("")
 
-const data = reactive({
+  const data = reactive({
     form: {},
     queryParams: {
       pageNum: 1,
@@ -199,7 +162,7 @@ const data = reactive({
         { required: true, message: "存货不能为空", trigger: "blur" }
       ],
     }
-})
+  })
 
   /*** 用户导入参数 */
   const upload = reactive({
@@ -228,38 +191,38 @@ const data = reactive({
   }
 
   /**文件上传中处理 */
-const handleFileUploadProgress = (event, file, fileList) => {
+  const handleFileUploadProgress = (event, file, fileList) => {
     upload.isUploading = true
-}
+  }
 
-/** 文件上传成功处理 */
+  /** 文件上传成功处理 */
-const handleFileSuccess = (response, file, fileList) => {
+  const handleFileSuccess = (response, file, fileList) => {
     upload.open = false
     upload.isUploading = false
     proxy.$refs["uploadRef"].handleRemove(file)
     proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
     getList()
-}
+  }
-const { queryParams, form, rules } = toRefs(data)
+  const { queryParams, form, rules } = toRefs(data)
 
-/** 查询物资管理列表 */
+  /** 查询物资管理列表 */
-function getList() {
+  function getList() {
     loading.value = true
     listManagement(queryParams.value).then(response => {
       managementList.value = response.rows
       total.value = response.total
       loading.value = false
     })
-}
+  }
 
-// 取消按钮
+  // 取消按钮
-function cancel() {
+  function cancel() {
     open.value = false
     reset()
-}
+  }
 
-// 表单重置
+  // 表单重置
-function reset() {
+  function reset() {
     form.value = {
       materialManagementCode: null,
       materialId: null,
@@ -274,36 +237,36 @@ function reset() {
       expirationAlarm: null
     }
     proxy.resetForm("managementRef")
-}
+  }
 
-/** 搜索按钮操作 */
+  /** 搜索按钮操作 */
-function handleQuery() {
+  function handleQuery() {
     queryParams.value.pageNum = 1
     getList()
-}
+  }
 
-/** 重置按钮操作 */
+  /** 重置按钮操作 */
-function resetQuery() {
+  function resetQuery() {
     proxy.resetForm("queryRef")
     handleQuery()
-}
+  }
 
-// 多选框选中数据
+  // 多选框选中数据
-function handleSelectionChange(selection) {
+  function handleSelectionChange(selection) {
     ids.value = selection.map(item => item.materialManagementCode)
     single.value = selection.length != 1
     multiple.value = !selection.length
-}
+  }
 
-/** 新增按钮操作 */
+  /** 新增按钮操作 */
-function handleAdd() {
+  function handleAdd() {
     reset()
     open.value = true
     title.value = "添加物资管理"
-}
+  }
 
-/** 修改按钮操作 */
+  /** 修改按钮操作 */
-function handleUpdate(row) {
+  function handleUpdate(row) {
     reset()
     const _materialManagementCode = row.materialManagementCode || ids.value
     getManagement(_materialManagementCode).then(response => {
@@ -311,10 +274,10 @@ function handleUpdate(row) {
       open.value = true
       title.value = "修改物资管理"
     })
-}
+  }
 
-/** 提交按钮 */
+  /** 提交按钮 */
-function submitForm() {
+  function submitForm() {
     proxy.$refs["managementRef"].validate(valid => {
       if (valid) {
         if (form.value.materialManagementCode != null) {
@@ -332,25 +295,25 @@ function submitForm() {
         }
       }
     })
-}
+  }
 
-/** 删除按钮操作 */
+  /** 删除按钮操作 */
-function handleDelete(row) {
+  function handleDelete(row) {
     const _materialManagementCodes = row.materialManagementCode || ids.value
-  proxy.$modal.confirm('是否确认删除物资管理编号为"' + _materialManagementCodes + '"的数据项？').then(function() {
+    proxy.$modal.confirm('是否确认删除物资管理编号为"' + _materialManagementCodes + '"的数据项？').then(function () {
       return delManagement(_materialManagementCodes)
     }).then(() => {
       getList()
       proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+    }).catch(() => { })
-}
+  }
 
-/** 导出按钮操作 */
+  /** 导出按钮操作 */
-function handleExport() {
+  function handleExport() {
     proxy.download('stock/management/export', {
       ...queryParams.value
     }, `management_${new Date().getTime()}.xlsx`)
-}
+  }
 
-getList()
+  getList()
 </script>