wilson
/
ha-mes-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

20250429

master
qiezi 9 months ago
parent
3411cdae9e
commit
76bba01451
4 changed files with 78 additions and 203 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      src/views/modules/board/VulcanizationDispatchOrder.vue
  2. 229
      src/views/modules/board/partInventory.vue
  3. 4
      src/views/modules/production/generateReport.vue
  4. 3
      src/views/modules/production/liuhuaProductView.vue

45
src/views/modules/board/VulcanizationDispatchOrder.vue
View File

@ -12,33 +12,16 @@ export default {
firstReportDate2Flag:'Y',
},
columnList: [
{
tableId: "vulcanizationTable",
tableName: this.$route.meta.title,
columnProp: "site",
columnLabel: "工厂编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 70,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: 'left'
},
{tableId: "vulcanizationTable", tableName: this.$route.meta.title, columnProp: "site", columnLabel: "工厂", columnHidden: false, columnImage: false, columnSortable: false, columnWidth: 40, format: null, functionId: this.$route.meta.menuId, sortLv: 0, status: true, fixed: '', serialNumber: null, columnType: null, align: 'left'},
{
tableId: "vulcanizationTable",
tableName: this.$route.meta.title,
columnProp: "seqNo",
columnLabel: "派工单号",
columnLabel: "派工单",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 70,
columnWidth: 60,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -73,7 +56,7 @@ export default {
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 120,
columnWidth: 60,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -109,7 +92,7 @@ export default {
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 70,
columnWidth: 60,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -127,7 +110,7 @@ export default {
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 70,
columnWidth: 60,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -145,7 +128,7 @@ export default {
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 70,
columnWidth: 60,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -163,7 +146,7 @@ export default {
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 130,
columnWidth: 120,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -181,7 +164,7 @@ export default {
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 130,
columnWidth: 75,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -194,12 +177,12 @@ export default {
{
tableId: "vulcanizationTable",
tableName: this.$route.meta.title,
columnProp: "ScheduledDate",
columnProp: "scheduledDate",
columnLabel: "派工日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 130,
columnWidth: 120,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -212,12 +195,12 @@ export default {
{
tableId: "vulcanizationTable",
tableName: this.$route.meta.title,
columnProp: "lastReportTimeDepartment",
columnProp: "latestReportDepartment",
columnLabel: "最后报工工序",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 130,
columnWidth: 90,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
@ -235,7 +218,7 @@ export default {
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 130,
columnWidth: 90,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,

229
src/views/modules/board/partInventory.vue
View File

@ -11,7 +11,7 @@ export default {
partDescription:'',
spec:'',
partType:'',
summaryType:3,
summaryType:1,
warehouseId:'',
locationId:'',
batchNo:'',
@ -187,79 +187,7 @@ export default {
columnProp: "firstInDate",
headerAlign: "center",
align: "center",
columnLabel: "入库日期",
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 153,
serialNumber: '153Table1',
tableId: "153Table1",
tableName: "物料库存信息表",
columnProp: "freezeFlag",
headerAlign: "center",
align: "left",
columnLabel: "冻结",
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},
{
userId: this.$store.state.user.name,
functionId: 153,
serialNumber: '153Table1',
tableId: "153Table1",
tableName: "物料库存信息表",
columnProp: "partType",
headerAlign: "center",
align: "left",
columnLabel: "物料类别",
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 153,
serialNumber: '153Table1',
tableId: "153Table1",
tableName: "物料库存信息表",
columnProp: "familyId",
headerAlign: "center",
align: "left",
columnLabel: "物料分类",
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 153,
serialNumber: '153Table1',
tableId: "153Table1",
tableName: "物料库存信息表",
columnProp: "familyName",
headerAlign: "center",
align: "left",
columnLabel: "物料分类名称",
columnLabel: "首次入库日期",
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -322,42 +250,6 @@ export default {
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 153,
serialNumber: '153Table1',
tableId: "153Table1",
tableName: "物料库存信息表",
columnProp: "partnerId",
headerAlign: "center",
align: "left",
columnLabel: "单位编码",
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},
{
userId: this.$store.state.user.name,
functionId: 153,
serialNumber: '153Table1',
tableId: "153Table1",
tableName: "物料库存信息表",
columnProp: "partnerType",
headerAlign: "center",
align: "left",
columnLabel: "单位类型",
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
{
userId: this.$store.state.user.name,
functionId: 153,
@ -412,24 +304,6 @@ export default {
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 153,
serialNumber: '153Table1',
tableId: "153Table1",
tableName: "物料库存信息表",
columnProp: "demandPartnerId",
headerAlign: "center",
align: "left",
columnLabel: "产品库存所属客户编码",
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
},
{
userId: this.$store.state.user.name,
functionId: 153,
@ -500,6 +374,16 @@ export default {
currentChangeHandle(val){
this.queryParams.no = val;
this.handleQueryPartInventory();
},
getFullNum(num) {
if (isNaN(num)) {
return num;
}
let str = '' + num;
if (!/e/i.test(str)) {
return num;
}
return num.toFixed(18).replace(/\.?0+$/, "");
}
},
created() {
@ -533,42 +417,42 @@ export default {
<template>
<div class="box-container">
<el-form :model="queryParams" label-position="top" style="max-width: 1000px;min-width: 800px">
<el-form :model="queryParams" label-position="top" style="max-width: 1200px;min-width: 800px">
<el-row :gutter="10">
<el-col :span="4">
<el-col :span="3">
<el-form-item label="工厂编码">
<el-input v-model="queryParams.site" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="物料编码">
<el-input v-model="queryParams.partNo" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="物料描述">
<el-input v-model="queryParams.partDescription" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="规格型号">
<el-input v-model="queryParams.spec" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="物料类别">
<el-select v-model="queryParams.partType" clearable style="width: 100%;">
<el-option value="" label="全部"></el-option>
<el-option value="原材料" label="原材料"></el-option>
<el-option value="产成品" label="产成品"></el-option>
<el-option value="半成品" label="半成品"></el-option>
<el-option value="贸易商品" label="贸易商品"></el-option>
<el-option value="低值易耗品" label="低值易耗品"></el-option>
<el-option value="其他" label="其他"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <el-col :span="3">-->
<!-- <el-form-item label="物料类别">-->
<!-- <el-select v-model="queryParams.partType" clearable style="width: 100%;">-->
<!-- <el-option value="" label="全部"></el-option>-->
<!-- <el-option value="原材料" label="原材料"></el-option>-->
<!-- <el-option value="产成品" label="产成品"></el-option>-->
<!-- <el-option value="半成品" label="半成品"></el-option>-->
<!-- <el-option value="贸易商品" label="贸易商品"></el-option>-->
<!-- <el-option value="低值易耗品" label="低值易耗品"></el-option>-->
<!-- <el-option value="其他" label="其他"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="3">
<el-form-item label="汇总方式">
<el-select v-model="queryParams.summaryType" style="width: 100%;" @change="handleQueryPartInventory">
<el-option :value="0" label="按物料"></el-option>
@ -578,35 +462,37 @@ export default {
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
</el-row>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item label="仓库">
<el-input v-model="queryParams.warehouseId" :disabled="queryParams.summaryType < 1" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="库位">
<el-input v-model="queryParams.locationId" :disabled="queryParams.summaryType < 2" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="批号">
<el-input v-model="queryParams.batchNo" :disabled="queryParams.summaryType < 3" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="物料分类">
<el-input v-model="queryParams.familyId" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="物料分类名称">
<el-input v-model="queryParams.familyName" clearable></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="3">-->
<!-- <el-form-item label="物料分类">-->
<!-- <el-input v-model="queryParams.familyId" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="3">-->
<!-- <el-form-item label="物料分类名称">-->
<!-- <el-input v-model="queryParams.familyName" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row :gutter="10">
<el-col :span="4">
<el-form-item label="入库日期">
<el-col :span="3">
<el-form-item label="首次入库日期">
<el-date-picker
style="width: 100%"
v-model="queryParams.startFirstInDate"
@ -615,7 +501,7 @@ export default {
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label=" ">
<el-date-picker
style="width: 100%"
@ -625,7 +511,7 @@ export default {
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="失效日期">
<el-date-picker
style="width: 100%"
@ -635,7 +521,7 @@ export default {
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label=" ">
<el-date-picker
style="width: 100%"
@ -645,7 +531,7 @@ export default {
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label=" ">
<el-button type="primary" @click="handleQueryPartInventory">查询</el-button>
@ -676,9 +562,14 @@ export default {
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
<template v-if="item.columnProp === 'batchNo'">
<span> {{ getFullNum(scope.row[item.columnProp]) }}</span>
</template>
<template v-else>
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</template>
</el-table-column>
</el-table>

4
src/views/modules/production/generateReport.vue
View File

@ -563,8 +563,8 @@
<span slot="footer" class="dialog-footer">
<el-button @click="SOPModal()" type="primary">查看SOP</el-button>
<el-button @click="setUp.reviewFlag = false">取消</el-button>
<el-button type="primary" :disabled="setUp.saveButton" @click="saveReport('N')">报工确定</el-button>
<el-button type="primary" :disabled="setUp.saveButton" style="margin-left: 200px" @click="saveReport('Y')">整单完工确定</el-button>
<el-button type="primary" :disabled="setUp.saveButton" @click="saveReport('N')">分批报工确定</el-button>
<el-button type="danger" :disabled="setUp.saveButton" style="margin-left: 200px" @click="saveReport('Y')">整单完工确定</el-button>
</span>
</el-dialog>

3
src/views/modules/production/liuhuaProductView.vue
View File

@ -219,7 +219,8 @@
serialNumber: null,
columnType: null,
align: 'left'
}, {
},
{
tableId: "liuhuaView",
tableName: this.$route.meta.title,
columnProp: "firstReportDate2",

Write Preview
Loading…
Cancel
Save