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

20240924

java8
qiezi 1 year ago
parent
7be58c4649
commit
63b40d85d1
5 changed files with 336 additions and 333 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/components/selector/select/BuSelect.vue
  2. 1
      src/main.js
  3. 355
      src/views/modules/fanuc/fanuc.vue
  4. 302
      src/views/modules/fanuc/fanucGroup.vue
  5. 4
      src/views/modules/quote/index.vue

7
src/components/selector/select/BuSelect.vue
View File

@ -32,15 +32,12 @@ export default {
<template>
<el-select v-on="$listeners" v-bind="$attrs" style="width: 100%">
<slot></slot>
<el-option
v-for = "i in userBuList"
:key = "i.id"
:label = "i.sitename"
:label = "i.buDesc"
:value = "i.id">
<span style="float: left;width: 100px">{{ i.sitename }}</span>
<span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 40px">
{{ i.buDesc }}
</span>
</el-option>
</el-select>
</template>

1
src/main.js
View File

@ -21,6 +21,7 @@ import getLodop from '@/utils/LodopFuncs.js'
// import pdf from 'vue-pdf'
import { debounce,throttle} from '@/utils/common.js'
import 'element-ui/lib/theme-chalk/drawer.css';
import 'element-ui/lib/theme-chalk/descriptions.css';
import Viewer from 'v-viewer'
import 'viewerjs/dist/viewer.css'

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

@ -1,58 +1,47 @@
<template>
<div class="mod-config">
<!-- &lt;!&ndash; 收藏 &ndash;&gt;-->
<!-- <div>-->
<!-- <span @click="favoriteFunction()">-->
<!-- <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
<!-- </span>-->
<!-- </div>-->
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<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-input v-model="searchData.buNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'加工中心编码'">
<el-input v-model="searchData.workCenterNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'加工中心名称'">
<el-input v-model="searchData.workCenterDesc" clearable style="width: 120px"></el-input>
</el-form-item>
<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-select>
</el-form-item>
<el-form-item :label="' '">
<el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
<!-- <el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>-->
<!-- <download-excel-->
<!-- :fields="fields()"-->
<!-- :data="exportData"-->
<!-- type="xls"-->
<!-- :name="exportName"-->
<!-- :header="exportHeader"-->
<!-- :footer="exportFooter"-->
<!-- :fetch="createExportData"-->
<!-- :before-generate="startDownload"-->
<!-- :before-finish="finishDownload"-->
<!-- worksheet="导出信息"-->
<!-- class="el-button el-button&#45;&#45;primary el-button&#45;&#45;medium">-->
<!-- {{ "导出" }}-->
<!-- </download-excel>-->
</el-form-item>
</el-form>
<div style="width: 1000px">
<el-form label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-row :gutter="10">
<el-col :span="3">
<el-form-item label="BU">
<bu-select v-model="searchData.buId">
<el-option label="全部" value=""></el-option>
</bu-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="加工中心编码">
<el-input v-model="searchData.workCenterNo" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="加工中心名称">
<el-input v-model="searchData.workCenterDesc" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="状态">
<el-select v-model="searchData.active" style="width: 100%;" placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option label="启用" value="Y"></el-option>
<el-option label="停用" value="N"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label=" ">
<el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 展示列表 -->
<el-table
:height="height"
height="35vh"
:data="dataList"
@row-click="changeData"
:row-style="rowStyle"
@ -66,24 +55,13 @@
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:width="item.columnWidth"
: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-column-->
<!-- fixed="right"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <a type="text" size="small" @click="updateModal1(scope.row)">修改</a>-->
<!-- <a type="text" size="small" @click="deleteModal(scope.row)">删除</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-pagination
@ -96,61 +74,93 @@
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tabs style="height: 45vh" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="详情" name="detail">
<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" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'加工中心名称'">
<el-input v-model="dataList1.workCenterDesc" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'BU'">
<el-input v-model="dataList1.buNo" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'工厂编码'">
<el-input v-model="dataList1.site" readonly style="width: 300px"></el-input>
</el-form-item>
<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 style="margin-top: 15px">
<el-form-item :label="'加工中心类型'">
<el-input v-model="dataList1.workCenterType" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'加工中心组编码'">
<el-input v-model="dataList1.prolineNo" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'平均产能'">
<el-input v-model="dataList1.averageCapacity" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'产能类型'">
<el-input v-model="dataList1.capacityType" readonly style="width: 300px"></el-input>
</el-form-item>
<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 style="margin-top: 15px">
<el-form-item :label="'备注'">
<el-input v-model="dataList1.remark" readonly style="width: 1235px"></el-input>
</el-form-item>
<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 style="margin-top: 15px">
<el-form-item :label="'录入人'">
<el-input v-model="dataList1.createdBy" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'录入时间'">
<el-input v-model="dataList1.createdDate" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'最近修改人'">
<el-input v-model="dataList1.updateBy" readonly style="width: 300px"></el-input>
</el-form-item>
<el-form-item :label="'最近修改时间'">
<el-input v-model="dataList1.updateDate" readonly style="width: 300px"></el-input>
</el-form-item>
<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-tab-pane>
@ -221,50 +231,60 @@
<!-- 新增和修改 -->
<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="workCenterNo" >
<el-input v-model="modalData1.workCenterNo" :disabled="!isNew" style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="单位成本:" prop="unitCost" :rules="rules.unitCost" >
<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 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 v-model="modalData1.laborCost" class="inlineNumber numInput" @input="validateInput" style="width: 221px"></el-input>
</el-form-item>
<el-form-item :label="'启用日期：'" :rules="rules.beginDate">
<el-date-picker
style="width: 221px"
v-model="modalData1.beginDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'结束日期：'" >
<el-date-picker
style="width: 221px"
v-model="modalData1.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="备注:" prop="remake" >
<el-input v-model="modalData.remake" style="width: 221px"></el-input>
</el-form-item>
<el-form label-position="top" :model="modalData1" :rules="rules">
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="加工中心编码" prop="workCenterNo" >
<el-input v-model="modalData1.workCenterNo" :disabled="!isNew"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="单位成本" prop="unitCost">
<el-input-number v-model="modalData1.unitCost" style="width: 100%" :controls="false" :step="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位制造费用成本" prop="overheadCost">
<el-input-number v-model="modalData1.overheadCost" style="width: 100%" :controls="false" :step="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位人工成本" prop="laborCost">
<el-input-number v-model="modalData1.laborCost" style="width: 100%" :controls="false" :step="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'启用日期'">
<el-date-picker
style="width: 100%"
v-model="modalData1.beginDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'结束日期'" >
<el-date-picker
style="width: 100%"
v-model="modalData1.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<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>
</el-col>
</el-row>
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-footer style="height:30px;line-height:30px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
</el-footer>
@ -315,12 +335,14 @@ import {
queryResourceInfo,//机台查询
} from "@/api/fanucGroup/fanuc.js"
import {getSiteAndBuByUserName} from "@/api/eam/eam.js"
import BuSelect from "../../../components/selector/select/BuSelect.vue";
export default {
components: {BuSelect},
data () {
return {
activeName: 'detail',
currentRow: '',
currentRow: {},
headerData: '',
currentRow2: '',
isNew: false,
@ -337,6 +359,7 @@ export default {
searchData: {
site: '',
buNo: '',
buId: '',
workshopId: '',
workCenterNo: '',
workCenterDesc: '',
@ -436,11 +459,11 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 501002,
serialNumber: '501002TableBuNo',
serialNumber: '501002TableBuDesc',
tableId: "501002Table",
tableName: "BU",
columnWidth: 130,
columnProp: 'buNo',
columnProp: 'buDesc',
headerAlign: 'center',
align: "left",
columnLabel: 'Bu',
@ -1228,13 +1251,13 @@ export default {
changeData (row) {
this.currentRow = JSON.parse(JSON.stringify(row));
this.headerData = row;
// this.headerData = row;
if (this.activeName == 'detail') {
this.refreshCurrentTabTable()
} else if (this.activeName == 'cost') {
if (this.activeName === 'detail') {
// this.refreshCurrentTabTable()
} else if (this.activeName === 'cost') {
this.refreshCurrentTabTable2()
} else if (this.activeName == 'resource') {
} else if (this.activeName === 'resource') {
this.refreshCurrentTabTable3()
}
},
@ -1249,9 +1272,8 @@ export default {
findFanuc(this.currentRow).then(({data}) => {
//区分请求成功和失败的状况
if (data && data.code == 0) {
if (data && data.code === 0) {
this.dataList1 = data.rows[0]
console.log("1111111:" + this.dataList1.workshopId)
} else {
this.dataList1 = [];
}
@ -1629,4 +1651,9 @@ export default {
-moz-appearance: textfield;
padding-right: 5px !important;
}
.auto /deep/ .el-form-item__content{
height: auto;
line-height: 1.5;
}
</style>

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

@ -1,54 +1,44 @@
<template>
<div class="mod-config">
<!-- &lt;!&ndash; 收藏 &ndash;&gt;-->
<!-- <div>-->
<!-- <span @click="favoriteFunction()">-->
<!-- <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
<!-- </span>-->
<!-- </div>-->
<!-- 条件查询 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<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-input v-model="searchData.buNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="searchData.status" placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option label="启用" value="Y"></el-option>
<el-option label="禁用" value="N"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'组编码'">
<el-input v-model="searchData.prodLineNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'组名称'">
<el-input v-model="searchData.prodLineDesc" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
<el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>
<!-- <download-excel-->
<!-- :fields="fields()"-->
<!-- :data="exportData"-->
<!-- type="xls"-->
<!-- :name="exportName"-->
<!-- :header="exportHeader"-->
<!-- :footer="exportFooter"-->
<!-- :fetch="createExportData"-->
<!-- :before-generate="startDownload"-->
<!-- :before-finish="finishDownload"-->
<!-- worksheet="导出信息"-->
<!-- class="el-button el-button&#45;&#45;primary el-button&#45;&#45;medium">-->
<!-- {{ "导出" }}-->
<!-- </download-excel>-->
</el-form-item>
</el-form>
<div style="width: 1000px">
<el-form label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-row :gutter="10">
<el-col :span="3">
<el-form-item label="BU">
<bu-select v-model="searchData.buId">
<el-option label="全部" value=""></el-option>
</bu-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="状态">
<el-select v-model="searchData.status" style="width: 100%" placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option label="启用" value="Y"></el-option>
<el-option label="禁用" value="N"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="组编码">
<el-input v-model="searchData.prodLineNo" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="组名称">
<el-input v-model="searchData.prodLineDesc" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label=" ">
<el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
<el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 展示列表 -->
<el-table
@ -67,8 +57,13 @@
: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 v-if="item.columnProp==='status'">
<span > {{ scope.row[item.columnProp] === 'Y'? '启用' : '停用' }}</span>
</template>
<template v-else>
<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>
</template>
</el-table-column>
<el-table-column
@ -96,48 +91,41 @@
<!-- 新增和修改 -->
<el-dialog title="加工中心组" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="400px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工厂编码:" prop="site" :rules="rules.site">
<el-input v-model="modalData.site" style="width: 150px" :disabled="!isNew"></el-input>
</el-form-item>
<!-- <el-form-item label="BU:" prop="buNo" >-->
<!-- <el-input v-model="modalData.buNo" style="width: 221px" :disabled="!isNew"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="BU" prop="bu" :rules="rules.bu">
<el-select v-model="modalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 150px">
<el-option
v-for = "i in userBuList"
:key = "i.buNo"
:label = "i.sitename"
:value = "i.buNo">
<span style="float: left; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
{{ i.buDesc }}
</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="组编码:" prop="prodLineNo" :rules="rules.prodLineNo">
<el-input v-model="modalData.prodLineNo" :disabled="modalDisableFlag" style="width: 150px"></el-input>
</el-form-item>
<el-form-item label="组名称:" prop="prodLineDesc" :rules="rules.prodLineDesc">
<el-input v-model="modalData.prodLineDesc" style="width: 150px"></el-input>
</el-form-item>
<el-form-item label="备注:" prop="remake" >
<el-input v-model="modalData.remake" style="width: 150px"></el-input>
</el-form-item>
<el-form-item label="状态:">
<el-select v-model="modalData.status" placeholder="请选择" style="width: 150px">
<el-option label="启用" value="Y"></el-option>
<el-option label="禁用" value="N"></el-option>
</el-select>
</el-form-item>
<el-form label-position="top" :model="modalData" :rules="rules">
<el-row :gutter="10">
<el-col :span="10">
<el-form-item label="BU" prop="bu">
<bu-select v-model="modalData.buId" :disabled="modalDisableFlag"></bu-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="10">
<el-form-item label="组编码" prop="prodLineNo">
<el-input v-model="modalData.prodLineNo" :disabled="modalDisableFlag"></el-input>
</el-form-item>
</el-col>
<el-col :span="14">
<el-form-item label="组名称" prop="prodLineDesc">
<el-input v-model="modalData.prodLineDesc"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="状态">
<el-select v-model="modalData.status" placeholder="请选择" style="width: 100%">
<el-option label="启用" value="Y"></el-option>
<el-option label="禁用" value="N"></el-option>
</el-select>
</el-form-item>
</el-col>
<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>
</el-col>
</el-row>
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-footer style="height:30px;line-height:30px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
</el-footer>
@ -153,7 +141,9 @@ import {
deleteFanuc, // 检验方法删除
} from "@/api/fanucGroup/fanucGroup.js"
import {getSiteAndBuByUserName} from "@/api/eam/eam.js"
import BuSelect from "../../../components/selector/select/BuSelect.vue";
export default {
components: {BuSelect},
data () {
return {
// 是否收藏
@ -166,7 +156,7 @@ export default {
exportList: [],
// 导出 end
searchData: {
site: this.$store.state.user.site,
site: '',
buNo: '',
prodLineNo: '',
prodLineDesc: '',
@ -177,6 +167,7 @@ export default {
updateDate: '',
remake: '',
status: '',
buId:'',
page: 1,
limit: 10,
},
@ -191,13 +182,14 @@ export default {
modalData: {
site: this.$store.state.user.site,
bu: '',
buId: '',
buNo: '',
prodLineNo: '',
prodLineDesc: '',
active: '',
createBy: this.$store.state.user.name,
createBy: '',
createDate: '',
updateBy: this.$store.state.user.name,
updateBy: '',
updateDate: '',
remake: '',
status: ''
@ -225,14 +217,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 501001,
serialNumber: '501001TableBuNo',
serialNumber: '501001TableBuDesc',
tableId: "501001Table",
tableName: "BU",
columnWidth: 150,
columnProp: 'buNo',
columnProp: 'buDesc',
headerAlign: 'center',
align: "left",
columnLabel: 'Bu',
columnLabel: 'BU',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -458,49 +450,38 @@ export default {
handler: function (newV, oldV) {
this.modalData.prodLineNo = this.modalData.prodLineNo.toUpperCase()
}
},
'modalData.buId'(newVal, oldVal){
let row = this.userBuList.find(item => item.id === newVal);
if (row){
this.modalData.bu = row.buNo
this.modalData.site = row.site
}
},
modalFlag(newVal, oldVal){
if (newVal === false){
this.modalData = {
site: '',
bu: '',
buId: '',
buNo: '',
prodLineNo: '',
prodLineDesc: '',
active: '',
remake: '',
status: ''
}
}
}
},
created () {
//页面在加载的时候就调用查询方法
// 获取用户的 site 和 bu
this.getSiteAndBuByUserName()
this.getDataList()
},
methods: {
// 获取用户的bu
getSiteAndBuByUserName () {
let tempData = {
username: this.$store.state.user.name,
}
getSiteAndBuByUserName(tempData).then(({data}) => {
if (data.code === 0) {
this.userBuList = data.rows
}
this.getDataList()
})
},
// // 初始化组件的参数
// init (currentRow) {
// //初始化参数
// this.pageData = JSON.parse(JSON.stringify(currentRow))
// //打开页面
// this.visible = true
// //判断是否是新增
// if (this.pageData.addFlag === 'Y') {
// this.modalDisableFlag = false
// this.pageData.bu = this.userBuList[0].buNo
// } else {
// this.pageData.bu = this.pageData.site + '_' + this.pageData.buNo
// this.modalDisableFlag = true
// }
// //重置人员信息
// this.pageData.username = this.userId
// },
// 查询获取数据列表
getDataList () {
this.searchData.limit = this.pageSize
@ -521,7 +502,6 @@ export default {
this.pageIndex = 1
this.getDataList()
},
// 当前页
currentChangeHandle (val) {
this.pageIndex = val
@ -530,42 +510,33 @@ export default {
// 新增按钮
addModal () {
this.modalData = {
flag: '1',
site: this.$store.state.user.site,
bu: this.userBuList[0].buNo,
prodLineNo: '',
prodLineDesc: '',
active: '',
createBy: '',
createDate: '',
updateBy: '',
updateDate: '',
remake: '',
status: 'Y',
let params = {
username: this.$store.state.user.name,
}
this.modalDisableFlag = false
this.modalFlag = true
getSiteAndBuByUserName(params).then(({data}) => {
if (data && data.code === 0) {
this.userBuList = data.rows
if (this.userBuList.length > 0){
this.modalData.buId = this.userBuList[0].id
this.modalData.createBy = this.$store.state.user.name
this.modalData.status = 'Y'
}
this.modalDisableFlag = false
this.modalFlag = true
}else {
this.$message.warning(data.msg)
}
}).catch((error)=>{
this.$message.error(error)
})
},
// 修改按钮
updateModal (row) {
this.modalData = {
...row,
flag: '2',
bu: row.site + '_' + row.buNo,
id:row.id,
site: row.site,
creator: this.$store.state.user.name,
buNo: row.buNo,
prodLineNo: row.prodLineNo,
active: row.active,
prodLineDesc: row.prodLineDesc,
createBy: row.createBy,
createDate: row.createDate,
updateBy: row.updateBy,
remake: row.remake,
status: row.status
updateBy: this.$store.state.user.name,
}
this.modalDisableFlag = true
this.modalFlag = true
@ -607,7 +578,7 @@ export default {
this.$message.warning('请输入组名称！')
return
}
if (this.modalData.flag === '1') { // 新增
if (this.modalData.id === undefined) { // 新增
saveFanuc(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@ -795,3 +766,10 @@ export default {
}
}
</script>
<style scoped>
.auto /deep/ .el-form-item__content{
height: auto;
line-height: 1.5;
}
</style>

4
src/views/modules/quote/index.vue
View File

@ -777,7 +777,7 @@ export default {
this.saveQuote.customerNo = newVal.toUpperCase()
},
'saveQuote.projectNo'(newVal, oldVal){
// this.saveQuote.projectNo = newVal.toUpperCase()
this.saveQuote.projectNo = newVal.toUpperCase()
},
saveVisible(newVal, oldVal){
if (newVal === false){
@ -829,7 +829,7 @@ export default {
<el-dialog :title="saveQuote.id? '报价信息:'+ saveQuote.quoteVersionNo : '报价信息'" v-drag :close-on-click-modal="false" :visible.sync="saveVisible" width="500px" >
<el-form ref="saveForm" :model="saveQuote" :rules="saveRules" label-position="top" label-width="100px">
<el-row :gutter="10">
<el-col :span="16">
<el-col :span="8">
<el-form-item label="BU" prop="buId" :show-message="false">
<bu-select v-model="saveQuote.buId" :disabled="saveQuote.id > 0"></bu-select>
</el-form-item>

Write Preview
Loading…
Cancel
Save