From 1e02cf5dc7b0c31ca6d23bb37fa4ab6ad3993b9d Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 5 Dec 2025 16:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigMaterial/ConfigMaterialInfoList.vue | 106 ++++++------------
 .../BlWarehouseMaterialInfoList.vue           |   2 +-
 .../BlWarehouseMaterialInfoListModal.vue      |   2 +-
 .../NuWarehouseMaterialCrkInfo.data.ts        |  10 +-
 .../NuWarehouseMaterialCrkInfoList.vue        |  28 ++++-
 .../NuWarehouseMaterialCrkInfoListModal.vue   |   2 +-
 .../components/DelWuliaoModal.vue             |   2 +-
 7 files changed, 68 insertions(+), 84 deletions(-)

diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
index 9c2ca81..09d12e3 100644
--- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
+++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
@@ -235,81 +235,11 @@
           </a-menu>
 
 
-
-
-
-
-
-          <!-- <a-tree class="draggable-tree" draggable block-node :tree-data="treeData">
-            <template #title="{ data, title }">
-              <div @mouseenter="data.showContent = true" @mouseleave="data.showContent = false">
-                <span @click="handleSearch(data)">{{ title }}</span>
-                <span v-if="data?.izEnabled == '1'" style="color:red;">(已停用)</span>
-                <span v-show="data.showContent" style="margin-left: 5px;">
-                  <a-dropdown>
-                    <a class="ant-dropdown-link" @click.prevent>
-                      <Icon icon="ant-design:setting-outlined" />
-                    </a>
-                    <template #overlay>
-                      <a-menu>
-                        <a-menu-item v-if="data.levle == '1'">
-                          <Icon icon="ant-design:plus-outlined" class="abuttoncss" />
-                          <a href="javascript:;" class="abuttoncss" @click="handleAddbj(data)">添加本级</a>
-                        </a-menu-item>
-                        <a-menu-item
-                          v-if="(data.levle == '1' || data.levle == '2') && data.tjxj == 0 && data.parentIzEnabled == 0 && data.izEnabled == '0'">
-                          <Icon icon="ant-design:plus-outlined" class="abuttoncss" />
-                          <a href="javascript:;" class="abuttoncss" @click="handleAddxj(data)">添加下级</a>
-                        </a-menu-item>
-                        <a-menu-item
-                          v-if="data?.children?.length == 0 && data.parentIzEnabled == 0 && data.izEnabled == '0'">
-                          <Icon icon="ant-design:plus-outlined" class="abuttoncss" />
-                          <a href="javascript:;" class="abuttoncss" @click="handleAdd(data)">添加物料</a>
-                        </a-menu-item>
-                        <a-menu-item v-if="data.parentIzEnabled == 0 && data.izEnabled == '0'">
-                          <Icon icon="ant-design:edit-outlined" class="abuttoncss" />
-                          <a href="javascript:;" class="abuttoncss" @click="handleFenleiEdit(data)">重命名</a>
-                        </a-menu-item>
-                        <a-menu-item
-                          v-if="(data.izEnabled == '1' && data.parentIzEnabled == 0) || (data.parentIzEnabled == 1 && data.levle == '1')">
-                          <Icon icon="ant-design:check-circle-outlined" class="abuttoncss" />
-                          <a href="javascript:;" class="abuttoncss" @click="handleQyty(data, '0')">启用</a>
-                        </a-menu-item>
-                        <a-menu-item v-if="data.izEnabled == '0'">
-                          <Icon icon="ant-design:stop-outlined" class="abuttoncss" />
-                          <a href="javascript:;" class="abuttoncss" @click="handleQyty(data, '1')">停用</a>
-                        </a-menu-item>
-                        <a-menu-item
-                          v-if="(data.levle == '2' || data.levle == '3') && data.parentIzEnabled == 0 && data.izEnabled == '0'">
-                          <Icon icon="ant-design:copy-outlined" class="abuttoncss" />
-                          <a href="javascript:;" class="abuttoncss" @click="handleQianyi(data)">迁移</a>
-                        </a-menu-item>
-
-                        <a-menu-item
-                          v-if="(data.levle == '2' || data.levle == '3') && data.parentIzEnabled == 1 && data.izEnabled == '1'">
-                          <span disabled>
-                            <Icon icon="ant-design:file-excel-outlined" />
-                            暂无操作
-                          </span>
-                        </a-menu-item>
-                      </a-menu>
-                    </template>
-                  </a-dropdown>
-                </span>
-              </div>
-            </template>
-          </a-tree> -->
         </div>
       </div>
       <div class="container-height" style="width:calc(100% - 300px);float: left;">
         <!--引用表格-->
         <BasicTable @register="registerTable" @headerSearch="handleHeaderSearch">
-          <!--插槽:table标题-->
-          <!-- <template #tableTitle>
-              <a-button type="primary" v-auth="'configMaterialInfo:config_material_info:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-              <a-button  type="primary" v-auth="'configMaterialInfo:config_material_info:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-              <j-upload-button  type="primary" v-auth="'configMaterialInfo:config_material_info:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-            </template> -->
           <!--操作栏-->
           <template #action="{ record }">
             <TableAction :actions="getTableAction(record)" />
@@ -362,8 +292,10 @@ import QianyiModal from '/@/views/invoicing/ConfigMaterial/components/QianyiModa
 import WlqianyiModal from '/@/views/invoicing/ConfigMaterial/components/WlqianyiModal.vue';
 import ConfigMaterialInfoListMenu from './ConfigMaterialInfoListMenu.vue';
 import { useResponsive } from '/@/hooks/web/useResponsive';
