Merge branch 'master' of http://123.56.95.229:10010/r/高精
This commit is contained in:
liushuai
@@ -443,24 +443,24 @@ export default {
|
||||
this.checkbox_number = 1
|
||||
}
|
||||
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
|
||||
if (response.data.rows.length !== 0) {
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
if (response.data.result.length !== 0) {
|
||||
for (let i = 0; i < response.data.result.length; i++) {
|
||||
this.tableData.push({
|
||||
工艺计划流水号: response.data.rows[i].工艺计划流水号,
|
||||
考核状态: response.data.rows[i].考核状态,
|
||||
序号: response.data.rows[i].序号,
|
||||
跟单号: response.data.rows[i].跟单号,
|
||||
零件图号: response.data.rows[i].零件图号,
|
||||
零件名称: response.data.rows[i].零件名称,
|
||||
加工数: response.data.rows[i].完成数量, // MES里采集 现在没有
|
||||
投产数量: response.data.rows[i].批次数量,
|
||||
完成日期: response.data.rows[i].机加工实际完成时间 ? response.data.rows[i].机加工实际完成时间.split(' ')[0] : '', // 排产时间
|
||||
计划结束时间: response.data.rows[i].机加工结束时间 ? response.data.rows[i].机加工结束时间.split(' ')[0] : '',
|
||||
客户名称: response.data.rows[i].客户名称 // 客户名
|
||||
工艺计划流水号: response.data.result[i].工艺计划流水号,
|
||||
考核状态: response.data.result[i].考核状态,
|
||||
序号: response.data.result[i].序号,
|
||||
跟单号: response.data.result[i].跟单号,
|
||||
零件图号: response.data.result[i].零件图号,
|
||||
零件名称: response.data.result[i].零件名称,
|
||||
加工数: response.data.result[i].完成数量, // MES里采集 现在没有
|
||||
投产数量: response.data.result[i].批次数量,
|
||||
完成日期: response.data.result[i].机加工实际完成时间 ? response.data.result[i].机加工实际完成时间.split(' ')[0] : '', // 排产时间
|
||||
计划结束时间: response.data.result[i].机加工结束时间 ? response.data.result[i].机加工结束时间.split(' ')[0] : '',
|
||||
客户名称: response.data.result[i].客户名称 // 客户名
|
||||
})
|
||||
}
|
||||
}
|
||||
this.total = response.data.total
|
||||
this.total = parseInt(response.data.output[0].ItemCount)
|
||||
this.loading0 = false
|
||||
}).catch(() => {
|
||||
this.loading0 = false
|
||||
|
||||
@@ -39,10 +39,9 @@
|
||||
{{ scope.row.投产数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="工序状态" show-overflow-tooltip min-width="90">
|
||||
<el-table-column align="center" label="完成日期" show-overflow-tooltip min-width="90">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.工序状态 >= 4">已完成</span>
|
||||
<span v-else>未完成</span>
|
||||
{{ scope.row.完成日期 ? scope.row.完成日期.split(' ')[0] : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
@@ -732,11 +732,9 @@ export default {
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
this.multipleSelection = val
|
||||
console.log(this.multipleSelection, 1111)
|
||||
},
|
||||
handleEditNumber(index, row) {
|
||||
this.dialogFormVisible3 = true
|
||||
console.log(row, 123)
|
||||
this.NumberValue = row.组件零件基本件流水号
|
||||
this.form3.投产数量 = row.投产总数量
|
||||
this.AlreadyCastNumber = row.已投产数量 ? parseInt(row.已投产数量) : 0
|
||||
|
||||
@@ -39,11 +39,6 @@
|
||||
{{ scope.row.工艺名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!--<el-table-column align="center" label="已完数量" show-overflow-tooltip min-width="70">-->
|
||||
<!--<template slot-scope="scope">-->
|
||||
<!--{{ scope.row.完成数量 }}-->
|
||||
<!--</template>-->
|
||||
<!--</el-table-column>-->
|
||||
<el-table-column align="center" label="投产数" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.批次数量 }}
|
||||
@@ -56,7 +51,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作者" show-overflow-tooltip width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.操作者 }}
|
||||
{{ scope.row.工序间是否外协 === 1 ? (scope.row.操作者 === '超级管理员' ? '系统' : scope.row.操作者) : '外协' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="扫码开始" width="95">
|
||||
@@ -571,7 +566,8 @@ export default {
|
||||
工序流水号: response.data[i].工序流水号,
|
||||
完成过程流水号: response.data[i].完成过程流水号,
|
||||
工序状态: response.data[i].工序状态,
|
||||
完成数量: response.data[i].完成数量
|
||||
完成数量: response.data[i].完成数量,
|
||||
工序间是否外协: response.data[i].工序间是否外协
|
||||
})
|
||||
}
|
||||
this.loading2 = false
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3>
|
||||
<el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
|
||||
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
|
||||
<el-button size="small" style="margin: 0px 0px 3px 300px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">编辑</el-button>
|
||||
<el-button size="small" style="margin: 0px 0px 3px 300px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">保存</el-button>
|
||||
</el-row>
|
||||
<el-row v-if="false">
|
||||
<h3 style="display: inline-block;margin: 0">签订日期:</h3>
|
||||
@@ -32,292 +32,297 @@
|
||||
<el-date-picker v-model="time_deliveryFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
<el-card style="overflow: auto">
|
||||
<el-row>
|
||||
<el-col style="width: 1400px;">
|
||||
<!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
|
||||
<el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
|
||||
<el-table-column label="项目编号" align="center" width="140px" fixed="left">
|
||||
<el-card>
|
||||
<!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
|
||||
<el-table v-loading="loading" :data="tableData" height="320" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
|
||||
<el-table-column label="项目编号" align="center" width="170px" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.项目编号" size="mini"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.项目编号 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="项目名称" align="center" min-width="120px" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" width="140px" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床名称" align="center" width="280px" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床数量" align="center" width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="签订日期" align="center" width="125px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交货期" align="center" width="125px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设备预验节点" align="center" width="125px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="安装调试节点" align="center" width="125px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="false" label="操作" width="150px" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
|
||||
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
|
||||
<el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin-top: 15px;">
|
||||
<el-pagination
|
||||
v-if="!loading"
|
||||
:current-page="pageCurrent"
|
||||
:page-sizes="[10, 20, 30, 40, 100]"
|
||||
:page-size="pageSize"
|
||||
:total="total"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
|
||||
<el-col style="width: 290px;margin-left: 10px">
|
||||
<el-card>
|
||||
<el-form label-position="left" label-width="90px" class="demo-ruleForm1">
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<!--<el-radio v-model="radio" label="1">{{ empty }}</el-radio>-->
|
||||
</el-col>
|
||||
<el-col style="width: 180px;margin-left: 20px">
|
||||
<el-form-item label="设计者" prop="设计者" >
|
||||
<el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 150px"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<!--<el-radio v-model="radio" label="2">{{ empty }}</el-radio>-->
|
||||
</el-col>
|
||||
<el-col style="width: 180px;margin-left: 20px">
|
||||
<el-form-item label="审图开始" prop="审图开始">
|
||||
<el-date-picker v-model="审图开始" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图开始" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<!--<el-radio v-model="radio" label="3">{{ empty }}</el-radio>-->
|
||||
</el-col>
|
||||
<el-col style="width: 180px;margin-left: 20px">
|
||||
<el-form-item label="审图结束" prop="审图结束">
|
||||
<el-date-picker v-model="审图结束" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图结束" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<el-radio v-model="radio" label="1">{{ empty }}</el-radio>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<el-form-item label="发图完成" prop="发图完成">
|
||||
<el-date-picker v-model="发图完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="发图完成" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<el-radio v-model="radio" label="2">{{ empty }}</el-radio>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<el-form-item label="采购完成" prop="采购完成">
|
||||
<el-date-picker v-model="采购完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="采购完成" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<el-radio v-model="radio" label="3">{{ empty }}</el-radio>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<el-form-item label="备料完成" prop="备料完成">
|
||||
<el-date-picker v-model="备料完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="备料完成" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<el-radio v-model="radio" label="4">{{ empty }}</el-radio>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<el-form-item label="制造完成" prop="制造完成">
|
||||
<el-date-picker v-model="制造完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="制造完成" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<el-radio v-model="radio" label="5">{{ empty }}</el-radio>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<el-form-item label="装配完成" prop="装配完成">
|
||||
<el-date-picker v-model="装配完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="装配完成" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<!--<el-radio v-model="radio" label="9">{{ empty }}</el-radio>-->
|
||||
</el-col>
|
||||
<el-col style="width: 180px;margin-left: 20px">
|
||||
<el-form-item label="更新时间" prop="更新时间">
|
||||
<el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 150px"/>
|
||||
<!--<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>-->
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-card>
|
||||
<h2 v-if="radio==='1'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 发图</h2>
|
||||
<h2 v-if="radio==='2'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 采购</h2>
|
||||
<h2 v-if="radio==='3'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 备料</h2>
|
||||
<h2 v-if="radio==='4'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 制造</h2>
|
||||
<h2 v-if="radio==='5'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 装配</h2>
|
||||
<el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 7px 0 0 0" plain @click="addTable()">增加</el-button>
|
||||
<el-table v-loading="loading2" :data="tableData2" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
|
||||
<el-table-column min-width="100px" label="组号" align="center">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.项目编号" size="mini"/>
|
||||
<el-select v-model="scope.row.组件流水号" filterable clearable size="small" style="width: 100px" @change="groupChange(scope.row, scope.$index)">
|
||||
<el-option
|
||||
v-for="item in groupNum"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.项目编号 }}
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="项目名称" align="center" min-width="120px" fixed="left">
|
||||
<el-table-column min-width="200px" label="任务名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.任务名称" size="mini" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.任务名称 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" width="140px" fixed="left">
|
||||
<el-table-column min-width="100px" label="负责人" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.负责人" size="mini" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.负责人 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床名称" align="center" width="280px" fixed="left">
|
||||
<el-table-column label="接收任务时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床名称 }}
|
||||
<template v-if="scope.row.edit">
|
||||
<el-date-picker v-model="scope.row.接收任务时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.接收任务时间 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床数量" align="center" width="100px">
|
||||
<el-table-column label="任务开始时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床数量 }}
|
||||
<template v-if="scope.row.edit">
|
||||
<el-date-picker v-model="scope.row.任务开始时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.任务开始时间 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="签订日期" align="center" width="125px">
|
||||
<el-table-column label="计划完成时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
|
||||
<template v-if="scope.row.edit">
|
||||
<el-date-picker v-model="scope.row.计划完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.计划完成时间 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交货期" align="center" width="125px">
|
||||
<el-table-column min-width="100px" label="货期" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.货期" size="mini" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.货期 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设备预验节点" align="center" width="125px">
|
||||
<el-table-column label="实际完成时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
|
||||
<template v-if="scope.row.edit && !scope.row.组件流水号">
|
||||
<el-date-picker v-model="scope.row.实际完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.实际完成时间 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="安装调试节点" align="center" width="125px">
|
||||
<el-table-column min-width="300px" label="备注" align="center" width="240px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.备注" size="mini" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="false" label="操作" width="150px" align="center">
|
||||
<el-table-column label="操作" width="180px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
|
||||
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit2(scope.row)">确定</el-button>
|
||||
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
|
||||
<el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
|
||||
<el-button v-else type="danger" size="small" @click="Delete(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin-top: 15px;">
|
||||
<el-pagination
|
||||
v-if="!loading"
|
||||
:current-page="pageCurrent"
|
||||
:page-sizes="[10, 20, 30, 40, 100]"
|
||||
:page-size="pageSize"
|
||||
:total="total"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"/>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col style="width: 200px;">
|
||||
<el-form label-position="left" label-width="90px" class="demo-ruleForm1">
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<!--<el-radio v-model="radio" label="1">{{ empty }}</el-radio>-->
|
||||
</el-col>
|
||||
<el-col style="width: 180px;margin-left: 20px">
|
||||
<el-form-item label="设计者" prop="设计者" >
|
||||
<el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 150px"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<!--<el-radio v-model="radio" label="2">{{ empty }}</el-radio>-->
|
||||
</el-col>
|
||||
<el-col style="width: 180px;margin-left: 20px">
|
||||
<el-form-item label="审图开始" prop="审图开始">
|
||||
<el-date-picker v-model="审图开始" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图开始" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<!--<el-radio v-model="radio" label="3">{{ empty }}</el-radio>-->
|
||||
</el-col>
|
||||
<el-col style="width: 180px;margin-left: 20px">
|
||||
<el-form-item label="审图结束" prop="审图结束">
|
||||
<el-date-picker v-model="审图结束" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图结束" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<el-radio v-model="radio" label="1">{{ empty }}</el-radio>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<el-form-item label="发图完成" prop="发图完成">
|
||||
<el-date-picker v-model="发图完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="发图完成" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<el-radio v-model="radio" label="2">{{ empty }}</el-radio>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<el-form-item label="采购完成" prop="采购完成">
|
||||
<el-date-picker v-model="采购完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="采购完成" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<el-radio v-model="radio" label="3">{{ empty }}</el-radio>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<el-form-item label="备料完成" prop="备料完成">
|
||||
<el-date-picker v-model="备料完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="备料完成" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<el-radio v-model="radio" label="4">{{ empty }}</el-radio>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<el-form-item label="制造完成" prop="制造完成">
|
||||
<el-date-picker v-model="制造完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="制造完成" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<el-radio v-model="radio" label="5">{{ empty }}</el-radio>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<el-form-item label="装配完成" prop="装配完成">
|
||||
<el-date-picker v-model="装配完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="装配完成" class="time"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 20px">
|
||||
<!--<el-radio v-model="radio" label="9">{{ empty }}</el-radio>-->
|
||||
</el-col>
|
||||
<el-col style="width: 180px;margin-left: 20px">
|
||||
<el-form-item label="更新时间" prop="更新时间">
|
||||
<el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 150px"/>
|
||||
<!--<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>-->
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-col>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<h2 v-if="radio==='1'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 发图</h2>
|
||||
<h2 v-if="radio==='2'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 采购</h2>
|
||||
<h2 v-if="radio==='3'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 备料</h2>
|
||||
<h2 v-if="radio==='4'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 制造</h2>
|
||||
<h2 v-if="radio==='5'" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 装配</h2>
|
||||
<el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 7px 0 0 0" plain @click="addTable()">增加</el-button>
|
||||
<el-table v-loading="loading2" :data="tableData2" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
|
||||
<el-table-column min-width="100px" label="组号" align="center">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-select v-model="scope.row.组件流水号" filterable clearable size="small" style="width: 100px" @change="groupChange(scope.row, scope.$index)">
|
||||
<el-option
|
||||
v-for="item in groupNum"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column min-width="200px" label="任务名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.任务名称" size="mini" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.任务名称 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column min-width="100px" label="负责人" align="center">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.负责人" size="mini" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.负责人 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="接收任务时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-date-picker v-model="scope.row.接收任务时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.接收任务时间 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务开始时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-date-picker v-model="scope.row.任务开始时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.任务开始时间 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="计划完成时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-date-picker v-model="scope.row.计划完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.计划完成时间 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column min-width="100px" label="货期" align="center">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.货期" size="mini" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.货期 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="实际完成时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit && !scope.row.组件流水号">
|
||||
<el-date-picker v-model="scope.row.实际完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.实际完成时间 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column min-width="300px" label="备注" align="center" width="240px">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.备注" size="mini" style="width: 100%"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="180px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit2(scope.row)">确定</el-button>
|
||||
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
|
||||
<el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
|
||||
<el-button v-else type="danger" size="small" @click="Delete(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-card>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -730,6 +735,16 @@ export default {
|
||||
.demo-ruleForm1 .el-form-item {
|
||||
margin-bottom: 0px
|
||||
}
|
||||
.demo-ruleForm1 .el-form-item__label {
|
||||
text-align: right;
|
||||
float: left;
|
||||
font-size: 16px;
|
||||
color: #606266;
|
||||
line-height: 40px;
|
||||
padding: 0 12px 0 0;
|
||||
-webkit-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.bold-font .el-table{
|
||||
font: bold 20px arial!important;
|
||||
margin: 0 0 10px 0;
|
||||
|
||||
@@ -44,222 +44,226 @@
|
||||
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
<el-card style="overflow: auto">
|
||||
<el-row>
|
||||
<el-col style="width: 1400px;">
|
||||
<el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
|
||||
<el-table-column label="项目编号" align="center" width="140px" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.项目编号" size="mini"/>
|
||||
<el-card>
|
||||
<el-table v-loading="loading" :data="tableData" height="320" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
|
||||
<el-table-column label="项目编号" align="center" width="170px" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.edit">
|
||||
<el-input v-model="scope.row.项目编号" size="mini"/>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.项目编号 }}
|
||||
</template>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ scope.row.项目编号 }}
|
||||
</el-table-column>
|
||||
<el-table-column label="项目名称" align="center" min-width="120px" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" width="140px" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床名称" align="center" width="280px" fixed="left">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床数量" align="center" width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="签订日期" align="center" width="125px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交货期" align="center" width="125px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设备预验节点" align="center" width="125px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="安装调试节点" align="center" width="125px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="false" label="操作" width="150px" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
|
||||
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
|
||||
<el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin-top: 15px;">
|
||||
<el-pagination
|
||||
v-if="!loading"
|
||||
:current-page="pageCurrent"
|
||||
:page-sizes="[10, 20, 30, 40, 100]"
|
||||
:page-size="pageSize"
|
||||
:total="total"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col style="width: 290px;margin-left: 10px">
|
||||
<el-card style="height: 370px">
|
||||
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">进程</div>
|
||||
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">计划时间</div>
|
||||
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">实际时间</div>
|
||||
<el-form label-position="right" label-width="85px" class="demo-ruleForm1">
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="审图开始">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 审图开始 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
-
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="审图结束">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 审图结束 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 审图实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="发图完成">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 发图完成 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 机床设计实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="采购完成">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 采购完成 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 采购实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="备料完成">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 备料完成 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 备料实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="制造完成">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 制造完成 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 机床生产实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="装配完成">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 装配完成 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 机床装配实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-card>
|
||||
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableRowClassName" style="margin-top: 10px;width: 100%;" border element-loading-text="拼命加载中">
|
||||
<el-table-column width="100px" label="计划名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计划类型名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="项目名称" align="center" min-width="120px" fixed="left">
|
||||
<el-table-column width="150px" label="组号" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床图号" align="center" width="140px" fixed="left">
|
||||
<el-table-column width="300px" label="任务名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
{{ scope.row.任务名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床名称" align="center" width="280px" fixed="left">
|
||||
<el-table-column width="120px" label="负责人" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床名称 }}
|
||||
{{ scope.row.负责人 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床数量" align="center" width="100px">
|
||||
<el-table-column label="任务开始时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床数量 }}
|
||||
{{ scope.row.任务开始时间 ? scope.row.任务开始时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="签订日期" align="center" width="125px">
|
||||
<el-table-column label="计划完成" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
|
||||
{{ scope.row.计划完成时间 ? scope.row.计划完成时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交货期" align="center" width="125px">
|
||||
<el-table-column width="140px" label="计划工期(天)" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
|
||||
{{ scope.row.货期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="设备预验节点" align="center" width="125px">
|
||||
<el-table-column label="实际完成时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
|
||||
{{ scope.row.实际完成时间 ? scope.row.实际完成时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="安装调试节点" align="center" width="125px">
|
||||
<el-table-column width="140px" label="实际工期(天)" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="false" label="操作" width="150px" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
|
||||
<el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
|
||||
<el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
|
||||
{{ scope.row.实际完成时间 ? scope.row.实际工期 : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin-top: 15px;">
|
||||
<el-pagination
|
||||
v-if="!loading"
|
||||
:current-page="pageCurrent"
|
||||
:page-sizes="[10, 20, 30, 40, 100]"
|
||||
:page-size="pageSize"
|
||||
:total="total"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"/>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col style="width: 240px;">
|
||||
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">进程</div>
|
||||
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">计划时间</div>
|
||||
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">实际时间</div>
|
||||
<el-form label-position="right" label-width="85px" class="demo-ruleForm1">
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="审图开始">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 审图开始 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
-
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="审图结束">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 审图结束 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 审图实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="发图完成">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 发图完成 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 机床设计实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="采购完成">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 采购完成 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 采购实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="备料完成">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 备料完成 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 备料实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="制造完成">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 制造完成 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 机床生产实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col style="width: 270px">
|
||||
<el-form-item label="装配完成">
|
||||
<el-col style="width: 80px;">
|
||||
{{ 装配完成 }}
|
||||
</el-col>
|
||||
<el-col style="width: 80px;">
|
||||
{{ 机床装配实际完成时间 }}
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-col>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableRowClassName" style="margin-top: 10px;width: 100%;" border element-loading-text="拼命加载中">
|
||||
<el-table-column width="100px" label="计划名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计划类型名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="150px" label="组号" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="300px" label="任务名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="120px" label="负责人" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.负责人 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务开始时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务开始时间 ? scope.row.任务开始时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="计划完成" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计划完成时间 ? scope.row.计划完成时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="140px" label="计划工期(天)" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.货期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="实际完成时间" align="center" width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.实际完成时间 ? scope.row.实际完成时间.split(' ')[0] : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="140px" label="实际工期(天)" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.实际完成时间 ? scope.row.实际工期 : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-card>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -465,6 +469,16 @@ export default {
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
.demo-ruleForm1 .el-form-item__label {
|
||||
text-align: right;
|
||||
float: left;
|
||||
font-size: 16px;
|
||||
color: #606266;
|
||||
line-height: 40px;
|
||||
padding: 0 12px 0 0;
|
||||
-webkit-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.PPMQHairDrawing{
|
||||
background: rgb(189,215,238) !important;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user