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

2023-10-18 设备和质量修改

java8
杨奉源 2 years ago
parent
4b1b13bbd2
commit
7178c7351a
6 changed files with 227 additions and 24 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. 20
      src/views/modules/eam/eamWorkPlanForCheck.vue
  2. 64
      src/views/modules/qc/FAIResultEntry.vue
  3. 64
      src/views/modules/qc/FQCResultEntry.vue
  4. 64
      src/views/modules/qc/IPQCResultEntry.vue
  5. 9
      src/views/modules/qc/IQCResultEntry.vue
  6. 30
      src/views/modules/qc/qcPartAttribute.vue

20
src/views/modules/eam/eamWorkPlanForCheck.vue
View File

@ -127,22 +127,22 @@
<!-- 新增 -->
<el-dialog title="点检计划" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="570px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="计划编码:">
<el-form-item label="计划编码">
<el-input v-model="modalData.planID" disabled style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="计划描述:" prop="planDesc" :rules="rules.planDescType">
<el-form-item label="计划描述" prop="planDesc" :rules="rules.planDescType">
<el-input v-model="modalData.planDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item prop="propertiesCode" :rules="rules.propertiesCodeType">
<span slot="label" style="" @click="getBaseList(31)"><a herf="#">点检模板</a></span>
<span slot="label" @click="getBaseList(31)"><a herf="#">点检模板</a></span>
<el-input v-model="modalData.propertiesCode" @blur="modalCodeBlur" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="模板名称:" prop="propertiesDesc" :rules="rules.propertiesDescType">
<el-form-item label="模板名称" prop="propertiesDesc" :rules="rules.propertiesDescType">
<el-input v-model="modalData.propertiesDesc" disabled style="width: 120px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item label="计划开始日期:" prop="planStartDate" :rules="rules.planStartDateType">
<el-form-item label="计划开始日期" prop="planStartDate" :rules="rules.planStartDateType">
<el-date-picker
style="width: 120px"
v-model="modalData.planStartDate"
@ -153,7 +153,7 @@
:editable=false>
</el-date-picker>
</el-form-item>
<el-form-item label="计划结束日期:" prop="planEndDate" :rules="rules.planEndDateType">
<el-form-item label="计划结束日期" prop="planEndDate" :rules="rules.planEndDateType">
<el-date-picker
style="width: 120px"
v-model="modalData.planEndDate"
@ -164,7 +164,7 @@
:editable=false>
</el-date-picker>
</el-form-item>
<el-form-item label="任务开始时间:" prop="taskStartDate" :rules="rules.taskStartDateType">
<el-form-item label="任务开始时间" prop="taskStartDate" :rules="rules.taskStartDateType">
<el-date-picker
style="width: 220px"
v-model="modalData.taskStartDate"
@ -177,10 +177,10 @@
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item label="备注:">
<el-form-item label="备注">
<el-input v-model="modalData.remark" style="width: 255px"></el-input>
</el-form-item>
<el-form-item label="点检频率:" prop="planPeriod" :rules="rules.planPeriodType">
<el-form-item label="点检频率" prop="planPeriod" :rules="rules.planPeriodType">
<el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="点检周期">
@ -191,7 +191,7 @@
<el-option label="年" value="年"></el-option>
</el-select>
</el-form-item>
<el-form-item label="周末:">
<el-form-item label="周末">
<input type="checkbox" value="A" name="addWorkOrderRule" v-model="modalData.workOrderRule"/>
</el-form-item>
</el-form>

64
src/views/modules/qc/FAIResultEntry.vue
View File

