yfy 3 years ago
parent
commit
f9f681cea0
  1. 26
      src/api/qc/qc.js
  2. 883
      src/views/modules/qc/FAIResultEntry.vue
  3. 1546
      src/views/modules/qc/IPQCResultEntry.vue
  4. 11
      src/views/modules/qc/qcCheckOutMethod.vue
  5. 621
      src/views/modules/qc/qcFamily.vue
  6. 149
      src/views/modules/qc/qcFamilyModel.vue
  7. 4
      src/views/modules/qc/qcMasterInformationModel.vue
  8. 1057
      src/views/modules/qc/qcPartModel.vue

26
src/api/qc/qc.js

@ -19,8 +19,14 @@ export const searchItemDetails = data => createAPI(`/pms/qc/searchItemDetails`,'
export const deleteItemDetails = data => createAPI(`/pms/qc/deleteItemDetails`,'post',data)
export const saveItemDetails = data => createAPI(`/pms/qc/saveItemDetails`,'post',data)
// ===================================== 根据物料设置检验模板 =====================================
export const qcPartModelSearch = data => createAPI(`/pms/qc/qcPartModelSearch`,'post',data)
export const qcPartModelSave = data => createAPI(`/pms/qc/qcPartModelSave`,'post',data)
export const qcPartModelUpdate = data => createAPI(`/pms/qc/qcPartModelUpdate`,'post',data)
export const qcPartModelDelete = data => createAPI(`/pms/qc/qcPartModelDelete`,'post',data)
// ===================================== 检验模板 =====================================
// ===================================== 根据分类设置检验模板 =====================================
export const qcCheckOutModelSearch = data => createAPI(`/pms/qc/qcCheckOutModelSearch`,'post',data)
export const qcCheckOutModelSave = data => createAPI(`/pms/qc/qcCheckOutModelSave`,'post',data)
export const qcCheckOutModelUpdate = data => createAPI(`/pms/qc/qcCheckOutModelUpdate`,'post',data)
@ -30,14 +36,6 @@ export const saveModalDetails = data => createAPI(`/pms/qc/saveModalDetails`,'po
export const deleteModalDetails = data => createAPI(`/pms/qc/deleteModalDetails`,'post',data)
export const getItemLists= data => createAPI(`/pms/qc/getItemLists`,'post',data)
// ===================================== 检验分类 =====================================
export const qcFamilySearch = data => createAPI(`/pms/qc/qcFamilySearch`,'post',data)
export const qcFamilySave = data => createAPI(`/pms/qc/qcFamilySave`,'post',data)
export const qcFamilyUpdate = data => createAPI(`/pms/qc/qcFamilyUpdate`,'post',data)
export const qcFamilyDelete = data => createAPI(`/pms/qc/qcFamilyDelete`,'post',data)
export const saveFamilyDetails = data => createAPI(`/pms/qc/saveFamilyDetails`,'post',data)
export const searchFamilyDetails = data => createAPI(`/pms/qc/searchFamilyDetails`,'post',data)
export const deleteFamilyDetails = data => createAPI(`/pms/qc/deleteFamilyDetails`,'post',data)
// ===================================== 检验录入 =====================================
export const qcInspectionInformationSearch = data => createAPI(`/pms/qc/qcInspectionInformationSearch`,'post',data)
@ -49,7 +47,15 @@ export const searchModelTree = data => createAPI(`/pms/qc/searchModelTree`,'post
export const detailInformationSearch = data => createAPI(`/pms/qc/detailInformationSearch`,'post',data)
export const saveDetailInformation = data => createAPI(`/pms/qc/saveDetailInformation`,'post',data)
export const qcInspectionInformationDelete = data => createAPI(`/pms/qc/qcInspectionInformationDelete`,'post',data)
export const saveSubmitResult = data => createAPI(`/pms/qc/saveSubmitResult`,'post',data)
export const checkCompleted = data => createAPI(`/pms/qc/checkCompleted`,'post',data)
export const selectModelByPartNo = data => createAPI(`/pms/qc/selectModelByPartNo`,'post',data)
export const subDetailInformationSave = data => createAPI(`/pms/qc/subDetailInformationSave`,'post',data)
export const selectSubDetailInformation = data => createAPI(`/pms/qc/selectSubDetailInformation`,'post',data)
export const checkOutIsSubmit = data => createAPI(`/pms/qc/checkOutIsSubmit`,'post',data)
export const workOrderSearch = data => createAPI(`/pms/qc/workOrderSearch`,'post',data)
export const selectInformationByWorkOrderNo = data => createAPI(`/pms/qc/selectInformationByWorkOrderNo`,'post',data)
export const checkSubDetailValue = data => createAPI(`/pms/qc/checkSubDetailValue`,'post',data)
// ===================================== 主记录栏信息 =====================================
export const searchMasterInformation = data => createAPI(`/pms/qc/searchMasterInformation`,'post',data)

883
src/views/modules/qc/FAIResultEntry.vue
File diff suppressed because it is too large
View File

1546
src/views/modules/qc/IPQCResultEntry.vue
File diff suppressed because it is too large
View File

11
src/views/modules/qc/qcCheckOutMethod.vue

@ -10,7 +10,7 @@
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
</el-form-item>
</el-form>
@ -118,13 +118,13 @@
valueNo: '',
availableValue: '',
methodType: 'D',
createdBy: this.$store.state.user.name
createBy: this.$store.state.user.name
},
modalData: {
flag: '',
methodNo: '',
methodName: '',
createdBy: this.$store.state.user.name,
createBy: this.$store.state.user.name,
methodRemark: '',
methodType: 'D'
},
@ -208,7 +208,7 @@
flag: '1',
methodNo: '',
methodName: '',
createdBy: this.$store.state.user.name,
createBy: this.$store.state.user.name,
methodRemark: '',
methodType: 'D'
}
@ -221,7 +221,7 @@
flag: '2',
methodNo: row.methodNo,
methodName: row.methodName,
createdBy: this.$store.state.user.name,
createBy: this.$store.state.user.name,
methodRemark: row.methodRemark,
methodType: 'D'
}
@ -256,6 +256,7 @@
},
// /
saveData () {
console.log(this.modalData)
if (this.modalData.methodNo == '' || this.modalData.methodNo == null) {
this.$alert('请输入检验方法编码!', '错误', {
confirmButtonText: '确定'

621
src/views/modules/qc/qcFamily.vue

@ -1,621 +0,0 @@
<template>
<div class="mod-config">
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-form-item :label="'工厂编码'">
<el-input v-model="searchData.site" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'分类编码'">
<el-input v-model="searchData.familyID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'分类名称'">
<el-input v-model="searchData.familyDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'是否在用'">
<el-select filterable v-model="searchData.active" style="width: 130px">
<el-option label="全部" value=""></el-option>
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
</el-form-item>
</el-form>
<!-- 展示列表 -->
<el-table
:height="height"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
: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>
</el-table-column>
<el-table-column
fixed="right"
header-align="center"
align="center"
width="160"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="updateModal(scope.row)">修改</a>
<a type="text" size="small" @click="detailFamily(scope.row)">检验模板</a>
<a type="text" size="small" @click="deleteFamily(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 1000]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<!-- 新增/修改分类 -->
<el-dialog title="检验分类" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="分类编码:">
<el-input v-model="modalData.familyID" :disabled="modalDisableFlag" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="分类名称:">
<el-input v-model="modalData.familyDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="是否在用:">
<el-select filterable v-model="modalData.active" style="width: 120px">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- 检验模板 -->
<el-dialog title="检验模板清单" :close-on-click-modal="false" v-drag :visible.sync="detailFamilyFlag" width="830px">
<el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
<el-form-item :label="'检验分类编码'">
<el-input v-model="detailData.familyID" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'检验分类名称'">
<el-input v-model="detailData.familyDesc" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="addDetailFamily()">新增</el-button>
</el-form-item>
</el-form>
<!-- 检验模板展示列表 -->
<el-table
:height="300"
:data="detailList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnDetailList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
: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>
</el-table-column>
<el-table-column
fixed="right"
header-align="center"
align="center"
width="130"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="deleteFamilyDetails(scope.row)">删除模板</a>
</template>
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="detailFamilyFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- 检验模板->新增 -->
<el-dialog title="添加项目" :close-on-click-modal="false" v-drag :visible.sync="addDetailFamilyFlag" width="300px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item >
<span slot="label" style="" @click="getBaseList(1035)"><a herf="#">检验模板编码</a></span>
<el-input v-model="detailData.codeNo" @blur="modelNoBlur" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="检验模板名称:">
<el-input v-model="detailData.codeDesc" disabled style="width: 120px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveFamilyDetails()">保存</el-button>
<el-button type="primary" @click="addDetailFamilyFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
<script>
import {
qcFamilySearch,
qcFamilySave,
qcFamilyUpdate,
qcFamilyDelete,
qcCheckOutModelSearch, //
saveFamilyDetails, //
searchFamilyDetails, //
deleteFamilyDetails //
} from "@/api/qc/qc.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
export default {
components: {
Chooselist
},
watch: {
searchData: {
deep: true,
handler: function (newV, oldV) {
this.searchData.familyID = this.searchData.familyID.toUpperCase()
}
},
modalData: {
deep: true,
handler: function (newV, oldV) {
this.modalData.familyID = this.modalData.familyID.toUpperCase()
}
}
},
data () {
return {
tagNo:'',
searchData: {
site: this.$store.state.user.site,
familyID: '',
familyDesc: '',
active: 'Y',
familyType:'D',
page: 1,
limit: 10
},
detailData: {
familyID:'',
familyDesc:'',
familyType:'D',
codeNo:'',
codeDesc:'',
functionType:'D',
userId:this.$store.state.user.name
},
height: 200,
pageIndex: 1,
pageSize: 100,
totalPage: 0,
dataList: [],
detailList: [],
dataListLoading: false,
dataListSelections: [],
modalFlag:false,
modalDisableFlag:false,
detailFamilyFlag:false,
addDetailFamilyFlag:false,
modalData:{
flag:'',
site: this.$store.state.user.site,
familyID:'',
familyDesc:'',
active:'',
familyType:'D',
},
departmentList:[],
//
columnList: [
{
userId: this.$store.state.user.name,
functionId: 301004,
serialNumber: '301004TableSite',
tableId: "301004Table",
tableName: "common",
columnProp: 'site',
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: 301004,
serialNumber: '301004TableFamilyID',
tableId: "301004Table",
tableName: "common",
columnProp: 'familyID',
headerAlign: "center",
align: "left",
columnLabel: '分类编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 301004,
serialNumber: '301004TableFamilyDesc',
tableId: "301004Table",
tableName: "common",
columnProp: 'familyDesc',
headerAlign: "center",
align: "left",
columnLabel: '分类名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140
},
{
userId: this.$store.state.user.name,
functionId: 301004,
serialNumber: '301004TableActive',
tableId: "301004Table",
tableName: "common",
columnProp: 'active',
headerAlign: "center",
align: "left",
columnLabel: '是否在用',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 40
}
],
columnDetailList: [
{
userId: this.$store.state.user.name,
functionId: 301004,
serialNumber: '301004Table2CodeNo',
tableId: "301004Table2",
tableName: "检验模板表",
columnProp: 'codeNo',
headerAlign: "center",
align: "left",
columnLabel: '检验模板编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 90,
},
{
userId: this.$store.state.user.name,
functionId: 301004,
serialNumber: '301004Table2CodeDesc',
tableId: "301004Table2",
tableName: "检验模板表",
columnProp: 'codeDesc',
headerAlign: "center",
align: "left",
columnLabel: '检验模板名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 90,
}
],
levelList:[]
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 210
})
},
created () {
this.getDataList()
},
methods: {
//
getBaseList (val,type) {
this.tagNo = val
this.$nextTick(() => {
let strVal = ''
if (val === 1035) {
strVal = this.detailData.codeNo
}
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
getBaseData (val) {
if (this.tagNo === 1035) {
this.detailData.codeNo = val.code_no
this.detailData.codeDesc = val.code_desc
}
},
//
modelNoBlur(){
let inData={
functionType:'D',
codeNo:this.detailData.codeNo
}
qcCheckOutModelSearch(inData).then(({data}) => {
if(data.rows.length>0){
this.detailData.codeDesc = data.rows[0].codeDesc
}else {
this.detailData.codeDesc=''
}
})
},
//
saveFamilyDetails(){
if(this.detailData.codeNo == "" || this.detailData.codeNo == null){
this.$alert('请选择检验模板编码!', '错误', {
confirmButtonText: '确定'
})
return false
}
saveFamilyDetails(this.detailData).then(({data}) => {
if (data && data.code == 0) {
searchFamilyDetails(this.detailData).then(({data}) => {
this.detailList = data.rows
})
this.addDetailFamilyFlag = false;
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
//
deleteFamilyDetails(row){
console.log(row)
this.$confirm(`是否删除这个检验模板?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteFamilyDetails(row).then(({data}) => {
if (data && data.code === 0) {
searchFamilyDetails(this.detailData).then(({data}) => {
this.detailList = data.rows
})
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}).catch(() => {
})
},
//
getDataList () {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
qcFamilySearch(this.searchData).then(({data}) => {
if (data.code == 0) {
this.dataList = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
}
this.dataListLoading = false
})
},
//
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
//
currentChangeHandle (val) {
this.pageIndex = val
this.getDataList()
},
//
selectionChangeHandle (val) {
this.dataListSelections = val
},
//
detailFamily(row){
this.detailData.familyID = row.familyID
this.detailData.familyDesc = row.familyDesc
searchFamilyDetails(this.detailData).then(({data}) => {
this.detailList = data.rows
})
this.detailFamilyFlag = true;
},
addDetailFamily(){
console.log(this.detailData)
this.detailData.codeNo = '';
this.detailData.codeDesc = '';
this.addDetailFamilyFlag = true;
},
//
addModal(){
this.modalData={
flag:'1',
site: this.$store.state.user.site,
familyID:'',
familyDesc:'',
active:'',
familyType:'D'
};
this.modalDisableFlag = false;
this.modalFlag = true;
},
//
updateModal(row){
this.modalData = {
flag:'2',
site: row.site,
familyID:row.familyID,
familyDesc:row.familyDesc,
active:row.active,
familyType:'D'
};
this.modalDisableFlag = true;
this.modalFlag = true;
},
//
deleteFamily (row) {
this.$confirm(`是否删除这个分类?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
qcFamilyDelete(row).then(({data}) => {
if (data && data.code === '0') {
this.getDataList()
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}).catch(() => {
})
},
// /
saveData(){
if (this.modalData.familyID == '' || this.modalData.familyID == null) {
this.$alert('请输入分类编码!', '错误', {
confirmButtonText: '确定'
})
return false
}
if (this.modalData.familyDesc == '' || this.modalData.familyDesc == null) {
this.$alert('请输入分类名称!', '错误', {
confirmButtonText: '确定'
})
return false
}
if (this.modalData.active == '' || this.modalData.active == null) {
this.$alert('选择是否在用!', '错误', {
confirmButtonText: '确定'
})
return false
}
if(this.modalData.flag == '1'){
qcFamilySave(this.modalData).then(({data}) => {
if (data && data.code === '0') {
this.getDataList()
this.modalFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}else {
qcFamilyUpdate(this.modalData).then(({data}) => {
if (data && data.code === '0') {
this.getDataList()
this.modalFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
}
}
}
</script>

149
src/views/modules/qc/qcCheckOutModel.vue → src/views/modules/qc/qcFamilyModel.vue

@ -2,12 +2,18 @@
<div class="mod-config">
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-form-item :label="'物料分类名称'">
<el-input v-model="searchData.familyName" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'检验模板编码'">
<el-input v-model="searchData.codeNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'检验模板名称'">
<el-input v-model="searchData.codeDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'检验类型名称'">
<el-input v-model="searchData.inspectionTypeName" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'是否在用'">
<el-select filterable v-model="searchData.active" style="width: 130px">
<el-option label="请选择" value=""></el-option>
@ -16,8 +22,9 @@
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
<el-button @click="doEmpty()">清空</el-button>
<el-button type="primary" @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
</el-form-item>
</el-form>
@ -70,6 +77,27 @@
<!-- 检验模板新增/修改 -->
<el-dialog title="检验模板" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item >
<span slot="label" style="" @click="getBaseList(1042)"><a herf="#">物料分类编码</a></span>
<el-input v-model="modalData.familyID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="物料分类名称:">
<el-input v-model="modalData.familyName" disabled style="width: 120px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item >
<span slot="label" style="" @click="getBaseList(1045)"><a herf="#">检验类型编码</a></span>
<el-input v-model="modalData.inspectionTypeNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="检验类型名称:">
<el-input v-model="modalData.inspectionTypeName" disabled style="width: 120px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="检验模板编码:">
<el-input v-model="modalData.codeNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>
@ -77,6 +105,7 @@
<el-form-item label="检验模板名称:">
<el-input v-model="modalData.codeDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="是否在用:">
<el-select filterable v-model="modalData.active" style="width: 120px">
<el-option label="是" value="Y"></el-option>
@ -84,6 +113,7 @@
</el-select>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
@ -323,7 +353,9 @@
codeNo: '',
codeDesc: '',
active:'',
familyName:'',
functionType:'D',
inspectionTypeName:'',
page: 1,
limit: 10,
},
@ -338,9 +370,13 @@
flag:'',
codeNo:'',
codeDesc:'',
familyID:'',
familyName:'',
active:'',
functionType:'D',
userId:this.$store.state.user.name
inspectionTypeNo:'',
inspectionTypeName:'',
createdBy:this.$store.state.user.name
},
detailData:{
codeNo:'',
@ -349,7 +385,7 @@
itemNo:'',
itemDesc:'',
itemType:'D',
userId:this.$store.state.user.name
createdBy:this.$store.state.user.name
},
columnList: [
{
@ -388,6 +424,42 @@
fixed: '',
columnWidth: 140,
},
{
userId: this.$store.state.user.name,
functionId: 301003,
serialNumber: '301003TableActive',
tableId: "301003Table",
tableName: "检验模板表",
columnProp: 'familyName',
headerAlign: "center",
align: "left",
columnLabel: '物料分类名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140,
},
{
userId: this.$store.state.user.name,
functionId: 301003,
serialNumber: '301003TableCodeDesc',
tableId: "301003Table",
tableName: "检验模板表",
columnProp: 'inspectionTypeName',
headerAlign: "center",
align: "left",
columnLabel: '检验类型名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140,
},
{
userId: this.$store.state.user.name,
functionId: 301003,
@ -406,6 +478,7 @@
fixed: '',
columnWidth: 40,
},
],
detailModelFlag:false,
detailList: [],
@ -578,6 +651,20 @@
this.getDataList();
},
methods: {
//
doEmpty(){
this.searchData = {
codeNo: '',
codeDesc: '',
active:'',
familyName:'',
functionType:'D',
inspectionTypeName:'',
page: 1,
limit: 10,
}
},
// S
getBaseList (val,type) {
this.tagNo = val
@ -585,8 +672,16 @@
let strVal = ''
if (val === 1034) {
strVal = this.detailData.itemNo
this.$refs.baseList.init(val, strVal)
}
if (val === 1042) {
strVal = this.modalData.familyID
this.$refs.baseList.init(val, strVal)
}
if (val === 1045) {
strVal = this.modalData.inspectionTypeNo
this.$refs.baseList.init(val, strVal)
}
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
@ -595,6 +690,14 @@
this.detailData.itemNo = val.ItemNo
this.detailData.itemDesc = val.ItemDesc
}
if (this.tagNo === 1042) {
this.modalData.familyID = val.FamilyID
this.modalData.familyName = val.FamilyName
}
if (this.tagNo === 1045) {
this.modalData.inspectionTypeNo = val.inspection_type_no
this.modalData.inspectionTypeName = val.inspection_type_name
}
},
//
getDataList () {
@ -628,10 +731,12 @@
codeDesc:'',
active:'Y',
functionType:'D',
userId:this.$store.state.user.name
inspectionTypeNo:'',
inspectionTypeName:'',
createdBy:this.$store.state.user.name
};
this.modalDisableFlag=false;
this.modalFlag=true;
this.modalDisableFlag = false;
this.modalFlag = true;
},
updateModal(row){
this.modalData={
@ -639,11 +744,15 @@
codeNo:row.codeNo,
codeDesc:row.codeDesc,
active:row.active,
familyID: row.familyID,
familyName: row.familyName,
inspectionTypeNo: row.inspectionTypeNo,
inspectionTypeName:row.inspectionTypeName,
functionType:'D',
userId:this.$store.state.user.name
createdBy:this.$store.state.user.name
};
this.modalDisableFlag=true;
this.modalFlag=true;
this.modalDisableFlag = true;
this.modalFlag = true;
},
//
deletePropertiesModel (row) {
@ -684,6 +793,18 @@
})
return false
}
if (this.modalData.familyID == '' || this.modalData.familyID == null) {
this.$alert('请选择物料分类编码!', '错误', {
confirmButtonText: '确定'
})
return false
}
if (this.modalData.inspectionTypeNo == '' || this.modalData.inspectionTypeNo == null) {
this.$alert('请选择检验类型!', '错误', {
confirmButtonText: '确定'
})
return false
}
if (this.modalData.active == '' || this.modalData.active == null) {
this.$alert('选择是否在用!', '错误', {
confirmButtonText: '确定'
@ -712,7 +833,7 @@
qcCheckOutModelUpdate(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.modalFlag=false
this.modalFlag = false
this.$message({
message: '操作成功',
type: 'success',
@ -777,7 +898,7 @@
itemNo: this.itemListRow1.itemNo,
itemDesc:this.itemListRow1.itemDesc,
itemType:this.detailData.itemType,
userId:this.$store.state.user.name
createdBy:this.$store.state.user.name
}
saveModalDetails(inData).then(({data}) => {
if (data && data.code == 0) {
@ -808,7 +929,7 @@
itemNo: this.itemListRow2.itemNo,
itemDesc:this.itemListRow2.itemDesc,
itemType:this.detailData.itemType,
userId:this.$store.state.user.name
createdBy:this.$store.state.user.name
}
deleteModalDetails(inData).then(({data}) => {
if (data && data.code === 0) {

4
src/views/modules/qc/qcMasterInformationModel.vue

@ -16,8 +16,8 @@
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
<el-button type="primary" @click="getDataList()">查询</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
</el-form-item>
</el-form>

1057
src/views/modules/qc/qcPartModel.vue
File diff suppressed because it is too large
View File

Loading…
Cancel
Save