root
/
cy_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
Mr.sun 2 years ago
parent ad326f5d98
commit 4c76752793
11 changed files with 556 additions and 555 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 354
      src/views/exWarehouse/dispatchDistribute/components/orderDetails.vue
  3. 112
      src/views/exWarehouse/dispatchDistribute/waveArrangement.vue
  4. 392
      src/views/exWarehouse/dispatchDistribute/waveDistribution.vue
  5. 153
      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
Unescape View File

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

354
src/views/exWarehouse/dispatchDistribute/components/orderDetails.vue
Unescape View File

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

112
src/views/exWarehouse/dispatchDistribute/waveArrangement.vue
Unescape View File

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

392
src/views/exWarehouse/dispatchDistribute/waveDistribution.vue
Unescape View File

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

153
src/views/exWarehouse/dispatchDistribute/waveState.vue
Unescape View File

@ -153,12 +153,12 @@ export default {
return _that.getDictLabel(value, _that.dict.type.out_order_status) return _that.getDictLabel(value, _that.dict.type.out_order_status)
} }
}, },
{ // {
label: '出库优先级', // label: '出库优先级',
prop: 'priority', // prop: 'priority',
istrue: true, // istrue: true,
width: '100' // width: '100'
}, // },
{ {
label: '业主编号', label: '业主编号',
prop: 'consignorCode', prop: 'consignorCode',
@ -188,71 +188,71 @@ export default {
label: '下单时间', label: '下单时间',
prop: 'orderDate', prop: 'orderDate',
istrue: true 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: {} curRow: {}
} }
@ -307,17 +307,10 @@ export default {
this.loading = false this.loading = false
}) })
}, },
toQuery() { toQuery(val) {
// this.paging.page = 1; // console.log(1111)
// this.queryTable(); this.paging.page = 1
if (Object.prototype.toString.call(val) === '[object Object]') {
this.paging.size = val.size
this.queryTable() this.queryTable()
} else {
// console.log(val)
this.paging.page = val
this.queryTable()
}
}, },
toReset() { toReset() {
this.query = {} this.query = {}

3
src/views/libraryManage/inventory/InventoryEntry.vue
Unescape View File

@ -305,9 +305,6 @@ export default {
const { rows } = await entrySave(arr2) const { rows } = await entrySave(arr2)
this.$message.success('操作成功') this.$message.success('操作成功')
this.queryTable() this.queryTable()
// } else {
// this.$message.warning("必填项不能为0");
// }
} }
}, },
// 取消盘点 // 取消盘点

22
src/views/libraryManage/inventory/config.js
Unescape View File

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

1
src/views/libraryManage/inventory/inventory.vue
Unescape View File

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

15
src/views/libraryManage/inventoryLock/examine/config.js
Unescape View File

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

28
src/views/taskManagement/index.vue
Unescape View File

@ -365,6 +365,7 @@ export default {
label: '任务创建时间', label: '任务创建时间',
prop: 'createTime', prop: 'createTime',
istrue: true, istrue: true,
sortable: true,
width: '180px' width: '180px'
}, },
{ {
@ -576,6 +577,20 @@ export default {
this.getList() 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() { getList() {
this.loading = true this.loading = true
@ -586,7 +601,15 @@ export default {
this.queryParams.createTimeS = null this.queryParams.createTimeS = null
this.queryParams.createTimeE = null this.queryParams.createTimeE = null
} }
queryTaskManagement(this.queryParams).then((res) => { 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.cheshiList = res.rows
this.paging.total = res.total this.paging.total = res.total
this.loading = false this.loading = false
@ -598,6 +621,11 @@ export default {
}) })
}) })
}, },
compare(prop) {
return function (a, b) {
return b[prop] - a[prop] //降序
}
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false this.open = false

32
src/views/warehousing/receiving/config.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save