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

1

java8
ruanqi 1 year ago
parent
678700b683
commit
d3f252cd31
5 changed files with 293 additions and 134 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. 1
      src/api/orderIssure/soIssueNotify.js
  2. 11
      src/assets/scss/yzznb.scss
  3. 113
      src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
  4. 152
      src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
  5. 150
      src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue

1
src/api/orderIssure/soIssueNotify.js
View File

@ -39,3 +39,4 @@ export const saveOtherPart= data => createAPI(`/orderIssure/issureNotify/saveOth
export const getNoControlPartList= data => createAPI(`/orderIssure/issureNotify/getNoControlPartList`,'post',data)
export const searchOtherPart= data => createAPI(`/orderIssure/issureNotify/searchOtherPart`,'post',data)
export const searchNotifyLog= data => createAPI(`/orderIssure/issureNotify/searchNotifyLog`,'post',data)
export const deleteNotifyMaterialWithOutLog= data => createAPI(`/orderIssure/issureNotify/deleteNotifyMaterialWithOutLog`,'post',data)

11
src/assets/scss/yzznb.scss
View File

@ -19,3 +19,14 @@
width: 100%; /* 让 el-input 铺满容器宽度 */
}
.el-table .error-row {
background: #f80d0d;
color: white;
}
.yzz .el-table__body tr:hover > td {
background-color: transparent !important; /* 设置为你需要的颜色，透明色表示无背景色 */
}

113
src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="mod-config yzzInput">
<div class="mod-config yzzInput yzz">
<el-form :inline="true" label-position="top" style="margin-top: -0px">
<el-row :gutter="20">
<el-col :span="20">
@ -123,6 +123,16 @@
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
<el-table-column
header-align="center"
align="center"
width="80"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="deleteNotifyMaterial(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="不管控物料" name="noControl">
@ -148,6 +158,16 @@
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
<el-table-column
header-align="center"
align="center"
width="80"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="deleteNotifyMaterial(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
@ -358,7 +378,7 @@
<el-button type="primary" @click="changeBuFlag=false">关闭</el-button>
</el-footer>
</el-dialog>
<el-dialog title="申请明细" :close-on-click-modal="false" v-drag :visible.sync="materialModalFlag" width="800px">
<el-dialog title="申请明细" :close-on-click-modal="false" v-drag :visible.sync="materialModalFlag" width="900px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-row :gutter="20">
<el-col :span="6">
@ -396,12 +416,16 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<div v-if="item.columnProp !== 'qtyToIssue'">
<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>
<div v-if="item.columnProp === 'qtyToIssue'">
<el-input-number v-model="scope.row.qtyToIssue" style="padding: 0;width: 100%" :step="0" :min="0" :controls="false"></el-input-number>
</div>
<div v-else-if="item.columnProp === 'remark'">
<el-input v-model="scope.row.remark" style="padding: 0;width: 100%" ></el-input>
</div>
<div v-else>
<el-input-number v-model="scope.row.qtyToIssue" style="padding: 0;width: 100%" :step="0" :min="0" :controls="false"></el-input-number>
<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>
</div>
</template>
@ -536,6 +560,7 @@
border
@row-dblclick="chooseNoControlPartNo"
style="width: 100%;">
<el-table-column
prop="partNo"
header-align="center"
@ -665,6 +690,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item :label="'备注'" >
<el-input v-model="otherPartData.remark" ></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveOtherPart()">保存</el-button>
@ -703,6 +735,7 @@
saveOtherPart,
getNoControlPartList,
searchOtherPart,
deleteNotifyMaterialWithOutLog,
}from "@/api/orderIssure/soIssueNotify.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
export default {
@ -858,6 +891,23 @@
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 701001,
serialNumber: '701001Table4Remark',
tableId: "701001Table4",
tableName: "申请单材料明细表",
columnProp: "remark",
headerAlign: "center",
align: "left",
columnLabel: "备注",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200
},
],
modalData:{
@ -1273,7 +1323,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 50,
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
@ -1291,7 +1341,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 220,
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
@ -1320,7 +1370,7 @@
columnProp: 'qtyOnHand',
headerAlign: "center",
align: "right",
columnLabel: '现场库存数量',
columnLabel: '现场库存',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1365,6 +1415,24 @@
fixed: '',
columnWidth: 60,
},
{
userId: this.$store.state.user.name,
functionId: 701001002,
serialNumber: '701001002Table3Remark',
tableId: "701001002Table3",
tableName: "领料申请BOM子表",
columnProp: 'remark',
headerAlign: "center",
align: "left",
columnLabel: '备注',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
],
rules:{
groupIdType:[
@ -1421,6 +1489,7 @@
issueType:'',
partDesc:'',
umid:'',
remark:'',
},
}
},
@ -1450,6 +1519,30 @@
},
methods: {
deleteNotifyMaterial(row){
this.$confirm('确认删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteNotifyMaterialWithOutLog(row).then(({data}) => {
if (data && data.code === 0) {
this.searchOtherPart('非BOM物料')
this.searchOtherPart('不管控物料')
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},
getBaseList (val,type) {
this.tagNo = val
let conSql=''
@ -1484,6 +1577,7 @@
issueType:'非BOM物料',
partDesc:row.partDesc,
umid:row.umid,
remark:'',
}
this.saveOtherPartModalFlag=true
},
@ -1498,6 +1592,7 @@
issueType:'不管控物料',
partDesc:row.partDesc,
umid:row.umid,
remark:'',
}
this.saveOtherPartModalFlag=true
},

152
src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="mod-config">
<div class="mod-config yzz">
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-form :inline="true" label-position="top" style="margin-top: 0px">
<el-form-item :label="'申请单号'">
@ -168,6 +168,7 @@
:data="dataList3"
:height="height"
border
:row-class-name="tableRowClassName"
v-loading="dataListLoading"
style="width: 100%; ">
<!-- <el-table-column-->
@ -543,6 +544,24 @@
status: true,
fixed: '',
columnWidth: 40
},
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table2NeedDate',
tableId: "701002Table2",
tableName: "领料申请派工单子表",
columnProp: 'needDate',
headerAlign: "center",
align: "left",
columnLabel: '要求发料时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},{
userId: this.$store.state.user.name,
functionId: 701002,
@ -664,25 +683,6 @@
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table2NeedDate',
tableId: "701002Table2",
tableName: "领料申请派工单子表",
columnProp: 'needDate',
headerAlign: "center",
align: "left",
columnLabel: '要求发料时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
@ -724,81 +724,81 @@
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3IssueType',
serialNumber: '701002Table3ComponentPartNo',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "issueType",
columnProp: "componentPartNo",
headerAlign: "center",
align: "right",
columnLabel: "类型",
align: "center",
columnLabel: "材料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3SOOrderNo',
serialNumber: '701002Table3PartDesc',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "orderNo",
columnProp: "partDesc",
headerAlign: "center",
align: "left",
columnLabel: "生产订单",
columnLabel: "材料名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
columnWidth: 130
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3OpsItemNo',
serialNumber: '701002Table3NeedDate',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "opsItemNo",
columnProp: "needDate",
headerAlign: "center",
align: "right",
columnLabel: "工序",
align: "center",
columnLabel: "需求时间",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 50
columnWidth: 110
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3SeqNo',
serialNumber: '701002Table3QtyToIssue',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "seqNo",
columnProp: "qtyToIssue",
headerAlign: "center",
align: "left",
columnLabel: "派工单号",
align: "right",
columnLabel: "申请数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3LocationNo',
serialNumber: '701002Table3QtyToIssueOriginal',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "locationNo",
columnProp: "qtyToIssueOriginal",
headerAlign: "center",
align: "left",
columnLabel: "机台",
align: "right",
columnLabel: "已发数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -809,13 +809,13 @@
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3BOMItemNo',
serialNumber: '701002Table3IssueType',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "bOMItemNo",
columnProp: "issueType",
headerAlign: "center",
align: "right",
columnLabel: "BOM序号",
columnLabel: "类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -826,47 +826,64 @@
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3ComponentPartNo',
serialNumber: '701002Table3SOOrderNo',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "componentPartNo",
columnProp: "orderNo",
headerAlign: "center",
align: "center",
columnLabel: "材料编码",
align: "left",
columnLabel: "生产订单",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
columnWidth: 120
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3PartDesc',
serialNumber: '701002Table3OpsItemNo',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "partDesc",
columnProp: "opsItemNo",
headerAlign: "center",
align: "right",
columnLabel: "工序",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 50
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3SeqNo',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "seqNo",
headerAlign: "center",
align: "left",
columnLabel: "材料名称",
columnLabel: "派工单号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130
columnWidth: 150
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3QtyToIssue',
serialNumber: '701002Table3LocationNo',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "qtyToIssue",
columnProp: "locationNo",
headerAlign: "center",
align: "right",
columnLabel: "申请数量",
align: "left",
columnLabel: "机台",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -877,13 +894,13 @@
},{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table3QtyToIssueOriginal',
serialNumber: '701002Table3BOMItemNo',
tableId: "701002Table3",
tableName: "申请单材料明细表",
columnProp: "qtyToIssueOriginal",
columnProp: "bOMItemNo",
headerAlign: "center",
align: "right",
columnLabel: "已发数量",
columnLabel: "BOM序号",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -891,6 +908,7 @@
status: true,
fixed: '',
columnWidth: 80
},
],
columnList4:[
@ -1433,10 +1451,18 @@
return s
},
tableRowClassName ({row, rowIndex}) {
if (row.qtyToIssueOriginal<row.qtyToIssue&&new Date(row.needDate)<new Date(this.dayjs().format("YYYY-MM-DD HH:mm"))) {
return 'error-row'
}
return ''
},
},
}
</script>
<style scoped>
</style>

150
src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="mod-config">
<div class="mod-config yzz">
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-form :inline="true" label-position="top" style="margin-top: 0px">
<el-form-item :label="'申请单号'">
@ -149,6 +149,7 @@
:data="dataList3"
:height="height"
border
:row-class-name="tableRowClassName"
v-loading="dataListLoading"
style="width: 100%; ">
<!-- <el-table-column-->
@ -487,6 +488,24 @@
status: true,
fixed: '',
columnWidth: 40
},
{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table2NeedDate',
tableId: "701003Table2",
tableName: "领料申请派工单子表",
columnProp: 'needDate',
headerAlign: "center",
align: "left",
columnLabel: '要求发料时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},{
userId: this.$store.state.user.name,
functionId: 701003,
@ -608,24 +627,6 @@
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table2NeedDate',
tableId: "701003Table2",
tableName: "领料申请派工单子表",
columnProp: 'needDate',
headerAlign: "center",
align: "left",
columnLabel: '要求发料时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
@ -668,81 +669,81 @@
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3IssueType',
serialNumber: '701003Table3NeedDate',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "issueType",
columnProp: "needDate",
headerAlign: "center",
align: "right",
columnLabel: "类型",
align: "center",
columnLabel: "需求时间",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
columnWidth: 110
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3SOOrderNo',
serialNumber: '701003Table3ComponentPartNo',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "orderNo",
columnProp: "componentPartNo",
headerAlign: "center",
align: "left",
columnLabel: "生产订单",
align: "center",
columnLabel: "材料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3OpsItemNo',
serialNumber: '701003Table3PartDesc',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "opsItemNo",
columnProp: "partDesc",
headerAlign: "center",
align: "right",
columnLabel: "工序",
align: "left",
columnLabel: "材料名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 50
columnWidth: 130
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3SeqNo',
serialNumber: '701003Table3QtyToIssue',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "seqNo",
columnProp: "qtyToIssue",
headerAlign: "center",
align: "left",
columnLabel: "派工单号",
align: "right",
columnLabel: "申请数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3LocationNo',
serialNumber: '701003Table3QtyToIssueOriginal',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "locationNo",
columnProp: "qtyToIssueOriginal",
headerAlign: "center",
align: "left",
columnLabel: "机台",
align: "right",
columnLabel: "已发数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -753,13 +754,13 @@
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3BOMItemNo',
serialNumber: '701003Table3IssueType',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "bOMItemNo",
columnProp: "issueType",
headerAlign: "center",
align: "right",
columnLabel: "BOM序号",
columnLabel: "类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -770,47 +771,64 @@
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3ComponentPartNo',
serialNumber: '701003Table3SOOrderNo',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "componentPartNo",
columnProp: "orderNo",
headerAlign: "center",
align: "center",
columnLabel: "材料编码",
align: "left",
columnLabel: "生产订单",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
columnWidth: 120
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3PartDesc',
serialNumber: '701003Table3OpsItemNo',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "partDesc",
columnProp: "opsItemNo",
headerAlign: "center",
align: "right",
columnLabel: "工序",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 50
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3SeqNo',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "seqNo",
headerAlign: "center",
align: "left",
columnLabel: "材料名称",
columnLabel: "派工单号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130
columnWidth: 150
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3QtyToIssue',
serialNumber: '701003Table3LocationNo',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "qtyToIssue",
columnProp: "locationNo",
headerAlign: "center",
align: "right",
columnLabel: "申请数量",
align: "left",
columnLabel: "机台",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -821,13 +839,13 @@
},{
userId: this.$store.state.user.name,
functionId: 701003,
serialNumber: '701003Table3QtyToIssueOriginal',
serialNumber: '701003Table3BOMItemNo',
tableId: "701003Table3",
tableName: "申请单材料明细表",
columnProp: "qtyToIssueOriginal",
columnProp: "bOMItemNo",
headerAlign: "center",
align: "right",
columnLabel: "已发数量",
columnLabel: "BOM序号",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -1204,6 +1222,14 @@
return s
},
tableRowClassName ({row, rowIndex}) {
if (row.qtyToIssueOriginal<row.qtyToIssue&&new Date(row.needDate)<new Date(this.dayjs().format("YYYY-MM-DD HH:mm"))) {
return 'error-row'
}
return ''
},
},
}
</script>

Write Preview
Loading…
Cancel
Save