@ -364,6 +364,7 @@
<el-dialog title="子明细信息" :close-on-click-modal="false" v-drag :visible.sync="subDetailFlag" width="471px">
<el-button type="success" icon="el-icon-plus" size="mini" @click="handleAddBtn(subDetailData)">添加</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteBtn(subDetailData)">删除</el-button>
<el-button type="primary" icon="el-icon-more" size="mini" @click="batchHandleAdd(subDetailData)">批量新增</el-button>
<div class="rq ">
<el-table
:height="300"
@ -383,7 +384,7 @@
<el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值" width="200">
<template slot-scope="{row}">
<el-input v-if="tableData[row.xh-1].isSubmit==='Y'" v-model="tableData[row.xh-1].subDetailValue" readonly placeholder="请输入实测值"></el-input>
<el-input v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" placeholder="请输入实测值"></el-input>
<el-input :ref="`${row.xh-1}`" v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus(row.xh-1)" placeholder="请输入实测值"></el-input>
</template>
</el-table-column>
</el-table>
@ -394,6 +395,22 @@
</el-footer>
</el-dialog>
<!-- 批量新增子明细操作-->
<el-dialog title="批量新增" :close-on-click-modal="false" v-drag :visible.sync="batchHandleAddModalFlag" width="471px">
<el-form :inline="true" label-position="top">
<el-form-item :label="'默认抽样位置'">
<el-input v-model="batchAddData.samplingLocation" style="width: 210px"></el-input>
</el-form-item>
<el-form-item :label="'抽样数量'">
<el-input type="number" v-model="batchAddData.samplingNumber" style="width: 210px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="batchHandleAddModal()">保存</el-button>
<el-button type="primary" @click="batchHandleAddModalFlag=false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- 文件清单 -->
<el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="800px">
<el-table
@ -431,7 +448,7 @@
</el-table>
</el-dialog>
<!-- chooselist模态框 -->
<!-- chooseList模态框 -->
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 上传文件的modal -->
@ -1057,6 +1074,11 @@
resourceList: [],
operationList: [],
partList: [],
batchHandleAddModalFlag: false,
batchAddData: {
samplingLocation: '',
samplingNumber: ''
}
}
},
mounted () {
@ -1505,6 +1527,10 @@
selectFAISubDetailedRecord(this.subDetailData).then(({data}) => {
this.tableData = data.rows
})
this.batchAddData = {
samplingLocation: '',
samplingNumber: ''
}
this.subDetailFlag = true;
},
@ -1594,6 +1620,38 @@
})
},
// 批量新增操作
batchHandleAdd (td) {
checkFAIIsSubmit(td).then(({data}) => {
if (data.flag != 1) {
this.batchHandleAddModalFlag = true
} else {
this.$alert("记录已提交！", '错误', {
confirmButtonText: '确定'
})
}
})
},
// 批量新增行
batchHandleAddModal () {
for (let i = 0; i < this.batchAddData.samplingNumber; i++) {
let obj = {}
obj.samplingLocation = this.batchAddData.samplingLocation
obj.subDetailValue = ""
this.tableData.push(obj)
}
this.batchHandleAddModalFlag = false
},
// 回车事件
nextFocus(index) {
let aaa = `${index + 1}`
this.$nextTick(() => {
this.$refs[aaa].focus()
})
},
//删除
handleDeleteBtn(td) {
checkFAIIsSubmit(td).then(({data}) => {
@ -1618,7 +1676,7 @@
})
})
this.$message({
message: "删除成功，记得保存修改喔！",
message: "删除成功！",
type: "success",
})
return

64
src/views/modules/qc/FQCResultEntry.vue
View File

