|
|
@@ -10,8 +10,8 @@
|
|
|
<!-- <el-button type="primary" @click="onstatus" >设置机台状态</el-button> -->
|
|
|
<el-button type="primary" @click="oncomplaints" >客诉记录</el-button>
|
|
|
<el-button type="primary" @click="onClear" >换型清场</el-button>
|
|
|
- <el-button type="primary" @click="onDel">删除</el-button>
|
|
|
- <el-button type="primary" @click="onADD">新增</el-button>
|
|
|
+ <el-button type="primary" @click="onDel" v-if="DelType === true" >删除</el-button>
|
|
|
+ <el-button type="primary" @click="onADD" v-if="AddType === true">新增</el-button>
|
|
|
<!-- <el-button type="primary" @click="onClear2" >换型清场</el-button> -->
|
|
|
</header>
|
|
|
<el-container>
|
|
|
@@ -19,7 +19,7 @@
|
|
|
<div class="JKWTree-tree">
|
|
|
|
|
|
<h3 >设备运行跟踪</h3>
|
|
|
- <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
|
|
|
+ <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick" ></el-tree>
|
|
|
</div>
|
|
|
|
|
|
</el-aside>
|
|
|
@@ -891,61 +891,7 @@
|
|
|
<div v-if="zhichengstatus" style="flex: 0; margin: 0;">
|
|
|
<el-tabs v-model="activNames" type="card" @tab-click="handleClick">
|
|
|
<el-tab-pane label="指标检验" @click="showTable('指标检验')" name="first">
|
|
|
- <el-table
|
|
|
- tooltip-effect="dark"
|
|
|
- :data="zhibiaoselectData"
|
|
|
- row-key="ID"
|
|
|
- highlight-current-row="true"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- border @row-click="dianjianhandle"
|
|
|
- style="width:100%; height:310px;"
|
|
|
- @row-dblclick="handleSelectClick"
|
|
|
- :row-class-name="rowClassName"
|
|
|
- >
|
|
|
- <el-table-column
|
|
|
- prop="检验项目"
|
|
|
- label="检验项目"
|
|
|
- width="270"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- v-slot="scope"
|
|
|
- label="不检测"
|
|
|
- width="70"
|
|
|
- >
|
|
|
- <el-checkbox v-model="scope.row.notjc" @click="notjcClick(scope.row)"></el-checkbox>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- v-slot="scope"
|
|
|
- label="合格"
|
|
|
- width="60"
|
|
|
- >
|
|
|
-
|
|
|
- <el-checkbox v-model="scope.row.zc" @click="zcClick(scope.row)"></el-checkbox>
|
|
|
-
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- v-slot="scope"
|
|
|
- label="不合格"
|
|
|
- width="70"
|
|
|
- >
|
|
|
- <el-checkbox v-model="scope.row.yc" @click="ycClick(scope.row)"></el-checkbox>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="检测方法"
|
|
|
- label="检测方法"
|
|
|
- width="90"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- prop="检验频率"
|
|
|
- label="检验频率"
|
|
|
- width="150"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- prop="相关标准"
|
|
|
- label="相关标准"
|
|
|
- width="180"
|
|
|
- />
|
|
|
- </el-table>
|
|
|
+ <el-table
tooltip-effect="dark"
:data="zhibiaoselectData"
row-key="ID"
highlight-current-row="true"
:show-overflow-tooltip="true"
border
style="width:100%; height:310px;"
:row-class-name="rowClassName"
>
<el-table-column prop="检验项目" label="检验项目" width="270" />
<el-table-column label="不检测" width="70">
<template v-slot="scope">
<el-radio v-model="scope.row.selected" label="不检测">
<span style="visibility: hidden;">不检测</span>
</el-radio>
</template>
</el-table-column>
<el-table-column label="合格" width="60">
<template v-slot="scope">
<el-radio v-model="scope.row.selected" label="合格">
<span style="visibility: hidden;">合格</span>
</el-radio>
</template>
</el-table-column>
<el-table-column label="不合格" width="70">
<template v-slot="scope">
<el-radio v-model="scope.row.selected" label="不合格">
<span style="visibility: hidden;">不合格</span>
</el-radio>
</template>
</el-table-column>
<el-table-column prop="检测方法" label="检测方法" width="90" />
<el-table-column prop="检验频率" label="检验频率" width="150" />
<el-table-column prop="相关标准" label="相关标准" width="180" />
</el-table>
|
|
|
</el-tab-pane>
|
|
|
|
|
|
<el-tab-pane label="附加检验记录" @click="showTable('附加检验记录')" name="second">
|
|
|
@@ -1170,6 +1116,7 @@
|
|
|
destroy-on-close
|
|
|
width="145vh"
|
|
|
style="height: 78vh;"
|
|
|
+ :before-close="closehuanxingVisible"
|
|
|
>
|
|
|
<div style="display: flex;">
|
|
|
<div style="flex: 0.1;">
|
|
|
@@ -1759,7 +1706,7 @@
|
|
|
<el-input v-model="formdata3.value.组员10['编号']" id="bh10" @keydown="ent($event, 'bh9', 'bh10', 'bh11')" @keyup.enter.native="GetYg($event, '10')" placeholder="" />
|
|
|
</el-col>
|
|
|
<el-col :span="2">
|
|
|
- <el-input v-model="formdata3.value.拉料['编号']" @keydown="ent($event, 'bh10', 'bh11', 'name1')" @keyup.enter.native="GetYg($event, '11')" placeholder="" />
|
|
|
+ <el-input v-model="formdata3.value.拉料['编号']" id="bh11" @keydown="ent($event, 'bh10', 'bh11', 'rate1')" @keyup.enter.native="GetYg($event, '11')" placeholder="" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -1809,7 +1756,7 @@
|
|
|
|
|
|
</el-col>
|
|
|
<el-col :span="2">
|
|
|
- <el-input v-model="formdata3.value.组员1['比例']" id="rate1" @keydown="ent($event, 'name11', 'rate1', 'rate2')" placeholder="" />
|
|
|
+ <el-input v-model="formdata3.value.组员1['比例']" id="rate1" @keydown="ent($event, 'bh11', 'rate1', 'rate2')" placeholder="" />
|
|
|
</el-col>
|
|
|
<el-col :span="2">
|
|
|
<el-input v-model="formdata3.value.组员2['比例']" id="rate2" @keydown="ent($event, 'rate1', 'rate2', 'rate3')" placeholder="" />
|
|
|
@@ -1928,7 +1875,8 @@ import {
|
|
|
ChanliangWorkorder,
|
|
|
ChanliangPrintDetail,
|
|
|
ChanliangProcessDetail,
|
|
|
- EmployeeData
|
|
|
+ EmployeeData,
|
|
|
+ RemodelDetail
|
|
|
} from '@/api/jixiaoguanli/jitairibaobiao'
|
|
|
|
|
|
import {
|
|
|
@@ -1944,6 +1892,9 @@ import { ref, reactive } from 'vue'
|
|
|
defineOptions({
|
|
|
name: 'Company'
|
|
|
})
|
|
|
+
|
|
|
+const DelType = ref(false)
|
|
|
+const AddType = ref(false)
|
|
|
const gytableData = ref([])
|
|
|
const drzcDatas =ref([])
|
|
|
const detailData = reactive([])
|
|
|
@@ -1972,6 +1923,8 @@ const handleNodeClick = (nodeData,node) => {
|
|
|
JTMCOn.value=false
|
|
|
dateOn.value=false
|
|
|
MachinelList()
|
|
|
+ DelType.value = false
|
|
|
+ AddType.value = false
|
|
|
// MachineVisible.value=true
|
|
|
} else if (nodeData.level === 2) {
|
|
|
console.log(node.label); // 第二级节点
|
|
|
@@ -1984,6 +1937,8 @@ const handleNodeClick = (nodeData,node) => {
|
|
|
// FacilityTeam(JTMC)
|
|
|
// console.log('123')
|
|
|
// console.log(JTMC)
|
|
|
+ DelType.value = false
|
|
|
+ AddType.value = false
|
|
|
} else if (nodeData.level === 3) {
|
|
|
JTMC=nodeData.machineName.split("-")[0]
|
|
|
JTMCOn.value=false
|
|
|
@@ -1996,7 +1951,8 @@ const handleNodeClick = (nodeData,node) => {
|
|
|
showbutton.value=false
|
|
|
FacilityInspect()
|
|
|
FacilitychanLiang()
|
|
|
-
|
|
|
+ DelType.value = true
|
|
|
+ AddType.value = true
|
|
|
// FacilityTeam(JTMC)
|
|
|
// InspectionRecord()
|
|
|
// FacilityDetail()
|
|
|
@@ -2362,7 +2318,7 @@ const Chanliangdel = async() => {
|
|
|
FacilitychanLiang()
|
|
|
}else{
|
|
|
ElMessage({
|
|
|
- type: 'success',
|
|
|
+ type: 'error',
|
|
|
message: '失败'
|
|
|
})
|
|
|
}
|
|
|
@@ -2418,7 +2374,8 @@ const processInspectionRecordsItem = async (value) => {
|
|
|
item.yjno=xunchaData.value.yjno
|
|
|
item.flow=xunchaData.value.lcdh
|
|
|
item.team=BZMC.value
|
|
|
- item.machine=JTMC.split("#")[0]
|
|
|
+ item.machine=JTMC.split("#")[0]
|
|
|
+ item.selected = '不检测';
|
|
|
return item
|
|
|
})
|
|
|
fujiaselectData.value=response.data.首件.附加.map(item=>{
|
|
|
@@ -2537,6 +2494,11 @@ const RemodelGetTab = async() => {
|
|
|
}
|
|
|
}
|
|
|
huanxingtreeData.value=arr
|
|
|
+ }else{
|
|
|
+ ElMessage({
|
|
|
+ type: 'error',
|
|
|
+ message: '请注意, 工单编号输入空置, 除非有特殊需要！'
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -2552,6 +2514,7 @@ const huanxingNodeClick = (node) => {
|
|
|
console.log('2')
|
|
|
}
|
|
|
}
|
|
|
+const huanxingData = ref({})
|
|
|
const remodelDetail = async (val) => {
|
|
|
const response = await RemodelDetail({UniqId:val});
|
|
|
if (response.code === 0) {
|
|
|
@@ -2581,6 +2544,11 @@ const remodelDetail = async (val) => {
|
|
|
}else{
|
|
|
huanxingData.value.项目5=false
|
|
|
}
|
|
|
+ }else{
|
|
|
+ ElMessage({
|
|
|
+ type: 'error',
|
|
|
+ message: '请注意, 工单编号输入空置, 除非有特殊需要！'
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
const modelChangeRecord = async (val) => {
|
|
|
@@ -2757,40 +2725,52 @@ const dianjianhandle = (val, row) => {
|
|
|
}
|
|
|
};
|
|
|
const notjcClick = (val) => {
|
|
|
- try {
|
|
|
- if(val.notjc==false){
|
|
|
- val.zc=true
|
|
|
- }else{
|
|
|
- val.zc=false
|
|
|
- val.yc==false
|
|
|
- }
|
|
|
- } catch (error) {
|
|
|
- console.error('An error occurred:', error);
|
|
|
- }
|
|
|
+ console.log("不检测")
|
|
|
+ val.notjc==true
|
|
|
+ val.zc=false
|
|
|
+ val.yc==false
|
|
|
+ // try {
|
|
|
+ // if(val.notjc==false){
|
|
|
+ // val.zc=true
|
|
|
+ // }else{
|
|
|
+ // val.zc=false
|
|
|
+ // val.yc==false
|
|
|
+ // }
|
|
|
+ // } catch (error) {
|
|
|
+ // console.error('An error occurred:', error);
|
|
|
+ // }
|
|
|
};
|
|
|
const zcClick = (val) => {
|
|
|
- try {
|
|
|
- if(val.zc==false){
|
|
|
- val.zc=true
|
|
|
- }else{
|
|
|
- val.zc=false
|
|
|
- val.yc==false
|
|
|
- }
|
|
|
- } catch (error) {
|
|
|
- console.error('An error occurred:', error);
|
|
|
- }
|
|
|
+ console.log("合格")
|
|
|
+ val.notjc==false
|
|
|
+ val.zc=true
|
|
|
+ val.yc==false
|
|
|
+ // try {
|
|
|
+ // if(val.zc==false){
|
|
|
+ // val.zc=true
|
|
|
+ // }else{
|
|
|
+ // val.zc=false
|
|
|
+ // val.yc==false
|
|
|
+ // }
|
|
|
+ // } catch (error) {
|
|
|
+ // console.error('An error occurred:', error);
|
|
|
+ // }
|
|
|
};
|
|
|
const ycClick = (val) => {
|
|
|
- try {
|
|
|
- if(val.yc==false){
|
|
|
- val.zc=true
|
|
|
- }else{
|
|
|
- val.zc=false
|
|
|
- val.notjc==false
|
|
|
- }
|
|
|
- } catch (error) {
|
|
|
- console.error('An error occurred:', error);
|
|
|
- }
|
|
|
+ console.log("不合格")
|
|
|
+ val.notjc==false
|
|
|
+ val.zc=false
|
|
|
+ val.yc==true
|
|
|
+ // try {
|
|
|
+ // if(val.yc==false){
|
|
|
+ // val.zc=true
|
|
|
+ // }else{
|
|
|
+ // val.zc=false
|
|
|
+ // val.notjc==false
|
|
|
+ // }
|
|
|
+ // } catch (error) {
|
|
|
+ // console.error('An error occurred:', error);
|
|
|
+ // }
|
|
|
};
|
|
|
|
|
|
const rowClassName = (row, column) => {
|
|
|
@@ -3449,16 +3429,26 @@ const MachineChanliang = async(value) => {
|
|
|
const currentIndex = Array.from(inputs).indexOf(event.target);
|
|
|
|
|
|
if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
|
|
|
- for (let i = currentIndex + 1; i < inputs.length; i++) {
|
|
|
- if (!inputs[i].readOnly) {
|
|
|
- nextTick(()=>{
|
|
|
- inputs[i].focus();
|
|
|
- inputs[i].select();
|
|
|
- })
|
|
|
- break;
|
|
|
+ let nextIndex = currentIndex + 1;
|
|
|
+ while (nextIndex < inputs.length) {
|
|
|
+ if (inputs[nextIndex].disabled) {
|
|
|
+ console.log("当前输入框为disabled，跳过");
|
|
|
+ nextIndex++; // 跳过disabled的输入框
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!inputs[nextIndex].readOnly) {
|
|
|
+ nextTick(() => {
|
|
|
+ inputs[nextIndex].focus();
|
|
|
+ inputs[nextIndex].select();
|
|
|
+ });
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ nextIndex++;
|
|
|
}
|
|
|
- }
|
|
|
- } else if (event.keyCode === 38) { // 向上箭头
|
|
|
+ }
|
|
|
+ else if (event.keyCode === 38) { // 向上箭头
|
|
|
for (let i = currentIndex - 1; i >= 0; i--) {
|
|
|
if (!inputs[i].readOnly) {
|
|
|
nextTick(()=>{
|
|
|
@@ -3610,7 +3600,30 @@ const deleteCompanyFunc = async (row) => {
|
|
|
getTableData()
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+//键盘 input框跳转
|
|
|
+const ent = (event,id1,id2,id3) => {
|
|
|
+ if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
|
|
|
+ if(id3!=''){
|
|
|
+ document.getElementById(id3).focus()
|
|
|
+ }
|
|
|
+ } else if (event.keyCode === 38) { // 向上箭头
|
|
|
+ if(id1!=''){
|
|
|
+ document.getElementById(id1).focus()
|
|
|
+ }
|
|
|
+ }else if (event.keyCode === 8) { // 删除箭头
|
|
|
+ if(id1!='' && document.getElementById(id2).value===''){
|
|
|
+ document.getElementById(id1).focus()
|
|
|
+ }
|
|
|
+ }else if (event.keyCode === 37) { // 向左箭头
|
|
|
+ if(id1!='' && document.getElementById(id2).selectionStart==0){
|
|
|
+ document.getElementById(id1).focus()
|
|
|
+ }
|
|
|
+ }else if (event.keyCode === 39) { // 向右箭头
|
|
|
+ if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
|
|
|
+ document.getElementById(id3).focus()
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
// 弹窗控制标记
|
|
|
const dialogFormVisible = ref(false)
|
|
|
const dianjianVisible = ref(false)
|
