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

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-07-20 19:37:52 +08:00
parent 78b220f2ca 1b326afa4c
commit 144960a348
21 changed files with 1173 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
View File

@@ -407,7 +407,7 @@ export default {
if (!'00,11'.includes(rows[i].status)) {
this.sub_flag = true
}
if (!'00,10'.includes(rows[i].status)) {
if (!'10'.includes(rows[i].status)) {
this.dissub_flag = true
}
if (rows.length !== 1) {
@@ -477,12 +477,12 @@ export default {
LODOP.PRINT_INIT('')
LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
LODOP.SET_PRINT_STYLE('FontSize', 9)
LODOP.SET_PRINT_STYLE('FontSize', 12)
LODOP.SET_PRINT_STYLE('Bold', 1)
LODOP.ADD_PRINT_BARCODE('10mm', '15mm', '60mm', '20mm', '128A', data.device_code)
LODOP.ADD_PRINT_TEXT('35mm', '15mm', '80mm', '15mm', '设备编码：' + data.device_code + '')
LODOP.ADD_PRINT_TEXT('40mm', '15mm', '80mm', '15mm', '设备名称：' + data.device_name + '')
LODOP.ADD_PRINT_TEXT('45mm', '15mm', '80mm', '15mm', '型号：' + data.device_model + '')
LODOP.ADD_PRINT_BARCODE('10mm', '12mm', '60mm', '20mm', '128A', data.device_code)
LODOP.ADD_PRINT_TEXT('34mm', '12mm', '80mm', '15mm', '设备编码：' + data.device_code + '')
LODOP.ADD_PRINT_TEXT('42mm', '12mm', '80mm', '15mm', '设备名称：' + data.device_name + '')
LODOP.ADD_PRINT_TEXT('49mm', '12mm', '80mm', '15mm', '设备型号：' + data.device_model + '')
LODOP.PRINT()// 打印
this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()

6
mes/qd/src/views/wms/ql/factorywarranty/index.vue
View File

@@ -120,7 +120,7 @@
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.inspection_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="path" label="质保书列表" width="80px">
<el-table-column prop="path" label="质保书列表" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
<el-button type="primary" icon="el-icon-folder-opened" circle @click="Picconfirm(scope.$index, scope.row)" />
</template>
@@ -136,9 +136,9 @@
<el-table-column prop="source_bill_code" label="源单据编号" width="150px" />
<el-table-column prop="input_optname" label="创建人" />
<el-table-column prop="input_time" label="创建时间" width="150px" />
<el-table-column prop="check_optname" label="检验人姓名" />
<el-table-column prop="check_optname" label="检验人" />
<el-table-column prop="check_time" label="检验时间" width="150px" />
<el-table-column prop="confirm_optname" label="确认人姓名" />
<el-table-column prop="confirm_optname" label="确认人" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">

12
mes/qd/src/views/wms/ql/physicalMst/index.vue
View File

@@ -138,7 +138,7 @@
<el-input v-model="form.inspection_code" placeholder="系统生成" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料" prop="material_name">
<el-input v-model="form.material_name" disabled class="input-with-select">
<el-input v-model="form.material_name" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater" />
</el-input>
</el-form-item>
@@ -186,13 +186,13 @@
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="inspection_id" label="理化质检单标识" />
<el-table-column prop="inspection_code" label="质检单号" width="135" />
<el-table-column prop="inspection_type" label="单据类型" :formatter="format_inspection_type" />
<el-table-column min-width="100" show-overflow-tooltip prop="inspection_type" label="单据类型" :formatter="format_inspection_type" />
<el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus" />
<el-table-column v-if="false" prop="biz_date" label="业务日期" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批号" min-width="100" show-overflow-tooltip/>
<el-table-column prop="pcsn" label="批号" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_effective" label="是否有效" :formatter="format_is_active" />
<el-table-column prop="result" label="结果" :formatter="format_result" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
@@ -200,7 +200,7 @@
<el-table-column prop="input_time" label="创建时间" width="135" />
<el-table-column prop="check_optname" label="检验人" />
<el-table-column prop="check_time" label="检验时间" width="135" />
<el-table-column prop="confirm_optname" label="结论判定人" />
<el-table-column prop="confirm_optname" label="结论判定人" min-width="100" />
<el-table-column prop="confirm_time" label="结论判定时间" width="135" />
<el-table-column label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
@@ -217,7 +217,7 @@
<pagination />
</div>
<MaterDtl :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2" />
<MaterDtl :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2" />
<Dialog1 :visiable1.sync="visiable1" :inspection-id="inspection_id" />
<RelevancyDialog :dialog-show.sync="RelevancyShow" @RelevancyChanged="RelevancyChanged" />
@@ -318,7 +318,7 @@ export default {
this.crud.toQuery()
})
},
queryMater(){
queryMater() {
this.materShow = true
},
resultEnter(data) {

60
mes/qd/src/views/wms/ql/physicalMstConfirm/index.vue
View File

@@ -94,7 +94,7 @@
/>
</el-select>
</el-form-item>
<rrOperation/>
<rrOperation />
</el-form>
</div>
@@ -154,18 +154,18 @@
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-input v-if="false" v-model="form.material_id"/>
<el-input v-if="false" v-model="form.material_id" />
<el-form-item label="质检单号" prop="inspection_code">
<el-input v-model="form.inspection_code" placeholder="系统生成" disabled style="width: 370px;"/>
<el-input v-model="form.inspection_code" placeholder="系统生成" disabled style="width: 370px;" />
</el-form-item>
<el-form-item label="物料" prop="material_name">
<el-input v-model="form.material_name" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-search" @click="queryMater"/>
<el-button slot="append" icon="el-icon-search" @click="queryMater" />
</el-input>
</el-form-item>
<el-form-item label="批号" prop="pcsn">
<el-input v-model="form.pcsn" style="width: 370px;"/>
<el-input v-model="form.pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="单据类型" prop="inspection_type">
<el-select
@@ -184,11 +184,11 @@
</el-select>
</el-form-item>
<el-form-item v-if="form.inspection_type==='30'" label="关联单号" prop="inspection_id_gu">
<el-input v-model="form.inspection_id_gu" clearable style="width: 370px;" @focus="RelevancyShow=true"/>
<el-input v-model="form.inspection_id_gu" clearable style="width: 370px;" @focus="RelevancyShow=true" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea"/>
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -205,25 +205,25 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="inspection_id" label="理化质检单标识"/>
<el-table-column prop="inspection_code" label="质检单号" width="135"/>
<el-table-column prop="inspection_type" label="单据类型" :formatter="format_inspection_type"/>
<el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus"/>
<el-table-column v-if="false" prop="biz_date" label="业务日期"/>
<el-table-column v-if="false" prop="material_id" label="物料标识"/>
<el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip/>
<el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip/>
<el-table-column min-width="110" show-overflow-tooltip prop="pcsn" label="批号"/>
<el-table-column prop="is_effective" label="是否有效" :formatter="format_is_active"/>
<el-table-column prop="result" label="结果" :formatter="format_result"/>
<el-table-column prop="remark" show-overflow-tooltip label="备注"/>
<el-table-column prop="input_optname" label="创建人"/>
<el-table-column prop="input_time" label="创建时间" width="135"/>
<el-table-column prop="check_optname" label="检验人"/>
<el-table-column prop="check_time" label="检验时间" width="135"/>
<el-table-column prop="confirm_optname" label="结论判定人"/>
<el-table-column prop="confirm_time" label="结论判定时间" width="135"/>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="inspection_id" label="理化质检单标识" />
<el-table-column prop="inspection_code" label="质检单号" width="135" />
<el-table-column min-width="100" show-overflow-tooltip prop="inspection_type" label="单据类型" :formatter="format_inspection_type" />
<el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus" />
<el-table-column v-if="false" prop="biz_date" label="业务日期" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip />
<el-table-column min-width="110" show-overflow-tooltip prop="pcsn" label="批号" />
<el-table-column prop="is_effective" label="是否有效" :formatter="format_is_active" />
<el-table-column prop="result" label="结果" :formatter="format_result" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
<el-table-column prop="input_optname" label="创建人" />
<el-table-column prop="input_time" label="创建时间" width="135" />
<el-table-column prop="check_optname" label="检验人" />
<el-table-column prop="check_time" label="检验时间" width="135" />
<el-table-column prop="confirm_optname" label="结论判定人" min-width="100" show-overflow-tooltip />
<el-table-column prop="confirm_time" label="结论判定时间" width="135" />
<el-table-column label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -236,12 +236,12 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
<MaterDtl :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2"/>
<Dialog1 :visiable1.sync="visiable1" :inspection-id="inspection_id"/>
<RelevancyDialog :dialog-show.sync="RelevancyShow" @RelevancyChanged="RelevancyChanged"/>
<MaterDtl :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2" />
<Dialog1 :visiable1.sync="visiable1" :inspection-id="inspection_id" />
<RelevancyDialog :dialog-show.sync="RelevancyShow" @RelevancyChanged="RelevancyChanged" />
</div>
</template>

6
mes/qd/src/views/wms/ql/workprocedureQl/index.vue
View File

@@ -181,12 +181,12 @@
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="inspection_id" label="工序质检单标识" />
<el-table-column prop="inspection_code" label="质检单号" width="120px" />
<el-table-column prop="workordercard_id" label="工艺指令卡" />
<el-table-column prop="workordercard_id" label="工艺指令卡" min-width="90" show-overflow-tooltip />
<el-table-column prop="workprocedure_name" label="工序名称" />
<el-table-column prop="device_name" label="设备名称" />
<el-table-column prop="bucketunique" label="桶号" min-width="120" show-overflow-tooltip/>
<el-table-column prop="bucketunique" label="桶号" min-width="120" show-overflow-tooltip />
<el-table-column prop="record_order" label="桶顺序号" />
<el-table-column prop="material_code" label="产品编码" width="120px" show-overflow-tooltip/>
<el-table-column prop="material_code" label="产品编码" width="120px" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="bill_status" label="单据状态" :formatter="formatStatus" />
<el-table-column prop="result" label="处理结果" :formatter="formatResultName" />

2
mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue
View File

@@ -12,7 +12,7 @@
label-suffix=":"
>
<el-form-item label="填报日期">
<date-range-picker v-model="query.createTime" class="date-item" />
<date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd" />
</el-form-item>
<el-form-item label="设备类别">
<treeselect

30
mes/qd/src/views/wms/sb/run/devicescrap/index.vue
View File

@@ -12,7 +12,7 @@
label-suffix=":"
>
<el-form-item label="启用日期">
<date-range-picker v-model="query.createTime" class="date-item" />
<date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="设备类别">
<treeselect
@@ -114,6 +114,17 @@
>
报废
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length !== 1"
@click="downloadWord"
>
下载Word
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
@@ -161,6 +172,8 @@ import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
import DateRangePicker from '@/components/DateRangePicker'
import {download} from "@/api/data";
import {downloadFile} from "@/utils";
const defaultForm = { status: null }
export default {
@@ -253,9 +266,9 @@ export default {
scrap() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
if (data.is_active !== '1') {
return this.crud.notify('设备未启用或不存在', CRUD.NOTIFICATION_TYPE.INFO)
}
// if (data.status !== '10') {
// return this.crud.notify('设备未启用或不存在', CRUD.NOTIFICATION_TYPE.INFO)
// }
if (data.device_is_delete === '1') {
return this.crud.notify('设备不存在或被删除', CRUD.NOTIFICATION_TYPE.INFO)
}
@@ -267,6 +280,15 @@ export default {
} else {
return this.crud.notify('设备状态不为正常或者闲置', CRUD.NOTIFICATION_TYPE.INFO)
}
},
downloadWord() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
download('/api/devicescrap/downloadWord', { 'devicerecord_id': data.devicerecord_id }).then(result => {
const name = data.device_name + '报废档案'
this.crud.toQuery()
downloadFile(result, name, 'docx')
})
}
}
}

5
mes/qd/src/views/wms/sb/stat/deviceivtquery/index.vue
View File

@@ -55,8 +55,9 @@
<el-table-column type="selection" width="55" />
<el-table-column prop="sect_code" label="库区编码" />
<el-table-column prop="sect_name" label="库区名称" />
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="名称" />
<el-table-column prop="material_code" label="物料编码" show-overflow-tooltip/>
<el-table-column prop="material_name" label="名称" show-overflow-tooltip/>
<el-table-column prop="sparepart_only_id" label="备件唯一码" show-overflow-tooltip/>
<el-table-column prop="material_model" label="型号" />
<el-table-column prop="material_spec" label="技术规格" />
<el-table-column prop="pcsn" label="批次" />

35
mes/qd/src/views/wms/sb/stat/devicesafetyqtyquery/index.vue
View File

@@ -28,23 +28,10 @@
placeholder="编码、名称"
/>
</el-form-item>
<el-form-item label="仅显示预警" label-width="120px">
<el-switch v-model="query.is_all" active-value="1" inactive-value="0" @change="crud.toQuery()"/>
</el-form-item>
<!-- <el-form-item label="库存类型">
<el-select
v-model="query.type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in deviceTypeList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>-->
<rrOperation />
</el-form>
@@ -68,9 +55,9 @@
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称" />
<el-table-column prop="class_name" label="物料分类" />
<el-table-column prop="safe_ivt_up" label="安全库存上限" />
<el-table-column prop="safe_ivt_down" label="安全库存下限" />
<el-table-column prop="ivt_qty" label="库存" />
<el-table-column prop="safe_ivt_up" label="安全库存上限" :formatter="crud.formatNum2" />
<el-table-column prop="safe_ivt_down" label="安全库存下限" :formatter="crud.formatNum2" />
<el-table-column prop="ivt_qty" label="库存" :formatter="crud.formatNum2" />
<el-table-column prop="qty_unit_name" label="单位" />
</el-table>
<!--分页组件-->
@@ -186,16 +173,6 @@ export default {
})
}
},
formatUp(row, cloum) {
if (row.safe_ivt_up === '') {
return '999999'
}
},
formatDown(row, cloum) {
if (row.safe_ivt_down === '') {
return '0'
}
},
cellStyle({ row, column, rowIndex, columnIndex }) {
const safe_ivt_down = parseInt(row.safe_ivt_down)
const safe_ivt_up = parseInt(row.safe_ivt_up)

4
mes/qd/src/views/wms/st/core/inbill/rawassist/index.vue
View File

@@ -167,7 +167,7 @@
@select-all="onSelectAll"
>
<el-table-column type="selection" width="55" />
<!-- <el-table-column
<!-- <el-table-column
label="操作"
width="115"
align="center"
@@ -184,7 +184,7 @@
</el-table-column>-->
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />

8
mes/qd/src/views/wms/statistics/ioStorQuery/index.vue
View File

@@ -200,8 +200,8 @@
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码" />
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column prop="io_type" label="出入库类型" :formatter="ioFormat" width="80" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" width="100" label="业务类型" />
<el-table-column prop="io_type" label="出入库类型" :formatter="ioFormat" min-width="100" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" min-width="120" label="业务类型" />
<el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" width="100" />
@@ -239,7 +239,7 @@ import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudRawAssist from '@/api/wms/st/core/inbill/rawassist'
export default {
name: 'ioStorQuery',
name: 'IoStorQuery',
components: { crudOperation, rrOperation, pagination, TaskDialog, DivDialog },
cruds() {
return CRUD({ title: '出入库单报表', idField: 'iostorinv_id', url: 'api/checkoutbill', crudMethod: { ...checkoutbill },
@@ -253,7 +253,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['ST_QUALITY_SCODE','io_bill_status', 'ST_CREATE_MODE', 'io_type', 'is_upload'],
dicts: ['ST_QUALITY_SCODE', 'io_bill_status', 'ST_CREATE_MODE', 'io_type', 'is_upload'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',