Browse Source

Merge branch 'pre-production'

fix_bug_pro20231227
pref_mail@163.com 1 year ago
parent
commit
e755c18e87
  1. 44
      src/api/distribution/createTask.js
  2. 4
      src/option/basic/basicProperty.js
  3. 4
      src/styles/element-ui.scss
  4. 40
      src/views/basic/deline/basicDeline.vue
  5. 8
      src/views/basic/deline/basicdeLineform.vue
  6. 41
      src/views/basic/line/basicLine.vue
  7. 4
      src/views/basic/material/basicMaterial.vue
  8. 17
      src/views/basic/printTemplate/basicPrintTemplate.vue
  9. 16
      src/views/basic/property/basicProperty.vue
  10. 39
      src/views/basic/property/basicPropertyDetails.vue
  11. 4
      src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
  12. 10
      src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
  13. 8
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  14. 8
      src/views/basicdata/warehouse/tray/basicdataTray.vue
  15. 2
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  16. 401
      src/views/distribution/checkInventoryTask/createTask.vue
  17. 4
      src/views/distribution/inventory/distrilbutionBillLading.vue
  18. 28
      src/views/system/dept.vue
  19. 2
      src/views/system/user.vue

44
src/api/distribution/createTask.js

@ -10,4 +10,48 @@ export const getDictList = params => {
method: 'get',
params,
});
};
/**
* 添加盘点任务
*/
export const postAddtaskQuest = data => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/save',
method: 'post',
data,
});
};
/**
* 获取盘点列表
*/
export const getTaskQuestPage = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/page',
method: 'get',
params,
});
};
/**
* 编辑盘点任务
*/
export const postEditTaskQuestUpdate = data => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/update',
method: 'post',
data,
});
};
/**
* 批量删除盘点任务
*/
export const postBatchDelete = params => {
return request({
url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/remove',
method: 'post',
params,
});
};

4
src/option/basic/basicProperty.js

