meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目计划查询

Browse Source
This commit is contained in:
Vergil
2020-03-24 17:34:36 +08:00
parent a634b97e00
commit 0d61499cc4
2 changed files with 61 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
View File

@@ -33,7 +33,7 @@
</el-row> </el-row>
</el-card> </el-card>
<el-row> <el-row>
<el-col style="width: 1400px;"> <el-col style="width: 1325px;">
<el-card> <el-card>
<!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>--> <!--<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 v-loading="loading" :data="tableData" height="320" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
@@ -67,22 +67,22 @@
{{ scope.row.机床数量 }} {{ scope.row.机床数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="签订日期" align="center" width="125px"> <el-table-column label="签订日期" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }} {{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="交货期" align="center" width="125px"> <el-table-column label="交货期" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }} {{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备预验节点" align="center" width="125px"> <el-table-column label="设备预验" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }} {{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="安装调试节点" align="center" width="125px"> <el-table-column label="安装调试" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }} {{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
</template> </template>
@@ -109,16 +109,16 @@
</el-card> </el-card>
</el-col> </el-col>
<el-col style="width: 290px;margin-left: 10px"> <el-col style="width: 370px;margin-left: 10px">
<el-card> <el-card>
<el-form label-position="left" label-width="90px" class="ProjectPlanningManagement"> <el-form label-position="left" label-width="80px" class="ProjectPlanningManagement">
<el-row> <el-row>
<el-col style="width: 20px"> <el-col style="width: 20px">
<!--<el-radio v-model="radio" label="1">{{ empty }}</el-radio>--> <!--<el-radio v-model="radio" label="1">{{ empty }}</el-radio>-->
</el-col> </el-col>
<el-col style="width: 180px;margin-left: 20px"> <el-col style="width: 180px;margin-left: 20px">
<el-form-item label="设计者" prop="设计者" > <el-form-item label="设计者" prop="设计者" >
<el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 150px"/> <el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 180px"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -128,7 +128,7 @@
</el-col> </el-col>
<el-col style="width: 180px;margin-left: 20px"> <el-col style="width: 180px;margin-left: 20px">
<el-form-item label="审图开始" prop="审图开始"> <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-date-picker v-model="审图开始" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="审图开始" class="time"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -138,7 +138,7 @@
</el-col> </el-col>
<el-col style="width: 180px;margin-left: 20px"> <el-col style="width: 180px;margin-left: 20px">
<el-form-item label="审图结束" prop="审图结束"> <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-date-picker v-model="审图结束" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="审图结束" class="time"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -148,7 +148,7 @@
</el-col> </el-col>
<el-col style="width: 180px"> <el-col style="width: 180px">
<el-form-item label="发图完成" prop="发图完成"> <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-date-picker v-model="发图完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="发图完成" class="time"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -158,7 +158,7 @@
</el-col> </el-col>
<el-col style="width: 180px"> <el-col style="width: 180px">
<el-form-item label="采购完成" prop="采购完成"> <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-date-picker v-model="采购完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="采购完成" class="time"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -168,7 +168,7 @@
</el-col> </el-col>
<el-col style="width: 180px"> <el-col style="width: 180px">
<el-form-item label="备料完成" prop="备料完成"> <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-date-picker v-model="备料完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="备料完成" class="time"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -178,7 +178,7 @@
</el-col> </el-col>
<el-col style="width: 180px"> <el-col style="width: 180px">
<el-form-item label="制造完成" prop="制造完成"> <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-date-picker v-model="制造完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="制造完成" class="time"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -188,7 +188,7 @@
</el-col> </el-col>
<el-col style="width: 180px"> <el-col style="width: 180px">
<el-form-item label="装配完成" prop="装配完成"> <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-date-picker v-model="装配完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 180px" placeholder="装配完成" class="time"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -198,7 +198,7 @@
</el-col> </el-col>
<el-col style="width: 180px;margin-left: 20px"> <el-col style="width: 180px;margin-left: 20px">
<el-form-item label="更新时间" prop="更新时间"> <el-form-item label="更新时间" prop="更新时间">
<el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 150px"/> <el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 180px"/>
<!--<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>--> <!--<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -209,11 +209,11 @@
</el-row> </el-row>
<el-row> <el-row>
<el-card> <el-card>
<h2 v-if="radio==='1'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 发图</h2> <span v-if="radio==='1'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 发图</span>
<h2 v-if="radio==='2'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 采购</h2> <span v-if="radio==='2'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 采购</span>
<h2 v-if="radio==='3'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 备料</h2> <span v-if="radio==='3'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 备料</span>
<h2 v-if="radio==='4'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 制造</h2> <span v-if="radio==='4'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 制造</span>
<h2 v-if="radio==='5'" style="float:left;margin: 7px 0 10px 0">子计划：{{ machineNum }} 装配</h2> <span v-if="radio==='5'" style="float:left;margin: 10px 0 10px 0">子计划：{{ machineNum }} 装配</span>
<el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 5px 0 3px 10px" plain @click="addTable()">增加</el-button> <el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 5px 0 3px 10px" 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 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"> <el-table-column min-width="100px" label="组号" align="center">
@@ -314,10 +314,10 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="180px" align="center" fixed="right"> <el-table-column label="操作" width="180px" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit2(scope.row)">确定</el-button> <el-button v-if="scope.row.edit" type="text" 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-else type="text" size="small" icon="el-icon-edit-outline" @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-if="scope.row.edit" type="text" 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> <el-button v-else type="text" size="small" icon="el-icon-delete" @click="Delete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -739,7 +739,7 @@ export default {
.ProjectPlanningManagement .el-form-item__label { .ProjectPlanningManagement .el-form-item__label {
text-align: right; text-align: right;
float: left; float: left;
font-size: 16px; font-size: 14px;
color: #606266; color: #606266;
line-height: 40px; line-height: 40px;
padding: 0 12px 0 0; padding: 0 12px 0 0;

67
src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
View File

@@ -45,7 +45,7 @@
</el-row> </el-row>
</el-card> </el-card>
<el-row> <el-row>
<el-col style="width: 1400px;"> <el-col style="width: 1325px;">
<el-card> <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 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"> <el-table-column label="项目编号" align="center" width="170px" fixed="left">
@@ -78,22 +78,22 @@
{{ scope.row.机床数量 }} {{ scope.row.机床数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="签订日期" align="center" width="125px"> <el-table-column label="签订日期" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }} {{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="交货期" align="center" width="125px"> <el-table-column label="交货期" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }} {{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备预验节点" align="center" width="125px"> <el-table-column label="设备预验" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }} {{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="安装调试节点" align="center" width="125px"> <el-table-column label="安装调试" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }} {{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
</template> </template>
@@ -119,91 +119,91 @@
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col style="width: 290px;margin-left: 10px"> <el-col style="width: 370px;margin-left: 10px">
<el-card style="height: 370px"> <el-card style="height: 370px">
<div style="width: 80px;font-size: 18px;float: left;text-align: center;">进程</div> <div style="width: 110px;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: 110px;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: 110px;font-size: 18px;float: left;text-align: center;">实际时间</div>
<el-form label-position="right" label-width="85px" class="ProjectPlanningManagementQuery"> <el-form label-position="right" label-width="100px" class="ProjectPlanningManagementQuery">
<el-row> <el-row>
<el-col style="width: 270px"> <el-col style="width: 370px">
<el-form-item label="审图开始"> <el-form-item label="审图开始">
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 审图开始 }} {{ 审图开始 }}
</el-col> </el-col>
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
- -
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col style="width: 270px"> <el-col style="width: 370px">
<el-form-item label="审图结束"> <el-form-item label="审图结束">
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 审图结束 }} {{ 审图结束 }}
</el-col> </el-col>
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 审图实际完成时间 }} {{ 审图实际完成时间 }}
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col style="width: 270px"> <el-col style="width: 370px">
<el-form-item label="发图完成"> <el-form-item label="发图完成">
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 发图完成 }} {{ 发图完成 }}
</el-col> </el-col>
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 机床设计实际完成时间 }} {{ 机床设计实际完成时间 }}
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col style="width: 270px"> <el-col style="width: 370px">
<el-form-item label="采购完成"> <el-form-item label="采购完成">
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 采购完成 }} {{ 采购完成 }}
</el-col> </el-col>
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 采购实际完成时间 }} {{ 采购实际完成时间 }}
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col style="width: 270px"> <el-col style="width: 370px">
<el-form-item label="备料完成"> <el-form-item label="备料完成">
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 备料完成 }} {{ 备料完成 }}
</el-col> </el-col>
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 备料实际完成时间 }} {{ 备料实际完成时间 }}
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col style="width: 270px"> <el-col style="width: 370px">
<el-form-item label="制造完成"> <el-form-item label="制造完成">
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 制造完成 }} {{ 制造完成 }}
</el-col> </el-col>
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 机床生产实际完成时间 }} {{ 机床生产实际完成时间 }}
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col style="width: 270px"> <el-col style="width: 370px">
<el-form-item label="装配完成"> <el-form-item label="装配完成">
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 装配完成 }} {{ 装配完成 }}
</el-col> </el-col>
<el-col style="width: 80px;"> <el-col style="width: 120px;" align="center">
{{ 机床装配实际完成时间 }} {{ 机床装配实际完成时间 }}
</el-col> </el-col>
</el-form-item> </el-form-item>
@@ -472,13 +472,16 @@ export default {
.ProjectPlanningManagementQuery .el-form-item__label { .ProjectPlanningManagementQuery .el-form-item__label {
text-align: right; text-align: right;
float: left; float: left;
font-size: 16px; font-size: 14px;
color: #606266; color: #606266;
line-height: 40px; line-height: 40px;
padding: 0 12px 0 0; padding: 0 12px 0 0;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.ProjectPlanningManagementQuery .el-form-item {
margin-bottom: 0px;
}
.PPMQHairDrawing{ .PPMQHairDrawing{
background: rgb(189,215,238) !important; background: rgb(189,215,238) !important;
} }