wilson
/
xujiecloud-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

20240925

java8
qiezi 1 year ago
parent
f31b5f4b47
commit
989785fddc
3 changed files with 185 additions and 233 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      src/views/modules/fanuc/currency.vue
  2. 313
      src/views/modules/fanuc/fanuc.vue
  3. 38
      src/views/modules/fanuc/fanucGroup.vue

67
src/views/modules/fanuc/currency.vue
View File

@ -7,7 +7,7 @@
<el-form-item label="工厂编号"> <el-form-item label="工厂编号">
<el-select v-model="searchData.site" style="width: 100%"> <el-select v-model="searchData.site" style="width: 100%">
<el-option label="全部" value=" "></el-option> <el-option label="全部" value=" "></el-option>
<el-option :label="site.sitename" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
<el-option :label="site.siteid" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -73,11 +73,11 @@
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="160"
min-width="120"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<a type="text" size="small" @click="updateModal(scope.row)">修改</a>
<a type="text" size="small" @click="deleteModal(scope.row)">删除</a>
<a type="text" @click="updateModal(scope.row)">修改</a>
<a type="text" @click="deleteModal(scope.row)">删除</a>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -191,7 +191,7 @@
<el-col :span="10"> <el-col :span="10">
<el-form-item label="工厂编码" prop="site"> <el-form-item label="工厂编码" prop="site">
<el-select v-model="modalData.site" :disabled="modalDisableFlag" style="width: 100%"> <el-select v-model="modalData.site" :disabled="modalDisableFlag" style="width: 100%">
<el-option :label="site.sitename" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
<el-option :label="site.siteid" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -230,19 +230,10 @@
<!-- 货币参考新增和修改 --> <!-- 货币参考新增和修改 -->
<el-dialog title="货币参考" :close-on-click-modal="false" v-drag :visible.sync="modalFlag1" width="500px">
<el-dialog title="货币参考" :close-on-click-modal="false" v-drag :visible.sync="modalFlag1" width="300px">
<el-form label-position="top" :model="modalData1" :rules="rules" > <el-form label-position="top" :model="modalData1" :rules="rules" >
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="10">
<el-form-item label="工厂编码" prop="site">
<el-select v-model="modalData1.site" disabled style="width: 100%">
<el-option :label="site.sitename" :value="site.siteid" v-for="(site) in siteList" :key="site.siteid"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="10">
<el-col :span="12">
<el-form-item label="参考货币" prop="currency"> <el-form-item label="参考货币" prop="currency">
<template slot="label"> <template slot="label">
<a @click="handleClickCurrency">参考货币</a> <a @click="handleClickCurrency">参考货币</a>
@ -250,23 +241,11 @@
<el-input v-model="modalData1.currency" @blur="handleBlurCurrency"></el-input> <el-input v-model="modalData1.currency" @blur="handleBlurCurrency"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="14">
<el-col :span="24">
<el-form-item label="参考货币描述" prop="currencyDesc"> <el-form-item label="参考货币描述" prop="currencyDesc">
<el-input v-model="modalData1.currencyDesc" disabled></el-input> <el-input v-model="modalData1.currencyDesc" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10">
<el-form-item label="最近汇率日期" >
<el-date-picker
style="width: 100%"
v-model="modalData1.createDate"
type="date"
disabled
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-footer style="height:30px;line-height:30px;text-align:center"> <el-footer style="height:30px;line-height:30px;text-align:center">
@ -279,7 +258,7 @@
<el-dialog title="货币汇率" top="20vh" :close-on-click-modal="false" v-drag :visible.sync="modalFlag2" width="200px"> <el-dialog title="货币汇率" top="20vh" :close-on-click-modal="false" v-drag :visible.sync="modalFlag2" width="200px">
<el-form label-position="top" :model="modalData2" :rules="rules"> <el-form label-position="top" :model="modalData2" :rules="rules">
<el-form-item label="汇率:" prop="exchangeRate"> <el-form-item label="汇率:" prop="exchangeRate">
<el-input-number v-model="modalData2.exchangeRate" style="width: 100%;" :controls="false" :step="0" :precision="4"></el-input-number>
<el-input-number v-model="modalData2.exchangeRate" style="width: 50%;" :controls="false" :step="0" :precision="4"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="启用日期" > <el-form-item label="启用日期" >
@ -464,7 +443,7 @@ export default {
serialNumber: '501004TableSite', serialNumber: '501004TableSite',
tableId: '501004Table', tableId: '501004Table',
tableName: '工厂编码', tableName: '工厂编码',
columnWidth: 160,
columnWidth: 100,
columnProp: 'site', columnProp: 'site',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
@ -482,7 +461,7 @@ export default {
serialNumber: '501004TableCurrency', serialNumber: '501004TableCurrency',
tableId: '501004Table', tableId: '501004Table',
tableName: '货币', tableName: '货币',
columnWidth: 160,
columnWidth: 120,
columnProp: 'currency', columnProp: 'currency',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
@ -500,7 +479,7 @@ export default {
serialNumber: '501004TableCurrencyDesc', serialNumber: '501004TableCurrencyDesc',
tableId: '501004Table', tableId: '501004Table',
tableName: '货币描述', tableName: '货币描述',
columnWidth: 160,
columnWidth: 180,
columnProp: 'currencyDesc', columnProp: 'currencyDesc',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
@ -518,7 +497,7 @@ export default {
serialNumber: '501004TableBaseCurrencyFlag', serialNumber: '501004TableBaseCurrencyFlag',
tableId: '501004Table', tableId: '501004Table',
tableName: '本位币', tableName: '本位币',
columnWidth: 160,
columnWidth: 120,
columnProp: 'baseCurrencyFlag', columnProp: 'baseCurrencyFlag',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
@ -536,7 +515,7 @@ export default {
serialNumber: '501004TableActive', serialNumber: '501004TableActive',
tableId: '501004Table', tableId: '501004Table',
tableName: '状态', tableName: '状态',
columnWidth: 160,
columnWidth: 100,
columnProp: 'active', columnProp: 'active',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
@ -593,7 +572,7 @@ export default {
columnWidth: 160, columnWidth: 160,
columnProp: 'updateDate', columnProp: 'updateDate',
headerAlign: 'center', headerAlign: 'center',
align: 'left',
align: 'center',
columnLabel: '修改时间', columnLabel: '修改时间',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -628,11 +607,11 @@ export default {
serialNumber: '501004TableCurrency', serialNumber: '501004TableCurrency',
tableId: '501004Table', tableId: '501004Table',
tableName: '货币', tableName: '货币',
columnWidth: 160,
columnWidth: 100,
columnProp: 'currency', columnProp: 'currency',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
columnLabel: '货币',
columnLabel: '参考货币',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -650,7 +629,7 @@ export default {
columnProp: 'currencyDesc', columnProp: 'currencyDesc',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
columnLabel: '货币描述',
columnLabel: '参考货币描述',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -664,10 +643,10 @@ export default {
serialNumber: '501004TableCreatDate', serialNumber: '501004TableCreatDate',
tableId: '501004Table', tableId: '501004Table',
tableName: '最近汇率日期', tableName: '最近汇率日期',
columnWidth: 160,
columnWidth: 120,
columnProp: 'createDate', columnProp: 'createDate',
headerAlign: 'center', headerAlign: 'center',
align: 'left',
align: 'center',
columnLabel: '最近汇率日期', columnLabel: '最近汇率日期',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -702,10 +681,10 @@ export default {
serialNumber: '501004TableActivationDate', serialNumber: '501004TableActivationDate',
tableId: '501004Table', tableId: '501004Table',
tableName: '启用日期', tableName: '启用日期',
columnWidth: 140,
columnWidth: 100,
columnProp: 'activationDate', columnProp: 'activationDate',
headerAlign: 'center', headerAlign: 'center',
align: 'left',
align: 'center',
columnLabel: '启用日期', columnLabel: '启用日期',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -720,7 +699,7 @@ export default {
serialNumber: '501004TableCreateDate', serialNumber: '501004TableCreateDate',
tableId: '501004Table', tableId: '501004Table',
tableName: '录入时间', tableName: '录入时间',
columnWidth: 110,
columnWidth: 140,
columnProp: 'createDate', columnProp: 'createDate',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',

313
src/views/modules/fanuc/fanuc.vue
View File

@ -41,7 +41,7 @@
<!-- 展示列表 --> <!-- 展示列表 -->
<el-table <el-table
height="35vh"
height="42vh"
:data="dataList" :data="dataList"
@row-click="changeData" @row-click="changeData"
:row-style="rowStyle" :row-style="rowStyle"
@ -59,11 +59,12 @@
:label="item.columnLabel"> :label="item.columnLabel">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="item.columnProp==='active'"> <template v-if="item.columnProp==='active'">
<span > {{ scope.row[item.columnProp] === 'Y'? '启用' : '停用' }}</span>
<span> {{ scope.row[item.columnProp] === 'Y' ? '启用' : '停用' }}</span>
</template> </template>
<template v-else> <template v-else>
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span> <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>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
@ -79,101 +80,97 @@
layout="total, sizes, prev, pager, next, jumper"> layout="total, sizes, prev, pager, next, jumper">
</el-pagination> </el-pagination>
<el-tabs style="height: 45vh" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tabs style="height: 40vh" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="详情" name="detail"> <el-tab-pane label="详情" name="detail">
<el-form label-position="top" :model="currentRow"> <el-form label-position="top" :model="currentRow">
<el-row :gutter="10">
<el-col :span="3">
<el-form-item label="工厂编码">
<el-input v-model="currentRow.site" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="BU">
<el-input v-model="currentRow.buDesc" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item :label="'加工中心编码'">
<el-input v-model="currentRow.workshopId" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'加工中心名称'">
<el-input v-model="currentRow.workCenterDesc" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item :label="'加工中心类型'">
<el-input v-model="currentRow.workCenterType" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="机台数量">
<el-input v-model="currentRow.resourceCount" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item :label="'加工中心组编码'">
<el-input v-model="currentRow.prolineNo" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item :label="'平均产能'">
<el-input v-model="currentRow.averageCapacity" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item :label="'产能类型'">
<el-input v-model="currentRow.capacityType" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item :label="'录入时间'">
<el-input v-model="currentRow.createdDate" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item :label="'录入人'">
<el-input v-model="currentRow.createdBy" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item :label="'最近修改时间'">
<el-input v-model="currentRow.updateDate" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item :label="'最近修改人'">
<el-input v-model="currentRow.updateBy" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item :label="'备注'" class="auto">
<el-input v-model="currentRow.remark" :rows="3" type="textarea"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item label="工厂编码">
<el-input v-model="currentRow.site" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="BU">
<el-input v-model="currentRow.buDesc" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item :label="'加工中心编码'">
<el-input v-model="currentRow.workshopId" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'加工中心名称'">
<el-input v-model="currentRow.workCenterDesc" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item :label="'加工中心类型'">
<el-input v-model="currentRow.workCenterType" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="机台数量">
<el-input v-model="currentRow.resourceCount" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item :label="'加工中心组编码'">
<el-input v-model="currentRow.prolineNo" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item :label="'平均产能'">
<el-input v-model="currentRow.averageCapacity" class="numInput" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item :label="'产能类型'">
<el-input v-model="currentRow.capacityType" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="3">
<el-form-item :label="'录入时间'">
<el-input v-model="currentRow.createdDate" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item :label="'录入人'">
<el-input v-model="currentRow.createdBy" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item :label="'最近修改时间'">
<el-input v-model="currentRow.updatedDate" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item :label="'最近修改人'">
<el-input v-model="currentRow.updateBy" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="15">
<el-form-item :label="'备注'" class="auto">
<el-input v-model="currentRow.remark" readonly resize='none' :rows="3" type="textarea"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="成本" name="cost"> <el-tab-pane label="成本" name="cost">
<el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button> <el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>
<el-table <el-table
:data="dataList2" :data="dataList2"
:height="height"
height="33vh"
border border
style="width: 100%; "> style="width: 100%; ">
<el-table-column <el-table-column
@ -209,7 +206,7 @@
<el-tab-pane label="机台" name="resource"> <el-tab-pane label="机台" name="resource">
<el-table <el-table
:data="dataList3" :data="dataList3"
:height="height + 25"
height="35vh"
border border
style="width: 100%; "> style="width: 100%; ">
<el-table-column <el-table-column
@ -233,13 +230,12 @@
</el-tabs> </el-tabs>
<!-- 新增和修改 --> <!-- 新增和修改 -->
<el-dialog title="成本" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px"> <el-dialog title="成本" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form label-position="top" :model="modalData1" :rules="rules"> <el-form label-position="top" :model="modalData1" :rules="rules">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="加工中心编码" prop="workCenterNo" >
<el-form-item label="加工中心编码" prop="workCenterNo">
<el-input v-model="modalData1.workCenterNo" :disabled="!isNew"></el-input> <el-input v-model="modalData1.workCenterNo" :disabled="!isNew"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -247,17 +243,20 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单位成本" prop="unitCost"> <el-form-item label="单位成本" prop="unitCost">
<el-input-number v-model="modalData1.unitCost" style="width: 100%" :controls="false" :step="0"></el-input-number>
<el-input-number v-model="modalData1.unitCost" style="width: 100%" :controls="false"
:step="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单位制造费用成本" prop="overheadCost"> <el-form-item label="单位制造费用成本" prop="overheadCost">
<el-input-number v-model="modalData1.overheadCost" style="width: 100%" :controls="false" :step="0"></el-input-number>
<el-input-number v-model="modalData1.overheadCost" style="width: 100%" :controls="false"
:step="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单位人工成本" prop="laborCost"> <el-form-item label="单位人工成本" prop="laborCost">
<el-input-number v-model="modalData1.laborCost" style="width: 100%" :controls="false" :step="0"></el-input-number>
<el-input-number v-model="modalData1.laborCost" style="width: 100%" :controls="false"
:step="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -272,7 +271,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'结束日期'" >
<el-form-item :label="'结束日期'">
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="modalData1.endDate" v-model="modalData1.endDate"
@ -283,8 +282,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" class="auto" >
<el-input v-model="modalData.remark" :rows="3" type="textarea"></el-input>
<el-form-item label="备注" class="auto">
<el-input v-model="modalData.remark" :rows="3" type="textarea"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -297,25 +296,26 @@
<!-- 修改 --> <!-- 修改 -->
<el-dialog title="加工中心" :close-on-click-modal="false" v-drag :visible.sync="modalFlag1" width="500px"> <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 :inline="true" label-position="top" :model="modalData" :rules="rules"
style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="加工中心编码:" prop="workCenterNo" >
<el-form-item label="加工中心编码:" prop="workCenterNo">
<el-input v-model="modalData.workCenterNo" style="width: 221px"></el-input> <el-input v-model="modalData.workCenterNo" style="width: 221px"></el-input>
</el-form-item> </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 label="加工中心名称:" prop="workCenterDesc">
<el-input v-model="modalData.workCenterDesc" style="width: 221px;text-align:end"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="加工中心类型:" prop="workCenterType" >
<el-input v-model="modalData.workCenterType" style="width: 221px"></el-input>
<el-form-item label="加工中心类型:" prop="workCenterType">
<el-input v-model="modalData.workCenterType" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="加工中心组编码:" prop="prolineNo" >
<el-input v-model="modalData.prolineNo" style="width: 221px"></el-input>
<el-form-item label="加工中心组编码:" prop="prolineNo">
<el-input v-model="modalData.prolineNo" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="状态:" prop="active" >
<el-input v-model="modalData.active" style="width: 221px"></el-input>
<el-form-item label="状态:" prop="active">
<el-input v-model="modalData.active" style="width: 221px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center"> <el-footer style="height:40px;margin-top: 20px;text-align:center">
@ -344,7 +344,7 @@ import BuSelect from "../../../components/selector/select/BuSelect.vue";
export default { export default {
components: {BuSelect}, components: {BuSelect},
data () {
data() {
return { return {
activeName: 'detail', activeName: 'detail',
currentRow: {}, currentRow: {},
@ -449,7 +449,7 @@ export default {
serialNumber: '501002TableSite', serialNumber: '501002TableSite',
tableId: "501002Table", tableId: "501002Table",
tableName: "工厂编码", tableName: "工厂编码",
columnWidth: 130,
columnWidth: 80,
columnProp: 'site', columnProp: 'site',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",
@ -471,7 +471,7 @@ export default {
columnProp: 'buDesc', columnProp: 'buDesc',
headerAlign: 'center', headerAlign: 'center',
align: "left", align: "left",
columnLabel: 'Bu',
columnLabel: 'BU',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -575,7 +575,7 @@ export default {
serialNumber: '501002TableActive', serialNumber: '501002TableActive',
tableId: "501002Table", tableId: "501002Table",
tableName: "状态", tableName: "状态",
columnWidth: 130,
columnWidth: 80,
columnProp: 'active', columnProp: 'active',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",
@ -1097,7 +1097,7 @@ export default {
status: true, status: true,
fixed: '', fixed: '',
}, },
],
],
rules: { rules: {
prodLineNo: [ prodLineNo: [
{ {
@ -1159,7 +1159,7 @@ export default {
} }
}, },
mounted () {
mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.height = (window.innerHeight - 260) / 2 this.height = (window.innerHeight - 260) / 2
}) })
@ -1175,7 +1175,7 @@ export default {
} }
}, },
created () {
created() {
//页面在加载的时候就调用查询方法 //页面在加载的时候就调用查询方法
this.getDataList() this.getDataList()
// 获取用户的 site 和 bu // 获取用户的 site 和 bu
@ -1195,12 +1195,12 @@ export default {
}, },
validateInput () {
validateInput() {
// 只保留数字 // 只保留数字
this.inputValue = this.inputValue.replace(/\D/g, ''); this.inputValue = this.inputValue.replace(/\D/g, '');
}, },
// 获取用户的bu // 获取用户的bu
getSiteAndBuByUserName () {
getSiteAndBuByUserName() {
let tempData = { let tempData = {
username: this.$store.state.user.name, username: this.$store.state.user.name,
} }
@ -1212,7 +1212,7 @@ export default {
}, },
// 查询获取数据列表 // 查询获取数据列表
getDataList () {
getDataList() {
this.searchData.limit = this.pageSize this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex this.searchData.page = this.pageIndex
findAll(this.searchData).then(({data}) => { findAll(this.searchData).then(({data}) => {
@ -1222,28 +1222,28 @@ export default {
this.pageSize = data.page.pageSize this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount this.totalPage = data.page.totalCount
} }
if (this.dataList.length > 0) {
this.currentRow = this.dataList[0]
this.refreshCurrentTabTable()
}
if (this.dataList.length > 0) {
this.currentRow = this.dataList[0]
this.refreshCurrentTabTable()
}
}) })
}, },
// 每页数 // 每页数
sizeChangeHandle (val) {
sizeChangeHandle(val) {
this.pageSize = val this.pageSize = val
this.pageIndex = 1 this.pageIndex = 1
this.getDataList() this.getDataList()
}, },
// 当前页 // 当前页
currentChangeHandle (val) {
currentChangeHandle(val) {
this.pageIndex = val this.pageIndex = val
this.getDataList() this.getDataList()
}, },
//页签二插查询 //页签二插查询
tabClick (tab, event) {
tabClick(tab, event) {
// 刷新列表数据 // 刷新列表数据
if (this.activeName == 'detail') { if (this.activeName == 'detail') {
this.refreshCurrentTabTable() this.refreshCurrentTabTable()
@ -1254,7 +1254,7 @@ export default {
} }
}, },
changeData (row) {
changeData(row) {
this.currentRow = JSON.parse(JSON.stringify(row)); this.currentRow = JSON.parse(JSON.stringify(row));
// this.headerData = row; // this.headerData = row;
@ -1267,13 +1267,13 @@ export default {
} }
}, },
rowStyle ({row}) {
rowStyle({row}) {
if (this.currentRow.workCenterNo === row.workCenterNo) { if (this.currentRow.workCenterNo === row.workCenterNo) {
return { 'background-color': '#E8F7F6', cursor: 'pointer' };
return {'background-color': '#E8F7F6', cursor: 'pointer'};
} }
}, },
refreshCurrentTabTable () {
refreshCurrentTabTable() {
findFanuc(this.currentRow).then(({data}) => { findFanuc(this.currentRow).then(({data}) => {
//区分请求成功和失败的状况 //区分请求成功和失败的状况
@ -1285,7 +1285,7 @@ export default {
}); });
}, },
refreshCurrentTabTable2 () {
refreshCurrentTabTable2() {
queryByCost(this.currentRow).then(({data}) => { queryByCost(this.currentRow).then(({data}) => {
//区分请求成功和失败的状况 //区分请求成功和失败的状况
@ -1297,7 +1297,7 @@ export default {
}); });
}, },
refreshCurrentTabTable3 () {
refreshCurrentTabTable3() {
queryResourceInfo(this.currentRow).then(({data}) => { queryResourceInfo(this.currentRow).then(({data}) => {
//区分请求成功和失败的状况 //区分请求成功和失败的状况
if (data && data.code == 0) { if (data && data.code == 0) {
@ -1309,7 +1309,7 @@ export default {
}, },
// 新增按钮 // 新增按钮
addModal () {
addModal() {
this.modalData1 = { this.modalData1 = {
flag: '1', flag: '1',
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -1329,7 +1329,7 @@ export default {
}, },
// 修改按钮 // 修改按钮
updateModal (row) {
updateModal(row) {
this.modalData1 = { this.modalData1 = {
flag: '2', flag: '2',
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -1349,7 +1349,7 @@ export default {
}, },
// 删除方法 // 删除方法
deleteModal (row) {
deleteModal(row) {
this.$confirm(`是否删除此数据?`, '提示', { this.$confirm(`是否删除此数据?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -1358,7 +1358,7 @@ export default {
deleteByCost(row).then(({data}) => { deleteByCost(row).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.refreshCurrentTabTable2 ()
this.refreshCurrentTabTable2()
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',
@ -1377,7 +1377,7 @@ export default {
}, },
// 新增/修改方法 // 新增/修改方法
saveData () {
saveData() {
if (this.modalData1.flag === '1') { // 新增 if (this.modalData1.flag === '1') { // 新增
if (this.modalData1.workCenterNo == null || this.modalData1.workCenterNo === '') { if (this.modalData1.workCenterNo == null || this.modalData1.workCenterNo === '') {
this.$message.warning('请选择一条加工中心数据！') this.$message.warning('请选择一条加工中心数据！')
@ -1387,7 +1387,7 @@ export default {
this.$message.warning('请选择启用日期！') this.$message.warning('请选择启用日期！')
return return
} }
if (this.modalData1.unitCost == null || this.modalData1.unitCost <0) {
if (this.modalData1.unitCost == null || this.modalData1.unitCost < 0) {
this.$message.warning('单位成本不能小于0！') this.$message.warning('单位成本不能小于0！')
return return
} }
@ -1432,7 +1432,7 @@ export default {
} }
}, },
//加工中心 //加工中心
updateModal1 (row) {
updateModal1(row) {
this.modalData = { this.modalData = {
flag: '2', flag: '2',
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -1464,7 +1464,7 @@ export default {
this.modalDisableFlag1 = true this.modalDisableFlag1 = true
this.modalFlag1 = true this.modalFlag1 = true
}, },
saveData1 () {
saveData1() {
if (this.modalData.flag === '2') { // 修改 if (this.modalData.flag === '2') { // 修改
updateFanuc(this.modalData).then(({data}) => { updateFanuc(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
@ -1490,7 +1490,7 @@ export default {
// 查询检验类型 // 查询检验类型
inspectionTypeSearch () {
inspectionTypeSearch() {
let tempData = { let tempData = {
site: this.$store.state.user.site site: this.$store.state.user.site
} }
@ -1502,7 +1502,7 @@ export default {
}, },
// 校验用户是否收藏 // 校验用户是否收藏
favoriteIsOk () {
favoriteIsOk() {
let userFavorite = { let userFavorite = {
userId: this.$store.state.user.id, userId: this.$store.state.user.id,
languageCode: this.$i18n.locale languageCode: this.$i18n.locale
@ -1517,7 +1517,7 @@ export default {
}, },
// 收藏 OR 取消收藏 // 收藏 OR 取消收藏
favoriteFunction () {
favoriteFunction() {
let userFavorite = { let userFavorite = {
userId: this.$store.state.user.id, userId: this.$store.state.user.id,
functionId: this.$route.meta.menuId, functionId: this.$route.meta.menuId,
@ -1537,7 +1537,7 @@ export default {
}, },
//导出excel //导出excel
async createExportData () {
async createExportData() {
this.searchData.limit = -1 this.searchData.limit = -1
this.searchData.page = 1 this.searchData.page = 1
await findAll(this.searchData).then(({data}) => { await findAll(this.searchData).then(({data}) => {
@ -1546,13 +1546,13 @@ export default {
return this.exportList return this.exportList
}, },
startDownload () {
startDownload() {
}, },
finishDownload () {
finishDownload() {
}, },
fields () {
fields() {
let json = "{" let json = "{"
this.columnList.forEach((item, index) => { this.columnList.forEach((item, index) => {
if (index == this.columnList.length - 1) { if (index == this.columnList.length - 1) {
@ -1567,7 +1567,7 @@ export default {
}, },
// 动态列开始 获取 用户保存的 格式列 // 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) {
async getTableUserColumn(tableId, columnId) {
let queryTableUser = { let queryTableUser = {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: this.$route.meta.menuId, functionId: this.$route.meta.menuId,
@ -1599,7 +1599,7 @@ export default {
}, },
// 获取 tableDefault 列 // 获取 tableDefault 列
async getColumnList (tableId, columnId) {
async getColumnList(tableId, columnId) {
let queryTable = { let queryTable = {
functionId: this.$route.meta.menuId, functionId: this.$route.meta.menuId,
tableId: tableId, tableId: tableId,
@ -1628,7 +1628,7 @@ export default {
}, },
//获取按钮的权限数据 //获取按钮的权限数据
getButtonAuthData () {
getButtonAuthData() {
let searchFlag = this.isAuth(this.menuId + ":search") let searchFlag = this.isAuth(this.menuId + ":search")
let saveFlag = this.isAuth(this.menuId + ":save") let saveFlag = this.isAuth(this.menuId + ":save")
let updateFlag = this.isAuth(this.menuId + ":update") let updateFlag = this.isAuth(this.menuId + ":update")
@ -1644,20 +1644,11 @@ export default {
</script> </script>
<style scoped> <style scoped>
.numInput /deep/ .el-input__inner{
.numInput /deep/ .el-input__inner {
text-align: right; 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; padding-right: 5px !important;
} }
.auto /deep/ .el-form-item__content{
.auto /deep/ .el-form-item__content {
height: auto; height: auto;
line-height: 1.5; line-height: 1.5;
} }

38
src/views/modules/fanuc/fanucGroup.vue
View File

@ -54,7 +54,7 @@
:show-overflow-tooltip="item.showOverflowTooltip" :show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align" :align="item.align"
:fixed="item.fixed==''?false:item.fixed" :fixed="item.fixed==''?false:item.fixed"
:width="item.columnWidth"
:min-width="item.columnWidth"
:label="item.columnLabel"> :label="item.columnLabel">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="item.columnProp==='status'"> <template v-if="item.columnProp==='status'">
@ -70,11 +70,11 @@
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="160"
min-width="100"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<a type="text" size="small" @click="updateModal(scope.row)">修改</a>
<a type="text" size="small" @click="deleteModal(scope.row)">删除</a>
<a type="text" @click="updateModal(scope.row)">修改</a>
<a type="text" @click="deleteModal(scope.row)">删除</a>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -202,7 +202,7 @@ export default {
serialNumber: '501001TableSite', serialNumber: '501001TableSite',
tableId: "501001Table", tableId: "501001Table",
tableName: "工厂编码", tableName: "工厂编码",
columnWidth: 150,
columnWidth: 80,
columnProp: 'site', columnProp: 'site',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",
@ -220,7 +220,7 @@ export default {
serialNumber: '501001TableBuDesc', serialNumber: '501001TableBuDesc',
tableId: "501001Table", tableId: "501001Table",
tableName: "BU", tableName: "BU",
columnWidth: 150,
columnWidth: 120,
columnProp: 'buDesc', columnProp: 'buDesc',
headerAlign: 'center', headerAlign: 'center',
align: "left", align: "left",
@ -238,7 +238,7 @@ export default {
serialNumber: '501001TableProdLineNo', serialNumber: '501001TableProdLineNo',
tableId: "501001Table", tableId: "501001Table",
tableName: "组编码", tableName: "组编码",
columnWidth: 150,
columnWidth: 120,
columnProp: 'prodLineNo', columnProp: 'prodLineNo',
headerAlign: 'center', headerAlign: 'center',
align: "left", align: "left",
@ -268,24 +268,6 @@ export default {
status: true, status: true,
fixed: '', fixed: '',
}, },
// {
// userId: this.$store.state.user.name,
// functionId: 501001,
// serialNumber: '501001TableActive',
// tableId: "501001Table",
// tableName: "仓库类型",
// columnWidth: 150,
// columnProp: 'active',
// headerAlign: 'center',
// align: "center",
// columnLabel: '仓库类型',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 501001, functionId: 501001,
@ -331,7 +313,7 @@ export default {
columnWidth: 140, columnWidth: 140,
columnProp: 'updateBy', columnProp: 'updateBy',
headerAlign: 'center', headerAlign: 'center',
align: "center",
align: "left",
columnLabel: '修改人', columnLabel: '修改人',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -349,7 +331,7 @@ export default {
columnWidth: 150, columnWidth: 150,
columnProp: 'updateDate', columnProp: 'updateDate',
headerAlign: 'center', headerAlign: 'center',
align: "left",
align: "center",
columnLabel: '修改时间', columnLabel: '修改时间',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -382,7 +364,7 @@ export default {
serialNumber: '501001TableStatus', serialNumber: '501001TableStatus',
tableId: "501001Table", tableId: "501001Table",
tableName: "状态", tableName: "状态",
columnWidth: 125,
columnWidth: 80,
columnProp: 'status', columnProp: 'status',
headerAlign: 'center', headerAlign: 'center',
align: "center", align: "center",

Write Preview
Loading…
Cancel
Save