问题修改

dev-scheduling
jinna 12 hours ago
parent b43196a6a5
commit ce4c013f50
  1. 18
      src/api/costManagement/costConfiguration.js
  2. 29
      src/views/basicData/components/inventory.vue
  3. 31
      src/views/basicData/components/warehouse.vue
  4. 33
      src/views/basicData/materialAttributeMaintenance.vue
  5. 8
      src/views/basicData/warehouseMaintenance.vue
  6. 11
      src/views/costManagement/costConfiguration.vue
  7. 18
      src/views/costStatistics/index.vue
  8. 39
      src/views/inboundOutboundManagement/binTransfer/index.vue
  9. 47
      src/views/warehouseManagement/materialMaintenance.vue
  10. 52
      src/views/warehouseManagement/materialPreserve.vue

@ -54,4 +54,20 @@ export const getWorkCenterList = () =>{
url: '/api/blade-desk/BA/WorkCenter/listForSelect',
method: 'get',
});
}
}
// 领料维护列表
export const getReceiveMaterialList = params =>
request({
url: '/api/blade-desk/costCalculationEmployee/page',
method: 'get',
params
});
// 产值维护列表
export const getProductionList = params =>
request({
url: '/api/blade-desk/costCalculationOutput/page',
method: 'get',
params
});

