Browse Source

2023-08-14 设备和质量修改

java8
杨奉源 2 years ago
parent
commit
b7992d5900
  1. 42
      src/views/modules/qc/FAIResultEntry.vue
  2. 10
      src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue
  3. 18
      src/views/modules/reportWorkOrder/reportCheckOrder.vue
  4. 9
      src/views/modules/reportWorkOrder/reportDefectOrder.vue
  5. 9
      src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue

42
src/views/modules/qc/FAIResultEntry.vue

@ -86,8 +86,8 @@
align="center" align="center"
label="状态"> label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{fontWeight:'bold', color: scope.row.state =='待检验' ? 'red' : scope.row.state =='待审核' ? '#ffa500e0' : scope.row.state =='已完成' ? '#3ac252' : ''}">
{{ scope.row.state }}
<div :style="{fontWeight:'bold', color: scope.row.state === '待检验' ? 'red' : scope.row.state === '待审核' ? '#ffa500e0' : scope.row.state === '已完成' ? '#3ac252' : ''}">
{{scope.row.state}}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -150,11 +150,11 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()"> <el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()">
<el-form-item :label="'不合格项目数量'"> <el-form-item :label="'不合格项目数量'">
<el-input v-if="detailData.submitFlag == 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input> <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'处置措施'"> <el-form-item :label="'处置措施'">
<el-select v-if="detailData.submitFlag == 'Y'" v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalMeasures" disabled style="width: 100px">
<el-option label="请选择" value=""></el-option> <el-option label="请选择" value=""></el-option>
<el-option label="特采" value="特采"></el-option> <el-option label="特采" value="特采"></el-option>
<el-option label="拒收" value="拒收"></el-option> <el-option label="拒收" value="拒收"></el-option>
@ -166,11 +166,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'处置说明'"> <el-form-item :label="'处置说明'">
<el-input v-if="detailData.submitFlag == 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalRemark" disabled style="width: 200px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalRemark" style="width: 200px"></el-input> <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalRemark" style="width: 200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'检验结论'"> <el-form-item :label="'检验结论'">
<el-select v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
<el-option label="合格" value="合格"></el-option> <el-option label="合格" value="合格"></el-option>
<el-option label="不合格" value="不合格"></el-option> <el-option label="不合格" value="不合格"></el-option>
</el-select> </el-select>
@ -180,7 +180,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="检验员"> <el-form-item label="检验员">
<el-select v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
<el-option <el-option
v-for = "i in options" v-for = "i in options"
:key = "i.inspectorNo" :key = "i.inspectorNo"
@ -198,7 +198,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'质检备注'"> <el-form-item :label="'质检备注'">
<el-input v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 200px"></el-input>
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 200px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 200px"></el-input> <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
@ -246,7 +246,7 @@
min-width="80" min-width="80"
label="不合格数量"> label="不合格数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="detailData.submitFlag == 'Y'" v-model="scope.row.unqualifiedQuantity" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
<el-input v-if="detailData.submitFlag === 'Y'" v-model="scope.row.unqualifiedQuantity" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input> <el-input v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -257,7 +257,7 @@
min-width="75" min-width="75"
label="项目检验结论"> label="项目检验结论">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-if="detailData.submitFlag == 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px" >
<el-select v-if="detailData.submitFlag === 'Y'" v-model="scope.row.itemResult" disabled style="height: 11px;padding: 0px" >
<el-option label="合格" value="Y" style="color: green"></el-option> <el-option label="合格" value="Y" style="color: green"></el-option>
<el-option label="不合格" value="N" style="color: red"></el-option> <el-option label="不合格" value="N" style="color: red"></el-option>
</el-select> </el-select>
@ -291,13 +291,13 @@
<el-table-column label="序号" align="center" prop="xh" width="50"></el-table-column> <el-table-column label="序号" align="center" prop="xh" width="50"></el-table-column>
<el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="抽样位置" width="150"> <el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="抽样位置" width="150">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-input v-if="tableData[row.xh-1].isSubmit=='Y'" v-model="tableData[row.xh-1].samplingLocation" readonly placeholder="请输入抽样位置"></el-input>
<el-input v-if="tableData[row.xh-1].isSubmit==='Y'" v-model="tableData[row.xh-1].samplingLocation" readonly placeholder="请输入抽样位置"></el-input>
<el-input v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].samplingLocation" placeholder="请输入抽样位置"></el-input> <el-input v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].samplingLocation" placeholder="请输入抽样位置"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值" width="200"> <el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值" width="200">
<template slot-scope="{row}"> <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" 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 v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" placeholder="请输入实测值"></el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -941,7 +941,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteObjectFile(row).then(({data}) => { deleteObjectFile(row).then(({data}) => {
if (data && data.code == 0) {
if (data && data.code === 0) {
this.getFileContentData(row); this.getFileContentData(row);
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
@ -988,7 +988,7 @@
this.searchData.limit = this.pageSize this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex this.searchData.page = this.pageIndex
qcFAIInspectionSearch(this.searchData).then(({data}) => { qcFAIInspectionSearch(this.searchData).then(({data}) => {
if (data.code == 0) {
if (data.code === 0) {
this.dataList = data.page.list this.dataList = data.page.list
this.pageIndex = data.page.currPage this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize this.pageSize = data.page.pageSize
@ -1014,7 +1014,7 @@
}, },
// //
deleteModal () { deleteModal () {
if(this.FAISelections.length == 0){
if(this.FAISelections.length === 0){
this.$alert('请勾选要删除的检验单!', '提示', { this.$alert('请勾选要删除的检验单!', '提示', {
confirmButtonText: '确定' confirmButtonText: '确定'
}) })
@ -1030,7 +1030,7 @@
submitList: this.FAISelections submitList: this.FAISelections
} }
faiRecordDelete(tempData).then(({data}) => { faiRecordDelete(tempData).then(({data}) => {
if (data && data.code == 0) {
if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.FAISelections = [] this.FAISelections = []
this.$message({ this.$message({
@ -1050,13 +1050,13 @@
}) })
}, },
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: '确定'
}) })
@ -1069,16 +1069,16 @@
// return false // 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){
if(this.detailList[i].itemResult === '' || this.detailList[i].itemResult == null){
// this.$alert(this.detailList[i].itemDesc+'', '', { // this.$alert(this.detailList[i].itemDesc+'', '', {
// confirmButtonText: '' // confirmButtonText: ''
// }) // })
// return false // return false
this.detailList[i].itemResult = 'Y' this.detailList[i].itemResult = 'Y'
} }
if(this.detailList[i].valueTypeDb == 'N') {
if(this.detailList[i].valueTypeDb === 'N') {
checkFAISubDetailValue(this.detailList[i]).then(({data}) => { checkFAISubDetailValue(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: '取消',

10
src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue

@ -26,13 +26,6 @@
</el-upload> </el-upload>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row>-->
<!-- <el-col :span="24" style="margin-bottom: 30px;">-->
<!-- <el-form-item class="customer-item" label="备注:" >-->
<!-- <el-input type="textarea" style="width: 360px;" placeholder="请输入内容" v-model="pageData.fileRemark"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="saveUploadFile()">保存</el-button> <el-button type="primary" @click="saveUploadFile()">保存</el-button>
@ -97,6 +90,7 @@ export default {
// //
this.visible = false; this.visible = false;
}, },
/*保修当前的数据*/ /*保修当前的数据*/
saveUploadFile(){ saveUploadFile(){
/*判断文件是否上传*/ /*判断文件是否上传*/
@ -125,7 +119,7 @@ export default {
}, },
created() { created() {
}
},
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

18
src/views/modules/reportWorkOrder/reportCheckOrder.vue

@ -133,11 +133,11 @@
<el-input v-model="saveData.planOperatorName" disabled style="width: 120px"></el-input> <el-input v-model="saveData.planOperatorName" disabled style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'执行日期:'"> <el-form-item :label="'执行日期:'">
<el-date-picker style="width: 150px" v-model="saveData.startDate" type="datetime"
<el-date-picker style="width: 150px" v-model="saveData.startDate" type="datetime" :editable="false" @focus='elDatePickerOnFocus'
value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期"> value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期">
</el-date-picker> </el-date-picker>
- -
<el-date-picker style="width: 150px" v-model="saveData.endDate" type="datetime"
<el-date-picker style="width: 150px" v-model="saveData.endDate" type="datetime" :editable="false" @focus='elDatePickerOnFocus'
value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="结束日期"> value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -254,7 +254,7 @@
:min-width="item.columnWidth" :min-width="item.columnWidth"
:label="item.columnLabel"> :label="item.columnLabel">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<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> <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template> </template>
</el-table-column> </el-table-column>
@ -298,7 +298,7 @@
:min-width="item.columnWidth" :min-width="item.columnWidth"
:label="item.columnLabel"> :label="item.columnLabel">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<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> <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template> </template>
</el-table-column> </el-table-column>
@ -309,8 +309,8 @@
min-width="80" min-width="80"
label="实测值"> label="实测值">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="scope.row.valueTypeDb=='T'" v-model="scope.row.textValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
<el-input v-if="scope.row.valueTypeDb=='N'" v-model="scope.row.numberValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
<el-input v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
<el-input v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" readonly style="height: 11px;padding: 0px " filterable allow-create>;width:98%"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -1331,6 +1331,12 @@
this.$refs.comEamItemImageUploadFile.init(currentData); this.$refs.comEamItemImageUploadFile.init(currentData);
}) })
}, },
//input
elDatePickerOnFocus(){
document.activeElement.blur();
},
} }
} }
</script> </script>

9
src/views/modules/reportWorkOrder/reportDefectOrder.vue

@ -142,6 +142,8 @@
value-format='yyyy-MM-dd HH:mm:ss' value-format='yyyy-MM-dd HH:mm:ss'
format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss'
placeholder="开始时间" placeholder="开始时间"
:editable="false"
@focus='elDatePickerOnFocus'
@change="handleChangeTime" @change="handleChangeTime"
> >
</el-date-picker> </el-date-picker>
@ -154,6 +156,8 @@
value-format='yyyy-MM-dd HH:mm:ss' value-format='yyyy-MM-dd HH:mm:ss'
format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss'
placeholder="结束时间" placeholder="结束时间"
:editable="false"
@focus='elDatePickerOnFocus'
@change="handleChangeTime" @change="handleChangeTime"
> >
</el-date-picker> </el-date-picker>
@ -1290,6 +1294,11 @@
}) })
this.imageModalFlag = true this.imageModalFlag = true
}, },
//input
elDatePickerOnFocus(){
document.activeElement.blur();
},
} }
} }
</script> </script>

9
src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue

@ -116,11 +116,11 @@
<el-input v-model="saveData.operatorName" style="width: 220px"></el-input> <el-input v-model="saveData.operatorName" style="width: 220px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'执行日期:'"> <el-form-item :label="'执行日期:'">
<el-date-picker style="width: 150px" v-model="saveData.startDate" type="datetime"
<el-date-picker style="width: 150px" v-model="saveData.startDate" type="datetime" :editable="false" @focus='elDatePickerOnFocus'
value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期"> value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期">
</el-date-picker> </el-date-picker>
- -
<el-date-picker style="width: 150px" v-model="saveData.endDate" type="datetime"
<el-date-picker style="width: 150px" v-model="saveData.endDate" type="datetime" :editable="false" @focus='elDatePickerOnFocus'
value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="结束日期"> value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -1481,6 +1481,11 @@
this.$refs.comEamItemImageUploadFile.init(currentData); this.$refs.comEamItemImageUploadFile.init(currentData);
}) })
}, },
//input
elDatePickerOnFocus(){
document.activeElement.blur();
},
} }
} }
</script> </script>

Loading…
Cancel
Save