|
|
@@ -9,222 +9,77 @@
|
|
|
<div class="boxDiv">
|
|
|
<!-- 任务信息 -->
|
|
|
<el-row>
|
|
|
- <p class="titleP" style="margin-top: 0;">{{$t("runCenter.form.viewSched.name")+"："}}</p>
|
|
|
+ <p style="margin-top:0;text-align:center;font-size:18px;">{{$t("runCenter.form.viewSched.name")}}
|
|
|
+ <span style="float:right;margin-right:20px;font-size:14px;">{{$t("runCenter.form.viewSched.bomNo")+"："}}{{tenant.no}}</span>
|
|
|
+ </p>
|
|
|
<table class="comtable" border="0" cellspacing="0" cellpadding="6">
|
|
|
<tr>
|
|
|
- <td class="blodTd" align="center" width="120">{{$t("runCenter.form.viewSched.procedureDesc")+"："}}</td>
|
|
|
- <td width="200">{{tenant.procedureDesc}}</td>
|
|
|
- <td class="blodTd" align="center" width="120">{{$t("runCenter.form.viewSched.content")+"："}}</td>
|
|
|
- <td width="300">{{tenant.content}}</td>
|
|
|
+ <td class="blodTd" align="center" width="120">{{$t("runCenter.form.viewSched.procedureNo")+"："}}</td>
|
|
|
+ <td width="200">{{tenant.taskNo}}</td>
|
|
|
<td class="blodTd" align="center" width="120">{{$t("runCenter.form.viewSched.status")+"："}}</td>
|
|
|
- <td width="200">
|
|
|
- <el-tag v-if="tenant.status == '1'" type="info">{{$t("runCenter.common.schedulStatus.noStart")}}</el-tag>
|
|
|
- <el-tag v-if="tenant.status == '2'" type="">{{$t("runCenter.common.schedulStatus.run")}}</el-tag>
|
|
|
- <el-tag v-if="tenant.status == '3'" type="success">{{$t("runCenter.common.schedulStatus.finished")}}</el-tag>
|
|
|
- </td>
|
|
|
+ <td width="120">
|
|
|
+ <el-tag v-if="tenant.status == 0" type="info">{{$t("runCenter.common.schedulStatus.noStart")}}</el-tag>
|
|
|
+ <el-tag v-if="tenant.status == 1" type="">{{$t("runCenter.common.schedulStatus.run")}}</el-tag>
|
|
|
+ <el-tag v-if="tenant.status == 2" type="success">{{$t("runCenter.common.schedulStatus.finished")}}</el-tag>
|
|
|
+ </td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.procedureNo")+"："}}</td>
|
|
|
- <td>{{tenant.procedureNo}}</td>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.prepareWorkHours")+"："}}</td>
|
|
|
- <td>{{tenant.prepareWorkHours}}</td>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.overtimeStatus")+"："}}</td>
|
|
|
- <td>{{tenant.overtimeStatus}}</td>
|
|
|
+ <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.procedureDesc")+"："}}</td>
|
|
|
+ <td>{{tenant.taskName}}</td>
|
|
|
+ <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.content")+"："}}</td>
|
|
|
+ <td width="200">{{tenant.content}}</td>
|
|
|
</tr>
|
|
|
+ <tr>
|
|
|
+ <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.prepareWorkHours")+"："}}</td>
|
|
|
+ <td>{{tenant.time}}分钟</td>
|
|
|
+ <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.procedurePosition")+"："}}</td>
|
|
|
+ <td>{{tenant.procedurePosition}}</td>
|
|
|
+ </tr>
|
|
|
<tr>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.bomDesc")+"："}}</td>
|
|
|
+ <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.startTime")+"："}}</td>
|
|
|
<td>{{tenant.bomDesc}}</td>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.ratedWorkHours")+"："}}</td>
|
|
|
- <td>{{tenant.ratedWorkHours}}</td>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.resourceDesc")+"："}}</td>
|
|
|
- <td>{{tenant.resourceDesc}}</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.bomNo")+"："}}</td>
|
|
|
- <td>{{tenant.bomNo}}</td>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.planTime")+"："}}</td>
|
|
|
- <td>{{tenant.planTime}}</td>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.executorName")+"："}}</td>
|
|
|
- <td>{{tenant.executorName}}</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.planNo")+"："}}</td>
|
|
|
- <td>{{tenant.planNo}}</td>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.actualTime")+"："}}</td>
|
|
|
- <td>{{tenant.actualTime}}</td>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.taskResour")+"："}}</td>
|
|
|
- <td>查看任务资源</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.orderNo")+"："}}</td>
|
|
|
- <td>{{tenant.orderNo}}</td>
|
|
|
- <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.jindu")+"："}}</td>
|
|
|
- <td><el-progress :text-inside="true" :stroke-width="24" :percentage="tenant.process"></el-progress></td>
|
|
|
- <td class="blodTd" align="center"></td>
|
|
|
- <td></td>
|
|
|
+ <td class="blodTd" align="center">{{$t("runCenter.form.viewSched.endTime")+"："}}</td>
|
|
|
+ <td>{{tenant.endTime}}</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
- </el-row>
|
|
|
-
|
|
|
- <!-- 自动化执行流程 -->
|
|
|
- <el-row>
|
|
|
- <p class="titleP">{{$t("runCenter.form.viewSched.autoLiuc")}}</p>
|
|
|
- <el-table
|
|
|
- :key="tableKey"
|
|
|
- ref="table"
|
|
|
- v-loading="loading"
|
|
|
- :data="tableData.records"
|
|
|
- border
|
|
|
- fit
|
|
|
- row-key="id"
|
|
|
- style="width: 100%;"
|
|
|
- highlight-current-row
|
|
|
- @current-change="handleCurrentChange"
|
|
|
- >
|
|
|
- <!-- 序号 -->
|
|
|
- <el-table-column :label='$t("common.serialNo")' width="55px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <div>
|
|
|
- {{scope.$index+(queryParams.current - 1) * queryParams.size + 1}}
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <!-- 权重 -->
|
|
|
- <el-table-column prop="prority" :label='$t("runCenter.table.aotoProcess.prority")' :show-overflow-tooltip="true" width="120px"></el-table-column>
|
|
|
- <!-- 设备 -->
|
|
|
- <el-table-column prop="resourceName" :label='$t("runCenter.table.aotoProcess.resourceName")' :show-overflow-tooltip="true" width="120px"></el-table-column>
|
|
|
- <!-- 动作包指令（报文） -->
|
|
|
- <el-table-column prop="code" :label='$t("runCenter.table.aotoProcess.code")' :show-overflow-tooltip="true" width="160px"></el-table-column>
|
|
|
- <!-- 执行动作 -->
|
|
|
- <el-table-column prop="instructionName" :label='$t("runCenter.table.aotoProcess.instructionName")' :show-overflow-tooltip="true"></el-table-column>
|
|
|
- <!-- 操作说明 -->
|
|
|
- <el-table-column prop="remark" :label='$t("runCenter.table.aotoProcess.remark")' :show-overflow-tooltip="true" width="180px"></el-table-column>
|
|
|
- <!-- 执行状态 -->
|
|
|
- <el-table-column prop="exeStatus" :label='$t("runCenter.table.aotoProcess.exeStatus")' width="150px">
|
|
|
- <template slot-scope="{ row }">
|
|
|
- <el-tag v-if="row.exeStatus == '1'" type="info">{{$t("runCenter.common.exeStatus.noStart")}}</el-tag>
|
|
|
- <el-tag v-if="row.exeStatus == '2'" type="">{{$t("runCenter.common.exeStatus.run")}}</el-tag>
|
|
|
- <el-tag v-if="row.exeStatus == '3'" type="success">{{$t("runCenter.common.exeStatus.finished")}}</el-tag>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <!-- 执行结果 -->
|
|
|
- <el-table-column prop="exeResult" :label='$t("runCenter.table.aotoProcess.exeResult")' width="150px">
|
|
|
- <template slot-scope="{ row }">
|
|
|
- <el-tag v-if="row.exeResult == '1'" type="success">{{$t("runCenter.common.exeResult.success")}}</el-tag>
|
|
|
- <el-tag v-if="row.exeResult == '0'">{{$t("runCenter.common.exeResult.fail")}}</el-tag>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <!-- 开始时间 -->
|
|
|
- <el-table-column prop="startTime" :label='$t("runCenter.table.aotoProcess.startTime")' width="150px"></el-table-column>
|
|
|
- <!-- 结束时间 -->
|
|
|
- <el-table-column prop="endTime" :label='$t("runCenter.table.aotoProcess.endTime")' width="150px"></el-table-column>
|
|
|
- <!-- 反馈信息 -->
|
|
|
- <el-table-column prop="feedback" :label='$t("runCenter.table.aotoProcess.feedback")' width="150px"></el-table-column>
|
|
|
- <!-- 反馈附件 -->
|
|
|
- <el-table-column prop="feedbackFile" :label='$t("runCenter.table.aotoProcess.feedbackFile")' width="150px"></el-table-column>
|
|
|
- </el-table>
|
|
|
- <!-- 【分页】组件 -->
|
|
|
- <pagination
|
|
|
- v-show="tableData.total > 0"
|
|
|
- :limit.sync="queryParams.size"
|
|
|
- :page.sync="queryParams.current"
|
|
|
- :total="Number(tableData.total)"
|
|
|
- @pagination="fetch"
|
|
|
- />
|
|
|
- </el-row>
|
|
|
- <!-- 所需原材料 -->
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <!-- 装夹物料 -->
|
|
|
<el-row>
|
|
|
- <p class="titleP">{{$t("prepare.common.meterial")}}</p>
|
|
|
+ <p class="titleP" style="margin-top:15px;color:#000;font-size:18px;" >ST1: 拆零件、装夹物料</p>
|
|
|
<!-- Table数据 -->
|
|
|
- <el-table
|
|
|
- ref="table"
|
|
|
- v-loading="loading"
|
|
|
- :data="tableData1"
|
|
|
- border
|
|
|
- fit
|
|
|
- style="width: 100%;"
|
|
|
- >
|
|
|
- <!-- 编号 -->
|
|
|
- <el-table-column prop="no" :label='$t("prepare.table.tools.no")' align="center" width="120px"></el-table-column>
|
|
|
- <!-- 名称 -->
|
|
|
- <el-table-column prop="name" :label='$t("prepare.table.tools.name")' align="center" width="150px"></el-table-column>
|
|
|
- <!-- 规格 -->
|
|
|
- <el-table-column prop="specification" :label='$t("prepare.table.tools.specification")' :show-overflow-tooltip="true" width="180px"></el-table-column>
|
|
|
- <!-- 品牌 -->
|
|
|
- <el-table-column prop="brand.data" :label='$t("prepare.table.tools.brand")' width="120px"></el-table-column>
|
|
|
- <!-- 备注 -->
|
|
|
- <el-table-column prop="remark" :label='$t("common.remark")'></el-table-column>
|
|
|
- <!-- 入产线编码 -->
|
|
|
- <el-table-column prop="uniqueCode" label='入产线编码'>
|
|
|
- <template slot-scope="{ row }">
|
|
|
- <el-input size="small" v-model="row.uniqueCode" :placeholder='$t("common.pleaseEnter")'></el-input>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- </el-row>
|
|
|
- <!-- 托盘夹具组 -->
|
|
|
- <el-row>
|
|
|
- <p class="titleP">{{$t("prepare.common.tpJgroup")}}</p>
|
|
|
- <!-- Table数据 :span-method="objectSpanMethod" -->
|
|
|
- <el-table
|
|
|
+ <el-table
|
|
|
ref="table"
|
|
|
v-loading="loading"
|
|
|
- :data="tableData2"
|
|
|
+ :data="tableData.records"
|
|
|
border
|
|
|
fit
|
|
|
- highlight-current-row
|
|
|
- @current-change="handleCurrentChange"
|
|
|
style="width: 100%;"
|
|
|
- :span-method="objectSpanMethod"
|
|
|
>
|
|
|
- <!-- 组序 -->
|
|
|
- <el-table-column prop="groupSort" :label='$t("prepare.table.toolGroup.groupSort")' align="center" width="70px"></el-table-column>
|
|
|
- <!-- 优先级 -->
|
|
|
- <el-table-column prop="groupPrority" :label='$t("prepare.table.toolGroup.groupPrority")' align="center" width="80px"></el-table-column>
|
|
|
- <!-- 类型 -->
|
|
|
- <el-table-column prop="category.data" :label='$t("prepare.table.toolGroup.category")' align="center" width="100px">
|
|
|
- <template slot-scope="{ row }">
|
|
|
- <span>{{row.category.data}}</span>
|
|
|
- <!--<el-button v-if="row.category.key == '02'" type="text" @click="editTools(row)">{{row.category.data}}</el-button>
|
|
|
- <el-button v-else type="text" @click="addRow(row)">{{row.category.data}}</el-button>-->
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <!-- 名称 -->
|
|
|
- <el-table-column prop="name" :label='$t("prepare.table.toolGroup.name")' align="center" width="120px" :show-overflow-tooltip="true"></el-table-column>
|
|
|
<!-- 编号 -->
|
|
|
- <el-table-column prop="no" :label='$t("prepare.table.toolGroup.no")' align="center" width="120px" :show-overflow-tooltip="true"></el-table-column>
|
|
|
- <!-- 规格 -->
|
|
|
- <el-table-column prop="specification" :label='$t("prepare.table.toolGroup.specification")' width="180px" :show-overflow-tooltip="true"></el-table-column>
|
|
|
- <!-- 品牌 -->
|
|
|
- <el-table-column prop="brand.data" :label='$t("prepare.table.toolGroup.brand")' width="180px"></el-table-column>
|
|
|
- <!-- 使用加紧位置 -->
|
|
|
- <el-table-column prop="positions" :label='$t("prepare.table.toolGroup.positions")' align="center" width="180px"></el-table-column>
|
|
|
- <!-- 装甲方式 -->
|
|
|
- <el-table-column prop="armorPic" :label='$t("prepare.table.toolGroup.armorPic")' align="center" width="180px">
|
|
|
- <template slot-scope="{ row }" v-if="row.category.key == '02'">
|
|
|
- <div v-if="row.jjImgList && row.jjImgList.length > 0" class="demo-image__preview">
|
|
|
- <el-image
|
|
|
- style="width: 100px; height: 60px"
|
|
|
- :src="row.jjImgList[0]"
|
|
|
- :preview-src-list="row.jjImgList">
|
|
|
- </el-image>
|
|
|
- </div>
|
|
|
- <!--<el-button v-else type="text" @click="handleClick(row)">{{$t("common.uploadImg")}}</el-button>-->
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <!-- 备注 -->
|
|
|
- <el-table-column prop="remark" :label='$t("common.remark")' width="180px"></el-table-column>
|
|
|
- <!-- 入产线编码 -->
|
|
|
- <el-table-column prop="uniqueCode" label='入产线编码' width="150px">
|
|
|
- <template slot-scope="{ row }">
|
|
|
- <el-input size="small" v-model="row.uniqueCode" :placeholder='$t("common.pleaseEnter")'></el-input>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column prop="no" :label='$t("prepare.table.tools.no")' align="center" ></el-table-column>
|
|
|
+ <!-- 编号 -->
|
|
|
+ <el-table-column prop="type" :label='$t("prepare.table.tools.type")' align="center" ></el-table-column>
|
|
|
+ <!-- 名称 -->
|
|
|
+ <el-table-column prop="name" :label='$t("prepare.table.tools.name")' align="center"></el-table-column>
|
|
|
+ <!-- 装夹方式 -->
|
|
|
+ <el-table-column prop="clampImg" :label='$t("prepare.table.tools.clampImg")' align="center">
|
|
|
+ <template slot-scope="{ row }">
|
|
|
+ <div class="block">
|
|
|
+ <el-image
|
|
|
+ style="width: 60px; height: 60px"
|
|
|
+ :src="row.clampImg"
|
|
|
+ fit="fill"></el-image>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <!-- 备注 -->
|
|
|
+ <el-table-column prop="remark" :label='$t("prepare.table.tools.name")' align="center"></el-table-column>
|
|
|
+
|
|
|
</el-table>
|
|
|
</el-row>
|
|
|
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
- <el-button plain type="info" @click="isVisible = false">{{ $t('machining.buttons.noFinished') }}</el-button>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" :disabled="confirmDisabled" @click="submitForm">{{ $t('machining.buttons.finished') }}</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -295,6 +150,7 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
submitForm(){
|
|
|
+ /*
|
|
|
let obj ={
|
|
|
taskNode: this.tenant,
|
|
|
meterialList: this.tableData1,
|
|
|
@@ -316,7 +172,8 @@ export default {
|
|
|
}).finally(() => {
|
|
|
this.confirmDisabled = false
|
|
|
return true
|
|
|
- })
|
|
|
+ }) */
|
|
|
+ this.isVisible = false;
|
|
|
},
|
|
|
// table的当前行值变化后
|
|
|
handleCurrentChange(val) {
|
|
|
@@ -347,7 +204,7 @@ export default {
|
|
|
},
|
|
|
fetch (params = {}) {
|
|
|
this.loading = true
|
|
|
- /*// 日期区间-参数
|
|
|
+ // 日期区间-参数
|
|
|
if (this.queryParams.timeRange) {
|
|
|
this.queryParams.map.createTime_st = this.queryParams.timeRange[0]
|
|
|
this.queryParams.map.createTime_ed = this.queryParams.timeRange[1]
|
|
|
@@ -357,14 +214,16 @@ export default {
|
|
|
this.queryParams.size = params.size ? params.size : this.queryParams.size
|
|
|
// 条件-参数*/
|
|
|
console.log("列表的row数据：", this.tenant)
|
|
|
+ /*
|
|
|
automatedProcessesApi.taskAutoNodeList({taskId: this.tenant.taskId, procedureId: this.tenant.procedureId, orderId: this.tenant.orderId}).then(response => {
|
|
|
const res = response.data
|
|
|
if (res.isSuccess) {
|
|
|
this.tableData.records = res.data
|
|
|
}
|
|
|
// eslint-disable-next-line no-return-assign
|
|
|
- }).finally(() => this.loading = false)
|
|
|
-
|
|
|
+ }).finally(() => this.loading = false) */
|
|
|
+ this.tableData.records = [{'no':'龙威夹','type':'&230','name':'龙威','clampImg':require(`@/assets/yunMap/clampImg.png`),'remark':'备注'}];
|
|
|
+ this.loading = false;
|
|
|
},
|
|
|
//获得数据相同的行数
|
|
|
rowspanFiled(data, filed) {
|
|
|
@@ -425,6 +284,7 @@ export default {
|
|
|
},
|
|
|
// 根据【工艺id】查询详情信息
|
|
|
getDetail(obj){
|
|
|
+ /*
|
|
|
machiningClientApi.getTaskNodeProcessAnalysis(obj).then(res => {
|
|
|
res = res.data
|
|
|
if(res.isSuccess){
|
|
|
@@ -442,7 +302,7 @@ export default {
|
|
|
this.spanArr2 = this.rowspanFiled(this.tableData2, "groupPrority")
|
|
|
}
|
|
|
}
|
|
|
- })
|
|
|
+ }) */
|
|
|
},
|
|
|
// 赋值前处理-添加key数据健
|
|
|
setKeyList(list, flag){
|
