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

更新

Browse Source
This commit is contained in:
liushuai
2019-09-20 19:34:56 +08:00
parent 95284fab38
commit 9c2b03c2b5
11 changed files with 405 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/ManufacturingCenter/ParseQuery.js
View File

@@ -32,3 +32,14 @@ export function ProcessProportion() {
} }
}) })
} }
export function searchMachine() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '机床总查询',
param: '机床流水号_check=' + arguments[0] + '&机床流水号=' + arguments[1]
}
})
}

BIN
src/assets/img/img11.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

BIN
src/assets/img/img12.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

2
src/utils/request.js
View File

@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.0.103:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })

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

@@ -2,8 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-row> <el-row>
<span>机床编号:</span> <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-left: 10px" clearable @change="machineChange()">
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
<el-option <el-option
v-for="item in machineNumber" v-for="item in machineNumber"
:key="item.value" :key="item.value"
@@ -13,7 +12,6 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div> <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option> </el-option>
</el-select> </el-select>
<span>组号:</span>
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable> <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
<el-option <el-option
v-for="item in groupNumber" v-for="item in groupNumber"
@@ -21,7 +19,6 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>检测项:</span>
<el-select v-model="TestValue" filterable placeholder="组号" size="small" clearable> <el-select v-model="TestValue" filterable placeholder="组号" size="small" clearable>
<el-option <el-option
v-for="item in Test" v-for="item in Test"
@@ -29,7 +26,6 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>质检情况:</span>
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable> <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable>
<el-option <el-option
v-for="item in qualityInspection" v-for="item in qualityInspection"
@@ -42,7 +38,7 @@
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%" height="600px"> <el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="500px">
<el-table-column align="center" label="检验情况" width="80px"> <el-table-column align="center" 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>
@@ -60,17 +56,17 @@
{{ scope.row.机床名称 }} {{ scope.row.机床名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center" width="120px"> <el-table-column label="组号" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="部件名称" align="center" width="120px"> <el-table-column label="部件名称" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组件名称 }} {{ scope.row.组件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检测项" align="center" width="120px"> <el-table-column label="检测项" align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.检测项 }} {{ scope.row.检测项 }}
</template> </template>

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

@@ -6,14 +6,15 @@
<el-row> <el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格原因</div> <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格原因</div>
</el-row> </el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd1()">增加</el-button> <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd1()">新增</el-button>
<el-table <el-table
:data="tableData" :data="tableData"
border border
style="width: 100%;max-height: 450px;margin-top: 10px" style="width: 100%;max-height: 450px;margin-top: 10px"
height="450px" height="450px"
highlight-current-row size="mini"
size="small"> stripe
highlight-current-row>
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
@@ -28,6 +29,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
plain
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
@@ -41,8 +43,8 @@
<el-row> <el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格处理</div> <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格处理</div>
</el-row> </el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd2()">增加</el-button> <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd2()">新增</el-button>
<el-table :data="tableData1" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small"> <el-table :data="tableData1" border style="width: 100%;max-height: 450px;margin-top: 10px" stripe height="350px" highlight-current-row size="mini">
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
@@ -58,6 +60,7 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
plain
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
@@ -72,14 +75,15 @@
<el-row> <el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检尺寸</div> <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检尺寸</div>
</el-row> </el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd3()">增加</el-button> <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
<el-table <el-table
:data="tableData2" :data="tableData2"
border border
style="width: 100%;max-height: 450px;margin-top: 10px" style="width: 100%;max-height: 450px;margin-top: 10px"
height="450px" height="350px"
stripe
highlight-current-row highlight-current-row
size="small"> size="mini">
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
@@ -95,6 +99,7 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
plain
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
@@ -107,8 +112,8 @@
<el-row> <el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检外观</div> <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检外观</div>
</el-row> </el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd4()">增加</el-button> <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
<el-table :data="tableData3" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small"> <el-table :data="tableData3" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
@@ -124,6 +129,7 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
plain
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
@@ -136,8 +142,8 @@
<el-row> <el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检形位</div> <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检形位</div>
</el-row> </el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd5()">增加</el-button> <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
<el-table :data="tableData4" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small"> <el-table :data="tableData4" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
@@ -153,6 +159,7 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
plain
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
@@ -167,8 +174,8 @@
<el-row> <el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项</div> <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项</div>
</el-row> </el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd6()">增加</el-button> <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
<el-table :data="tableData5" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small" @row-click="searchTesting"> <el-table :data="tableData5" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" highlight-current-row stripe size="mini" @row-click="searchTesting">
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
@@ -184,6 +191,7 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
plain
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
@@ -196,8 +204,8 @@
<el-row> <el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项明细</div> <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项明细</div>
</el-row> </el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd7()">增加</el-button> <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:80%;margin-top: 15px" @click="handleAdd7()">增加</el-button>
<el-table :data="tableData6" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small"> <el-table :data="tableData6" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
@@ -213,6 +221,7 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
plain
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
</template> </template>