@ -362,6 +362,7 @@
<el-dialog title="子明细信息" :close-on-click-modal="false" v-drag :visible.sync="subDetailFlag" width="471px">
<el-button type="success" icon="el-icon-plus" size="mini" @click="handleAddBtn(subDetailData)">添加</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteBtn(subDetailData)">删除</el-button>
<el-button type="primary" icon="el-icon-more" size="mini" @click="batchHandleAdd(subDetailData)">批量新增</el-button>
<div class="rq ">
<el-table
:height="300"
@ -381,7 +382,7 @@
<el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值" width="200">
<template slot-scope="{row}">
<el-input v-if="tableData[row.xh-1].isSubmit==='Y'" v-model="tableData[row.xh-1].subDetailValue" readonly placeholder="请输入实测值"></el-input>
<el-input v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" placeholder="请输入实测值"></el-input>
<el-input :ref="`${row.xh-1}`" v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus(row.xh-1)" placeholder="请输入实测值"></el-input>
</template>
</el-table-column>
</el-table>
@ -392,6 +393,22 @@
</el-footer>
</el-dialog>
<!-- 批量新增子明细操作-->
<el-dialog title="批量新增" :close-on-click-modal="false" v-drag :visible.sync="batchHandleAddModalFlag" width="471px">
<el-form :inline="true" label-position="top">
<el-form-item :label="'默认抽样位置'">
<el-input v-model="batchAddData.samplingLocation" style="width: 210px"></el-input>
</el-form-item>
<el-form-item :label="'抽样数量'">
<el-input type="number" v-model="batchAddData.samplingNumber" style="width: 210px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="batchHandleAddModal()">保存</el-button>
<el-button type="primary" @click="batchHandleAddModalFlag=false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- 文件清单 -->
<el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="800px">
<el-table
@ -429,7 +446,7 @@
</el-table>
</el-dialog>
<!-- chooselist模态框 -->
<!-- chooseList模态框 -->
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 上传文件的modal -->
@ -1053,6 +1070,11 @@
resourceList: [],
operationList: [],
partList: [],
batchHandleAddModalFlag: false,
batchAddData: {
samplingLocation: '',
samplingNumber: ''
}
}
},
mounted () {
@ -1491,6 +1513,10 @@
selectFQCSubDetailedRecord(this.subDetailData).then(({data}) => {
this.tableData = data.rows
})
this.batchAddData = {
samplingLocation: '',
samplingNumber: ''
}
this.subDetailFlag = true;
},
@ -1580,6 +1606,38 @@
})
},
// 批量新增操作
batchHandleAdd (td) {
checkFQCIsSubmit(td).then(({data}) => {
if (data.flag != 1) {
this.batchHandleAddModalFlag = true
} else {
this.$alert("记录已提交！", '错误', {
confirmButtonText: '确定'
})
}
})
},
// 批量新增行
batchHandleAddModal () {
for (let i = 0; i < this.batchAddData.samplingNumber; i++) {
let obj = {}
obj.samplingLocation = this.batchAddData.samplingLocation
obj.subDetailValue = ""
this.tableData.push(obj)
}
this.batchHandleAddModalFlag = false
},
// 回车事件
nextFocus(index) {
let aaa = `${index + 1}`
this.$nextTick(() => {
this.$refs[aaa].focus()
})
},
//删除
handleDeleteBtn(td) {
checkFQCIsSubmit(td).then(({data}) => {
@ -1604,7 +1662,7 @@
});
});
this.$message({
message: "删除成功，记得保存修改喔！",
message: "删除成功！",
type: "success",
});
//this.$refs.tb.clearSelection();

64
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -439,6 +439,7 @@
<el-dialog title="子明细信息" :close-on-click-modal="false" v-drag :visible.sync="subDetailFlag" width="471px">
<el-button type="success" icon="el-icon-plus" size="mini" @click="handleAddBtn(subDetailData)">添加</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteBtn(subDetailData)">删除</el-button>
<el-button type="primary" icon="el-icon-more" size="mini" @click="batchHandleAdd(subDetailData)">批量新增</el-button>
<div class="rq ">
<el-table
:height="300"
@ -458,7 +459,7 @@
<el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值" width="200">
<template slot-scope="{row}">
<el-input v-if="tableData[row.xh-1].isSubmit=='Y'" v-model="tableData[row.xh-1].subDetailValue" readonly placeholder="请输入实测值"></el-input>
<el-input v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" placeholder="请输入实测值"></el-input>
<el-input :ref="`${row.xh-1}`" v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus(row.xh-1)" placeholder="请输入实测值"></el-input>
</template>
</el-table-column>
</el-table>
@ -469,6 +470,22 @@
</el-footer>
</el-dialog>
<!-- 批量新增子明细操作-->
<el-dialog title="批量新增" :close-on-click-modal="false" v-drag :visible.sync="batchHandleAddModalFlag" width="471px">
<el-form :inline="true" label-position="top">
<el-form-item :label="'默认抽样位置'">
<el-input v-model="batchAddData.samplingLocation" style="width: 210px"></el-input>
</el-form-item>
<el-form-item :label="'抽样数量'">
<el-input type="number" v-model="batchAddData.samplingNumber" style="width: 210px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="batchHandleAddModal()">保存</el-button>
<el-button type="primary" @click="batchHandleAddModalFlag=false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- 文件清单 -->
<el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="800px">
<el-table
@ -1162,6 +1179,11 @@
}
]
},
batchHandleAddModalFlag: false,
batchAddData: {
samplingLocation: '',
samplingNumber: ''
}
// orderNoData:{
// limit: 10,
// page: 1,
@ -1685,7 +1707,11 @@
selectIPQCSubDetailedRecord(this.subDetailData).then(({data}) => {
this.tableData = data.rows
})
this.subDetailFlag = true;
this.batchAddData = {
samplingLocation: '',
samplingNumber: ''
}
this.subDetailFlag = true
},
// 审核按钮
@ -1774,6 +1800,38 @@
})
},
// 批量新增操作
batchHandleAdd (td) {
checkIPQCIsSubmit(td).then(({data}) => {
if (data.flag != 1) {
this.batchHandleAddModalFlag = true
} else {
this.$alert("记录已提交！", '错误', {
confirmButtonText: '确定'
})
}
})
},
// 批量新增行
batchHandleAddModal () {
for (let i = 0; i < this.batchAddData.samplingNumber; i++) {
let obj = {}
obj.samplingLocation = this.batchAddData.samplingLocation
obj.subDetailValue = ""
this.tableData.push(obj)
}
this.batchHandleAddModalFlag = false
},
// 回车事件
nextFocus(index) {
let aaa = `${index + 1}`
this.$nextTick(() => {
this.$refs[aaa].focus()
})
},
//删除
handleDeleteBtn(td) {
checkIPQCIsSubmit(td).then(({data}) => {
@ -1798,7 +1856,7 @@
});
});
this.$message({
message: "删除成功，记得保存修改喔！",
message: "删除成功!",
type: "success",
});
return;

