初次对接

src/api/list/index.ts

@@ -79,5 +79,21 @@ export function listApi() {
                 data,
             });
         },
+        //用户状态更新
+        batchUpdateStatus: (data: object) => {
+            return request({
+                url: '/api/Admin/Login/BatchUpdateStatus',
+                method: 'post',
+                data,
+            });
+        },
+        //修改密码
+        UpPassword: (data: object) => {
+            return request({
+                url: '/api/Admin/Login/UpPassword',
+                method: 'get',
+                params:data,
+            });
+        },
     };
 }

src/layout/navBars/topBar/user.vue

@@ -77,12 +77,21 @@
 					<!--          <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="" @click="()=>{state.dialogShow = true}">修改密码</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" />
+    <el-dialog title="修改密码" v-model="state.dialogShow" width="300px" @close="dialogCloseFun">
+      <el-input v-model="state.password" placeholder="请输入" type="password" clearable></el-input>
+      <template #footer>
+				<span class="dialog-footer">
+					<el-button size="default" @click="()=>{state.dialogShow = true}">取 消</el-button>
+					<el-button type="primary" size="default" @click="passwordFunTJ">确定</el-button>
+				</span>
+      </template>
+    </el-dialog>
 	</div>
 </template>
 
@@ -98,7 +107,7 @@ import { useThemeConfig } from '/@/stores/themeConfig';
 import other from '/@/utils/other';
 import mittBus from '/@/utils/mitt';
 import { Session, Local } from '/@/utils/storage';
-
+import { listApi } from '../../../api/list/index'
 // 引入组件
 const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/topBar/userNews.vue'));
 const Search = defineAsyncComponent(() => import('/@/layout/navBars/topBar/search.vue'));
@@ -117,8 +126,20 @@ const state = reactive({
 	isScreenfull: false,
 	disabledI18n: 'zh-cn',
 	disabledSize: 'large',
+  dialogShow:false,
+  password:''
 });
