Teams/shgx_tz_vue-sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

物料清单添加 Type 1-成品 2-毛坯

Browse Source 
首检，终检添加开始时间
成品库，出库记录修改权限字符
This commit is contained in:
赵正易
2024-05-24 10:48:05 +08:00
parent abccc2361c
commit 0cbca87e11
7 changed files with 131 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/qualityManagement/firstFQC.js
View File

@@ -56,4 +56,13 @@ export function writeProcessFlow_first(query) {
method: 'get',
params: query,
})
}
//获取工单开始时间 string workOrderId
export function GetQcQualityStatisticsFirstStartTime(query) {
return request({
url: '/mes/qc/FQC/getQcQualityStatisticsFirstStartTime',
method: 'get',
params: query,
})
}

21
src/views/qualityManagement/FQC/firstFQC.vue
View File

@@ -489,6 +489,8 @@
<tr>
<td>抛光数</td>
<td>{{ calculate_defectNumber }}</td>
<td>工单开始时间</td>
<td>{{ workOrderStartTime }}</td>
</tr>
</table>
</el-card>
@@ -514,6 +516,7 @@
get_previous_current_workorder,
accumulator_query,
writeProcessFlow_first,
GetQcQualityStatisticsFirstStartTime,
} from '@/api/qualityManagement/firstFQC.js'
import { mapState, mapGetters, mapMutations, mapActions } from 'vuex'
export default {
@@ -543,6 +546,8 @@
DMLdialog: {
visiable: false,
},
// 工单开始时间
workOrderStartTime: "",
toUpdateNum: 0, //弹窗更新值
toname: '',
toindex: 0, //索引
@@ -555,6 +560,22 @@
this.initMqtt();
this.getcurrentWorkorder()
},
watch: {
'CurrentWorkorder.clientWorkorder'(newValue, oldValue) {
if (newValue == null) {
this.workOrderStartTime = "";
return;
}
const data = {
workOrderId: newValue
}
GetQcQualityStatisticsFirstStartTime(data).then(res => {
if (res.code === 200) {
this.workOrderStartTime = res.data;
}
})
}
},
mounted() {},
computed: {
// 计算合格数

7
src/views/qualityManagement/FQC/qualityStatistics.vue
View File

@@ -12,13 +12,13 @@
</el-date-picker>
</el-form-item>
<el-form-item label="工单号">
<el-input v-model="search.workorderid" placeholder="输入工单号" :style="{ width: inputWidth }"></el-input>
<el-input v-model.trim="search.workorderid" placeholder="输入工单号" :style="{ width: inputWidth }"></el-input>
</el-form-item>
<el-form-item label="零件号">
<el-input v-model="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input>
<el-input v-model.trim="search.partnumber" placeholder="输入零件号" :style="{ width: inputWidth }"></el-input>
</el-form-item>
<el-form-item label="产品描述">
<el-input v-model="search.product_description" placeholder="输入产品描述" :style="{ width: inputWidth }"></el-input>
<el-input v-model.trim="search.product_description" placeholder="输入产品描述" :style="{ width: inputWidth }"></el-input>
</el-form-item>
<el-form-item label="班组">
<el-select v-model="search.team" placeholder="输入班组" :style="{ width: inputWidth }">
@@ -315,7 +315,6 @@
let query = { ...this.search, ...this.pagination }
delete query['reportType']
delete query['total']
console.log('query', query)
switch (this.search.reportType) {
case 0:
GetQualityStatisticsTable_first(query).then((res) => {

53
src/views/qualityManagement/FQC/thirtyFQC.vue
View File

@@ -455,10 +455,6 @@
<el-button type="primary" icon="el-icon-arrow-left" size="mini" @click="getPrevious_current_workorder">上一个工单</el-button>
</el-button-group>
</div>
<span>
<el-image style="width: 40px; height: 40px" :src="imageUrl" :preview-src-list="[imageUrl]">
</el-image>
</span>
<el-button type="primary" size="medium" @click="workOrderCompleted">本工单完成</el-button>
<table>
<tr>
@@ -493,6 +489,17 @@
<td>报废数</td>
<td>{{ calculate_scrapNumber }}</td>
</tr>
<tr>
<td>标签参考图片</td>
<td>
<span>
<el-image ref="elImageRef" style="width: 40px; height: 40px" :src="imageUrl" :preview-src-list="[imageUrl]">
</el-image>
</span>
</td>
<td>开始时间</td>
<td>{{ workOrderStartTime }}</td>
</tr>
</table>
</el-card>
</div>
@@ -522,6 +529,9 @@
generateQualityStatisticsTable,
} from '@/api/qualityManagement/thirtyFQC.js';
import {
GetQcQualityStatisticsFirstStartTime,
} from '@/api/qualityManagement/firstFQC.js'
import { convertToIncomingInspectionData } from '@/api/wmsManagement/wmFgentryInspect.js'
export default {
name: 'thirtyFQC',
@@ -551,6 +561,8 @@
DMLdialog: {
visiable: false,
},
// 工单开始时间
workOrderStartTime: "",
toUpdateNum: 0, //弹窗更新值
toname: '',
toindex: 0, //索引
@@ -562,10 +574,28 @@
created() {
this.initMqtt();
this.getcurrentWorkorder()
// this.startTimer()
},
mounted() {},
watch: {
// 工单变动
'CurrentWorkorder.clientWorkorder'(newValue, oldValue) {
this.showBigImageView();
if (newValue == null) {
this.workOrderStartTime = "";
return;
}
const data = {
workOrderId: newValue
}
GetQcQualityStatisticsFirstStartTime(data).then(res => {
if (res.code === 200) {
this.workOrderStartTime = res.data;
}
})
}
},
computed: {
@@ -1098,11 +1128,22 @@
}
this.mqttClient.publish(topic.OrderChange, emqxUtil.stringJSON(message));
}
}
},
// 大图触发
showBigImageView() {
this.$nextTick(() => {
this.$refs.elImageRef.clickHandler();
})
},
},
// 退出后关闭计时器
beforeDestroy() {
this.stopTimer()
},
}
</script>