9
src/views/modules/qc/IQCResultEntry.vue
View File

@ -331,7 +331,7 @@
<el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值" width="200">
<template slot-scope="{row}">
<el-input v-if="tableData[row.xh-1].isSubmit === 'Y'" v-model="tableData[row.xh-1].subDetailValue" readonly placeholder="请输入实测值"></el-input>
<el-input :ref="`${row.xh-1}`" v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus(row.xh-1)" placeholder="请输入实测值" class="batch_add"></el-input>
<el-input :ref="`${row.xh-1}`" v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus(row.xh-1)" placeholder="请输入实测值"></el-input>
</template>
</el-table-column>
</el-table>
@ -349,7 +349,7 @@
<el-input v-model="batchAddData.samplingLocation" style="width: 210px"></el-input>
</el-form-item>
<el-form-item :label="'抽样数量'">
<el-input v-model="batchAddData.samplingNumber" style="width: 210px"></el-input>
<el-input type="number" v-model="batchAddData.samplingNumber" style="width: 210px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
@ -1166,6 +1166,10 @@
selectIQCSubDetailedRecord(this.subDetailData).then(({data}) => {
this.tableData = data.rows
})
this.batchAddData = {
samplingLocation: '',
samplingNumber: ''
}
this.subDetailFlag = true
},
// 删除检验记录
@ -1311,7 +1315,6 @@
},
// 回车事件
nextFocus(index) {
console.log(index)
let aaa = `${index + 1}`
this.$nextTick(() => {
this.$refs[aaa].focus()

30
src/views/modules/qc/qcPartAttribute.vue
View File

@ -104,7 +104,7 @@
<el-dialog title="物料属性设置" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="partNo" :rules="rules.partNoType">
<span slot="label" style="" @click="getBaseList(1043)"><a herf="#">物料编码:</a></span>
<span slot="label" @click="getBaseList(1043)"><a herf="#">物料编码:</a></span>
<el-input v-model="modalData.partNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="物料名称:" prop="partDesc" :rules="rules.partDescType">
@ -113,7 +113,10 @@
</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.attributeRemark" style="width: 375px"></el-input>
<el-input v-model="modalData.attributeRemark" style="width: 315px"></el-input>
</el-form-item>
<el-form-item label="是否免检">
<input type="checkbox" value="Y" name="isExemptInspection" v-model="modalData.exemptInspection"/>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
@ -630,6 +633,7 @@
createTime: '',
createBy: this.$store.state.user.name,
attributeType: 'A',
exemptInspection: ''
},
detailData:{
site: this.$store.state.user.site,
@ -703,6 +707,18 @@
status: true,
fixed: '',
},
{
columnProp: 'exemptInspection',
headerAlign: "center",
align: "center",
columnLabel: '是否免检',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'attributeRemark',
headerAlign: "center",
@ -1030,6 +1046,7 @@
updateBy: this.$store.state.user.name,
createBy: this.$store.state.user.name,
attributeType: 'A',
exemptInspection: ''
};
this.modalDisableFlag = false;
this.modalFlag = true;
@ -1069,6 +1086,15 @@
this.$message.warning('请选择物料名称！')
return
}
let obj = document.getElementsByName('isExemptInspection')
let s = ''
for (let i = 0; i < obj.length; i++) {
if (obj[i].checked) {
s += obj[i].value + ','
}
}
s = s.substring(0, s.length - 1)
this.modalData.exemptInspection = s
if(this.modalData.flag === '1'){
qcPartAttributeSave(this.modalData).then(({data}) => {
if (data && data.code === 0) {

Write Preview
Loading…
Cancel
Save