-
+const dialogCloseFun = () => {
+  state.dialogShow = false
+  state.password = ''
+}
+const passwordFunTJ = () => {
+  listApi().UpPassword({pwd:state.password}).then((res:any) => {
+    if (res.resultCode === 0) {
+      ElMessage.success('修改成功');
+    }
+  })
+}
 // 设置分割样式
 const layoutUserFlexNum = computed(() => {
 	let num: string | number = '';

src/views/materialReceiptNotice/ceshi.vue

@@ -26,8 +26,18 @@
 			<div class="item item3">
 				<VueQr style="width: 150px; height: 150px" :text="state.pageData.f_VHUB_Text" :size="150"></VueQr>
 			</div>
+
 		</div>
 		<avue-crud ref="crudRef" :data="props.data" :option="state.option"></avue-crud>
+    <div class="shuming">
+      <div class="nameText">送货人：</div>
+      <div class="dateTime">
+        <span>年</span>
+        <span>月</span>
+        <span>日</span>
+      </div>
+
+    </div>
 	</div>
 </template>
 
@@ -42,22 +52,7 @@ const props = defineProps({
 		default: () => [],
 	},
 });
-watch(
+
-	() => props.data,
-	(newData) => {
-    // console.log(JSON.parse(JSON.stringify(newData)))
-    let arr = []
-    arr = JSON.parse(JSON.stringify(newData))
-    // console.log(arr.length)
-    // debugger
-    if(arr.length !== 0){
-      state.pageData.fBillNo = arr[0].fBillNo
-      state.pageData.supplierName = arr[0].supplierName
-      state.pageData.deliveryDate = arr[0].deliveryDate
-      state.pageData.f_VHUB_Text = arr[0].f_VHUB_Text
-    }
-  }
-);
 const state = reactive({
 	pageData: {
 		fBillNo: '',
@@ -90,12 +85,41 @@ const state = reactive({
 		],
 	},
 });
+watch(
+	() => props.data,
+	(newData) => {
+		let arr = [];
+		arr = JSON.parse(JSON.stringify(newData));
+		if (arr.length !== 0) {
+			state.pageData.fBillNo = arr[0].fBillNo;
+			state.pageData.supplierName = arr[0].supplierName;
+			state.pageData.deliveryDate = arr[0].deliveryDate;
+			state.pageData.f_VHUB_Text = arr[0].f_VHUB_Text;
+		}
+	},
+	{ immediate: true,deep:true }
+);
 defineExpose({
 	orderPrintingRef,
 });
 </script>
 
 <style scoped lang="scss">
+.shuming{
+  width: 100%;
+  text-align: right;
+}
+.nameText{
+  margin-right: 120px;
+  margin-top: 80px;
+}
+.dateTime{
+  margin-right: 50px;
+  margin-top: 16px;
+}
+.dateTime > span{
+  margin-left: 42px;
+}
 :deep(.el-table__inner-wrapper) {
 	box-sizing: border-box;
 	//border: 1px solid black;

src/views/materialReceiptNotice/index.vue

@@ -7,13 +7,14 @@
 				:option="state.option"
 				v-model:page="state.page"
 				@on-load="onLoadFun"
-          @selection-change="selectionChange"
 				:table-loading="state.loading"
 			>
-        <template #deliveryDate="{ row }">{{ row.ifHidden === 0 ? row.deliveryDate : '' }}</template>
+				<template #checkboxBox="{ row }">
-        <template #purchaseOrderFBillNo="{ row }">{{ row.ifHidden === 0 ? row.purchaseOrderFBillNo : '' }}</template>
+          <div style="width: 100%;height: 100%;display: flex;align-items: center;justify-content: center">
+            <el-checkbox v-if="row.ifHidden === 0" v-model="row.checkboxBox" true-value="1" false-value="0" @change="selectionChange"/>
+          </div>
+        </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>
@@ -27,21 +28,7 @@
 				<template #menu-left>
 					<div class="selectBoxes">
 						<div class="selectItem">
-              <el-input v-model="state.formData.purchaseOrderFBillNo" style="width: 240px" placeholder="采购单号" size="default" />
+							<el-input v-model="state.formData.sheet" 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>
@@ -57,20 +44,27 @@
 				</template>
 			</avue-crud>
 		</el-card>
-    <selectedData :listData="state.selectedData" :showes="state.selectedDataShow" @close="() => {state.selectedDataShow = false}"/>
+		<selectedData
+			:listData="state.selectedData"
+			:showes="state.selectedDataShow"
+			@close="
+				() => {
+					state.selectedDataShow = false;
+				}
+			"
+		/>
 	</div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, onMounted, computed, nextTick } from 'vue';
+import { reactive, onMounted, computed, nextTick, ref } from 'vue';
-// import { useRouter } from 'vue-router';
 import { listApi } from '../../api/list/index';
+import { ElMessage } from 'element-plus';
 import { useI18n } from 'vue-i18n';
 import SelectedData from '/@/views/materialReceiptNotice/selectedData.vue';
-// import { ElMessage } from 'element-plus';
 
 const { t } = useI18n();
-// const router = useRouter();
+const crudRef = ref();
 // 定义变量内容
 const state = reactive({
 	page: {
@@ -79,7 +73,7 @@ const state = reactive({
 		pageSize: 30,
 	},
 	option: {
-    height: computed(() => window.innerHeight - (window.innerHeight * 0.25) + '') ,
+		height: computed(() => window.innerHeight - window.innerHeight * 0.25 + ''),
 		tip: false,
 		index: false,
 		menuWidth: 120,
@@ -87,38 +81,28 @@ const state = reactive({
 		delBtn: false,
 		editBtn: false,
 		align: 'center',
-    selection: true,
+		selection: false,
 		searchMenuSpan: 3,
 		addBtn: false,
 		column: [
-      {
+			{ label: '', prop: 'checkboxBox',width: 35 },
-        label: computed(() => t('message.list.ReceivingDate')),
+			{ label: '发货单号', prop: 'sheet', width: '135' },
-        prop: 'deliveryDate',
+			{ label: '美塞斯批号', prop: 'mssSupplierLot' },
-        type: 'datetime',
+			{ label: '供应商批号', prop: 'fSupplierLot' },
-        searchSpan: 12,
+			{ label: '物料编码', prop: 'materialCode', width: '120' },
-        searchRange: true,
-        width:'160'
-      },
-      { label: '采购单号', prop: 'purchaseOrderFBillNo',width:'120' },
-      { label: '发货单号', prop: 'sheet',width:'135' },
-      { label: '收料单号', prop: 'fBillNo',width:'110' },
-      { label: '美塞斯批号', prop: 'mssSupplierLot',width:'90' },
-      { label: '供应商批号', prop: 'fSupplierLot',width:'90' },
-      { label: '物料编码', prop: 'materialCode',width:'120' },
 			{ label: '物料名称', prop: 'materialName' },
-
+			{ label: computed(() => t('message.list.SupplierCode2')), prop: 'supplierId', width: '90' },
-      { label: computed(() => t('message.list.SupplierCode2')), prop: 'supplierId',width:'90' },
+			{ label: computed(() => t('message.list.SupplierName2')), prop: 'supplierName', width: '120' },
-      { label: computed(() => t('message.list.SupplierName2')), prop: 'supplierName',width:'120' },
+			{ label: '累计收料数量', prop: 'sendedQty', width: '110' },
-      { label: '累计收料数量', prop: 'sendedQty',width:'110' },
+			{ label: '发货数量', prop: 'qty' },
-      { label: '发货数量', prop: 'qty',width:'80' },
+			{ label: '采购数量', prop: 'purchaseQty' },
-      { label: '采购数量', prop: 'purchaseQty',width:'80' },
+			{ label: '采购单位', prop: 'unitName' },
-      { label: '采购单位', prop: 'unitName',width:'80' },
 		],
 	},
 	data: [],
 	elDatePicker: '',
 	formData: {
-    purchaseOrderFBillNo: '',
+		sheet: '',
 		fDateBegin: '',
 		fDateEmd: '',
 		fmrpCloseStatus: '',
@@ -129,16 +113,17 @@ const state = reactive({
 	selectedDataShow: false,
 	loading: false,
 });
-const selectionChange = (list: any) => {
+const selectionChange = () => {
-  nextTick(() => {
+  let ids: any = [];
-    state.selectedData = JSON.parse(JSON.stringify(list));
+  let arr: any = []
-  });
+  state.data.forEach((item:any) => {
+    if(item.checkboxBox === '1'){
+      arr.push(item)
+    }
+  })
+  state.selectedData = arr
 };
 
-const elDatePickerFun = (val: any) => {
-  state.formData.fDateBegin = val[0];
-  state.formData.fDateEmd = val[1];
-};
 //接口数据处理
 const selectFun = () => {
 	state.page.currentPage = 1;
@@ -150,7 +135,7 @@ const resetFun = () => {
 	state.page.pageSize = 30;
 	state.elDatePicker = '';
 	state.formData = {
-    purchaseOrderFBillNo: '',
+		sheet: '',
 		fDateBegin: '',
 		fDateEmd: '',
 		fmrpCloseStatus: '',
@@ -174,17 +159,27 @@ const getList = () => {
 			state.loading = false;
 			if (res.resultCode === 0) {
 				state.data = res.data.dataList;
+        state.data.forEach((item:any) => {
+          item.checkboxBox = '0'
+        })
 				state.page.total = res.data.total;
 			}
 		});
 };
 // 页面加载时
-onMounted(() => {
+onMounted(() => {});
-  // console.log(window.innerHeight - 400)
-});
 </script>
 
 <style lang="scss" scoped>
+//.el-checkbox__inner:nth-child(1){
+//  display: none;
+//}
+:deep(.el-checkbox--default):nth-child(0) {
+	display: none !important;
+}
+:deep(.el-checkbox){
+  height: 15px !important;
+}
 :deep(.cell) {
 	padding: 0 8px !important;
 }
@@ -192,10 +187,12 @@ onMounted(() => {
 :deep(.avue-crud__left) {
 	flex: 1;
 }
-:deep(.el-button--text){
+
+:deep(.el-button--text) {
 	padding: 0 !important;
 	height: auto !important;
 }
+
 :deep(.avue-crud__refreshBtn) {
 	display: none;
 }

src/views/mssPurchaseOrder/index.vue

@@ -28,7 +28,7 @@
 					<el-button type="primary" size="default" @click="selectFun">搜索</el-button>
 					<el-button size="default" @click="resetFun">重置</el-button>
 				</div>
-        <div class="selectItem" style="flex: 1;margin-right: 0">
+				<div class="selectItem" style="flex: 1; margin-right: 0">
 					<div class="piliang">
 						<el-button type="primary" size="small" @click="state.selectedDataShow = true">
 							<span>已选中 {{ state.selectedData.length }} 条数据，去查看</span>
@@ -61,7 +61,10 @@
 				@selection-change="selectionChange"
 				:table-loading="state.loading"
 			>
-				<template #fBillNo="{ row }">{{ row.ifHidden === 0 ? row.fBillNo : '' }}</template>
+				<template #fBillNo="{ row }">
+          <span v-if="row.ifHidden === 0" @click="toPurchaseDetails(row)" style="cursor: pointer">{{ row.fBillNo }}</span>
+<!--          {{ row.ifHidden === 0 ? row.fBillNo : '' }}-->
+        </template>
 				<template #fDate="{ row }">{{ row.ifHidden === 0 ? row.fDate : '' }}</template>
 				<template #fCancelStatus="{ row }">
 					{{ row.ifHidden === 0 ? (row.fCancelStatus === 'A' ? '未关闭' : '已关闭') : '' }}
@@ -95,9 +98,7 @@
 						@change="batchSetNewChengNuoJiaoQiFun([{ id: row.id, newTime: row.newChengNuoJiaoQi }])"
 					/>
 				</template>
-				<template #menu-left>
+				<template #menu-left></template>
-
-				</template>
 				<template #menu="{ row }">
 					<el-button type="text" icon="el-icon-pie-chart" @click="toPurchaseDetails(row)">查看</el-button>
 				</template>
@@ -124,7 +125,8 @@ 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';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { Session } from '/@/utils/storage';
 
 const selectedDataRef = ref();
 // const { t } = useI18n();
@@ -137,10 +139,10 @@ const state = reactive({
 		pageSize: 30,
 	},
 	option: {
-		height: computed(() => window.innerHeight - (window.innerHeight * 0.23) + ''),
+		height: computed(() => window.innerHeight - window.innerHeight * 0.23 + ''),
 		tip: false,
 		index: true,
-		menu: true,
+		menu: false,
 		menuWidth: 85,
 		border: true,
 		delBtn: false,
@@ -223,9 +225,19 @@ const chengNuoJiaoQiPFun = (e: string) => {
 	}
 };
 const batchSetChengNuoJiaoQiFun = (arr: any) => {
+	ElMessageBox({
+		closeOnClickModal: false,
+		closeOnPressEscape: false,
+		title: '提示',
+		message: '是否要修正此项日期',
+		showCancelButton: true,
+		buttonSize: 'default',
+		beforeClose: (action, instance, done) => {
+			if (action === 'confirm') {
 				listApi()
 					.batchSetChengNuoJiaoQi(arr)
 					.then((res: any) => {
+            done();
 						if (res.resultCode === 0) {
 							ElMessage.success('操作成功');
 							getList();
@@ -233,22 +245,44 @@ const batchSetChengNuoJiaoQiFun = (arr: any) => {
 						}
 						if (res.resultCode === -1) {
 							ElMessage.success(res.errorMessage);
-				state.newChengNuoJiaoQiP = '';
+							state.chengNuoJiaoQiP = '';
 						}
 					});
+			} else {
+				done();
+			}
+		},
+	});
 };
 const batchSetNewChengNuoJiaoQiFun = (arr: any) => {
+	ElMessageBox({
+		closeOnClickModal: false,
+		closeOnPressEscape: false,
+		title: '提示',
+		message: '是否要修正此项日期',
+		showCancelButton: true,
+		buttonSize: 'default',
+		beforeClose: (action, instance, done) => {
+			if (action === 'confirm') {
 				listApi()
 					.batchSetNewChengNuoJiaoQi(arr)
 					.then((res: any) => {
+            done();
 						if (res.resultCode === 0) {
 							ElMessage.success('操作成功');
 							getList();
+              state.newChengNuoJiaoQiP = ''
 						}
 						if (res.resultCode === -1) {
 							ElMessage.success(res.errorMessage);
+              state.newChengNuoJiaoQiP = ''
 						}
 					});
+			} else {
+				done();
+			}
+		},
+	});
 };
 const generateDocumentsFun = () => {
 	state.selectedDataShow = false;
@@ -259,7 +293,7 @@ const toPurchaseDetails = (item: any) => {
 	router.push({
 		path: '/purchaseDetails',
 		query: {
-      fBillNo: item.fBillNo ,
+			fBillNo: item.fBillNo,
 		},
 	});
 };
@@ -303,13 +337,12 @@ const getList = () => {
 			if (res.resultCode === 0) {
 				state.data = res.data.dataList;
 				state.page.total = res.data.total;
-
 			}
 		});
 };
 // 页面加载时
 onMounted(() => {
-  console.log(window.innerHeight - window.innerHeight * 0.25 + '')
+	console.log(window.innerHeight - window.innerHeight * 0.25 + '');
 });
 </script>
 
@@ -317,10 +350,12 @@ onMounted(() => {
 :deep(.avue-crud__header) {
 	display: none;
 }
-:deep(.el-button--text){
+
+:deep(.el-button--text) {
 	padding: 0 !important;
 	height: auto !important;
 }
+
 :deep(.avue-crud__pagination) {
 	padding: 0 12px !important;
 }
@@ -368,6 +403,7 @@ onMounted(() => {
 .selectBoxes {
 	display: flex;
 	flex-wrap: wrap;
+
 	.selectItem {
 		margin-right: 16px;
 		display: flex;

src/views/mssPurchaseOrder/purchaseDetails.vue

@@ -78,7 +78,7 @@ 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';
+import {ElMessage, ElMessageBox} from 'element-plus';
 const selectedDataRef = ref()
 // const { t } = useI18n();
 const router = useRouter();
@@ -175,8 +175,20 @@ const chengNuoJiaoQiPFun = (e: string) => {
     ElMessage.warning('请先选中数据');
   }
 };
-const batchSetChengNuoJiaoQiFun = (arr:any) => {
+const batchSetChengNuoJiaoQiFun = (arr: any) => {
-  listApi().batchSetChengNuoJiaoQi(arr).then((res: any) => {
+  ElMessageBox({
+    closeOnClickModal: false,
+    closeOnPressEscape: false,
+    title: '提示',
+    message: '是否要修正此项日期',
+    showCancelButton: true,
+    buttonSize: 'default',
+    beforeClose: (action, instance, done) => {
+      if (action === 'confirm') {
+        listApi()
+            .batchSetChengNuoJiaoQi(arr)
+            .then((res: any) => {
+              done();
               if (res.resultCode === 0) {
                 ElMessage.success('操作成功');
                 getList();
@@ -184,21 +196,45 @@ const batchSetChengNuoJiaoQiFun = (arr:any) => {
               }
               if (res.resultCode === -1) {
                 ElMessage.success(res.errorMessage);
-      state.newChengNuoJiaoQiP = '';
+                state.chengNuoJiaoQiP = '';
               }
             });
-}
+      } else {
-const batchSetNewChengNuoJiaoQiFun = (arr:any) => {
+        done();
-  listApi().batchSetNewChengNuoJiaoQi(arr).then((res: any) => {
+      }
+    },
+  });
+};
+const batchSetNewChengNuoJiaoQiFun = (arr: any) => {
+  ElMessageBox({
+    closeOnClickModal: false,
+    closeOnPressEscape: false,
+    title: '提示',
+    message: '是否要修正此项日期',
+    showCancelButton: true,
+    buttonSize: 'default',
+    beforeClose: (action, instance, done) => {
+      if (action === 'confirm') {
+        listApi()
+            .batchSetNewChengNuoJiaoQi(arr)
+            .then((res: any) => {
+              done();
               if (res.resultCode === 0) {
                 ElMessage.success('操作成功');
                 getList();
+                state.newChengNuoJiaoQiP = ''
               }
               if (res.resultCode === -1) {
                 ElMessage.success(res.errorMessage);
+                state.newChengNuoJiaoQiP = ''
               }
             });
-}
+      } else {
+        done();
+      }
+    },
+  });
+};
 const generateDocumentsFun = () => {
   state.selectedDataShow = false
   getList()

src/views/mssPurchaseOrder/selectedData.vue

@@ -18,30 +18,30 @@
 					<el-input-number v-model="row.notSendQty" size="small" />
 				</div>
 			</template>
-			<template #chengNuoJiaoQi="{ row }">
+<!--			<template #chengNuoJiaoQi="{ row }">-->
-				<div style="display: flex; align-items: center; justify-content: center">
+<!--				<div style="display: flex; align-items: center; justify-content: center">-->
-					<el-date-picker
+<!--					<el-date-picker-->
-						v-model="row.chengNuoJiaoQi"
+<!--						v-model="row.chengNuoJiaoQi"-->
-						type="date"
+<!--						type="date"-->
-						size="small"
+<!--						size="small"-->
-						style="width: 100%"
+<!--						style="width: 100%"-->
-						format="YYYY/MM/DD"
+<!--						format="YYYY/MM/DD"-->
-						@change="batchSetChengNuoJiaoQiFun([{ id: row.id, newTime: row.chengNuoJiaoQi }])"
+<!--						@change="batchSetChengNuoJiaoQiFun([{ id: row.id, newTime: row.chengNuoJiaoQi }])"-->
-					/>
+<!--					/>-->
-				</div>
+<!--				</div>-->
-			</template>
+<!--			</template>-->
-			<template #newChengNuoJiaoQi="{ row }">
+<!--			<template #newChengNuoJiaoQi="{ row }">-->
-				<div style="display: flex; align-items: center; justify-content: center">
+<!--				<div style="display: flex; align-items: center; justify-content: center">-->
-					<el-date-picker
+<!--					<el-date-picker-->
-						v-model="row.newChengNuoJiaoQi"
+<!--						v-model="row.newChengNuoJiaoQi"-->
-						type="date"
+<!--						type="date"-->
-						size="small"
+<!--						size="small"-->
-						style="width: 100%"
+<!--						style="width: 100%"-->
-						format="YYYY/MM/DD"
+<!--						format="YYYY/MM/DD"-->
-						@change="batchSetNewChengNuoJiaoQiFun([{ id: row.id, newTime: row.newChengNuoJiaoQi }])"
+<!--						@change="batchSetNewChengNuoJiaoQiFun([{ id: row.id, newTime: row.newChengNuoJiaoQi }])"-->
-					/>
+<!--					/>-->
-				</div>
+<!--				</div>-->
-			</template>
+<!--			</template>-->
 			<template #menu-left>
 				<div class="selectBoxes">
 					<el-date-picker
@@ -198,6 +198,7 @@ const batchAddInvoiceOrderFun = () => {
       arr.push({
         id: item.id,
         qty: item.notSendQty,
+        fSupplierLot:item.fSupplierLot
       });
     });
     listApi()

src/views/system/user/dialog.vue

@@ -103,8 +103,9 @@ const openDialog = (type: string, row: any) => {
     state.ruleForm.login = row.login
     state.ruleForm.name = row.name
     state.ruleForm.mobile = row.mobile
-    state.ruleForm.password = '******'
+    state.ruleForm.supplierId = row.supplierId
-    state.BDSupplierListItem = row.supplierId
+    state.ruleForm.supplierName = row.supplierName
+    state.ruleForm.password = ''
 		state.dialog.title = '修改用户';
 		state.dialog.submitTxt = '修 改';
 	} else {

src/views/system/user/index.vue

@@ -12,6 +12,16 @@
 				<template #menu-left>
 					<el-button type="primary" size="default" @click="userDialogRefShow">添加账号</el-button>
 				</template>
+        <template #status="scope">
+          <el-switch
+              v-model="scope.row.status"
+              active-value="1"
+              inactive-value="0"
+              active-text="启用"
+              inactive-text="禁用"
+              @change="statusChangeFun($event, scope.row.id)"
+          />
+        </template>
 				<template #menu="{ row }">
 					<el-button type="text" @click="xiugaizhanghao(row)">修改</el-button>
 				</template>
@@ -22,7 +32,7 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, onMounted, ref } from 'vue';
+import { reactive, onMounted, ref, nextTick } from 'vue';
 import { listApi } from '../../../api/list/index';
 import UserDialog from './dialog.vue';
 import { ElMessage } from 'element-plus';
@@ -92,13 +102,18 @@ const state = reactive({
 	newChengNuoJiaoQiP: '',
 	selectedDataShow: false,
 	loading: false,
-  itemId:''
+	itemId: '',
 });
 const getTableData = (item: any) => {
+	let data1 = { ...item };
+	let data2 = { ...item, id: state.itemId };
+  console.log(data2)
+  debugger
 	listApi()
-		.loginSave({ ...item })
+		.loginSave(state.itemId === '' ? data1 : data2)
 		.then((res: any) => {
 			if (res.resultCode === 0) {
+				state.itemId = '';
 				ElMessage.success('成功');
 				getList();
 			}
@@ -127,19 +142,34 @@ const getList = () => {
 			}
 		});
 };
+const statusChangeFun = (val: any, row:any) => {
+  nextTick(() => {
+    console.log(val,row)
+    if(row != undefined){
+      listApi().batchUpdateStatus({
+        status: val,
+        ids:[row]
+      }).then((res: any) => {
+        if(res.resultCode === 0){
+          ElMessage.success('修改成功');
+          getList()
+        }
+      });
+    }
+  })
 
+
+};
 const userDialogRefShow = () => {
 	userDialogRef.value.openDialog();
 };
-const xiugaizhanghao = (row:any) => {
+const xiugaizhanghao = (row: any) => {
-  state.itemId = row.id
+	state.itemId = row.id;
-  userDialogRef.value.openDialog('edit',row);
+	userDialogRef.value.openDialog('edit', row);
-}
+};
 
 // 页面加载时
-onMounted(() => {
+onMounted(() => {});
-
-});
 </script>
 
 <style lang="scss" scoped>