@ -158,7 +158,7 @@ export default {
prop: "assetName",
type: "input",
labelWidth:'150',
width:"200px",
width:"270px",
align:'center',
span:11,
search: true,
@ -186,7 +186,7 @@ export default {
prop: "node",
type: "input",
labelWidth:'150',
width:"340px",
width:"360px",
align:'center',
span:11,
},

4
src/styles/element-ui.scss

@ -68,3 +68,7 @@
.avue--detail .el-form-item {
background-color: #fafafa;
}
// 页码组件激活样式字体不加粗
li.is-active{
font-weight: normal !important;
}

40
src/views/basic/deline/basicDeline.vue

@ -284,6 +284,7 @@ export default {
</script>
<style scoped lang="scss">
:deep(.avue-form__group) {
width: 100%;
align-items: flex-start;
@ -298,4 +299,43 @@ export default {
margin-right: 8px;
}
}
:deep(.avue-form__row){
max-width:324px;
}
:deep(.avue-form__row):nth-child(1),:deep(.avue-form__row):nth-child(2){
max-width:100%;
.el-form-item{
margin-right:0;
display: flex;
}
.el-input-number,.el-input__wrapper{
height: 33px;
}
.el-table__header{
width: 100% !important;
}
.el-table__body{
width: 100% !important;
}
}
:deep(.avue-form__row):first-of-type {
max-width:100%;
.el-form-item{
margin-right:0;
display: flex;
}
.el-input-number,.el-input__wrapper{
height: 33px;
}
.el-table__header{
width: 100% !important;
}
.el-table__body{
width: 100% !important;
}
}
</style>

8
src/views/basic/deline/basicdeLineform.vue

@ -1,17 +1,17 @@
<template>
<el-form>
<div style="background-color: #ffffff; height: 845px; padding: 2% 4%">
<div style="background-color: #ffffff; height: 100vh; padding: 10px">
<avue-form :option="option" ref="myForm" v-model="form">
<template #input="{ row }">
<el-tag>序号:{{ row.$index }}-数据:{{ row.input }}</el-tag>
</template>
</avue-form>
<div style="position: fixed; bottom: 7%; left: 40%; width: 100%">
<div style="width: 100%">
<div >
<div>
<el-button
type="primary"
@click="submitForm"
style="margin-right: 20%"
:disabled="this.isDis"
>确定</el-button
>

41
src/views/basic/line/basicLine.vue

@ -283,14 +283,43 @@ export default {
justify-content: space-between !important;
}
:deep(.avue-form__group--flex) {
display: flex;
flex-direction: column;
justify-content: space-between;
display: flex;
flex-direction: row;
justify-content: flex-start;
}
:deep(.avue-form__row){
max-width:100%
max-width:324px;
.el-form-item{
margin-right: 10px;
}
}
:deep(.el-form-item){
width: max-content;
:deep(.avue-form__row):first-of-type {
max-width:100%;
.el-form-item{
margin-right:0;
display: flex;
}
.el-input-number,.el-input__wrapper{
height: 33px;
}
.el-table__header{
width: 100% !important;
}
.el-table__body{
width: 100% !important;
}
}
:deep(.el-table__header){
width: 100%;
}
:deep(.avue-form__row){
margin-left:10px;
}
:deep(.avue-form__row):nth-child(1),
:deep(.avue-form__row):nth-child(2),
:deep(.avue-form__row):nth-child(7) {
margin-left:0px;
}
</style>

4
src/views/basic/material/basicMaterial.vue

@ -321,5 +321,7 @@
:deep(.no-print ){
margin-left: auto !important;
}
:deep(.el-form-item__label){
width:auto !important;
}
</style>

17
src/views/basic/printTemplate/basicPrintTemplate.vue

@ -330,7 +330,7 @@ export default {
}
</style>
<style scope lang="scss">
<style lang="scss">
.avue-form__group {
.no-print {
display: flex;
@ -352,13 +352,22 @@ export default {
:deep(.el-form-item__label){
width:auto !important;
}
.avue-form__row{
max-width:300px;
}
.no-print{
// margin-left:auto;
.el-button{
margin-right:0
}
}
</style>
<style scoped lang='scss'>
:deep(.no-print){
margin-left:auto;
.el-button{
margin-right:0
}
}
:deep(.avue-form__row){
max-width:300px;
}
</style>

16
src/views/basic/property/basicProperty.vue

@ -255,4 +255,20 @@ export default {
:deep(.no-print ){
margin-left: auto !important;
}
:deep(.el-form-item__label){
width:auto !important;
}
// :deep(.el-table__header){
// width: inherit !important;
// }
// :deep(.el-table__row){
// width: inherit !important;
// }
// :deep(.el-scrollbar__view){
// width: inherit !important;
// }
// :deep(.el-table__body){
// width: inherit !important;
// }
</style>

39
src/views/basic/property/basicPropertyDetails.vue

@ -641,4 +641,43 @@ export default {
:deep(.no-print ){
margin-left: auto !important;
}
:deep(.el-form-item__label){
width:auto !important;
}
// nth-child
:deep(.avue-form__row){
margin-right:30px;
.el-form-item{
margin-right:0;
}
}
:deep(.avue-form__row){
margin-right:0px;
margin-left:0px;
}
:deep(.avue-form__row:nth-child(7)){
margin-left:35px;
}
:deep(.avue-form__row:nth-child(8)){
margin-left:35px;
}
:deep(.avue-form__row){
margin-left:10px;
}
:deep(.avue-form__row:first-child) {
margin-left:0px;
}
:deep(.avue-form__row:nth-child(6)){
margin-left:0px;
}
:deep(.avue-form__group--flex){
justify-content: space-between;
}
:deep(.el-tabs--border-card){
border:0;
}
:deep(.el-tabs__content){
padding:0;
}
</style>

4
src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

@ -25,10 +25,10 @@
<el-button type="danger" icon="el-icon-delete" plain @click="handleDisable"
>
</el-button>
<el-button type="danger" icon="el-icon-delete" plain @click="handleEnable"
<el-button type="danger" icon="el-icon-check" plain @click="handleEnable"
>
</el-button>
<el-button type="danger" icon="el-icon-delete" plain @click="downAllocation"
<el-button type="danger" icon="el-icon-minus" plain @click="downAllocation"
>
</el-button>
<!-- <el-button type="warning"-->

10
src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue

@ -61,19 +61,19 @@
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
> </el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleExport" plain
<el-button type="danger" icon="el-icon-download" @click="handleExport" plain
> </el-button
>
<el-button type="danger" icon="el-icon-delete" plain @click="handleImport"
<el-button type="danger" icon="el-icon-upload" plain @click="handleImport"
>
</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDisable" plain
<el-button type="danger" icon="el-icon-close" @click="handleDisable" plain
> </el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleEnable" plain
<el-button type="danger" icon="el-icon-check" @click="handleEnable" plain
> </el-button
>
</div>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>

8
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue

@ -38,19 +38,19 @@
</el-row>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd"> </el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
> </el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleDisable" plain
<el-button type="danger" icon="el-icon-close" @click="handleDisable" plain
> </el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleEnable" plain
<el-button type="danger" icon="el-icon-check" @click="handleEnable" plain
> </el-button
>
<el-button type="danger" icon="el-icon-delete" plain @click="handleImport"
<el-button type="danger" icon="el-icon-upload" plain @click="handleImport"
>
</el-button>
<!-- <el-button type="danger" icon="el-icon-delete" @click="aaa" plain>导出二维码</el-button>-->

8
src/views/basicdata/warehouse/tray/basicdataTray.vue

@ -36,10 +36,10 @@
<el-button type="warning" plain icon="el-icon-camera" @click="handleqr"
>查看二维码
</el-button>
<el-button type="warning" plain icon="el-icon-camera" @click="lossess"> </el-button>
<el-button type="warning" plain icon="el-icon-camera" @click="disable"> </el-button>
<el-button type="warning" plain icon="el-icon-camera" @click="addable"> </el-button>
<el-button type="warning" plain icon="el-icon-camera" @click="vacants"
<el-button type="warning" plain icon="el-icon-edit" @click="lossess"> </el-button>
<el-button type="warning" plain icon="el-icon-circle-close" @click="disable"> </el-button>
<el-button type="warning" plain icon="el-icon-check" @click="addable"> </el-button>
<el-button type="warning" plain icon="el-icon-refresh" @click="vacants"
>
</el-button>
</template>

2
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

@ -1186,6 +1186,7 @@ export default {
:deep(.no-print){
// margin-left:auto;
max-width:300px !important;
margin-left: inherit;
.el-button{
margin-right:0;
}
@ -1196,4 +1197,5 @@ export default {
:deep(.avue-form__group--flex) {
justify-content: space-between;
}
</style>

401
src/views/distribution/checkInventoryTask/createTask.vue

@ -1,8 +1,8 @@
<template>
<basic-container>
<div class="avue-crud">
<!-- 查询模块 -->
<el-row v-if="!search">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<div class="fo-rl">
<el-form-item label="货物名称:">
@ -22,6 +22,8 @@
</el-form-item>
</el-form>
</el-row>
<!-- 控件区 -->
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
@ -29,6 +31,9 @@
<el-button icon="el-icon-plus" type="primary" @click="createCheckTask"
>创建盘点任务</el-button
>
<el-button icon="el-icon-delete" type="primary" @click="handleBatchDelete">
批量删除
</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -38,8 +43,9 @@
</div>
</div>
</el-row>
<!-- 列表模块 -->
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
@ -55,30 +61,32 @@
type="primary"
text
icon="el-icon-view"
@click="handleViewCheck(slotProps.scope)"
@click="handleViewCheck(slotProps.scope.row)"
> </el-text
>
<el-text
type="primary"
text
icon="el-icon-view"
@click="handleEditCheck(slotProps.scope)"
@click="handleEditCheck(slotProps.scope.row)"
> </el-text
>
<el-text
type="primary"
text
icon="el-icon-view"
@click="handleDeleteCheck(slotProps.scope)"
@click="handleDeleteCheck(slotProps.scope.row)"
> </el-text
>
</template>
</tablecmt>
</el-row>
<!-- 分页模块 -->
<el-row>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<!-- 分页 -->
<el-pagination
align="right"
background
@ -102,14 +110,12 @@
center
:before-close="beforeClose"
append-to-body
:disabled="view"
>
<el-form :disabled="view" ref="form" :model="form" label-width="120px">
<!-- 表单字段 -->
<el-form-item label="订单自编号" prop="orderCode">
<el-input v-model="form.orderCode" placeholder="请输入订单自编号" clearable />
</el-form-item>
<el-form-item label="商场名称" prop="orderCode">
<el-select v-model="form.region" multiple placeholder="请选择商场" clearable>
<!-- 商场名称 -->
<el-form-item label="商场名称">
<el-select v-model="form.clientList" multiple placeholder="请选择商场" clearable>
<template v-if="form.selectList && form.selectList.length !== 0">
<el-option
v-for="item in form.selectList"
@ -119,10 +125,14 @@
</template>
</el-select>
</el-form-item>
<el-form-item label="品牌" prop="orderCode">
<!-- 品牌 -->
<el-form-item label="品牌">
<el-input v-model="form.brandName" placeholder="品牌名称" disabled />
</el-form-item>
<el-form-item label="订单时间">
<!-- 盘点时间 -->
<el-form-item label="盘点时间">
<div class="block" prop="time">
<el-date-picker
v-model="form.time"
@ -134,6 +144,21 @@
/>
</div>
</el-form-item>
<!-- 盘点订单状态 -->
<template v-if="isEdit">
<el-form-item label="盘点订单状态">
<el-select v-model="form.dictKey" placeholder="请选择订单状态" clearable>
<template v-if="this.typeData.length !== 0">
<el-option
v-for="item in this.typeData"
:label="item.dictValue"
:value="item.dictKey"
/>
</template>
</el-select>
</el-form-item>
</template>
</el-form>
<!-- 表单按钮 -->
<template #footer>
@ -163,7 +188,13 @@
</template>
<script>
import { getDictList } from '@/api/distribution/createTask';
import {
getDictList,
postAddtaskQuest,
getTaskQuestPage,
postEditTaskQuestUpdate,
postBatchDelete,
} from '@/api/distribution/createTask';
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import { getDictionaryBiz } from '@/api/system/dict';
@ -185,52 +216,71 @@ export default {
checkarr: [],
fixed: true,
},
{
prop: 'serviceNumber',
prop: 'questNum',
label: '任务编号',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'warehouseName',
label: '仓库名称',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: true,
fixed: false,
sortable: true,
head: false,
},
{
prop: 'serviceNumber',
prop: 'marketName',
label: '商城名称',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: true,
fixed: false,
sortable: true,
head: false,
},
{
prop: 'serviceNumber',
prop: 'brandName',
label: '品牌名称',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'startTime',
label: '任务开始时间',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: true,
fixed: false,
sortable: true,
head: false,
},
{
prop: 'serviceNumber',
prop: 'endTime',
label: '任务结束时间',
type: 2,
values: '',
width: '130',
checkarr: [],
fixed: true,
fixed: false,
sortable: true,
head: false,
},
{
@ -240,26 +290,25 @@ export default {
values: '',
width: '130',
checkarr: [],
fixed: true,
fixed: false,
sortable: true,
head: false,
},
{
prop: 'unpack',
label: '拆包状态',
prop: 'questStatusName',
label: '状态',
type: 1,
values: '',
width: '130',
checkarr: [
{
value: `true`,
label: '是',
},
{
value: `false`,
label: '否',
},
// {
// value: `true`,
// label: '',
// },
// {
// value: `false`,
// label: '',
// },
],
fixed: false,
sortable: true,
@ -282,11 +331,6 @@ export default {
//
title: '',
stockList: {}, //
// stockId: '', //id
// materialId: '', //id
// marketId: '', //id
// storeId: '', //id
//
box: false,
//
@ -313,6 +357,9 @@ export default {
selectionList: [],
//
data: [],
//
typeData: [],
};
},
mounted() {
@ -401,15 +448,47 @@ export default {
},
},
methods: {
/**
* 表单事件选择器改变时触发回调
*/
timeChange(value) {
console.log('value :>> ', value);
value.forEach((item)=>{
console.log('item :>> ', item);
item.getFullYear()
console.log('item.getFullYear() :>> ', item.getFullYear());
// const date = new Date(item)
// console.log('date :>> ', date);
})
//
const _time = new Date().getTime();
//
const _isTime = value.every(item => {
console.log('item.toLocaleString() :>> ', item.toLocaleString());
return _time < item.getTime();
});
if (!_isTime) {
this.form.time = [];
return this.$message({
type: 'error',
message: '开始时间不能小于当前时间',
});
}
// _time.toLocaleTimeString()
// console.log('_time.toLocaleTimeString() :>> ', _time.toLocaleString());
},
//
filterTime(time) {
const y = time.getFullYear();
const m = time;
myDate.getYear(); //(2)
myDate.getFullYear(); //(4,1970-????)
myDate.getMonth(); //(0-11,01)
myDate.getDate(); //(1-31)
myDate.getDay(); //X(0-6,0)
myDate.getTime(); //(1970.1.1)
myDate.getHours(); //(0-23)
myDate.getMinutes(); //(0-59)
myDate.getSeconds(); //(0-59)
myDate.getMilliseconds(); //(0-999)
myDate.toLocaleDateString(); //
var mytime = myDate.toLocaleTimeString(); //
myDate.toLocaleString(); //
},
showdrawer(value) {
@ -433,6 +512,40 @@ export default {
}
},
/**
* 批量删除
*/
handleBatchDelete() {
if (this.selectionList.length === 0)
return this.$message({
type: 'error',
message: '最少选择一条数据',
});
const ids = this.selectionList.map(item => item.id).join(',');
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(async () => {
return postBatchDelete({ ids });
})
.then((res) => {
this.onLoad(this.page);
const { code, msg } = res.data;
if (code === 200) {
return this.$message({
type: 'success',
message: msg,
});
}
});
},
btnsc(index, row) {
console.log(index, row);
},
@ -540,45 +653,104 @@ export default {
},
//
handleSubmit() {},
async handleSubmit() {
//
if (!this.form.time || this.form.time.length === 0) {
return this.$message({
type: 'error',
message: '请选择盘点时间',
});
}
//
handleEditSubmit() {},
const formData = {};
formData.list = [];
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
//
this.form.selectList.forEach(val => {
if (this.form.clientList.includes(val.id))
formData.list.push({
refId: val.id,
refName: val.clientName,
});
});
//
formData.startTime = this.form.time[0].toLocaleString();
//
formData.endTime = this.form.time[1].toLocaleString();
console.log('formData :>> ', formData);
const res = await postAddtaskQuest(formData);
const { code, msg } = res.data;
if (code === 200)
this.$message({
message: msg,
type: 'success',
});
//
this.onLoad();
//
this.box = false;
},
//
async handleEditSubmit() {
console.log('this.form :>> ', this.form);
//
if (!this.form.time || this.form.time.length === 0) {
return this.$message({
type: 'error',
message: '请选择盘点时间',
});
}
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return;
})
.then(() => {
this.selectionClear();
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
const formData = {};
formData.list = [];
//
this.form.selectList.forEach(val => {
if (this.form.clientList.includes(val.id))
formData.list.push({
refId: val.id,
refName: val.clientName,
});
});
//
formData.startTime = this.form.time[0].toLocaleString();
//
formData.endTime = this.form.time[1].toLocaleString();
console.log('formData :>> ', formData);
formData.questStatus = this.form.dictKey;
formData.id = this.form.id;
const res = await postEditTaskQuestUpdate(formData);
const { code, msg } = res.data;
console.log('msg :>> ', msg);
console.log('res :>> ', res);
if (code === 200)
this.$message({
message: msg,
type: 'success',
});
//
this.onLoad();
//
this.box = false;
},
/**
* 删除单个任务
*/
handleDeleteCheck() {
handleDeleteCheck(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return;
return postBatchDelete({ids: row.id});
})
.then(() => {
this.onLoad(this.page);
@ -601,11 +773,36 @@ export default {
/**
* 编辑单个任务
*/
handleEditCheck(row) {
async handleEditCheck(row) {
this.title = '编辑盘点任务';
this.isEdit = true; //
this.box = true; //
console.log('row :>> ', row);
this.form.brandName = row.brandName;
this.form.time = [row.startTime, row.endTime];
this.form.clientList = row.list.map(val => val.refId);
this.form.dictKey = row.questStatus;
this.form.selectList = [];
this.form.id = row.id;
console.log('this.form :>> ', this.form);
//
const res = await getDictList();
const { code, data } = res.data;
if (code === 200 && !!data) {
console.log('data :>> ', data);
this.form.selectList = data.map(item => {
return {
//
clientName: item.clientName,
// id
id: item.id,
//
brandName: item.brandName,
};
});
}
},
beforeClose(done) {
@ -615,6 +812,7 @@ export default {
},
selectionChange(list) {
this.selectionList = list;
console.log('this.selectionList :>> ', this.selectionList);
},
selectionClear() {
this.selectionList = [];
@ -627,31 +825,60 @@ export default {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
onLoad(page, params = {}) {
async onLoad(page, params = {}) {
this.loading = true;
this.query.serviceType = '3';
const postData = { ...page, ...params };
const res = await getTaskQuestPage(postData);
const {
code,
data: { records },
} = res.data;
this.data = [];
if (code === 200) this.data = records;
console.log('records :>> ', records);
this.data.forEach(val => {
val.brandName = '';
val.marketName = '';
val.list.forEach(item => {
if (item.brandName) val.brandName += item.brandName + ',';
if (item.refName) val.marketName += item.refName + ',';
});
});
this.loading = false;
//
getDictionaryBiz('warehouse_quest_status').then(res => {
this.typeData = res.data.data.map(val => {
return {
dictKey: val.dictKey,
dictValue: val.dictValue,
};
});
});
},
},
watch: {
//
'form.region'(newVal) {
'form.clientList'(newVal) {
let _newVal = Array.from(newVal);
let _value = '';
// ,
if (newVal.length === 0) return (this.form.brandName = _value);
if (_newVal.length === 0) return (this.form.brandName = _value);
console.log('this.form.selectList :>> ', this.form.selectList);
//
this.form.brandName = newVal.reduce((curr, item)=> {
const _brandName = this.form.selectList.find(val => val.id === item).brandName;
if (_brandName) return curr += _brandName;
return curr
}, '')
this.form.brandName = _newVal.reduce((curr, item) => {
const _brand = this.form.selectList.find(val => val.id === item);
if (_brand) return (curr += _brand.brandName);
return curr;
}, '');
},
},
};
</script>
<style lang="scss" scoped>
<style scoped lang="scss">
.zhu {
display: flex;
flex-direction: row;
@ -676,8 +903,6 @@ export default {
.demo-form-inline .el-input {
--el-input-width: 220px;
}
</style>
<style scoped lang="scss">
.el-row:first-of-type {
/* 样式规则 */
.el-form {

4
src/views/distribution/inventory/distrilbutionBillLading.vue

@ -469,8 +469,8 @@
<el-dialog v-model="dialogFormZeroOrderVisible" title="修改订单信息" center style="width: 50%">
<template v-if="zeroOrderFormList">
<div style="display: flex; align-items: center; text-align: center">
<div style="width: 120px">名称</div>
<div style="flex: 1">数量</div>
<div style="width: 120px; display: flex">名称</div>
<div style="display: flex">数量</div>
</div>
<el-form-item
:label="item.firsts"

28
src/views/system/dept.vue

@ -376,24 +376,26 @@ export default {
};
</script>
<style scoped lang='scss'>
:deep(.avue-form__row){
margin-left:10px;
max-width:300px!important;
<style scoped lang="scss">
:deep(.avue-form__row) {
margin-left: 10px;
max-width: 300px !important;
}
:deep(.no-print){
:deep(.no-print) {
margin-left: auto;
}
:deep(.avue-form__row){
margin-left:0;
:deep(.avue-form__row) {
margin-left: 0;
}
:deep(.no-print){
.el-button{
margin-right:0
:deep(.no-print) {
.el-button {
margin-right: 0;
}
}
:deep(.el-form-item__label){
width:auto !important;
:deep(.el-form-item__label) {
width: auto !important;
}
:deep(.el-table__empty-block) {
height: 100vh !important;
}
</style>

2
src/views/system/user.vue

@ -74,7 +74,7 @@
>账号解封
</el-button>
<el-button
type="success"
type="warning"
plain
v-if="userInfo.role_name.includes('admin')"
icon="el-icon-upload"

Loading…
Cancel
Save