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

20240926

java8
qiezi 1 year ago
parent
5ede2646a3
commit
39aa16827f
4 changed files with 179 additions and 192 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. 80
      src/views/modules/fanuc/currency.vue
  2. 30
      src/views/modules/fanuc/fanuc.vue
  3. 35
      src/views/modules/fanuc/labor.vue
  4. 4
      src/views/modules/quote/index.vue

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

@ -7,7 +7,8 @@
<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.siteid" :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>
@ -43,7 +44,7 @@
<!-- 展示列表 --> <!-- 展示列表 -->
<el-table <el-table
:height="height"
height="36vh"
:data="dataList" :data="dataList"
@row-click="changeData" @row-click="changeData"
border border
@ -65,7 +66,8 @@
</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>
@ -73,7 +75,7 @@
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
min-width="120"
min-width="100"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<a type="text" @click="updateModal(scope.row)">修改</a> <a type="text" @click="updateModal(scope.row)">修改</a>
@ -93,17 +95,17 @@
</el-pagination> </el-pagination>
<el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card">
<el-tabs style="height: auto;" class="customer-tab" v-model="activeName" type="border-card">
<el-tab-pane label="汇率" name="detail"> <el-tab-pane label="汇率" name="detail">
<el-row style="display: flex">
<el-card style="width: 50%">
<el-col >
<el-row :gutter="10">
<el-col :span="12">
<el-card>
<div>参考货币</div> <div>参考货币</div>
<el-button v-if="!authSave" type="primary" @click="addModal1()">新增</el-button> <el-button v-if="!authSave" type="primary" @click="addModal1()">新增</el-button>
<el-table <el-table
:data="dataList1" :data="dataList1"
@row-click="changeData2" @row-click="changeData2"
:height="height"
height="36vh"
border border
:row-style="rowStyle2" :row-style="rowStyle2"
style="width: 100%; "> style="width: 100%; ">
@ -127,26 +129,25 @@
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="160"
width="80"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <a type="text" size="small" @click="updateModal1(scope.row)">修改</a>--> <!-- <a type="text" size="small" @click="updateModal1(scope.row)">修改</a>-->
<a type="text" size="small" @click="deleteModal1(scope.row)">删除</a> <a type="text" size="small" @click="deleteModal1(scope.row)">删除</a>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-col>
</el-card> </el-card>
<el-card style="width: 50%">
<el-col style="margin-left: 20px">
<el-col>
<span>货币汇率</span>
</el-col> </el-col>
<el-col :span="12">
<el-card>
<div>
<span>货币汇率</span>
</div>
<el-button v-if="!authSave" type="primary" @click="addModal2()">新增</el-button> <el-button v-if="!authSave" type="primary" @click="addModal2()">新增</el-button>
<el-table <el-table
:data="dataList2" :data="dataList2"
:height="height"
height="36vh"
border border
style="width: 100%; "> style="width: 100%; ">
<el-table-column <el-table-column
@ -169,7 +170,7 @@
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="160"
width="80"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <a type="text" size="small" @click="updateModal2(scope.row)">修改</a>--> <!-- <a type="text" size="small" @click="updateModal2(scope.row)">修改</a>-->
@ -177,8 +178,8 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-col>
</el-card> </el-card>
</el-col>
</el-row> </el-row>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -191,7 +192,8 @@
<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.siteid" :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>
@ -255,10 +257,12 @@
</el-dialog> </el-dialog>
<!-- 货币汇率新增和修改 --> <!-- 货币汇率新增和修改 -->
<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: 50%;" :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="启用日期">
@ -443,7 +447,7 @@ export default {
serialNumber: '501004TableSite', serialNumber: '501004TableSite',
tableId: '501004Table', tableId: '501004Table',
tableName: '工厂编码', tableName: '工厂编码',
columnWidth: 100,
columnWidth: 80,
columnProp: 'site', columnProp: 'site',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
@ -461,7 +465,7 @@ export default {
serialNumber: '501004TableCurrency', serialNumber: '501004TableCurrency',
tableId: '501004Table', tableId: '501004Table',
tableName: '货币', tableName: '货币',
columnWidth: 120,
columnWidth: 80,
columnProp: 'currency', columnProp: 'currency',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
@ -479,7 +483,7 @@ export default {
serialNumber: '501004TableCurrencyDesc', serialNumber: '501004TableCurrencyDesc',
tableId: '501004Table', tableId: '501004Table',
tableName: '货币描述', tableName: '货币描述',
columnWidth: 180,
columnWidth: 160,
columnProp: 'currencyDesc', columnProp: 'currencyDesc',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
@ -497,7 +501,7 @@ export default {
serialNumber: '501004TableBaseCurrencyFlag', serialNumber: '501004TableBaseCurrencyFlag',
tableId: '501004Table', tableId: '501004Table',
tableName: '本位币', tableName: '本位币',
columnWidth: 120,
columnWidth: 80,
columnProp: 'baseCurrencyFlag', columnProp: 'baseCurrencyFlag',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
@ -515,7 +519,7 @@ export default {
serialNumber: '501004TableActive', serialNumber: '501004TableActive',
tableId: '501004Table', tableId: '501004Table',
tableName: '状态', tableName: '状态',
columnWidth: 100,
columnWidth: 80,
columnProp: 'active', columnProp: 'active',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
@ -533,7 +537,7 @@ export default {
serialNumber: '501004TableCreateDate', serialNumber: '501004TableCreateDate',
tableId: '501004Table', tableId: '501004Table',
tableName: '录入时间', tableName: '录入时间',
columnWidth: 160,
columnWidth: 120,
columnProp: 'createDate', columnProp: 'createDate',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
@ -551,7 +555,7 @@ export default {
serialNumber: '501004TableCreateBy', serialNumber: '501004TableCreateBy',
tableId: '501004Table', tableId: '501004Table',
tableName: '录入人', tableName: '录入人',
columnWidth: 160,
columnWidth: 80,
columnProp: 'createBy', columnProp: 'createBy',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
@ -569,7 +573,7 @@ export default {
serialNumber: '501004TableUpdateDate', serialNumber: '501004TableUpdateDate',
tableId: '501004Table', tableId: '501004Table',
tableName: '修改时间', tableName: '修改时间',
columnWidth: 160,
columnWidth: 120,
columnProp: 'updateDate', columnProp: 'updateDate',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
@ -587,7 +591,7 @@ export default {
serialNumber: '501004TableUpdateBy', serialNumber: '501004TableUpdateBy',
tableId: '501004Table', tableId: '501004Table',
tableName: '修改人', tableName: '修改人',
columnWidth: 160,
columnWidth: 80,
columnProp: 'updateBy', columnProp: 'updateBy',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
@ -607,7 +611,7 @@ export default {
serialNumber: '501004TableCurrency', serialNumber: '501004TableCurrency',
tableId: '501004Table', tableId: '501004Table',
tableName: '货币', tableName: '货币',
columnWidth: 100,
columnWidth: 80,
columnProp: 'currency', columnProp: 'currency',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
@ -625,7 +629,7 @@ export default {
serialNumber: '501004TableCurrencyDesc', serialNumber: '501004TableCurrencyDesc',
tableId: '501004Table', tableId: '501004Table',
tableName: '货币描述', tableName: '货币描述',
columnWidth: 160,
columnWidth: 140,
columnProp: 'currencyDesc', columnProp: 'currencyDesc',
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
@ -663,7 +667,7 @@ export default {
serialNumber: '501004TableExchangeRate', serialNumber: '501004TableExchangeRate',
tableId: '501004Table', tableId: '501004Table',
tableName: '汇率', tableName: '汇率',
columnWidth: 110,
columnWidth: 80,
columnProp: 'exchangeRate', columnProp: 'exchangeRate',
headerAlign: 'center', headerAlign: 'center',
align: 'right', align: 'right',
@ -699,7 +703,7 @@ export default {
serialNumber: '501004TableCreateDate', serialNumber: '501004TableCreateDate',
tableId: '501004Table', tableId: '501004Table',
tableName: '录入时间', tableName: '录入时间',
columnWidth: 140,
columnWidth: 120,
columnProp: 'createDate', columnProp: 'createDate',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
@ -717,7 +721,7 @@ export default {
serialNumber: '501004TableCreateBy', serialNumber: '501004TableCreateBy',
tableId: '501004Table', tableId: '501004Table',
tableName: '录入人', tableName: '录入人',
columnWidth: 110,
columnWidth: 80,
columnProp: 'createBy', columnProp: 'createBy',
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
@ -782,7 +786,6 @@ export default {
}, },
//货币自动转化成大写 //货币自动转化成大写
watch: { watch: {
modalData: { modalData: {
@ -852,6 +855,7 @@ export default {
this.currentRow = JSON.parse(JSON.stringify(row)) this.currentRow = JSON.parse(JSON.stringify(row))
this.headerData = row this.headerData = row
this.refreshCurrentTabTable() this.refreshCurrentTabTable()
this.changeData2({})
}, },
refreshCurrentTabTable() { refreshCurrentTabTable() {
findRefCurrency(this.currentRow).then(({data}) => { findRefCurrency(this.currentRow).then(({data}) => {
@ -1443,11 +1447,13 @@ export default {
.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-outer-spin-button,
/deep/ .inlineNumber input::-webkit-inner-spin-button { /deep/ .inlineNumber input::-webkit-inner-spin-button {
-webkit-appearance: none; -webkit-appearance: none;
} }
/deep/ .inlineNumber input[type="number"] { /deep/ .inlineNumber input[type="number"] {
-moz-appearance: textfield; -moz-appearance: textfield;
padding-right: 5px !important; padding-right: 5px !important;

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

@ -80,7 +80,7 @@
layout="total, sizes, prev, pager, next, jumper"> layout="total, sizes, prev, pager, next, jumper">
</el-pagination> </el-pagination>
<el-tabs style="height: 40vh" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tabs style="height: auto;min-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-row :gutter="10">
@ -95,19 +95,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<el-form-item :label="'加工中心编码'">
<el-form-item label="加工中心编码">
<el-input v-model="currentRow.workshopId" readonly></el-input> <el-input v-model="currentRow.workshopId" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="'加工中心名称'">
<el-form-item label="加工中心名称">
<el-input v-model="currentRow.workCenterDesc" readonly></el-input> <el-input v-model="currentRow.workCenterDesc" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="3"> <el-col :span="3">
<el-form-item :label="'加工中心类型'">
<el-form-item label="加工中心类型">
<el-input v-model="currentRow.workCenterType" readonly></el-input> <el-input v-model="currentRow.workCenterType" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -117,41 +117,29 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<el-form-item :label="'加工中心组编码'">
<el-form-item label="加工中心组编码">
<el-input v-model="currentRow.prolineNo" readonly></el-input> <el-input v-model="currentRow.prolineNo" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="3"> <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-form-item label="录入时间">
<el-input v-model="currentRow.createdDate" readonly></el-input> <el-input v-model="currentRow.createdDate" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<el-form-item :label="'录入人'">
<el-form-item label="录入人">
<el-input v-model="currentRow.createdBy" readonly></el-input> <el-input v-model="currentRow.createdBy" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<el-form-item :label="'最近修改时间'">
<el-form-item label="最近修改时间">
<el-input v-model="currentRow.updatedDate" readonly></el-input> <el-input v-model="currentRow.updatedDate" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<el-form-item :label="'最近修改人'">
<el-form-item label="最近修改人">
<el-input v-model="currentRow.updateBy" readonly></el-input> <el-input v-model="currentRow.updateBy" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

35
src/views/modules/fanuc/labor.vue
View File

@ -54,7 +54,7 @@
<!-- 展示列表 --> <!-- 展示列表 -->
<el-table <el-table
:height="height"
height="45vh"
:data="dataList" :data="dataList"
ref="laborClassTable" ref="laborClassTable"
@row-click="laborClassClickRow" @row-click="laborClassClickRow"
@ -136,72 +136,58 @@
</el-footer> </el-footer>
</el-dialog> </el-dialog>
<el-tabs v-model="activeName" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card" @tab-click="tabClick" class="customer-tab">
<el-tabs v-model="activeName" style="min-height: 36vh;height: auto" type="border-card" @tab-click="tabClick" class="customer-tab">
<el-tab-pane label="详情" name="detail"> <el-tab-pane label="详情" name="detail">
<el-form label-position="top" :model="dataList1" style="margin-left: 10px;margin-top: 5px;margin-right: 10px">
<div style="padding: 15px">
<el-form label-position="top" :model="dataList1">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="4"> <el-col :span="4">
<div class="grid-content bg-purple">
<el-form-item :label="'人工等级编码'"> <el-form-item :label="'人工等级编码'">
<el-input v-model="dataList1.classNo" readonly></el-input> <el-input v-model="dataList1.classNo" readonly></el-input>
</el-form-item> </el-form-item>
</div>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<div class="grid-content bg-purple">
<el-form-item :label="'人工等级名称'"> <el-form-item :label="'人工等级名称'">
<el-input v-model="dataList1.classDesc" readonly></el-input> <el-input v-model="dataList1.classDesc" readonly></el-input>
</el-form-item> </el-form-item>
</div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<div class="grid-content bg-purple">
<el-form-item :label="'是否在用'"> <el-form-item :label="'是否在用'">
<el-input v-model="dataList1.activeDesc" readonly></el-input> <el-input v-model="dataList1.activeDesc" readonly></el-input>
</el-form-item> </el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="4"> <el-col :span="4">
<div class="grid-content bg-purple">
<el-form-item :label="'创建人'"> <el-form-item :label="'创建人'">
<el-input v-model="dataList1.createdBy" readonly></el-input> <el-input v-model="dataList1.createdBy" readonly></el-input>
</el-form-item> </el-form-item>
</div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="grid-content bg-purple">
<el-form-item :label="'创建时间'"> <el-form-item :label="'创建时间'">
<el-input v-model="dataList1.createdDate" readonly></el-input> <el-input v-model="dataList1.createdDate" readonly></el-input>
</el-form-item> </el-form-item>
</div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="grid-content bg-purple">
<el-form-item :label="'修改人'"> <el-form-item :label="'修改人'">
<el-input v-model="dataList1.updatedBy" readonly></el-input> <el-input v-model="dataList1.updatedBy" readonly></el-input>
</el-form-item> </el-form-item>
</div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="grid-content bg-purple">
<el-form-item :label="'修改时间'"> <el-form-item :label="'修改时间'">
<el-input v-model="dataList1.updatedDate" readonly></el-input> <el-input v-model="dataList1.updatedDate" readonly></el-input>
</el-form-item> </el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="16"> <el-col :span="16">
<div class="grid-content bg-purple">
<el-form-item label="备注" style="height: 80px">
<el-form-item label="备注" class="auto">
<el-input type="textarea" v-model="dataList1.remark" readonly :rows="3" resize='none' show-word-limit></el-input> <el-input type="textarea" v-model="dataList1.remark" readonly :rows="3" resize='none' show-word-limit></el-input>
</el-form-item> </el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="成本" name="cost"> <el-tab-pane label="成本" name="cost">
@ -210,7 +196,7 @@
</div> </div>
<el-table <el-table
:data="dataList2" :data="dataList2"
:height="secondHeight - 54"
height="30vh"
border border
style="width: 100%;margin-top: 5px"> style="width: 100%;margin-top: 5px">
<el-table-column <el-table-column
@ -1194,9 +1180,12 @@ export default {
</script> </script>
<style scoped> <style scoped>
.auto /deep/ .el-form-item__content {
height: auto;
line-height: 1.5;
}
/deep/ .customer-tab .el-tabs__content { /deep/ .customer-tab .el-tabs__content {
padding: 0px !important;
height: 459px;
padding: 0 !important;
} }
.numInput /deep/ .el-input__inner{ .numInput /deep/ .el-input__inner{
text-align: right; text-align: right;

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

@ -573,6 +573,10 @@ export default {
if (data && data.code === 0){ if (data && data.code === 0){
this.$message.success(data.msg) this.$message.success(data.msg)
this.handleSearch(); this.handleSearch();
this.currentQuote = {
...row,
status: '下达',
}
}else { }else {
this.$message.warning(data.msg) this.$message.warning(data.msg)
} }

Write Preview
Loading…
Cancel
Save