wilson
/
cq-ccl-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

重庆刀模 2023年3月9日 sxm

master
[li_she] 3 years ago
parent
93b60538e2
commit
8bdd3455dc
13 changed files with 410 additions and 337 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. 4
      config/index.js
  2. 13
      package-lock.json
  3. 1
      package.json
  4. 3
      src/api/toolMan/tool-info.js
  5. 1
      src/assets/scss/global.scss
  6. 4
      src/main.js
  7. 2
      src/views/main-navbar.vue
  8. 33
      src/views/modules/bulletinBoard/toolDetailBoard.vue
  9. 8
      src/views/modules/toolMan/location.vue
  10. 42
      src/views/modules/toolMan/quarantineLibrary.vue
  11. 530
      src/views/modules/toolMan/tool-info.vue
  12. 6
      src/views/modules/toolMan/toolResume.vue

4
config/index.js
View File

@ -23,8 +23,8 @@ module.exports = {
}, },
// Various Dev Server settings // Various Dev Server settings
host: '192.168.1.110', // can be overwritten by process.env.HOST
port: 8002, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
host: 'localhost', // can be overwritten by process.env.HOST
port: 8003, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true, autoOpenBrowser: true,
errorOverlay: true, errorOverlay: true,
notifyOnErrors: true, notifyOnErrors: true,

13
package-lock.json
View File

@ -9557,14 +9557,6 @@
} }
} }
}, },
"kr-print-designer": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/kr-print-designer/-/kr-print-designer-1.1.8.tgz",
"integrity": "sha512-uQGv/XyjdpSNT3WZeCp1TswCvSywz3iU0Si7El+TGSRyyIBjKuawUe3MKzQWK0N2bWQdpZCnctTWw/C3buu4CQ==",
"requires": {
"nanoid": "^1.0.1"
}
},
"last-call-webpack-plugin": { "last-call-webpack-plugin": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-2.1.2.tgz", "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-2.1.2.tgz",
@ -10554,11 +10546,6 @@
"resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
"integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==" "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
}, },
"nanoid": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-1.3.4.tgz",
"integrity": "sha512-4ug4BsuHxiVHoRUe1ud6rUFT3WUMmjXt1W0quL0CviZQANdan7D8kqN5/maw53hmAApY/jfzMRkC57BNNs60ZQ=="
},
"nanomatch": { "nanomatch": {
"version": "1.2.13", "version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",

1
package.json
View File

@ -25,7 +25,6 @@
"gulp-load-plugins": "2.0.5", "gulp-load-plugins": "2.0.5",
"gulp-replace": "1.0.0", "gulp-replace": "1.0.0",
"gulp-shell": "0.8.0", "gulp-shell": "0.8.0",
"kr-print-designer": "^1.1.8",
"lodash": "4.17.5", "lodash": "4.17.5",
"node-sass": "4.13.1", "node-sass": "4.13.1",
"npm": "^6.9.0", "npm": "^6.9.0",

3
src/api/toolMan/tool-info.js
View File

@ -25,5 +25,8 @@ export const flagAdd = data => createAPI(`toolInfo/flagAdd`,'POST',data)
// 获取工具使用记录 // 获取工具使用记录
export const updateSoToolInspectionApplyList = data => createAPI(`evaluated/updateSoToolInspectionApplyList`,'POST',data) export const updateSoToolInspectionApplyList = data => createAPI(`evaluated/updateSoToolInspectionApplyList`,'POST',data)
// 工具实例出入记录
export const getToolTransInfoList = data => createAPI(`toolInfo/getToolTransInfoList`,'POST',data)

1
src/assets/scss/global.scss
View File

@ -114,3 +114,4 @@
/* el-form-item 间距 end*/ /* el-form-item 间距 end*/

4
src/main.js
View File

@ -14,10 +14,6 @@ import JsonExcel from 'vue-json-excel'
import i18n from '@/i18n/i18n' import i18n from '@/i18n/i18n'
import './directives' import './directives'
import decimalUtil from '@/utils/decimalUtil' import decimalUtil from '@/utils/decimalUtil'
import KrPrintDesigner from "kr-print-designer";
import "kr-print-designer/lib/kr-print-designer.css";
Vue.use(KrPrintDesigner);
Vue.component('downloadExcel', JsonExcel) Vue.component('downloadExcel', JsonExcel)

2
src/views/main-navbar.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType"> <nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType">
<div class="site-navbar__header"> <div class="site-navbar__header">
<h1 class="site-navbar__brand" @click="$router.push({ name: 'home' })">
<h1 class="site-navbar__brand">
<el-menu <el-menu
class="site-navbar__menu" class="site-navbar__menu"
mode="horizontal"> mode="horizontal">

33
src/views/modules/bulletinBoard/toolDetailBoard.vue
View File

@ -24,9 +24,20 @@
<el-form-item :label="inputLabel.headerInput.label6"> <el-form-item :label="inputLabel.headerInput.label6">
<el-input style="width: 100px;" v-model="queryData.endDays" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input> <el-input style="width: 100px;" v-model="queryData.endDays" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'状态'">
<el-select style="width: 100px;" v-model="queryData.status">
<el-option value="" label="全部"></el-option>
<el-option value="已启用" label="已启用"></el-option>
<el-option value="在库" label="在库"></el-option>
<el-option value="出库" label="出库"></el-option>
<el-option value="退库" label="退库"></el-option>
<el-option value="维修中" label="维修中"></el-option>
<el-option value="已报废" label="已报废"></el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button> <el-button @click="getDataList()" type="primary">{{buttons.search}}</el-button>
<el-button @click="saveColumnList()" type="primary" v-show="showDefault">{{buttons.defaultTable}}
<el-button @click="saveColumnList()" type="primary" v-show="false">{{buttons.defaultTable}}
</el-button> </el-button>
<el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button> <el-button @click="userSetting" type="primary">{{ buttons.settingTable}}</el-button>
<download-excel <download-excel
@ -117,7 +128,7 @@ import {
label3 : '开始使用次数', label3 : '开始使用次数',
label4 : '结束使用次数', label4 : '结束使用次数',
label5 : '呆滞天数', label5 : '呆滞天数',
label6 : '————',
label6 : '—',
}, },
}, },
queryData : { queryData : {
@ -128,6 +139,7 @@ import {
endActualuseQty : '', endActualuseQty : '',
startDays : '', startDays : '',
endDays : '', endDays : '',
status: ''
}, },
site : this.$store.state.user.site, site : this.$store.state.user.site,
userName : this.$store.state.user.name, userName : this.$store.state.user.name,
@ -267,6 +279,23 @@ import {
status: true, status: true,
fixed: false fixed: false
}, },
{
userId: this.$store.state.user.name,
functionId: 2701,
serialNumber: 'toolDetail2701SupplierName',
tableId: "toolDetail2701",
tableName: "common",
columnProp: "status",
headerAlign: "center",
align: "center",
columnLabel: "状态",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 2701, functionId: 2701,

8
src/views/modules/toolMan/location.vue
View File

@ -781,13 +781,13 @@ import {
LODOP.SET_PRINT_STYLE("LineHeight",-2); LODOP.SET_PRINT_STYLE("LineHeight",-2);
LODOP.ADD_PRINT_BARCODE(3,3,300,120,"QRCode",row.locationId); LODOP.ADD_PRINT_BARCODE(3,3,300,120,"QRCode",row.locationId);
LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
LODOP.ADD_PRINT_TEXT(10,205,400,150,row.locationId );
LODOP.SET_PRINT_STYLEA(0,"FontSize",40);
LODOP.ADD_PRINT_TEXT(39,122,331,43,row.locationId );
LODOP.SET_PRINT_STYLEA(0,"FontSize",25);
} }
LODOP.PRINT_DESIGN();
// LODOP.PRINT_DESIGN();
//LODOP.PREVIEW(); //LODOP.PREVIEW();
// LODOP.PRINT();
LODOP.PRINT();
console.log("操作成功！") console.log("操作成功！")
} }
} }

