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 68b173b7c7
commit 874cfdb0b8
6 changed files with 114 additions and 68 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. 20
      src/views/exWarehouse/dispatchDistribute/waveArrangement.vue
  2. 30
      src/views/exWarehouse/dispatchDistribute/waveDistribution.vue
  3. 4
      src/views/libraryManage/inventory/InventoryEntry.vue
  4. 78
      src/views/libraryManage/inventory/config.js
  5. 45
      src/views/wcs/base/AGV/index.vue
  6. 5
      vue.config.js

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

@ -360,16 +360,16 @@ export default {
prop: 'orderDate',
istrue: true
},
{
label: '整件数',
prop: 'totalCaseQry',
istrue: true
},
{
label: '折合件数',
prop: 'combineNumber',
istrue: true
},
// {
// label: '整件数',
// prop: 'totalCaseQry',
// istrue: true
// },
// {
// label: '折合件数',
// prop: 'combineNumber',
// istrue: true
// },
// {
// label: '出库优先级',
// prop: 'priority',

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

@ -113,12 +113,12 @@ export default {
label: '件数',
prop: 'caseNumber',
istrue: true
},
{
label: '折合件数',
prop: 'combineNumber',
istrue: true
}
// {
// label: '折合件数',
// prop: 'combineNumber',
// istrue: true
// }
],
tableData2: [],
loading2: false,
@ -165,16 +165,16 @@ export default {
prop: 'orderDate',
istrue: true
},
{
label: '整件数',
prop: 'totalCaseQry',
istrue: true
},
{
label: '折合件数',
prop: 'combineNumber',
istrue: true
},
// {
// label: '整件数',
// prop: 'totalCaseQry',
// istrue: true
// },
// {
// label: '折合件数',
// prop: 'combineNumber',
// istrue: true
// },
{
label: '品规数',
prop: 'goodsNumber',

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

@ -211,11 +211,15 @@ export default {
this.disabledFlag = false
this.selectData = val
this.handleSelect = val.map((ele) => ele.id)
val.forEach((item) => {
if (item.invStatus !== 'init') {
this.disabledFlag = true
}
})
if (val.length === 0) {
this.disabledFlag = true
}
},
// 重置
resetQuery() {

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

@ -326,7 +326,6 @@ export function tableConfig() {
prop: "invType",
istrue: true,
filter(row, value) {
console.log(row);
return getDictLabel(value, _that.dict.type.inv_type_dict);
},
},
@ -502,45 +501,45 @@ export function tableConfig() {
prop: "goodName",
istrue: true,
},
{
label: "批号",
prop: "batchNo",
istrue: true,
},
// {
// label: "批号",
// prop: "batchNo",
// istrue: true,
// },
{
label: "包装单位",
prop: "unit",
istrue: true,
// filter(row, value) {
// return getDictLabel(value, _that.dict.type.goods_unit);
// },
},
{
label: "包装数量",
prop: "packageQty",
istrue: true,
},
{
label: "生产厂家",
prop: "factory",
istrue: true,
},
{
label: "产地",
prop: "waster",
istrue: true,
},
// {
// label: "包装单位",
// prop: "unit",
// istrue: true,
// filter(row, value) {
// return getDictLabel(value, _that.dict.type.goods_unit);
// },
// },
// {
// label: "包装数量",
// prop: "packageQty",
// istrue: true,
// },
// {
// label: "生产厂家",
// prop: "factory",
// istrue: true,
// },
// {
// label: "产地",
// prop: "waster",
// istrue: true,
// },
{
label: "件数",
prop: "caseQty",
istrue: true,
},
{
label: "零散数",
prop: "pieceQty",
istrue: true,
},
// {
// label: "零散数",
// prop: "pieceQty",
// istrue: true,
// },
{
label: "数量",
prop: "quantity",
@ -551,11 +550,11 @@ export function tableConfig() {
prop: "invCase",
istrue: true,
},
{
label: "实盘零散数",
prop: "invPiece",
istrue: true,
},
// {
// label: "实盘零散数",
// prop: "invPiece",
// istrue: true,
// },
{
label: "实盘数量",
prop: "invQty",
@ -595,7 +594,6 @@ export function tableConfig() {
prop: "invType",
istrue: true, //inv_type_dict
filter(row, value) {
console.log(row);
return getDictLabel(value, _that.dict.type.inv_type_dict);
},
},

45
src/views/wcs/base/AGV/index.vue
Unescape View File

@ -1,6 +1,51 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="88px"
>
<el-form-item
label="点位编码"
prop="devName"
>
<el-input
v-model="queryParams.pointNo"
placeholder="请输入点位编码查询"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item
label="点位名称"
prop="devName"
>
<el-input
v-model="queryParams.pointName"
placeholder="请输入点位名称查询"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button>
</el-form-item>
</el-form>
<div class="opt-box">
<div class="opt-box-right">
<el-button

5
vue.config.js
Unescape View File

@ -35,8 +35,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://127.0.0.1:8031`,
target: `http://192.168.0.110:8030`,
target: `http://127.0.0.1:8031`,
// target: `http://192.168.0.110:8030`,
// target: `http://192.168.0.105:8030`,
// target: `http://120.77.94.227:8030`,
// target: `http://xiaowen.vaiwan.com`,
@ -86,7 +86,6 @@ module.exports = {
.loader("sass-resources-loader")
.options({
// 要公用的scss的路径
resources: "src/assets/styles/_customVariables.scss",
})
.end();

Write Preview
Loading…
Cancel
Save