diff --git a/.env.development b/.env.development index f2301ee..bbdec19 100644 --- a/.env.development +++ b/.env.development @@ -9,3 +9,6 @@ VUE_APP_BASE_API = '/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true + +# 报表系统/开发环境 +VUE_APP_REPORT = 'http://localhost:8080' \ No newline at end of file diff --git a/.env.production b/.env.production index 93172c2..d95d2e2 100644 --- a/.env.production +++ b/.env.production @@ -6,3 +6,6 @@ ENV = 'production' # 若依管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' + +# 报表系统/开发环境 +VUE_APP_REPORT = 'http://localhost:8080' diff --git a/.env.staging b/.env.staging index 12ce6a0..bb63be1 100644 --- a/.env.staging +++ b/.env.staging @@ -8,3 +8,6 @@ ENV = 'staging' # 若依管理系统/测试环境 VUE_APP_BASE_API = '/stage-api' + +# 报表系统/开发环境 +VUE_APP_REPORT = 'http://localhost:8080' diff --git a/src/components/barcodeImg/index.vue b/src/components/barcodeImg/index.vue index 06c5987..7c8fd83 100644 --- a/src/components/barcodeImg/index.vue +++ b/src/components/barcodeImg/index.vue @@ -1,85 +1,91 @@ diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue index 45bed37..e5d6c42 100644 --- a/src/views/mes/dv/machinery/index.vue +++ b/src/views/mes/dv/machinery/index.vue @@ -173,61 +173,80 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + +
+ +
+ +
+ +
- - - - - - - - - - - - - - - + - - - - - - - @@ -285,6 +304,7 @@ import {genCode} from "@/api/system/autocode/rule" import { getToken } from "@/utils/auth"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; +import {getBarcodeUrl} from "@/api/mes/wm/barcode"; export default { name: "Machinery", @@ -342,6 +362,13 @@ export default { // 上传的地址 url: process.env.VUE_APP_BASE_API + "/mes/dv/machinery/importData" }, + //二维码查询参数 + barcodeParams: { + bussinessId: null, + bussinessCode: null, + barcodeFormart: 'QR_CODE', //模式二维码 + barcodeType: 'MACHINERY' //类型 + }, // 查询参数 queryParams: { pageNum: 1, @@ -489,6 +516,7 @@ export default { this.open = true; this.title = "查看设备信息"; this.optType = "view"; + this.getBarcodeUrl(); }); }, /** 新增按钮操作 */ @@ -515,6 +543,17 @@ export default { this.open = true; this.title = "修改设备"; this.optType = "edit"; + this.getBarcodeUrl(); + }); + }, + //获取二维码地址 + getBarcodeUrl(){ + this.barcodeParams.bussinessId = this.form.machineryId; + this.barcodeParams.bussinessCode = this.form.machineryCode; + getBarcodeUrl(this.barcodeParams).then( response =>{ + if(response.data != null){ + this.$set(this.form,'barcodeUrl',response.data.barcodeUrl);//强制刷新DOM + } }); }, /** 提交按钮 */ @@ -592,4 +631,18 @@ export default { } } }; - \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/mes/md/mditem/index.vue b/src/views/mes/md/mditem/index.vue index fa10c13..bf19348 100644 --- a/src/views/mes/md/mditem/index.vue +++ b/src/views/mes/md/mditem/index.vue @@ -111,14 +111,14 @@ - + @@ -133,7 +133,7 @@ @@ -166,7 +166,7 @@ icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:md:mditem:remove']" - >删除 + >删除 @@ -196,9 +196,9 @@ + active-color="#13ce66" + active-text="自动生成" + @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'"> @@ -221,25 +221,25 @@ - + + v-for="item in measureOptions" + :key="item.measureCode" + :label="item.measureName" + :value="item.measureCode" + :disabled="item.enableFlag == 'N'" + > + v-for="item in measureOptions" + :key="item.measureCode" + :label="item.measureName" + :value="item.measureCode" + :disabled="item.enableFlag == 'N'" + > @@ -252,8 +252,8 @@ - - + + @@ -265,13 +265,13 @@ - + - + - + - + @@ -577,7 +577,7 @@ export default { minStock: 0, maxStock: 0, optType: undefined, - remark: undefined + remark: undefined }; this.autoGenFlag = false; this.resetForm("form"); @@ -698,14 +698,14 @@ export default { submitFileForm() { this.$refs.upload.submit(); }, - //获取二维码地址 + //获取二维码地址 getBarcodeUrl(){ this.barcodeParams.bussinessId = this.form.itemId; this.barcodeParams.bussinessCode = this.form.itemCode; - getBarcodeUrl(this.barcodeParams).then( response =>{ + getBarcodeUrl(this.barcodeParams).then( response =>{ if(response.data != null){ this.$set(this.form,'barcodeUrl',response.data.barcodeUrl);//强制刷新DOM - } + } }); }, //自动生成物料编码 @@ -723,17 +723,17 @@ export default { }; \ No newline at end of file +.flex-container{ + display: flex; + justify-content: center; /* 水平居中 */ + align-items: center; /* 垂直居中 */ +} + diff --git a/src/views/mes/md/workshop/index.vue b/src/views/mes/md/workshop/index.vue index 15d2f4f..0320545 100644 --- a/src/views/mes/md/workshop/index.vue +++ b/src/views/mes/md/workshop/index.vue @@ -111,56 +111,74 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{dict.label}} + + + {{dict.label}} + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{dict.label}} - - - {{dict.label}} - - + +
+ +
+ +
+ +
@@ -183,6 +201,7 @@ + diff --git a/src/views/mes/pro/workorder/bom/bom.vue b/src/views/mes/pro/workorder/bom/bom.vue index 3dacea0..cb41f4f 100644 --- a/src/views/mes/pro/workorder/bom/bom.vue +++ b/src/views/mes/pro/workorder/bom/bom.vue @@ -143,9 +143,9 @@ export default { }, props: { optType: undefined, - workorder: undefined, + workorder: undefined, }, - created() { + mounted() { this.getList(); }, methods: { @@ -157,6 +157,7 @@ export default { this.workorderbomList = response.rows; this.total = response.total; this.loading = false; + console.log(this.form,'160') }); }, // 取消按钮 diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue index a7bc704..e478125 100644 --- a/src/views/mes/pro/workorder/index.vue +++ b/src/views/mes/pro/workorder/index.vue @@ -69,10 +69,10 @@ + v-model="queryParams.requestDate" + type="date" + value-format="yyyy-MM-dd" + placeholder="请选择需求日期"> @@ -81,7 +81,7 @@ - + - + - + @@ -176,7 +176,7 @@ - + @@ -235,23 +242,23 @@ + active-color="#13ce66" + active-text="自动生成" + @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'"> - + - + - + {{dict.label}} - + - + @@ -290,7 +297,7 @@ - + @@ -306,7 +313,7 @@ - + @@ -318,7 +325,7 @@ - + @@ -329,18 +336,18 @@ + v-model="form.requestDate" + type="date" + value-format="yyyy-MM-dd" + placeholder="请选择需求日期"> - + - + @@ -387,12 +394,12 @@ - - - + + + - +
@@ -535,7 +542,7 @@ export default { children: node.children }; }, - /** 查询生产工单下拉树结构 */ + /** 查询生产工单下拉树结构 */ getTreeselect() { listWorkorder().then(response => { this.workorderOptions = []; @@ -635,8 +642,13 @@ export default { this.getTreeselect(); const workorderId = row.workorderId || this.ids; getWorkorder(workorderId).then(response => { - this.form = response.data; + this.form = response.data this.open = true; + this.$nextTick(() => { + console.log("2232",this.$refs.barcodeImg) + this.$refs.barcodeImg.getBarcode(); + + }) this.title = "查看工单信息"; this.optType = "view"; }); @@ -650,6 +662,10 @@ export default { } getWorkorder(row.workorderId).then(response => { this.form = response.data; + + console.log("3232",this.form) + this.form.workorderCode = response.data.workorderCode + this.form.workorderId = response.data.workorderId this.open = true; this.title = "修改生产工单"; this.optType="edit"; @@ -677,6 +693,10 @@ export default { } }); }, + handlePreview(row){ + //todo:本地环境报表地址 + window.open(process.env.VUE_APP_REPORT+"/ureport/preview?_u=mysql:生产工单打印模版.ureport.xml&id="+row.workorderId+"&code="+row.workorderCode) + }, /** 删除按钮操作 */ handleDelete(row) { this.$modal.confirm('是否确认删除生产工单编号为"' + row.workorderId + '"的数据项？').then(function() { @@ -716,21 +736,21 @@ export default { }, //物料选择弹出框 onItemSelected(obj){ - if(obj != undefined && obj != null){ - this.form.productId = obj.itemId; - this.form.productCode = obj.itemCode; - this.form.productName = obj.itemName; - this.form.productSpc = obj.specification; - this.form.unitOfMeasure = obj.unitName; - } + if(obj != undefined && obj != null){ + this.form.productId = obj.itemId; + this.form.productCode = obj.itemCode; + this.form.productName = obj.itemName; + this.form.productSpc = obj.specification; + this.form.unitOfMeasure = obj.unitName; + } }, //客户选择弹出框 onClientSelected(obj){ - if(obj != undefined && obj != null){ - this.form.clientId = obj.clientId; - this.form.clientCode = obj.clientCode; - this.form.clientName = obj.clientName; - } + if(obj != undefined && obj != null){ + this.form.clientId = obj.clientId; + this.form.clientCode = obj.clientCode; + this.form.clientName = obj.clientName; + } }, //供应商选择 handleSelectVendor(){ @@ -738,12 +758,12 @@ export default { }, //供应商选择弹出框 onVendorSelected(obj){ - debugger; - if(obj != undefined && obj != null){ - this.form.vendorId = obj.vendorId; - this.form.vendorCode = obj.vendorCode; - this.form.vendorName = obj.vendorName; - } + debugger; + if(obj != undefined && obj != null){ + this.form.vendorId = obj.vendorId; + this.form.vendorCode = obj.vendorCode; + this.form.vendorName = obj.vendorName; + } }, //自动生成编码 handleAutoGenChange(autoGenFlag){ diff --git a/src/views/mes/tm/tool/index.vue b/src/views/mes/tm/tool/index.vue index d0a8354..563f1df 100644 --- a/src/views/mes/tm/tool/index.vue +++ b/src/views/mes/tm/tool/index.vue @@ -157,7 +157,7 @@ - +