盘点库存 筛选条件控制

盘点库存 筛选条件控制

mes-ui/mes-ui-admin-vue3/src/api/heli/equip/index.ts

@@ -6,7 +6,10 @@ export interface EquipVO {
   mouldTypeId: number
   status: number
 }
-
+// 查询设备信息全页数据
+export const getSimpList = async () => {
+  return await request.get({ url: `/heli/equip/all-simples` })
+}
 // 查询设备信息分页
 export const getEquipPage = async (params) => {
   return await request.get({ url: `/heli/equip/page`, params })

mes-ui/mes-ui-admin-vue3/src/api/heli/mouldtype/index.ts

@@ -6,6 +6,11 @@ export interface MouldTypeVO {
   status: number
 }
 
+// 查询模具类型全页数据
+export const getSimpList = async () => {
+  return await request.get({ url: `/heli/mould-type/all-simples` })
+}
+
 // 查询模具类型分页
 export const getMouldTypePage = async (params) => {
   return await request.get({ url: `/heli/mould-type/page`, params })

mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue

@@ -8,19 +8,10 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="自增字段，唯一" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入自增字段，唯一"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="设备名称 唯一" prop="name">
+      <el-form-item label="设备名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入设备名称 唯一"
+          placeholder="设备名称"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -35,14 +26,10 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="状态,1表示正常，2表示禁用，默认是1" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态,1表示正常，2表示禁用，默认是1"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
+      <el-form-item label="启用状态" prop="pnStatus">
+        <el-select v-model="queryParams.status" placeholder="启用状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_STATUS)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="创建者" prop="creator">
@@ -173,6 +160,7 @@
 import download from '@/utils/download'
 import * as EquipApi from '@/api/heli/equip'
 import EquipForm from './EquipForm.vue'
+import * as MoudleTypeApi from '@api/heli/mouldtype'
 
 defineOptions({ name: 'Equip' })
 
@@ -258,7 +246,8 @@ const handleExport = async () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
-  getList()
+onMounted( async() => {
+  await MoudleTypeApi.getSimpList()
+  await getList()
 })
 </script>

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue

@@ -280,7 +280,7 @@
         存</el-button>
       <el-button @click="handleStatus(2)"  type="primary" v-if="btnSave" size="large">提
         交</el-button>
-      <el-button @click="handleStatus(3)"  type="danger" v-if="btnCancel" size="large">报
+      <el-button @click="handleStatus(3)"  type="danger" v-if="btnCancel" size="large">作
         废</el-button>
     </div>
   </el-card>
@@ -368,7 +368,7 @@ const handleStatus = async (num) => {
     return
   }
   // 提示用户是否保存入库信息
-  await message.confirm('确认'+(num==2?'提交':'报废')+'入库信息?')
+  await message.confirm('确认'+(num==2?'提交':'作废')+'入库信息?')
   formData.value.status = num
   
   //保存表单数据

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue

@@ -283,7 +283,7 @@
         存</el-button>
       <el-button @click="handleStatus(2)"  type="primary" v-if="btnSave" size="large">提
         交</el-button>
-      <el-button @click="handleStatus(3)"  type="danger" v-if="btnCancel" size="large">报
+      <el-button @click="handleStatus(3)"  type="danger" v-if="btnCancel" size="large">作
         废</el-button>
     </div>
   </el-card>
@@ -402,7 +402,7 @@ const handleStatus = async (num) => {
   }
 
   // 提示用户是否保存出库信息
-  await message.confirm('确认'+(num==2?'提交':'报废')+'出库信息?')
+  await message.confirm('确认'+(num==2?'提交':'作废')+'出库信息?')
   //保存表单数据
   await saveFormData()
 

mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue

@@ -92,7 +92,7 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-button class="hl-addbutton" type="primary" size="large" v-bind:disabled="ctrView || ctrSave" @click="openMatForm">新增</el-button>
+                <el-button class="hl-addbutton" type="primary" size="large" v-bind:disabled="ctrView || ctrSave" @click="openMatForm">获取物料</el-button>
               </el-col>
               <el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
                 <el-table :data="formData.matItemDOList" class="hl-table">

mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue

@@ -3,17 +3,17 @@
     <ContentWrap class="borderxx">
       <el-form class="-mb-15px" :model="queryReqVo" :inline="true" label-width="108px">
         <el-form-item label="物料类型：">
-          <el-select v-model="queryReqVo.matType" placeholder="物料类型" clearable class="!w-240px">
+          <el-select v-model="queryReqVo.matType" placeholder="物料类型" clearable class="!w-240px" v-bind:disabled="!chkboxEnable">
             <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label" :label="dict.label" :value="dict.label" />
           </el-select>
         </el-form-item>
         <el-form-item label=" 物料名称/编码：" label-width="150px">
-          <el-input v-model="queryReqVo.matCode" placeholder="物料名称/编码" class="!w-240px" />
+          <el-input v-model="queryReqVo.matCode" placeholder="物料名称/编码" class="!w-240px" v-bind:disabled="!chkboxEnable" />
         </el-form-item>
         <el-form-item>
-          <el-button @click="handleQuery" type="primary">
+          <el-button @click="handleQuery" type="primary" v-bind:disabled="!chkboxEnable">
             <Icon icon="ep:search" class="mr-5px" /> 搜索
-          </el-button><el-button @click="resetQuery">
+          </el-button><el-button @click="resetQuery" v-bind:disabled="!chkboxEnable">
             <Icon icon="ep:refresh" class="mr-5px" /> 重置
           </el-button>
         </el-form-item>
@@ -51,6 +51,7 @@ import * as StorageLogApi from '@/api/heli/storagelog'
 
 //:selectable="row=>row.disabled || chkboxEnable"
 const chkboxEnable = ref(true)
+const queryEnable = ref(true)
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -107,6 +108,7 @@ const open = async (noZero: number, whId?: number, isAll?: number) => {
   list.value = data
   // total.value = data.total
   chkboxEnable.value = isAll === 2 ? false : true
+  //queryEnable.value = isAll === 2?true:false
 
   var iNum = 1
   list.value.forEach((row) => {