去除部分属性 增加时间排序

master
Mr.sun 2 years ago
parent ad326f5d98
commit 4c76752793
  1. 1
      .gitignore
  2. 350
      src/views/exWarehouse/dispatchDistribute/components/orderDetails.vue
  3. 112
      src/views/exWarehouse/dispatchDistribute/waveArrangement.vue
  4. 392
      src/views/exWarehouse/dispatchDistribute/waveDistribution.vue
  5. 155
      src/views/exWarehouse/dispatchDistribute/waveState.vue
  6. 3
      src/views/libraryManage/inventory/InventoryEntry.vue
  7. 22
      src/views/libraryManage/inventory/config.js
  8. 1
      src/views/libraryManage/inventory/inventory.vue
  9. 15
      src/views/libraryManage/inventoryLock/examine/config.js
  10. 28
      src/views/taskManagement/index.vue
  11. 32
      src/views/warehousing/receiving/config.js

1
.gitignore vendored

@ -22,3 +22,4 @@ selenium-debug.log
package-lock.json
yarn.lock
vue.config.js

@ -10,17 +10,22 @@
@opened="opened"
>
<el-card class="box-card">
<sForm ref="simpleForm" :formdata="formdata"> </sForm>
<sForm
ref="simpleForm"
:formdata="formdata"
> </sForm>
</el-card>
<div class="opt-box">
<div class="opt-box-right">
<el-button type="primary" @click="redFlushTotal">整单冲红</el-button>
<el-button
type="primary"
@click="redFlushTotal"
>整单冲红</el-button>
<el-button
type="primary"
@click="redFlushDetial"
:disabled="handleSelect.length === 0"
>所选明细冲红</el-button
>
>所选明细冲红</el-button>
</div>
</div>
<div class="layout-full">
@ -56,7 +61,10 @@
:prop="`data.${scope.row.index}.reason`"
:rules="tableForm.rules.reason"
>
<el-select v-model="scope.row.reason" placeholder="请选择">
<el-select
v-model="scope.row.reason"
placeholder="请选择"
>
<el-option
v-for="item in dict.type.red_reason"
:key="item.value"
@ -73,26 +81,22 @@
</el-dialog>
</template>
<script>
import {
getListByOrderNo,
wholeOrderRed,
orderDetailRed,
} from "@/api/exWarehouse/dispatchDistribute";
import { validateField } from "@/utils/custom.js";
import { getListByOrderNo, wholeOrderRed, orderDetailRed } from '@/api/exWarehouse/dispatchDistribute'
import { validateField } from '@/utils/custom.js'
export default {
props: ["orderInfo"],
dicts: ["red_reason", "goods_unit"],
props: ['orderInfo'],
dicts: ['red_reason', 'goods_unit'],
data() {
const _that = this;
const _that = this
return {
dialogVisible: false,
formdata: {
type: "view",
width: "100px",
type: 'view',
width: '100px',
data: {
orderNo: "",
companyName: "",
consignorName: "",
orderNo: '',
companyName: '',
consignorName: ''
},
config: [
{
@ -101,25 +105,25 @@ export default {
[
[
{
label: "单据编号:",
prop: "orderNo",
type: "label",
label: '单据编号:',
prop: 'orderNo',
type: 'label'
},
{
label: "单位名称:",
prop: "companyName",
type: "label",
label: '单位名称:',
prop: 'companyName',
type: 'label'
},
{
label: "业主名称:",
prop: "consignorName",
type: "label",
},
],
],
],
},
],
label: '业主名称:',
prop: 'consignorName',
type: 'label'
}
]
]
]
}
]
},
tableForm: {
data: [],
@ -127,230 +131,222 @@ export default {
redNum: [
{
required: true,
message: "请输入冲红数量",
trigger: "change,blur",
},
message: '请输入冲红数量',
trigger: 'change,blur'
}
],
reason: [
{
required: true,
message: "请选择冲红原因",
trigger: "change,blur",
},
],
},
message: '请选择冲红原因',
trigger: 'change,blur'
}
]
}
},
tableProps: {
"max-height": 500,
'max-height': 500
},
config: [
//
{ label: "复选框", type: "selection", prop: "selection", istrue: true },
{ label: '复选框', type: 'selection', prop: 'selection', istrue: true },
{
label: "序号",
prop: "index",
type: "index",
istrue: true,
label: '序号',
prop: 'index',
type: 'index',
istrue: true
},
{
label: "商品编号",
prop: "goodNo",
istrue: true,
label: '商品编号',
prop: 'goodNo',
istrue: true
},
{
label: "商品名称",
prop: "goodName",
istrue: true,
label: '商品名称',
prop: 'goodName',
istrue: true
},
{
label: "商品规格",
prop: "specifications",
istrue: true,
label: '商品规格',
prop: 'specifications',
istrue: true
},
// {
// label: '',
// prop: 'factory',
// istrue: true
// },
{
label: "生产厂家",
prop: "factory",
istrue: true,
},
{
label: "件装量",
prop: "packageQty",
istrue: true,
},
{
label: "单位",
prop: "unit",
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.goods_unit);
},
},
{
label: "批号",
prop: "batchNo",
istrue: true,
label: '件装量',
prop: 'packageQty',
istrue: true
},
{
label: "生产日期",
prop: "productionDate",
istrue: true,
label: '单位',
prop: 'unit',
istrue: true
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.goods_unit);
// },
},
// {
// label: '',
// prop: 'batchNo',
// istrue: true
// },
// {
// label: '',
// prop: 'productionDate',
// istrue: true
// },
{
label: "有效期",
prop: "expiredDate",
istrue: true,
},
// {
// label: '',
// prop: 'expiredDate',
// istrue: true
// },
{
label: "订单总数量",
prop: "qty",
istrue: true,
},
{
label: "冲红数量",
prop: "redNum",
"min-width": 100,
istrue: true,
type: "slot",
slotName: "redNum",
tooltip: false,
label: '订单总数量',
prop: 'qty',
istrue: true
},
// {
// label: '',
// prop: 'redNum',
// 'min-width': 100,
// istrue: true,
// type: 'slot',
// slotName: 'redNum',
// tooltip: false
// },
// {
// label: '',
// 'min-width': 100,
// prop: 'reason',
// istrue: true,
// type: 'slot',
// slotName: 'reason',
// tooltip: false
// },
{
label: "冲红原因",
"min-width": 100,
prop: "reason",
istrue: true,
type: "slot",
slotName: "reason",
tooltip: false,
label: '累计已冲红数量',
prop: 'redQty',
istrue: true
},
{
label: "累计已冲红数量",
prop: "redQty",
istrue: true,
label: '整件未处理量',
prop: 'noHandleCaseQty',
istrue: true
},
{
label: "整件未处理量",
prop: "noHandleCaseQty",
istrue: true,
},
{
label: "零货未处理量",
prop: "noHandlePieceQty",
istrue: true,
},
label: '零货未处理量',
prop: 'noHandlePieceQty',
istrue: true
}
],
handleSelect: [], //
handleSelectId: [], // id
handleSelectMap: [], //
};
handleSelectMap: [] //
}
},
methods: {
async open() {
await this.getTableHeaderCom("busin_out_order_d", {
config: this.config,
});
this.queryTable();
await this.getTableHeaderCom('busin_out_order_d', {
config: this.config
})
this.queryTable()
},
opened() {
this.$refs.simpleForm.resetFormValue();
this.$refs.simpleForm.setFormValue(this.orderInfo);
this.$refs.simpleForm.resetFormValue()
this.$refs.simpleForm.setFormValue(this.orderInfo)
},
hasValid(row) {
if (row.redNum > row.qty - row.redQty) {
this.$message.warning("冲红数量不能超过(订单总数量-累计已冲红数量)");
row.redNum = "";
} else if (row.redNum === 0 || row.redNum === "0") {
this.$message.warning("冲红数量不能为0");
row.redNum = "";
this.$message.warning('冲红数量不能超过(订单总数量-累计已冲红数量)')
row.redNum = ''
} else if (row.redNum === 0 || row.redNum === '0') {
this.$message.warning('冲红数量不能为0')
row.redNum = ''
}
},
//
redFlushTotal() {
this.$refs["tableForm"].clearValidate();
this.$refs["tableForm"].validate((valid) => {
this.$refs['tableForm'].clearValidate()
this.$refs['tableForm'].validate((valid) => {
if (valid) {
this.$confirm(
"确认要对整个订单进行冲红吗?冲红后将无法再进行波次安排!",
"冲红确认",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
).then(() => {
this.$confirm('确认要对整个订单进行冲红吗?冲红后将无法再进行波次安排!', '冲红确认', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
wholeOrderRed({ orderNo: this.orderInfo.orderNo }).then((res) => {
if (res.code === 200) {
this.$message.success("冲红成功");
this.closeDialog();
this.$message.success('冲红成功')
this.closeDialog()
}
});
});
})
})
} else {
this.$message.warning("校验不通过");
this.$message.warning('校验不通过')
}
});
})
},
validateField,
//
redFlushDetial() {
this.$refs["tableForm"].clearValidate();
let arr = [];
this.$refs['tableForm'].clearValidate()
let arr = []
this.tableForm.data.forEach((ele, index) => {
if (this.handleSelectId.includes(ele.id)) {
arr.push(this.validateField("tableForm", index));
arr.push(this.validateField('tableForm', index))
}
});
})
if (arr.some((k) => !k)) {
//
this.$message.warning("校验不通过");
this.$message.warning('校验不通过')
} else {
this.$confirm(
"确认要对所选明细进行数量冲红吗?冲红后的数量将无法进行拣选!",
"冲红确认",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
).then(() => {
this.$confirm('确认要对所选明细进行数量冲红吗?冲红后的数量将无法进行拣选!', '冲红确认', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleSelectMap = this.handleSelect.map((ele) => {
return {
id: ele.id,
redQty: ele.redNum,
reason: ele.reason,
};
});
reason: ele.reason
}
})
orderDetailRed(this.handleSelectMap).then((res) => {
if (res.code === 200) {
this.$message.success("冲红成功");
this.closeDialog();
this.$message.success('冲红成功')
this.closeDialog()
}
});
});
})
})
}
},
//
closeDialog() {
this.dialogVisible = false;
this.$emit("toReset");
this.dialogVisible = false
this.$emit('toReset')
},
//
queryTable() {
getListByOrderNo(this.orderInfo.orderNo).then((res) => {
if (res.code === 200) {
this.tableForm.data = res.data;
this.tableForm.data = res.data
}
});
})
},
handleselection(data) {
this.handleSelect = data;
this.handleSelectId = data.map((ele) => ele.id);
},
},
};
this.handleSelect = data
this.handleSelectId = data.map((ele) => ele.id)
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.box-card {

@ -370,58 +370,58 @@ export default {
prop: 'combineNumber',
istrue: true
},
{
label: '出库优先级',
prop: 'priority',
istrue: true
},
{
label: '客户备注',
prop: 'companyRemark',
istrue: true
},
{
label: '开票员',
prop: 'userSalesman',
istrue: true
},
{
label: '路线名称',
prop: 'lineno',
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.line_name_type)
}
},
{
label: '提货方式',
prop: 'deliverMode',
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.deliver_mode_dict)
}
},
{
label: '订单类型',
prop: 'orderType',
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.order_type_dict)
}
},
{
label: '部门名称',
prop: 'deptName',
istrue: true
},
{
label: '订单状态',
prop: 'orderStatus',
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.out_order_status)
}
},
// {
// label: '',
// prop: 'priority',
// istrue: true
// },
// {
// label: '',
// prop: 'companyRemark',
// istrue: true
// },
// {
// label: '',
// prop: 'userSalesman',
// istrue: true
// },
// {
// label: '线',
// prop: 'lineno',
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.line_name_type)
// }
// },
// {
// label: '',
// prop: 'deliverMode',
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.deliver_mode_dict)
// }
// },
// {
// label: '',
// prop: 'orderType',
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.order_type_dict)
// }
// },
// {
// label: '',
// prop: 'deptName',
// istrue: true
// },
// {
// label: '',
// prop: 'orderStatus',
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.out_order_status)
// }
// },
{
label: '操作',
prop: 'operating',
@ -579,14 +579,6 @@ export default {
toQuery() {
// this.paging.page = 1;
// this.queryTable();
if (Object.prototype.toString.call(val) === '[object Object]') {
this.paging.size = val.size
this.queryTable()
} else {
// console.log(val)
this.paging.page = val
this.queryTable()
}
},
toReset() {
this.query = {}

@ -7,8 +7,7 @@
type="primary"
:disabled="!curRow.waveCode"
@click="distributeWave"
>波次下发</el-button
>
>波次下发</el-button>
<!-- <el-button
type="primary"
:disabled="!curRow.waveCode"
@ -19,12 +18,17 @@
type="primary"
:disabled="!curRow.waveCode"
@click="cancleWave"
>取消波次</el-button
>
<el-button type="primary" @click="queryTable">刷新</el-button>
>取消波次</el-button>
<el-button
type="primary"
@click="queryTable"
>刷新</el-button>
</div>
</div>
<div class="layout-full" style="margin-bottom: 45px">
<div
class="layout-full"
style="margin-bottom: 45px"
>
<heavy-table
:data="tableData"
:loading="loading"
@ -58,23 +62,13 @@
</div>
</template>
<script>
import {
waveOrderList,
waveDistribution,
waveCancel,
waveDeleteOrder,
} from "@/api/exWarehouse/dispatchDistribute";
import orderPoolReplenishment from "./components/orderPoolReplenishment";
import { waveOrderList, waveDistribution, waveCancel, waveDeleteOrder } from '@/api/exWarehouse/dispatchDistribute'
import orderPoolReplenishment from './components/orderPoolReplenishment'
export default {
components: { orderPoolReplenishment },
dicts: [
"out_order_status",
"line_name_type",
"deliver_mode_dict",
"order_type_dict",
],
dicts: ['out_order_status', 'line_name_type', 'deliver_mode_dict', 'order_type_dict'],
data() {
const _that = this;
const _that = this
return {
handleSelect: [],
handleSelectId: [],
@ -83,295 +77,291 @@ export default {
paging: {
page: 1, //
size: 10, //
total: 0,
total: 0
},
tableConfig: [
// { label: "", type: "selection", prop: "selection", istrue: true },
{
label: "",
prop: "radio",
type: "radio",
label: '',
prop: 'radio',
type: 'radio',
event: this.handleCommand,
istrue: true,
istrue: true
},
{
label: "序号",
type: "index",
prop: "index",
istrue: true,
label: '序号',
type: 'index',
prop: 'index',
istrue: true
},
{
label: "波次号",
prop: "waveCode",
istrue: true,
label: '波次号',
prop: 'waveCode',
istrue: true
},
{
label: "订单数",
prop: "orderNumber",
istrue: true,
label: '订单数',
prop: 'orderNumber',
istrue: true
},
{
label: "品规数",
prop: "goodsNumber",
istrue: true,
label: '品规数',
prop: 'goodsNumber',
istrue: true
},
{
label: "件数",
prop: "caseNumber",
istrue: true,
label: '件数',
prop: 'caseNumber',
istrue: true
},
{
label: "折合件数",
prop: "combineNumber",
istrue: true,
},
label: '折合件数',
prop: 'combineNumber',
istrue: true
}
],
tableData2: [],
loading2: false,
paging2: {
page: 1, //
size: 10, //
total: 0,
total: 0
},
tableConfig2: [
//
{
label: "序号",
prop: "index",
type: "index",
istrue: true,
label: '序号',
prop: 'index',
type: 'index',
istrue: true
},
{
label: "业主编号",
prop: "consignorCode",
istrue: true,
label: '业主编号',
prop: 'consignorCode',
istrue: true
},
{
label: "业主名称",
prop: "consignorName",
istrue: true,
label: '业主名称',
prop: 'consignorName',
istrue: true
},
{
label: "单位编号",
prop: "companyNo",
istrue: true,
label: '单位编号',
prop: 'companyNo',
istrue: true
},
{
label: "单位名称",
prop: "companyName",
istrue: true,
label: '单位名称',
prop: 'companyName',
istrue: true
},
{
label: "单据编号",
prop: "orderNo",
istrue: true,
label: '单据编号',
prop: 'orderNo',
istrue: true
},
{
label: "下单时间",
prop: "orderDate",
istrue: true,
label: '下单时间',
prop: 'orderDate',
istrue: true
},
{
label: "整件数",
prop: "totalCaseQry",
istrue: true,
label: '整件数',
prop: 'totalCaseQry',
istrue: true
},
{
label: "折合件数",
prop: "combineNumber",
istrue: true,
label: '折合件数',
prop: 'combineNumber',
istrue: true
},
{
label: "品规数",
prop: "goodsNumber",
istrue: true,
label: '品规数',
prop: 'goodsNumber',
istrue: true
},
// {
// label: "",
// prop: "priority",
// istrue: true,
// },
// {
// label: "",
// prop: "companyRemark",
// istrue: true,
// },
// {
// label: "",
// prop: "userSalesman",
// istrue: true,
// },
// {
// label: "线",
// prop: "lineno",
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.line_name_type);
// },
// },
// {
// label: "",
// prop: "deliverMode",
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.deliver_mode_dict);
// },
// },
// {
// label: "",
// prop: "orderType",
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.order_type_dict);
// },
// },
// {
// label: "",
// prop: "deptName",
// istrue: true,
// },
// {
// label: "",
// prop: "orderStatus",
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.out_order_status);
// },
// },
{
label: "出库优先级",
prop: "priority",
istrue: true,
},
{
label: "客户备注",
prop: "companyRemark",
istrue: true,
},
{
label: "开票员",
prop: "userSalesman",
istrue: true,
},
{
label: "路线名称",
prop: "lineno",
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.line_name_type);
},
},
{
label: "提货方式",
prop: "deliverMode",
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.deliver_mode_dict);
},
},
{
label: "订单类型",
prop: "orderType",
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.order_type_dict);
},
label: '波次号',
prop: 'waveCode',
istrue: true
},
{
label: "部门名称",
prop: "deptName",
label: '操作',
prop: 'operating',
istrue: true,
},
{
label: "订单状态",
prop: "orderStatus",
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.out_order_status);
},
},
{
label: "波次号",
prop: "waveCode",
istrue: true,
},
{
label: "操作",
prop: "operating",
istrue: true,
type: "button",
type: 'button',
width: 90,
fixed: "right",
fixed: 'right',
buttons: [
{
name: "剔除订单",
event: "doDel",
},
],
},
name: '剔除订单',
event: 'doDel'
}
]
}
],
tableProps: {
"max-height": 240,
'max-height': 240
},
curRow: {}, //
};
curRow: {} //
}
},
async created() {
await this.getTableHeaderCom("busin_out_wave", {
config: this.tableConfig,
});
await this.getTableHeaderCom("busin_out_wave_order_s", {
config: this.tableConfig2,
});
this.queryTable();
await this.getTableHeaderCom('busin_out_wave', {
config: this.tableConfig
})
await this.getTableHeaderCom('busin_out_wave_order_s', {
config: this.tableConfig2
})
this.queryTable()
},
methods: {
toReplenishment() {
this.$refs.orderPoolReplenishment.dialogVisible = true;
this.$refs.orderPoolReplenishment.dialogVisible = true
},
handleCommand(data, row, prop) {
this.curRow = row;
this.curRow = row
},
queryTable() {
console.log(this.tableConfig, "tableConfig");
this.loading = true;
console.log(this.tableConfig, 'tableConfig')
this.loading = true
let request = {
// pageSize: this.paging.size,
// pageNum: this.paging.page,
};
}
waveOrderList(request)
.then((res) => {
if (res.code === 200) {
res.data.forEach((element) => {
element.businOutOrderSVos.forEach((ele) => {
ele.waveCode = element.waveCode;
});
});
this.tableData = res.data;
this.tableData2 = [];
ele.waveCode = element.waveCode
})
})
this.tableData = res.data
this.tableData2 = []
// this.paging.total = res.total;
}
this.loading = false;
this.loading = false
})
.catch(() => {
this.loading = false;
});
this.loading = false
})
},
queryTable2() {},
rowClick(row) {
this.tableData2 = row.businOutOrderSVos;
this.tableData2 = row.businOutOrderSVos
},
//
distributeWave() {
this.$confirm("确认选中数据进行波次下发?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
this.$confirm('确认选中数据进行波次下发?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// let arrStr = this.handleSelect.map((ele) => ele.waveCode).join(",");
waveDistribution(this.curRow.waveCode).then((res) => {
if (res.code == 200) {
this.$message.success("波次下发成功");
this.queryTable();
this.$message.success('波次下发成功')
this.queryTable()
}
});
});
})
})
},
//
cancleWave() {
this.$confirm("确认选中数据进行波次取消?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
this.$confirm('确认选中数据进行波次取消?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// let arrStr = this.handleSelect.map((ele) => ele.waveCode).join(",");
waveCancel(this.curRow.waveCode).then((res) => {
if (res.code == 200) {
this.$message.success("波次取消成功");
this.queryTable();
this.$message.success('波次取消成功')
this.queryTable()
}
});
});
})
})
},
handleselection(data) {
this.handleSelect = data;
this.handleSelectId = data.map((ele) => ele.id);
this.handleSelect = data
this.handleSelectId = data.map((ele) => ele.id)
},
//
doDel(row) {
this.$confirm(
"确认要将订单从波次中剔除吗?提出后订单将还原回初始状态,可重新生成波次!",
"剔除确认",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
).then(() => {
this.$confirm('确认要将订单从波次中剔除吗?提出后订单将还原回初始状态,可重新生成波次!', '剔除确认', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let obj = {
waveCode: row.waveCode,
orderNo: row.orderNo,
};
orderNo: row.orderNo
}
waveDeleteOrder(obj).then((res) => {
if (res.code == 200) {
this.$message.success("剔除成功");
this.queryTable();
this.$message.success('剔除成功')
this.queryTable()
}
});
});
},
},
};
})
})
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped></style>

