|
|
|
@ -10,23 +10,23 @@ |
|
|
|
|
|
|
|
<!-- 条件查询 --> |
|
|
|
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()"> |
|
|
|
<el-form-item :label="'工厂编号:'"> |
|
|
|
<el-form-item :label="'工厂编号'"> |
|
|
|
<el-input v-model="searchData.site" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'BU:'"> |
|
|
|
<el-form-item :label="'BU'"> |
|
|
|
<el-input v-model="searchData.buNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'加工中心编码:'"> |
|
|
|
<el-form-item :label="'加工中心编码'"> |
|
|
|
<el-input v-model="searchData.workCenterNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'加工中心名称:'"> |
|
|
|
<el-form-item :label="'加工中心名称'"> |
|
|
|
<el-input v-model="searchData.workCenterDesc" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="状态:"> |
|
|
|
<el-form-item label="状态"> |
|
|
|
<el-select v-model="searchData.active" placeholder="请选择"> |
|
|
|
<el-option label="全部" value=""></el-option> |
|
|
|
<el-option label="启用" value="Y"></el-option> |
|
|
|
<el-option label="禁用" value="N"></el-option> |
|
|
|
<el-option label="停用" value="N"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
@ -55,6 +55,7 @@ |
|
|
|
:height="height" |
|
|
|
:data="dataList" |
|
|
|
@row-click="changeData" |
|
|
|
|
|
|
|
border |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
@ -79,7 +80,7 @@ |
|
|
|
width="160" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" @click="updateModal(scope.row)">修改</a> |
|
|
|
<a type="text" size="small" @click="updateModal1(scope.row)">修改</a> |
|
|
|
<!-- <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>--> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -97,28 +98,60 @@ |
|
|
|
|
|
|
|
<el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick"> |
|
|
|
<el-tab-pane label="详情" name="detail"> |
|
|
|
<el-table |
|
|
|
:data="dataList1" |
|
|
|
:height="height" |
|
|
|
border |
|
|
|
style="width: 100%; "> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in columnList1" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
:prop="item.columnProp" |
|
|
|
:header-align="item.headerAlign" |
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
:align="item.align" |
|
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
|
:min-width="item.columnWidth" |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" |
|
|
|
style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
<el-form :inline="true" label-position="top" :model="dataList1"> |
|
|
|
<el-row style="margin-top: 15px"> |
|
|
|
<el-form-item :label="'加工中心编码'"> |
|
|
|
<el-input v-model="dataList1.workshopId" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'加工中心名称'"> |
|
|
|
<el-input v-model="dataList1.workCenterDesc" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'BU'"> |
|
|
|
<el-input v-model="dataList1.buNo" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'工厂编码'"> |
|
|
|
<el-input v-model="dataList1.site" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-row> |
|
|
|
|
|
|
|
<el-row style="margin-top: 15px"> |
|
|
|
<el-form-item :label="'加工中心类型'"> |
|
|
|
<el-input v-model="dataList1.workCenterType" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'加工中心组编码'"> |
|
|
|
<el-input v-model="dataList1.prolineNo" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'平均产能'"> |
|
|
|
<el-input v-model="dataList1.averageCapacity" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'产能类型'"> |
|
|
|
<el-input v-model="dataList1.capacityType" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-row> |
|
|
|
|
|
|
|
<el-row style="margin-top: 15px"> |
|
|
|
<el-form-item :label="'备注'"> |
|
|
|
<el-input v-model="dataList1.remark" clearable style="width: 1235px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-row> |
|
|
|
|
|
|
|
<el-row style="margin-top: 15px"> |
|
|
|
<el-form-item :label="'录入人'"> |
|
|
|
<el-input v-model="dataList1.createdBy" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'录入时间'"> |
|
|
|
<el-input v-model="dataList1.createdDate" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'最近修改人'"> |
|
|
|
<el-input v-model="dataList1.updateBy" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'最近修改时间'"> |
|
|
|
<el-input v-model="dataList1.updateDate" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
|
|
</el-form> |
|
|
|
</el-tab-pane> |
|
|
|
|
|
|
|
<el-tab-pane label="成本" name="cost"> |
|
|
|
@ -165,34 +198,28 @@ |
|
|
|
<el-dialog title="成本" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData1" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
|
|
|
|
<el-form-item label="工厂编码:" prop="site" :rules="rules.site"> |
|
|
|
<el-input v-model="modalData1.site" style="width: 221px" :disabled="!isNew"></el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="加工中心编码:" prop="workCenterNo" > |
|
|
|
<el-input v-model="modalData1.workCenterNo" :disabled="!isNew" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="项目号:" prop="itemNo" > |
|
|
|
<el-input type="number" v-model="modalData1.itemNo" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="单位成本:" prop="unitCost" :rules="rules.unitCost" > |
|
|
|
<el-input type="number" v-model="modalData1.unitCost" style="width: 221px"></el-input> |
|
|
|
<el-input v-model="modalData1.unitCost" class="inlineNumber numInput" @input="validateInput" style="width: 221px;text-align:end"></el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="单位制造费用成本:" prop="overheadCost" :rules="rules.overheadCost"> |
|
|
|
<el-input type="number" v-model="modalData1.overheadCost" style="width: 221px"></el-input> |
|
|
|
<el-input v-model="modalData1.overheadCost" class="inlineNumber numInput" @input="validateInput" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="单位人工成本:" prop="laborCost" :rules="rules.laborCost"> |
|
|
|
<el-input type="number" v-model="modalData1.laborCost" style="width: 221px"></el-input> |
|
|
|
<el-input v-model="modalData1.laborCost" class="inlineNumber numInput" @input="validateInput" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item :label="'启用日期：'" > |
|
|
|
<el-form-item :label="'启用日期：'" :rules="rules.beginDate"> |
|
|
|
<el-date-picker |
|
|
|
style="width: 221px" |
|
|
|
v-model="modalData1.beginDate" |
|
|
|
type="datetime" |
|
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
placeholder="选择日期"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
@ -201,18 +228,12 @@ |
|
|
|
<el-date-picker |
|
|
|
style="width: 221px" |
|
|
|
v-model="modalData1.endDate" |
|
|
|
type="datetime" |
|
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
placeholder="选择日期"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<!-- <el-form-item label="启用日期:" prop="beginDate" >--> |
|
|
|
<!-- <el-date-picker v-model="modalData1.beginDate" style="width: 221px"></el-date-picker>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- <el-form-item label="结束日期:" prop="endDate" >--> |
|
|
|
<!-- <el-date-picker v-model="modalData1.endDate" style="width: 221px"></el-date-picker>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
|
|
<el-form-item label="备注:" prop="remake" > |
|
|
|
<el-input v-model="modalData.remake" style="width: 221px"></el-input> |
|
|
|
@ -224,7 +245,34 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 修改 --> |
|
|
|
<el-dialog title="加工中心" :close-on-click-modal="false" v-drag :visible.sync="modalFlag1" width="500px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
|
|
|
|
<el-form-item label="加工中心编码:" prop="workCenterNo" > |
|
|
|
<el-input v-model="modalData.workCenterNo" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="加工中心名称:" prop="workCenterDesc" > |
|
|
|
<el-input v-model="modalData.workCenterDesc" style="width: 221px;text-align:end"></el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="加工中心类型:" prop="workCenterType" > |
|
|
|
<el-input v-model="modalData.workCenterType" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="加工中心组编码:" prop="prolineNo" > |
|
|
|
<el-input v-model="modalData.prolineNo" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="状态:" prop="active" > |
|
|
|
<el-input v-model="modalData.active" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="saveData1()">保存</el-button> |
|
|
|
<el-button type="primary" @click="modalFlag1 = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
@ -233,22 +281,24 @@ |
|
|
|
<script> |
|
|
|
import { |
|
|
|
findAll, // 检验方法查询 |
|
|
|
updateFanuc, // 检验方法修 |
|
|
|
updateFanuc, // 检验方法修改 |
|
|
|
findFanuc,//查询(传的list) |
|
|
|
appendByCost,//成本新增 |
|
|
|
queryByCost, //成本插叙 |
|
|
|
queryByCost, //成本查询 |
|
|
|
amendByCost,//成本修改 |
|
|
|
deleteByCost,//删除成本 |
|
|
|
} from "@/api/fanucGroup/fanuc.js" |
|
|
|
import {getSiteAndBuByUserName} from "@/api/eam/eam.js" |
|
|
|
|
|
|
|
export default { |
|
|
|
data () { |
|
|
|
return { |
|
|
|
activeName:'detail', |
|
|
|
currentRow:'', |
|
|
|
headerData:'', |
|
|
|
currentRow2:'', |
|
|
|
headerData2:'', |
|
|
|
activeName: 'detail', |
|
|
|
currentRow: '', |
|
|
|
headerData: '', |
|
|
|
currentRow2: '', |
|
|
|
isNew: false, |
|
|
|
headerData2: '', |
|
|
|
// 是否收藏 |
|
|
|
favorite: false, |
|
|
|
// 导出 start |
|
|
|
@ -290,11 +340,13 @@ export default { |
|
|
|
totalPage: 0, |
|
|
|
height: 200, |
|
|
|
dataList: [], |
|
|
|
dataList1:[], |
|
|
|
dataList2:[], |
|
|
|
dataList1: [], |
|
|
|
dataList2: [], |
|
|
|
dataListLoading: false, |
|
|
|
modalFlag: false, |
|
|
|
modalDisableFlag: false, |
|
|
|
modalFlag1: false, |
|
|
|
modalDisableFlag1: false, |
|
|
|
modalData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
bu: '', |
|
|
|
@ -321,7 +373,7 @@ export default { |
|
|
|
delflag: '', |
|
|
|
version: '' |
|
|
|
}, |
|
|
|
modalData1:{ |
|
|
|
modalData1: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
workCenterNo: '', |
|
|
|
itemNo: '', |
|
|
|
@ -329,9 +381,10 @@ export default { |
|
|
|
overheadCost: '', |
|
|
|
laborCost: '', |
|
|
|
umId: '', |
|
|
|
beginDate: '', |
|
|
|
beginDate: this.formatDate(new Date()), |
|
|
|
endDate: '', |
|
|
|
remark: '', |
|
|
|
serialNo: '', |
|
|
|
}, |
|
|
|
// 标头展示 |
|
|
|
columnList: [ |
|
|
|
@ -466,12 +519,12 @@ export default { |
|
|
|
functionId: 501002, |
|
|
|
serialNumber: '501002TableCreatedDate', |
|
|
|
tableId: "501002Table", |
|
|
|
tableName: "创建时间", |
|
|
|
tableName: "录入时间", |
|
|
|
columnWidth: 130, |
|
|
|
columnProp: 'createdDate', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "center", |
|
|
|
columnLabel: '创建时间', |
|
|
|
columnLabel: '录入时间', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
@ -484,12 +537,12 @@ export default { |
|
|
|
functionId: 501002, |
|
|
|
serialNumber: '501002TableCreatedBy', |
|
|
|
tableId: "501002Table", |
|
|
|
tableName: "创建人", |
|
|
|
tableName: "录入人", |
|
|
|
columnWidth: 130, |
|
|
|
columnProp: 'createdBy', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "left", |
|
|
|
columnLabel: '创建人', |
|
|
|
columnLabel: '录入人', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
@ -502,12 +555,12 @@ export default { |
|
|
|
functionId: 501002, |
|
|
|
serialNumber: '501002TableUpdateDate', |
|
|
|
tableId: "501002Table", |
|
|
|
tableName: "修改时间", |
|
|
|
tableName: "最近修改时间", |
|
|
|
columnWidth: 130, |
|
|
|
columnProp: 'updateDate', |
|
|
|
columnProp: 'updatedDate', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "left", |
|
|
|
columnLabel: '修改时间', |
|
|
|
columnLabel: '最近修改时间', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
@ -520,12 +573,12 @@ export default { |
|
|
|
functionId: 501002, |
|
|
|
serialNumber: '501002TableUpdateBy', |
|
|
|
tableId: "501002Table", |
|
|
|
tableName: "修改时间", |
|
|
|
tableName: "最近修改人", |
|
|
|
columnWidth: 130, |
|
|
|
columnProp: 'updateBy', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "left", |
|
|
|
columnLabel: '修改时间', |
|
|
|
columnLabel: '最近修改人', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
@ -753,34 +806,34 @@ export default { |
|
|
|
}, |
|
|
|
], |
|
|
|
columnList2: [ |
|
|
|
// { |
|
|
|
// userId: this.$store.state.user.name, |
|
|
|
// functionId: 501002, |
|
|
|
// serialNumber: '501002TableSite', |
|
|
|
// tableId: "501002Table", |
|
|
|
// tableName: "工厂编码", |
|
|
|
// columnWidth: 130, |
|
|
|
// columnProp: 'site', |
|
|
|
// headerAlign: 'center', |
|
|
|
// align: "center", |
|
|
|
// columnLabel: '工厂编码', |
|
|
|
// columnHidden: false, |
|
|
|
// columnImage: false, |
|
|
|
// columnSortable: false, |
|
|
|
// sortLv: 0, |
|
|
|
// status: true, |
|
|
|
// fixed: '', |
|
|
|
// }, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 501002, |
|
|
|
serialNumber: '501002TableSite', |
|
|
|
tableId: "501002Table", |
|
|
|
tableName: "工厂编码", |
|
|
|
columnWidth: 130, |
|
|
|
columnProp: 'site', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "center", |
|
|
|
columnLabel: '工厂编码', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 501002, |
|
|
|
serialNumber: '501002TableId', |
|
|
|
serialNumber: '501002TableItemNo', |
|
|
|
tableId: "501002Table", |
|
|
|
tableName: "序号", |
|
|
|
columnWidth: 130, |
|
|
|
columnProp: 'id', |
|
|
|
columnProp: 'itemNo', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "left", |
|
|
|
align: "right", |
|
|
|
columnLabel: '序号', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
@ -798,7 +851,7 @@ export default { |
|
|
|
columnWidth: 130, |
|
|
|
columnProp: 'unitCost', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "center", |
|
|
|
align: "right", |
|
|
|
columnLabel: '单位成本', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
@ -816,7 +869,7 @@ export default { |
|
|
|
columnWidth: 130, |
|
|
|
columnProp: 'overheadCost', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "center", |
|
|
|
align: "right", |
|
|
|
columnLabel: '单位制造费用成本', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
@ -834,7 +887,7 @@ export default { |
|
|
|
columnWidth: 130, |
|
|
|
columnProp: 'laborCost', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "center", |
|
|
|
align: "right", |
|
|
|
columnLabel: '单位人工成本', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
@ -940,6 +993,13 @@ export default { |
|
|
|
message: ' ', |
|
|
|
trigger: ['blur', 'change'] |
|
|
|
} |
|
|
|
], |
|
|
|
beginDate: [ |
|
|
|
{ |
|
|
|
required: true, |
|
|
|
message: ' ', |
|
|
|
trigger: ['blur', 'change'] |
|
|
|
} |
|
|
|
] |
|
|
|
}, |
|
|
|
options: [], |
|
|
|
@ -954,7 +1014,7 @@ export default { |
|
|
|
|
|
|
|
mounted () { |
|
|
|
this.$nextTick(() => { |
|
|
|
this.height = (window.innerHeight- 260) / 2 |
|
|
|
this.height = (window.innerHeight - 260) / 2 |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
@ -976,6 +1036,22 @@ export default { |
|
|
|
}, |
|
|
|
|
|
|
|
methods: { |
|
|
|
formatDate(date) { |
|
|
|
const year = date.getFullYear(); |
|
|
|
const month = (date.getMonth() + 1).toString().padStart(2, '0'); |
|
|
|
const day = date.getDate().toString().padStart(2, '0'); |
|
|
|
// const hours = date.getHours().toString().padStart(2, '0'); |
|
|
|
// const minutes = date.getMinutes().toString().padStart(2, '0'); |
|
|
|
// const seconds = date.getSeconds().toString().padStart(2, '0'); |
|
|
|
// return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; |
|
|
|
return `${year}-${month}-${day}`; |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
validateInput () { |
|
|
|
// 只保留数字 |
|
|
|
this.inputValue = this.inputValue.replace(/\D/g, ''); |
|
|
|
}, |
|
|
|
// 获取用户的bu |
|
|
|
getSiteAndBuByUserName () { |
|
|
|
let tempData = { |
|
|
|
@ -1018,37 +1094,37 @@ export default { |
|
|
|
|
|
|
|
tabClick (tab, event) { |
|
|
|
// 刷新列表数据 |
|
|
|
if (this.activeName == 'detail'){ |
|
|
|
if (this.activeName == 'detail') { |
|
|
|
this.refreshCurrentTabTable() |
|
|
|
}else if (this.activeName == 'cost'){ |
|
|
|
} else if (this.activeName == 'cost') { |
|
|
|
this.refreshCurrentTabTable2() |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
changeData(row){ |
|
|
|
changeData (row) { |
|
|
|
this.currentRow = JSON.parse(JSON.stringify(row)); |
|
|
|
this.headerData=row; |
|
|
|
this.headerData = row; |
|
|
|
|
|
|
|
if (this.activeName == 'detail'){ |
|
|
|
if (this.activeName == 'detail') { |
|
|
|
this.refreshCurrentTabTable() |
|
|
|
}else if (this.activeName == 'cost'){ |
|
|
|
} else if (this.activeName == 'cost') { |
|
|
|
this.refreshCurrentTabTable2() |
|
|
|
} |
|
|
|
}, |
|
|
|
refreshCurrentTabTable(){ |
|
|
|
refreshCurrentTabTable () { |
|
|
|
|
|
|
|
findFanuc(this.currentRow).then(({data}) => { |
|
|
|
//区分请求成功和失败的状况 |
|
|
|
if (data && data.code == 0) { |
|
|
|
this.dataList1 = data.rows |
|
|
|
this.dataList1 = data.rows[0] |
|
|
|
console.log("1111111:" + this.dataList1.workshopId) |
|
|
|
} else { |
|
|
|
this.dataList1 = []; |
|
|
|
} |
|
|
|
}); |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
refreshCurrentTabTable2(){ |
|
|
|
refreshCurrentTabTable2 () { |
|
|
|
|
|
|
|
queryByCost(this.currentRow).then(({data}) => { |
|
|
|
//区分请求成功和失败的状况 |
|
|
|
@ -1071,7 +1147,7 @@ export default { |
|
|
|
overheadCost: '', |
|
|
|
laborCost: '', |
|
|
|
umId: '', |
|
|
|
beginDate: '', |
|
|
|
beginDate: this.formatDate(new Date()), |
|
|
|
endDate: '', |
|
|
|
remark: '', |
|
|
|
|
|
|
|
@ -1086,7 +1162,7 @@ export default { |
|
|
|
flag: '2', |
|
|
|
site: this.$store.state.user.site, |
|
|
|
workCenterNo: this.currentRow.workCenterNo, |
|
|
|
id:row.id, |
|
|
|
id: row.id, |
|
|
|
itemNo: row.itemNo, |
|
|
|
unitCost: row.unitCost, |
|
|
|
overheadCost: row.overheadCost, |
|
|
|
@ -1110,6 +1186,7 @@ export default { |
|
|
|
deleteByCost(row).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.refreshCurrentTabTable2 () |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
@ -1130,13 +1207,22 @@ export default { |
|
|
|
// 新增/修改方法 |
|
|
|
saveData () { |
|
|
|
if (this.modalData1.flag === '1') { // 新增 |
|
|
|
if (this.modalData1.workCenterNo ==null || this.modalData1.workCenterNo === ''){ |
|
|
|
if (this.modalData1.workCenterNo == null || this.modalData1.workCenterNo === '') { |
|
|
|
this.$message.warning('请选择一条加工中心数据！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData1.beginDate == null || this.modalData1.beginDate === '') { |
|
|
|
this.$message.warning('请选择启用日期！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData1.unitCost == null || this.modalData1.unitCost <0) { |
|
|
|
this.$message.warning('单位成本不能小于0！') |
|
|
|
return |
|
|
|
} |
|
|
|
appendByCost(this.modalData1).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.refreshCurrentTabTable2() |
|
|
|
this.modalFlag = false |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
@ -1155,12 +1241,14 @@ export default { |
|
|
|
amendByCost(this.modalData1).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.refreshCurrentTabTable2() |
|
|
|
this.modalFlag = false |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
duration: 1500, |
|
|
|
onClose: () => { |
|
|
|
|
|
|
|
} |
|
|
|
}) |
|
|
|
} else { |
|
|
|
@ -1171,6 +1259,63 @@ export default { |
|
|
|
}) |
|
|
|
} |
|
|
|
}, |
|
|
|
//加工中心 |
|
|
|
updateModal1 (row) { |
|
|
|
this.modalData = { |
|
|
|
flag: '2', |
|
|
|
site: this.$store.state.user.site, |
|
|
|
id: row.id, |
|
|
|
bu: row.bu, |
|
|
|
buNo: row.buNo, |
|
|
|
workshopId: row.buNo, |
|
|
|
workCenterNo: row.workCenterNo, |
|
|
|
workCenterDesc: row.workCenterDesc, |
|
|
|
workCenterTypeDb: row.workCenterTypeDb, |
|
|
|
workCenterType: row.workCenterType, |
|
|
|
updateBy: this.$store.state.user.name, |
|
|
|
updateDate: row.updateDate, |
|
|
|
averageCapacity: row.averageCapacity, |
|
|
|
efficiency: row.efficiency, |
|
|
|
utilization: row.utilization, |
|
|
|
capacityTypeDb: row.capacityTypeDb, |
|
|
|
capacityType: row.capacityType, |
|
|
|
umid: row.umid, |
|
|
|
active: row.active, |
|
|
|
prolineNo: row.prolineNo, |
|
|
|
needSetupFlag: row.needSetupFlag, |
|
|
|
createdBy: this.$store.state.user.name, |
|
|
|
createdDate: row.createDate, |
|
|
|
remark: row.remark, |
|
|
|
delflag: row.delflag, |
|
|
|
version: row.version |
|
|
|
} |
|
|
|
this.modalDisableFlag1 = true |
|
|
|
this.modalFlag1 = true |
|
|
|
}, |
|
|
|
saveData1 () { |
|
|
|
if (this.modalData.flag === '2') { // 修改 |
|
|
|
updateFanuc(this.modalData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.refreshCurrentTabTable2() |
|
|
|
this.modalFlag1 = false |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
duration: 1500, |
|
|
|
onClose: () => { |
|
|
|
|
|
|
|
} |
|
|
|
}) |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 查询检验类型 |
|
|
|
inspectionTypeSearch () { |
|
|
|
@ -1325,3 +1470,18 @@ export default { |
|
|
|
} |
|
|
|
} |
|
|
|
</script> |
|
|
|
|
|
|
|
<style scoped> |
|
|
|
.numInput /deep/ .el-input__inner{ |
|
|
|
text-align: right; |
|
|
|
} |
|
|
|
/deep/ .inlineNumber input::-webkit-outer-spin-button, |
|
|
|
/deep/ .inlineNumber input::-webkit-inner-spin-button { |
|
|
|
-webkit-appearance: none; |
|
|
|
|
|
|
|
} |
|
|
|
/deep/ .inlineNumber input[type="number"]{ |
|
|
|
-moz-appearance: textfield; |
|
|
|
padding-right: 5px !important; |
|
|
|
} |
|
|
|
</style> |
