From b7f32b6f098e6a209398dc53c6a64e5c18ce745e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=99=93=E9=B9=8F?= <jialanbaiyue@163.com>
Date: Thu, 3 Apr 2025 01:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AC=A1=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/list/index.ts                         |  27 +
 src/layout/navBars/topBar/user.vue            | 411 +++++++--------
 src/views/materialReceiptNotice/index.vue     | 423 +++++++++++----
 src/views/mssPurchaseOrder/index.vue          | 439 +++++++++++++---
 .../mssPurchaseOrder/purchaseDetails.vue      | 489 ++++++++++++------
 src/views/mssPurchaseOrder/selectedData.vue   | 265 +++++++---
 src/views/system/user/dialog.vue              | 157 +++---
 src/views/system/user/index.vue               | 335 +++++++-----
 8 files changed, 1741 insertions(+), 805 deletions(-)

diff --git a/src/api/list/index.ts b/src/api/list/index.ts
index f262ec6..f8b21a2 100644
--- a/src/api/list/index.ts
+++ b/src/api/list/index.ts
@@ -52,5 +52,32 @@ export function listApi() {
                 data,
             });
         },
+
+
+        //用户列表
+        loginGetPageList: (data: object) => {
+            return request({
+                url: '/api/Admin/Login/GetPageList',
+                method: 'post',
+                data,
+            });
+        },
+
+        //获取供应商列表
+        getBDSupplierList: (data: object) => {
+            return request({
+                url: '/api/Admin/Login/GetBDSupplierList',
+                method: 'get',
+                params:data,
+            });
+        },
+        //保存用户
+        loginSave: (data: object) => {
+            return request({
+                url: '/api/Admin/Login/Save',
+                method: 'post',
+                data,
+            });
+        },
     };
 }
diff --git a/src/layout/navBars/topBar/user.vue b/src/layout/navBars/topBar/user.vue
index 51d8562..fb550e5 100644
--- a/src/layout/navBars/topBar/user.vue
+++ b/src/layout/navBars/topBar/user.vue
@@ -1,68 +1,68 @@
 <template>
-  <div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
-<!--    <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">-->
-<!--      <div class="layout-navbars-breadcrumb-user-icon">-->
-<!--        <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>-->
-<!--      </div>-->
-<!--      <template #dropdown>-->
-<!--        <el-dropdown-menu>-->
-<!--          <el-dropdown-item command="large" :disabled="state.disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>-->
-<!--          <el-dropdown-item command="default" :disabled="state.disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>-->
-<!--          <el-dropdown-item command="small" :disabled="state.disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>-->
-<!--        </el-dropdown-menu>-->
-<!--      </template>-->
-<!--    </el-dropdown>-->
-    <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
-      <div class="layout-navbars-breadcrumb-user-icon">
-        <i
-            class="iconfont"
-            :class="state.disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'"
-            :title="$t('message.user.title1')"
-        ></i>
-      </div>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item command="zh-cn" :disabled="state.disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>
-          <el-dropdown-item command="en" :disabled="state.disabledI18n === 'en'">English</el-dropdown-item>
-<!--          <el-dropdown-item command="zh-tw" :disabled="state.disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>-->
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-<!--    <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">-->
-<!--      <el-icon :title="$t('message.user.title2')">-->
-<!--        <ele-Search />-->
-<!--      </el-icon>-->
-<!--    </div>-->
-    <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
-      <i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
-    </div>
-<!--    <div class="layout-navbars-breadcrumb-user-icon" ref="userNewsBadgeRef" v-click-outside="onUserNewsClick">-->
-<!--      <el-badge :is-dot="true">-->
-<!--        <el-icon :title="$t('message.user.title4')">-->
-<!--          <ele-Bell />-->
-<!--        </el-icon>-->
-<!--      </el-badge>-->
-<!--    </div>-->
-    <el-popover
-        ref="userNewsRef"
-        :virtual-ref="userNewsBadgeRef"
-        placement="bottom"
-        trigger="click"
-        transition="el-zoom-in-top"
-        virtual-triggering
-        :width="300"
-        :persistent="false"
-    >
-      <UserNews />
-    </el-popover>
-    <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
-      <i
-          class="iconfont"
-          :title="state.isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
-          :class="!state.isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
-      ></i>
-    </div>
-    <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
+	<div class="layout-navbars-breadcrumb-user pr15" :style="{ flex: layoutUserFlexNum }">
+		<!--    <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">-->
+		<!--      <div class="layout-navbars-breadcrumb-user-icon">-->
+		<!--        <i class="iconfont icon-ziti" :title="$t('message.user.title0')"></i>-->
+		<!--      </div>-->
+		<!--      <template #dropdown>-->
+		<!--        <el-dropdown-menu>-->
+		<!--          <el-dropdown-item command="large" :disabled="state.disabledSize === 'large'">{{ $t('message.user.dropdownLarge') }}</el-dropdown-item>-->
+		<!--          <el-dropdown-item command="default" :disabled="state.disabledSize === 'default'">{{ $t('message.user.dropdownDefault') }}</el-dropdown-item>-->
+		<!--          <el-dropdown-item command="small" :disabled="state.disabledSize === 'small'">{{ $t('message.user.dropdownSmall') }}</el-dropdown-item>-->
+		<!--        </el-dropdown-menu>-->
+		<!--      </template>-->
+		<!--    </el-dropdown>-->
+		<el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
+			<div class="layout-navbars-breadcrumb-user-icon">
+				<i
+					class="iconfont"
+					:class="state.disabledI18n === 'en' ? 'icon-fuhao-yingwen' : 'icon-fuhao-zhongwen'"
+					:title="$t('message.user.title1')"
+				></i>
+			</div>
+			<template #dropdown>
+				<el-dropdown-menu>
+					<el-dropdown-item command="zh-cn" :disabled="state.disabledI18n === 'zh-cn'">简体中文</el-dropdown-item>
+					<el-dropdown-item command="en" :disabled="state.disabledI18n === 'en'">English</el-dropdown-item>
+					<!--          <el-dropdown-item command="zh-tw" :disabled="state.disabledI18n === 'zh-tw'">繁體中文</el-dropdown-item>-->
+				</el-dropdown-menu>
+			</template>
+		</el-dropdown>
+		<!--    <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">-->
+		<!--      <el-icon :title="$t('message.user.title2')">-->
+		<!--        <ele-Search />-->
+		<!--      </el-icon>-->
+		<!--    </div>-->
+		<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
+			<i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
+		</div>
+		<!--    <div class="layout-navbars-breadcrumb-user-icon" ref="userNewsBadgeRef" v-click-outside="onUserNewsClick">-->
+		<!--      <el-badge :is-dot="true">-->
+		<!--        <el-icon :title="$t('message.user.title4')">-->
+		<!--          <ele-Bell />-->
+		<!--        </el-icon>-->
+		<!--      </el-badge>-->
+		<!--    </div>-->
+		<el-popover
+			ref="userNewsRef"
+			:virtual-ref="userNewsBadgeRef"
+			placement="bottom"
+			trigger="click"
+			transition="el-zoom-in-top"
+			virtual-triggering
+			:width="300"
+			:persistent="false"
+		>
+			<UserNews />
+		</el-popover>
+		<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
+			<i
+				class="iconfont"
+				:title="state.isScreenfull ? $t('message.user.title6') : $t('message.user.title5')"
+				:class="!state.isScreenfull ? 'icon-fullscreen' : 'icon-tuichuquanping'"
+			></i>
+		</div>
+		<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
 			<span class="layout-navbars-breadcrumb-user-link">
 				<img :src="userInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
 				{{ userInfos.userName === '' ? 'common' : userInfos.userName }}
@@ -70,20 +70,20 @@
 					<ele-ArrowDown />
 				</el-icon>
 			</span>
-      <template #dropdown>
-        <el-dropdown-menu>
-<!--          <el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>-->
-<!--          <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
-<!--          <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->
-<!--          <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
-<!--          <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->
-          <el-dropdown-item divided command="">修改密码</el-dropdown-item>
-          <el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-    <Search ref="searchRef" />
-  </div>
+			<template #dropdown>
+				<el-dropdown-menu>
+					<!--          <el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>-->
+					<!--          <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>-->
+					<!--          <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>-->
+					<!--          <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
+					<!--          <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>-->
+					<el-dropdown-item divided command="">修改密码</el-dropdown-item>
+					<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
+				</el-dropdown-menu>
+			</template>
+		</el-dropdown>
+		<Search ref="searchRef" />
+	</div>
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbUser">
@@ -114,165 +114,170 @@ const { userInfos } = storeToRefs(stores);
 const { themeConfig } = storeToRefs(storesThemeConfig);
 const searchRef = ref();
 const state = reactive({
-  isScreenfull: false,
-  disabledI18n: 'zh-cn',
-  disabledSize: 'large',
+	isScreenfull: false,
+	disabledI18n: 'zh-cn',
+	disabledSize: 'large',
 });
 
 // 设置分割样式
 const layoutUserFlexNum = computed(() => {
-  let num: string | number = '';
-  const { layout, isClassicSplitMenu } = themeConfig.value;
-  const layoutArr: string[] = ['defaults', 'columns'];
-  if (layoutArr.includes(layout) || (layout === 'classic' && !isClassicSplitMenu)) num = '1';
-  else num = '';
-  return num;
+	let num: string | number = '';
+	const { layout, isClassicSplitMenu } = themeConfig.value;
+	const layoutArr: string[] = ['defaults', 'columns'];
+	if (layoutArr.includes(layout) || (layout === 'classic' && !isClassicSplitMenu)) num = '1';
+	else num = '';
+	return num;
 });
 // 全屏点击时
 const onScreenfullClick = () => {
-  if (!screenfull.isEnabled) {
-    ElMessage.warning('暂不不支持全屏');
-    return false;
-  }
-  screenfull.toggle();
-  screenfull.on('change', () => {
-    if (screenfull.isFullscreen) state.isScreenfull = true;
-    else state.isScreenfull = false;
-  });
+	if (!screenfull.isEnabled) {
+		ElMessage.warning('暂不不支持全屏');
+		return false;
+	}
+	screenfull.toggle();
+	screenfull.on('change', () => {
+		if (screenfull.isFullscreen) state.isScreenfull = true;
+		else state.isScreenfull = false;
+	});
 };
 // 消息通知点击时
 const onUserNewsClick = () => {
-  unref(userNewsRef).popperRef?.delayHide?.();
+	unref(userNewsRef).popperRef?.delayHide?.();
 };
 // 布局配置 icon 点击时
 const onLayoutSetingClick = () => {
-  mittBus.emit('openSetingsDrawer');
+	mittBus.emit('openSetingsDrawer');
 };
 // 下拉菜单点击时
 const onHandleCommandClick = (path: string) => {
-  if (path === 'logOut') {
-    ElMessageBox({
-      closeOnClickModal: false,
-      closeOnPressEscape: false,
-      title: t('message.user.logOutTitle'),
-      message: t('message.user.logOutMessage'),
-      showCancelButton: true,
-      confirmButtonText: t('message.user.logOutConfirm'),
-      cancelButtonText: t('message.user.logOutCancel'),
-      buttonSize: 'default',
-      beforeClose: (action, instance, done) => {
-        if (action === 'confirm') {
-          instance.confirmButtonLoading = true;
-          instance.confirmButtonText = t('message.user.logOutExit');
-          setTimeout(() => {
-            done();
-            setTimeout(() => {
-              instance.confirmButtonLoading = false;
-            }, 300);
-          }, 700);
-        } else {
-          done();
-        }
-      },
-    })
-        .then(async () => {
-          // 清除缓存/token等
-          Session.clear();
-          // 使用 reload 时，不需要调用 resetRoute() 重置路由
-          window.location.reload();
-        })
-        .catch(() => {});
-  } else if (path === 'wareHouse') {
-    window.open('https://gitee.com/lyt-top/vue-next-admin');
-  } else {
-    router.push(path);
-  }
+	if (path === 'logOut') {
+		ElMessageBox({
+			closeOnClickModal: false,
+			closeOnPressEscape: false,
+			title: t('message.user.logOutTitle'),
+			message: t('message.user.logOutMessage'),
+			showCancelButton: true,
+			confirmButtonText: t('message.user.logOutConfirm'),
+			cancelButtonText: t('message.user.logOutCancel'),
+			buttonSize: 'default',
+			beforeClose: (action, instance, done) => {
+				if (action === 'confirm') {
+					instance.confirmButtonLoading = true;
+					instance.confirmButtonText = t('message.user.logOutExit');
+					setTimeout(() => {
+						done();
+						setTimeout(() => {
+							instance.confirmButtonLoading = false;
+						}, 300);
+					}, 700);
+				} else {
+					done();
+				}
+			},
+		}).then(async () => {
+				// 清除缓存/token等
+				Session.clear();
+				// 使用 reload 时，不需要调用 resetRoute() 重置路由
+				window.location.reload();
+			}).catch(() => {});
+	} else if (path === 'wareHouse') {
+		window.open('https://gitee.com/lyt-top/vue-next-admin');
+	} else {
+		router.push(path);
+	}
 };
 // 菜单搜索点击
 const onSearchClick = () => {
-  searchRef.value.openSearch();
+	searchRef.value.openSearch();
 };
 // 组件大小改变
 const onComponentSizeChange = (size: string) => {
-  Local.remove('themeConfig');
-  themeConfig.value.globalComponentSize = size;
-  Local.set('themeConfig', themeConfig.value);
-  initI18nOrSize('globalComponentSize', 'disabledSize');
-  window.location.reload();
+	Local.remove('themeConfig');
+	themeConfig.value.globalComponentSize = size;
+	Local.set('themeConfig', themeConfig.value);
+	initI18nOrSize('globalComponentSize', 'disabledSize');
+	window.location.reload();
 };
 // 语言切换
