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

优化

Browse Source
This commit is contained in:
zds
2022-12-06 12:36:17 +08:00
parent dd366c7322
commit f9c9429dd1
16 changed files with 171 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mes/qd/src/views/wms/lk/libraryquery/QueryDtlDialog.vue
View File

@@ -22,15 +22,16 @@
style="width: 100%;"
>
<el-table-column type="selection" width="55"/>
<el-table-column show-overflow-tooltip prop="pallet_code" label="托盘"/>
<el-table-column show-overflow-tooltip prop="barrelcode" label="桶号"/>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码"/>
<el-table-column show-overflow-tooltip prop="pcsn" label="批号"/>
<el-table-column show-overflow-tooltip prop="weight" label="重量" :formatter="crud.formatNum3"/>
<el-table-column show-overflow-tooltip prop="status" label="品质类型" :formatter="formatStatus"/>
<el-table-column show-overflow-tooltip prop="available" label="是否可用" :formatter="formatIsUsable"/>
<el-table-column show-overflow-tooltip prop="ordernum" label="序号"/>
<el-table-column show-overflow-tooltip prop="inputtime" label="入库时间"/>
<el-table-column prop="pallet_code" label="托盘" min-width="120px" />
<el-table-column prop="barrelcode" label="桶号" min-width="150" />
<el-table-column prop="material_code" label="物料编码" min-width="150" />
<el-table-column prop="pcsn" label="批号" min-width="120" />
<el-table-column prop="weight" label="重量" :formatter="crud.formatNum3" min-width="120" />
<el-table-column prop="status" label="品质类型" :formatter="formatStatus" min-width="120" />
<el-table-column prop="available" label="是否可用" :formatter="formatIsUsable" min-width="120" />
<el-table-column prop="weigh_status" label="称重状态" min-width="120" />
<el-table-column prop="ordernum" label="序号" min-width="120" />
<el-table-column prop="inputtime" label="入库时间" min-width="150" />
</el-table>
<!--分页组件-->
</div>

38
mes/qd/src/views/wms/lk/libraryquery/index.vue
View File

@@ -77,6 +77,25 @@
/>
</el-select>
</el-form-item>
<el-form-item label="称重状态">
<el-select
v-model="query.weigh_status"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 210px;"
@change="hand"
>
<el-option
v-for="item in dict.weigh_status"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -106,18 +125,19 @@
<!--表格渲染-->
<el-table ref="table" :max-height="590" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="pallet_code" label="托盘" width="120px">
<el-table-column prop="pallet_code" label="托盘" min-width="120px">
<template slot-scope="scope">
<el-link type="warning" @click="queryDtl(scope.row)">{{ scope.row.pallet_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称" />
<el-table-column prop="pcsn" label="批号" />
<el-table-column prop="weight" label="重量" :formatter="crud.formatNum3"/>
<el-table-column prop="status" label="品质类型" :formatter="formatStatus"/>
<el-table-column prop="available" label="是否可用" :formatter="formatIsUsable"/>
<el-table-column prop="inputtime" label="入库时间" />
<el-table-column prop="material_code" label="物料编码" min-width="150" />
<el-table-column prop="material_name" label="物料名称" min-width="150" />
<el-table-column prop="pcsn" label="批号" min-width="120" />
<el-table-column prop="weight" label="重量" :formatter="crud.formatNum3" min-width="120" />
<el-table-column prop="status" label="品质类型" :formatter="formatStatus" min-width="120" />
<el-table-column prop="available" label="是否可用" :formatter="formatIsUsable" min-width="120"/>
<el-table-column prop="weigh_status" label="称重状态" min-width="120"/>
<el-table-column prop="inputtime" label="入库时间" min-width="150" />
</el-table>
<!--分页组件-->
<pagination />
@@ -141,7 +161,7 @@ import { downloadFile } from '@/utils'
const defaultForm = { agvaddr: null }
export default {
name: 'Libraryquery',
dicts: ['is_usable', 'ST_QUALITY_SCODE'],
dicts: ['is_usable', 'ST_QUALITY_SCODE', 'weigh_status'],
components: { QueryDtlDialog, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

1
mes/qd/src/views/wms/statistics/materPlan/StructIvt2.vue
View File

@@ -104,7 +104,6 @@ export default {
report.query4().then(res => {
this.XLList = res
})
this.queryStruct()
},
/**
* 接受父组件传值

1
mes/qd/src/views/wms/statistics/materPlan/StructIvt3.vue
View File

@@ -103,7 +103,6 @@ export default {
report.query4().then(res => {
this.XLList = res
})
this.queryStruct()
},
/**
* 接受父组件传值

1
mes/qd/src/views/wms/statistics/materPlan/StructIvt4.vue
View File

@@ -100,7 +100,6 @@ export default {
report.query4().then(res => {
this.XLList = res
})
this.queryStruct()
},
/**
* 接受父组件传值

14
mes/qd/src/views/wms/statistics/materPlan/index.vue
View File

@@ -52,7 +52,8 @@
<el-table-column v-if="col.prop !== 'first'" :prop="col.prop" :label="col.label" width="120px" />
<el-table-column v-if="col.prop === 'first'" :prop="col.prop" :label="col.label" width="120px" fixed>
<template slot-scope="scope">
<el-link type="warning" @click="open2(scope.$index, scope.row)">{{ scope.row.first }}</el-link>
<span v-show="!isshow(scope.row)">{{ scope.row.first }}</span>
<el-link v-show="isshow(scope.row)" type="warning" @click="open2(scope.$index, scope.row)">{{ scope.row.first }}</el-link>
</template>
</el-table-column>
</template>
@@ -183,6 +184,17 @@ export default {
this.structshow3 = true
}
},
isshow(row) {
if (row.first === '库存现存量') {
return true
} else if (row.first === '待检入库量') {
return true
} else if (row.first === '合同在途') {
return true
} else {
return false
}
},
hand(value) {
this.crud.toQuery()
},