From 3a5e80d8f3b890edd46381fa9b6218f4cc7e47cb Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期三, 13 八月 2025 17:06:54 +0800
Subject: [PATCH] feat(盘点模块): 完善盘点功能并优化UI
---
src/views/cms/modules/ToolStocktakingModal.vue | 1
src/views/cms/CuttingInventoryList.vue | 2
src/views/cms/CuttingToolList.vue | 5 +-
src/views/cms/modules/ToolStocktakingForm.vue | 15 +++++--
src/views/cms/CuttingInboundList.vue | 2
src/views/cms/ToolStocktakingList.vue | 60 +++++++++++++++++++++++++++--
6 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/src/views/cms/CuttingInboundList.vue b/src/views/cms/CuttingInboundList.vue
index 0f1df64..0e0876e 100644
--- a/src/views/cms/CuttingInboundList.vue
+++ b/src/views/cms/CuttingInboundList.vue
@@ -1,7 +1,7 @@
<template>
<a-card :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
- <div class="table-page-search-wrapper">
+ <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
diff --git a/src/views/cms/CuttingInventoryList.vue b/src/views/cms/CuttingInventoryList.vue
index 0e58ea9..65b96c9 100644
--- a/src/views/cms/CuttingInventoryList.vue
+++ b/src/views/cms/CuttingInventoryList.vue
@@ -1,7 +1,7 @@
<template>
<a-card :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
- <div class="table-page-search-wrapper">
+ <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
diff --git a/src/views/cms/CuttingToolList.vue b/src/views/cms/CuttingToolList.vue
index f1fdce4..1746e41 100644
--- a/src/views/cms/CuttingToolList.vue
+++ b/src/views/cms/CuttingToolList.vue
@@ -52,10 +52,11 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <!-- <a-button type="primary" icon="download" @click="handleExportXls('鍒�鍏蜂俊鎭�')">瀵煎嚭</a-button>
+ <!-- 瀵煎叆銆佸鍑哄姛鑳� -->
+ <a-button type="primary" icon="download" @click="handleExportXls('鍒�鍏蜂俊鎭�')">瀵煎嚭</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload> -->
+ </a-upload>
</div>
<!-- table鍖哄煙-begin -->
diff --git a/src/views/cms/ToolStocktakingList.vue b/src/views/cms/ToolStocktakingList.vue
index 67ac216..db72ad1 100644
--- a/src/views/cms/ToolStocktakingList.vue
+++ b/src/views/cms/ToolStocktakingList.vue
@@ -4,6 +4,51 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
+ <a-col :md="6" :sm="8">
+ <a-form-item label="鐩樼偣鍗曞彿">
+ <a-input placeholder="璇疯緭鍏ョ洏鐐瑰崟鍙�" v-model="queryParam.orderCode" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="6" :sm="8">
+ <a-form-item label="鐩樼偣鐘舵��">
+ <a-input placeholder="璇疯緭鍏ョ洏鐐圭姸鎬�" v-model="queryParam.orderStatus" />
+ </a-form-item>
+ </a-col>
+ <!-- <a-col :md="6" :sm="8">
+ <a-form-item label="鐩樼偣浜�">
+ <a-input placeholder="璇烽�夋嫨鐩樼偣浜�" v-model="queryParam.operator" />
+ </a-form-item>
+ </a-col> -->
+ <a-col :md="6" :sm="8">
+ <a-form-item label="鐩樼偣浜�">
+ <j-search-select-tag
+ placeholder="璇烽�夋嫨鐩樼偣浜�"
+ v-model="queryParam.operator"
+ dict="sys_user,realname,id,del_flag=0"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <span
+ style="float: left;overflow: hidden;"
+ class="table-page-search-submitButtons"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ type="primary"
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
+ </span>
+ </a-col>
</a-row>
</a-form>
</div>
@@ -121,11 +166,11 @@
return parseInt(index)+1;
}
},
- {
- title:'鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
+ // {
+ // title:'鍒犻櫎鏍囪',
+ // align:"center",
+ // dataIndex: 'delFlag'
+ // },
{
title:'鐩樼偣鍗曞彿',
align:"center",
@@ -186,6 +231,11 @@
methods: {
initDictConfig(){
},
+ handleAdd(){
+ this.$refs.modalForm.add()
+ this.$refs.modalForm.title = '鏂板'
+ this.$refs.modalForm.disableSubmit = false
+ },
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'int',value:'delFlag',text:'鍒犻櫎鏍囪'})
diff --git a/src/views/cms/modules/ToolStocktakingForm.vue b/src/views/cms/modules/ToolStocktakingForm.vue
index af27038..424661f 100644
--- a/src/views/cms/modules/ToolStocktakingForm.vue
+++ b/src/views/cms/modules/ToolStocktakingForm.vue
@@ -3,11 +3,12 @@
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
- <a-col :span="24">
+ <!-- 娉ㄩ噴鐨勬槸del_flag榛樿鏄�0涓嶉渶瑕佽緭鍏� -->
+ <!-- <a-col :span="24">
<a-form-model-item label="鍒犻櫎鏍囪" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
<a-input-number v-model="model.delFlag" placeholder="璇疯緭鍏ュ垹闄ゆ爣璁�" style="width: 100%" />
</a-form-model-item>
- </a-col>
+ </a-col> -->
<a-col :span="24">
<a-form-model-item label="鐩樼偣鍗曞彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderCode">
<a-input v-model="model.orderCode" placeholder="璇疯緭鍏ョ洏鐐瑰崟鍙�" ></a-input>
@@ -20,7 +21,12 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="鐩樼偣浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="operator">
- <a-input v-model="model.operator" placeholder="璇疯緭鍏ョ洏鐐逛汉" ></a-input>
+ <!-- <a-input v-model="model.operator" placeholder="璇疯緭鍏ョ洏鐐逛汉" ></a-input> -->
+ <j-search-select-tag
+ placeholder="璇烽�夋嫨鐩樼偣浜�"
+ v-model="model.operator"
+ dict="sys_user,realname,id,del_flag=0"
+ />
</a-form-model-item>
</a-col>
<a-col :span="24">
@@ -43,10 +49,11 @@
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
-
+ import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
export default {
name: 'ToolStocktakingForm',
components: {
+ JSearchSelectTag,
},
props: {
//琛ㄥ崟绂佺敤
diff --git a/src/views/cms/modules/ToolStocktakingModal.vue b/src/views/cms/modules/ToolStocktakingModal.vue
index 2ea7e1a..48b3e4e 100644
--- a/src/views/cms/modules/ToolStocktakingModal.vue
+++ b/src/views/cms/modules/ToolStocktakingModal.vue
@@ -47,6 +47,7 @@
},
handleOk () {
this.$refs.realForm.submitForm();
+ this.loadData()
},
submitCallback(){
this.$emit('ok');
--
Gitblit v1.9.3