42
src/views/modules/toolMan/quarantineLibrary.vue
View File

@ -328,6 +328,40 @@ import {
status: true, status: true,
fixed: false, fixed: false,
}, },
{
userId: this.$store.state.user.name,
functionId: 2101,
serialNumber: 'library2101OactualuseQty',
tableId: "library2101",
tableName: "libraryTable",
columnProp: "actualuseQty",
headerAlign: "center",
align: "center",
columnLabel: "使用次数",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
},
{
userId: this.$store.state.user.name,
functionId: 2101,
serialNumber: 'library2101OrepairQty',
tableId: "library2101",
tableName: "libraryTable",
columnProp: "repairQty",
headerAlign: "center",
align: "center",
columnLabel: "维修次数",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false,
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 2101, functionId: 2101,
@ -860,7 +894,7 @@ import {
saveTableDefaultList(this.columnList).then(({data}) => { saveTableDefaultList(this.columnList).then(({data}) => {
if (data.code == 0) { if (data.code == 0) {
this.$message.success(data.msg) this.$message.success(data.msg)
this.showDefault = false
//this.showDefault = false
} else { } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }
@ -868,7 +902,7 @@ import {
saveTableDefaultList(this.columnList1).then(({data}) => { saveTableDefaultList(this.columnList1).then(({data}) => {
if (data.code == 0) { if (data.code == 0) {
this.$message.success(data.msg) this.$message.success(data.msg)
this.showDefault = false
// this.showDefault = false
} else { } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }
@ -883,10 +917,10 @@ import {
getColumnList() { getColumnList() {
getTableDefaultListLanguage(this.queryTable).then(({data}) => { getTableDefaultListLanguage(this.queryTable).then(({data}) => {
if (!data.rows.length == 0) { if (!data.rows.length == 0) {
this.showDefault = false
// this.showDefault = false
this.columnList = data.rows this.columnList = data.rows
} else { } else {
this.showDefault = true
// this.showDefault = true
} }
}) })
}, },

530
src/views/modules/toolMan/tool-info.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<div >
<div>
<el-main style="background-color: #B3C0D1;padding: 2px;"> <el-main style="background-color: #B3C0D1;padding: 2px;">
<el-form :inline="true" label-position="top" label-width="100px"> <el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="inputLabel.headerInput.label1"> <el-form-item :label="inputLabel.headerInput.label1">
<el-input style="width: 100px;" @focus="initToolHeaderModel()" readonly v-model="headerData.toolId" ></el-input> <!---->
<el-input style="width: 100px;" @focus="initToolHeaderModel()" readonly
v-model="headerData.toolId"></el-input> <!---->
</el-form-item> </el-form-item>
<el-form-item :label="inputLabel.headerInput.label2"> <el-form-item :label="inputLabel.headerInput.label2">
<el-input style="width: 100px;" readonly v-model="headerData.toolDescription"></el-input> <el-input style="width: 100px;" readonly v-model="headerData.toolDescription"></el-input>
@ -57,27 +58,29 @@
<el-form-item :label="inputLabel.headerInput.label13"> <el-form-item :label="inputLabel.headerInput.label13">
<el-input style="width: 205px;" readonly v-model="headerData.remark"></el-input> <el-input style="width: 205px;" readonly v-model="headerData.remark"></el-input>
</el-form-item> </el-form-item>
<el-form-item >
<el-form-item>
<upload style="margin-top: 27px;"></upload> <upload style="margin-top: 27px;"></upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-main> </el-main>
<el-container >
<el-container>
<el-aside width="50%" style="padding: 0px 2px;"> <el-aside width="50%" style="padding: 0px 2px;">
<el-form :inline="true" label-position="top" label-width="95px" style="padding: 5px;"> <el-form :inline="true" label-position="top" label-width="95px" style="padding: 5px;">
<el-form-item >
<el-form-item>
<!-- <el-button type="primary">{{ inputLabel.leftInput.label1 }}</el-button> &lt;!&ndash;@click="initViewIfsTable('Y')"&ndash;&gt;--> <!-- <el-button type="primary">{{ inputLabel.leftInput.label1 }}</el-button> &lt;!&ndash;@click="initViewIfsTable('Y')"&ndash;&gt;-->
<el-button @click="initToolModel()" type="primary" v-show="showDefault">{{ buttons.edit }}</el-button> <el-button @click="initToolModel()" type="primary" v-show="showDefault">{{ buttons.edit }}</el-button>
<el-button @click="printReport()" type="primary" v-show="showDefault">{{ buttons.print }}</el-button> <el-button @click="printReport()" type="primary" v-show="showDefault">{{ buttons.print }}</el-button>
<el-button @click="initFlagAdd()" type="primary" v-show="showDefault">{{ buttons.badApplication }}</el-button>
<el-button @click="initFlagAdd()" type="primary" v-show="showDefault">{{ buttons.badApplication }}
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="100px"> <el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="inputLabel.leftInput.label1"> <el-form-item :label="inputLabel.leftInput.label1">
<el-select @change="toolInstanceIdChange(currentDetailData.toolInstanceId)" v-model="currentDetailData.toolInstanceId" placeholder="请选择" style="width: 115px;">
<el-select @change="toolInstanceIdChange(currentDetailData.toolInstanceId)"
v-model="currentDetailData.toolInstanceId" placeholder="请选择" style="width: 115px;">
<el-option <el-option
v-for="item in selectList.select4" v-for="item in selectList.select4"
:key="item.value" :key="item.value"
@ -219,7 +222,8 @@
</el-container> </el-container>
<column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column> <column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.headerInput.label16" :visible.sync="setUp.toolHeaderFlag" width="485px">
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag
:title="inputLabel.headerInput.label16" :visible.sync="setUp.toolHeaderFlag" width="485px">
<el-form :inline="true" label-position="left"> <el-form :inline="true" label-position="left">
<el-form-item :label="inputLabel.headerInput.label1"> <el-form-item :label="inputLabel.headerInput.label1">
<el-input style="width: 110px;" v-model="queryHeaderData.likeToolId"></el-input> <el-input style="width: 110px;" v-model="queryHeaderData.likeToolId"></el-input>
@ -227,7 +231,7 @@
<el-form-item :label="inputLabel.headerInput.label2"> <el-form-item :label="inputLabel.headerInput.label2">
<el-input style="width: 110px;" v-model="queryHeaderData.likeToolDescription"></el-input> <el-input style="width: 110px;" v-model="queryHeaderData.likeToolDescription"></el-input>
</el-form-item> </el-form-item>
<el-form-item >
<el-form-item>
<!-- <el-button type="primary">{{ inputLabel.leftInput.label1 }}</el-button> &lt;!&ndash;@click="initViewIfsTable('Y')"&ndash;&gt;--> <!-- <el-button type="primary">{{ inputLabel.leftInput.label1 }}</el-button> &lt;!&ndash;@click="initViewIfsTable('Y')"&ndash;&gt;-->
<el-button @click="getToolHeaderList()" type="primary" v-show="showDefault">{{ buttons.search }}</el-button> <el-button @click="getToolHeaderList()" type="primary" v-show="showDefault">{{ buttons.search }}</el-button>
</el-form-item> </el-form-item>
@ -238,7 +242,7 @@
border border
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;" style="width: 100%;"
@row-dblclick="rowDblclick" >
@row-dblclick="rowDblclick">
<el-table-column <el-table-column
v-for="(item,index) in columnList2" :key="index" v-for="(item,index) in columnList2" :key="index"
:sortable="item.columnSortable" :sortable="item.columnSortable"
@ -257,7 +261,8 @@
</el-dialog> </el-dialog>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.leftInput.label15" :visible.sync="setUp.toolEditFlag" width="620px">
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.leftInput.label15"
:visible.sync="setUp.toolEditFlag" width="620px">
<el-form :inline="true" label-position="top"> <el-form :inline="true" label-position="top">
<el-form-item :label="inputLabel.leftInput.label1"> <el-form-item :label="inputLabel.leftInput.label1">
<el-input style="width: 130px;" readonly v-model="editData.toolInstanceId"></el-input> <el-input style="width: 130px;" readonly v-model="editData.toolInstanceId"></el-input>
@ -291,7 +296,7 @@
v-model="editData.strPhaseInDate" v-model="editData.strPhaseInDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format = "yyyy-MM-dd"
value-format="yyyy-MM-dd"
style="width: 130px;"> style="width: 130px;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -300,7 +305,7 @@
v-model="editData.strPhaseOutDate" v-model="editData.strPhaseOutDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format = "yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
style="width: 130px;"> style="width: 130px;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -312,12 +317,12 @@
<el-form-item :label="inputLabel.leftInput.label10"> <el-form-item :label="inputLabel.leftInput.label10">
<el-input style="width: 130px;" readonly v-model="editData.actualuseQty"></el-input> <el-input style="width: 130px;" readonly v-model="editData.actualuseQty"></el-input>
</el-form-item> </el-form-item>
<!--<el-form-item :label="inputLabel.leftInput.label11">
<el-input style="width: 130px;" v-model="editData.strCreateDate"></el-input>
<el-form-item :label="inputLabel.leftInput.label18 || '工程师账号'">
<el-input style="width: 130px;" v-model="editData.engineer"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="inputLabel.leftInput.label12">
<el-input style="width: 130px;" v-model="editData.createdBy"></el-input>
</el-form-item>-->
<!-- <el-form-item :label="inputLabel.leftInput.label12">-->
<!-- <el-input style="width: 130px;" v-model="editData.createdBy"></el-input>-->
<!-- </el-form-item>-->
</el-form> </el-form>
<el-form :inline="true" label-position="top"> <el-form :inline="true" label-position="top">
<el-form-item :label="inputLabel.leftInput.label14"> <el-form-item :label="inputLabel.leftInput.label14">
@ -330,10 +335,12 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.modelInput.label1" :visible.sync="setUp.modelFlag" width="350px">
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.modelInput.label1"
:visible.sync="setUp.modelFlag" width="350px">
<el-form label-position="top"> <el-form label-position="top">
<el-form-item :label="inputLabel.modelInput.label2"> <el-form-item :label="inputLabel.modelInput.label2">
<el-input type="textarea" :rows="3" placeholder="请输入内容" style="width: 300px;padding: 0px 3px;" v-model="remark"></el-input>
<el-input type="textarea" :rows="3" placeholder="请输入内容" style="width: 300px;padding: 0px 3px;"
v-model="remark"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -348,6 +355,9 @@
<script> <script>
import column from "../common/column"; import column from "../common/column";
import {
getTblUserList,
} from "@/api/toolMan/receive.js"
import { import {
searchSysLanguagePackList, searchSysLanguagePackList,
searchSysLanguageParam, searchSysLanguageParam,
@ -388,141 +398,142 @@
}, },
data() { data() {
return { return {
toolHeaderList :[],
queryHeaderData : {
site : this.$store.state.user.site,
toolId : '',
toolDescription : '',
likeToolId : '',
likeToolDescription : '',
},
editData : {},
setUp :{
toolEditFlag : false,
saveToolFlag : false,
toolHeaderFlag : false,
modelFlag : false,
saveModelFlag : false,
},
toolInstanceIdUseHist : [],
sfdcToolingHistList : [],
selectList:{
select1 : [{
toolHeaderList: [],
queryHeaderData: {
site: this.$store.state.user.site,
toolId: '',
toolDescription: '',
likeToolId: '',
likeToolDescription: '',
},
editData: {},
setUp: {
toolEditFlag: false,
saveToolFlag: false,
toolHeaderFlag: false,
modelFlag: false,
saveModelFlag: false,
},
toolInstanceIdUseHist: [],
sfdcToolingHistList: [],
selectList: {
select1: [{
value: 'Y', value: 'Y',
label: '启用' label: '启用'
},{
}, {
value: 'N', value: 'N',
label: '禁用' label: '禁用'
}], }],
select2 :[{
select2: [{
value: 'Y', value: 'Y',
label: '是' label: '是'
},{
}, {
value: 'N', value: 'N',
label: '否' label: '否'
}], }],
select3 :[{
select3: [{
value: 'P', value: 'P',
label: '个人' label: '个人'
},{
}, {
value: 'G', value: 'G',
label: '组' label: '组'
}], }],
select4 : [],
select5 : [],
},
inputLabel :{
headerInput : {
label1 : '工具编码',
label2 : '工具名称',
label3 : '规格型号',
label4 : '工厂编号',
label5 : '工具分类',
label6 : '工具分类名称',
label7 : '计量单位',
label8 : '在用',
label9 : '属性模块',
label10 : '默认库位',
label11 : '创建物料编码',
label12 : '物料编码',
label13 : '说明',
label14 : '录入日期',
label15 : '录入人',
label16 : '工具编码信息',
label17 : '横排数',
label18 : '竖排数',
},
leftInput :{
label1 : '实例编号',
label2 : '状态',
label3 : '供应商编码',
label4 : '供应商名称',
label5 : '采购日期',
label6 : '钢印信息',
label7 : '入库日期',
label8 : '停用日期',
label9 : '预计使用次数',
label10 : '实际使用次数',
label11 : '录入日期',
label12 : '录入人',
label13 : '采购订单号',
label14 : '备注',
label15 : '工具实例信息',
label16 : '库位编码',
label17 : '工程师',
},
rightInput :{
label1 : '工具使用记录:',
label2 : '工具维修记录:',
},
modelInput : {
label1 : '审核信息',
label2 : '不合格原因',
},
},
remark : '',
currentDetailData :{
select4: [],
select5: [],
},
inputLabel: {
headerInput: {
label1: '工具编码',
label2: '工具名称',
label3: '规格型号',
label4: '工厂编号',
label5: '工具分类',
label6: '工具分类名称',
label7: '计量单位',
label8: '在用',
label9: '属性模块',
label10: '默认库位',
label11: '创建物料编码',
label12: '物料编码',
label13: '说明',
label14: '录入日期',
label15: '录入人',
label16: '工具编码信息',
label17: '横排数',
label18: '竖排数',
},
leftInput: {
label1: '实例编号',
label2: '状态',
label3: '供应商编码',
label4: '供应商名称',
label5: '采购日期',
label6: '钢印信息',
label7: '入库日期',
label8: '停用日期',
label9: '预计使用次数',
label10: '实际使用次数',
label11: '录入日期',
label12: '录入人',
label13: '采购订单号',
label14: '备注',
label15: '工具实例信息',
label16: '库位编码',
label17: '工程师',
label18: '工程师账号',
},
rightInput: {
label1: '工具使用记录:',
label2: '工具维修记录:',
},
modelInput: {
label1: '审核信息',
label2: '不合格原因',
},
},
remark: '',
currentDetailData: {
actualuseQty: '', actualuseQty: '',
createDate:'',
createdBy:'',
description:'',
createDate: '',
createdBy: '',
description: '',
estUseQty: '', estUseQty: '',
inspectDuration:'',
lastUpdateBy:'',
latestInspectDate:'',
latestUseDate:'',
locationId:'',
phaseInDate:'',
phaseOutDate:'',
purchaseDate:'',
remark:'',
site:'',
status:'',
statusRef:'',
supplierId:'',
supplierName:'',
toolDescription:'',
toolId:'',
toolIndex:'',
toolInstanceId:'',
torNumacc:'',
torNumdown:'',
workCenterNo:'',
steelSeal : '',
strCreateDate:'',
strLatestInspectDate:'',
strLatestUseDate:'',
strPhaseInDate:'',
strPhaseOutDate:'',
strPurchaseDate:'',
},
detailList : [],
headerData :{},
site : this.$store.state.user.site,
userName : this.$store.state.user.name,
inspectDuration: '',
lastUpdateBy: '',
latestInspectDate: '',
latestUseDate: '',
locationId: '',
phaseInDate: '',
phaseOutDate: '',
purchaseDate: '',
remark: '',
site: '',
status: '',
statusRef: '',
supplierId: '',
supplierName: '',
toolDescription: '',
toolId: '',
toolIndex: '',
toolInstanceId: '',
torNumacc: '',
torNumdown: '',
workCenterNo: '',
steelSeal: '',
strCreateDate: '',
strLatestInspectDate: '',
strLatestUseDate: '',
strPhaseInDate: '',
strPhaseOutDate: '',
strPurchaseDate: '',
},
detailList: [],
headerData: {},
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
// table高度 // table高度
height:450,
tableHeight : 300,
height: 450,
tableHeight: 300,
// 是否收藏 // 是否收藏
favorite: false, favorite: false,
addLanguage: false, addLanguage: false,
@ -707,7 +718,7 @@
// fixed: false, // fixed: false,
// } // }
], ],
columnList2 :[
columnList2: [
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 2501, functionId: 2501,
@ -759,8 +770,8 @@
download: '导出', download: '导出',
settingTable: '设置列表', settingTable: '设置列表',
defaultTable: '设置默认配置', defaultTable: '设置默认配置',
print : "打印",
badApplication : '不良申请',
print: "打印",
badApplication: '不良申请',
}, },
// 导出 start // 导出 start
exportData: [], exportData: [],
@ -856,11 +867,11 @@
} }
}, },
mounted() { mounted() {
this.$nextTick(()=>{
this.$nextTick(() => {
this.height = window.innerHeight - 255; this.height = window.innerHeight - 255;
}) })
this.$nextTick(()=>{
this.tableHeight = (window.innerHeight - 350)/2;
this.$nextTick(() => {
this.tableHeight = (window.innerHeight - 350) / 2;
}) })
}, },
activated() { activated() {
@ -869,12 +880,12 @@
this.getLanguageList() this.getLanguageList()
}, },
methods: { methods: {
modelVerification(){
modelVerification() {
this.saveModelFlag = true this.saveModelFlag = true
if(this.remark == ''){
if (this.remark == '') {
this.$alert('请输入原因！', '操作提示', { this.$alert('请输入原因！', '操作提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
type :"warning",
type: "warning",
callback: action => { callback: action => {
this.saveModelFlag = false this.saveModelFlag = false
} }
@ -886,11 +897,11 @@
this.saveFlagAdd() this.saveFlagAdd()
}, },
//判断是否新增不良信息 //判断是否新增不良信息
initFlagAdd(){
if(this.currentDetailData.status != '在库'){
initFlagAdd() {
if (this.currentDetailData.status != '在库') {
this.$alert('当前工具状态不为在库！', '操作提示', { this.$alert('当前工具状态不为在库！', '操作提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
type :"warning",
type: "warning",
callback: action => { callback: action => {
} }
@ -900,21 +911,21 @@
this.remark = '' this.remark = ''
this.setUp.modelFlag = true this.setUp.modelFlag = true
}, },
saveFlagAdd(){
saveFlagAdd() {
let applyType = "待隔离处理" let applyType = "待隔离处理"
let queryDate = { let queryDate = {
site : this.currentDetailData.site,
toolInstanceId : this.currentDetailData.toolInstanceId,
applyType : this.currentDetailData.applyType,
newApplyType : applyType,
site: this.currentDetailData.site,
toolInstanceId: this.currentDetailData.toolInstanceId,
applyType: this.currentDetailData.applyType,
newApplyType: applyType,
} }
flagAdd(queryDate).then(({data}) =>{
if(data.success){
flagAdd(queryDate).then(({data}) => {
if (data.success) {
this.updateOffInspection() this.updateOffInspection()
}else {
} else {
this.$alert(data.msg, '操作提示', { this.$alert(data.msg, '操作提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
type :"warning",
type: "warning",
callback: action => { callback: action => {
} }
@ -923,43 +934,43 @@
}) })
}, },
//更改工具不良信息 //更改工具不良信息
updateOffInspection(){
updateOffInspection() {
let addFlag = "Y"; let addFlag = "Y";
let passFlag = "N"; let passFlag = "N";
let status = "隔离"; let status = "隔离";
let applyType = "待隔离处理"; let applyType = "待隔离处理";
let jsonData = { let jsonData = {
id : 0,
passFlag : passFlag,
actCheckBy : this.userName,
site : this.currentDetailData.site,
toolInstanceId : this.currentDetailData.toolInstanceId,
status : status,
orderref1 : this.currentDetailData.orderref1,
toolId : this.currentDetailData.toolId,
applyType : this.currentDetailData.applyType,
newApplyType : applyType,
addFlag : addFlag,
checkBy :this.currentDetailData.checkBy,
id: 0,
passFlag: passFlag,
actCheckBy: this.userName,
site: this.currentDetailData.site,
toolInstanceId: this.currentDetailData.toolInstanceId,
status: status,
orderref1: this.currentDetailData.orderref1,
toolId: this.currentDetailData.toolId,
applyType: this.currentDetailData.applyType,
newApplyType: applyType,
addFlag: addFlag,
checkBy: this.currentDetailData.checkBy,
// remark : this.currentDetailData.remark, // remark : this.currentDetailData.remark,
remark : this.remark,
remark: this.remark,
} }
let jsonList = [] let jsonList = []
jsonList.push(jsonData) jsonList.push(jsonData)
updateSoToolInspectionApplyList(jsonList).then(({data}) =>{
if(data.code == 0){
updateSoToolInspectionApplyList(jsonList).then(({data}) => {
if (data.code == 0) {
this.toolInstanceIdChange() this.toolInstanceIdChange()
} }
this.$alert(data.msg, '操作提示', { this.$alert(data.msg, '操作提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
type :"warning",
type: "warning",
callback: action => { callback: action => {
} }
}); });
}) })
}, },
rowDblclick(row, column, event){
rowDblclick(row, column, event) {
console.log(row) console.log(row)
console.log(column) console.log(column)
console.log(event) console.log(event)
@ -969,94 +980,109 @@
this.setUp.toolHeaderFlag = false this.setUp.toolHeaderFlag = false
}, },
getTime(date) { getTime(date) {
if(date != null && date != ''){
if (date != null && date != '') {
var json_date = new Date(date).toJSON(); var json_date = new Date(date).toJSON();
return new Date(new Date(json_date) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '') return new Date(new Date(json_date) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
} }
}, },
saveToolDetail(){
saveToolDetail() {
this.setUp.saveToolFlag = true this.setUp.saveToolFlag = true
this.editData.purchaseDate = this.editData.strPurchaseDate this.editData.purchaseDate = this.editData.strPurchaseDate
this.editData.phaseInDate = this.editData.strPhaseInDate this.editData.phaseInDate = this.editData.strPhaseInDate
this.editData.phaseOutDate = this.editData.strPhaseOutDate this.editData.phaseOutDate = this.editData.strPhaseOutDate
updateToolDetail(this.editData).then((data) =>{
// 校验 工程师是否存在
let dto ={
site: this.site,
baseData: 'engineer',
engineer: this.editData.engineer
}
getTblUserList(dto).then(({data}) =>{
if (data.code == 0 && data.list.length >0 ){
updateToolDetail(this.editData).then((data) => {
if (data.code == 0 || data.data.code == 0) { if (data.code == 0 || data.data.code == 0) {
this.toolInstanceIdChange() this.toolInstanceIdChange()
} }
this.$alert(data.data.msg, '操作提示', { this.$alert(data.data.msg, '操作提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
type :"warning",
type: "warning",
callback: action => { callback: action => {
this.setUp.toolEditFlag = false this.setUp.toolEditFlag = false
} }
}); });
this.setUp.saveToolFlag = false this.setUp.saveToolFlag = false
}) })
}else {
this.$message.warning('工程师账号不存在')
this.setUp.saveToolFlag = false
}
})
}, },
initToolHeaderModel(){
initToolHeaderModel() {
this.toolHeaderList = [] this.toolHeaderList = []
this.setUp.toolHeaderFlag = true this.setUp.toolHeaderFlag = true
this.queryHeaderData.likeToolId = '' this.queryHeaderData.likeToolId = ''
this.queryHeaderData.likeToolDescription = '' this.queryHeaderData.likeToolDescription = ''
this.getToolHeaderList() this.getToolHeaderList()
}, },
getToolHeaderList(){
getToolHeaderList(this.queryHeaderData).then(({data}) =>{
getToolHeaderList() {
getToolHeaderList(this.queryHeaderData).then(({data}) => {
this.toolHeaderList = data.rows this.toolHeaderList = data.rows
}) })
}, },
initToolModel(){
initToolModel() {
this.setUp.toolEditFlag = true this.setUp.toolEditFlag = true
this.setUp.saveToolFlag = false this.setUp.saveToolFlag = false
this.editData = JSON.parse(JSON.stringify(this.currentDetailData)) this.editData = JSON.parse(JSON.stringify(this.currentDetailData))
}, },
//获取工具使用记录 //获取工具使用记录
getSfdcToolingHistList(){
getSfdcToolingHistList() {
let queryData = { let queryData = {
site : this.site,
toolInstanceId : this.currentDetailData.toolInstanceId
site: this.site,
toolInstanceId: this.currentDetailData.toolInstanceId
} }
getSfdcToolingHistList(queryData).then(({data}) =>{
getSfdcToolingHistList(queryData).then(({data}) => {
this.sfdcToolingHistList = data.rows this.sfdcToolingHistList = data.rows
}) })
}, },
//获取工具使用记录 //获取工具使用记录
getToolInstanceIdUseHist(){
getToolInstanceIdUseHist() {
let queryData = { let queryData = {
site : this.site,
toolInstanceId : this.currentDetailData.toolInstanceId
site: this.site,
toolInstanceId: this.currentDetailData.toolInstanceId
} }
getToolInstanceIdUseHist(queryData).then(({data}) =>{
getToolInstanceIdUseHist(queryData).then(({data}) => {
this.toolInstanceIdUseHist = data.rows this.toolInstanceIdUseHist = data.rows
}) })
}, },
toolInstanceIdChange(){
toolInstanceIdChange() {
this.sfdcToolingHistList = [] this.sfdcToolingHistList = []
this.toolInstanceIdUseHist = [] this.toolInstanceIdUseHist = []
let queryData = { let queryData = {
site : this.site,
toolInstanceId : this.currentDetailData.toolInstanceId,
site: this.site,
toolInstanceId: this.currentDetailData.toolInstanceId,
} }
getToolDetailList(queryData).then(({data}) =>{
getToolDetailList(queryData).then(({data}) => {
let list = data.rows let list = data.rows
if(list.length > 0){
if (list.length > 0) {
this.currentDetailData = list[0] this.currentDetailData = list[0]
this.getToolInstanceIdUseHist() this.getToolInstanceIdUseHist()
this.getSfdcToolingHistList() this.getSfdcToolingHistList()
} }
}) })
}, },
getDetailList(){
getDetailList() {
this.currentDetailData = {} this.currentDetailData = {}
this.selectList.select4 = [] this.selectList.select4 = []
this.sfdcToolingHistList = [] this.sfdcToolingHistList = []
this.toolInstanceIdUseHist = [] this.toolInstanceIdUseHist = []
let queryData = { let queryData = {
site : this.site,
toolId : this.headerData.toolId,
toolDescription : this.headerData.toolDescription,
site: this.site,
toolId: this.headerData.toolId,
toolDescription: this.headerData.toolDescription,
} }
getToolDetailList(queryData).then(({data}) =>{
getToolDetailList(queryData).then(({data}) => {
let list = data.rows let list = data.rows
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
let selectData = { let selectData = {
@ -1065,53 +1091,50 @@
} }
this.selectList.select4.push(selectData); this.selectList.select4.push(selectData);
} }
if(list.length > 0){
if (list.length > 0) {
this.currentDetailData = list[0] this.currentDetailData = list[0]
this.toolInstanceIdChange() this.toolInstanceIdChange()
} }
}) })
}, },
//获取主记录信息 //获取主记录信息
getHeaderData(){
getHeaderData() {
let queryData = { let queryData = {
site : this.site,
toolId : this.headerData.toolId,
toolDescription : this.headerData.toolDescription,
site: this.site,
toolId: this.headerData.toolId,
toolDescription: this.headerData.toolDescription,
} }
getToolHeaderData(queryData).then(({data}) =>{
getToolHeaderData(queryData).then(({data}) => {
this.headerData = data.row this.headerData = data.row
this.getDetailList() this.getDetailList()
}) })
}, },
// 打印方式 // 打印方式
printReport(){
printReport() {
let row = this.currentDetailData let row = this.currentDetailData
// alert( this.$store.state.user.site) // alert( this.$store.state.user.site)
this.$lodop.print(temp, data);
const LODOP = getLodop() const LODOP = getLodop()
if (LODOP) { if (LODOP) {
LODOP.SET_LICENSES("","13F0BE83846277CB60918577C6281375","","");
LODOP.SET_LICENSES("", "13F0BE83846277CB60918577C6281375", "", "");
LODOP.PRINT_INIT("ToolInstanceID"); LODOP.PRINT_INIT("ToolInstanceID");
LODOP.SET_PRINT_PAGESIZE(0,80,40,"");
LODOP.SET_PRINT_PAGESIZE(0, 80, 40, "");
LODOP.SET_PRINT_STYLE("FontSize", 12); LODOP.SET_PRINT_STYLE("FontSize", 12);
LODOP.NewPage(); LODOP.NewPage();
LODOP.PRINT_INIT('') //初始化 LODOP.PRINT_INIT('') //初始化
LODOP.SET_PRINT_PAGESIZE(0,1000,400,"");
LODOP.SET_PRINT_STYLE("FontSize",12);
LODOP.SET_PRINT_STYLE("LineHeight",-2);
LODOP.ADD_PRINT_BARCODE(3,3,300,120,"QRCode",row.toolInstanceId);
LODOP.ADD_PRINT_TEXT(10,115,400,150,"实例编码:");
LODOP.ADD_PRINT_TEXT(10,205,400,150,row.toolInstanceId );
LODOP.ADD_PRINT_TEXT(32,115,400,150,"工具名称:");
LODOP.ADD_PRINT_TEXT(32,205,400,150,row.toolDescription );
LODOP.ADD_PRINT_TEXT(54,115,400,150,"入库日期:");
LODOP.ADD_PRINT_TEXT(54,205,400,150,row.createDate);
LODOP.ADD_PRINT_TEXT(76,115,400,150,"库位号:");
LODOP.ADD_PRINT_TEXT(76,205,400,150,row.currLocationId);
LODOP.ADD_PRINT_TEXT(98,115,400,150,"供应商编码:");
LODOP.ADD_PRINT_TEXT(98,205,400,150,row.supplierId);
LODOP.SET_PRINT_PAGESIZE(0, 1000, 400, "");
LODOP.SET_PRINT_STYLE("FontSize", 12);
LODOP.SET_PRINT_STYLE("LineHeight", -2);
LODOP.ADD_PRINT_BARCODE(3, 3, 300, 120, "QRCode", row.toolInstanceId);
LODOP.ADD_PRINT_TEXT(10, 115, 400, 150, "实例编码:");
LODOP.ADD_PRINT_TEXT(10, 205, 400, 150, row.toolInstanceId);
LODOP.ADD_PRINT_TEXT(32, 115, 400, 150, "工具名称:");
LODOP.ADD_PRINT_TEXT(32, 205, 400, 150, row.toolDescription);
LODOP.ADD_PRINT_TEXT(54, 115, 400, 150, "入库日期:");
LODOP.ADD_PRINT_TEXT(54, 205, 400, 150, row.createDate);
LODOP.ADD_PRINT_TEXT(76, 115, 400, 150, "库位号:");
LODOP.ADD_PRINT_TEXT(76, 205, 400, 150, row.locationId);
LODOP.ADD_PRINT_TEXT(98, 115, 400, 150, "供应商编码:");
LODOP.ADD_PRINT_TEXT(98, 205, 400, 150, row.supplierId);
// LODOP.PRINT_DESIGN(); // LODOP.PRINT_DESIGN();
//LODOP.PREVIEW(); //LODOP.PREVIEW();
LODOP.PRINT(); LODOP.PRINT();
@ -1119,41 +1142,41 @@
} }
}, },
// 校验用户是否收藏 // 校验用户是否收藏
favoriteIsOk(){
let userFavorite ={
userId:this.$store.state.user.id,
languageCode:this.$i18n.locale
favoriteIsOk() {
let userFavorite = {
userId: this.$store.state.user.id,
languageCode: this.$i18n.locale
} }
userFavoriteList(userFavorite).then(({data}) =>{
let size = data.list.filter(item => item.userId==userFavorite.menuId).length;
if (size>0){
userFavoriteList(userFavorite).then(({data}) => {
let size = data.list.filter(item => item.userId == userFavorite.menuId).length;
if (size > 0) {
this.favorite = true this.favorite = true
}else {
} else {
this.favorite = false this.favorite = false
} }
}) })
}, },
// 收藏 OR 取消收藏 // 收藏 OR 取消收藏
favoriteFunction(){
let userFavorite ={
favoriteFunction() {
let userFavorite = {
userId: this.$store.state.user.id, userId: this.$store.state.user.id,
functionId: this.$route.meta.menuId, functionId: this.$route.meta.menuId,
} }
if (this.favorite){
if (this.favorite) {
// 取消收藏 // 取消收藏
this.$confirm(`确定取消收藏`, '提示', { this.$confirm(`确定取消收藏`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
removeUserFavorite(userFavorite).then(({data})=>{
removeUserFavorite(userFavorite).then(({data}) => {
this.$message.success(data.msg) this.$message.success(data.msg)
this.favorite = false this.favorite = false
}) })
}) })
}else {
} else {
// 收藏 // 收藏
saveUserFavorite(userFavorite).then(({data})=>{
saveUserFavorite(userFavorite).then(({data}) => {
this.$message.success(data.msg) this.$message.success(data.msg)
this.favorite = true this.favorite = true
}) })
@ -1202,7 +1225,7 @@
// 获取button的词典 // 获取button的词典
getFunctionButtonList() { getFunctionButtonList() {
searchFunctionButtonList(this.queryButton).then(({data}) => { searchFunctionButtonList(this.queryButton).then(({data}) => {
if (JSON.stringify(data.data)!=='{}') {
if (JSON.stringify(data.data) !== '{}') {
this.buttons = data.data this.buttons = data.data
} else { } else {
saveButtonList(this.buttonList).then(({data}) => { saveButtonList(this.buttonList).then(({data}) => {
@ -1334,23 +1357,23 @@
}) })
}, },
fields(){
fields() {
let json = "{" let json = "{"
this.columnList.forEach((item,index) =>{
if (index == this.columnList.length-1 ){
json +="\""+item.columnLabel+"\"" +":"+"\""+item.columnProp+"\""
}else {
json += "\""+item.columnLabel+"\"" +":"+"\""+item.columnProp+"\""+ ","
this.columnList.forEach((item, index) => {
if (index == this.columnList.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
} }
}) })
json +="}"
json += "}"
let s = eval("(" + json + ")") let s = eval("(" + json + ")")
return s return s
}, },
createExportData() { createExportData() {
// 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据 // 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
// TODO:构造需要下载的数据返回 // TODO:构造需要下载的数据返回
if(this.dataListSelections.length>0){
if (this.dataListSelections.length > 0) {
return this.dataListSelections; return this.dataListSelections;
} }
return this.dataList; return this.dataList;
@ -1372,7 +1395,7 @@
} }
</script> </script>
<style >
<style>
.el-header, .el-footer { .el-header, .el-footer {
background-color: #B3C0D1; background-color: #B3C0D1;
color: #333; color: #333;
@ -1406,7 +1429,8 @@
.el-container:nth-child(7) .el-aside { .el-container:nth-child(7) .el-aside {
line-height: 320px; line-height: 320px;
} }
.number .el-input__inner{
.number .el-input__inner {
text-align: right; text-align: right;
} }
</style> </style>

6
src/views/modules/toolMan/toolResume.vue
View File

@ -374,7 +374,7 @@ import {
columnProp: "actualuseQty", columnProp: "actualuseQty",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "已使用米数",
columnLabel: "已使用次数",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -392,7 +392,7 @@ import {
columnProp: "estuseQty", columnProp: "estuseQty",
headerAlign: "center", headerAlign: "center",
align: "right", align: "right",
columnLabel: "预计使用米数",
columnLabel: "预计使用次数",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -784,7 +784,7 @@ import {
}) })
}, },
activated() { activated() {
this.getDataList()
//this.getDataList()
this.getLanguageList() this.getLanguageList()
}, },
methods: { methods: {

Write Preview
Loading…
Cancel
Save