Browse Source

Merge remote-tracking branch 'origin/master'

master
ruanqi 4 years ago
parent
commit
638c3001fa
  1. 142
      package-lock.json
  2. 7
      package.json
  3. 7
      src/api/chooselist/chooselist.js
  4. 7
      src/api/production/generateReport.js
  5. 2
      src/main.js
  6. 207
      src/views/modules/common/Chooselist.vue
  7. 513
      src/views/modules/production/generateReport.vue

142
package-lock.json

@ -4,6 +4,11 @@
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@types/json-schema": {
"version": "7.0.9",
"resolved": "https://rg.cnpmjs.org/@types/json-schema/download/@types/json-schema-7.0.9.tgz",
"integrity": "sha1-l+3JA36gw4WFMgsolk3eOznkZg0="
},
"@types/node": { "@types/node": {
"version": "8.10.48", "version": "8.10.48",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz",
@ -1076,8 +1081,7 @@
"babel-plugin-syntax-dynamic-import": { "babel-plugin-syntax-dynamic-import": {
"version": "6.18.0", "version": "6.18.0",
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
"dev": true
"integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo="
}, },
"babel-plugin-syntax-exponentiation-operator": { "babel-plugin-syntax-exponentiation-operator": {
"version": "6.13.0", "version": "6.13.0",
@ -3526,6 +3530,11 @@
"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
"dev": true "dev": true
}, },
"dayjs": {
"version": "1.10.7",
"resolved": "https://r.cnpmjs.org/dayjs/download/dayjs-1.10.7.tgz",
"integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg="
},
"de-indent": { "de-indent": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@ -3545,6 +3554,11 @@
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
}, },
"decimal.js": {
"version": "10.3.1",
"resolved": "https://r.cnpmjs.org/decimal.js/download/decimal.js-10.3.1.tgz",
"integrity": "sha1-2MOkRKnGd0umDKatcmHDqU/V54M="
},
"decode-uri-component": { "decode-uri-component": {
"version": "0.2.0", "version": "0.2.0",
"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@ -16349,6 +16363,11 @@
"safe-buffer": "^5.1.2" "safe-buffer": "^5.1.2"
} }
}, },
"pubsub-js": {
"version": "1.9.3",
"resolved": "https://r.cnpmjs.org/pubsub-js/download/pubsub-js-1.9.3.tgz",
"integrity": "sha1-Z07qTVaNBALgUnzbEOKqt7VWIdI="
},
"pump": { "pump": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
@ -19470,6 +19489,11 @@
"integrity": "sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g==", "integrity": "sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g==",
"dev": true "dev": true
}, },
"vue-i18n": {
"version": "8.25.0",
"resolved": "https://r.cnpmjs.org/vue-i18n/download/vue-i18n-8.25.0.tgz",
"integrity": "sha1-EDfZKV+ihFojC3cd5HNIHtss/Ew="
},
"vue-jest": { "vue-jest": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-1.0.2.tgz", "resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-1.0.2.tgz",
@ -19656,6 +19680,95 @@
} }
} }
}, },
"vue-pdf": {
"version": "4.3.0",
"resolved": "https://rg.cnpmjs.org/vue-pdf/download/vue-pdf-4.3.0.tgz",
"integrity": "sha1-1feQ7nln57eqkIm5exGrFo4Z29A=",
"requires": {
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"loader-utils": "^1.4.0",
"pdfjs-dist": "2.6.347",
"raw-loader": "^4.0.2",
"vue-resize-sensor": "^2.0.0",
"worker-loader": "^2.0.0"
},
"dependencies": {
"ajv-keywords": {
"version": "3.5.2",
"resolved": "https://rg.cnpmjs.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz",
"integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0="
},
"emojis-list": {
"version": "3.0.0",
"resolved": "https://r.cnpmjs.org/emojis-list/download/emojis-list-3.0.0.tgz",
"integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang="
},
"loader-utils": {
"version": "1.4.0",
"resolved": "https://rg.cnpmjs.org/loader-utils/download/loader-utils-1.4.0.tgz",
"integrity": "sha1-xXm140yzSxp07cbB+za/o3HVphM=",
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
}
},
"minimist": {
"version": "1.2.5",
"resolved": "https://r.cnpmjs.org/minimist/download/minimist-1.2.5.tgz",
"integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
},
"pdfjs-dist": {
"version": "2.6.347",
"resolved": "https://rg.cnpmjs.org/pdfjs-dist/download/pdfjs-dist-2.6.347.tgz",
"integrity": "sha1-8lftZug76QDND9KFJKIYf7niXNU="
},
"raw-loader": {
"version": "4.0.2",
"resolved": "https://r.cnpmjs.org/raw-loader/download/raw-loader-4.0.2.tgz",
"integrity": "sha1-GqxrfRrRUB5m79rBUixz5ZpYTrY=",
"requires": {
"loader-utils": "^2.0.0",
"schema-utils": "^3.0.0"
},
"dependencies": {
"json5": {
"version": "2.2.0",
"resolved": "https://r.cnpmjs.org/json5/download/json5-2.2.0.tgz",
"integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=",
"requires": {
"minimist": "^1.2.5"
}
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://rg.cnpmjs.org/loader-utils/download/loader-utils-2.0.2.tgz",
"integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=",
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"schema-utils": {
"version": "3.1.1",
"resolved": "https://rg.cnpmjs.org/schema-utils/download/schema-utils-3.1.1.tgz",
"integrity": "sha1-vHTEtraZXB2I92qLd76nIZ4MgoE=",
"requires": {
"@types/json-schema": "^7.0.8",
"ajv": "^6.12.5",
"ajv-keywords": "^3.5.2"
}
}
}
},
"vue-resize-sensor": {
"version": "2.0.0",
"resolved": "https://rg.cnpmjs.org/vue-resize-sensor/download/vue-resize-sensor-2.0.0.tgz",
"integrity": "sha1-Olh/1oAuFohwnPLFqtrnoAdZUr8="
},
"vue-router": { "vue-router": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz",
@ -20472,6 +20585,31 @@
"errno": "~0.1.7" "errno": "~0.1.7"
} }
}, },
"worker-loader": {
"version": "2.0.0",
"resolved": "https://rg.cnpmjs.org/worker-loader/download/worker-loader-2.0.0.tgz",
"integrity": "sha1-Rf2j73asqBV3GokQc5nuQRm0MKw=",
"requires": {
"loader-utils": "^1.0.0",
"schema-utils": "^0.4.0"
},
"dependencies": {
"ajv-keywords": {
"version": "3.5.2",
"resolved": "https://rg.cnpmjs.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz",
"integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0="
},
"schema-utils": {
"version": "0.4.7",
"resolved": "https://rg.cnpmjs.org/schema-utils/download/schema-utils-0.4.7.tgz",
"integrity": "sha1-unT1l9K+LqiAExdG7hfQoJPGgYc=",
"requires": {
"ajv": "^6.1.0",
"ajv-keywords": "^3.1.0"
}
}
}
},
"wrap-ansi": { "wrap-ansi": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",

7
package.json

@ -5,7 +5,7 @@
"author": "daxiong.yang <daxiong.yang@qq.com>", "author": "daxiong.yang <daxiong.yang@qq.com>",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 0.0.0.0",
"start": "npm run dev", "start": "npm run dev",
"unit": "jest --config test/unit/jest.conf.js --coverage", "unit": "jest --config test/unit/jest.conf.js --coverage",
"e2e": "node test/e2e/runner.js", "e2e": "node test/e2e/runner.js",
@ -17,6 +17,8 @@
"axios": "0.17.1", "axios": "0.17.1",
"babel-plugin-component": "0.10.1", "babel-plugin-component": "0.10.1",
"babel-polyfill": "6.26.0", "babel-polyfill": "6.26.0",
"dayjs": "^1.10.7",
"decimal.js": "^10.3.1",
"element-ui": "2.8.2", "element-ui": "2.8.2",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"gulp": "4.0.2", "gulp": "4.0.2",
@ -27,11 +29,14 @@
"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",
"pubsub-js": "^1.9.3",
"sass-loader": "6.0.6", "sass-loader": "6.0.6",
"svg-sprite-loader": "3.7.3", "svg-sprite-loader": "3.7.3",
"vue": "2.5.16", "vue": "2.5.16",
"vue-cookie": "1.1.4", "vue-cookie": "1.1.4",
"vue-i18n": "^8.25.0",
"vue-json-excel": "^0.3.0", "vue-json-excel": "^0.3.0",
"vue-pdf": "^4.3.0",
"vue-router": "3.0.1", "vue-router": "3.0.1",
"vuex": "3.0.1", "vuex": "3.0.1",
"xlsx": "^0.17.0" "xlsx": "^0.17.0"

7
src/api/chooselist/chooselist.js

@ -0,0 +1,7 @@
import { createAPI } from "@/utils/httpRequest.js";
export const getChooselist = data => createAPI(`/chooselist/getChooselist/${data.tagNo}`,'get',data)
export const getChooselistData = data => createAPI(`/chooselist/getChooselistData`,'post',data)

7
src/api/production/generateReport.js

@ -0,0 +1,7 @@
import { createAPI } from "@/utils/httpRequest.js";
// 获取生产报告信息
export const getGenerateReportList = data => createAPI(`dailyPlan/getGenerateReportList`, 'post', data);
// 获取生产报告信息
export const saveGenerateReport = data => createAPI(`dailyPlan/saveGenerateReport`, 'post', data);

2
src/main.js

@ -16,6 +16,7 @@ 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 dayjs from 'dayjs';
Vue.component('downloadExcel', JsonExcel) Vue.component('downloadExcel', JsonExcel)
@ -33,6 +34,7 @@ if (process.env.NODE_ENV !== 'production') {
Vue.prototype.$http = httpRequest // ajax请求方法 Vue.prototype.$http = httpRequest // ajax请求方法
Vue.prototype.isAuth = isAuth // 权限方法 Vue.prototype.isAuth = isAuth // 权限方法
Vue.prototype.decimalUtil = decimalUtil // 计算 Vue.prototype.decimalUtil = decimalUtil // 计算
Vue.prototype.dayjs = dayjs //时间格式化插件 2021-11-02
// 保存整站vuex本地储存初始状态 // 保存整站vuex本地储存初始状态

207
src/views/modules/common/Chooselist.vue

@ -0,0 +1,207 @@
<template>
<el-dialog :title="baseListData.description"
:close-on-click-modal="false" :close-on-press-escape="false"
@close="closeDialog"
:visible.sync="visible"
width="685px" v-drag>
<el-form label-position="top"
inline="inline"
size="mini"
label-width="120px">
<el-form-item :label="baseListData.caption1" v-if="baseListData.caption1!='' && baseListData.caption1!=null">
<el-input v-model="param1"></el-input>
</el-form-item>
<el-form-item :label="baseListData.caption2" v-if="baseListData.caption2!='' && baseListData.caption2!=null">
<el-input v-model="param2"></el-input>
</el-form-item>
<el-form-item :label="baseListData.caption4" v-if="baseListData.caption4!='' && baseListData.caption4!=null">
<el-input v-model="param4" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="baseListData.caption3" v-if="baseListData.caption3!='' && baseListData.caption3!=null">
<el-select v-model="param3" style="width: 120px">
<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-button style="margin-top: 18px" type="primary" @click="getDataList(false)">查询
</el-button>
</el-form>
<el-table
:height="height"
:data="dataList"
border
@row-dblclick="getRowData"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
{{ scope.row[item.columnProp] }}
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false" type="primary">关闭</el-button>
</span>
</el-dialog>
</template>
<script>
import {
getChooselist,
getChooselistData
} from "@/api/chooselist/chooselist.js"
export default {
data() {
return {
height: 200,
title: '列表',
columnList: [],
queryTable: {},
visible: false,
dataListLoading: true,
fullscreenLoading: false,
param1: '',
param2: '',
param3: '',
param: '',
param4: this.$store.state.user.site,
dataList: [],
baseListData: {
caption1: '',
caption2: '',
caption3: '',
caption4: '',
description: '',
fieldname1: '',
fieldname2: '',
sqlcode: '',
tagno: '',
},
defaultParam: false
}
},
methods: {
//
init(tagNo,param) {
this.visible = true;
this.param = param
// tagNo
getChooselist({"tagNo": tagNo}).then(({data}) => {
this.columnList = []
this.baseListData = data.data
let start = data.data.sqlcode.indexOf("Select")
let end = data.data.sqlcode.indexOf("from")
let length = end - start
let columns = data.data.sqlcode.trim().substring(start + 6, length).trim()
let props = columns.split(",")
props.forEach((item, index) => {
let name = '信息列'
switch (index) {
case 0:
name = this.baseListData.caption1
break;
case 1:
name = this.baseListData.caption2
break;
case 2:
name = this.baseListData.caption3
break;
case 3:
name = this.baseListData.caption4
break;
}
let index1 = item.indexOf(" as ");
let index2 = item.indexOf(".");
let l = item.length
let prop = item
if (index1> 0){
prop = item.substring(index1+3,l).trim()
}
if (index1<0 && index2>0){
prop = item.substring(index2+1,l)
}
let column = {
"columnProp":prop.trim(),
"columnLabel": name,
"columnHidden": false,
"columnImage": false,
"columnSortable": false,
"columnWidth": null,
"format": null,
"sortLv": index,
"status": true,
"fixed": false,
"serialNumber": null,
"columnType": null,
"align": null
}
this.columnList.push(column)
})
this.getDataList(true)
})
this.dataListLoading = false
},
getDataList(bool) {
let sql = this.baseListData.sqlcode
if (bool){
sql += " and (" + this.baseListData.fieldname1 + " like '%" + this.param + "%' OR "+this.baseListData.fieldname2 + " like '%" + this.param + "%'" +" ) "
}
if (this.param1) {
sql += " and " + this.baseListData.fieldname1 + " like '%" + this.param1 + "%'"
}
if (this.param2) {
sql += " and " + this.baseListData.fieldname2 + " like '%" + this.param2 + "%'"
}
if (this.param3) {
sql += " and active like '%" + this.param3 + "%'"
}
if (this.param4) {
sql += " and site=" + this.param4
}
getChooselistData({"sqlcode": sql}).then(({data}) => {
if (data.code == 0) {
this.dataList = data.baseListData;
} else {
this.$message.error(data.msg)
}
})
},
getRowData(row) {
this.visible = false
this.$emit('getBaseData',row)
},
closeDialog(){
this.param1= ''
this.param2=''
this.param3= ''
this.param= ''
this.param4=this.$store.state.user.site
}
}
}
</script>
<style>
</style>

513
src/views/modules/production/generateReport.vue

@ -0,0 +1,513 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -20px;">
<el-form-item :label="'生产订单号'">
<el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
<el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
<el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item>
<el-button @click="search()" style="margin-left: 0px;margin-top: 33px" type="primary">查询</el-button>
<download-excel
:fields="exportDataStandard"
:data="tableData"
type="xlsx"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:defaultValue="exportDefaultValue"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{'导出'}}
</download-excel>
</el-form>
<el-table
:height="height"
:data="tableData"
border
style="width: 100%">
<el-table-column
prop=""
header-align="center"
align="center"
min-width="50"
label="操作">
<template slot-scope="scope" class="foo_container">
<a type="text" size="small" @click="initReportModal(scope.row)">报告</a>
</template>
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="left"
min-width="100"
label="生产订单号">
</el-table-column>
<el-table-column
prop="itemNo"
header-align="center"
align="right"
min-width="50"
label="工序号">
</el-table-column>
<el-table-column
prop="operationDesc"
header-align="center"
align="left"
min-width="70"
label="工序名称">
</el-table-column>
<el-table-column
prop="workCenterNo"
header-align="center"
align="left"
min-width="70"
label="加工中心">
</el-table-column>
<el-table-column
prop="workCenterDesc"
header-align="center"
align="left"
min-width="100"
label="加工中心名称">
</el-table-column>
<el-table-column
prop="qtyRequired"
header-align="center"
align="right"
min-width="70"
label="需求数量">
</el-table-column>
<el-table-column
prop="qtyReported"
header-align="center"
align="right"
min-width="70"
label="报告数量">
</el-table-column>
<el-table-column
prop="qtyApprove"
header-align="center"
align="right"
min-width="70"
label="合格数量">
</el-table-column>
<el-table-column
prop="timeRequired"
header-align="center"
align="right"
min-width="70"
label="需求时间">
</el-table-column>
<el-table-column
prop="timeReported"
header-align="center"
align="right"
min-width="70"
label="报告时间">
</el-table-column>
<el-table-column
prop="partNo"
header-align="center"
align="left"
min-width="70"
label="产品编码">
</el-table-column>
<el-table-column
prop="partDescription"
header-align="center"
align="left"
min-width="100"
label="产品名称">
</el-table-column>
<el-table-column
prop="lotSize"
header-align="center"
align="right"
min-width="70"
label="订单数量">
</el-table-column>
<el-table-column
prop="status"
header-align="center"
align="left"
min-width="70"
label="订单状态">
</el-table-column>
</el-table>
<el-dialog @close="closeDialog" :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="报告信息" :visible.sync="setUp.reviewFlag" width="615px">
<el-form :inline="true" label-position="top">
<el-form-item label="生产订单号">
<el-input style="width: 130px;" :disabled="setUp.disabled" onkeyup="this.value = this.value.toUpperCase()" v-model="saveHeaderData.orderNo"></el-input>
</el-form-item>
<el-form-item label="产品编码">
<el-input style="width: 130px;" :disabled="setUp.disabled" v-model="saveHeaderData.partNo"></el-input>
</el-form-item>
<el-form-item label="产品名称/规格型号">
<el-input style="width: 275px;" :disabled="setUp.disabled" v-model="saveHeaderData.partDescription"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top">
<el-form-item label="工序号">
<el-input style="width: 130px;" :disabled="setUp.disabled" v-model="saveHeaderData.itemNo"></el-input>
</el-form-item>
<el-form-item label="工序名称">
<el-input style="width: 130px;" :disabled="setUp.disabled" v-model="saveHeaderData.operationDesc"></el-input>
</el-form-item>
<el-form-item label="加工中心编码">
<el-input style="width: 130px;" :disabled="setUp.disabled" v-model="saveHeaderData.workCenterNo"></el-input>
</el-form-item>
<el-form-item label="加工中心名称">
<el-input style="width: 130px;" :disabled="setUp.disabled" v-model="saveHeaderData.workCenterDesc"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top">
<el-form-item>
<span slot="label" style="" @click="getBaseList(26 ,1)"><a herf="#">操作员</a></span>
<el-input style="width: 130px;" v-model="saveHeaderData.operatorId"></el-input>
</el-form-item>
<el-form-item label="操作员姓名">
<el-input style="width: 130px;" v-model="saveHeaderData.operatorName"></el-input>
</el-form-item>
<el-form-item label="生产日期">
<el-date-picker
style="width: 130px"
v-model="saveHeaderData.planStartTime"
type="date"
value-format="yyyy-MM-dd"
format = "yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="报告日期">
<el-date-picker
style="width: 130px"
v-model="saveHeaderData.planFinishTime"
type="date"
value-format="yyyy-MM-dd"
format = "yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top">
<el-form-item label="报告数量">
<el-input type="number" oninput="value=value.replace(/[^\d]/g,'')" class="input_left" style="width: 178px;" v-model="saveHeaderData.qtyReported"></el-input>
<!-- <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.qtyRework" size="medium" :min="0" :controls="false"></el-input-number>-->
</el-form-item>
<el-form-item label="合格数量">
<el-input type="number" style="width: 178px;" oninput="value=value.replace(/[^\d]/g,'')" class="input_reight" v-model="saveHeaderData.qtyApprove"></el-input>
<!-- <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.qtyRework" size="medium" :min="0" :controls="false"></el-input-number>-->
</el-form-item>
<el-form-item label="返工数量">
<el-input type="number" style="width: 178px;" oninput="value=value.replace(/[^\d]/g,'')" v-model="saveHeaderData.qtyRework"></el-input>
<!-- <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.qtyRework" size="medium" :min="0" :controls="false"></el-input-number>-->
</el-form-item>
</el-form>
<fieldset class="customer-fieldset" style="width: 597px;margin-left: -10px;">
<legend class="customer-legend">不良品分析</legend>
<el-form :inline="true" label-position="top">
<el-form-item>
<span slot="label" style="" @click="getBaseList(26 ,2)"><a herf="#">操作员</a></span>
<el-input style="width: 178px;" v-model="saveHeaderData.operatorId2"></el-input>
</el-form-item>
<el-form-item label="操作员姓名">
<el-input style="width: 178px;" v-model="saveHeaderData.operatorIdName2"></el-input>
</el-form-item>
<el-form-item label="报废原因">
<el-input style="width: 178px;" v-model="saveHeaderData.scrapReason"></el-input>
</el-form-item>
</el-form>
</fieldset>
<el-form :inline="true" label-position="top">
<el-form-item label="准备时间">
<el-input type="number" style="width: 178px;text-align: right;" v-model="saveHeaderData.preparationTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
<!-- <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.preparationTime" size="medium" :min="0" :controls="false"></el-input-number>-->
</el-form-item>
<el-form-item label="制造时间">
<el-input type="number" style="width: 178px;" v-model="saveHeaderData.manufacturingTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
<!-- <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.manufacturingTime" size="medium" :min="0" :controls="false"></el-input-number>-->
</el-form-item>
<el-form-item label="清理时间" label-width="0px">
<el-input type="number" style="width: 178px;" v-model="saveHeaderData.cleaningTime"></el-input> <!--oninput ="value=value.replace(/[^0-9.]/g,'')"-->
<!-- :min="0" 最小值 :controls="false" 隐藏减价按钮 -->
<!-- <el-input-number style="width: 178px;text-align: right;" v-model="saveHeaderData.cleaningTime" size="medium" :min="0" :controls="false"></el-input-number>-->
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top">
<el-form-item label="停机原因">
<el-input style="width: 560px;" v-model="saveHeaderData.shutdownReason"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top">
<el-form-item label="备注">
<el-input style="width: 560px;" v-model="saveHeaderData.remark"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="setUp.reviewFlag = false">取消</el-button>
<el-button type="primary" :disabled="setUp.saveButton" @click="saveReport()">确定</el-button>
</span>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
<script>
import {
getGenerateReportList
, saveGenerateReport
} from '@/api/production/generateReport.js'
import Chooselist from '@/views/modules/common/Chooselist'
export default {
name: 'searchDailyPlan',
components: {
Chooselist
},
data () {
return {
setUp: {
reviewFlag: false,
saveButton: false,
readonlyFlag: false,
disabled: false
},
saveHeaderData: {
site: '',
orderNo: '',
itemNo: '',
partNo: '',
partDescription: '',
operationDesc: '',
workCenterNo: '',
workCenterDesc: '',
operatorId: '',
operatorName: '',
planStartTime: '',
planFinishTime: '',
qtyReported: 0,
qtyApprove: 0,
qtyRework: 0,
operatorId2: '',
operatorIdName2: '',
scrapReason: '',
preparationTime: 0,
manufacturingTime: 0,
cleaningTime: 0,
shutdownReason: '',
remark: ''
},
site: this.$store.state.user.site,
operatorType: 0,
// start
exportData: [],
exportDataStandard: {
'日计划单号': 'orderNo',
'计划日期': 'orderDate',
'订单号': 'orderRef1',
'物料编码': 'partNo',
'物料名称': 'partDescription',
'计划数量': 'orderQty',
'已完工数': 'qtyfinished',
'录入人': 'userName',
'录入时间': 'enterDate'
},
exportName: '日计划列表' + this.getStrDate(),
exportHeader: ['日计划列表'],
exportFooter: [],
exportDefaultValue: '这一行这一列没有数据',
// end
height: 200,
tableData: [],
date1: '',
searchData: {
orderNo: '',
workCenterNo: '',
partNo: '',
site: this.$store.state.user.site
}
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 210
})
},
methods: {
saveReport () {
if (this.saveHeaderData.qtyReported == null || this.saveHeaderData.qtyReported <= 0) {
this.$alert('报告数量错误!', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.qtyApprove == null || this.saveHeaderData.qtyApprove <= 0) {
this.$alert('合格数量错误!', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.qtyRework == null || this.saveHeaderData.qtyRework <= 0) {
this.$alert('返工数量错误!', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.preparationTime == null || this.saveHeaderData.preparationTime <= 0) {
this.$alert('准备时间错误!', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.manufacturingTime == null || this.saveHeaderData.manufacturingTime <= 0) {
this.$alert('制造时间错误!', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.cleaningTime == null || this.saveHeaderData.cleaningTime <= 0) {
this.$alert('清理时间错误!', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (parseFloat(this.saveHeaderData.qtyApprove) > parseFloat(this.saveHeaderData.qtyReported)) {
this.$alert('合格数量大于报告数量!', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.planStartTime == null || this.saveHeaderData.planStartTime === '') {
this.$alert('请选择生产日期!', '错误信息', {
confirmButtonText: '确定'
})
return
}
if (this.saveHeaderData.planFinishTime == null || this.saveHeaderData.planFinishTime === '') {
this.$alert('请选择报告日期!', '错误信息', {
confirmButtonText: '确定'
})
return
}
saveGenerateReport(this.saveHeaderData).then(({data}) => {
if (data.code == 0) {
this.$message.success(data.msg)
this.setUp.reviewFlag = false
this.search()
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
// S
getBaseList (val, type) {
this.tagNo = val
this.$nextTick(() => {
let strVal = ''
if (val === 24) {
strVal = this.searchData.workCenterNo
} else if (val === 26) {
this.operatorType = type
if (type === 1) {
strVal = this.saveHeaderData.operatorId
} else if (type === 2) {
strVal = this.saveHeaderData.operatorId2
}
}
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
getBaseData (val) {
console.log(val)
if (this.tagNo === 24) {
this.searchData.workCenterNo = val.WorkCenterNo
} else if (this.tagNo === 26) {
if (this.operatorType === 1) {
this.saveHeaderData.operatorId = val.OperatorID
this.saveHeaderData.operatorName = val.OperatorName
} else if (this.operatorType === 2) {
this.saveHeaderData.operatorId2 = val.OperatorID
this.saveHeaderData.operatorIdName2 = val.OperatorName
}
} else if (this.tagNo === 5) {
this.searchData.partNo = val.PartNo
}
},
initReportModal (row) {
this.setUp.reviewFlag = true
this.setUp.disabled = true
let currentData = JSON.parse(JSON.stringify(row))
this.saveHeaderData.site = currentData.site
this.saveHeaderData.orderNo = currentData.orderNo
this.saveHeaderData.itemNo = currentData.itemNo
this.saveHeaderData.operationDesc = currentData.operationDesc
this.saveHeaderData.partNo = currentData.partNo
this.saveHeaderData.partDescription = currentData.partDescription + '/' + currentData.spec
this.saveHeaderData.workCenterNo = currentData.workCenterNo
this.saveHeaderData.workCenterDesc = currentData.workCenterDesc
this.saveHeaderData.planFinishTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
},
closeDialog () {
Object.assign(this.$data.saveHeaderData, this.$options.data.call(this).saveHeaderData)
},
search () {
getGenerateReportList(this.searchData).then(({data}) => {
this.tableData = data.rows
})
},
createExportData () {
return this.tableData
},
startDownload () {
// this.exportData = this.dataList
},
finishDownload () {
},
getStrDate () {
let dd = new Date()
let Y = dd.getFullYear()
let M = (dd.getMonth() + 1) < 10 ? '0' + (dd.getMonth() + 1) : (dd.getMonth() + 1)// 100
let D = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate()// 100
let H = dd.getHours() < 10 ? '0' + dd.getHours() : dd.getHours()
let MM = dd.getMinutes() < 10 ? '0' + dd.getMinutes() : dd.getMinutes()
let S = dd.getSeconds() < 10 ? '0' + dd.getSeconds() : dd.getSeconds()
return Y + M + D + H + MM + S
}
},
created () {
}
}
</script>
<style scoped>
.input_left{
text-align: left;
}
.input_reight{
text-align: right;
}
/deep/ input::-webkit-inner-spin-button {
-webkit-appearance: none !important;
}
input[type='number'] {
-moz-appearance: textfield !important;
}
</style>
Loading…
Cancel
Save