时间查询 去掉产品规划

master
Mr.sun 2 years ago
parent f5604f2186
commit e2c8dd1aa7
  1. 3
      src/api/wms/busFunctions/reportForms/lockInStock.js
  2. 16
      src/views/libraryManage/components/goods.vue
  3. 58
      src/views/libraryManage/inventory/InventoryEntry.vue
  4. 67
      src/views/libraryManage/inventory/config.js
  5. 3
      src/views/libraryManage/inventory/inventory.vue
  6. 18
      src/views/libraryManage/inventoryLock/apply/config.js
  7. 6
      src/views/libraryManage/inventoryLock/examine/config.js
  8. 13
      src/views/libraryManage/lockOutStore/index.vue
  9. 4
      vue.config.js

@ -70,7 +70,8 @@ export function getLockstockBatch(data) {
//叫料确认 //叫料确认
export function addLockstockOut(data) { export function addLockstockOut(data) {
return request({ return request({
url: '/wms/lock/addLockstockOut', // url: '/wms/lock/addLockstockOut',
url: 'wms/stock/lock/addLockstockOut',
method: 'post', method: 'post',
data: data data: data
}) })

@ -120,10 +120,10 @@ export default {
{ {
label: '单位', label: '单位',
prop: 'unit', prop: 'unit',
istrue: true, istrue: true
filter(row, value) { // filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.goods_unit) // return _that.getDictLabel(value, _that.dict.type.goods_unit)
} // }
}, },
{ {
label: '商品规格', label: '商品规格',
@ -143,10 +143,10 @@ export default {
{ {
label: '产品分类', label: '产品分类',
prop: 'classify', prop: 'classify',
istrue: true, istrue: true
filter(row, value) { // filter(row, value) {
return _that.getDictLabel(value, _that.dict.type.goods_classify) // return _that.getDictLabel(value, _that.dict.type.goods_classify)
} // }
}, },
{ {
label: '存储分类', label: '存储分类',

@ -22,6 +22,22 @@
<el-radio label="close">盲盘</el-radio> <el-radio label="close">盲盘</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="盘点状态">
<el-select
v-model="enterForm.invType"
placeholder="请选择盘点状态"
clearable
style="width: 240px"
>
<el-option
v-for="item in dict.type.inv_status"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="货位"> <el-form-item label="货位">
<el-input <el-input
v-model="enterForm.locationCode" v-model="enterForm.locationCode"
@ -30,6 +46,29 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="生产计划日期">
<!-- <el-date-picker
v-model="value1"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker> -->
<el-date-picker
style="width: 280px"
v-model="value1"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '00:00:00']"
>
</el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
@ -124,14 +163,16 @@
import { tableConfig } from './config.js' import { tableConfig } from './config.js'
import { list, cancel, entrySave } from '@/api/libraryManage/inventory' import { list, cancel, entrySave } from '@/api/libraryManage/inventory'
import { Debounce, getDictLabel } from '@/utils/index' import { Debounce, getDictLabel } from '@/utils/index'
import moment from 'moment'
export default { export default {
name: '', name: '',
dicts: ['goods_storage_conditions', 'goods_classify', 'goods_unit', 'inv_type_dict'], dicts: ['goods_storage_conditions', 'goods_classify', 'goods_unit', 'inv_type_dict', 'inv_status'],
data() { data() {
return { return {
enterForm: { enterForm: {
invOrderNo: '' invOrderNo: '',
// invWay: 'open' // invWay: 'open'
invStatus: 'init'
}, },
selectData: [], selectData: [],
tableForm: { tableData: [] }, tableForm: { tableData: [] },
@ -142,13 +183,13 @@ export default {
page: 1, // page: 1, //
size: 10, // size: 10, //
total: 0 total: 0
} },
value1: [moment().locale('zh-cn').format('yyyy-MM-DD 00:00:00'), moment().locale('zh-cn').add(1, 'days').format('yyyy-MM-DD 00:00:00')]
} }
}, },
mounted() {}, mounted() {},
async created() { async created() {
this.queryTable() this.queryTable()
this.tableConfig = await this.getTableHeaderCom('busin_inventory_add', tableConfig.call(this), 'configEntry') this.tableConfig = await this.getTableHeaderCom('busin_inventory_add', tableConfig.call(this), 'configEntry')
}, },
methods: { methods: {
@ -156,6 +197,13 @@ export default {
queryTable() { queryTable() {
// if (!this.enterForm.invOrderNo) return this.$message("!"); // if (!this.enterForm.invOrderNo) return this.$message("!");
this.loading = true this.loading = true
if (this.value1 !== null && this.value1 !== 'null' && this.value1 !== undefined) {
this.enterForm.execTime = this.value1[0]
this.enterForm.endTime = this.value1[1]
} else {
this.enterForm.execTime = null
this.enterForm.endTime = null
}
list({ list({
// invWay: 'open', // invWay: 'open',
...this.enterForm ...this.enterForm
@ -177,7 +225,9 @@ export default {
}, },
// //
resetQuery() { resetQuery() {
this.value1 = [moment().locale('zh-cn').format('yyyy-MM-DD'), moment().locale('zh-cn').format('yyyy-MM-DD')]
this.enterForm = {} this.enterForm = {}
this.queryTable()
}, },
onCalc3(row, prop) { onCalc3(row, prop) {
if (row.storageClassify === '0') { if (row.storageClassify === '0') {

@ -61,11 +61,7 @@ export function tableConfig() {
prop: "batchNo", prop: "batchNo",
istrue: true, istrue: true,
}, },
{
label: "商品规格",
prop: "specifications",
istrue: true,
},
{ {
label: "库存数量", label: "库存数量",
prop: "quantity", prop: "quantity",
@ -116,6 +112,15 @@ export function tableConfig() {
filter(row, value) { filter(row, value) {
return getDictLabel(value, _that.dict.type.inv_type_dict); return getDictLabel(value, _that.dict.type.inv_type_dict);
}, },
},
{
label: "盘点状态",
prop: "invStatus",
istrue: true,
filter(row, value) {
return getDictLabel(value, _that.dict.type.inv_status);
},
}, },
// { // {
// label: "显示货位", // label: "显示货位",
@ -147,11 +152,7 @@ export function tableConfig() {
// prop: "batchNo", // prop: "batchNo",
// istrue: true, // istrue: true,
// }, // },
// {
// label: "产品规格",
// prop: "specifications",
// istrue: true,
// },
// { // {
// label: "包装单位", // label: "包装单位",
// prop: "unit", // prop: "unit",
@ -242,6 +243,17 @@ export function tableConfig() {
prop: "locationGroup", prop: "locationGroup",
istrue: true, istrue: true,
}, },
{
label: "执行盘点时间",
prop: "execTime",
istrue: true,
},
{
label: "完成盘点时间",
prop: "endTime",
istrue: true,
},
{ {
label: "深位", label: "深位",
prop: "isDeep", prop: "isDeep",
@ -252,11 +264,7 @@ export function tableConfig() {
prop: "batchNo", prop: "batchNo",
istrue: true, istrue: true,
}, },
{
label: "商品规格",
prop: "specifications",
istrue: true,
},
{ {
label: "库存数量", label: "库存数量",
prop: "quantity", prop: "quantity",
@ -316,6 +324,7 @@ export function tableConfig() {
prop: "invType", prop: "invType",
istrue: true, istrue: true,
filter(row, value) { filter(row, value) {
console.log(row);
return getDictLabel(value, _that.dict.type.inv_type_dict); return getDictLabel(value, _that.dict.type.inv_type_dict);
}, },
}, },
@ -349,11 +358,7 @@ export function tableConfig() {
prop: "batchNo", prop: "batchNo",
istrue: true, istrue: true,
}, },
{
label: "产品规格",
prop: "specifications",
istrue: true,
},
{ {
label: "包装单位", label: "包装单位",
prop: "unit", prop: "unit",
@ -453,6 +458,7 @@ export function tableConfig() {
prop: "productionDate", prop: "productionDate",
istrue: true, istrue: true,
}, },
{ {
label: "盘点类型", label: "盘点类型",
prop: "invType", prop: "invType",
@ -461,6 +467,14 @@ export function tableConfig() {
return getDictLabel(value, _that.dict.type.inv_type_dict); return getDictLabel(value, _that.dict.type.inv_type_dict);
}, },
}, },
{
label: "盘点状态",
prop: "invStatus",
istrue: true,
filter(row, value) {
return getDictLabel(value, _that.dict.type.inv_status);
},
},
{ {
label: "显示货位", label: "显示货位",
prop: "locationName", prop: "locationName",
@ -491,11 +505,7 @@ export function tableConfig() {
prop: "batchNo", prop: "batchNo",
istrue: true, istrue: true,
}, },
{
label: "产品规格",
prop: "specifications",
istrue: true,
},
{ {
label: "包装单位", label: "包装单位",
prop: "unit", prop: "unit",
@ -583,6 +593,7 @@ export function tableConfig() {
prop: "invType", prop: "invType",
istrue: true, //inv_type_dict istrue: true, //inv_type_dict
filter(row, value) { filter(row, value) {
console.log(row);
return getDictLabel(value, _that.dict.type.inv_type_dict); return getDictLabel(value, _that.dict.type.inv_type_dict);
}, },
}, },
@ -616,11 +627,7 @@ export function tableConfig() {
prop: "batchNo", prop: "batchNo",
istrue: true, istrue: true,
}, },
{
label: "产品规格",
prop: "specifications",
istrue: true,
},
{ {
label: "包装单位", label: "包装单位",
prop: "unit", prop: "unit",

@ -118,7 +118,8 @@
type="primary" type="primary"
@click="generateThePlan" @click="generateThePlan"
:disabled="!handleSelect.length != 0" :disabled="!handleSelect.length != 0"
>生成计划</el-button> >生成计划
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<!-- <el-button type="primary" @click="exportBtn">导出</el-button> --> <!-- <el-button type="primary" @click="exportBtn">导出</el-button> -->

@ -44,9 +44,9 @@ export function tableConfig() {
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);
}, // },
}, },
{ {
label: "件装量", label: "件装量",
@ -138,9 +138,9 @@ export function tableConfig() {
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);
}, // },
}, },
{ {
label: "件装量", label: "件装量",
@ -227,9 +227,9 @@ export function tableConfig() {
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);
}, // },
}, },
{ {
label: "件装量", label: "件装量",

@ -57,9 +57,9 @@ export function tableConfig() {
label: "单位", label: "单位",
prop: "unit", prop: "unit",
istrue: true, istrue: true,
filter(row, value) { // filter(row, value) {
return getDictLabel(value, _that.dict.type.goods_unit); // return getDictLabel(value, _that.dict.type.goods_unit);
}, // },
}, },
{ {
label: "件装量", label: "件装量",

@ -124,7 +124,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
label="叫料位置" label="叫料位置"
prop="trolleyType" prop="trolleyType"
> >
@ -143,7 +143,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item <el-form-item
label="需求量" label="需求量"
prop="ptPart" prop="ptPart"
@ -337,9 +337,9 @@ export default {
// getItemDataBreakCat({ pageSize: 999, pageNum: 1 }).then((response) => { // getItemDataBreakCat({ pageSize: 999, pageNum: 1 }).then((response) => {
// this.BreakCatList = response.data // this.BreakCatList = response.data
// }) // })
getLockstockBatch({ pageSize: 999, pageNum: 1 }).then((response) => { // getLockstockBatch({ pageSize: 999, pageNum: 1 }).then((response) => {
this.lockstockBatch = response.data // this.lockstockBatch = response.data
}) // })
}, },
methods: { methods: {
// //
@ -432,9 +432,10 @@ export default {
let data = { let data = {
id: tempRow.id, id: tempRow.id,
batch: tempRow.batch, batch: tempRow.batch,
ptPart: tempRow.ptPart, // ptPart: tempRow.taskPath,
lockNo: tempRow.lockNo, lockNo: tempRow.lockNo,
lockId: tempRow.lockId lockId: tempRow.lockId
// taskPath:''
// containerCode: tempRow.tempRow // containerCode: tempRow.tempRow
} }
this.form = data this.form = data

@ -35,8 +35,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://127.0.0.1:8031`, // target: `http://127.0.0.1:8031`,
// target: `http://192.168.0.110:8030`, target: `http://192.168.0.110:8030`,
// target: `http://192.168.0.105:8030`, // target: `http://192.168.0.105:8030`,
// target: `http://120.77.94.227:8030`, // target: `http://120.77.94.227:8030`,
// target: `http://xiaowen.vaiwan.com`, // target: `http://xiaowen.vaiwan.com`,

Loading…
Cancel
Save