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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-03-24 17:40:39 +08:00
parent 95c0bcf29b 0d61499cc4
commit b032a43809
6 changed files with 112 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/Assembly/AssemblyQualityInspection/index.vue
View File

@@ -40,7 +40,7 @@
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="830px"> <el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="750px">
<el-table-column align="center" prop="是否合格" label="检验情况" width="80px"> <el-table-column align="center" prop="是否合格" label="检验情况" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag> <el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>
@@ -53,7 +53,7 @@
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床名称" prop="机床名称" align="center" width="260px"> <el-table-column label="机床名称" prop="机床名称" align="center" width="250px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床名称 }} {{ scope.row.机床名称 }}
</template> </template>
@@ -73,7 +73,7 @@
{{ scope.row.检测项 }} {{ scope.row.检测项 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检测项明细" align="center" width="300px"> <el-table-column label="检测项明细" align="center" width="270px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.检测项明细 }} {{ scope.row.检测项明细 }}
</template> </template>

36
src/views/Assembly/QualityBasicData/index.vue
View File

@@ -25,7 +25,7 @@
{{ scope.row.不合格原因文本 }} {{ scope.row.不合格原因文本 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200px"> <el-table-column label="操作" align="center" fixed="right" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -54,7 +54,7 @@
{{ scope.row.不合格处理文本 }} {{ scope.row.不合格处理文本 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200px"> <el-table-column label="操作" align="center" fixed="right" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -90,7 +90,7 @@
{{ scope.row.质检尺寸 }} {{ scope.row.质检尺寸 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="150px"> <el-table-column label="操作" align="center" fixed="right" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -119,7 +119,7 @@
{{ scope.row.质检形位 }} {{ scope.row.质检形位 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="150px"> <el-table-column label="操作" align="center" fixed="right" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -150,7 +150,7 @@
{{ scope.row.质检外观 }} {{ scope.row.质检外观 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="150px"> <el-table-column label="操作" align="center" fixed="right" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -179,7 +179,7 @@
{{ scope.row.检测项 }} {{ scope.row.检测项 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200px"> <el-table-column label="操作" align="center" fixed="right" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -208,7 +208,7 @@
{{ scope.row.检测项明细 }} {{ scope.row.检测项明细 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200px"> <el-table-column label="操作" align="center" fixed="right" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -417,15 +417,19 @@ export default {
} }
}) })
} else if (this.title === '增加检测项明细') { } else if (this.title === '增加检测项明细') {
addTesting(this.value1, this.Testing).then(response => { if (this.value1) {
if (response.data[0].result === '1') { addTesting(this.value1, this.Testing).then(response => {
this.$message.success('增加成功') if (response.data[0].result === '1') {
this.dialogFormVisible = false this.$message.success('增加成功')
initTesting(this.value1).then(response => { this.tableData6 = response.data }) this.dialogFormVisible = false
} else { initTesting(this.value1).then(response => { this.tableData6 = response.data })
this.$message.error('增加失败') } else {
} this.$message.error('增加失败')
}) }
})
} else {
this.$message.error('请先选择检测项')
}
} }
}, },
handleDelete(row) { handleDelete(row) {

22
src/views/BasicData/PartsNumberMaintenance/index.vue
View File

@@ -97,7 +97,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑零件数量" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="编辑零件数量" placement="top">
<el-button <el-button
:disabled="scope.row.考核状态>=6" :disabled="scope.row.考核状态>=6&&scope.row.状态==='已加工'"
size="mini" size="mini"
type="primary" type="primary"
plain plain
@@ -115,16 +115,16 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <div class="block" style="margin-top: 10px;">--> <!--<div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination--> <!--<el-pagination-->
<!-- :current-page="pageCurrent"--> <!--:current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40]"--> <!--:page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize"--> <!--:page-size="pageSize"-->
<!-- :total="total"--> <!--:total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"--> <!--layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChanges"--> <!--@size-change="handleSizeChanges"-->
<!-- @current-change="handleCurrentChanges"/>--> <!--@current-change="handleCurrentChanges"/>-->
<!-- </div>--> <!--</div>-->
</el-card> </el-card>
<el-card> <el-card>
<div> <div>

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

@@ -2,26 +2,26 @@
<div class="app-container bold-font"> <div class="app-container bold-font">
<el-card> <el-card>
<el-row> <el-row>
<h3 style="display: inline-block;margin: 0">项目名称:</h3> <!-- <h3 style="display: inline-block;margin: 0">项目名称:</h3> -->
<el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="项目名称" @change="typeChange()"> <el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="项目名称" @change="typeChange()">
<el-option <el-option
v-for="item in project" v-for="item in project"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<h3 style="display: inline-block;margin: 0 0 0 20px">机床名称:</h3> <!-- <h3 style="display: inline-block;margin: 0 0 0 20px">机床名称:</h3> -->
<el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床名称"> <el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床名称">
<el-option <el-option
v-for="item in toolNum" v-for="item in toolNum"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3> <!-- <h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3> -->
<el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/> <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" 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 750px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">保存</el-button>
</el-row> </el-row>
<el-row v-if="false"> <el-row v-if="false">
<h3 style="display: inline-block;margin: 0">签订日期:</h3> <h3 style="display: inline-block;margin: 0">签订日期:</h3>
@@ -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="demo-ruleForm1"> <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,12 +209,12 @@
</el-row> </el-row>
<el-row> <el-row>
<el-card> <el-card>
<h2 v-if="radio==='1'" style="width: 400px;float:left;display: inline-block;margin: 0 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="width: 400px;float:left;display: inline-block;margin: 0 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="width: 400px;float:left;display: inline-block;margin: 0 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="width: 400px;float:left;display: inline-block;margin: 0 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="width: 400px;float:left;display: inline-block;margin: 0 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: 7px 0 0 0" 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">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -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>
@@ -561,6 +561,7 @@ export default {
} }
}) })
searchTable2(this.机床流水号, this.radio).then(response => { searchTable2(this.机床流水号, this.radio).then(response => {
console.log('')
if (response.data.length === 0) { if (response.data.length === 0) {
this.loading2 = false this.loading2 = false
} else { } else {
@@ -732,27 +733,17 @@ export default {
.el-radio { .el-radio {
margin-top: 12px !important; margin-top: 12px !important;
} }
.demo-ruleForm1 .el-form-item { .ProjectPlanningManagement .el-form-item {
margin-bottom: 0px margin-bottom: 0px
} }
.demo-ruleForm1 .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;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.bold-font .el-table{
font: bold 20px arial!important;
margin: 0 0 10px 0;
/*color: white;*/
}
.bold-font{
/*color: ghostwhite;*/
font: bold 22px arial!important;
padding: 5px;
}
</style> </style>

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

@@ -2,14 +2,14 @@
<div class="app-container bold-font"> <div class="app-container bold-font">
<el-card> <el-card>
<el-row> <el-row>
<el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 200px" placeholder="项目名称" @change="typeChange()"> <el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="项目名称" @change="typeChange()">
<el-option <el-option
v-for="item in project" v-for="item in project"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 200px" placeholder="机床名称"> <el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床名称">
<el-option <el-option
v-for="item in toolNum" v-for="item in toolNum"
:key="item.value" :key="item.value"
@@ -17,7 +17,7 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/> <el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
<h3 style="display: inline-block;margin: 0 0 0 10px">签订日期:</h3> <span style="display: inline-block;margin: 0 0 0 10px">签订日期:</span>
<el-date-picker <el-date-picker
v-model="Sign" v-model="Sign"
size="small" size="small"
@@ -29,7 +29,7 @@
range-separator="～" range-separator="～"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
<h3 style="display: inline-block;margin: 0 0 0 10px">交货期:</h3> <span style="display: inline-block;margin: 0 0 0 10px">交货期:</span>
<el-date-picker <el-date-picker
v-model="delivery" v-model="delivery"
size="small" size="small"
@@ -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="demo-ruleForm1"> <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>
@@ -469,16 +469,19 @@ export default {
} }
</style> </style>
<style> <style>
.demo-ruleForm1 .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;
} }
@@ -494,17 +497,5 @@ export default {
.PPMQassembling{ .PPMQassembling{
background: rgb(169,208,142) !important; background: rgb(169,208,142) !important;
} }
.demo-ruleForm1 .el-form-item {
margin-bottom: 0px
}
.bold-font .el-table{
font: bold 20px arial!important;
margin: 0 0 10px 0;
/*color: white;*/
}
.bold-font{
/*color: ghostwhite;*/
font: bold 22px arial!important;
padding: 5px;
}
</style> </style>

2
src/views/ManufacturingCenter/ShopScheduling/index.vue
View File

@@ -202,7 +202,7 @@ export default {
}, },
tableData1ClassName({ row, rowIndex }) { tableData1ClassName({ row, rowIndex }) {
row.index = rowIndex row.index = rowIndex
if (row.状态 === '1') { if (row.状态 === 1) {
return 'CJPClingjianjinxing' return 'CJPClingjianjinxing'
} }
}, },