@ -15,9 +15,10 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@sort-change="sortChange"
>
<template #menu-left>
<el-button type="primary" @click="handleAdd">新增</el-button>
<el-button type="primary" @click="handleAdd" v-if="permission.storage_add">新增</el-button>
</template>
<template #goodsCode-form="{ type, disabled }">
<span>
@ -58,6 +59,7 @@ import {
delLocation,
editLocation,
} from '@/api/storeManagement/warehouseMaintenance';
import { mapGetters } from 'vuex';
export default {
components: { addEditDialog },
data() {
@ -112,6 +114,7 @@ export default {
search: true,
type: 'select',
filterable: true,
sortable: 'custom',
remote: true,
dicUrl: `/api/blade-wms/stStorehouse/page?current=1&&size=999999&&shName={{key}}`,
props: {
@ -132,6 +135,7 @@ export default {
prop: 'location',
span: 12,
overflow: true,
sortable: 'custom',
search: true,
rules: [
{
@ -144,6 +148,7 @@ export default {
{
label: '物料编号',
prop: 'goodsCode',
sortable: 'custom',
span: 12,
overflow: true,
search: true,
@ -153,6 +158,7 @@ export default {
label: '物料名称',
prop: 'goodsName',
span: 12,
sortable: 'custom',
overflow: true,
search: false,
disabled: true,
@ -162,6 +168,7 @@ export default {
prop: 'specifications',
span: 12,
overflow: true,
sortable: 'custom',
search: false,
disabled: true,
},
@ -188,8 +195,28 @@ export default {
loading: false,
};
},
computed: {
...mapGetters(['permission']),
permissionList() {
return {
delBtn: this.validData(this.permission.storage_delete, false),
editBtn: this.validData(this.permission.storage_edit, false),
};
},
},
mounted() {},
methods: {
//
sortChange({ prop, order }) {
this.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
//
this.onLoad(this.page, this.query);
},
changeGoods(val, item) {
console.log(val, item);
if (item != undefined) {

@ -7,6 +7,7 @@
v-model="form"
v-model:page="page"
ref="crud"
:permission="permissionList"
@row-del="rowDel"
@row-save="rowSave"
@row-update="rowUpdate"
@ -17,6 +18,7 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@sort-change="sortChange"
></avue-crud>
</div>
</template>
@ -40,6 +42,7 @@ import {
saveWareUser,
getMaterialSelect,
} from '@/api/storeManagement/warehouseMaintenance';
import { mapGetters } from 'vuex';
export default {
data() {
@ -93,6 +96,7 @@ export default {
span: 12,
overflow: true,
search: true,
sortable: 'custom',
rules: [
{
required: true,
@ -105,6 +109,7 @@ export default {
label: '库房名称',
prop: 'shName',
span: 12,
sortable: 'custom',
overflow: true,
search: true,
},
@ -112,6 +117,7 @@ export default {
label: '类别说明',
prop: 'memo',
span: 12,
sortable: 'custom',
overflow: true,
search: false,
},
@ -119,6 +125,7 @@ export default {
label: '所属工装类型',
prop: 'toolingType',
span: 12,
sortable: 'custom',
type: 'select',
overflow: true,
search: true,
@ -129,6 +136,7 @@ export default {
label: '所属类别',
prop: 'type',
span: 12,
sortable: 'custom',
overflow: true,
search: true,
type: 'select',
@ -138,6 +146,7 @@ export default {
{
label: '库房层级',
prop: 'shLevel',
sortable: 'custom',
span: 12,
overflow: true,
search: false,
@ -147,6 +156,7 @@ export default {
prop: 'saveUser',
span: 12,
overflow: true,
sortable: 'custom',
search: true,
filterable: true,
type: 'select',
@ -170,8 +180,29 @@ export default {
loading: false,
};
},
computed: {
...mapGetters(['permission']),
permissionList() {
return {
addBtn: this.validData(this.permission.warehouse_add, false),
delBtn: this.validData(this.permission.warehouse_delete, false),
editBtn: this.validData(this.permission.warehouse_edit, false),
};
},
},
mounted() {},
methods: {
//
sortChange({ prop, order }) {
this.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
//
this.onLoad(this.page, this.query);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;

@ -5,9 +5,13 @@
<el-tab-pane label="物料标记" name="materialMarking"></el-tab-pane>
</el-tabs> -->
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-del="rowDel" @row-save="rowAdd" @row-update="rowUpdate" @search-change="searchChange" @search-reset="searchReset"
@row-del="rowDel" @row-save="rowAdd" @row-update="rowUpdate"
:permission="permissionList"
@search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
@refresh-change="refreshChange" @on-load="onLoad"
@sort-change="sortChange"
>
</avue-crud>
</basic-container>
</template>
@ -15,6 +19,7 @@
<script>
import {getList,addType,updateType,deleteType} from "@/api/basicData/materialAttributeMaintenance"
// import materialAttribute from './js/materialAttribute'
import { mapGetters } from 'vuex';
export default {
data() {
return {
@ -71,6 +76,7 @@ export default {
prop: 'gcCode',
span: 24,
overflow: true,
sortable: 'custom',
search: true,
rules: [
{
@ -85,6 +91,7 @@ export default {
prop: 'gcName',
span: 24,
overflow: true,
sortable: 'custom',
search: true,
rules: [
{
@ -97,6 +104,7 @@ export default {
{
label: '类别说明',
prop: 'memo',
sortable: 'custom',
type: 'textarea',
span: 24,
overflow: true,
@ -115,10 +123,31 @@ export default {
selectionList:[]
}
},
computed: {
...mapGetters(['permission']),
permissionList() {
return {
addBtn: this.validData(this.permission.material_add, false),
delBtn: this.validData(this.permission.material_delete, false),
editBtn: this.validData(this.permission.material_edit, false),
};
},
},
mounted() {
// this.option.column = materialAttribute[this.tabPosition]
},
methods: {
//
sortChange({ prop, order }) {
this.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
//
this.onLoad(this.page, this.query);
},
searchChange(params, done){
this.page.currentPage = 1
this.query = params

@ -9,8 +9,8 @@
<inventory v-if="activeName == 'storageSetup'"></inventory>
<div v-if="activeName == 'inventorySetup'" class="setup-height">
<div style="margin-bottom: 10px">
<el-button type="primary" @click="selectFn(1)">按人员设置</el-button>
<el-button type="primary" @click="selectFn(2)">按库房设置</el-button>
<el-button type="primary" @click="selectFn(1)" v-if="permission.inventory_person">按人员设置</el-button>
<el-button type="primary" @click="selectFn(2)" v-if="permission.inventory_house">按库房设置</el-button>
</div>
<el-select
v-model="checkUser"
@ -71,7 +71,7 @@
<!-- <transferTree v-if="isUser == 2"></transferTree> -->
<!-- <treeTransfer :noChoose="noChooseUser" :choose="chooseUser" style="margin-top:10px;" v-if="isUser == 2"></treeTransfer> -->
<div style="margin-top: 10px; display: flex; justify-content: center; align-items: center">
<el-button type="primary" @click="handleSubmit"> </el-button>
<el-button type="primary" @click="handleSubmit" v-if="permission.inventory_save"> </el-button>
</div>
</div>
</basic-container>
@ -129,7 +129,7 @@ export default {
};
},
computed: {
...mapGetters(['userInfo']),
...mapGetters(['userInfo','permission']),
},
mounted() {},
methods: {

@ -4,10 +4,13 @@
<el-tabs v-model="tabPosition" class="demo-tabs" @tab-change="tabPositionChange">
<el-tab-pane label="工序维护" name="processMaintenance"></el-tab-pane>
<el-tab-pane label="物料维护" name="materialMaintenance"></el-tab-pane>
<el-tab-pane label="领料维护" name="receiveMaterial"></el-tab-pane>
<el-tab-pane label="产值维护" name="productionValue"></el-tab-pane>
</el-tabs>
<processMaintenance v-if="tabPosition == 'processMaintenance'"></processMaintenance>
<materialMaintenance v-if="tabPosition == 'materialMaintenance'"></materialMaintenance>
<receiveMaterial v-if="tabPosition == 'receiveMaterial'"></receiveMaterial>
<productionValue v-if="tabPosition == 'productionValue'"></productionValue>
<!-- <avue-crud
:option="option"
:table-loading="loading"
@ -124,11 +127,15 @@ import costColumnData from './js/costColumnData';
import basicImport from '@/components/basic-import/main.vue';
import processMaintenance from './components/processMaintenance.vue';
import materialMaintenance from './components/materialMaintenance.vue';
import receiveMaterial from './components/receiveMaterial.vue'
import productionValue from "./components/productionValue.vue"
export default {
components: {
basicImport,
processMaintenance,
materialMaintenance
materialMaintenance,
receiveMaterial,
productionValue
},
data() {
return {

@ -262,6 +262,24 @@ export default {
width:120,
overHidden: true,
},
{
label: '产值',
prop: 'output',
search: false,
sortable: 'custom',
sortable: false,
width:120,
overHidden: true,
},
{
label: '成本费用率',
prop: 'costRate',
search: false,
sortable: 'custom',
sortable: false,
width:120,
overHidden: true,
},
// {
// label:"",
// sortable: 'custom',

@ -3,9 +3,11 @@
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
@refresh-change="refreshChange" @on-load="onLoad"
@sort-change="sortChange"
>
<template #menu-left>
<el-button type="primary" @click="handleAdd">库位调整</el-button>
<el-button type="primary" @click="handleAdd" v-if="permission.binTransfer_adjust">库位调整</el-button>
<!-- <el-button type="danger" @click="handle()">删除</el-button> -->
</template>
<template #menu-right>
@ -30,6 +32,7 @@ import basicImport from '@/components/basic-import/main.vue'
import { getTransferList,delTransfer} from "@/api/storeManagement/binTransfer.js"
import { change } from '@/api/job/jobinfo'
import addEditDialog from './components/addEditDialog.vue'
import { mapGetters } from 'vuex';
export default {
components: {
basicImport,addEditDialog
@ -94,7 +97,7 @@ export default {
label: '物料编号',
prop: 'goodsCode',
// bind: 'stRealtimeStock.coGoods.goodsCode',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: true,
@ -117,7 +120,7 @@ export default {
label: '物料名称',
prop: 'goodsName',
// bind: 'stRealtimeStock.coGoods.goodsName',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: false,
@ -128,7 +131,7 @@ export default {
label: '旧库房号',
prop: 'oldWarehouseName',
// bind: 'oldStorageLocation.coStorehouse.shName',
sortable: true,
// sortable: 'custom',
filter: true,
span: 12,
search: false,
@ -157,7 +160,7 @@ export default {
label: '旧库位号',
prop: 'oldLocation',
// bind: 'oldStorageLocation.location',
sortable: true,
// sortable: 'custom',
filter: true,
span: 12,
search: false,
@ -187,7 +190,7 @@ export default {
label: '新库房号',
prop: 'newWarehouseName',
// bind: 'newStorageLocation.coStorehouse.shName',
sortable: true,
// sortable: 'custom',
filter: true,
span: 12,
search: false,
@ -217,7 +220,7 @@ export default {
label: '新库位号',
prop: 'newLocation',
// bind: 'newStorageLocation.location',
sortable: true,
// sortable: 'custom',
filter: true,
span: 12,
search: false,
@ -247,7 +250,7 @@ export default {
label: '物料规格',
prop: 'specifications',
// bind: 'stRealtimeStock.coGoods.specifications',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: false,
@ -256,7 +259,7 @@ export default {
label: '批次号',
prop: 'piNo',
// bind: 'stRealtimeStock.piNo',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: false,
@ -265,7 +268,7 @@ export default {
label: '库存数量',
prop: 'quantity',
// bind: 'stRealtimeStock.quantity',
sortable: true,
sortable: 'custom',
filter: true,
span: 12,
search: false,
@ -286,7 +289,21 @@ export default {
},
}
},
computed: {
...mapGetters(['permission']),
},
methods: {
//
sortChange({ prop, order }) {
this.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
//
this.onLoad(this.page, this.query);
},
closeDialog(val){
this.isShowImport = false
this.showDialog = false

@ -18,13 +18,14 @@
@refresh-change="refreshChange"
@on-load="onLoad"
:row-class-name="tableRowClassName"
@sort-change="sortChange"
>
<template #deptName="{ row }">{{ row.dept && row.dept.deptName }}</template>
<template #materialGoods="{ row }">{{ row.materialGoods.goodsCode }}</template>
<template #menu-left>
<div style="display: flex">
<el-input v-model="goodsCode" placeholder="请输入物料编码"></el-input>
<el-button type="primary" style="margin-left: 10px" @click="handleAdd">新增</el-button>
<el-button type="primary" style="margin-left: 10px" @click="handleAdd" v-if="permission.materialMaintain_add">新增</el-button>
</div>
</template>
<template #used="scope">
@ -34,6 +35,7 @@
:inactive-value="false"
active-color="#ff4949"
inactive-color="#13ce66"
:disabled="!permission.materialMaintain_isUsed"
@change="rowUpdate(scope.row)"
/>
</template>
@ -43,6 +45,7 @@
:active-value="true"
:inactive-value="false"
active-color="#ff4949"
:disabled="!permission.materialMaintain_minWarning"
inactive-color="#13ce66"
@change="rowUpdate(scope.row)"
/>
@ -62,6 +65,7 @@
import { getGoodsList, addGoods, editGoods } from '@/api/storeManagement/materialMaintenance';
// import { edit } from '@/api/orderManagement/exceptionOrder';
import materialAdd from './components/materialAdd.vue';
import { mapGetters } from 'vuex';
export default {
components: { materialAdd },
data() {
@ -116,6 +120,7 @@ export default {
label: '物料编码',
prop: 'goodsCode',
span: 12,
sortable: 'custom',
editDisabled: true,
overflow: true,
search: true,
@ -125,6 +130,7 @@ export default {
label: '物料名称',
prop: 'goodsName',
editDisabled: true,
sortable: 'custom',
span: 12,
overflow: true,
search: true,
@ -150,6 +156,7 @@ export default {
label: '型号/牌号',
prop: 'specifications',
span: 12,
sortable: 'custom',
overflow: true,
editDisplay: false,
search: true,
@ -165,6 +172,7 @@ export default {
{
label: '计量单位',
prop: 'unitName',
sortable: 'custom',
span: 12,
// editDisplay: false,
overflow: true,
@ -181,6 +189,7 @@ export default {
{
label: 'PDM单位',
prop: 'pdmUnit',
sortable: 'custom',
span: 12,
editDisplay: false,
overflow: true,
@ -198,6 +207,7 @@ export default {
label: '物料类别',
prop: 'gcId',
span: 12,
sortable: 'custom',
type: 'select',
// editDisplay: false,
overflow: true,
@ -219,6 +229,7 @@ export default {
{
label: '是否工艺审批',
prop: 'processApproval',
sortable: 'custom',
type: 'select',
dicData: [
{ label: '是', value: true },
@ -240,6 +251,7 @@ export default {
label: '补制类型',
prop: 'reissueType',
type: 'select',
sortable: 'custom',
dicData: [
// /**
// * -
@ -295,6 +307,7 @@ export default {
editDisplay: false,
span: 12,
overflow: true,
sortable: 'custom',
search: false,
width: 120,
rules: [
@ -311,6 +324,7 @@ export default {
span: 12,
overflow: true,
search: false,
sortable: 'custom',
width: 120,
// rules: [
// {
@ -325,6 +339,7 @@ export default {
prop: 'minNum',
span: 12,
overflow: true,
sortable: 'custom',
search: false,
width: 120,
rules: [
@ -340,6 +355,7 @@ export default {
label: '采购数量',
prop: 'purchaseQuantity',
span: 12,
sortable: 'custom',
overflow: true,
search: false,
width: 120,
@ -355,6 +371,7 @@ export default {
label: '是否启用',
editDisplay: true,
prop: 'used',
sortable: 'custom',
type: 'switch',
dicData: [
{ label: '关', value: false },
@ -394,6 +411,7 @@ export default {
overflow: true,
editDisplay: false,
search: false,
sortable: 'custom',
width: 120,
rules: [
{
@ -410,6 +428,7 @@ export default {
overflow: true,
editDisplay: false,
search: false,
sortable: 'custom',
width: 120,
rules: [
{
@ -423,6 +442,7 @@ export default {
label: '当前库存',
prop: 'currentQuantity',
editDisplay: false,
sortable: 'custom',
span: 12,
overflow: true,
search: false,
@ -439,6 +459,7 @@ export default {
editDisplay: false,
label: '在途',
prop: 'onthewayQuantity',
sortable: 'custom',
span: 12,
overflow: true,
search: false,
@ -454,6 +475,7 @@ export default {
{
label: '锁料',
prop: 'lockQuantity',
sortable: 'custom',
span: 12,
overflow: true,
editDisplay: false,
@ -473,6 +495,7 @@ export default {
span: 12,
overflow: true,
search: false,
sortable: 'custom',
hide: true,
width: 120,
// rules: [
@ -486,6 +509,7 @@ export default {
{
label: '最低库存预警',
prop: 'minWarning',
sortable: 'custom',
type: 'switch',
dicData: [
{ label: '关', value: false },
@ -494,7 +518,7 @@ export default {
span: 12,
overflow: true,
search: false,
width: 100,
width: 120,
rules: [
{
required: true,
@ -516,8 +540,27 @@ export default {
query: {},
};
},
computed: {
...mapGetters(['permission']),
permissionList() {
return {
editBtn: this.validData(this.permission.materialMaintain_edit, false),
};
},
},
mounted() {},
methods: {
//
sortChange({ prop, order }) {
this.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
//
this.onLoad(this.page, this.query);
},
closeDialog() {
this.materialAddShow = false;
this.onLoad(this.page);

@ -4,7 +4,8 @@
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@row-save="rowSave" @row-update="rowUpdate" :before-open="beforeOpen"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad" >
@refresh-change="refreshChange" @on-load="onLoad"
:permission="permissionList" @sort-change="sortChange">
<!-- <template #goodsCode="{ row }">{{ row.coGoods.goodsCode }}</template>
<template #goodsName="{ row }">{{ row.coGoods.goodsName }}</template>
<template #bsBasicClass="{ row }">{{ row.bsBasicClass.name }}</template>
@ -12,15 +13,15 @@
<template #mtltmrk="{ row }">{{ row.coGoods.mtltmrk }}</template>
<template #specifications="{ row }">{{ row.coGoods.specifications }}</template> -->
<template #menu-left>
<el-button type="danger" @click="handleDelete">删除</el-button>
<el-button type="primary" @click="handlePaint">缺漆信息</el-button>
<el-button type="danger" @click="handleDelete" v-if="permission.materialPreserve_del">删除</el-button>
<el-button type="primary" @click="handlePaint" v-if="permission.materialPreserve_paintLoss">缺漆信息</el-button>
</template>
<template #menu-right>
<el-button type="danger" @click="handleSearch(1)" plain>需报料</el-button>
<el-button type="warning" @click="handleSearch(2)" plain>需跟踪</el-button>
<el-button type="primary" @click="handleSearch(3)" plain>待领料</el-button>
<el-button type="success" @click="handleSearch(4)" plain>正常</el-button>
<el-button type="info" @click="handleSearch(5)" plain>长期未使用</el-button>
<el-button type="danger" @click="handleSearch(1)" v-if="permission.materialPreserve_needGoods" plain>需报料</el-button>
<el-button type="warning" @click="handleSearch(2)" v-if="permission.materialPreserve_needTail" plain>需跟踪</el-button>
<el-button type="primary" @click="handleSearch(3)" v-if="permission.materialPreserve_awaitMaterial" plain>待领料</el-button>
<el-button type="success" @click="handleSearch(4)" v-if="permission.materialPreserve_normal" plain>正常</el-button>
<el-button type="info" @click="handleSearch(5)" v-if="permission.materialPreserve_notUsed" plain>长期未使用</el-button>
</template>
</avue-crud>
<paint-loss-dialog v-if="isOpen" :openShow="isOpen" title="缺漆信息" :data="laInData" @closeDialog="closeDialog"></paint-loss-dialog>
@ -30,6 +31,7 @@
<script>
import {getMaterialStatusList,addMaterialStatus,editMaterialStatus,delMaterialStatus} from "@/api/storeManagement/materialPreserve"
import paintLossDialog from './components/paintLossDialog.vue'
import { mapGetters } from 'vuex';
export default {
components: {
paintLossDialog
@ -98,6 +100,7 @@ export default {
addDisplay: false,
editDisplay: false,
span: 8,
sortable: 'custom',
hide:true,
width: 200,
search: true,
@ -124,6 +127,7 @@ export default {
type: 'select',
addDisplay: true,
editDisplay: true,
sortable: 'custom',
span: 8,
width: 200,
search: false,
@ -153,6 +157,7 @@ export default {
addDisabled: true,
addDisplay: true,
editDisplay: true,
sortable: 'custom',
span: 8,
width: 200,
search: true,
@ -171,6 +176,7 @@ export default {
prop: 'materialModel',
addDisplay: false,
editDisplay: false,
sortable: 'custom',
span: 8,
width: 200,
search: false,
@ -187,6 +193,7 @@ export default {
prop: 'specifications',
addDisplay: false,
editDisplay: false,
sortable: 'custom',
span: 8,
width: 200,
search: false,
@ -203,6 +210,7 @@ export default {
prop: 'useAverage',
addDisplay: true,
editDisplay: true,
sortable: 'custom',
span: 8,
width: 200,
search: false,
@ -213,6 +221,7 @@ export default {
prop: 'firstStore',
addDisplay: false,
editDisplay: false,
sortable: 'custom',
span: 8,
width: 200,
search: false,
@ -229,6 +238,7 @@ export default {
prop: 'lastStore',
addDisplay: false,
editDisplay: false,
sortable: 'custom',
span: 8,
width: 200,
search: false,
@ -245,6 +255,7 @@ export default {
prop: 'planQty',
addDisplay: false,
editDisplay: false,
sortable: 'custom',
span: 8,
width: 120,
search: false,
@ -262,6 +273,7 @@ export default {
type: 'select',
addDisplay: true,
editDisplay: true,
sortable: 'custom',
span: 8,
width: 120,
search: false,
@ -283,6 +295,7 @@ export default {
type: 'select',
addDisplay: true,
editDisplay: true,
sortable: 'custom',
span: 8,
width: 200,
search: true,
@ -302,6 +315,7 @@ export default {
type: "select",
addDisplay: true,
editDisplay: true,
sortable: 'custom',
span: 8,
width: 120,
search: true,
@ -323,6 +337,7 @@ export default {
type: 'select',
addDisplay: true,
editDisplay: true,
sortable: 'custom',
span: 8,
width: 120,
search: true,
@ -344,6 +359,7 @@ export default {
type: 'select',
addDisplay: false,
editDisplay: false,
sortable: 'custom',
span: 8,
width: 200,
search: true,
@ -377,10 +393,30 @@ export default {
}
}
},
computed: {
...mapGetters(['permission']),
permissionList() {
return {
addBtn: this.validData(this.permission.materialPreserve_add, false),
editBtn: this.validData(this.permission.materialPreserve_edit, false),
};
},
},
mounted() {
},
methods: {
//
sortChange({ prop, order }) {
this.query.descs = undefined;
this.query.ascs = undefined;
let orderByFieldKey = order === 'descending' ? 'descs' : 'ascs';
this.query[orderByFieldKey] = !prop
? undefined
: prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
//
this.onLoad(this.page, this.query);
},
searchChange(params, done){
this.query = params
this.page.currentPage = 1;

Loading…
Cancel
Save