-const onLanguageChange = (lang: string,stateVal:boolean = true) => {
-  Local.remove('themeConfig');
-  themeConfig.value.globalI18n = lang;
-  Local.set('themeConfig', themeConfig.value);
-  Local.set('langes', lang)
-  locale.value = lang;
-  other.useTitle();
-  initI18nOrSize('globalI18n', 'disabledI18n');
-  if (stateVal) router.go(0)
+const onLanguageChange = (lang: string, stateVal: boolean = true) => {
+	Local.remove('themeConfig');
+	themeConfig.value.globalI18n = lang;
+	Local.set('themeConfig', themeConfig.value);
+	Local.set('langes', lang);
+	locale.value = lang;
+	other.useTitle();
+	initI18nOrSize('globalI18n', 'disabledI18n');
+	if (stateVal) router.go(0);
 };
 // 初始化组件大小/i18n
 const initI18nOrSize = (value: string, attr: string) => {
-  (<any>state)[attr] = Local.get('themeConfig')[value];
+	(<any>state)[attr] = Local.get('themeConfig')[value];
 };
 // 页面加载时
 onMounted(() => {
-  if (Local.get('themeConfig')) {
-    initI18nOrSize('globalComponentSize', 'disabledSize');
-    initI18nOrSize('globalI18n', 'disabledI18n');
-  }
-  if(Local.get('langes') === 'en') {
-    onLanguageChange('en' , false)
-  }
-  else {
-    onLanguageChange('zh-cn', false)
-  }
+	if (Local.get('themeConfig')) {
+		initI18nOrSize('globalComponentSize', 'disabledSize');
+		initI18nOrSize('globalI18n', 'disabledI18n');
+	}
+	if (Local.get('langes') === 'en') {
+		onLanguageChange('en', false);
+	} else {
+		onLanguageChange('zh-cn', false);
+	}
 });
 </script>
 
 <style scoped lang="scss">
 .layout-navbars-breadcrumb-user {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  &-link {
-    height: 100%;
-    display: flex;
-    align-items: center;
-    white-space: nowrap;
-    &-photo {
-      width: 25px;
-      height: 25px;
-      border-radius: 100%;
-    }
-  }
-  &-icon {
-    padding: 0 10px;
-    cursor: pointer;
-    color: var(--next-bg-topBarColor);
-    height: 50px;
-    line-height: 50px;
-    display: flex;
-    align-items: center;
-    &:hover {
-      background: var(--next-color-user-hover);
-      i {
-        display: inline-block;
-        animation: logoAnimation 0.3s ease-in-out;
-      }
-    }
-  }
-  :deep(.el-dropdown) {
-    color: var(--next-bg-topBarColor);
-  }
-  :deep(.el-badge) {
-    height: 40px;
-    line-height: 40px;
-    display: flex;
-    align-items: center;
-  }
-  :deep(.el-badge__content.is-fixed) {
-    top: 12px;
-  }
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+
+	&-link {
+		height: 100%;
+		display: flex;
+		align-items: center;
+		white-space: nowrap;
+
+		&-photo {
+			width: 25px;
+			height: 25px;
+			border-radius: 100%;
+		}
+	}
+
+	&-icon {
+		padding: 0 10px;
+		cursor: pointer;
+		color: var(--next-bg-topBarColor);
+		height: 50px;
+		line-height: 50px;
+		display: flex;
+		align-items: center;
+
+		&:hover {
+			background: var(--next-color-user-hover);
+
+			i {
+				display: inline-block;
+				animation: logoAnimation 0.3s ease-in-out;
+			}
+		}
+	}
+
+	:deep(.el-dropdown) {
+		color: var(--next-bg-topBarColor);
+	}
+
+	:deep(.el-badge) {
+		height: 40px;
+		line-height: 40px;
+		display: flex;
+		align-items: center;
+	}
+
+	:deep(.el-badge__content.is-fixed) {
+		top: 12px;
+	}
 }
 </style>
diff --git a/src/views/materialReceiptNotice/index.vue b/src/views/materialReceiptNotice/index.vue
index 07c09e5..3c8383a 100644
--- a/src/views/materialReceiptNotice/index.vue
+++ b/src/views/materialReceiptNotice/index.vue
@@ -1,129 +1,350 @@
 <template>
-	<div class="system-user-container layout-padding">
-		<el-card class="layout-padding-auto" shadow="hover">
-			<avue-crud
+  <div class="system-user-container layout-padding">
+    <el-card class="layout-padding-auto" shadow="hover">
+      <avue-crud
           ref="crudRef"
           :data="state.data"
           :option="state.option"
           v-model:page="state.page"
-          v-model:search="state.formData"
           @on-load="onLoadFun"
-          @search-change="searchChange"
-          @search-reset="resetChange"
+          @selection-change="selectionChange"
+          :table-loading="state.loading"
       >
-				<template #menu>
-          <div class="btnList">
-<!--            <el-button type="text" icon="el-icon-pie-chart" @click="toPurchaseDetails">查看详情</el-button>-->
-            <el-button type="text" icon="el-icon-pie-chart" @click="state.selectedDataShow = true">查看单据</el-button>
+        <template #deliveryDate="{ row }">{{ row.ifHidden === 0 ? row.deliveryDate : '' }}</template>
+        <template #purchaseOrderFBillNo="{ row }">{{ row.ifHidden === 0 ? row.purchaseOrderFBillNo : '' }}</template>
+        <template #sheet="{ row }">{{ row.ifHidden === 0 ? row.sheet : '' }}</template>
+        <template #fBillNo="{ row }">{{ row.ifHidden === 0 ? row.fBillNo : '' }}</template>
+        <template #materialName="{ row }">
+          <el-tooltip :content="row.materialName" placement="top">
+            <div class="multi-line-omit">{{ row.materialName }}</div>
+          </el-tooltip>
+        </template>
+        <template #supplierName="{ row }">
+          <el-tooltip :content="row.supplierName" placement="top">
+            <div class="multi-line-omit">{{ row.supplierName }}</div>
+          </el-tooltip>
+        </template>
+        <template #menu-left>
+          <div class="selectBoxes">
+            <div class="selectItem">
+              <el-input v-model="state.formData.fBillNo" style="width: 240px" placeholder="单据编号" size="default" />
+            </div>
+            <div class="selectItem">
+              <el-date-picker
+                  v-model="state.elDatePicker"
+                  style="width: 560px"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始发货日期"
+                  end-placeholder="发货结束日期"
+                  size="default"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  @change="elDatePickerFun"
+              />
+            </div>
+            <el-button type="primary" size="default" @click="selectFun">搜索</el-button>
+            <el-button size="default" @click="resetFun">重置</el-button>
+            <el-button type="primary" size="default" @click="state.selectedDataShow = true">
+              <span>已选中 {{ state.selectedData.length }} 条数据，去打印</span>
+            </el-button>
           </div>
-				</template>
-			</avue-crud>
-		</el-card>
+        </template>
+        <template #menu>
+          <div class="btnList">
+            <el-button type="text" @click="state.selectedDataShow = true">打印单据</el-button>
+          </div>
+        </template>
+      </avue-crud>
+    </el-card>
     <selectedData :showes="state.selectedDataShow"/>
-	</div>
+  </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, onMounted,computed } from 'vue';
-import { useRouter } from 'vue-router'
+import { reactive, onMounted, computed, nextTick, ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { listApi } from '../../api/list/index';
 import { useI18n } from 'vue-i18n';
-import selectedData from './selectedData.vue'
-import {listApi} from "/@/api/list";
-const router = useRouter()
+import SelectedData from '/@/views/materialReceiptNotice/selectedData.vue';
+import { ElMessage } from 'element-plus';
 const { t } = useI18n();
-
+const router = useRouter();
 // 定义变量内容
 const state = reactive({
-	page: {
-		total: 1000,
-		currentPage: 1,
-		pageSize: 10,
-	},
-	option: {
-		index: false,
-		menuWidth: 150,
-		border: true,
-		delBtn: false,
-		editBtn: false,
-		align: 'center',
-    searchLabelWidth:120,
-    searchMenuSpan:6,
-    addBtn:false,
-		column: [
-			{ label: '采购订单号', prop: 'purchaseOrderFBillNo', width: 200,search: true },
-			{ label: '发货单号', prop: 'sheet', width: 200,search: true },
-			{ label: computed(() => t('message.list.PONumber2')), prop: 'fBillNo', width: 200,search: true },
-			{ label: computed(() => t('message.list.SupplierCode2')), prop: 'supplierId', width: 200,search: true },
-			{ label: computed(() => t('message.list.SupplierName2')), prop: 'supplierName', width: 200,search: true },
-			{ label: computed(() => t('message.list.Buyer2')), prop: 'FPurchaserId', width: 200,search: true },
-      // { label: computed(() => t('message.list.ReceiveOrg')), prop: 'FStockOrgId', width: 200,search: true },
-      // { label: computed(() => t('message.list.BusinessType')), prop: 'FBillTypeID', width: 200,search: true },
-      // { label: computed(() => t('message.list.OrderCreator')), prop: 'FCreatorId', width: 200,search: true },
-      { label: computed(() => t('message.list.DocStatus2')), prop: 'FDocumentStatus', width: 200,search: true },
-      { label: computed(() => t('message.list.ReceivingDate')), prop: 'fDate', width: 200,search: true,type: 'datetime', searchSpan: 12,searchRange: true,},
-			// { label: computed(() => t('message.list.Comments3')), prop: 'FRemarks', width: 200 },
-		],
-	},
-	data: [],
-  selectedDataShow:false,
-  formData:{}
+  page: {
+    total: 1000,
+    currentPage: 1,
+    pageSize: 30,
+  },
+  option: {
+    height: '720',
+    tip: false,
+    index: false,
+    menuWidth: 120,
+    border: true,
+    delBtn: false,
+    editBtn: false,
+    align: 'center',
+    // searchLabelWidth:100,
+    selection: true,
+    searchMenuSpan: 3,
+    addBtn: false,
+    column: [
+      {
+        label: computed(() => t('message.list.ReceivingDate')),
+        prop: 'deliveryDate',
+        type: 'datetime',
+        searchSpan: 12,
+        searchRange: true,
+        width:'160'
+      },
+      { label: '采购订单号', prop: 'purchaseOrderFBillNo',width:'120' },
+      { label: '发货单号', prop: 'sheet',width:'135' },
+      { label: '收料单号', prop: 'fBillNo',width:'120' },
+      { label: '美塞斯批号', prop: 'mssSupplierLot',width:'90' },
+      { label: '供应商批号', prop: 'fSupplierLot',width:'90' },
+      { label: '物料编码', prop: 'materialCode',width:'120' },
+      { label: '物料名称', prop: 'materialName' },
+      { label: computed(() => t('message.list.PONumber2')), prop: 'purchaseOrderFBillNo',width:'110' },
+      { label: computed(() => t('message.list.SupplierCode2')), prop: 'supplierId',width:'90' },
+      { label: computed(() => t('message.list.SupplierName2')), prop: 'supplierName',width:'120' },
+      { label: '累计收料数量', prop: 'sendedQty',width:'110' },
+      { label: '发货数量', prop: 'qty',width:'80' },
+      { label: '采购数量', prop: 'purchaseQty',width:'80' },
+      { label: '采购单位', prop: 'unitName',width:'80' },
+    ],
+  },
+  data: [],
+  elDatePicker: '',
+  formData: {
+    fBillNo: '',
+    fDateBegin: '',
+    fDateEmd: '',
+    fmrpCloseStatus: '',
+  },
+  selectedData: [],
+  chengNuoJiaoQiP: '',
+  newChengNuoJiaoQiP: '',
+  selectedDataShow: false,
+  loading: false,
 });
-const toPurchaseDetails = () => {
-  router.push({
-    path: '/materialReceiptNoticePurchaseDetails',
-  })
-}
-const onLoadFun = (e:any) => {
-  state.page.currentPage = e.currentPage
-  state.page.pageSize = e.pageSize
-  getList()
-}
-const searchChange = (params:any, done:any) => {
-  done()
-  if(params.fDate?.length){
-    console.log(11111)
-  }
-}
-const resetChange = () => {
-
-}
-const getList = () => {
-  listApi().invoiceOrderGetPageList({
-    ...state.formData,
-    pageSize:state.page.pageSize,
-    page:state.page.currentPage,
-  }).then((res:any) => {
-    if(res.resultCode === 0){
-      state.data = res.data.dataList
-      state.page.total = res.data.total
+const selectionChange = (list: any) => {
+  nextTick(() => {
+    state.selectedData = JSON.parse(JSON.stringify(list));
+  });
+};
+const chengNuoJiaoQiPFun = (e: string) => {
+  if (state.selectedData.length != 0) {
+    let arr: any = [];
+    if (e === '0') {
+      state.selectedData.forEach((item: any) => {
+        arr.push({ id: item.id, newTime: state.chengNuoJiaoQiP });
+      });
+      batchSetChengNuoJiaoQiFun(arr);
     }
-  })
-}
+    if (e === '1') {
+      state.selectedData.forEach((item: any) => {
+        arr.push({ id: item.id, newTime: state.newChengNuoJiaoQiP });
+      });
+      batchSetNewChengNuoJiaoQiFun(arr);
+    }
+  } else {
+    ElMessage.warning('请先选中数据');
+  }
+};
+const batchSetChengNuoJiaoQiFun = (arr: any) => {
+  listApi()
+      .batchSetChengNuoJiaoQi(arr)
+      .then((res: any) => {
+        if (res.resultCode === 0) {
+          ElMessage.success('操作成功');
+          getList();
+          state.chengNuoJiaoQiP = '';
+        }
+        if (res.resultCode === -1) {
+          ElMessage.success(res.errorMessage);
+          state.newChengNuoJiaoQiP = '';
+        }
+      });
+};
+const batchSetNewChengNuoJiaoQiFun = (arr: any) => {
+  listApi()
+      .batchSetNewChengNuoJiaoQi(arr)
+      .then((res: any) => {
+        if (res.resultCode === 0) {
+          ElMessage.success('操作成功');
+          getList();
+        }
+        if (res.resultCode === -1) {
+          ElMessage.success(res.errorMessage);
+        }
+      });
+};
+const generateDocumentsFun = () => {
+  state.selectedDataShow = false;
+  getList();
+};
+//跳转详情
+const toPurchaseDetails = (item: any) => {
+  router.push({
+    path: '/purchaseDetails',
+    query: {
+      topId: item.fiD,
+    },
+  });
+};
+const elDatePickerFun = (val: any) => {
+  state.formData.fDateBegin = val[0];
+  state.formData.fDateEmd = val[1];
+};
+//接口数据处理
+const selectFun = () => {
+  state.page.currentPage = 1;
+  state.page.pageSize = 30;
+  getList();
+};
+const resetFun = () => {
+  state.page.currentPage = 1;
+  state.page.pageSize = 20;
+  state.elDatePicker = '';
+  state.formData = {
+    fBillNo: '',
+    fDateBegin: '',
+    fDateEmd: '',
+    fmrpCloseStatus: '',
+  };
+  getList();
+};
+const onLoadFun = (e: any) => {
+  state.page.currentPage = e.currentPage;
+  state.page.pageSize = e.pageSize;
+  getList();
+};
+const getList = () => {
+  state.loading = true;
+  listApi()
+      .invoiceOrderGetPageList({
+        condition: state.formData,
+        pageSize: state.page.pageSize,
+        page: state.page.currentPage,
+      })
+      .then((res: any) => {
+        state.loading = false;
+        if (res.resultCode === 0) {
+          state.data = res.data.dataList;
+          state.page.total = res.data.total;
+        }
+      });
+};
 // 页面加载时
-onMounted(() => {
-  getList()
-});
+onMounted(() => {});
 </script>
 
 <style lang="scss" scoped>
-.system-user-container {
-	:deep(.el-card__body) {
-		display: flex;
-		flex-direction: column;
-		flex: 1;
-		overflow: auto;
+:deep(.cell) {
+  padding: 0 8px !important;
+}
 
-		.el-table {
-			flex: 1;
-		}
-	}
+:deep(.avue-crud__left) {
+  flex: 1;
 }
-:deep(.el-col){
-  margin-bottom: 16px;
+
+:deep(.avue-crud__refreshBtn) {
+  display: none;
 }
-.btnList{
-  :deep(.el-button){
-    margin-left: 0!important;
+
+:deep(.avue-crud__gridBtn) {
+  display: none;
+}
+
+.piliang {
+  margin-left: 12px;
+  border: 1px solid #d5d5d5;
+  border-radius: 8px;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  padding: 4px;
+}
+
+.system-user-container {
+  padding: 0 !important;
+}
+
+.multi-line-omit {
+  word-break: break-all; // 允许单词内自动换行，如果一个单词很长的话
+  text-overflow: ellipsis; // 溢出用省略号显示
+  overflow: hidden; // 超出的文本隐藏
+  display: -webkit-box; // 作为弹性伸缩盒子模型显示
+  -webkit-line-clamp: 1; // 显示的行
+  -webkit-box-orient: vertical; // 设置伸缩盒子的子元素排列方式--从上到下垂直排列
+}
+
+.selectBoxes {
+  display: flex;
+  flex: 1;
+
+  .selectItem {
+    margin-right: 16px;
+    display: flex;
   }
 }
+
+:deep(.avue-crud) {
+  height: 100%;
+  width: 100%;
+}
+
+:deep(.avue-crud--card) {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
+:deep(.avue-crud__body) {
+  flex: 1;
+}
+
+:deep(.el-table__header) {
+  height: 40px;
+}
+
+:deep(.el-card__body) {
+  width: 100% !important;
+  height: 100% !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+}
+
+:deep(.el-table__cell) {
+  padding: 0 !important;
+  //height: 56px !important;
+}
+
+:deep(.el-card) {
+  padding: 12px;
+}
+
+:deep(.el-form) {
+  flex: 1;
+}
+
+.system-user-container {
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+
+    .el-table {
+      flex: 1;
+    }
+  }
+}
+
+:deep(.el-col) {
+  margin-bottom: 16px;
+}
 </style>
diff --git a/src/views/mssPurchaseOrder/index.vue b/src/views/mssPurchaseOrder/index.vue
index bdfa2f7..ef9df1f 100644
--- a/src/views/mssPurchaseOrder/index.vue
+++ b/src/views/mssPurchaseOrder/index.vue
@@ -2,117 +2,395 @@
 	<div class="system-user-container layout-padding">
 		<el-card class="layout-padding-auto" shadow="hover">
 			<avue-crud
-          ref="crudRef"
-          :data="state.data"
-          :option="state.option"
-          v-model:page="state.page"
-          v-model:search="state.formData"
-          @on-load="onLoadFun"
-          @search-change="searchChange"
-          @search-reset="resetChange"
-      >
-				<template #status>
-					<div>未发货</div>
+				ref="crudRef"
+				:data="state.data"
+				:option="state.option"
+				v-model:page="state.page"
+				@on-load="onLoadFun"
+				@selection-change="selectionChange"
+				:table-loading="state.loading"
+			>
+				<template #fBillNo="{ row }">{{ row.ifHidden === 0 ? row.fBillNo : '' }}</template>
+				<template #fDate="{ row }">{{ row.ifHidden === 0 ? row.fDate : '' }}</template>
+				<template #fCancelStatus="{ row }">
+					{{ row.ifHidden === 0 ? (row.fCancelStatus === 'A' ? '未关闭' : '已关闭') : '' }}
 				</template>
-        <template #menu="{row}">
-					<el-button type="text" icon="el-icon-pie-chart" @click="toPurchaseDetails(row)">查看</el-button>
+				<template #materialName="{ row }">
+					<el-tooltip :content="row.materialName" placement="top">
+						<div class="multi-line-omit">{{ row.materialName }}</div>
+					</el-tooltip>
 				</template>
+				<template #chengNuoJiaoQi="{ row }">
+					<el-date-picker
+						v-model="row.chengNuoJiaoQi"
+						type="date"
+						placeholder="日期"
+						size="small"
+						style="width: 220px"
+						format="YYYY-MM-DD"
+						value-format="YYYY-MM-DD"
+						@change="batchSetChengNuoJiaoQiFun([{ id: row.id, newTime: row.chengNuoJiaoQi }])"
+					/>
+				</template>
+				<template #newChengNuoJiaoQi="{ row }">
+					<el-date-picker
+						v-model="row.newChengNuoJiaoQi"
+						type="date"
+						placeholder="日期"
+						size="small"
+						style="width: 220px"
+						format="YYYY-MM-DD"
+						value-format="YYYY-MM-DD"
+						@change="batchSetNewChengNuoJiaoQiFun([{ id: row.id, newTime: row.newChengNuoJiaoQi }])"
+					/>
+				</template>
+				<template #menu-left>
+					<div class="selectBoxes">
+						<div class="selectItem">
+							<el-input v-model="state.formData.fBillNo" style="width: 240px" placeholder="单据编号" size="default" />
+						</div>
+						<div class="selectItem">
+							<el-select placeholder="业务状态" size="default" style="width: 240px" v-model="state.formData.fmrpCloseStatus">
+								<el-option v-for="item in state.option.column[2].dicData" :key="item.value" :label="item.label" :value="item.value" />
+							</el-select>
+						</div>
+						<div class="selectItem">
+							<el-date-picker
+								v-model="state.elDatePicker"
+								style="width: 560px"
+								type="daterange"
+								range-separator="-"
+								start-placeholder="开始采购日期"
+								end-placeholder="采购结束日期"
+								size="default"
+								format="YYYY-MM-DD"
+								value-format="YYYY-MM-DD"
+								@change="elDatePickerFun"
+							/>
+						</div>
+						<div class="selectItem" style="flex: 1">
+							<el-button type="primary" size="default" @click="selectFun">搜索</el-button>
+							<el-button size="default" @click="resetFun">重置</el-button>
+							<div class="piliang">
+								<el-button type="primary" size="small" @click="state.selectedDataShow = true">
+									<span>已选中 {{ state.selectedData.length }} 条数据，去查看</span>
+								</el-button>
+								<el-date-picker
+									v-model="state.chengNuoJiaoQiP"
+									type="date"
+									placeholder="批量修改选中承诺日期"
+									size="small"
+									style="width: 190px; margin-left: 12px"
+									@change="chengNuoJiaoQiPFun('0')"
+								/>
+								<el-date-picker
+									v-model="state.newChengNuoJiaoQiP"
+									type="date"
+									placeholder="批量修改选中承诺最新交期"
+									size="small"
+									style="width: 190px; margin-left: 12px"
+									@change="chengNuoJiaoQiPFun('1')"
+								/>
+							</div>
+						</div>
+					</div>
+				</template>
+				<!--				<template #menu="{ row }">-->
+				<!--					<el-button type="text" icon="el-icon-pie-chart" @click="toPurchaseDetails(row)">查看</el-button>-->
+				<!--				</template>-->
 			</avue-crud>
 		</el-card>
+		<selectedData
+			ref="selectedDataRef"
+			:showes="state.selectedDataShow"
+			:listData="state.selectedData"
+			@generateDocuments="generateDocumentsFun"
+			@close="() => {state.selectedDataShow = false;getList()}"
+		/>
 	</div>
 </template>
 
 <script lang="ts" setup>
-import {reactive, onMounted, computed,defineProps} from 'vue';
-import { useRouter } from 'vue-router'
-import { listApi } from '../../api/list/index'
-import { useI18n } from 'vue-i18n';
-const { locale, t } = useI18n();
-const router = useRouter()
-const props = defineProps({
+import { reactive, onMounted, computed, nextTick, ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { listApi } from '../../api/list/index';
+// import { useI18n } from 'vue-i18n';
+import SelectedData from '/@/views/mssPurchaseOrder/selectedData.vue';
+import { ElMessage } from 'element-plus';
 
-})
+const selectedDataRef = ref();
+// const { t } = useI18n();
+const router = useRouter();
 // 定义变量内容
-JSON.stringify()
 const state = reactive({
 	page: {
 		total: 1000,
 		currentPage: 1,
-		pageSize: 10,
+		pageSize: 30,
 	},
 	option: {
+		height: '720',
+		tip: false,
 		index: false,
+		menu: false,
 		menuWidth: 120,
 		border: true,
 		delBtn: false,
 		editBtn: false,
 		align: 'center',
-    // searchLabelWidth:100,
-    selection: true,
-    searchMenuSpan:3,
-    addBtn:false,
+		// searchLabelWidth:100,
+		selection: true,
+		searchMenuSpan: 3,
+		addBtn: false,
 		column: [
-			{ label: computed(() => t('message.list.PONumber')), prop: 'fBillNo', width: 150,search: true,searchSpan: 3 },
-      { label: computed(() => t('message.list.PurchaseDate')), prop: 'fDate', width: 150,search: true,type: 'datetime', searchSpan: 6,searchRange: true,},
-      { label: '关闭状态', prop: 'hangzhuangtai', width: 150 },
-      { label: '物料编码', prop: 'wuliaobinama', width: 150 },
-      { label: '物料名称', prop: 'wuliaomingcheng', width: 150 },
-      { label: '采购单位', prop: 'caigoudanwei', width: 150 },
-      { label: '采购数量', prop: 'caigoushuliang', width: 150 },
-      { label: '交货日期', prop: 'jioahuiriqi', width: 150 },
-      { label: '业务状态', prop: 'yewuzhuangtai', width: 150,search: true,searchSpan: 3 },
-      { label: '累计收料数量', prop: 'ljslsl', width: 150 },
-      { label: '剩余收料数量', prop: 'syslsl', width: 150 },
-      { label: '供应商承诺交期', prop: 'gyscnjq', width: 150 },
-      { label: '供应商承诺最新交期', prop: 'gyscnzxjq', width: 150 },
+			{ label: '单据编号', prop: 'fBillNo', /*search: true,*/ searchSpan: 3, width: '125' },
+			{ label: '采购日期', prop: 'fDate', /*search: true,*/ type: 'datetime', searchSpan: 6, searchRange: true },
+			{
+				label: '关闭状态',
+				prop: 'fCancelStatus',
+				dicData: [
+					{ label: '未关闭', value: 'A' },
+					{ label: '已关闭', value: 'B' },
+				],
+				width: '90',
+			},
+			{ label: '物料编码', prop: 'materialCode', width: '120' },
+			{ label: '物料名称', prop: 'materialName', width: '240' },
+			{ label: '采购单位', prop: 'unitName', width: '90' },
+			{ label: '采购数量', prop: 'qty', width: '90' },
+			{ label: '交货日期', prop: 'fDeliveryDate', width: '165' },
+			{
+				label: '业务状态',
+				prop: 'fmrpCloseStatus' /*search: true,*/,
+				searchSpan: 3,
+				dicData: [
+					{ label: '正常', value: 'A' },
+					{ label: '业务关闭', value: 'B' },
+				],
+				width: '90',
+			},
+			{ label: '累计收料数量', prop: 'sendedQty', width: '110' },
+			{ label: '剩余收料数量', prop: 'notSendQty', width: '110' },
+			{ label: '供应商承诺交期', prop: 'chengNuoJiaoQi', width: '220' },
+			{ label: '供应商承诺最新交期', prop: 'newChengNuoJiaoQi', width: '220' },
 		],
 	},
 	data: [],
-  formData:{}
+	elDatePicker: '',
+	formData: {
+		fBillNo: '',
+		fDateBegin: '',
+		fDateEmd: '',
+		fmrpCloseStatus: '',
+	},
+	selectedData: [],
+	chengNuoJiaoQiP: '',
+	newChengNuoJiaoQiP: '',
+	selectedDataShow: false,
+	loading: false,
 });
-
-const onLoadFun = (e:any) => {
-  state.page.currentPage = e.currentPage
-  state.page.pageSize = e.pageSize
-  getList()
-}
-const searchChange = (params:any, done:any) => {
-  done()
-  if(params.fDate?.length){}
-}
-const resetChange = () => {
-  
-}
-const toPurchaseDetails = (item:any) => {
-  router.push({
-    path: '/purchaseDetails',
-    query:{
-      topId:item.fiD
-    }
-  })
-}
+const selectionChange = (list: any) => {
+	nextTick(() => {
+		state.selectedData = JSON.parse(JSON.stringify(list));
+	});
+};
+const chengNuoJiaoQiPFun = (e: string) => {
+	if (state.selectedData.length != 0) {
+		let arr: any = [];
+		if (e === '0') {
+			state.selectedData.forEach((item: any) => {
+				arr.push({ id: item.id, newTime: state.chengNuoJiaoQiP });
+			});
+			batchSetChengNuoJiaoQiFun(arr);
+		}
+		if (e === '1') {
+			state.selectedData.forEach((item: any) => {
+				arr.push({ id: item.id, newTime: state.newChengNuoJiaoQiP });
+			});
+			batchSetNewChengNuoJiaoQiFun(arr);
+		}
+	} else {
+		ElMessage.warning('请先选中数据');
+	}
+};
+const batchSetChengNuoJiaoQiFun = (arr: any) => {
+	listApi()
+		.batchSetChengNuoJiaoQi(arr)
+		.then((res: any) => {
+			if (res.resultCode === 0) {
+				ElMessage.success('操作成功');
+				getList();
+				state.chengNuoJiaoQiP = '';
+			}
+			if (res.resultCode === -1) {
+				ElMessage.success(res.errorMessage);
+				state.newChengNuoJiaoQiP = '';
+			}
+		});
+};
+const batchSetNewChengNuoJiaoQiFun = (arr: any) => {
+	listApi()
+		.batchSetNewChengNuoJiaoQi(arr)
+		.then((res: any) => {
+			if (res.resultCode === 0) {
+				ElMessage.success('操作成功');
+				getList();
+			}
+			if (res.resultCode === -1) {
+				ElMessage.success(res.errorMessage);
+			}
+		});
+};
+const generateDocumentsFun = () => {
+	state.selectedDataShow = false;
+	getList();
+};
+//跳转详情
+const toPurchaseDetails = (item: any) => {
+	router.push({
+		path: '/purchaseDetails',
+		query: {
+			topId: item.fiD,
+		},
+	});
+};
+const elDatePickerFun = (val: any) => {
+	state.formData.fDateBegin = val[0];
+	state.formData.fDateEmd = val[1];
+};
+//接口数据处理
+const selectFun = () => {
+	state.page.currentPage = 1;
+	state.page.pageSize = 30;
+	getList();
+};
+const resetFun = () => {
+	state.page.currentPage = 1;
+	state.page.pageSize = 20;
+	state.elDatePicker = '';
+	state.formData = {
+		fBillNo: '',
+		fDateBegin: '',
+		fDateEmd: '',
+		fmrpCloseStatus: '',
+	};
+	getList();
+};
+const onLoadFun = (e: any) => {
+	state.page.currentPage = e.currentPage;
+	state.page.pageSize = e.pageSize;
+	getList();
+};
 const getList = () => {
-  listApi().getPageList({
-    ...state.formData,
-    pageSize:state.page.pageSize,
-    page:state.page.currentPage,
-  }).then((res:any) => {
-    if(res.resultCode === 0){
-      state.data = res.data.dataList
-      state.page.total = res.data.total
-    }
-  })
-}
+	state.loading = true;
+	listApi()
+		.getPageList({
+			condition: state.formData,
+			pageSize: state.page.pageSize,
+			page: state.page.currentPage,
+		})
+		.then((res: any) => {
+			state.loading = false;
+			if (res.resultCode === 0) {
+				state.data = res.data.dataList;
+				state.page.total = res.data.total;
+			}
+		});
+};
 // 页面加载时
-onMounted(() => {
-  getList()
-});
+onMounted(() => {});
 </script>
 
 <style lang="scss" scoped>
-:deep(.el-table__cell){
-  padding: 0 !important;
+:deep(.cell) {
+	padding: 0 !important;
 }
+
+:deep(.avue-crud__left) {
+	flex: 1;
+}
+
+:deep(.avue-crud__refreshBtn) {
+	display: none;
+}
+
+:deep(.avue-crud__gridBtn) {
+	display: none;
+}
+
+.piliang {
+	margin-left: 12px;
+	border: 1px solid #d5d5d5;
+	border-radius: 8px;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	box-sizing: border-box;
+	padding: 4px;
+}
+
+.system-user-container {
+	padding: 0 !important;
+}
+
+.multi-line-omit {
+	word-break: break-all; // 允许单词内自动换行，如果一个单词很长的话
+	text-overflow: ellipsis; // 溢出用省略号显示
+	overflow: hidden; // 超出的文本隐藏
+	display: -webkit-box; // 作为弹性伸缩盒子模型显示
+	-webkit-line-clamp: 1; // 显示的行
+	-webkit-box-orient: vertical; // 设置伸缩盒子的子元素排列方式--从上到下垂直排列
+}
+
+.selectBoxes {
+	display: flex;
+	flex: 1;
+
+	.selectItem {
+		margin-right: 16px;
+		display: flex;
+	}
+}
+
+:deep(.avue-crud) {
+	height: 100%;
+	width: 100%;
+}
+
+:deep(.avue-crud--card) {
+	display: flex;
+	flex-direction: column;
+	flex: 1;
+}
+
+:deep(.avue-crud__body) {
+	flex: 1;
+}
+
+:deep(.el-table__header) {
+	height: 40px;
+}
+
+:deep(.el-card__body) {
+	width: 100% !important;
+	height: 100% !important;
+	overflow: hidden !important;
+	padding: 0 !important;
+}
+
+:deep(.el-table__cell) {
+	padding: 0 !important;
+	//height: 56px !important;
+}
+
+:deep(.el-card) {
+	padding: 12px;
+}
+
+:deep(.el-form) {
+	flex: 1;
+}
+
 .system-user-container {
 	:deep(.el-card__body) {
 		display: flex;
@@ -125,7 +403,8 @@ onMounted(() => {
 		}
 	}
 }
-:deep(.el-col){
-  margin-bottom: 16px;
+
+:deep(.el-col) {
+	margin-bottom: 16px;
 }
 </style>
diff --git a/src/views/mssPurchaseOrder/purchaseDetails.vue b/src/views/mssPurchaseOrder/purchaseDetails.vue
index e85f68c..a837d62 100644
--- a/src/views/mssPurchaseOrder/purchaseDetails.vue
+++ b/src/views/mssPurchaseOrder/purchaseDetails.vue
@@ -1,142 +1,268 @@
 <template>
-	<div class="system-user-container layout-padding">
-		<el-card class="layout-padding-auto" shadow="hover">
-			<avue-crud
+  <div class="system-user-container layout-padding">
+    <el-card class="layout-padding-auto" shadow="hover">
+      <avue-crud
           ref="crudRef"
           :data="state.data"
           :option="state.option"
           @selection-change="selectionChange"
-          @search-change="searchChange"
-          @search-reset="resetChange"
+          :table-loading="state.loading"
       >
-				<template #menu-left>
-          <div style="display: flex;">
-            <div class="menu-left">
-              <span >已选中 <span style="color: #3edc95; font-size: 18px">{{ state.selectedData.length }}</span> 条数据</span >
+        <template #fBillNo="{ row }">{{row.fBillNo}}</template>
+        <template #fDate="{ row }">{{row.fDate}}</template>
+        <template #fCancelStatus="{ row }">{{row.fCancelStatus === 'A' ? '未关闭' : '已关闭'}} </template>
+        <template #materialName="{ row }">
+          <el-tooltip :content="row.materialName" placement="top">
+            <div class="multi-line-omit">{{ row.materialName }}</div>
+          </el-tooltip>
+        </template>
+        <template #chengNuoJiaoQi="{ row }">
+          <el-date-picker
+              v-model="row.chengNuoJiaoQi"
+              type="date"
+              placeholder="日期"
+              size="small"
+              style="width: 115px"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              @change="batchSetChengNuoJiaoQiFun([{id:row.id,newTime:row.chengNuoJiaoQi}])"
+          />
+        </template>
+        <template #newChengNuoJiaoQi="{ row }">
+          <el-date-picker
+              v-model="row.newChengNuoJiaoQi"
+              type="date"
+              placeholder="日期"
+              size="small"
+              style="width: 130px"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              @change="batchSetNewChengNuoJiaoQiFun([{id:row.id,newTime:row.newChengNuoJiaoQi}])"
+          />
+        </template>
+        <template #menu-left>
+          <div class="selectBoxes">
+            <div class="selectItem">
+              <el-input v-model="state.formData.fBillNo" style="width: 240px" placeholder="单据编号" size="default" />
+            </div>
+            <div class="selectItem">
+              <el-select placeholder="业务状态" size="default" style="width: 240px" v-model="state.formData.fmrpCloseStatus">
+                <el-option v-for="item in state.option.column[2].dicData" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </div>
+            <div class="selectItem">
+              <el-date-picker
+                  v-model="state.elDatePicker"
+                  style="width: 560px"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始采购日期"
+                  end-placeholder="采购结束日期"
+                  size="default"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                  @change="elDatePickerFun"
+              />
+            </div>
+            <div class="selectItem" style="flex: 1">
+              <el-button type="primary" size="default" @click="selectFun">搜索</el-button>
+              <el-button size="default" @click="resetFun">重置</el-button>
+              <div class="piliang">
+                <el-button type="primary" size="small" @click="state.selectedDataShow = true">
+                  <span>已选中 {{ state.selectedData.length }} 条数据，去查看</span>
+                </el-button>
+                <el-date-picker
+                    v-model="state.chengNuoJiaoQiP"
+                    type="date"
+                    placeholder="批量修改选中承诺日期"
+                    size="small"
+                    style="width: 190px; margin-left: 12px"
+                    @change="chengNuoJiaoQiPFun('0')"
+                />
+                <el-date-picker
+                    v-model="state.newChengNuoJiaoQiP"
+                    type="date"
+                    placeholder="批量修改选中承诺最新交期"
+                    size="small"
+                    style="width: 190px; margin-left: 12px"
+                    @change="chengNuoJiaoQiPFun('1')"
+                />
+              </div>
             </div>
-            <el-button  style="margin-left: 16px" type="primary"  @click="selectedDataShowFun" >生成送货单</el-button>
           </div>
-
-
-				</template>
-			</avue-crud>
-		</el-card>
-    <selectedData :showes="state.selectedDataShow" :listData="state.selectedData" @generateDocuments="generateDocumentsFun"/>
-<!--    <receipt :showes="state.receiptShow"/>-->
-	</div>
+        </template>
+        <template #menu="{ row }">
+          <el-button type="text" icon="el-icon-pie-chart" @click="toPurchaseDetails(row)">查看</el-button>
+        </template>
+      </avue-crud>
+    </el-card>
+    <selectedData ref="selectedDataRef" :showes="state.selectedDataShow" :listData="state.selectedData" @generateDocuments="generateDocumentsFun" @close="state.selectedDataShow = false"/>
+  </div>
 </template>
 
 <script lang="ts" setup>
-import {reactive, onMounted, nextTick, computed} from 'vue';
-import { ArrowRight } from '@element-plus/icons-vue';
-import selectedData from './selectedData.vue'
-import receipt from './receipt.vue'
-import { useI18n } from 'vue-i18n';
-import {listApi} from "/@/api/list";
-import { useRoute } from 'vue-router'
+import {reactive, onMounted, computed, nextTick, ref} from 'vue';
+import { useRouter,useRoute } from 'vue-router';
+import { listApi } from '../../api/list/index';
+// import { useI18n } from 'vue-i18n';
+import SelectedData from '/@/views/mssPurchaseOrder/selectedData.vue';
+import { ElMessage } from 'element-plus';
+const selectedDataRef = ref()
+// const { t } = useI18n();
+const router = useRouter();
 const route = useRoute()
-const { locale, t } = useI18n();
 // 定义变量内容
 const state = reactive({
-	page: {
-		total: 1000,
-		currentPage: 1,
-		pageSize: 10,
-	},
-	option: {
-		tip: false,
-		selection: true,
-		index: true,
-		menu: false,
-		menuWidth: 150,
-		border: true,
-		delBtn: false,
-		editBtn: false,
-		align: 'center',
-		searchLabelWidth: 130,
-		searchMenuSpan: 6,
-		addBtn: false,
-		column: [
-      { label: 'PO号', prop: 'fBillNo', width: 150},
-      { label: computed(() => t('message.list.PurchaseDate')), prop: 'fDate', width: 150,type: 'datetime', searchSpan: 6,searchRange: true,},
-      { label: '关闭状态', prop: 'hangzhuangtai', width: 150 },
-      { label: '物料编码', prop: 'wuliaobinama', width: 150 },
-      { label: '物料名称', prop: 'wuliaomingcheng', width: 150 },
-      { label: '采购单位', prop: 'caigoudanwei', width: 150 },
-      { label: '采购数量', prop: 'caigoushuliang', width: 150 },
-      { label: '交货日期', prop: 'jioahuiriqi', width: 150 },
-      { label: '业务状态', prop: 'yewuzhuangtai', width: 150},
-      { label: '累计收料数量', prop: 'ljslsl', width: 150 },
-      { label: '剩余收料数量', prop: 'syslsl', width: 150 },
-      { label: '供应商承诺交期', prop: 'gyscnjq', width: 150 },
-      { label: '供应商承诺最新交期', prop: 'gyscnzxjq', width: 150 },
-			// { label: computed(() => t('message.list.MaterialCode')), prop: 'materialCode', width: 200 },
-			// { label: computed(() => t('message.list.MaterialName')), prop: 'materialName', width: 200 },
-			// { label: computed(() => t('message.list.Specification')), prop: 'specificationModel', width: 200 },
-			// { label: computed(() => t('message.list.PurchaseUnit')), prop: 'FUnitId', width: 200 },
-			// { label: '采购数量', prop: 'qty', width: 200 },
-			// { label: '处理中数量', prop: 'processingQty', width: 200 },
-			// { label: '已发货数量', prop: 'sendedQty', width: 200 },
-			// { label: '未发货数量', prop: 'notSendQty', width: 200 },
-			// { label: '本次发货数量', prop: 'nowSendQty', width: 200 },
-			// { label: computed(() => t('message.list.UP')), prop: 'unitPrice', width: 200 },
-			// { label:'价税合计(含税金额', prop: 'amount1', width: 200 },
-			// { label: computed(() => t('message.list.TotalAmount')), prop: 'amount2', width: 200 },
-			// { label: computed(() => t('message.list.AccumulatedReceiptQTY')), prop: 'FReceiveQty', width: 200 },
-			// { label: computed(() => t('message.list.TaxAmount')), prop: 'taxAmount', width: 200 },
-			// {
-			// 	label: computed(() => t('message.list.CommittedDeliveryDate')),
-			// 	prop: 'chengNuoJiaoQi',
-			// 	width: 200,
-			// 	type: 'datetime',
-			// 	searchSpan: 12,
-			// 	searchRange: true,
-			// 	searchLabelWidth: 150,
-			// },
-			// {
-			// 	label: computed(() => t('message.list.LatestCommittedDeliveryDate')),
-			// 	prop: 'newChengNuoJiaoQi',
-			// 	width: 200,
-			// 	type: 'datetime',
-			// 	searchSpan: 12,
-			// 	searchRange: true,
-			// 	searchLabelWidth: 150,
-			// },
-			// { label: computed(() => t('message.list.Comments2')), prop: 'remark', width: 200 },
-		],
-	},
-	data: [],
-  selectedData:[],
+  page: {
+    total: 1000,
+    currentPage: 1,
+    pageSize: 25,
+  },
+  option: {
+    height: '720',
+    tip: false,
+    index: false,
+    menuWidth: 120,
+    border: true,
+    delBtn: false,
+    editBtn: false,
+    align: 'center',
+    // searchLabelWidth:100,
+    selection: true,
+    searchMenuSpan: 3,
+    addBtn: false,
+    column: [
+      { label: 'PO号', prop: 'fBillNo', /*search: true,*/ searchSpan: 3, width: '125' },
+      { label: '采购日期', prop: 'fDate', /*search: true,*/ type: 'datetime', searchSpan: 6, searchRange: true },
+      {
+        label: '关闭状态',
+        prop: 'fCancelStatus',
+        dicData: [
+          { label: '未关闭', value: 'A' },
+          { label: '已关闭', value: 'B' },
+        ],
+        width: '90',
+      },
+      { label: '物料编码', prop: 'materialCode', width: '120' },
+      { label: '物料名称', prop: 'materialName', width: '240' },
+      { label: '采购单位', prop: 'unitName', width: '90' },
+      { label: '采购数量', prop: 'qty', width: '90' },
+      { label: '交货日期', prop: 'fDeliveryDate', width: '165' },
+      {
+        label: '业务状态',
+        prop: 'fmrpCloseStatus' /*search: true,*/,
+        searchSpan: 3,
+        dicData: [
+          { label: '正常', value: 'A' },
+          { label: '业务关闭', value: 'B' },
+        ],
+        width: '90',
+      },
+      { label: '累计收料数量', prop: 'sendedQty', width: '110' },
+      { label: '剩余收料数量', prop: 'notSendQty' },
+      { label: '供应商承诺交期', prop: 'chengNuoJiaoQi', width: '140' },
+      { label: '供应商承诺最新交期', prop: 'newChengNuoJiaoQi', width: '160' },
+    ],
+  },
+  data: [],
+  elDatePicker: '',
+  formData: {
+    fBillNo: '',
+    fDateBegin: '',
+    fDateEmd: '',
+    fmrpCloseStatus: '',
+  },
+  selectedData: [],
+  chengNuoJiaoQiP: '',
+  newChengNuoJiaoQiP: '',
   selectedDataShow:false,
-  receiptShow:false,
+  loading:false,
   topId:''
 });
-const selectionChange = (list:any) => {
-  nextTick( () => {
-    state.selectedData = JSON.parse(JSON.stringify(list))
-  })
-
+const selectionChange = (list: any) => {
+  state.selectedData = list;
+};
+const chengNuoJiaoQiPFun = (e: string) => {
+  if (state.selectedData.length != 0) {
+    let arr: any = [];
+    if (e === '0') {
+      state.selectedData.forEach((item: any) => {
+        arr.push({ id: item.id, newTime: state.chengNuoJiaoQiP });
+      });
+      batchSetChengNuoJiaoQiFun(arr)
+    }
+    if (e === '1') {
+      state.selectedData.forEach((item: any) => {
+        arr.push({ id: item.id, newTime: state.newChengNuoJiaoQiP });
+      });
+      batchSetNewChengNuoJiaoQiFun(arr)
+    }
+  } else {
+    ElMessage.warning('请先选中数据');
+  }
+};
+const batchSetChengNuoJiaoQiFun = (arr:any) => {
+  listApi().batchSetChengNuoJiaoQi(arr).then((res: any) => {
+    if (res.resultCode === 0) {
+      ElMessage.success('操作成功');
+      getList();
+      state.chengNuoJiaoQiP = '';
+    }
+    if (res.resultCode === -1) {
+      ElMessage.success(res.errorMessage);
+      state.newChengNuoJiaoQiP = '';
+    }
+  });
 }
-const searchChange = (params:any, done:any) => {
-  done()
-  getList()
-}
-const resetChange = () => {
-
+const batchSetNewChengNuoJiaoQiFun = (arr:any) => {
+  listApi().batchSetNewChengNuoJiaoQi(arr).then((res: any) => {
+    if (res.resultCode === 0) {
+      ElMessage.success('操作成功');
+      getList();
+    }
+    if (res.resultCode === -1) {
+      ElMessage.success(res.errorMessage);
+    }
+  });
 }
 const generateDocumentsFun = () => {
   state.selectedDataShow = false
   getList()
 }
-const selectedDataShowFun = () => {
-  state.selectedDataShow = !state.selectedDataShow
-}
-// 页面加载时
-onMounted(() => {
-  state.topId = route.query.topId as string
-  getList()
-})
+//跳转详情
+const toPurchaseDetails = (item: any) => {
+  router.push({
+    path: '/purchaseDetails',
+    query: {
+      topId: item.fiD,
+    },
+  });
+};
+const elDatePickerFun = (val: any) => {
+  state.formData.fDateBegin = val[0];
+  state.formData.fDateEmd = val[1];
+};
+//接口数据处理
+const selectFun = () => {
+  state.page.currentPage = 1;
+  state.page.pageSize = 20;
+  getList();
+};
+const resetFun = () => {
+  state.page.currentPage = 1;
+  state.page.pageSize = 20;
+  state.elDatePicker = '';
+  state.formData = {
+    fBillNo: '',
+    fDateBegin: '',
+    fDateEmd: '',
+    fmrpCloseStatus: '',
+  };
+  getList();
+};
+
 const getList = () => {
+  state.loading = true
   listApi().getPurchaseOrderItemList({
     fid:state.topId
   }).then((res:any) => {
@@ -144,43 +270,114 @@ const getList = () => {
       state.data = res.data
     }
   })
-}
-
+};
+// 页面加载时
+onMounted(() => {
+  state.topId = route.query.topId as string
+  getList()
+});
 </script>
 
 <style lang="scss" scoped>
-.system-user-container {
-	:deep(.el-card__body) {
-		display: flex;
-		flex-direction: column;
-		flex: 1;
-		overflow: auto;
+:deep(.avue-crud__left) {
+  flex: 1;
+}
 
-		.el-table {
-			flex: 1;
-		}
-	}
+:deep(.avue-crud__refreshBtn) {
+  display: none;
+}
+
+:deep(.avue-crud__gridBtn) {
+  display: none;
+}
+
+.piliang {
+  margin-left: 12px;
+  border: 1px solid #d5d5d5;
+  border-radius: 8px;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  padding: 4px;
+}
+
+.system-user-container {
+  padding: 0 !important;
+}
+
+.multi-line-omit {
+  word-break: break-all; // 允许单词内自动换行，如果一个单词很长的话
+  text-overflow: ellipsis; // 溢出用省略号显示
+  overflow: hidden; // 超出的文本隐藏
+  display: -webkit-box; // 作为弹性伸缩盒子模型显示
+  -webkit-line-clamp: 1; // 显示的行
+  -webkit-box-orient: vertical; // 设置伸缩盒子的子元素排列方式--从上到下垂直排列
+}
+
+.selectBoxes {
+  display: flex;
+  flex: 1;
+
+  .selectItem {
+    margin-right: 16px;
+    display: flex;
+  }
+}
+
+:deep(.avue-crud) {
+  height: 100%;
+  width: 100%;
+}
+
+:deep(.avue-crud--card) {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
+:deep(.avue-crud__body) {
+  flex: 1;
+}
+
+:deep(.el-table__header) {
+  height: 40px;
+}
+
+:deep(.el-card__body) {
+  width: 100% !important;
+  height: 100% !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+}
+
+:deep(.el-table__cell) {
+  padding: 0 !important;
+  //height: 56px !important;
+}
+
+:deep(.el-card) {
+  padding: 12px;
+}
+
+:deep(.el-form) {
+  flex: 1;
+}
+
+.system-user-container {
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+
+    .el-table {
+      flex: 1;
+    }
+  }
 }
 
 :deep(.el-col) {
-	margin-bottom: 16px;
-}
-
-:deep(.avue-crud__header) {
-	display: flex;
-	flex-wrap: wrap;
-}
-
-.menu-left {
-	//width: 340px;
-	height: 40px;
-	background-color: rgba(64, 159, 255, 0.18);
-	border-radius: 8px;
-	border: 2px solid #d9ecff;
-	display: flex;
-	align-items: center;
-	padding: 0 16px;
-	justify-content: space-between;
-	cursor: pointer;
+  margin-bottom: 16px;
 }
 </style>
diff --git a/src/views/mssPurchaseOrder/selectedData.vue b/src/views/mssPurchaseOrder/selectedData.vue
index 20377ce..a9560f3 100644
--- a/src/views/mssPurchaseOrder/selectedData.vue
+++ b/src/views/mssPurchaseOrder/selectedData.vue
@@ -1,25 +1,49 @@
 <template>
-	<el-dialog :model-value="props.showes" width="70%">
+	<el-dialog :model-value="props.showes" @close="closeFun" width="80%">
 		<avue-crud
 			ref="crudRef"
-			:data="props.listData"
+			:data="state.data"
 			:option="state.option"
 		>
-      <template #nowSendQty="{row}">
+      <template #fSupplierLot="{row}">
         <div style="display: flex;align-items: center;justify-content: center">
-          <el-input-number v-model="row.nowSendQty" :min="1"/>
+          <el-input v-model="row.fSupplierLot" placeholder="批号" size="small"/>
+        </div>
+      </template>
+      <template #notSendQty="{row}">
+        <div style="display: flex;align-items: center;justify-content: center">
+          <el-input-number v-model="row.notSendQty" size="small"/>
         </div>
       </template>
       <template #chengNuoJiaoQi="{row}">
         <div style="display: flex;align-items: center;justify-content: center">
-          <el-date-picker v-model="row.chengNuoJiaoQi" type="date" size="large" style="width: 100%" format="YYYY/MM/DD"
-                          value-format="YYYY-MM-DD" @change="chengNuoJiaoQiChange(row)"/>
+          <el-date-picker v-model="row.chengNuoJiaoQi" type="date" size="small" style="width: 100%" format="YYYY/MM/DD"
+                           @change="batchSetChengNuoJiaoQiFun([{id:row.id,newTime:row.chengNuoJiaoQi}])"/>
         </div>
       </template>
       <template #newChengNuoJiaoQi="{row}">
         <div style="display: flex;align-items: center;justify-content: center">
-          <el-date-picker v-model="row.newChengNuoJiaoQi" type="date" size="large" style="width: 100%" format="YYYY/MM/DD"
-                          value-format="YYYY-MM-DD" @change="newChengNuoJiaoQiChange(row)"/>
+          <el-date-picker v-model="row.newChengNuoJiaoQi" type="date" size="small" style="width: 100%" format="YYYY/MM/DD"
+                           @change="batchSetNewChengNuoJiaoQiFun([{id:row.id,newTime:row.newChengNuoJiaoQi}])"/>
+        </div>
+      </template>
+      <template #menu-left>
+        <div class="selectBoxes">
+          <el-date-picker
+              v-model="state.chengNuoJiaoQiP"
+              type="date"
+              placeholder="批量修改选中承诺日期"
+              style="width: 190px;"
+              @change="chengNuoJiaoQiPFun('0')"
+          />
+          <el-date-picker
+              v-model="state.newChengNuoJiaoQiP"
+              type="date"
+              placeholder="批量修改选中承诺最新交期"
+              style="width: 190px; margin-left: 12px"
+              @change="chengNuoJiaoQiPFun('1')"
+          />
+          <el-input v-model="state.fSupplierLot" style="width: 190px;margin-left: 12px" placeholder="批号" @input="fSupplierLotFun"/>
         </div>
       </template>
     </avue-crud>
@@ -29,9 +53,9 @@
 	</el-dialog>
 </template>
 <script setup lang="ts">
-import { defineProps, reactive, defineEmits, computed } from 'vue';
+import { defineProps, reactive, defineEmits, watch } from 'vue';
 import { listApi } from '../../api/list/index'
-const emits = defineEmits(['generateDocuments']);
+const emits = defineEmits(['generateDocuments','close']);
 import { useI18n } from 'vue-i18n';
 import {ElMessage} from "element-plus";
 const { t } = useI18n();
@@ -47,6 +71,7 @@ const props = defineProps({
 });
 
 const state = reactive({
+  fSupplierLot:'',
 	dialogVisible: true,
 	data: [],
   show:true,
@@ -65,67 +90,77 @@ const state = reactive({
 		searchMenuSpan: 6,
 		addBtn: false,
 		column: [
-			{ label: 'PO号', prop: 'materialCode',  },
-			{ label: '物料编码', prop: 'materialCode',  },
-			{ label: '物料名称', prop: 'materialCode',  },
-			{ label: '采购单位', prop: 'materialCode',  },
-			{ label: '本次发货数量', prop: 'materialCode',  },
-			{ label: '采购数量', prop: 'materialCode',  },
-			{ label: '已发货数量', prop: 'materialCode',  },
-			// { label: computed(() => t('message.list.MaterialName')), prop: 'materialName',  },
-			// { label: computed(() => t('message.list.Specification')), prop: 'specificationModel',  },
-			// { label: computed(() => t('message.list.PurchaseUnit')), prop: 'FUnitId',  },
-      // { label: '采购数量', prop: 'qty',  },
-      // { label: '处理中数量', prop: 'processingQty',  },
-      // { label: '已发货数量', prop: 'sendedQty',  },
-      // { label: '未发货数量', prop: 'notSendQty',  },
-      // { label: '本次发货数量', prop: 'nowSendQty', ,fixed:true  },
-			// { label: computed(() => t('message.list.UP')), prop: 'amount1',  },
-			// { label: computed(() => t('message.list.TotalAmount')), prop: 'amount2',  },
-			// { label: computed(() => t('message.list.AccumulatedReceiptQTY')), prop: 'FReceiveQty',  },
-			// { label: computed(() => t('message.list.TaxAmount')), prop: 'taxAmount',  },
-			// { label: computed(() => t('message.list.CommittedDeliveryDate')), prop: 'chengNuoJiaoQi',
-      //   , type: 'datetime', searchSpan: 12, searchRange: true, searchLabelWidth: 150,fixed:true },
-			// {
-			// 	label: computed(() => t('message.list.LatestCommittedDeliveryDate')),
-			// 	prop: 'newChengNuoJiaoQi',
-			// 	,
-			// 	type: 'datetime',
-			// 	searchSpan: 12,
-			// 	searchRange: true,
-			// 	searchLabelWidth: 150,
-      //   fixed:true
-			// },
-			// { label: computed(() => t('message.list.Comments2')), prop: 'remark',  },
+			{ label: 'PO号', prop: 'fBillNo' },
+			{ label: '物料编码', prop: 'materialCode' },
+			{ label: '物料名称', prop: 'materialName',width:'180' },
+			{ label: '采购单位', prop: 'unitName' },
+			{ label: '采购数量', prop: 'qty' },
+			{ label: '已发货数量', prop: 'sendedQty' },
+			{ label: '批号', prop: 'fSupplierLot' },
+      { label: '本次发货数量', prop: 'notSendQty',width:'180' },
+      { label: '供应商承诺交期', prop: 'chengNuoJiaoQi',width:'180' },
+      { label: '供应商承诺最新交期', prop: 'newChengNuoJiaoQi',width:'180' },
 		],
 	},
 	topId: '',
+  chengNuoJiaoQiP:'',
+  newChengNuoJiaoQiP:'',
 });
-const chengNuoJiaoQiChange = (item:any) => {
-  listApi().batchSetChengNuoJiaoQi([{
-    id:item.id,
-    newTime:item.chengNuoJiaoQi
-  }]).then((res:any) => {
-    if(res.resultCode === 0){
-      ElMessage.success('操作成功');
-    }
-    if(res.resultCode === -1){
-      ElMessage.success(res.errorMessage);
-    }
+watch(() => props.listData,() => {
+  state.data = props.listData
+})
+const fSupplierLotFun = () => {
+  state.data.forEach((item:any) => {
+    item.fSupplierLot = state.fSupplierLot
   })
+  console.log(state.data)
+  // state.fSupplierLot = '';
 }
-const newChengNuoJiaoQiChange = (item:any) => {
-  listApi().batchSetNewChengNuoJiaoQi([{
-    id:item.id,
-    newTime:item.newChengNuoJiaoQi
-  }]).then((res:any) => {
-    if(res.resultCode === 0){
+const chengNuoJiaoQiPFun = (e: string) => {
+  let arr: any = [];
+  if (e === '0') {
+    state.data.forEach((item: any) => {
+      arr.push({ id: item.id, newTime: state.chengNuoJiaoQiP });
+    });
+    batchSetChengNuoJiaoQiFun(arr)
+  }
+  if (e === '1') {
+    state.data.forEach((item: any) => {
+      arr.push({ id: item.id, newTime: state.newChengNuoJiaoQiP });
+    });
+    batchSetNewChengNuoJiaoQiFun(arr)
+  }
+};
+const batchSetChengNuoJiaoQiFun = (arr:any) => {
+  listApi().batchSetChengNuoJiaoQi(arr).then((res: any) => {
+    if (res.resultCode === 0) {
       ElMessage.success('操作成功');
+      state.data.forEach((item:any) => {
+        item.chengNuoJiaoQi = state.chengNuoJiaoQiP
+      })
+      // state.chengNuoJiaoQiP = '';
     }
-    if(res.resultCode === -1){
+    if (res.resultCode === -1) {
       ElMessage.success(res.errorMessage);
+      // state.newChengNuoJiaoQiP = '';
     }
-  })
+  });
+}
+const batchSetNewChengNuoJiaoQiFun = (arr:any) => {
+  listApi().batchSetNewChengNuoJiaoQi(arr).then((res: any) => {
+    if (res.resultCode === 0) {
+      ElMessage.success('操作成功');
+
+      state.data.forEach((item:any) => {
+        item.newChengNuoJiaoQi = state.newChengNuoJiaoQiP
+      })
+      // state.chengNuoJiaoQiP = '';
+    }
+    if (res.resultCode === -1) {
+      ElMessage.success(res.errorMessage);
+      // state.newChengNuoJiaoQiP = '';
+    }
+  });
 }
 const batchAddInvoiceOrderFun = () => {
   console.log(props.listData)
@@ -133,7 +168,7 @@ const batchAddInvoiceOrderFun = () => {
   props.listData.forEach((item:any) => {
     arr.push({
       id:item.id,
-      qty:item.nowSendQty
+      qty:item.notSendQty
     })
   })
   listApi().batchAddInvoiceOrder(arr).then((res:any) => {
@@ -142,10 +177,13 @@ const batchAddInvoiceOrderFun = () => {
       emits('generateDocuments')
     }
     if(res.resultCode === -1){
-      ElMessage.success(res.errorMessage);
+      ElMessage.error(res.errorMessage);
     }
   })
 }
+const closeFun = () => {
+  emits('close')
+}
 </script>
 <style scoped lang="scss">
 .btnList {
@@ -153,4 +191,105 @@ const batchAddInvoiceOrderFun = () => {
 	display: flex;
 	justify-content: center;
 }
+:deep(.avue-crud__left) {
+  flex: 1;
+}
+
+:deep(.avue-crud__refreshBtn) {
+  display: none;
+}
+
+:deep(.avue-crud__gridBtn) {
+  display: none;
+}
+
+.piliang {
+  margin-left: 12px;
+  border: 1px solid #d5d5d5;
+  border-radius: 8px;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  padding: 4px;
+}
+
+.system-user-container {
+  //padding: 0 !important;
+}
+
+.multi-line-omit {
+  word-break: break-all; // 允许单词内自动换行，如果一个单词很长的话
+  text-overflow: ellipsis; // 溢出用省略号显示
+  overflow: hidden; // 超出的文本隐藏
+  display: -webkit-box; // 作为弹性伸缩盒子模型显示
+  -webkit-line-clamp: 1; // 显示的行
+  -webkit-box-orient: vertical; // 设置伸缩盒子的子元素排列方式--从上到下垂直排列
+}
+
+.selectBoxes {
+  display: flex;
+  flex: 1;
+
+  .selectItem {
+    margin-right: 16px;
+    display: flex;
+  }
+}
+
+:deep(.avue-crud) {
+  height: 100%;
+  width: 100%;
+}
+
+:deep(.avue-crud--card) {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
+:deep(.avue-crud__body) {
+  flex: 1;
+}
+
+:deep(.el-table__header) {
+  height: 40px;
+}
+
+:deep(.el-card__body) {
+  width: 100% !important;
+  height: 100% !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+}
+
+:deep(.el-table__cell) {
+  //padding: 0 !important;
+  //height: 56px !important;
+}
+
+:deep(.el-card) {
+  padding: 12px;
+}
+
+:deep(.el-form) {
+  flex: 1;
+}
+
+.system-user-container {
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+
+    .el-table {
+      flex: 1;
+    }
+  }
+}
+
+:deep(.el-col) {
+  margin-bottom: 16px;
+}
 </style>
diff --git a/src/views/system/user/dialog.vue b/src/views/system/user/dialog.vue
index c304389..619b8af 100644
--- a/src/views/system/user/dialog.vue
+++ b/src/views/system/user/dialog.vue
@@ -4,55 +4,46 @@
 			<el-form ref="userDialogFormRef" :model="state.ruleForm" size="default" label-width="90px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="账户名称">
-							<el-input v-model="state.ruleForm.userName" placeholder="请输入账户名称" clearable></el-input>
+						<el-form-item label="账号">
+							<el-input v-model="state.ruleForm.login" placeholder="请输入账号" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="用户昵称">
-							<el-input v-model="state.ruleForm.userNickname" placeholder="请输入用户昵称" clearable></el-input>
+						<el-form-item label="名称">
+							<el-input v-model="state.ruleForm.name" placeholder="请输入名称" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="关联角色">
-							<el-select v-model="state.ruleForm.roleSign" placeholder="请选择" clearable class="w100">
-								<el-option label="超级管理员" value="admin"></el-option>
-								<el-option label="普通用户" value="common"></el-option>
+						<el-form-item label="国外账号">
+							<el-select placeholder="业务状态" size="default" style="width: 240px" v-model="state.ruleForm.ifForeign">
+								<el-option label="是" value="1" />
+								<el-option label="否" value="0" />
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="部门">
-							<el-cascader
-								:options="state.deptData"
-								:props="{ checkStrictly: true, value: 'deptName', label: 'deptName' }"
-								placeholder="请选择部门"
-								clearable
-								class="w100"
-								v-model="state.ruleForm.department"
-							>
-								<template #default="{ node, data }">
-									<span>{{ data.deptName }}</span>
-									<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-								</template>
-							</el-cascader>
-						</el-form-item>
-					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="手机号">
-							<el-input v-model="state.ruleForm.phone" placeholder="请输入手机号" clearable></el-input>
+							<el-input v-model="state.ruleForm.mobile" placeholder="请输入手机号" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="邮箱">
-							<el-input v-model="state.ruleForm.email" placeholder="请输入" clearable></el-input>
+						<el-form-item label="账号类型">
+							<el-select placeholder="账号类型" size="default" style="width: 240px" v-model="state.ruleForm.systemType">
+								<el-option label="管理员" value="1" />
+								<el-option label="供应商" value="0" />
+							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="性别">
-							<el-select v-model="state.ruleForm.sex" placeholder="请选择" clearable class="w100">
-								<el-option label="男" value="男"></el-option>
-								<el-option label="女" value="女"></el-option>
+						<el-form-item label="供应商">
+							<el-select
+								placeholder="请选择供应商"
+								size="default"
+								style="width: 240px"
+								v-model="state.BDSupplierListItem"
+								@change="BDSupplierListItemChange"
+							>
+								<el-option :label="item.text" :value="item.value" v-for="(item, index) of state.BDSupplierList" :key="index" />
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -61,21 +52,6 @@
 							<el-input v-model="state.ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="账户过期">
-							<el-date-picker v-model="state.ruleForm.overdueTime" type="date" placeholder="请选择" class="w100"> </el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="用户状态">
-							<el-switch v-model="state.ruleForm.status" inline-prompt active-text="启" inactive-text="禁"></el-switch>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="用户描述">
-							<el-input v-model="state.ruleForm.describe" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input>
-						</el-form-item>
-					</el-col>
 				</el-row>
 			</el-form>
 			<template #footer>
@@ -89,27 +65,27 @@
 </template>
 
 <script setup lang="ts" name="systemUserDialog">
-import { reactive, ref } from 'vue';
-
+import {nextTick, reactive, ref} from 'vue';
+import { listApi } from '../../../api/list/index';
+import {ElMessage} from "element-plus";
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
 const userDialogFormRef = ref();
 const state = reactive({
+  BDSupplierList:[],
+  BDSupplierListItem:{},
 	ruleForm: {
-		userName: '', // 账户名称
-		userNickname: '', // 用户昵称
-		roleSign: '', // 关联角色
-		department: [] as string[], // 部门
-		phone: '', // 手机号
-		email: '', // 邮箱
-		sex: '', // 性别
+    ifForeign:'',
+    systemType:0,
+    login: '', // 账户名称
+		name: '', // 用户昵称
+		mobile: '', // 手机号
 		password: '', // 账户密码
-		overdueTime: '', // 账户过期
-		status: true, // 用户状态
-		describe: '', // 用户描述
-	},
+    supplierId:'',
+    supplierName:''
+  },
 	deptData: [] as DeptTreeType[], // 部门数据
 	dialog: {
 		isShowDialog: false,
@@ -120,18 +96,23 @@ const state = reactive({
 });
 
 // 打开弹窗
-const openDialog = (type: string, row: RowUserType) => {
+const openDialog = (type: string, row: any) => {
 	if (type === 'edit') {
-		state.ruleForm = row;
+    state.ruleForm.ifForeign = row.ifForeign
+    state.ruleForm.systemType = row.systemType
+    state.ruleForm.login = row.login
+    state.ruleForm.name = row.name
+    state.ruleForm.mobile = row.mobile
+    state.BDSupplierListItem = row.supplierId
 		state.dialog.title = '修改用户';
 		state.dialog.submitTxt = '修 改';
 	} else {
 		state.dialog.title = '新增用户';
 		state.dialog.submitTxt = '新 增';
 		// 清空表单，此项需加表单验证才能使用
-		// nextTick(() => {
-		// 	userDialogFormRef.value.resetFields();
-		// });
+		nextTick(() => {
+			userDialogFormRef.value.resetFields();
+		});
 	}
 	state.dialog.isShowDialog = true;
 	getMenuData();
@@ -147,37 +128,25 @@ const onCancel = () => {
 // 提交
 const onSubmit = () => {
 	closeDialog();
-	emit('refresh');
-	// if (state.dialog.type === 'add') { }
+
+	emit('refresh', {...state.ruleForm,dataState:state.dialog.title === '新增用户' ? '0':'1'});
 };
-// 初始化部门数据
+
+const BDSupplierListItemChange = (item:any) => {
+  state.ruleForm.supplierId = item.value
+  state.ruleForm.supplierName = item.text
+}
+
+// 初始化供应商数据
 const getMenuData = () => {
-	state.deptData.push({
-		deptName: 'vueNextAdmin',
-		createTime: new Date().toLocaleString(),
-		status: true,
-		sort: Math.random(),
-		describe: '顶级部门',
-		id: Math.random(),
-		children: [
-			{
-				deptName: 'IT外包服务',
-				createTime: new Date().toLocaleString(),
-				status: true,
-				sort: Math.random(),
-				describe: '总部',
-				id: Math.random(),
-			},
-			{
-				deptName: '资本控股',
-				createTime: new Date().toLocaleString(),
-				status: true,
-				sort: Math.random(),
-				describe: '分部',
-				id: Math.random(),
-			},
-		],
-	});
+  listApi().getBDSupplierList({}).then((res:any) => {
+    if (res.resultCode === 0) {
+      state.BDSupplierList = res.data
+    }
+    if (res.resultCode === -1) {
+      ElMessage.error(res.errorMessage);
+    }
+  })
 };
 
 // 暴露变量
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 29282a5..808ab1a 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,150 +1,249 @@
 <template>
 	<div class="system-user-container layout-padding">
-		<el-card shadow="hover" class="layout-padding-auto">
-			<div class="system-user-search mb15">
-				<el-button size="default" type="success" class="ml10" @click="onOpenAddUser('add')">
-					<el-icon>
-						<ele-FolderAdd />
-					</el-icon>
-					新增用户
-				</el-button>
-			</div>
-			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
-				<el-table-column type="index" label="序号" width="60" />
-				<el-table-column prop="userName" label="账户名称" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="userName" label="供应商名称" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="userName" label="供应商ID" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="userNickname" label="用户昵称" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="status" label="用户状态" show-overflow-tooltip>
-					<template #default="scope">
-						<el-tag type="success" v-if="scope.row.status">启用</el-tag>
-						<el-tag type="info" v-else>禁用</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column prop="describe" label="用户描述" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
-				<el-table-column label="操作" width="100">
-					<template #default="scope">
-						<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenEditUser('edit', scope.row)"
-							>修改</el-button
-						>
-						<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination
-				@size-change="onHandleSizeChange"
-				@current-change="onHandleCurrentChange"
-				class="mt15"
-				:pager-count="5"
-				:page-sizes="[10, 20, 30]"
-				v-model:current-page="state.tableData.param.pageNum"
-				background
-				v-model:page-size="state.tableData.param.pageSize"
-				layout="total, sizes, prev, pager, next, jumper"
-				:total="state.tableData.total"
+		<el-card class="layout-padding-auto" shadow="hover">
+			<avue-crud
+				ref="crudRef"
+				:data="state.data"
+				:option="state.option"
+				v-model:page="state.page"
+				@on-load="onLoadFun"
+				:table-loading="state.loading"
 			>
-			</el-pagination>
+				<template #menu-left>
+					<el-button type="primary" size="default" @click="userDialogRefShow">添加账号</el-button>
+				</template>
+				<template #menu="{ row }">
+					<el-button type="text" @click="xiugaizhanghao(row)">修改</el-button>
+				</template>
+			</avue-crud>
+			<UserDialog ref="userDialogRef" @refresh="getTableData" />
 		</el-card>
-		<UserDialog ref="userDialogRef" @refresh="getTableData()" />
 	</div>
 </template>
 
-<script setup lang="ts" name="systemUser">
-import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
-import { ElMessageBox, ElMessage } from 'element-plus';
+<script lang="ts" setup>
+import { reactive, onMounted, ref } from 'vue';
+import { listApi } from '../../../api/list/index';
+import UserDialog from './dialog.vue';
+import { ElMessage } from 'element-plus';
 
-// 引入组件
-const UserDialog = defineAsyncComponent(() => import('/@/views/system/user/dialog.vue'));
-
-// 定义变量内容
 const userDialogRef = ref();
-const state = reactive<SysUserState>({
-	tableData: {
-		data: [],
-		total: 0,
-		loading: false,
-		param: {
-			pageNum: 1,
-			pageSize: 10,
-		},
+// 定义变量内容
+const state = reactive({
+	page: {
+		total: 1000,
+		currentPage: 1,
+		pageSize: 30,
 	},
+	option: {
+		height: '720',
+		tip: false,
+		index: false,
+		menuWidth: 120,
+		border: true,
+		delBtn: false,
+		editBtn: false,
+		align: 'center',
+		selection: false,
+		searchMenuSpan: 3,
+		addBtn: false,
+		column: [
+			{ label: '供应商编码', prop: 'supplierId' },
+			{ label: '供应商名称', prop: 'supplierName' },
+			{ label: '账号', prop: 'login' },
+			{ label: '名称', prop: 'name' },
+			{
+				label: '是否为国外账号',
+				prop: 'ifForeign',
+				dicData: [
+					{ label: '否', value: '0' },
+					{ label: '是', value: '1' },
+				],
+			},
+			{ label: '手机号码', prop: 'mobile' },
+			{
+				label: '账号类型',
+				prop: 'systemType',
+				dicData: [
+					{ label: '供应商', value: '0' },
+					{ label: '管理员', value: '1' },
+				],
+			},
+			{
+				label: '账号状态',
+				prop: 'status',
+        dicData: [
+          { label: '禁用', value: '0' },
+          { label: '正常', value: '1' },
+        ],
+			},
+		],
+	},
+	data: [],
+	elDatePicker: '',
+	formData: {
+		fBillNo: '',
+		fDateBegin: '',
+		fDateEmd: '',
+		fmrpCloseStatus: '',
+	},
+	selectedData: [],
+	chengNuoJiaoQiP: '',
+	newChengNuoJiaoQiP: '',
+	selectedDataShow: false,
+	loading: false,
+  itemId:''
 });
-
-// 初始化表格数据
-const getTableData = () => {
-	state.tableData.loading = true;
-	const data = [];
-	for (let i = 0; i < 2; i++) {
-		data.push({
-			userName: i === 0 ? 'admin' : 'test',
-			userNickname: i === 0 ? '我是管理员' : '我是普通用户',
-			roleSign: i === 0 ? 'admin' : 'common',
-			department: i === 0 ? ['vueNextAdmin', 'IT外包服务'] : ['vueNextAdmin', '资本控股'],
-			phone: '12345678910',
-			email: 'vueNextAdmin@123.com',
-			sex: '女',
-			password: '123456',
-			overdueTime: new Date(),
-			status: true,
-			describe: i === 0 ? '不可删除' : '测试用户',
-			createTime: new Date().toLocaleString(),
+const getTableData = (item: any) => {
+	listApi()
+		.loginSave({ ...item })
+		.then((res: any) => {
+			if (res.resultCode === 0) {
+				ElMessage.success('成功');
+        getList();
+			}
+			if (res.resultCode === -1) {
+				ElMessage.error(res.errorMessage);
+			}
 		});
-	}
-	state.tableData.data = data;
-	state.tableData.total = state.tableData.data.length;
-	setTimeout(() => {
-		state.tableData.loading = false;
-	}, 500);
 };
-// 打开新增用户弹窗
-const onOpenAddUser = (type: string) => {
-	userDialogRef.value.openDialog(type);
+const onLoadFun = (e: any) => {
+	state.page.currentPage = e.currentPage;
+	state.page.pageSize = e.pageSize;
+	getList();
 };
-// 打开修改用户弹窗
-const onOpenEditUser = (type: string, row: RowUserType) => {
-	userDialogRef.value.openDialog(type, row);
-};
-// 删除用户
-const onRowDel = (row: RowUserType) => {
-	ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.userName}”，是否继续?`, '提示', {
-		confirmButtonText: '确认',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(() => {
-			getTableData();
-			ElMessage.success('删除成功');
+const getList = () => {
+	state.loading = true;
+	listApi()
+		.loginGetPageList({
+			pageSize: state.page.pageSize,
+			page: state.page.currentPage,
 		})
-		.catch(() => {});
+		.then((res: any) => {
+			state.loading = false;
+			if (res.resultCode === 0) {
+				state.data = res.data.dataList;
+				state.page.total = res.data.total;
+			}
+		});
 };
-// 分页改变
-const onHandleSizeChange = (val: number) => {
-	state.tableData.param.pageSize = val;
-	getTableData();
-};
-// 分页改变
-const onHandleCurrentChange = (val: number) => {
-	state.tableData.param.pageNum = val;
-	getTableData();
+
+const userDialogRefShow = () => {
+	userDialogRef.value.openDialog();
 };
+const xiugaizhanghao = (row:any) => {
+  state.itemId = row.id
+  userDialogRef.value.openDialog('edit',row);
+}
+
 // 页面加载时
-onMounted(() => {
-	getTableData();
-});
+onMounted(() => {});
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
+:deep(.cell) {
+	padding: 0 !important;
+}
+
+:deep(.avue-crud__left) {
+	flex: 1;
+}
+
+:deep(.avue-crud__refreshBtn) {
+	display: none;
+}
+
+:deep(.avue-crud__gridBtn) {
+	display: none;
+}
+
+.piliang {
+	margin-left: 12px;
+	border: 1px solid #d5d5d5;
+	border-radius: 8px;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	box-sizing: border-box;
+	padding: 4px;
+}
+
+.system-user-container {
+	padding: 0 !important;
+}
+
+.multi-line-omit {
+	word-break: break-all; // 允许单词内自动换行，如果一个单词很长的话
+	text-overflow: ellipsis; // 溢出用省略号显示
+	overflow: hidden; // 超出的文本隐藏
+	display: -webkit-box; // 作为弹性伸缩盒子模型显示
+	-webkit-line-clamp: 1; // 显示的行
+	-webkit-box-orient: vertical; // 设置伸缩盒子的子元素排列方式--从上到下垂直排列
+}
+
+.selectBoxes {
+	display: flex;
+	flex: 1;
+
+	.selectItem {
+		margin-right: 16px;
+		display: flex;
+	}
+}
+
+:deep(.avue-crud) {
+	height: 100%;
+	width: 100%;
+}
+
+:deep(.avue-crud--card) {
+	display: flex;
+	flex-direction: column;
+	flex: 1;
+}
+
+:deep(.avue-crud__body) {
+	flex: 1;
+}
+
+:deep(.el-table__header) {
+	height: 40px;
+}
+
+:deep(.el-card__body) {
+	width: 100% !important;
+	height: 100% !important;
+	overflow: hidden !important;
+	padding: 0 !important;
+}
+
+:deep(.el-table__cell) {
+	padding: 0 !important;
+	//height: 56px !important;
+}
+
+:deep(.el-card) {
+	padding: 12px;
+}
+
+:deep(.el-form) {
+	flex: 1;
+}
+
 .system-user-container {
 	:deep(.el-card__body) {
 		display: flex;
 		flex-direction: column;
 		flex: 1;
 		overflow: auto;
+
 		.el-table {
 			flex: 1;
 		}
 	}
 }
+
+:deep(.el-col) {
+	margin-bottom: 16px;
+}
 </style>