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

2023-09-22 设备和质量修改

java8
杨奉源 2 years ago
parent
1902b7fe8d
commit
da1c123ae0
5 changed files with 181 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 87
      src/views/modules/qc/FAIResultEntry.vue
  2. 52
      src/views/modules/qc/FQCResultEntry.vue
  3. 111
      src/views/modules/qc/IPQCResultEntry.vue
  4. 3
      src/views/modules/qc/qcPartAttribute.vue
  5. 1
      src/views/modules/qc/qcTemplate.vue

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

@ -135,12 +135,12 @@
<!-- 新增检验记录 --> <!-- 新增检验记录 -->
<el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px"> <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="orderNo" :rules="rules.orderNoType">
<span slot="label" @click="getBaseList(1052)"><a herf="#">工单号</a></span>
<el-input v-model="modalData.orderNo" style="width: 221px"></el-input>
<el-form-item prop="orderNo" :rules="rules.seqNoType">
<span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
<el-input v-model="modalData.seqNo" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="送检数量:" prop="rollQty" :rules="rules.rollQtyType">
<el-input v-model="modalData.rollQty" type="number" style="width: 221px"></el-input>
<el-form-item label="工单号" prop="orderNo" :rules="rules.orderNoType">
<el-input v-model="modalData.orderNo" style="width: 221px" disabled></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -177,6 +177,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="送检数量:" prop="rollQty" :rules="rules.rollQtyType">
<el-input v-model="modalData.rollQty" type="number" style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="老卷号">
<el-input v-model="modalData.batchRollNo" style="width: 221px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center"> <el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button> <el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button> <el-button type="primary" @click="modalFlag = false">关闭</el-button>
@ -496,6 +504,8 @@
inspectorNo: '', inspectorNo: '',
inspectorName: '', inspectorName: '',
submit_flag: '', submit_flag: '',
seqNo: '',
batchRollNo: ''
}, },
// 展示列集 // 展示列集
columnList: [ columnList: [
@ -571,6 +581,18 @@
status: true, status: true,
fixed: '', fixed: '',
}, },
{
columnProp: 'seqNo',
headerAlign: "center",
align: "center",
columnLabel: '派工单号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{ {
columnProp: 'operationDesc', columnProp: 'operationDesc',
headerAlign: "center", headerAlign: "center",
@ -982,6 +1004,13 @@
message: ' ', message: ' ',
trigger: 'change' trigger: 'change'
} }
],
seqNoType: [
{
required: true,
message: ' ',
trigger: 'change'
}
] ]
}, },
resourceList: [], resourceList: [],
@ -1005,7 +1034,7 @@
this.$nextTick(() => { this.$nextTick(() => {
let strVal = '' let strVal = ''
if (val === 1052) { if (val === 1052) {
strVal = this.modalData.orderNo
strVal = this.modalData.seqNo
this.$refs.baseList.init(val, strVal) this.$refs.baseList.init(val, strVal)
} }
}) })
@ -1014,7 +1043,10 @@
/* 列表方法的回调 */ /* 列表方法的回调 */
getBaseData (val) { getBaseData (val) {
if (this.tagNo === 1052) { if (this.tagNo === 1052) {
this.modalData.seqNo = val.seqno
this.modalData.orderNo = val.orderno this.modalData.orderNo = val.orderno
this.modalData.operationDesc = ''
this.modalData.resourceId = ''
this.getOperationList() this.getOperationList()
this.getPartList() this.getPartList()
} }
@ -1063,6 +1095,10 @@
// 新增FAI巡检记录 // 新增FAI巡检记录
saveData(){ saveData(){
if (this.modalData.seqNo === '' || this.modalData.seqNo == null) {
this.$message.warning('请选择派工单！')
return
}
if (this.modalData.orderNo === '' || this.modalData.orderNo == null) { if (this.modalData.orderNo === '' || this.modalData.orderNo == null) {
this.$message.warning('请选择工单！') this.$message.warning('请选择工单！')
return return
@ -1126,6 +1162,8 @@
resourceId: '', resourceId: '',
resourceDesc: '', resourceDesc: '',
rollQty: '', rollQty: '',
seqNo: '',
batchRollNo: ''
}; };
this.operationList = []; this.operationList = [];
this.resourceList = []; this.resourceList = [];
@ -1373,7 +1411,7 @@
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
saveFAIDetailedRecord(this.saveInformationData).then(({data}) => { saveFAIDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code == '0') {
if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.detailInformationFlag = false this.detailInformationFlag = false
} else { } else {
@ -1462,7 +1500,7 @@
}).then(() => { }).then(() => {
this.submitData.submitList = this.FAISelections this.submitData.submitList = this.FAISelections
saveFAISubmitResult(this.submitData).then(({data}) => { saveFAISubmitResult(this.submitData).then(({data}) => {
if (data && data.code ==0) {
if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.FAISelections = [] this.FAISelections = []
this.$message({ this.$message({
@ -1485,12 +1523,12 @@
// 子明细方法 // 子明细方法
//表格的新增 //表格的新增
rowClassName({ row, rowIndex }) { rowClassName({ row, rowIndex }) {
row.xh = rowIndex + 1;
row.xh = rowIndex + 1
}, },
//单选框选中数据 //单选框选中数据
handleDetailSelectionChange(selection) { handleDetailSelectionChange(selection) {
this.checkedDetail = selection;
this.checkedDetail = selection
}, },
//点击新增更多 //点击新增更多
@ -1498,10 +1536,9 @@
checkFAIIsSubmit(td).then(({data}) => { checkFAIIsSubmit(td).then(({data}) => {
if (data.flag != 1) { if (data.flag != 1) {
let obj = {}; let obj = {};
obj.subDetailValue = "";
obj.samplingLocation = "";
this.tableData.push(obj);
console.log(this.tableData)
obj.subDetailValue = ""
obj.samplingLocation = ""
this.tableData.push(obj)
} else { } else {
this.$alert("记录已提交！", '错误', { this.$alert("记录已提交！", '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1517,7 +1554,7 @@
if (this.checkedDetail.length == 0) { if (this.checkedDetail.length == 0) {
this.$alert("请先选择要删除的数据", "提示", { this.$alert("请先选择要删除的数据", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
});
})
} else { } else {
this.$confirm("请是否确认删除该子明细记录?", "提示", { this.$confirm("请是否确认删除该子明细记录?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -1525,29 +1562,28 @@
type: "warning", type: "warning",
callback: (action) => { callback: (action) => {
if (action === "confirm") { if (action === "confirm") {
let val = this.checkedDetail;
let val = this.checkedDetail
val.forEach((val, index) => { val.forEach((val, index) => {
this.tableData.forEach((v, i) => { this.tableData.forEach((v, i) => {
if (val.xh === v.xh) { if (val.xh === v.xh) {
this.tableData.splice(i, 1);
this.tableData.splice(i, 1)
} }
});
});
})
})
this.$message({ this.$message({
message: "删除成功，记得保存修改喔！", message: "删除成功，记得保存修改喔！",
type: "success", type: "success",
});
//this.$refs.tb.clearSelection();
return;
})
return
} else { } else {
this.$message({ this.$message({
message: "已取消删除操作", message: "已取消删除操作",
type: "warning", type: "warning",
});
return;
})
return
} }
}, },
});
})
} }
} else { } else {
this.$alert("记录已提交！", '错误', { this.$alert("记录已提交！", '错误', {
@ -1555,7 +1591,6 @@
}) })
} }
}) })
}, },
// 新增子明细记录 // 新增子明细记录

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

@ -133,12 +133,12 @@
<!-- 新增检验记录 --> <!-- 新增检验记录 -->
<el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px"> <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="orderNo" :rules="rules.orderNoType">
<span slot="label" @click="getBaseList(1052)"><a herf="#">工单号</a></span>
<el-input v-model="modalData.orderNo" style="width: 221px"></el-input>
<el-form-item prop="orderNo" :rules="rules.seqNoType">
<span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
<el-input v-model="modalData.seqNo" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="送检数量:" prop="rollQty" :rules="rules.rollQtyType">
<el-input v-model="modalData.rollQty" type="number" style="width: 221px"></el-input>
<el-form-item label="工单号" prop="orderNo" :rules="rules.orderNoType">
<el-input v-model="modalData.orderNo" style="width: 221px" disabled></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -175,6 +175,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="送检数量:" prop="rollQty" :rules="rules.rollQtyType">
<el-input v-model="modalData.rollQty" type="number" style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="老卷号">
<el-input v-model="modalData.batchRollNo" style="width: 221px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center"> <el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button> <el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button> <el-button type="primary" @click="modalFlag = false">关闭</el-button>
@ -492,6 +500,8 @@
inspectorNo: '', inspectorNo: '',
inspectorName: '', inspectorName: '',
submit_flag: '', submit_flag: '',
seqNo: '',
batchRollNo: ''
}, },
// 展示列集 // 展示列集
columnList: [ columnList: [
@ -567,6 +577,18 @@
status: true, status: true,
fixed: '', fixed: '',
}, },
{
columnProp: 'seqNo',
headerAlign: "center",
align: "center",
columnLabel: '派工单号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{ {
columnProp: 'operationDesc', columnProp: 'operationDesc',
headerAlign: "center", headerAlign: "center",
@ -978,6 +1000,13 @@
message: ' ', message: ' ',
trigger: 'change' trigger: 'change'
} }
],
seqNoType: [
{
required: true,
message: ' ',
trigger: 'change'
}
] ]
}, },
resourceList: [], resourceList: [],
@ -1001,7 +1030,7 @@
this.$nextTick(() => { this.$nextTick(() => {
let strVal = '' let strVal = ''
if (val === 1052) { if (val === 1052) {
strVal = this.modalData.orderNo
strVal = this.modalData.seqNo
this.$refs.baseList.init(val, strVal) this.$refs.baseList.init(val, strVal)
} }
}) })
@ -1010,7 +1039,10 @@
/* 列表方法的回调 */ /* 列表方法的回调 */
getBaseData (val) { getBaseData (val) {
if (this.tagNo === 1052) { if (this.tagNo === 1052) {
this.modalData.seqNo = val.seqno
this.modalData.orderNo = val.orderno this.modalData.orderNo = val.orderno
this.modalData.operationDesc = ''
this.modalData.resourceId = ''
this.getOperationList() this.getOperationList()
this.getPartList() this.getPartList()
} }
@ -1059,6 +1091,10 @@
// 新增FAI巡检记录 // 新增FAI巡检记录
saveData(){ saveData(){
if (this.modalData.seqNo === '' || this.modalData.seqNo == null) {
this.$message.warning('请选择派工单！')
return
}
if (this.modalData.orderNo === '' || this.modalData.orderNo == null) { if (this.modalData.orderNo === '' || this.modalData.orderNo == null) {
this.$message.warning('请选择工单！') this.$message.warning('请选择工单！')
return return
@ -1122,6 +1158,8 @@
resourceId: '', resourceId: '',
resourceDesc: '', resourceDesc: '',
rollQty: '', rollQty: '',
seqNo: '',
batchRollNo: ''
}; };
this.operationList = []; this.operationList = [];
this.resourceList = []; this.resourceList = [];
@ -1359,7 +1397,7 @@
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
saveFQCDetailedRecord(this.saveInformationData).then(({data}) => { saveFQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code == '0') {
if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.detailInformationFlag = false this.detailInformationFlag = false
} else { } else {

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

@ -143,21 +143,12 @@
<!-- 新增巡检记录 --> <!-- 新增巡检记录 -->
<el-dialog title="新增巡检记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px"> <el-dialog title="新增巡检记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="orderNo" :rules="rules.orderNoType">
<span slot="label" @click="getBaseList(1052)"><a herf="#">工单号</a></span>
<el-input v-model="modalData.orderNo" style="width: 221px"></el-input>
<el-form-item prop="orderNo" :rules="rules.seqNoType">
<span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
<el-input v-model="modalData.seqNo" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item prop="orderNo" :rules="rules.orderNoType">-->
<!-- <span slot="label" @click="getOrderNoList"><a herf="#">工单号</a></span>-->
<!-- <el-input v-model="modalData.orderNo" @change="orderNoChange()" style="width: 221px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
<el-select v-model="modalData.inspectionTypeNo" style="width: 221px">
<el-option label="首件检" value="101"></el-option>
<el-option label="自检" value="102"></el-option>
<el-option label="巡检" value="103"></el-option>
<el-option label="末件检" value="104"></el-option>
</el-select>
<el-form-item label="工单号" prop="orderNo" :rules="rules.orderNoType">
<el-input v-model="modalData.orderNo" style="width: 221px" disabled></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -184,7 +175,7 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="物料" prop="partNo" :rules="rules.partNoType"> <el-form-item label="物料" prop="partNo" :rules="rules.partNoType">
<el-select v-model="modalData.partNo" placeholder="请选择" style="width: 321px">
<el-select v-model="modalData.partNo" placeholder="请选择" style="width: 456px">
<el-option <el-option
v-for = "i in partList" v-for = "i in partList"
:key = "i.partNo" :key = "i.partNo"
@ -193,8 +184,23 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="送检数量:" prop="rollQty" :rules="rules.rollQtyType">
<el-input v-model="modalData.rollQty" type="number" style="width: 120px"></el-input>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
<el-select v-model="modalData.inspectionTypeNo" style="width: 221px">
<el-option label="首件检" value="101"></el-option>
<el-option label="自检" value="102"></el-option>
<el-option label="巡检" value="103"></el-option>
<el-option label="末件检" value="104"></el-option>
</el-select>
</el-form-item>
<el-form-item label="送检数量" prop="rollQty" :rules="rules.rollQtyType">
<el-input v-model="modalData.rollQty" type="number" style="width: 221px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="老卷号">
<el-input v-model="modalData.batchRollNo" style="width: 456px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center"> <el-footer style="height:40px;margin-top: 10px;text-align:center">
@ -575,6 +581,8 @@
resourceId: '', resourceId: '',
resourceDesc: '', resourceDesc: '',
rollQty: '', rollQty: '',
seqNo: '',
batchRollNo: ''
}, },
// 展示列集 // 展示列集
columnList: [ columnList: [
@ -662,6 +670,18 @@
status: true, status: true,
fixed: '', fixed: '',
}, },
{
columnProp: 'seqNo',
headerAlign: "center",
align: "center",
columnLabel: '派工单号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{ {
columnProp: 'operationDesc', columnProp: 'operationDesc',
headerAlign: "center", headerAlign: "center",
@ -1043,6 +1063,13 @@
partList: [], partList: [],
IPQCSelections: [], IPQCSelections: [],
rules:{ rules:{
seqNoType: [
{
required: true,
message: ' ',
trigger: 'change'
}
],
orderNoType: [ orderNoType: [
{ {
required: true, required: true,
@ -1084,7 +1111,7 @@
message: ' ', message: ' ',
trigger: 'change' trigger: 'change'
} }
]
],
}, },
// orderNoData:{ // orderNoData:{
// limit: 10, // limit: 10,
@ -1223,7 +1250,7 @@
this.$nextTick(() => { this.$nextTick(() => {
let strVal = '' let strVal = ''
if (val === 1052) { if (val === 1052) {
strVal = this.modalData.orderNo
strVal = this.modalData.seqNo
this.$refs.baseList.init(val, strVal) this.$refs.baseList.init(val, strVal)
} }
}) })
@ -1232,7 +1259,10 @@
/* 列表方法的回调 */ /* 列表方法的回调 */
getBaseData (val) { getBaseData (val) {
if (this.tagNo === 1052) { if (this.tagNo === 1052) {
this.modalData.seqNo = val.seqno
this.modalData.orderNo = val.orderno this.modalData.orderNo = val.orderno
this.modalData.operationDesc = ''
this.modalData.resourceId = ''
this.getOperationList() this.getOperationList()
this.getPartList() this.getPartList()
} }
@ -1358,6 +1388,8 @@
resourceId: '', resourceId: '',
resourceDesc: '', resourceDesc: '',
rollQty: '', rollQty: '',
seqNo: '',
batchRollNo: ''
}; };
this.operationList = []; this.operationList = [];
this.resourceList = []; this.resourceList = [];
@ -1368,6 +1400,10 @@
// 新增IPQC巡检记录 // 新增IPQC巡检记录
saveData(){ saveData(){
if (this.modalData.seqNo === '' || this.modalData.seqNo == null) {
this.$message.warning('请选择派工单！')
return
}
if (this.modalData.orderNo === '' || this.modalData.orderNo == null) { if (this.modalData.orderNo === '' || this.modalData.orderNo == null) {
this.$message.warning('请选择工单！') this.$message.warning('请选择工单！')
return return
@ -1463,7 +1499,7 @@
// 删除检验记录 // 删除检验记录
deleteModal () { deleteModal () {
if(this.IPQCSelections.length == 0){
if(this.IPQCSelections.length === 0){
this.$alert('请勾选要删除的检验单！', '提示', { this.$alert('请勾选要删除的检验单！', '提示', {
confirmButtonText: '确定' confirmButtonText: '确定'
}) })
@ -1500,35 +1536,25 @@
}, },
Transfer(){ Transfer(){
if (this.detailData.inspectionResult == '' || this.detailData.inspectionResult == null) {
if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) {
this.$alert('请选择检验结论！', '错误', { this.$alert('请选择检验结论！', '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
}) })
return false return false
} }
if (this.detailData.inspectorNo == '' || this.detailData.inspectorNo == null) {
if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) {
this.$alert('请选择检验员！', '错误', { this.$alert('请选择检验员！', '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
}) })
return false return false
} }
// if (this.detailData.inspectionResult == 'Y' && (this.detailData.disposalMeasures == '特采' || this.detailData.disposalMeasures == '拒收')) {
// this.$alert('合格不予处置措施，请查看！', '错误', {
// confirmButtonText: '确定'
// })
// return false
// }
for (let i = 0; i < this.detailList.length; i++) { for (let i = 0; i < this.detailList.length; i++) {
if(this.detailList[i].itemResult == '' || this.detailList[i].itemResult == null){
// this.$alert(this.detailList[i].itemDesc+'是否合格未确认！', '错误', {
// confirmButtonText: '确定'
// })
// return false
if(this.detailList[i].itemResult === '' || this.detailList[i].itemResult == null){
this.detailList[i].itemResult = 'Y' this.detailList[i].itemResult = 'Y'
} }
if(this.detailList[i].valueTypeDb == 'N') {
if(this.detailList[i].valueTypeDb === 'N') {
checkIPQCSubDetailValue(this.detailList[i]).then(({data}) => { checkIPQCSubDetailValue(this.detailList[i]).then(({data}) => {
if (data.flag == 2 && this.detailList[i].itemResult == 'Y') {
if (data.flag === 2 && this.detailList[i].itemResult ==='Y') {
this.$confirm(this.detailList[i].itemDesc + ' 中实测值不在合格范围！是否保存为合格？', '提示', { this.$confirm(this.detailList[i].itemDesc + ' 中实测值不在合格范围！是否保存为合格？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -1557,7 +1583,7 @@
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code == '0') {
if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.detailInformationFlag = false this.detailInformationFlag = false
} else { } else {
@ -1685,7 +1711,6 @@
obj.subDetailValue = ""; obj.subDetailValue = "";
obj.samplingLocation = ""; obj.samplingLocation = "";
this.tableData.push(obj); this.tableData.push(obj);
console.log(this.tableData)
} else { } else {
this.$alert("记录已提交！", '错误', { this.$alert("记录已提交！", '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1780,13 +1805,10 @@
console.log(this.$route.meta.menuId) console.log(this.$route.meta.menuId)
userFavoriteList(userFavorite).then(({data}) => { userFavoriteList(userFavorite).then(({data}) => {
for (let i = 0; i < data.list.length; i++) { for (let i = 0; i < data.list.length; i++) {
// let flag=false;
if(this.$route.meta.menuId==data.list[i].menuId){ if(this.$route.meta.menuId==data.list[i].menuId){
this.favorite = true this.favorite = true
// flag=true;
} }
} }
}) })
}, },
@ -1797,17 +1819,10 @@
functionId: this.$route.meta.menuId, functionId: this.$route.meta.menuId,
} }
if (this.favorite) { if (this.favorite) {
// 取消收藏
// this.$confirm(`确定取消收藏`, '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
removeUserFavorite(userFavorite).then(({data}) => { removeUserFavorite(userFavorite).then(({data}) => {
this.$message.success(data.msg) this.$message.success(data.msg)
this.favorite = false this.favorite = false
}) })
// })
} else { } else {
// 收藏 // 收藏
saveUserFavorite(userFavorite).then(({data}) => { saveUserFavorite(userFavorite).then(({data}) => {
@ -1824,7 +1839,6 @@
await qcIPQCInspectionSearch(this.searchData).then(({data}) => { await qcIPQCInspectionSearch(this.searchData).then(({data}) => {
this.exportList= data.page.list; this.exportList= data.page.list;
}) })
return this.exportList; return this.exportList;
}, },
@ -1847,7 +1861,6 @@
}) })
json += "}" json += "}"
let s = eval("(" + json + ")") let s = eval("(" + json + ")")
return s return s
}, },
} }

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

@ -1148,6 +1148,9 @@
this.dataListOperationSelections = [] this.dataListOperationSelections = []
this.operation = '' this.operation = ''
this.resourceId = '' this.resourceId = ''
this.operationData.operationDesc = ''
this.resourceData.resourceId = ''
this.resourceData.resourceDesc = ''
this.operationCurrent = -1 this.operationCurrent = -1
this.resourceCurrent = -1 this.resourceCurrent = -1
this.selectionManufacturer = [] this.selectionManufacturer = []

1
src/views/modules/qc/qcTemplate.vue
View File

@ -1177,6 +1177,7 @@
return return
} }
let inData = { let inData = {
site: this.$store.state.user.site,
templateId: this.detailData.templateId, templateId: this.detailData.templateId,
templateName: this.detailData.templateName, templateName: this.detailData.templateName,
// itemNo: this.itemListRow1.itemNo, // itemNo: this.itemListRow1.itemNo,

Write Preview
Loading…
Cancel
Save