86
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-row> <el-row>
<span>机床编号:</span> <span style="margin-left:10px">机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()"> <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
<el-option <el-option
v-for="item in machineNumber" v-for="item in machineNumber"
@@ -33,14 +33,14 @@
</el-select> </el-select>
</el-row> </el-row>
<el-row style="margin-top: 20px"> <el-row style="margin-top: 20px">
<span class="demonstration">时间区间:</span> <!--<span class="demonstration">时间区间:</span>-->
<el-date-picker <el-date-picker
v-model="startTime" v-model="startTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="small" size="small"
style="width: 160px" style="width: 160px;margin-left: 10px"
type="date" type="date"
placeholder="选择日期"/> placeholder="选择开始日期"/>
<span class="demonstration">~</span> <span class="demonstration">~</span>
<el-date-picker <el-date-picker
v-model="endTime" v-model="endTime"
@@ -48,17 +48,17 @@
size="small" size="small"
style="width: 160px" style="width: 160px"
type="date" type="date"
placeholder="选择日期"/> placeholder="选择结束日期"/>
<span>质检情况:</span> <!--<span>质检情况:</span>-->
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable> <el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 140px;margin-left: 50px" clearable>
<el-option <el-option
v-for="item in qualityInspection" v-for="item in qualityInspection"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>质检人员:</span> <!--<span>质检人员:</span>-->
<el-select v-model="personNum" filterable placeholder="质检人员" size="small" clearable> <el-select v-model="personNum" filterable placeholder="选择质检人员" size="small" style="width: 140px;margin-left: 10px" clearable>
<el-option <el-option
v-for="item in person" v-for="item in person"
:key="item.value" :key="item.value"
@@ -70,7 +70,7 @@
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px"> <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table-column align="center" label="禁用情况" width="80px"> <el-table-column align="center" label="禁用情况" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否禁用)===0||scope.row.是否禁用===''" type="success" size="small" @click="approvalPass(scope.row)">未禁用</el-tag> <el-tag v-if="parseInt(scope.row.是否禁用)===0||scope.row.是否禁用===''" type="success" size="small" @click="approvalPass(scope.row)">未禁用</el-tag>
@@ -82,17 +82,17 @@
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床名称" align="center" width="160px"> <el-table-column label="机床名称" align="center" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床名称 }} {{ scope.row.机床名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center"> <el-table-column label="组号" align="center" width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件型号" align="center"> <el-table-column label="零件型号" align="center" min-width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
@@ -160,7 +160,7 @@
<el-table-column label="形位" fixed="right" align="center" width="100"> <el-table-column label="形位" fixed="right" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click"> <el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini"> <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="类别"> <el-table-column min-width="150" align="center" label="类别">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -185,7 +185,7 @@
<el-table-column label="尺寸" fixed="right" align="center" width="100"> <el-table-column label="尺寸" fixed="right" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click"> <el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini"> <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="类别"> <el-table-column min-width="150" align="center" label="类别">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -210,7 +210,7 @@
<el-table-column label="外观" fixed="right" align="center" width="100"> <el-table-column label="外观" fixed="right" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click"> <el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini"> <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="类别"> <el-table-column min-width="150" align="center" label="类别">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -232,11 +232,12 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="100"> <el-table-column label="操作" fixed="right" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
plain
icon="el-icon-search" icon="el-icon-search"
@click="viewPicture(scope.row)">查看图片</el-button> @click="viewPicture(scope.row)">查看图片</el-button>
</template> </template>
@@ -255,14 +256,14 @@
</div> </div>
</el-card> </el-card>
<el-card> <el-card>
<h3 align="center">正在加工零件列表</h3> <h4 style="margin-left: 45%;">正在加工零件列表</h4>
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px"> <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table-column label="机床图号" align="center"> <el-table-column label="机床图号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床名称" align="center" width="160px"> <el-table-column label="机床名称" align="center" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床名称 }} {{ scope.row.机床名称 }}
</template> </template>
@@ -272,7 +273,7 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center"> <el-table-column label="零件图号" align="center" min-width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
@@ -302,13 +303,14 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="100"> <el-table-column label="操作" fixed="right" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
plain
icon="el-icon-search" icon="el-icon-search"
@click="viewProcedures(scope.row)">查看工序情况</el-button> @click="viewProcedures(scope.row)">查看工序</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -324,34 +326,34 @@
</div> </div>
</el-card> </el-card>
<el-card> <el-card>
<h3 align="center">待加工零件列表</h3> <h4 style="margin-left: 45%;">待加工零件列表</h4>
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px"> <el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table-column label="机床图号" align="center"> <el-table-column label="机床图号" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="机床名称" align="center" width="160px"> <el-table-column label="机床名称" align="center" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床名称 }} {{ scope.row.机床名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组号" align="center"> <el-table-column label="组号" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center"> <el-table-column label="零件图号" align="center" width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" align="center"> <el-table-column label="零件名称" align="center" min-width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件数量" align="center"> <el-table-column label="零件数量" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
@@ -361,7 +363,7 @@
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工位" align="center" width="100px"> <el-table-column label="工位" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.mes终端编号 }} {{ scope.row.mes终端编号 }}
</template> </template>
@@ -371,13 +373,14 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="100"> <el-table-column label="操作" fixed="right" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
plain
icon="el-icon-search" icon="el-icon-search"
@click="viewProcedures(scope.row)">查看工序情况</el-button> @click="viewProcedures(scope.row)">查看工序</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -392,7 +395,7 @@
@current-change="handleCurrentChange2"/> @current-change="handleCurrentChange2"/>
</div> </div>
</el-card> </el-card>
<el-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
<el-row> <el-row>
<span>零件图号:</span> <span>零件图号:</span>
<el-input v-model="SparePartsNumber" style="width: 200px" size="small"/> <el-input v-model="SparePartsNumber" style="width: 200px" size="small"/>
@@ -404,14 +407,15 @@
style="width: 100%;max-height: 400px;margin-top: 20px" style="width: 100%;max-height: 400px;margin-top: 20px"
size="mini" size="mini"
height="300" height="300"
stripe
highlight-current-row highlight-current-row
border> border>
<el-table-column align="center" label="工序顺序" width="100"> <el-table-column align="center" label="工序顺序" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工序顺序 }} {{ scope.row.工序顺序 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工艺名称" width="150"> <el-table-column align="center" label="工艺名称" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
@@ -426,14 +430,14 @@
{{ scope.row.员工姓名 }} {{ scope.row.员工姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工艺是否完成" width="130"> <el-table-column align="center" label="工艺是否完成" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag> <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
<el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag> <el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
<el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag> <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工艺是否质检" width="130"> <el-table-column align="center" label="工艺是否质检" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag> <el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>
<el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag> <el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>
@@ -442,9 +446,9 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible" title="图片" center style="" width="1100px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="图片" center style="" width="800px">
<viewer> <viewer>
<img v-for="url in urls" :key="url" :src="url" lazy style="width: 1000px;height: 700px"> <img v-for="url in urls" :key="url" :src="url" lazy style="width: 700px;height: 700px">
</viewer> </viewer>
</el-dialog> </el-dialog>
</div> </div>
@@ -695,5 +699,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
h3{
margin: 5px !important;
}
</style> </style>

442
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

@@ -1,160 +1,144 @@
<template> <template>
<div> <div>
<el-card>
<span>请选择机床：</span>
<el-autocomplete
v-model="searchCriteria"
:fetch-suggestions="querySearch"
clearable
style="width: 200px;margin-left: 10px"
size="small"
class="inline-input"
placeholder="请输入内容"
@clear="clearMachine"
@select="handleSelect"/>
<el-tag style="margin-left: 10px; background: #EAEAEA; color: black">未开始</el-tag>
<el-tag style="background: #7eaced; color: black">进行中</el-tag>
<el-tag style="background: #ff9759; color: black">已完成</el-tag>
</el-card>
<el-card> <el-card>
<div class="main"> <div class="main">
<div class="process"> <div class="process" @click.stop="chaxun">
<div :class="[isActive ? color[22] : 'white']" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;"> <div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div> <div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div>
<el-button :disabled="disabled" :class="[isActive ? color[22] : 'white']" type="text" @click="searchDiv23">发货<br>{{ `${data[0].发货百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[22] : 'weikaishi']" type="text" @click.stop="searchDiv23">发货<br>{{ `${data[0].发货百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[21] : 'white']" class="module" style="position: relative;left: 1580px;top:220px; width: 80px;height: 48px;"> <div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1580px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：质检部<br>对机床进行总装调试</div> <div slot="content">角色：质检部<br>对机床进行总装调试</div>
<el-button :disabled="disabled" :class="[isActive ? color[21] : 'white']" type="text" @click="searchDiv22">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[20] : 'white']" class="module" style="position: relative;left: 1390px;top:220px; width: 80px;height: 48px;"> <div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1390px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：质检部<br>对机床重要部件进行检测</div> <div slot="content">角色：质检部<br>对机床重要部件进行检测</div>
<el-button :disabled="disabled" :class="[isActive ? color[20] : 'white']" type="text" @click="searchDiv21">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[19] : 'white']" class="module" style="position: relative;left: 1185px;top:105px; width: 80px;height: 48px;"> <div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 1185px;top:105px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div> <div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[19] : 'white']" type="text" @click="searchDiv6">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[18] : 'white']" class="module" style="position: relative;left: 1100px;top:176px; width: 80px;height: 48px;"> <div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 1100px;top:176px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content"><br>角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div> <div slot="content"><br>角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[18] : 'white']" type="text" @click="searchDiv5">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[18] : 'weikaishi']" type="text" @click.stop="searchDiv5">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[17] : 'white']" class="module" style="position: relative;left: 1015px;top:247px; width: 80px;height: 48px;"> <div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 1015px;top:247px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div> <div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[17] : 'white']" type="text" @click="searchDiv7">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[16] : 'white']" class="module" style="position: relative;left: 930px;top:319px; width: 80px;height: 48px;"> <div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 930px;top:319px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div> <div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" :class="[isActive ? color[16] : 'white']" type="text" @click="searchDiv8">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[15] : 'white']" class="module" style="position: relative;left: 695px;top:220px; width: 80px;height: 48px;"> <div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 695px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div> <div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div>
<el-button :disabled="disabled" :class="[isActive ? color[15] : 'white']" type="text" @click="searchDiv9">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[14] : 'white']" class="module" style="position: relative;left: 455px;top:55px; width: 80px;height: 48px;"> <div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 455px;top:55px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：质检部<br>对自制件进行检测</div> <div slot="content">角色：质检部<br>对自制件进行检测</div>
<el-button :disabled="disabled" :class="[isActive ? color[14] : 'white']" type="text" @click="searchDiv12">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[13] : 'white']" class="module" style="position: relative;left: 373px;top:283px; width: 80px;height: 48px;"> <div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 373px;top:283px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：质检部<br>对采购件进行检测</div> <div slot="content">角色：质检部<br>对采购件进行检测</div>
<el-button :disabled="disabled" :class="[isActive ? color[13] : 'white']" type="text" @click="searchDiv19">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[12] : 'white']" class="module" style="position: relative;left: 160px;top:110px; width: 80px;height: 48px;"> <div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: 160px;top:110px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div> <div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div>
<el-button :disabled="disabled" :class="[isActive ? color[12] : 'white']" type="text" @click="searchDiv10">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[11] : 'white']" class="module" style="position: relative;left: -25px;top:-1px; width: 80px;height: 48px;"> <div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -25px;top:-1px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：外协员<br>进行外协加工</div> <div slot="content">角色：外协员<br>进行外协加工</div>
<el-button :disabled="disabled" :class="[isActive ? color[11] : 'white']" type="text" @click="searchDiv18">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[10] : 'white']" class="module" style="position: relative;left: -230px;top:54px; width: 80px;height: 48px;"> <div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -230px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：计划员<br>针对做完工艺定额的零件进行排查</div> <div slot="content">角色：计划员<br>针对做完工艺定额的零件进行排查</div>
<el-button :disabled="disabled" :class="[isActive ? color[10] : 'white']" type="text" @click="searchDiv15">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[9] : 'white']" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;"> <div id="son13" :class="[isActive ? color[9] : 'weikaishi']" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：工艺部<br>制定零件定额</div> <div slot="content">角色：工艺部<br>制定零件定额</div>
<el-button :disabled="disabled" :class="[isActive ? color[9] : 'white']" type="text" @click="searchDiv14">定额<br>{{ `${data[0].定额百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[9] : 'weikaishi']" type="text" @click.stop="searchDiv14">定额<br>{{ `${data[0].定额百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[8] : 'white']" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;"> <div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：工艺部<br>制定零件工艺</div> <div slot="content">角色：工艺部<br>制定零件工艺</div>
<el-button :disabled="disabled" :class="[isActive ? color[8] : 'white']" type="text" @click="searchDiv13">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[7] : 'white']" class="module" style="position: relative;left: -805px;top:1px; width: 80px;height: 48px;"> <div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -805px;top:1px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div> <div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div>
<el-button :disabled="disabled" :class="[isActive ? color[7] : 'white']" type="text" @click="searchDiv11">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[0] : 'white']" class="module" style="position: relative;left: -1350px;top:222px; width: 80px;height: 48px;"> <div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1350px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div> <div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div>
<el-button :disabled="disabled" :class="[isActive ? color[0] : 'white']" type="text" @click="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[1] : 'white']" class="module" style="position: relative;left: -1336px;top:222px; width: 80px;height: 48px;"> <div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1336px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div> <div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div>
<el-button :disabled="disabled" :class="[isActive ? color[1] : 'white']" type="text" @click="searchDiv2">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[6] : 'white']" class="module" style="position: relative;left: -1057px;top:110px; width: 80px;height: 48px;"> <div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -1057px;top:110px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div> <div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div>
<el-button :disabled="disabled" :class="[isActive ? color[6] : 'white']" type="text" @click="searchDiv20">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[2] : 'white']" class="module" style="position: relative;left: -1405px;top:222px; width: 80px;height: 48px;"> <div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1405px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div> <div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div>
<el-button :disabled="disabled" :class="[isActive ? color[2] : 'white']" type="text" @click="searchDiv3">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[3] : 'white']" class="module" style="position: relative;left: -1350px;top:63px; width: 80px;height: 48px;"> <div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -1350px;top:63px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div> <div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div>
<el-button :disabled="disabled" :class="[isActive ? color[3] : 'white']" type="text" @click="searchDiv4">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[5] : 'white']" class="module" style="position: relative;left: -1435px;top:223px; width: 80px;height: 48px;"> <div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1435px;top:223px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：制造部长<br>计划员分配零件后，<br>将分配到制造部的采购件进行采购</div> <div slot="content">角色：制造部长<br>计划员分配零件后，<br>将分配到制造部的采购件进行采购</div>
<el-button :disabled="disabled" :class="[isActive ? color[5] : 'white']" type="text" @click="searchDiv17">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[4] : 'white']" class="module" style="position: relative;left: -548px;top:300px; width: 80px;height: 48px;"> <div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -548px;top:300px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div> <div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div>
<el-button :disabled="disabled" :class="[isActive ? color[4] : 'white']" type="text" @click="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
@@ -163,9 +147,76 @@
<!--初始化--> <!--初始化-->
<div v-show="showDiv0"> <div v-show="showDiv0">
<el-card class="showDiv"> <el-card class="showDiv">
<div class="grid-content bg-purple" style="width: 100%; height: 340px; border: 1px solid #DCDFE6;text-align: center;line-height: 340px;color: #DCDFE6"> <span>请选择机床：</span>
<h2>请选择项目后选择节点查看对应信息</h2> <el-autocomplete
</div> v-model="searchCriteria"
:fetch-suggestions="querySearch"
clearable
style="width: 200px;margin-left: 10px"
size="small"
class="inline-input"
placeholder="请输入内容"
@clear="clearMachine"
@select="SearchMachine"/>
<el-table
:data="tableDataDiv0"
height="340"
style="width: 100%;min-height: 300px;"
size="mini"
highlight-current-row
border
@row-click="handleSelect">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column align="center" label="机床图号">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床名称" min-width="150px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="数量">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="签订日期" align="center">
<template slot-scope="scope">
{{ scope.row.合同签订日期 ? scope.row.合同签订日期.substring(0, 11) : '-' }}
</template>
</el-table-column>
<el-table-column label="交货期" align="center">
<template slot-scope="scope">
{{ scope.row.发货节点 ? scope.row.发货节点.substring(0, 11) : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="理论工时">
<template slot-scope="scope">
{{ scope.row.理论加工时间段 }}
</template>
</el-table-column>
<el-table-column align="center" label="实际工时">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 }}
</template>
</el-table-column>
<el-table-column align="center" label="外协工时">
<template slot-scope="scope">
{{ scope.row.外协工时总数 }}
</template>
</el-table-column>
<el-table-column align="center" label="采购总价">
<template slot-scope="scope">
{{ scope.row.零件金额 }}
</template>
</el-table-column>
</el-table>
</el-card> </el-card>
</div> </div>
<!--签订合同--> <!--签订合同-->
@@ -1835,7 +1886,7 @@
</template> </template>
<script> <script>
import { SelectMachine, ProcessOutsourcing, ProcessProportion } from '@/api/ManufacturingCenter/ParseQuery' import { SelectMachine, ProcessOutsourcing, ProcessProportion, searchMachine } from '@/api/ManufacturingCenter/ParseQuery'
import request from '@/utils/request' import request from '@/utils/request'
import echarts from 'echarts' import echarts from 'echarts'
import Cookie from 'js-cookie' import Cookie from 'js-cookie'
@@ -1846,9 +1897,11 @@ export default {
WorkPurchase: '', WorkPurchase: '',
Outsourcing: '', Outsourcing: '',
Home: '', Home: '',
check: 0,
color: [], color: [],
disabled: true, disabled: true,
machineValue: '', // 机床流水号 machineValue: '', // 机床流水号
machineValue1: '',
searchCriteria: '', // 机床名称 V-model searchCriteria: '', // 机床名称 V-model
restaurants: [], // 机床名称数组 restaurants: [], // 机床名称数组
showDiv0: true, showDiv0: true,
@@ -1877,6 +1930,7 @@ export default {
showDiv22: false, showDiv22: false,
valueDiv1: null, // div1 客户评级 valueDiv1: null, // div1 客户评级
maxDiv1: 6, // div1 客户评级最大值 maxDiv1: 6, // div1 客户评级最大值
tableDataDiv0: [],
tableDataDiv2: [], tableDataDiv2: [],
tableDataDiv3: [], tableDataDiv3: [],
tableDataDiv4: [], tableDataDiv4: [],
@@ -2021,12 +2075,14 @@ export default {
} }
} }
}, },
created() {}, created() {
this.SearchMachine1()
},
methods: { methods: {
// 跳转到零件分配 // 跳转到零件分配
turnToPartAs(row) { turnToPartAs(row) {
if (row.总未分配个数 > 0 && row.总个数 > 0) { if (row.总未分配个数 > 0 && row.总个数 > 0) {
Cookie.set('machineValue', this.machineValue) Cookie.set('machineValue', this.machineValue1)
Cookie.set('group', row.组件流水号) Cookie.set('group', row.组件流水号)
this.$router.push('/ManufacturingCenter/PartAssignment') this.$router.push('/ManufacturingCenter/PartAssignment')
} }
@@ -2040,7 +2096,7 @@ export default {
// 跳转到加工进度查询 // 跳转到加工进度查询
turnToProStatus(row) { turnToProStatus(row) {
if (!row.实际完成时间) { if (!row.实际完成时间) {
Cookie.set('machineValue', this.machineValue) Cookie.set('machineValue', this.machineValue1)
Cookie.set('group', row.组件流水号) Cookie.set('group', row.组件流水号)
this.$router.push('/ManufacturingCenter/ProcessingStatus') this.$router.push('/ManufacturingCenter/ProcessingStatus')
} }
@@ -2048,7 +2104,7 @@ export default {
// 跳转到生产计划下达 // 跳转到生产计划下达
turnIniPro(row) { turnIniPro(row) {
if ((parseInt(row.自家加工件总条数) - parseInt(row.已传递条数)) > 0 && parseInt(row.自家加工件总条数) !== 0) { if ((parseInt(row.自家加工件总条数) - parseInt(row.已传递条数)) > 0 && parseInt(row.自家加工件总条数) !== 0) {
Cookie.set('machineValue', this.machineValue) Cookie.set('machineValue', this.machineValue1)
Cookie.set('group', row.组件流水号) Cookie.set('group', row.组件流水号)
this.$router.push('/ManufacturingCenter/InitialProduction') this.$router.push('/ManufacturingCenter/InitialProduction')
} }
@@ -2056,11 +2112,37 @@ export default {
// 跳转到备料完成 // 跳转到备料完成
turnMaterArrMan(row) { turnMaterArrMan(row) {
if (row.状态 !== '完成') { if (row.状态 !== '完成') {
Cookie.set('machineValue', this.machineValue) Cookie.set('machineValue', this.machineValue1)
Cookie.set('group', row.组件流水号) Cookie.set('group', row.组件流水号)
this.$router.push('/ManufacturingCenter/MaterialArrivalManagement') this.$router.push('/ManufacturingCenter/MaterialArrivalManagement')
} }
}, },
chaxun() {
this.showDiv0 = true
this.showDiv1 = false
this.showDiv2 = false
this.showDiv3 = false
this.showDiv4 = false
this.showDiv5 = false
this.showDiv6 = false
this.showDiv7 = false
this.showDiv8 = false
this.showDiv9 = false
this.showDiv10 = false
this.showDiv11 = false
this.showDiv12 = false
this.showDiv13 = false
this.showDiv14 = false
this.showDiv15 = false
this.showDiv16 = false
this.showDiv17 = false
this.showDiv18 = false
this.showDiv19 = false
this.showDiv20 = false
this.showDiv21 = false
this.showDiv22 = false
this.showDiv23 = false
},
changeScroll1() { changeScroll1() {
const div1 = document.getElementById('div1') const div1 = document.getElementById('div1')
const div2 = document.getElementById('div2') const div2 = document.getElementById('div2')
@@ -2094,6 +2176,7 @@ export default {
// 清空查询条件 // 清空查询条件
clearMachine() { clearMachine() {
this.machineValue = '' this.machineValue = ''
this.machineValue1 = ''
this.disabled = true this.disabled = true
this.showDiv0 = true this.showDiv0 = true
this.showDiv1 = false this.showDiv1 = false
@@ -2143,6 +2226,10 @@ export default {
this.data[0].装配质检百分比 = 0 this.data[0].装配质检百分比 = 0
this.data[0].总装调试百分比 = 0 this.data[0].总装调试百分比 = 0
this.data[0].发货百分比 = 0 this.data[0].发货百分比 = 0
this.machineValue ? this.check = 1 : this.check = 0
searchMachine(this.check, this.machineValue).then(response => {
this.tableDataDiv0 = response.data
})
}, },
// 机床名称查询函数 // 机床名称查询函数
querySearch(queryString, cb) { querySearch(queryString, cb) {
@@ -2174,11 +2261,24 @@ export default {
// !== -1为全字匹配 === 0为首字匹配 // !== -1为全字匹配 === 0为首字匹配
} }
}, },
// 选择机床名称后的赋值函数 SearchMachine1() {
async handleSelect(item) { this.machineValue ? this.check = 1 : this.check = 0
// 在此方法中可以把下拉框选中值中的内容赋值给其他变量使用 searchMachine(this.check, this.machineValue).then(response => {
this.tableDataDiv0 = response.data
})
},
SearchMachine(item) {
this.machineValue = item.num this.machineValue = item.num
this.machineValue ? this.disabled = false : this.disabled = true this.machineValue ? this.check = 1 : this.check = 0
searchMachine(this.check, this.machineValue).then(response => {
this.tableDataDiv0 = response.data
})
},
// 选择机床名称后的赋值函数
async handleSelect(row) {
// 在此方法中可以把下拉框选中值中的内容赋值给其他变量使用
this.machineValue1 = row.机床流水号
this.machineValue1 ? this.disabled = false : this.disabled = true
this.showDiv1 = false this.showDiv1 = false
this.showDiv2 = false this.showDiv2 = false
this.showDiv3 = false this.showDiv3 = false
@@ -2206,35 +2306,35 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select * from 综合查询_状态 where 机床流水号 = ${this.machineValue}` name: `select * from 综合查询_状态 where 机床流水号 = ${this.machineValue1}`
} }
}).then(res => { }).then(res => {
this.isActive = true this.isActive = true
this.data = res.data this.data = res.data
console.log(res) console.log(res)
if (res.data[0].签订合同状态 === 1) { this.color[0] = 'white' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'yellow' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'green' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' } if (res.data[0].签订合同状态 === 1) { this.color[0] = 'weikaishi' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'jixingzhong' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'yiwancheng' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' }
if (res.data[0].产品设计状态 === 1) { this.color[1] = 'white' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'yellow' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'green' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' } if (res.data[0].产品设计状态 === 1) { this.color[1] = 'weikaishi' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'jixingzhong' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'yiwancheng' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' }
if (res.data[0].零件分配状态 === 1) { this.color[2] = 'white' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'yellow' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'green' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' } if (res.data[0].零件分配状态 === 1) { this.color[2] = 'weikaishi' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'jixingzhong' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'yiwancheng' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' }
if (res.data[0].自制件状态 === 1) { this.color[3] = 'white' } else if (res.data[0].自制件状态 === 2) { this.color[3] = 'yellow' } else if (res.data[0].自制件状态 === 3) { this.color[3] = 'green' } else if (res.data[0].自制件状态 === 4) { this.color[3] = 'red' } if (res.data[0].自制件状态 === 1) { this.color[3] = 'weikaishi' } else if (res.data[0].自制件状态 === 2) { this.color[3] = 'jixingzhong' } else if (res.data[0].自制件状态 === 3) { this.color[3] = 'yiwancheng' } else if (res.data[0].自制件状态 === 4) { this.color[3] = 'red' }
if (res.data[0].采购部采购状态 === 1) { this.color[4] = 'white' } else if (res.data[0].采购部采购状态 === 2) { this.color[4] = 'yellow' } else if (res.data[0].采购部采购状态 === 3) { this.color[4] = 'green' } else if (res.data[0].采购部采购状态 === 4) { this.color[4] = 'red' } if (res.data[0].采购部采购状态 === 1) { this.color[4] = 'weikaishi' } else if (res.data[0].采购部采购状态 === 2) { this.color[4] = 'jixingzhong' } else if (res.data[0].采购部采购状态 === 3) { this.color[4] = 'yiwancheng' } else if (res.data[0].采购部采购状态 === 4) { this.color[4] = 'red' }
if (res.data[0].车间采购状态 === 1) { this.color[5] = 'white' } else if (res.data[0].车间采购状态 === 2) { this.color[5] = 'yellow' } else if (res.data[0].车间采购状态 === 3) { this.color[5] = 'green' } else if (res.data[0].车间采购状态 === 4) { this.color[5] = 'red' } if (res.data[0].车间采购状态 === 1) { this.color[5] = 'weikaishi' } else if (res.data[0].车间采购状态 === 2) { this.color[5] = 'jixingzhong' } else if (res.data[0].车间采购状态 === 3) { this.color[5] = 'yiwancheng' } else if (res.data[0].车间采购状态 === 4) { this.color[5] = 'red' }
if (res.data[0].外购备料状态 === 1) { this.color[6] = 'white' } else if (res.data[0].外购备料状态 === 2) { this.color[6] = 'yellow' } else if (res.data[0].外购备料状态 === 3) { this.color[6] = 'green' } else if (res.data[0].外购备料状态 === 4) { this.color[6] = 'red' } if (res.data[0].外购备料状态 === 1) { this.color[6] = 'weikaishi' } else if (res.data[0].外购备料状态 === 2) { this.color[6] = 'jixingzhong' } else if (res.data[0].外购备料状态 === 3) { this.color[6] = 'yiwancheng' } else if (res.data[0].外购备料状态 === 4) { this.color[6] = 'red' }
if (res.data[0].自家备料状态 === 1) { this.color[7] = 'white' } else if (res.data[0].自家备料状态 === 2) { this.color[7] = 'yellow' } else if (res.data[0].自家备料状态 === 3) { this.color[7] = 'green' } else if (res.data[0].自家备料状态 === 4) { this.color[7] = 'red' } if (res.data[0].自家备料状态 === 1) { this.color[7] = 'weikaishi' } else if (res.data[0].自家备料状态 === 2) { this.color[7] = 'jixingzhong' } else if (res.data[0].自家备料状态 === 3) { this.color[7] = 'yiwancheng' } else if (res.data[0].自家备料状态 === 4) { this.color[7] = 'red' }
if (res.data[0].工艺状态 === 1) { this.color[8] = 'white' } else if (res.data[0].工艺状态 === 2) { this.color[8] = 'yellow' } else if (res.data[0].工艺状态 === 3) { this.color[8] = 'green' } else if (res.data[0].工艺状态 === 4) { this.color[8] = 'red' } if (res.data[0].工艺状态 === 1) { this.color[8] = 'weikaishi' } else if (res.data[0].工艺状态 === 2) { this.color[8] = 'jixingzhong' } else if (res.data[0].工艺状态 === 3) { this.color[8] = 'yiwancheng' } else if (res.data[0].工艺状态 === 4) { this.color[8] = 'red' }
if (res.data[0].定额状态 === 1) { this.color[9] = 'white' } else if (res.data[0].定额状态 === 2) { this.color[9] = 'yellow' } else if (res.data[0].定额状态 === 3) { this.color[9] = 'green' } else if (res.data[0].定额状态 === 4) { this.color[9] = 'red' } if (res.data[0].定额状态 === 1) { this.color[9] = 'weikaishi' } else if (res.data[0].定额状态 === 2) { this.color[9] = 'jixingzhong' } else if (res.data[0].定额状态 === 3) { this.color[9] = 'yiwancheng' } else if (res.data[0].定额状态 === 4) { this.color[9] = 'red' }
if (res.data[0].能力平衡状态 === 1) { this.color[10] = 'white' } else if (res.data[0].能力平衡状态 === 2) { this.color[10] = 'yellow' } else if (res.data[0].能力平衡状态 === 3) { this.color[10] = 'green' } else if (res.data[0].能力平衡状态 === 4) { this.color[10] = 'red' } if (res.data[0].能力平衡状态 === 1) { this.color[10] = 'weikaishi' } else if (res.data[0].能力平衡状态 === 2) { this.color[10] = 'jixingzhong' } else if (res.data[0].能力平衡状态 === 3) { this.color[10] = 'yiwancheng' } else if (res.data[0].能力平衡状态 === 4) { this.color[10] = 'red' }
if (res.data[0].工序外协状态 === 1) { this.color[11] = 'white' } else if (res.data[0].工序外协状态 === 2) { this.color[11] = 'yellow' } else if (res.data[0].工序外协状态 === 3) { this.color[11] = 'green' } else if (res.data[0].工序外协状态 === 4) { this.color[11] = 'red' } if (res.data[0].工序外协状态 === 1) { this.color[11] = 'weikaishi' } else if (res.data[0].工序外协状态 === 2) { this.color[11] = 'jixingzhong' } else if (res.data[0].工序外协状态 === 3) { this.color[11] = 'yiwancheng' } else if (res.data[0].工序外协状态 === 4) { this.color[11] = 'red' }
if (res.data[0].车间加工状态 === 1) { this.color[12] = 'white' } else if (res.data[0].车间加工状态 === 2) { this.color[12] = 'yellow' } else if (res.data[0].车间加工状态 === 3) { this.color[12] = 'green' } else if (res.data[0].车间加工状态 === 4) { this.color[12] = 'red' } if (res.data[0].车间加工状态 === 1) { this.color[12] = 'weikaishi' } else if (res.data[0].车间加工状态 === 2) { this.color[12] = 'jixingzhong' } else if (res.data[0].车间加工状态 === 3) { this.color[12] = 'yiwancheng' } else if (res.data[0].车间加工状态 === 4) { this.color[12] = 'red' }
if (res.data[0].采购质检状态 === 1) { this.color[13] = 'white' } else if (res.data[0].采购质检状态 === 2) { this.color[13] = 'yellow' } else if (res.data[0].采购质检状态 === 3) { this.color[13] = 'green' } else if (res.data[0].采购质检状态 === 4) { this.color[13] = 'red' } if (res.data[0].采购质检状态 === 1) { this.color[13] = 'weikaishi' } else if (res.data[0].采购质检状态 === 2) { this.color[13] = 'jixingzhong' } else if (res.data[0].采购质检状态 === 3) { this.color[13] = 'yiwancheng' } else if (res.data[0].采购质检状态 === 4) { this.color[13] = 'red' }
if (res.data[0].自制质检状态 === 1) { this.color[14] = 'white' } else if (res.data[0].自制质检状态 === 2) { this.color[14] = 'yellow' } else if (res.data[0].自制质检状态 === 3) { this.color[14] = 'green' } else if (res.data[0].自制质检状态 === 4) { this.color[14] = 'red' } if (res.data[0].自制质检状态 === 1) { this.color[14] = 'weikaishi' } else if (res.data[0].自制质检状态 === 2) { this.color[14] = 'jixingzhong' } else if (res.data[0].自制质检状态 === 3) { this.color[14] = 'yiwancheng' } else if (res.data[0].自制质检状态 === 4) { this.color[14] = 'red' }
if (res.data[0].成组配套状态 === 1) { this.color[15] = 'white' } else if (res.data[0].成组配套状态 === 2) { this.color[15] = 'yellow' } else if (res.data[0].成组配套状态 === 3) { this.color[15] = 'green' } else if (res.data[0].成组配套状态 === 4) { this.color[15] = 'red' } if (res.data[0].成组配套状态 === 1) { this.color[15] = 'weikaishi' } else if (res.data[0].成组配套状态 === 2) { this.color[15] = 'jixingzhong' } else if (res.data[0].成组配套状态 === 3) { this.color[15] = 'yiwancheng' } else if (res.data[0].成组配套状态 === 4) { this.color[15] = 'red' }
if (res.data[0].油漆状态 === 1) { this.color[16] = 'white' } else if (res.data[0].油漆状态 === 2) { this.color[16] = 'yellow' } else if (res.data[0].油漆状态 === 3) { this.color[16] = 'green' } else if (res.data[0].油漆状态 === 4) { this.color[16] = 'red' } if (res.data[0].油漆状态 === 1) { this.color[16] = 'weikaishi' } else if (res.data[0].油漆状态 === 2) { this.color[16] = 'jixingzhong' } else if (res.data[0].油漆状态 === 3) { this.color[16] = 'yiwancheng' } else if (res.data[0].油漆状态 === 4) { this.color[16] = 'red' }
if (res.data[0].冷作状态 === 1) { this.color[17] = 'white' } else if (res.data[0].冷作状态 === 2) { this.color[17] = 'yellow' } else if (res.data[0].冷作状态 === 3) { this.color[17] = 'green' } else if (res.data[0].冷作状态 === 4) { this.color[17] = 'red' } if (res.data[0].冷作状态 === 1) { this.color[17] = 'weikaishi' } else if (res.data[0].冷作状态 === 2) { this.color[17] = 'jixingzhong' } else if (res.data[0].冷作状态 === 3) { this.color[17] = 'yiwancheng' } else if (res.data[0].冷作状态 === 4) { this.color[17] = 'red' }
if (res.data[0].机械装配状态 === 1) { this.color[18] = 'white' } else if (res.data[0].机械装配状态 === 2) { this.color[18] = 'yellow' } else if (res.data[0].机械装配状态 === 3) { this.color[18] = 'green' } else if (res.data[0].机械装配状态 === 4) { this.color[18] = 'red' } if (res.data[0].机械装配状态 === 1) { this.color[18] = 'weikaishi' } else if (res.data[0].机械装配状态 === 2) { this.color[18] = 'jixingzhong' } else if (res.data[0].机械装配状态 === 3) { this.color[18] = 'yiwancheng' } else if (res.data[0].机械装配状态 === 4) { this.color[18] = 'red' }
if (res.data[0].电气装配状态 === 1) { this.color[19] = 'white' } else if (res.data[0].电气装配状态 === 2) { this.color[19] = 'yellow' } else if (res.data[0].电气装配状态 === 3) { this.color[19] = 'green' } else if (res.data[0].电气装配状态 === 4) { this.color[19] = 'red' } if (res.data[0].电气装配状态 === 1) { this.color[19] = 'weikaishi' } else if (res.data[0].电气装配状态 === 2) { this.color[19] = 'jixingzhong' } else if (res.data[0].电气装配状态 === 3) { this.color[19] = 'yiwancheng' } else if (res.data[0].电气装配状态 === 4) { this.color[19] = 'red' }
if (res.data[0].装配质检状态 === 1) { this.color[20] = 'white' } else if (res.data[0].装配质检状态 === 2) { this.color[20] = 'yellow' } else if (res.data[0].装配质检状态 === 3) { this.color[20] = 'green' } else if (res.data[0].装配质检状态 === 4) { this.color[20] = 'red' } if (res.data[0].装配质检状态 === 1) { this.color[20] = 'weikaishi' } else if (res.data[0].装配质检状态 === 2) { this.color[20] = 'jixingzhong' } else if (res.data[0].装配质检状态 === 3) { this.color[20] = 'yiwancheng' } else if (res.data[0].装配质检状态 === 4) { this.color[20] = 'red' }
if (res.data[0].总装调试状态 === 1) { this.color[21] = 'white' } else if (res.data[0].总装调试状态 === 2) { this.color[21] = 'yellow' } else if (res.data[0].总装调试状态 === 3) { this.color[21] = 'green' } else if (res.data[0].总装调试状态 === 4) { this.color[21] = 'red' } if (res.data[0].总装调试状态 === 1) { this.color[21] = 'weikaishi' } else if (res.data[0].总装调试状态 === 2) { this.color[21] = 'jixingzhong' } else if (res.data[0].总装调试状态 === 3) { this.color[21] = 'yiwancheng' } else if (res.data[0].总装调试状态 === 4) { this.color[21] = 'red' }
if (res.data[0].发货状态 === 1) { this.color[22] = 'white' } else if (res.data[0].发货状态 === 2) { this.color[22] = 'yellow' } else if (res.data[0].发货状态 === 3) { this.color[22] = 'green' } else if (res.data[0].发货状态 === 4) { this.color[22] = 'red' } if (res.data[0].发货状态 === 1) { this.color[22] = 'weikaishi' } else if (res.data[0].发货状态 === 2) { this.color[22] = 'jixingzhong' } else if (res.data[0].发货状态 === 3) { this.color[22] = 'yiwancheng' } else if (res.data[0].发货状态 === 4) { this.color[22] = 'red' }
}) })
}, },
// 查询签订合同div数据 // 查询签订合同div数据
@@ -2268,7 +2368,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select 项目流水号 from PDM_机床名称 where 机床流水号 = ${this.machineValue}` name: `select 项目流水号 from PDM_机床名称 where 机床流水号 = ${this.machineValue1}`
} }
}).then(res => { }).then(res => {
request({ request({
@@ -2338,7 +2438,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue},@计划类型 = 1` name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue1},@计划类型 = 1`
} }
}).then(res => { }).then(res => {
this.tableDataDiv2 = res.data this.tableDataDiv2 = res.data
@@ -2347,7 +2447,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue}` name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue1}`
} }
}).then(res => { }).then(res => {
this.dataDiv2.组件总数 = res.data[0].Column1 this.dataDiv2.组件总数 = res.data[0].Column1
@@ -2356,7 +2456,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue} and 组号 like '9%'` name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue1} and 组号 like '9%'`
} }
}).then(res => { }).then(res => {
this.dataDiv2.整改组数 = res.data[0].Column1 this.dataDiv2.整改组数 = res.data[0].Column1
@@ -2365,7 +2465,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select count(*) from 项目计划管理_组件计划_视图 where 机床流水号 = ${this.machineValue} and 计划类型 = 1 and 实际完成时间 is not null` name: `select count(*) from 项目计划管理_组件计划_视图 where 机床流水号 = ${this.machineValue1} and 计划类型 = 1 and 实际完成时间 is not null`
} }
}).then(res => { }).then(res => {
if (parseInt(this.dataDiv2.整改组数) !== 0) { if (parseInt(this.dataDiv2.整改组数) !== 0) {
@@ -2488,7 +2588,7 @@ export default {
from PDM_零件明细表_基本件 where 是否采购 = 0 and 是否传递 = 0 group by 组件流水号) as c on 综合查询_零件分配模块信息视图.组件流水号 = c.组件流水号 from PDM_零件明细表_基本件 where 是否采购 = 0 and 是否传递 = 0 group by 组件流水号) as c on 综合查询_零件分配模块信息视图.组件流水号 = c.组件流水号
left join (select 组件流水号,count(*) as 外购件未分配个数 left join (select 组件流水号,count(*) as 外购件未分配个数
from PDM_零件明细表_标准件和外购件 where 是否车间采购 = 0 group by 组件流水号) as d on 综合查询_零件分配模块信息视图.组件流水号 = d.组件流水号 from PDM_零件明细表_标准件和外购件 where 是否车间采购 = 0 group by 组件流水号) as d on 综合查询_零件分配模块信息视图.组件流水号 = d.组件流水号
where 机床流水号 = ${this.machineValue} and 组号 <> '00组' order by 组号` where 机床流水号 = ${this.machineValue1} and 组号 <> '00组' order by 组号`
} }
}).then(res => { }).then(res => {
this.tableDataDiv3 = res.data this.tableDataDiv3 = res.data
@@ -2571,7 +2671,7 @@ export default {
left join (select 组件流水号,count(*) as 已传递条数 left join (select 组件流水号,count(*) as 已传递条数
from 车间生产管理工艺_零件工序_投产信息_查询视图 where 是否传递 = 2 group by 组件流水号) as b from 车间生产管理工艺_零件工序_投产信息_查询视图 where 是否传递 = 2 group by 组件流水号) as b
on 综合查询_零件分配模块信息视图.组件流水号 = b.组件流水号 on 综合查询_零件分配模块信息视图.组件流水号 = b.组件流水号
where 机床流水号 = ${this.machineValue} order by 组号` where 机床流水号 = ${this.machineValue1} order by 组号`
} }
}).then(res => { }).then(res => {
this.tableDataDiv4 = res.data this.tableDataDiv4 = res.data
@@ -2658,7 +2758,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue} and 计划类型 = 1 ` name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue1} and 计划类型 = 1 `
} }
}).then(res => { }).then(res => {
this.tableDataDiv5 = res.data this.tableDataDiv5 = res.data
@@ -2668,7 +2768,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select COUNT(*) as 进行中 from 车间管理_工作计划 where 计划类型 = 1 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}` name: `select COUNT(*) as 进行中 from 车间管理_工作计划 where 计划类型 = 1 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue1}`
} }
}).then(res => { }).then(res => {
this.dataDiv5.data1 = res.data[0].进行中 this.dataDiv5.data1 = res.data[0].进行中
@@ -2684,7 +2784,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: ` select COUNT(*) as 已完成 from 车间管理_工作计划 where 计划类型 = 1 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}` name: ` select COUNT(*) as 已完成 from 车间管理_工作计划 where 计划类型 = 1 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue1}`
} }
}).then(res => { }).then(res => {
this.dataDiv5.data2 = res.data[0].已完成 this.dataDiv5.data2 = res.data[0].已完成
@@ -2773,7 +2873,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue} and 计划类型 = 2 ` name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue1} and 计划类型 = 2 `
} }
}).then(res => { }).then(res => {
this.tableDataDiv6 = res.data this.tableDataDiv6 = res.data
@@ -2783,7 +2883,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select COUNT(*) as 进行中 from 车间管理_工作计划 where 计划类型 = 2 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}` name: `select COUNT(*) as 进行中 from 车间管理_工作计划 where 计划类型 = 2 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue1}`
} }
}).then(res => { }).then(res => {
this.dataDiv6.data1 = res.data[0].进行中 this.dataDiv6.data1 = res.data[0].进行中
@@ -2799,7 +2899,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: ` select COUNT(*) as 已完成 from 车间管理_工作计划 where 计划类型 = 2 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}` name: ` select COUNT(*) as 已完成 from 车间管理_工作计划 where 计划类型 = 2 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue1}`
} }
}).then(res => { }).then(res => {
this.dataDiv6.data2 = res.data[0].已完成 this.dataDiv6.data2 = res.data[0].已完成
@@ -2887,7 +2987,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue} and 计划类型 = 3 ` name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue1} and 计划类型 = 3 `
} }
}).then(res => { }).then(res => {
this.tableDataDiv7 = res.data this.tableDataDiv7 = res.data
@@ -2897,7 +2997,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select COUNT(*) as 进行中 from 车间管理_工作计划 where 计划类型 = 3 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}` name: `select COUNT(*) as 进行中 from 车间管理_工作计划 where 计划类型 = 3 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue1}`
} }
}).then(res => { }).then(res => {
this.dataDiv7.data1 = res.data[0].进行中 this.dataDiv7.data1 = res.data[0].进行中
@@ -2913,7 +3013,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: ` select COUNT(*) as 已完成 from 车间管理_工作计划 where 计划类型 = 3 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}` name: ` select COUNT(*) as 已完成 from 车间管理_工作计划 where 计划类型 = 3 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue1}`
} }
}).then(res => { }).then(res => {
this.dataDiv7.data2 = res.data[0].已完成 this.dataDiv7.data2 = res.data[0].已完成
@@ -3001,7 +3101,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue} and 计划类型 = 4 ` name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue1} and 计划类型 = 4 `
} }
}).then(res => { }).then(res => {
this.tableDataDiv8 = res.data this.tableDataDiv8 = res.data
@@ -3011,7 +3111,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select COUNT(*) as 进行中 from 车间管理_工作计划 where 计划类型 = 4 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}` name: `select COUNT(*) as 进行中 from 车间管理_工作计划 where 计划类型 = 4 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue1}`
} }
}).then(res => { }).then(res => {
this.dataDiv8.data1 = res.data[0].进行中 this.dataDiv8.data1 = res.data[0].进行中
@@ -3027,7 +3127,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: ` select COUNT(*) as 已完成 from 车间管理_工作计划 where 计划类型 = 4 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}` name: ` select COUNT(*) as 已完成 from 车间管理_工作计划 where 计划类型 = 4 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue1}`
} }
}).then(res => { }).then(res => {
this.dataDiv8.data2 = res.data[0].已完成 this.dataDiv8.data2 = res.data[0].已完成
@@ -3121,7 +3221,7 @@ export default {
group by 组号,组件名称) as 前几列 group by 组号,组件名称) as 前几列
left join (SELECT 组号,'未完成' as 完成时间 left join (SELECT 组号,'未完成' as 完成时间
from 车间生产管理工艺_零件工艺计划_传递后_视图 from 车间生产管理工艺_零件工艺计划_传递后_视图
where 机床流水号 = ${this.machineValue} and isnull(入库数量,0) <> isnull(批次数量,0) where 机床流水号 = ${this.machineValue1} and isnull(入库数量,0) <> isnull(批次数量,0)
group by 组号) as 未完成组 group by 组号) as 未完成组
on 前几列.组号 = 未完成组.组号` on 前几列.组号 = 未完成组.组号`
} }
@@ -3141,7 +3241,7 @@ export default {
where 采购管理_采购合同_采购部.是否未通过 = 0 where 采购管理_采购合同_采购部.是否未通过 = 0
) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号 ) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号 left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
WHERE 机床流水号 = N'${this.machineValue}' WHERE 机床流水号 = N'${this.machineValue1}'
union union
SELECT [机床图号] ,[机床流水号] ,[组号] ,[组件名称] ,[组件流水号] ,[零件名称] ,[零件图号] ,规格 ,[零件数量] ,通过的合同.已到货数量 SELECT [机床图号] ,[机床流水号] ,[组号] ,[组件名称] ,[组件流水号] ,[零件名称] ,[零件图号] ,规格 ,[零件数量] ,通过的合同.已到货数量
FROM MRP_计划订单_组件零件清单_基本件_视图 FROM MRP_计划订单_组件零件清单_基本件_视图
@@ -3151,9 +3251,9 @@ export default {
where 采购管理_采购合同_采购部.是否未通过 = 0 where 采购管理_采购合同_采购部.是否未通过 = 0
) as 通过的合同 on 通过的合同.组件零件基本件流水号 = MRP_计划订单_组件零件清单_基本件_视图.组件零件基本件流水号 ) as 通过的合同 on 通过的合同.组件零件基本件流水号 = MRP_计划订单_组件零件清单_基本件_视图.组件零件基本件流水号
left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号 left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
where 机床流水号 = '${this.machineValue}' where 机床流水号 = '${this.machineValue1}'
) as a ) as a
where a.机床流水号 = '${this.machineValue}' where a.机床流水号 = '${this.machineValue1}'
group by a.组号,a.组件名称 group by a.组号,a.组件名称
order by a.组号` order by a.组号`
} }
@@ -3172,7 +3272,7 @@ export default {
dbo.车间管理_车间采购_请购单明细.已到货数量 dbo.车间管理_车间采购_请购单明细.已到货数量
FROM dbo.PDM_组件名称 RIGHT OUTER JOIN FROM dbo.PDM_组件名称 RIGHT OUTER JOIN
dbo.车间管理_车间采购_请购单明细 ON dbo.PDM_组件名称.组件流水号 = dbo.车间管理_车间采购_请购单明细.组件流水号 dbo.车间管理_车间采购_请购单明细 ON dbo.PDM_组件名称.组件流水号 = dbo.车间管理_车间采购_请购单明细.组件流水号
) as a where a.机床流水号 = ${this.machineValue} ) as a where a.机床流水号 = ${this.machineValue1}
group by a.[组号],a.组件名称` group by a.[组号],a.组件名称`
} }
}).then(res => { }).then(res => {
@@ -3213,7 +3313,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue}, @计划类型=4` name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue1}, @计划类型=4`
} }
}).then(res => { }).then(res => {
this.tableDataDiv10 = res.data this.tableDataDiv10 = res.data
@@ -3224,7 +3324,7 @@ export default {
type: '3', type: '3',
name: `select COUNT(*) as 未完成 name: `select COUNT(*) as 未完成
from 项目计划管理_组件计划_视图 from 项目计划管理_组件计划_视图
where 机床流水号 = ${this.machineValue} and 计划类型 = 4 and 实际完成时间 is null` where 机床流水号 = ${this.machineValue1} and 计划类型 = 4 and 实际完成时间 is null`
} }
}).then(res => { }).then(res => {
if (res.data[0].未完成 !== 0) { if (res.data[0].未完成 !== 0) {
@@ -3241,7 +3341,7 @@ export default {
type: '3', type: '3',
name: `select COUNT(*) as 已完成 name: `select COUNT(*) as 已完成
from 项目计划管理_组件计划_视图 from 项目计划管理_组件计划_视图
where 机床流水号 = ${this.machineValue} and 计划类型 = 4 and 实际完成时间 is not null` where 机床流水号 = ${this.machineValue1} and 计划类型 = 4 and 实际完成时间 is not null`
} }
}).then(res => { }).then(res => {
if (res.data[0].已完成 !== 0) { if (res.data[0].已完成 !== 0) {
@@ -3359,7 +3459,7 @@ export default {
*/ */
data: { data: {
type: '3', type: '3',
name: `declare @机床流水号 int = ${this.machineValue} name: `declare @机床流水号 int = ${this.machineValue1}
select *,(case when 100 * 已备料条数/零件条数 = 100 then '' else '——' end) as 完成时间 from ( select *,(case when 100 * 已备料条数/零件条数 = 100 then '' else '——' end) as 完成时间 from (
select case when 已备料条数 = 零件条数 then '完成' else '未完成' end as 状态 select case when 已备料条数 = 零件条数 then '完成' else '未完成' end as 状态
,所有.*,已备料条数 ,所有.*,已备料条数
@@ -3471,7 +3571,7 @@ export default {
,sum([批次数量]) as 零件总数量 ,sum([批次数量]) as 零件总数量
,isnull(sum([不合格数量])/sum([数量]), 0) as 不合格率 ,isnull(sum([不合格数量])/sum([数量]), 0) as 不合格率
,1 - isNull(sum([不合格数量])/sum([数量]), 0) as 合格率 ,1 - isNull(sum([不合格数量])/sum([数量]), 0) as 合格率
FROM [质检管理_基本件数据_查询视图] where 机床流水号 = ${this.machineValue} FROM [质检管理_基本件数据_查询视图] where 机床流水号 = ${this.machineValue1}
group by 组号, 组件名称 order by 组号` group by 组号, 组件名称 order by 组号`
} }
}).then(res => { }).then(res => {
@@ -3520,10 +3620,10 @@ export default {
from ( from (
SELECT 机床流水号,组号,组件名称 SELECT 机床流水号,组号,组件名称
,(select COUNT(*) where 机床流水号 = ${this.machineValue}) as 外购件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1}) as 外购件数
,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) = isnull(零件数量,0)) as 已采购外购件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) = isnull(零件数量,0)) as 已采购外购件数
,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购外购件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购外购件数
,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数外购件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数外购件数
FROM MRP_计划订单_组件零件清单_标准件和外购件_视图 FROM MRP_计划订单_组件零件清单_标准件和外购件_视图
left join ( left join (
select 采购管理_采购合同_采购部.*,组件零件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部 select 采购管理_采购合同_采购部.*,组件零件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部
@@ -3531,7 +3631,7 @@ export default {
where 采购管理_采购合同_采购部.是否未通过 = 0 where 采购管理_采购合同_采购部.是否未通过 = 0
) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号 ) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号 left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
where 机床流水号 is not null and 零件类型 = 2 and 机床流水号 = ${this.machineValue} where 机床流水号 is not null and 零件类型 = 2 and 机床流水号 = ${this.machineValue1}
) as a ) as a
group by 机床流水号,组号,组件名称 order by 组号 group by 机床流水号,组号,组件名称 order by 组号
` `
@@ -3553,10 +3653,10 @@ export default {
from ( from (
SELECT 机床流水号,组号 SELECT 机床流水号,组号
,组件名称 ,组件名称
,(select COUNT(*) where 机床流水号 = ${this.machineValue}) as 标准件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1}) as 标准件数
,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) = isnull(零件数量,0)) as 已采购标准件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) = isnull(零件数量,0)) as 已采购标准件数
,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购标准件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购标准件数
,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数标准件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数标准件数
FROM MRP_计划订单_组件零件清单_标准件和外购件_视图 FROM MRP_计划订单_组件零件清单_标准件和外购件_视图
left join ( left join (
select 采购管理_采购合同_采购部.*,组件零件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部 select 采购管理_采购合同_采购部.*,组件零件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部
@@ -3564,7 +3664,7 @@ export default {
where 采购管理_采购合同_采购部.是否未通过 = 0 where 采购管理_采购合同_采购部.是否未通过 = 0
) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号 ) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号 left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
where 机床流水号 is not null and 零件类型 = 1 and 机床流水号 = ${this.machineValue} where 机床流水号 is not null and 零件类型 = 1 and 机床流水号 = ${this.machineValue1}
) as a ) as a
group by 机床流水号,组号 group by 机床流水号,组号
,组件名称 order by 组号` ,组件名称 order by 组号`
@@ -3584,10 +3684,10 @@ export default {
,SUM(总到货数基本件数 ) as 总到货数基本件数 ,SUM(总到货数基本件数 ) as 总到货数基本件数
from ( from (
SELECT 机床流水号,组号,组件名称 SELECT 机床流水号,组号,组件名称
,(select COUNT(*) where 机床流水号 = ${this.machineValue}) as 基本件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1}) as 基本件数
,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) = isnull(零件数量,0)) as 已采购基本件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) = isnull(零件数量,0)) as 已采购基本件数
,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购基本件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购基本件数
,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数基本件数 ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数基本件数
FROM MRP_计划订单_组件零件清单_基本件_视图 FROM MRP_计划订单_组件零件清单_基本件_视图
left join ( left join (
select 采购管理_采购合同_采购部.*,组件零件基本件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部 select 采购管理_采购合同_采购部.*,组件零件基本件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部
@@ -3595,7 +3695,7 @@ export default {
where 采购管理_采购合同_采购部.是否未通过 = 0 where 采购管理_采购合同_采购部.是否未通过 = 0
) as 通过的合同 on 通过的合同.组件零件基本件流水号 = MRP_计划订单_组件零件清单_基本件_视图.组件零件基本件流水号 ) as 通过的合同 on 通过的合同.组件零件基本件流水号 = MRP_计划订单_组件零件清单_基本件_视图.组件零件基本件流水号
left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号 left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
where 机床流水号 is not null and 机床流水号 = ${this.machineValue} where 机床流水号 is not null and 机床流水号 = ${this.machineValue1}
) as a ) as a
group by 机床流水号,组号,组件名称 order by 组号` group by 机床流水号,组号,组件名称 order by 组号`
} }
@@ -3643,10 +3743,10 @@ export default {
,SUM(已到货基本件数 ) as 总到货数基本件数 ,SUM(已到货基本件数 ) as 总到货数基本件数
from ( from (
select 组号,组件名称, select 组号,组件名称,
(select COUNT(*) where 机床流水号 =${this.machineValue} and 基本件流水号 is not null) as 基本件数, (select COUNT(*) where 机床流水号 =${this.machineValue1} and 基本件流水号 is not null) as 基本件数,
(select COUNT(*) where 机床流水号 =${this.machineValue} and 基本件流水号 is not null and 采购合同明细流水号 is not null) as 已采购基本件数, (select COUNT(*) where 机床流水号 =${this.machineValue1} and 基本件流水号 is not null and 采购合同明细流水号 is not null) as 已采购基本件数,
(select COUNT(*) where 机床流水号 =${this.machineValue} and 基本件流水号 is not null and isnull(零件数量,0) = isnull(已到货数量,0)) as 已到货基本件数 (select COUNT(*) where 机床流水号 =${this.machineValue1} and 基本件流水号 is not null and isnull(零件数量,0) = isnull(已到货数量,0)) as 已到货基本件数
from 车间采购_综合查询视图 where 机床流水号 = ${this.machineValue} from 车间采购_综合查询视图 where 机床流水号 = ${this.machineValue1}
) as a ) as a
group by a.组号,a.组件名称 order by 组号` group by a.组号,a.组件名称 order by 组号`
} }
@@ -3664,10 +3764,10 @@ export default {
,SUM(已到货基本件数 ) as 总到货数基本件数 ,SUM(已到货基本件数 ) as 总到货数基本件数
from ( from (
select 组号,组件名称, select 组号,组件名称,
(select COUNT(*) where 机床流水号 =${this.machineValue} and 标准件和外购件流水号 is not null) as 基本件数, (select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null) as 基本件数,
(select COUNT(*) where 机床流水号 =${this.machineValue} and 标准件和外购件流水号 is not null and 采购合同明细流水号 is not null) as 已采购基本件数, (select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null and 采购合同明细流水号 is not null) as 已采购基本件数,
(select COUNT(*) where 机床流水号 =${this.machineValue} and 标准件和外购件流水号 is not null and isnull(零件数量,0) = isnull(已到货数量,0)) as 已到货基本件数 (select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null and isnull(零件数量,0) = isnull(已到货数量,0)) as 已到货基本件数
from 车间采购_综合查询视图 where 机床流水号 =${this.machineValue} from 车间采购_综合查询视图 where 机床流水号 =${this.machineValue1}
) as a ) as a
group by a.组号,a.组件名称 order by 组号` group by a.组号,a.组件名称 order by 组号`
} }
@@ -3704,10 +3804,10 @@ export default {
this.showDiv22 = false this.showDiv22 = false
this.dataDiv18.yDataA = [] this.dataDiv18.yDataA = []
this.dataDiv18.xData = [] this.dataDiv18.xData = []
ProcessOutsourcing(this.machineValue).then(response => { ProcessOutsourcing(this.machineValue1).then(response => {
this.tableDataDiv18 = response.data this.tableDataDiv18 = response.data
}) })
ProcessProportion(this.machineValue).then(response => { ProcessProportion(this.machineValue1).then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.dataDiv18.xData.push(response.data[i].工艺名称) this.dataDiv18.xData.push(response.data[i].工艺名称)
this.dataDiv18.yDataA.push(response.data[i].零件数量) this.dataDiv18.yDataA.push(response.data[i].零件数量)
@@ -3777,11 +3877,11 @@ export default {
,isnull(sum([不合格数量])/sum([数量]), 0) as 不合格率 ,isnull(sum([不合格数量])/sum([数量]), 0) as 不合格率
,1 - isNull(sum([不合格数量])/sum([数量]), 0) as 合格率 ,1 - isNull(sum([不合格数量])/sum([数量]), 0) as 合格率
FROM ( FROM (
select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件制造部数据_查询视图 where 机床流水号 = ${this.machineValue} select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件制造部数据_查询视图 where 机床流水号 = ${this.machineValue1}
union union
select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件采购部基本件数据_查询视图 where 机床流水号 = ${this.machineValue} select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件采购部基本件数据_查询视图 where 机床流水号 = ${this.machineValue1}
union union
select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件采购部外购件数据_查询视图 where 机床流水号 = ${this.machineValue}) as a select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件采购部外购件数据_查询视图 where 机床流水号 = ${this.machineValue1}) as a
group by a.组号, a.组件名称 order by 组号` group by a.组号, a.组件名称 order by 组号`
} }
}).then(res => { }).then(res => {
@@ -3827,10 +3927,10 @@ export default {
SUM(外购备料到货总数) as 外购备料到货总数, SUM(外购备料到货总数) as 外购备料到货总数,
SUM(外购备料出库总数) as 外购备料出库总数 from SUM(外购备料出库总数) as 外购备料出库总数 from
(select 组号,组件名称, (select 组号,组件名称,
(select COUNT(*) where 机床流水号 = ${this.machineValue}) as 外购备料总数, (select COUNT(*) where 机床流水号 = ${this.machineValue1}) as 外购备料总数,
(select COUNT(*) where 机床流水号 = ${this.machineValue} and 是否到货 = 1) as 外购备料到货总数, (select COUNT(*) where 机床流水号 = ${this.machineValue1} and 是否到货 = 1) as 外购备料到货总数,
(select COUNT(*) where 机床流水号 = ${this.machineValue} and 是否出库 = 1) as 外购备料出库总数 (select COUNT(*) where 机床流水号 = ${this.machineValue1} and 是否出库 = 1) as 外购备料出库总数
from [dbo].[备料管理_采购计划明细_查询数据_视图] where 机床流水号 = ${this.machineValue}) as a from [dbo].[备料管理_采购计划明细_查询数据_视图] where 机床流水号 = ${this.machineValue1}) as a
group by 组号,组件名称` group by 组号,组件名称`
} }
}).then(res => { }).then(res => {
@@ -3878,7 +3978,7 @@ export default {
data: { data: {
type: '3', type: '3',
name: `SELECT * name: `SELECT *
FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue} and 组件流水号 is not null` FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue1} and 组件流水号 is not null`
} }
}).then(res => { }).then(res => {
this.tableDataDiv21 = res.data this.tableDataDiv21 = res.data
@@ -3925,7 +4025,7 @@ export default {
data: { data: {
type: '3', type: '3',
name: `SELECT * name: `SELECT *
FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue} and 组件流水号 is null` FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue1} and 组件流水号 is null`
} }
}).then(res => { }).then(res => {
this.tableDataDiv22 = res.data this.tableDataDiv22 = res.data
@@ -3971,7 +4071,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `declare @机床流水号 int = ${this.machineValue} name: `declare @机床流水号 int = ${this.machineValue1}
select 机床流水号,组号,组件名称,SUM(零件总数) as 零件总数,SUM(未制定零件数) as 未制定零件数,SUM(已制定零件数) as 已制定零件数 from ( select 机床流水号,组号,组件名称,SUM(零件总数) as 零件总数,SUM(未制定零件数) as 未制定零件数,SUM(已制定零件数) as 已制定零件数 from (
--总 --总
select 机床流水号,组号,组件名称 select 机床流水号,组号,组件名称
@@ -4071,7 +4171,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `declare @机床流水号 int = ${this.machineValue} name: `declare @机床流水号 int = ${this.machineValue1}
select 机床流水号 select 机床流水号
,a.组件流水号 ,a.组件流水号
,组号 ,组号
@@ -4190,7 +4290,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `declare @机床流水号 int = ${this.machineValue} name: `declare @机床流水号 int = ${this.machineValue1}
create table #临时表1 create table #临时表1
( (
id int IDENTITY (1,1) not null, id int IDENTITY (1,1) not null,
@@ -4317,7 +4417,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '3', type: '3',
name: `select * from dbo.发货管理_发货单 where 机床流水号 = ${this.machineValue} and 是否发出 = 1` name: `select * from dbo.发货管理_发货单 where 机床流水号 = ${this.machineValue1} and 是否发出 = 1`
} }
}).then(res => { }).then(res => {
this.tableDataDiv23 = res.data this.tableDataDiv23 = res.data
@@ -4331,17 +4431,17 @@ export default {
.red{ .red{
background: red; background: red;
} }
.yellow{ .jixingzhong{
background: #7eaced; background: #7eaced;
color: black; color: black;
font-weight: bold; font-weight: bold;
} }
.green{ .yiwancheng{
background: #ff9759; background: #ff9759;
color: black; color: black;
font-weight: bold; font-weight: bold;
} }
.white{ .weikaishi{
background: #EAEAEA; background: #EAEAEA;
color: black; color: black;
font-weight: bold; font-weight: bold;
@@ -4370,7 +4470,7 @@ export default {
width: 1858px; width: 1858px;
height: 400px; height: 400px;
/*border: 1px solid red;*/ /*border: 1px solid red;*/
background: url('../../../assets/img/img10.png') repeat; background: url('../../../assets/img/img12.png') repeat;
background-repeat:no-repeat; background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%; background-size:100% 100%;-moz-background-size:100% 100%;
} }

57
src/views/Outsourcing/OutsourcingQCSearch/index.vue
View File

@@ -1,15 +1,13 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div slot="header" class="header"> <span style="margin-left: 10px">外协到货单号:</span>
<span>外协到货单号:</span> <el-input v-model="orderNumber" clearable style="width: 200px" size="small"/>
<el-input v-model="orderNumber" clearable style="width: 200px" size="small"/> <span style="margin-left: 10px">外协厂家:</span>
<span>外协厂家:</span> <el-input v-model="outsourcingSupplier" clearable style="width: 200px" size="small"/>
<el-input v-model="outsourcingSupplier" clearable style="width: 200px" size="small"/> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button> <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
</div> <el-table-column label="序号" align="center" width="55" type="index"/>
<el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
<el-table-column label="序号" align="center" width="80" type="index"/>
<el-table-column label="外协到货单号" align="center" min-width="100"> <el-table-column label="外协到货单号" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.外协到货单编号 }} {{ scope.row.外协到货单编号 }}
@@ -37,34 +35,34 @@
@size-change="handleSizeChange1" @size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/> @current-change="handleCurrentChange1"/>
</div> </div>
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries" show-summary border style="width: 100%;min-height: 400px" height="400px" size="mini"> <el-table v-loading="" :data="tableData2" :summary-method="getSummaries" show-summary border stripe style="width: 100%;min-height: 400px" height="400px" size="mini">
<el-table-column label="序号" align="center" width="80" type="index"/> <el-table-column label="序号" align="center" width="50px" type="index"/>
<el-table-column label="零件名称" align="center"> <el-table-column label="零件名称" align="center" min-width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center"> <el-table-column label="零件图号" align="center" min-width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件数量" align="center"> <el-table-column label="零件数量" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="质检人员" align="center"> <el-table-column label="质检人员" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验数量" align="center"> <el-table-column label="检验数量" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.数量 || 0 }} {{ scope.row.数量 || 0 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="不合格数量" align="center"> <el-table-column label="不合格数量" align="center" min-width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.不合格数量 || 0 }} {{ scope.row.不合格数量 || 0 }}
</template> </template>
@@ -74,27 +72,27 @@
{{ scope.row.不合格原因文本 }} {{ scope.row.不合格原因文本 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="处理结果" align="center"> <el-table-column label="处理结果" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.不合格处理文本 }} {{ scope.row.不合格处理文本 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验时间" align="center"> <el-table-column label="检验时间" align="center" min-width="135px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.操作时间 || '—' }} {{ scope.row.操作时间 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="形位" align="center" width="100"> <el-table-column label="形位" align="center" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click"> <el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini"> <el-table :data="gridData" highlight-current-row stripe size="mini">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50px" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="类别"> <el-table-column min-width="150px" align="center" label="类别">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.类别 }} {{ scope.row.类别 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column min-width="100" align="center" label="数值"> <el-table-column min-width="100px" align="center" label="数值">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.数值 }} {{ scope.row.数值 }}
</template> </template>
@@ -109,10 +107,10 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="尺寸" align="center" width="100"> <el-table-column label="尺寸" align="center" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click"> <el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini"> <el-table :data="gridData" highlight-current-row stripe size="mini">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="类别"> <el-table-column min-width="150" align="center" label="类别">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -134,10 +132,10 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外观" align="center" width="100"> <el-table-column label="外观" align="center" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click"> <el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini"> <el-table :data="gridData" highlight-current-row stripe size="mini">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="类别"> <el-table-column min-width="150" align="center" label="类别">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -279,7 +277,4 @@ export default {
</script> </script>
<style scoped> <style scoped>
.header span{
margin: 0 0 0 20px;
}
</style> </style>

14
src/views/PurchasingCenter/PurchaseContractApproval/index.vue
View File

@@ -35,12 +35,13 @@
v-loading="loading1" v-loading="loading1"
:data="tableData1" :data="tableData1"
size="mini" size="mini"
stripe
border border
style="width: 100%;max-height: 300px;" style="width: 100%;max-height: 450px;"
height="300px" height="450px"
highlight-current-row highlight-current-row
@row-click="searchTable2"> @row-click="searchTable2">
<el-table-column type="expand"> <el-table-column label="展开" align="center" type="expand">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form id="table" label-position="left" inline class="demo-table-expand"> <el-form id="table" label-position="left" inline class="demo-table-expand">
<el-row> <el-row>
@@ -98,7 +99,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="100" fixed="right"> <el-table-column label="操作" align="center" min-width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button> <el-button type="primary" size="mini" plain icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -117,7 +118,7 @@
<div style="background-color:white;min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/> <div style="background-color:white;min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
<el-dialog :visible.sync="dialogVisible3" title="审批" center style="min-height: 300px;" width="370px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible3" title="采购合同审批" center style="min-height: 300px;" width="370px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm"> <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="审批是否通过" prop="审批是否通过" center> <el-form-item label="审批是否通过" prop="审批是否通过" center>
<el-select v-model="form2.审批是否通过" size="small"> <el-select v-model="form2.审批是否通过" size="small">
@@ -317,6 +318,9 @@ export default {
.searchForm .el-form-item{ .searchForm .el-form-item{
margin-bottom: 5px; margin-bottom: 5px;
} }
.el-card{
margin: 0px;
}
</style> </style>
<style> <style>
#table .el-form-item { #table .el-form-item {

18
src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
View File

@@ -31,7 +31,7 @@
size="mini" size="mini"
border border
style="width: 100%;max-height: 300px;" style="width: 100%;max-height: 300px;"
height="300px" height="450px"
highlight-current-row highlight-current-row
@row-click="searchTable2"> @row-click="searchTable2">
<el-table-column label="采购合同号" align="center"> <el-table-column label="采购合同号" align="center">
@@ -49,7 +49,7 @@
{{ scope.row.规定到货时间 }} {{ scope.row.规定到货时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" align="center"> <el-table-column label="供应商" align="center" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -71,7 +71,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button> <el-button type="primary" size="mini" plain icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -218,11 +218,12 @@
</div> </div>
</el-card> </el-card>
<el-dialog :visible.sync="dialogVisible2" title="采购员选择" center style="min-height: 300px;" width="40%"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="采购员选择" center style="min-height: 300px;" width="40%">
<el-table <el-table
:data="tableData02" :data="tableData02"
size="small" size="mini"
border border
stripe
style="width: 100%;min-height:300px" style="width: 100%;min-height:300px"
height="300px" height="300px"
highlight-current-row highlight-current-row
@@ -253,7 +254,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogVisible3" title="审批" center style="min-height: 300px;" width="20%"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible3" title="采购合同审批" center style="min-height: 300px;" width="30%">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm"> <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="审批是否通过" prop="审批是否通过" center> <el-form-item label="审批是否通过" prop="审批是否通过" center>
<el-select v-model="form2.审批是否通过" size="small" @change="selectChange"> <el-select v-model="form2.审批是否通过" size="small" @change="selectChange">
@@ -329,7 +330,7 @@ export default {
], ],
disabled: true, disabled: true,
form2: { form2: {
审批是否通过: '', 审批是否通过: '是',
未通过原因: '' 未通过原因: ''
}, },
rules2: { rules2: {
@@ -510,6 +511,9 @@ export default {
.searchForm .el-form-item{ .searchForm .el-form-item{
margin-bottom: 5px; margin-bottom: 5px;
} }
.el-card{
margin: 0px;
}
</style> </style>
<style> <style>
.tableData{ .tableData{