+import { useMessage } from "/@/hooks/web/useMessage";
 
 const { screenEnum, screenWidth } = useResponsive();
+const { createMessage} = useMessage();
 // 计算动态高度
 const scrollY = computed(() => {
   // 大屏幕（≥1600px）使用 71vh，否则使用 66.5vh
@@ -521,7 +453,22 @@ function handleAdd(data) {
 /**
  * 编辑事件
  */
-function handleEdit(record: Recordable) {
+async function handleEdit(record: Recordable) {
+  var sfjx = "0";
+  var izEnabled = record.izEnabled;
+  if("Y"==izEnabled){
+    await defHttp.get({ url: '/invoicing/blWarehouseMaterialInfo/queryWlsfzy', params: { wlId: record.id,nuId:null } }).then(res => {
+      console.log("🚀 ~ handleQyty ~ res:", res)
+      if(!res.success){
+        createMessage.error(res.message);
+        sfjx = "1";
+      }
+    });
+  }
+
+  if(sfjx == '1'){
+    return;
+  }
   registerModal.value.disableSubmit = false;
   registerModal.value.edit(record);
 }
@@ -602,9 +549,24 @@ function handleWlqianyi(record: Recordable) {
 }
 
 //物料的启用停用
-function handleWlQyty(record) {
+async function handleWlQyty(record) {
   console.log("🚀 ~ handleWlQyty ~ record:", record)
   const izEnabled = record.izEnabled == 'Y' ? 'N' : "Y"
+  var sfjx = "0";
+  if("N"==izEnabled){
+    await defHttp.get({ url: '/invoicing/blWarehouseMaterialInfo/queryWlsfzy', params: { wlId: record.id,nuId:null } }).then(res => {
+      console.log("🚀 ~ handleQyty ~ res:", res)
+      if(!res.success){
+        createMessage.error(res.message);
+        sfjx = "1";
+      }
+    });
+  }
+
+  if(sfjx == '1'){
+    return;
+  }
+
   var params = { id: record.id, izEnabled }
   defHttp.post({ url: '/invoicing/configMaterialInfo/edit', params }).then((res) => {
     searchQuery()
diff --git a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue
index bd5dbe7..f84a2f5 100644
--- a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue
+++ b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="p-2">
+  <div>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
diff --git a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoListModal.vue b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoListModal.vue
index 2a723e0..51745f4 100644
--- a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoListModal.vue
+++ b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoListModal.vue
@@ -2,7 +2,7 @@
 
 
   <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }"  @close="handleCancel">
     <BlWarehouseMaterialInfoList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></BlWarehouseMaterialInfoList>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
diff --git a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.data.ts b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.data.ts
index 0b837e5..0788791 100644
--- a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.data.ts
+++ b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfo.data.ts
@@ -5,11 +5,11 @@ import { render } from '/@/utils/common/renderUtils';
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
-  {
-    title: '采购单',
-    align: "center",
-    dataIndex: 'cgdId_dictText'
-  },
+  // {
+  //   title: '采购单',
+  //   align: "center",
+  //   dataIndex: 'cgdId_dictText'
+  // },
   {
     title: '库房',
     align: "center",
diff --git a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoList.vue b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoList.vue
index e59a789..58dbc1a 100644
--- a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoList.vue
+++ b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoList.vue
@@ -1,12 +1,33 @@
 <template>
-  <div >
+  <div>
     <!--查询区域-->
-    <!-- <div class="jeecg-basic-table-form-container">
+    <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item name="crkType">
+              <template #label><span title="出入库类型">出入库类型</span></template>
+              <j-dict-select-tag type='list' placeholder="请选择出入库类型" v-model:value="queryParam.crkType" dictCode="crk_type" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item name="paramDate">
+              <template #label><span title="操作时间">操作时间</span></template>
+              <a-date-picker v-model:value="queryParam.paramDate"  placeholder="请填写操作时间" value-format="YYYY-MM-DD" allow-clear/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="2" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
+                  style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
-    </div> -->
+    </div>
     <!--引用表格-->
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
@@ -33,6 +54,7 @@
   import { downloadFile } from '/@/utils/common/renderUtils';
   import NuWarehouseMaterialCrkInfoModal from './components/NuWarehouseMaterialCrkInfoModal.vue'
   import { useUserStore } from '/@/store/modules/user';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
diff --git a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoListModal.vue b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoListModal.vue
index 991c975..828cc54 100644
--- a/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoListModal.vue
+++ b/src/views/invoicing/warehouseMaterialInfo/NuWarehouseMaterialCrkInfoListModal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }"  @close="handleCancel">
     <NuWarehouseMaterialCrkInfoList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuWarehouseMaterialCrkInfoList>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
diff --git a/src/views/invoicing/warehouseMaterialInfo/components/DelWuliaoModal.vue b/src/views/invoicing/warehouseMaterialInfo/components/DelWuliaoModal.vue
index ea0d84b..20b7b66 100644
--- a/src/views/invoicing/warehouseMaterialInfo/components/DelWuliaoModal.vue
+++ b/src/views/invoicing/warehouseMaterialInfo/components/DelWuliaoModal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer :title="title" :width="width"  v-model:visible="visible" :closable="true"
-    :footer-style="{ textAlign: 'right' }" @close="handleCancel">
+    :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @close="handleCancel">
     <DelWuliaoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DelWuliaoForm>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>