4
src/views/wmsManagement/WmGoodsNowProduction.vue
View File

@@ -100,7 +100,7 @@
<template slot-scope="scope">
<el-button
size="mini"
v-hasPermi="['business:wmgoodsnowproduction:edit']"
v-hasPermi="['wmsManagement:wmgoodsnowproduction:edit']"
type="success"
icon="el-icon-edit"
title="编辑"
@@ -108,7 +108,7 @@
></el-button>
<el-button
size="mini"
v-hasPermi="['business:wmgoodsnowproduction:delete']"
v-hasPermi="['wmsManagement:wmgoodsnowproduction:delete']"
type="danger"
icon="el-icon-delete"
title="删除"

4
src/views/wmsManagement/WmGoodsOutProduction.vue
View File

@@ -63,8 +63,8 @@
<el-table-column label="操作" align="center" width="140">
<template slot-scope="scope">
<el-button size="mini" v-hasPermi="['business:wmgoodsoutproduction:edit']" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
<el-button size="mini" v-hasPermi="['business:wmgoodsoutproduction:delete']" type="danger" icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
<el-button size="mini" v-hasPermi="['wmsManagement:wmgoodsoutproduction:edit']" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
<el-button size="mini" v-hasPermi="['wmsManagement:wmgoodsoutproduction:delete']" type="danger" icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>

77
src/views/wmsManagement/WmMaterial.vue
View File