@ -153,12 +153,12 @@ export default {
return _that.getDictLabel(value, _that.dict.type.out_order_status)
}
},
{
label: '出库优先级',
prop: 'priority',
istrue: true,
width: '100'
},
// {
// label: '',
// prop: 'priority',
// istrue: true,
// width: '100'
// },
{
label: '业主编号',
prop: 'consignorCode',
@ -188,71 +188,71 @@ export default {
label: '下单时间',
prop: 'orderDate',
istrue: true
},
{
label: '整件数',
prop: 'totalCaseQry',
istrue: true
},
{
label: '折合件数',
prop: 'combineNumber',
istrue: true
},
{
label: '品规数',
prop: 'goodsNumber',
istrue: true
},
{
label: '客户备注',
prop: 'companyRemark',
istrue: true
},
{
label: '开票员',
prop: 'userSalesman',
istrue: true
},
{
label: '路线名称',
prop: 'lineno',
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.line_name_type)
}
},
{
label: '提货方式',
prop: 'deliverMode',
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.deliver_mode_dict)
}
},
{
label: '订单类型',
prop: 'orderType',
istrue: true,
filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.order_type_dict)
}
},
{
label: '部门名称',
prop: 'deptName',
istrue: true
},
{
label: '暂存区起始位置',
prop: 'tempPlatformStartName',
istrue: true
},
{
label: '暂存区终止位置',
prop: 'tempPlatformEndName',
istrue: true
}
// {
// label: '',
// prop: 'totalCaseQry',
// istrue: true
// },
// {
// label: '',
// prop: 'combineNumber',
// istrue: true
// }
// {
// label: '',
// prop: 'goodsNumber',
// istrue: true
// },
// {
// label: '',
// prop: 'companyRemark',
// istrue: true
// },
// {
// label: '',
// prop: 'userSalesman',
// istrue: true
// },
// {
// label: '线',
// prop: 'lineno',
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.line_name_type)
// }
// }
// {
// label: '',
// prop: 'deliverMode',
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.deliver_mode_dict)
// }
// },
// {
// label: '',
// prop: 'orderType',
// istrue: true,
// filter(row, value) {
// return _that.getDictLabel(value, _that.dict.type.order_type_dict)
// }
// },
// {
// label: '',
// prop: 'deptName',
// istrue: true
// },
// {
// label: '',
// prop: 'tempPlatformStartName',
// istrue: true
// },
// {
// label: '',
// prop: 'tempPlatformEndName',
// istrue: true
// }
],
curRow: {}
}
@ -307,17 +307,10 @@ export default {
this.loading = false
})
},
toQuery() {
// this.paging.page = 1;
// this.queryTable();
if (Object.prototype.toString.call(val) === '[object Object]') {
this.paging.size = val.size
this.queryTable()
} else {
// console.log(val)
this.paging.page = val
this.queryTable()
}
toQuery(val) {
// console.log(1111)
this.paging.page = 1
this.queryTable()
},
toReset() {
this.query = {}

@ -305,9 +305,6 @@ export default {
const { rows } = await entrySave(arr2)
this.$message.success('操作成功')
this.queryTable()
// } else {
// this.$message.warning("0");
// }
}
},
//

@ -71,6 +71,7 @@ export function tableConfig() {
label: "单位",
prop: "unit",
istrue: true,
"min-width": 100,
// filter(row, value) {
// return getDictLabel(value, _that.dict.type.goods_unit);
@ -238,6 +239,17 @@ export function tableConfig() {
prop: "goodName",
istrue: true,
},
{
label: "批号",
prop: "batchNo",
istrue: true,
},
{
label: "库存数量",
prop: "quantity",
istrue: true,
},
{
label: "货位分组",
prop: "locationGroup",
@ -259,17 +271,7 @@ export function tableConfig() {
prop: "isDeep",
istrue: true,
},
{
label: "批号",
prop: "batchNo",
istrue: true,
},
{
label: "库存数量",
prop: "quantity",
istrue: true,
},
{
label: "单位",
prop: "unit",

@ -193,6 +193,7 @@ export default {
},
async created() {
this.tableConfig = await this.getTableHeaderCom('busin_inventory', tableConfig.call(this))
console.log(this.tableConfig)
},
watch: {
// locationCode

@ -46,6 +46,13 @@ export function tableConfig() {
"min-width": 120,
"show-overflow-tooltip": true,
},
{
label: "批号",
prop: "batchNo",
istrue: true,
"min-width": 120,
"show-overflow-tooltip": true,
},
{
label: "商品规格",
prop: "specifications",
@ -72,13 +79,7 @@ export function tableConfig() {
prop: "locationName",
istrue: true,
},
{
label: "批号",
prop: "batchNo",
istrue: true,
"min-width": 120,
"show-overflow-tooltip": true,
},
],
};
}

@ -365,6 +365,7 @@ export default {
label: '任务创建时间',
prop: 'createTime',
istrue: true,
sortable: true,
width: '180px'
},
{
@ -576,6 +577,20 @@ export default {
this.getList()
}
},
//
formatStringToTimestamp(formattedString) {
// Date
let date = new Date(formattedString)
// Date
if (!isNaN(date.getTime())) {
//
let timestamp = date.getTime()
return timestamp
} else {
throw new Error('Invalid formatted string')
}
},
/** 查询区域列表 */
getList() {
this.loading = true
@ -586,7 +601,15 @@ export default {
this.queryParams.createTimeS = null
this.queryParams.createTimeE = null
}
queryTaskManagement(this.queryParams).then((res) => {
// res.rows.sort((a, b) => {
// a.createTime < b.createTime ? 1 : -1
// })
res.rows = res.rows.sort((a, b) => {
return this.formatStringToTimestamp(b['createTime']) - this.formatStringToTimestamp(a['createTime'])
})
console.log(res.rows)
this.cheshiList = res.rows
this.paging.total = res.total
this.loading = false
@ -598,6 +621,11 @@ export default {
})
})
},
compare(prop) {
return function (a, b) {
return b[prop] - a[prop] //
}
},
//
cancel() {
this.open = false

@ -93,24 +93,24 @@ export function tableConfig() {
prop: "ableQty",
istrue: true,
},
{
label: "存储条件",
prop: "bgStorageConditions",
istrue: true,
// {
// label: "存储条件",
// prop: "bgStorageConditions",
// istrue: true,
filter(row, value) {
return getDictLabel(value, _that.dict.type.goods_storage_conditions);
},
},
{
label: "产品分类",
prop: "bgClassify",
istrue: true,
// filter(row, value) {
// return getDictLabel(value, _that.dict.type.goods_storage_conditions);
// },
// },
// {
// label: "产品分类",
// prop: "bgClassify",
// istrue: true,
filter(row, value) {
return getDictLabel(value, _that.dict.type.goods_classify);
},
},
// filter(row, value) {
// return getDictLabel(value, _that.dict.type.goods_classify);
// },
// },
{
label: "商品编号",
prop: "bgGoodNo",

Loading…
Cancel
Save