Develop/maxcess-synergy-admin
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初次对接

Browse Source
This commit is contained in:
刘晓鹏
2025-04-12 20:40:39 +08:00
parent 0d3bf51c2b
commit 12c297923a
9 changed files with 543 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/list/index.ts
View File

@@ -79,5 +79,21 @@ export function listApi() {
data, 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,
});
},
}; };
} }

27
src/layout/navBars/topBar/user.vue
View File

@@ -77,12 +77,21 @@
<!-- <el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</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="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>-->
<!-- <el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</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-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>
</el-dropdown> </el-dropdown>
<Search ref="searchRef" /> <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> </div>
</template> </template>
@@ -98,7 +107,7 @@ import { useThemeConfig } from '/@/stores/themeConfig';
import other from '/@/utils/other'; import other from '/@/utils/other';
import mittBus from '/@/utils/mitt'; import mittBus from '/@/utils/mitt';
import { Session, Local } from '/@/utils/storage'; import { Session, Local } from '/@/utils/storage';
import { listApi } from '../../../api/list/index'
// 引入组件 // 引入组件
const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/topBar/userNews.vue')); const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/topBar/userNews.vue'));
const Search = defineAsyncComponent(() => import('/@/layout/navBars/topBar/search.vue')); const Search = defineAsyncComponent(() => import('/@/layout/navBars/topBar/search.vue'));
@@ -117,8 +126,20 @@ const state = reactive({
isScreenfull: false, isScreenfull: false,
disabledI18n: 'zh-cn', disabledI18n: 'zh-cn',
disabledSize: 'large', 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(() => { const layoutUserFlexNum = computed(() => {
let num: string | number = ''; let num: string | number = '';

56
src/views/materialReceiptNotice/ceshi.vue
View File

@@ -26,8 +26,18 @@
<div class="item item3"> <div class="item item3">
<VueQr style="width: 150px; height: 150px" :text="state.pageData.f_VHUB_Text" :size="150"></VueQr> <VueQr style="width: 150px; height: 150px" :text="state.pageData.f_VHUB_Text" :size="150"></VueQr>
</div> </div>
</div> </div>
<avue-crud ref="crudRef" :data="props.data" :option="state.option"></avue-crud> <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> </div>
</template> </template>
@@ -42,22 +52,7 @@ const props = defineProps({
default: () => [], 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({ const state = reactive({
pageData: { pageData: {
fBillNo: '', 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({ defineExpose({
orderPrintingRef, orderPrintingRef,
}); });
</script> </script>
<style scoped lang="scss"> <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) { :deep(.el-table__inner-wrapper) {
box-sizing: border-box; box-sizing: border-box;
//border: 1px solid black; //border: 1px solid black;

419
src/views/materialReceiptNotice/index.vue
View File

@@ -1,296 +1,293 @@
<template> <template>
<div class="system-user-container layout-padding"> <div class="system-user-container layout-padding">
<el-card class="layout-padding-auto" shadow="hover"> <el-card class="layout-padding-auto" shadow="hover">
<avue-crud <avue-crud
ref="crudRef" ref="crudRef"
:data="state.data" :data="state.data"
:option="state.option" :option="state.option"
v-model:page="state.page" v-model:page="state.page"
@on-load="onLoadFun" @on-load="onLoadFun"
@selection-change="selectionChange" :table-loading="state.loading"
:table-loading="state.loading" >
> <template #checkboxBox="{ row }">
<template #deliveryDate="{ row }">{{ row.ifHidden === 0 ? row.deliveryDate : '' }}</template> <div style="width: 100%;height: 100%;display: flex;align-items: center;justify-content: center">
<template #purchaseOrderFBillNo="{ row }">{{ row.ifHidden === 0 ? row.purchaseOrderFBillNo : '' }}</template> <el-checkbox v-if="row.ifHidden === 0" v-model="row.checkboxBox" true-value="1" false-value="0" @change="selectionChange"/>
<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.purchaseOrderFBillNo" 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> </div>
</template> </template>
<template #menu> <template #sheet="{ row }">{{ row.ifHidden === 0 ? row.sheet : '' }}</template>
<div class="btnList"> <template #materialName="{ row }">
<el-button type="text" @click="state.selectedDataShow = true">打印条码</el-button> <el-tooltip :content="row.materialName" placement="top">
</div> <div class="multi-line-omit">{{ row.materialName }}</div>
</template> </el-tooltip>
</avue-crud> </template>
</el-card> <template #supplierName="{ row }">
<selectedData :listData="state.selectedData" :showes="state.selectedDataShow" @close="() => {state.selectedDataShow = false}"/> <el-tooltip :content="row.supplierName" placement="top">
</div> <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.sheet" style="width: 240px" placeholder="发货单号" size="default" />
</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>
<template #menu>
<div class="btnList">
<el-button type="text" @click="state.selectedDataShow = true">打印条码</el-button>
</div>
</template>
</avue-crud>
</el-card>
<selectedData
:listData="state.selectedData"
:showes="state.selectedDataShow"
@close="
() => {
state.selectedDataShow = false;
}
"
/>
</div>
</template> </template>
<script lang="ts" setup> <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 { listApi } from '../../api/list/index';
import { ElMessage } from 'element-plus';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import SelectedData from '/@/views/materialReceiptNotice/selectedData.vue'; import SelectedData from '/@/views/materialReceiptNotice/selectedData.vue';
// import { ElMessage } from 'element-plus';
const { t } = useI18n(); const { t } = useI18n();
// const router = useRouter(); const crudRef = ref();
// 定义变量内容 // 定义变量内容
const state = reactive({ const state = reactive({
page: { page: {
total: 1000, total: 1000,
currentPage: 1, currentPage: 1,
pageSize: 30, pageSize: 30,
}, },
option: { option: {
height: computed(() => window.innerHeight - (window.innerHeight * 0.25) + '') , height: computed(() => window.innerHeight - window.innerHeight * 0.25 + ''),
tip: false, tip: false,
index: false, index: false,
menuWidth: 120, menuWidth: 120,
border: true, border: true,
delBtn: false, delBtn: false,
editBtn: false, editBtn: false,
align: 'center', align: 'center',
selection: true, selection: false,
searchMenuSpan: 3, searchMenuSpan: 3,
addBtn: false, addBtn: false,
column: [ 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, { label: '物料名称', prop: 'materialName' },
width:'160' { label: computed(() => t('message.list.SupplierCode2')), prop: 'supplierId', width: '90' },
}, { label: computed(() => t('message.list.SupplierName2')), prop: 'supplierName', width: '120' },
{ label: '采购单号', prop: 'purchaseOrderFBillNo',width:'120' }, { label: '累计收料数量', prop: 'sendedQty', width: '110' },
{ label: '发货单号', prop: 'sheet',width:'135' }, { label: '发货数量', prop: 'qty' },
{ label: '收料单号', prop: 'fBillNo',width:'110' }, { label: '采购数量', prop: 'purchaseQty' },
{ label: '美塞斯批号', prop: 'mssSupplierLot',width:'90' }, { label: '采购单位', prop: 'unitName' },
{ label: '供应商批号', prop: 'fSupplierLot',width:'90' }, ],
{ label: '物料编码', prop: 'materialCode',width:'120' }, },
{ label: '物料名称', prop: 'materialName' }, data: [],
elDatePicker: '',
{ label: computed(() => t('message.list.SupplierCode2')), prop: 'supplierId',width:'90' }, formData: {
{ label: computed(() => t('message.list.SupplierName2')), prop: 'supplierName',width:'120' }, sheet: '',
{ label: '累计收料数量', prop: 'sendedQty',width:'110' }, fDateBegin: '',
{ label: '发货数量', prop: 'qty',width:'80' }, fDateEmd: '',
{ label: '采购数量', prop: 'purchaseQty',width:'80' }, fmrpCloseStatus: '',
{ label: '采购单位', prop: 'unitName',width:'80' }, },
], selectedData: [],
}, chengNuoJiaoQiP: '',
data: [], newChengNuoJiaoQiP: '',
elDatePicker: '', selectedDataShow: false,
formData: { loading: false,
purchaseOrderFBillNo: '',
fDateBegin: '',
fDateEmd: '',
fmrpCloseStatus: '',
},
selectedData: [],
chengNuoJiaoQiP: '',
newChengNuoJiaoQiP: '',
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 = () => { const selectFun = () => {
state.page.currentPage = 1; state.page.currentPage = 1;
state.page.pageSize = 30; state.page.pageSize = 30;
getList(); getList();
}; };
const resetFun = () => { const resetFun = () => {
state.page.currentPage = 1; state.page.currentPage = 1;
state.page.pageSize = 30; state.page.pageSize = 30;
state.elDatePicker = ''; state.elDatePicker = '';
state.formData = { state.formData = {
purchaseOrderFBillNo: '', sheet: '',
fDateBegin: '', fDateBegin: '',
fDateEmd: '', fDateEmd: '',
fmrpCloseStatus: '', fmrpCloseStatus: '',
}; };
getList(); getList();
}; };
const onLoadFun = (e: any) => { const onLoadFun = (e: any) => {
state.page.currentPage = e.currentPage; state.page.currentPage = e.currentPage;
state.page.pageSize = e.pageSize; state.page.pageSize = e.pageSize;
getList(); getList();
}; };
const getList = () => { const getList = () => {
state.loading = true; state.loading = true;
listApi() listApi()
.invoiceOrderGetPageList({ .invoiceOrderGetPageList({
condition: state.formData, condition: state.formData,
pageSize: state.page.pageSize, pageSize: state.page.pageSize,
page: state.page.currentPage, page: state.page.currentPage,
}) })
.then((res: any) => { .then((res: any) => {
state.loading = false; state.loading = false;
if (res.resultCode === 0) { if (res.resultCode === 0) {
state.data = res.data.dataList; state.data = res.data.dataList;
state.page.total = res.data.total; state.data.forEach((item:any) => {
} item.checkboxBox = '0'
}); })
state.page.total = res.data.total;
}
});
}; };
// 页面加载时 // 页面加载时
onMounted(() => { onMounted(() => {});
// console.log(window.innerHeight - 400)
});
</script> </script>
<style lang="scss" scoped> <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) { :deep(.cell) {
padding: 0 8px !important; padding: 0 8px !important;
} }
:deep(.avue-crud__left) { :deep(.avue-crud__left) {
flex: 1; flex: 1;
} }
:deep(.el-button--text){
padding: 0 !important; :deep(.el-button--text) {
height: auto !important; padding: 0 !important;
height: auto !important;
} }
:deep(.avue-crud__refreshBtn) { :deep(.avue-crud__refreshBtn) {
display: none; display: none;
} }
:deep(.avue-crud__gridBtn) { :deep(.avue-crud__gridBtn) {
display: none; display: none;
} }
.piliang { .piliang {
margin-left: 12px; margin-left: 12px;
border: 1px solid #d5d5d5; border: 1px solid #d5d5d5;
border-radius: 8px; border-radius: 8px;
flex: 1; flex: 1;
display: flex; display: flex;
align-items: center; align-items: center;
box-sizing: border-box; box-sizing: border-box;
padding: 4px; padding: 4px;
} }
.system-user-container { .system-user-container {
padding: 0 !important; padding: 0 !important;
} }
.multi-line-omit { .multi-line-omit {
word-break: break-all; // 允许单词内自动换行，如果一个单词很长的话 word-break: break-all; // 允许单词内自动换行，如果一个单词很长的话
text-overflow: ellipsis; // 溢出用省略号显示 text-overflow: ellipsis; // 溢出用省略号显示
overflow: hidden; // 超出的文本隐藏 overflow: hidden; // 超出的文本隐藏
display: -webkit-box; // 作为弹性伸缩盒子模型显示 display: -webkit-box; // 作为弹性伸缩盒子模型显示
-webkit-line-clamp: 1; // 显示的行 -webkit-line-clamp: 1; // 显示的行
-webkit-box-orient: vertical; // 设置伸缩盒子的子元素排列方式--从上到下垂直排列 -webkit-box-orient: vertical; // 设置伸缩盒子的子元素排列方式--从上到下垂直排列
} }
.selectBoxes { .selectBoxes {
display: flex; display: flex;
flex: 1; flex: 1;
.selectItem { .selectItem {
margin-right: 16px; margin-right: 16px;
display: flex; display: flex;
} }
} }
:deep(.avue-crud) { :deep(.avue-crud) {
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
:deep(.avue-crud--card) { :deep(.avue-crud--card) {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
} }
:deep(.avue-crud__body) { :deep(.avue-crud__body) {
flex: 1; flex: 1;
} }
:deep(.el-table__header) { :deep(.el-table__header) {
height: 40px; height: 40px;
} }
:deep(.el-card__body) { :deep(.el-card__body) {
width: 100% !important; width: 100% !important;
height: 100% !important; height: 100% !important;
overflow: hidden !important; overflow: hidden !important;
padding: 0 !important; padding: 0 !important;
} }
:deep(.el-table__cell) { :deep(.el-table__cell) {
padding: 0 !important; padding: 0 !important;
//height: 56px !important; //height: 56px !important;
} }
:deep(.el-card) { :deep(.el-card) {
padding: 12px; padding: 12px;
} }
:deep(.el-form) { :deep(.el-form) {
flex: 1; flex: 1;
} }
.system-user-container { .system-user-container {
:deep(.el-card__body) { :deep(.el-card__body) {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
overflow: auto; overflow: auto;
.el-table { .el-table {
flex: 1; flex: 1;
} }
} }
} }
:deep(.el-col) { :deep(.el-col) {
margin-bottom: 16px; margin-bottom: 16px;
} }
</style> </style>

210
src/views/mssPurchaseOrder/index.vue
View File

@@ -1,57 +1,57 @@
<template> <template>
<div class="system-user-container layout-padding"> <div class="system-user-container layout-padding">
<el-card class="layout-padding-auto" shadow="hover"> <el-card class="layout-padding-auto" shadow="hover">
<div class="selectBoxes"> <div class="selectBoxes">
<div class="selectItem"> <div class="selectItem">
<el-input v-model="state.formData.fBillNo" style="width: 12vw" placeholder="单据编号" size="default" /> <el-input v-model="state.formData.fBillNo" style="width: 12vw" placeholder="单据编号" size="default" />
</div> </div>
<div class="selectItem"> <div class="selectItem">
<el-select placeholder="业务状态" size="default" style="width: 12vw" v-model="state.formData.fmrpCloseStatus"> <el-select placeholder="业务状态" size="default" style="width: 12vw" 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-option v-for="item in state.option.column[2].dicData" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</div> </div>
<div class="selectItem"> <div class="selectItem">
<el-date-picker <el-date-picker
v-model="state.elDatePicker" v-model="state.elDatePicker"
style="width: 25vw" style="width: 25vw"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
start-placeholder="开始采购日期" start-placeholder="开始采购日期"
end-placeholder="采购结束日期" end-placeholder="采购结束日期"
size="default" size="default"
format="YYYY-MM-DD" format="YYYY-MM-DD"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@change="elDatePickerFun" @change="elDatePickerFun"
/> />
</div> </div>
<div class="selectItem" style="margin-right: 0"> <div class="selectItem" style="margin-right: 0">
<el-button type="primary" size="default" @click="selectFun">搜索</el-button> <el-button type="primary" size="default" @click="selectFun">搜索</el-button>
<el-button size="default" @click="resetFun">重置</el-button> <el-button size="default" @click="resetFun">重置</el-button>
</div> </div>
<div class="selectItem" style="flex: 1;margin-right: 0"> <div class="selectItem" style="flex: 1; margin-right: 0">
<div class="piliang"> <div class="piliang">
<el-button type="primary" size="small" @click="state.selectedDataShow = true"> <el-button type="primary" size="small" @click="state.selectedDataShow = true">
<span>已选中 {{ state.selectedData.length }} 条数据，去查看</span> <span>已选中 {{ state.selectedData.length }} 条数据，去查看</span>
</el-button> </el-button>
<el-date-picker <el-date-picker
v-model="state.chengNuoJiaoQiP" v-model="state.chengNuoJiaoQiP"
type="date" type="date"
placeholder="批量修改选中承诺日期" placeholder="批量修改选中承诺日期"
size="small" size="small"
style="width: 45%; margin-left: 12px" style="width: 45%; margin-left: 12px"
@change="chengNuoJiaoQiPFun('0')" @change="chengNuoJiaoQiPFun('0')"
/> />
<el-date-picker <el-date-picker
v-model="state.newChengNuoJiaoQiP" v-model="state.newChengNuoJiaoQiP"
type="date" type="date"
placeholder="批量修改选中承诺最新交期" placeholder="批量修改选中承诺最新交期"
size="small" size="small"
style="width: 45%; margin-left: 12px" style="width: 45%; margin-left: 12px"
@change="chengNuoJiaoQiPFun('1')" @change="chengNuoJiaoQiPFun('1')"
/> />
</div> </div>
</div> </div>
</div> </div>
<avue-crud <avue-crud
ref="crudRef" ref="crudRef"
:data="state.data" :data="state.data"
@@ -61,7 +61,10 @@
@selection-change="selectionChange" @selection-change="selectionChange"
:table-loading="state.loading" :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 #fDate="{ row }">{{ row.ifHidden === 0 ? row.fDate : '' }}</template>
<template #fCancelStatus="{ row }"> <template #fCancelStatus="{ row }">
{{ row.ifHidden === 0 ? (row.fCancelStatus === 'A' ? '未关闭' : '已关闭') : '' }} {{ row.ifHidden === 0 ? (row.fCancelStatus === 'A' ? '未关闭' : '已关闭') : '' }}
@@ -95,9 +98,7 @@
@change="batchSetNewChengNuoJiaoQiFun([{ id: row.id, newTime: row.newChengNuoJiaoQi }])" @change="batchSetNewChengNuoJiaoQiFun([{ id: row.id, newTime: row.newChengNuoJiaoQi }])"
/> />
</template> </template>
<template #menu-left> <template #menu-left></template>
</template>
<template #menu="{ row }"> <template #menu="{ row }">
<el-button type="text" icon="el-icon-pie-chart" @click="toPurchaseDetails(row)">查看</el-button> <el-button type="text" icon="el-icon-pie-chart" @click="toPurchaseDetails(row)">查看</el-button>
</template> </template>
@@ -124,7 +125,8 @@ import { useRouter } from 'vue-router';
import { listApi } from '../../api/list/index'; import { listApi } from '../../api/list/index';
// import { useI18n } from 'vue-i18n'; // import { useI18n } from 'vue-i18n';
import SelectedData from '/@/views/mssPurchaseOrder/selectedData.vue'; 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 selectedDataRef = ref();
// const { t } = useI18n(); // const { t } = useI18n();
@@ -137,10 +139,10 @@ const state = reactive({
pageSize: 30, pageSize: 30,
}, },
option: { option: {
height: computed(() => window.innerHeight - (window.innerHeight * 0.23) + ''), height: computed(() => window.innerHeight - window.innerHeight * 0.23 + ''),
tip: false, tip: false,
index: true, index: true,
menu: true, menu: false,
menuWidth: 85, menuWidth: 85,
border: true, border: true,
delBtn: false, delBtn: false,
@@ -223,32 +225,64 @@ const chengNuoJiaoQiPFun = (e: string) => {
} }
}; };
const batchSetChengNuoJiaoQiFun = (arr: any) => { const batchSetChengNuoJiaoQiFun = (arr: any) => {
listApi() ElMessageBox({
.batchSetChengNuoJiaoQi(arr) closeOnClickModal: false,
.then((res: any) => { closeOnPressEscape: false,
if (res.resultCode === 0) { title: '提示',
ElMessage.success('操作成功'); message: '是否要修正此项日期',
getList(); showCancelButton: true,
state.chengNuoJiaoQiP = ''; buttonSize: 'default',
beforeClose: (action, instance, done) => {
if (action === 'confirm') {
listApi()
.batchSetChengNuoJiaoQi(arr)
.then((res: any) => {
done();
if (res.resultCode === 0) {
ElMessage.success('操作成功');
getList();
state.chengNuoJiaoQiP = '';
}
if (res.resultCode === -1) {
ElMessage.success(res.errorMessage);
state.chengNuoJiaoQiP = '';
}
});
} else {
done();
} }
if (res.resultCode === -1) { },
ElMessage.success(res.errorMessage); });
state.newChengNuoJiaoQiP = '';
}
});
}; };
const batchSetNewChengNuoJiaoQiFun = (arr: any) => { const batchSetNewChengNuoJiaoQiFun = (arr: any) => {
listApi() ElMessageBox({
.batchSetNewChengNuoJiaoQi(arr) closeOnClickModal: false,
.then((res: any) => { closeOnPressEscape: false,
if (res.resultCode === 0) { title: '提示',
ElMessage.success('操作成功'); message: '是否要修正此项日期',
getList(); 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();
} }
if (res.resultCode === -1) { },
ElMessage.success(res.errorMessage); });
}
});
}; };
const generateDocumentsFun = () => { const generateDocumentsFun = () => {
state.selectedDataShow = false; state.selectedDataShow = false;
@@ -259,7 +293,7 @@ const toPurchaseDetails = (item: any) => {
router.push({ router.push({
path: '/purchaseDetails', path: '/purchaseDetails',
query: { query: {
fBillNo: item.fBillNo , fBillNo: item.fBillNo,
}, },
}); });
}; };
@@ -303,13 +337,12 @@ const getList = () => {
if (res.resultCode === 0) { if (res.resultCode === 0) {
state.data = res.data.dataList; state.data = res.data.dataList;
state.page.total = res.data.total; state.page.total = res.data.total;
} }
}); });
}; };
// 页面加载时 // 页面加载时
onMounted(() => { onMounted(() => {
console.log(window.innerHeight - window.innerHeight * 0.25 + '') console.log(window.innerHeight - window.innerHeight * 0.25 + '');
}); });
</script> </script>
@@ -317,10 +350,12 @@ onMounted(() => {
:deep(.avue-crud__header) { :deep(.avue-crud__header) {
display: none; display: none;
} }
:deep(.el-button--text){
padding: 0 !important; :deep(.el-button--text) {
height: auto !important; padding: 0 !important;
height: auto !important;
} }
:deep(.avue-crud__pagination) { :deep(.avue-crud__pagination) {
padding: 0 12px !important; padding: 0 12px !important;
} }
@@ -367,7 +402,8 @@ onMounted(() => {
.selectBoxes { .selectBoxes {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.selectItem { .selectItem {
margin-right: 16px; margin-right: 16px;
display: flex; display: flex;

82
src/views/mssPurchaseOrder/purchaseDetails.vue
View File

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

49
src/views/mssPurchaseOrder/selectedData.vue
View File

@@ -18,30 +18,30 @@
<el-input-number v-model="row.notSendQty" size="small" /> <el-input-number v-model="row.notSendQty" size="small" />
</div> </div>
</template> </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> <template #menu-left>
<div class="selectBoxes"> <div class="selectBoxes">
<el-date-picker <el-date-picker
@@ -198,6 +198,7 @@ const batchAddInvoiceOrderFun = () => {
arr.push({ arr.push({
id: item.id, id: item.id,
qty: item.notSendQty, qty: item.notSendQty,
fSupplierLot:item.fSupplierLot
}); });
}); });
listApi() listApi()

5
src/views/system/user/dialog.vue
View File

@@ -103,8 +103,9 @@ const openDialog = (type: string, row: any) => {
state.ruleForm.login = row.login state.ruleForm.login = row.login
state.ruleForm.name = row.name state.ruleForm.name = row.name
state.ruleForm.mobile = row.mobile 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.title = '修改用户';
state.dialog.submitTxt = '修 改'; state.dialog.submitTxt = '修 改';
} else { } else {

60
src/views/system/user/index.vue
View File

@@ -12,6 +12,16 @@
<template #menu-left> <template #menu-left>
<el-button type="primary" size="default" @click="userDialogRefShow">添加账号</el-button> <el-button type="primary" size="default" @click="userDialogRefShow">添加账号</el-button>
</template> </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 }"> <template #menu="{ row }">
<el-button type="text" @click="xiugaizhanghao(row)">修改</el-button> <el-button type="text" @click="xiugaizhanghao(row)">修改</el-button>
</template> </template>
@@ -22,7 +32,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, onMounted, ref } from 'vue'; import { reactive, onMounted, ref, nextTick } from 'vue';
import { listApi } from '../../../api/list/index'; import { listApi } from '../../../api/list/index';
import UserDialog from './dialog.vue'; import UserDialog from './dialog.vue';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
@@ -72,10 +82,10 @@ const state = reactive({
{ {
label: '账号状态', label: '账号状态',
prop: 'status', prop: 'status',
dicData: [ dicData: [
{ label: '禁用', value: '0' }, { label: '禁用', value: '0' },
{ label: '正常', value: '1' }, { label: '正常', value: '1' },
], ],
}, },
], ],
}, },
@@ -92,15 +102,20 @@ const state = reactive({
newChengNuoJiaoQiP: '', newChengNuoJiaoQiP: '',
selectedDataShow: false, selectedDataShow: false,
loading: false, loading: false,
itemId:'' itemId: '',
}); });
const getTableData = (item: any) => { const getTableData = (item: any) => {
let data1 = { ...item };
let data2 = { ...item, id: state.itemId };
console.log(data2)
debugger
listApi() listApi()
.loginSave({ ...item }) .loginSave(state.itemId === '' ? data1 : data2)
.then((res: any) => { .then((res: any) => {
if (res.resultCode === 0) { if (res.resultCode === 0) {
state.itemId = '';
ElMessage.success('成功'); ElMessage.success('成功');
getList(); getList();
} }
if (res.resultCode === -1) { if (res.resultCode === -1) {
ElMessage.error(res.errorMessage); ElMessage.error(res.errorMessage);
@@ -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 = () => { const userDialogRefShow = () => {
userDialogRef.value.openDialog(); 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> </script>
<style lang="scss" scoped> <style lang="scss" scoped>