|
|
@@ -946,13 +946,153 @@
|
|
|
</div>
|
|
|
<div v-if="huanxingstatus" style="flex: 0; margin: 0;">
|
|
|
<el-tabs v-model="activNames" type="card" @tab-click="handleClick">
|
|
|
- <el-tab-pane label="换型清场明细信息" @click="showTable('换型清场明细信息')" name="first">
|
|
|
- <tr>
|
|
|
- <td>1</td>
|
|
|
- <td>2</td>
|
|
|
- <td>3</td>
|
|
|
- <td>4</td>
|
|
|
- </tr>
|
|
|
+ <el-tab-pane label="换型清场明细信息" @click="showTable('换型清场明细信息')" name="first">
|
|
|
+ <div style="width:110vh">
|
|
|
+ <el-descriptions :column="9" border>
|
|
|
+ <el-descriptions-item :span="9">
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="日期:" prop="id" style="margin-top=0px; margin-bottom: 0px;">
|
|
|
+ <el-input v-model="huanxingData.日期" :clearable="true" placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="2" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="机台编号:" prop="id" style="margin-top=0px; margin-bottom: 0px;">
|
|
|
+ <el-input v-model="huanxingData.机台编号" :clearable="true" placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="班组:" prop="id" style="margin-top=0px; margin-bottom: 0px;">
|
|
|
+ <el-input v-model="huanxingData.班组" :clearable="true" placeholder="" style="margin-top=0px; margin-bottom: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="清场原因 从" :span="9">
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-col :span="8" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="工单编号:" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.工单编号A" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="16" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="印件名称:" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.印件名称A" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-col :span="12" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="印件工序:" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.印件工序A" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="码包号" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.码包号A" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="清场原因 到" :span="9">
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-col :span="8" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="工单编号:" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.工单编号B" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="16" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="印件名称:" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.印件名称B" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-col :span="12" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="印件工序:" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.印件工序B" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="码包号" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.码包B" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="清场确认项目" :span="9">
|
|
|
+
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-col :span="12" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="菲林_标样_签样品_留样品" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-checkbox v-model="huanxingData.项目1"></el-checkbox>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="版材_纸张_电化铝_油墨" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-checkbox v-model="huanxingData.项目2"></el-checkbox>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-col :span="12" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="过版纸_废品_次品" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-checkbox v-model="huanxingData.项目3"></el-checkbox>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="半成品_成品_零头" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-checkbox v-model="huanxingData.项目4"></el-checkbox>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-col :span="12" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="操作台桌面_抽屉_地面" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-checkbox v-model="huanxingData.项目5"></el-checkbox>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="清场确认人" :span="9">
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-col :span="12" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="机长签字" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.机长" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-col :span="12" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="带班主管签字" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.班长" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-form-item label="质量巡查员签字" prop="id" style="margin-bottom: 0px;margin-top: 0px;">
|
|
|
+ <el-input v-model="huanxingData.质量巡查员" :clearable="true" placeholder="" style="margin-bottom: 0px;margin-top: 0px;"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-descriptions-item>
|
|
|
+ </el-descriptions>
|
|
|
+ </div>
|
|
|
+
|
|
|
</el-tab-pane>
|
|
|
|
|
|
<el-tab-pane label="当前设备换型记录" @click="showTable('当前设备换型记录')" name="second">
|
|
|
@@ -1879,6 +2019,31 @@ const remodelDetail = async (val) => {
|
|
|
const response = await RemodelDetail({UniqId:val});
|
|
|
if (response.code === 0) {
|
|
|
huanxingData.value=response.data
|
|
|
+ if(response.data.项目1==1){
|
|
|
+ huanxingData.value.项目1=true
|
|
|
+ }else{
|
|
|
+ huanxingData.value.项目1=false
|
|
|
+ }
|
|
|
+ if(response.data.项目2==1){
|
|
|
+ huanxingData.value.项目2=true
|
|
|
+ }else{
|
|
|
+ huanxingData.value.项目2=false
|
|
|
+ }
|
|
|
+ if(response.data.项目3==1){
|
|
|
+ huanxingData.value.项目3=true
|
|
|
+ }else{
|
|
|
+ huanxingData.value.项目3=false
|
|
|
+ }
|
|
|
+ if(response.data.项目4==1){
|
|
|
+ huanxingData.value.项目4=true
|
|
|
+ }else{
|
|
|
+ huanxingData.value.项目4=false
|
|
|
+ }
|
|
|
+ if(response.data.项目5==1){
|
|
|
+ huanxingData.value.项目5=true
|
|
|
+ }else{
|
|
|
+ huanxingData.value.项目5=false
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
const handleNodeClick = (nodeData,node) => {
|
|
|
@@ -2566,7 +2731,11 @@ const GetMachineMac = async () => {
|
|
|
xmlhttp.open("get", "http://127.0.0.1:8090/init")
|
|
|
// 5. 发送
|
|
|
xmlhttp.send();
|
|
|
- const response = await getMachineMac({ addr: '68-ED-A4-26-5F-8E' });
|
|
|
+ // const response = await getMachineMac({ addr: '68-ED-A4-26-5D-5E' });
|
|
|
+ // const response = await getMachineMac({ addr: '68-ED-A4-26-5D-90' });
|
|
|
+ // const response = await getMachineMac({ addr: '68-ED-A4-26-5E-50' });
|
|
|
+ const response = await getMachineMac({ addr: '68-ED-A4-26-60-CC' });
|
|
|
+ // const response = await getMachineMac({ addr: '68-ED-A4-26-5F-8E' });
|
|
|
// const response = await getMachineMac({ addr: '68-ED-A4-26-60-C8' });
|
|
|
// const response = await getMachineMac({ addr: '40-62-31-21-4E-15' });
|
|
|
// const response = await getMachineMac({ addr: '68-ED-A4-26-5F-42' });
|
|
|
@@ -3312,6 +3481,16 @@ const updateCompanyFunc = async(row) => {
|
|
|
}
|
|
|
|
|
|
const yjupdateCompanyFunc = async(row) => {
|
|
|
+ ElMessageBox.confirm('确定切换当前工单为工作工单吗?', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ setMachineTeams(row)
|
|
|
+ })
|
|
|
+}
|
|
|
+
|
|
|
+const setMachineTeams = async(row) => {
|
|
|
const res = await setMachineTeam({
|
|
|
machine: JTMC.split("#")[0],
|
|
|
order:row['工单编号|质量信息'].split('|')[0],
|