@@ -28,11 +28,13 @@
<el-form-item label="显示描述" prop="description">
<el-input v-model="queryParams.description" placeholder="显示描述(产品描述+颜色+规格)" :clearable="true" />
</el-form-item>
<el-form-item label="物料代号" prop="search1">
<el-input v-model="queryParams.search1" placeholder="请输入物料代号" :clearable="true" />
<el-form-item label="物料类别" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择物料类别" @change="handleQuery">
<el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="queryParams.status">
<el-radio-group v-model="queryParams.status" @change="handleQuery">
<el-radio-button v-for="item in statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">{{
item.dictLabel
}}</el-radio-button>
@@ -46,16 +48,16 @@
<!-- 工具区域 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" v-hasPermi="['business:wmmaterial:add']" plain icon="el-icon-plus" size="medium" @click="handleAdd">新增物料记录</el-button>
<el-button type="primary" v-hasPermi="['wms:wmmaterial:add']" plain icon="el-icon-plus" size="medium" @click="handleAdd">新增物料记录</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" v-hasPermi="['business:wmmaterial:add']" plain icon="el-icon-download" size="medium" @click="importmaterial">批量导入</el-button>
<el-button type="warning" v-hasPermi="['wms:wmmaterial:add']" plain icon="el-icon-download" size="medium" @click="importmaterial">批量导入</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" :disabled="single" v-hasPermi="['business:wmmaterial:edit']" plain icon="el-icon-edit" size="medium" @click="handleUpdate">批量修改</el-button>
<el-button type="success" :disabled="single" v-hasPermi="['wms:wmmaterial:edit']" plain icon="el-icon-edit" size="medium" @click="handleUpdate">批量修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" :disabled="multiple" v-hasPermi="['business:wmmaterial:delete']" plain icon="el-icon-delete" size="medium" @click="handleDelete">批量删除</el-button>
<el-button type="danger" :disabled="multiple" v-hasPermi="['wms:wmmaterial:delete']" plain icon="el-icon-delete" size="medium" @click="handleDelete">批量删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -83,8 +85,8 @@
<el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" width="140">
<template slot-scope="scope">
<el-button size="mini" v-hasPermi="['business:wmmaterial:edit']" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
<el-button size="mini" v-hasPermi="['business:wmmaterial:delete']" type="danger" icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
<el-button size="mini" v-hasPermi="['wms:wmmaterial:edit']" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
<el-button size="mini" v-hasPermi="['wms:wmmaterial:delete']" type="danger" icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>
@@ -115,81 +117,83 @@
<el-row :gutter="20">
<el-col :lg="12">
<el-form-item label="物料号" prop="partnumber">
<el-input v-model="form.partnumber" placeholder="请输入物料号（零件号）" />
<el-input v-model.trim="form.partnumber" placeholder="请输入物料号（零件号）" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="库存编码" prop="u8InventoryCode">
<el-input v-model="form.u8InventoryCode" placeholder="请输入U8库存编码" />
<el-input v-model.trim="form.u8InventoryCode" placeholder="请输入U8库存编码" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="毛坯号" prop="blankNum">
<el-input v-model="form.blankNum" placeholder="请输入毛坯号" />
<el-input v-model.trim="form.blankNum" placeholder="请输入毛坯号" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位(个)" />
<el-input v-model.trim="form.unit" placeholder="请输入单位(个)" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="产品描述" prop="productName">
<el-input v-model="form.productName" placeholder="请输入产品描述（产品名称）" />
<el-input v-model.trim="form.productName" placeholder="请输入产品描述（产品名称）" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="产品颜色" prop="color">
<el-input v-model="form.color" placeholder="请输入产品颜色" />
<el-input v-model.trim="form.color" placeholder="请输入产品颜色" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="规格" prop="specification">
<el-input v-model="form.specification" placeholder="请输入规格（左右脚）" />
<el-input v-model.trim="form.specification" placeholder="请输入规格（左右脚）" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="显示描述" prop="description">
<el-input v-model="form.description" placeholder="请输入显示描述(产品描述+颜色+规格)" />
<el-input v-model.trim="form.description" placeholder="请输入显示描述(产品描述+颜色+规格)" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="版本号" prop="version">
<el-input v-model="form.version" placeholder="请输入版本号" />
<el-input v-model.trim="form.version" placeholder="请输入版本号" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注" />
<el-input v-model.trim="form.remarks" placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序(特殊排序)" />
<el-input v-model.trim="form.sort" placeholder="请输入排序(特殊排序)" />
</el-form-item>
</el-col>
<el-col :lg="12">
<el-form-item label="物料代号1" prop="search1">
<el-input v-model="form.search1" placeholder="请输入物料代号1" />
<el-form-item label="物料类别" prop="type">
<el-select v-model="form.type" placeholder="请选择物料类别" clearable>
<el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :lg="12">
<!-- <el-col :lg="12">
<el-form-item label="物料代号2" prop="search2">
<el-input v-model="form.search2" placeholder="请输入物料代号1" />
<el-input v-model.trim="form.search2" placeholder="请输入物料代号1" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :lg="12">
<el-form-item label="状态" prop="status">
@@ -231,8 +235,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
sort: null,
sortType: null,
status: 1,
type: 1,
},
// 弹出层标题
title: '',
@@ -241,7 +245,10 @@
// 是否显示弹出层
open: false,
// 表单参数
form: {},
form: {
status: 1,
type: 1,
},
columns: [
{ index: 1, key: 'partnumber', label: `物料号（零件号）`, checked: true },
{ index: 2, key: 'u8InventoryCode', label: `U8库存编码`, checked: true },
@@ -253,7 +260,7 @@
{ index: 8, key: 'description', label: `显示描述(产品描述+颜色+规格)`, checked: true },
{ index: 9, key: 'version', label: `版本号`, checked: false },
{ index: 10, key: 'remarks', label: `备注`, checked: false },
{ index: 14, key: 'status', label: `状态（0-不可见 1-可见）`, checked: false },
{ index: 14, key: 'status', label: `状态`, checked: false },
],
// 状态（0-不可见 1-可见）选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
statusOptions: [
@@ -265,6 +272,15 @@
dictLabel: '弃用',
dictValue: 0,
}, ],
typeList: [
{
label: '成品',
value: 1
},
{
label: '毛坯',
value: 2
}, ],
// 数据列表
dataList: [],
// 总记录数
@@ -364,8 +380,9 @@
version: undefined,
remarks: undefined,
sort: undefined,
search1: undefined,
search1: '',
search2: undefined,
type: 1,
status: 1,
createdBy: undefined,
createdTime: undefined,