mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

二维码回显问题改为组件

Browse Source
This commit is contained in:
xw88 2024-11-25 15:06:49 +08:00
parent b4cec0c147
commit ef18e8b2a7
5 changed files with 69 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/views/mes/dv/machinery/index.vue
View File

@ -154,7 +154,7 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['mes:dv:machinery:remove']" v-hasPermi="['mes:dv:machinery:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -231,13 +231,7 @@
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<div class="flex-container"> <BarcodeImg ref="barcodeImg" :bussinessId="form.machineryId" :bussinessCode="form.machineryCode" barcodeType="MACHINERY"></BarcodeImg>
<el-image class="barcodeClass" fit="scale-down" :src="form.barcodeUrl?form.barcodeUrl.toString():''">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -304,12 +298,13 @@ import {genCode} from "@/api/system/autocode/rule"
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import BarcodeImg from "@/components/barcodeImg/index.vue"
import {getBarcodeUrl} from "@/api/mes/wm/barcode"; import {getBarcodeUrl} from "@/api/mes/wm/barcode";
export default { export default {
name: "Machinery", name: "Machinery",
dicts: ['sys_yes_no','mes_machinery_status'], dicts: ['sys_yes_no','mes_machinery_status'],
components: { Treeselect }, components: { Treeselect,BarcodeImg },
data() { data() {
return { return {
//自动生成编码 //自动生成编码
@ -484,7 +479,7 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null updateTime: null
}; };
this.autoGenFlag = false; this.autoGenFlag = false;
this.resetForm("form"); this.resetForm("form");
@ -516,7 +511,9 @@ export default {
this.open = true; this.open = true;
this.title = "查看设备信息"; this.title = "查看设备信息";
this.optType = "view"; this.optType = "view";
this.getBarcodeUrl(); this.$nextTick(()=>{
this.$refs.barcodeImg.getBarcode();
})
}); });
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -543,19 +540,12 @@ export default {
this.open = true; this.open = true;
this.title = "修改设备"; this.title = "修改设备";
this.optType = "edit"; this.optType = "edit";
this.getBarcodeUrl(); this.$nextTick(()=>{
}); this.$refs.barcodeImg.getBarcode();
}, })
//获取二维码地址
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
}
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
@ -645,4 +635,4 @@ export default {
position: relative; position: relative;
display: inline-block; display: inline-block;
} }
</style> </style>

20
src/views/mes/md/mditem/index.vue
View File

@ -246,13 +246,7 @@
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<div class="flex-container"> <BarcodeImg ref="barcodeImg" :bussinessId="form.itemId" :bussinessCode="form.itemCode" barcodeType="ITEM"></BarcodeImg>
<el-image class="barcodeClass" fit="scale-down" :src="form.barcodeUrl">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -406,11 +400,11 @@ import { treeselect } from "@/api/mes/md/itemtype";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import { getBarcodeUrl } from "@/api/mes/wm/barcode"; import { getBarcodeUrl } from "@/api/mes/wm/barcode";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import BarcodeImg from "@/components/barcodeImg/index.vue"
export default { export default {
name: "MdItem", name: "MdItem",
dicts: ['sys_yes_no','mes_item_product'], dicts: ['sys_yes_no','mes_item_product'],
components: { Treeselect,ItemBom,SOPTab,SIPTab }, components: { Treeselect,ItemBom,SOPTab,SIPTab,BarcodeImg },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -608,7 +602,9 @@ export default {
this.open = true; this.open = true;
this.title = "查看物料/产品"; this.title = "查看物料/产品";
this.optType = "view"; this.optType = "view";
this.getBarcodeUrl(); this.$nextTick(()=>{
this.$refs.barcodeImg.getBarcode();
})
}); });
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -632,7 +628,9 @@ export default {
this.open = true; this.open = true;
this.optType = "edit"; this.optType = "edit";
this.title = "修改物料/产品"; this.title = "修改物料/产品";
this.getBarcodeUrl(); this.$nextTick(()=>{
this.$refs.barcodeImg.getBarcode();
})
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */

22
src/views/mes/md/workshop/index.vue
View File

@ -98,7 +98,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -172,13 +172,7 @@
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<div class="flex-container"> <BarcodeImg ref="barcodeImg" :bussinessId="form.workshopId" :bussinessCode="form.workshopCode" barcodeType="WORKSHOP"></BarcodeImg>
<el-image class="barcodeClass" fit="scale-down" :src="form.barcodeUrl?form.barcodeUrl.toString():''">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -201,8 +195,10 @@
<script> <script>
import { listWorkshop, getWorkshop, delWorkshop, addWorkshop, updateWorkshop } from "@/api/mes/md/workshop"; import { listWorkshop, getWorkshop, delWorkshop, addWorkshop, updateWorkshop } from "@/api/mes/md/workshop";
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import BarcodeImg from "@/components/barcodeImg/index.vue"
import {getBarcodeUrl} from "@/api/mes/wm/barcode"; import {getBarcodeUrl} from "@/api/mes/wm/barcode";
export default { export default {
components:{BarcodeImg},
name: "Workshop", name: "Workshop",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],
data() { data() {
@ -332,7 +328,9 @@ export default {
this.open = true; this.open = true;
this.title = "查看车间"; this.title = "查看车间";
this.optType = "view"; this.optType = "view";
this.getBarcodeUrl(); this.$nextTick(()=>{
this.$refs.barcodeImg.getBarcode();
})
}); });
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
@ -344,7 +342,9 @@ export default {
this.open = true; this.open = true;
this.title = "修改车间"; this.title = "修改车间";
this.optType = "edit"; this.optType = "edit";
this.getBarcodeUrl(); this.$nextTick(()=>{
this.$refs.barcodeImg.getBarcode();
})
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@ -403,7 +403,7 @@ export default {
}else{ }else{
this.form.workshopCode = null; this.form.workshopCode = null;
} }
} }
} }
}; };

51
src/views/mes/md/workstation/index.vue
View File

@ -143,7 +143,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -168,7 +168,7 @@
<el-switch v-model="autoGenFlag" <el-switch v-model="autoGenFlag"
active-color="#13ce66" active-color="#13ce66"
active-text="自动生成" active-text="自动生成"
@change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'"> @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -203,15 +203,9 @@
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<div class="flex-container"> <BarcodeImg ref="barcodeImg" :bussinessId="form.workstationId" :bussinessCode="form.workstationCode" barcodeType="WORKSTATION"></BarcodeImg>
<el-image class="barcodeClass" fit="scale-down" :src="form.barcodeUrl"> </el-col>
<div slot="error" class="image-slot"> </el-row>
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</div>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="所属工序" prop="processId"> <el-form-item label="所属工序" prop="processId">
@ -224,7 +218,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="是否启用" prop="enableFlag"> <el-form-item label="是否启用" prop="enableFlag">
<el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'"> <el-radio-group v-model="form.enableFlag" disabled v-if="optType=='view'">
@ -263,7 +257,7 @@
<span>设备资源</span> <span>设备资源</span>
<el-button style="float:right; padding: 3px 0" @click="handleMachineryAdd" v-if="optType !='view'" type="text">新增</el-button> <el-button style="float:right; padding: 3px 0" @click="handleMachineryAdd" v-if="optType !='view'" type="text">新增</el-button>
</div> </div>
<WorkStationMachine ref="machineryList" :optType="optType" :workstationId="form.workstationId" style="align:center"></WorkStationMachine> <WorkStationMachine ref="machineryList" :optType="optType" :workstationId="form.workstationId" style="align:center"></WorkStationMachine>
</el-card> </el-card>
</el-carousel-item> </el-carousel-item>
<el-carousel-item> <el-carousel-item>
@ -312,10 +306,11 @@ import {listAllProcess} from "@/api/mes/pro/process";
import {genCode} from "@/api/system/autocode/rule"; import {genCode} from "@/api/system/autocode/rule";
import { listAllWorkshop } from "@/api/mes/md/workshop"; import { listAllWorkshop } from "@/api/mes/md/workshop";
import { getBarcodeUrl } from "@/api/mes/wm/barcode"; import { getBarcodeUrl } from "@/api/mes/wm/barcode";
import BarcodeImg from "@/components/barcodeImg/index.vue";
export default { export default {
name: "Workstation", name: "Workstation",
dicts: ['sys_yes_no'], dicts: ['sys_yes_no'],
components: {WorkStationMachine,MachinerySelectSingle,Workstationworker,WorkStationTool}, components: {WorkStationMachine,MachinerySelectSingle,Workstationworker,WorkStationTool,BarcodeImg},
data() { data() {
return { return {
//自动生成编码 //自动生成编码
@ -414,7 +409,7 @@ export default {
], ],
processId: [ processId: [
{ required: true, message: "请选择所属工序", trigger: "blur" } { required: true, message: "请选择所属工序", trigger: "blur" }
] ]
} }
}; };
}, },
@ -436,7 +431,7 @@ export default {
}, },
//查询车间信息 //查询车间信息
getWorkshops(){ getWorkshops(){
listAllWorkshop().then( response => { listAllWorkshop().then( response => {
this.workshopOptions = response.data; this.workshopOptions = response.data;
}); });
}, },
@ -448,16 +443,16 @@ export default {
}, },
//获取仓库 //获取仓库
getWarehouseList(){ getWarehouseList(){
getTreeList().then( response =>{ getTreeList().then( response =>{
this.warehouseOptions = response.data; this.warehouseOptions = response.data;
this.warehouseOptions.map(w =>{ this.warehouseOptions.map(w =>{
w.children.map(l =>{ w.children.map(l =>{
let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName'); let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
l.children = JSON.parse(lstr); l.children = JSON.parse(lstr);
}); });
let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName'); let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
w.children = JSON.parse(wstr); w.children = JSON.parse(wstr);
}); });
let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName'); let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@ -555,7 +550,9 @@ export default {
this.open = true; this.open = true;
this.title = "查看工作站信息"; this.title = "查看工作站信息";
this.optType = "view"; this.optType = "view";
this.getBarcodeUrl(); this.$nextTick(()=>{
this.$refs.barcodeImg.getBarcode();
})
}); });
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
@ -568,7 +565,9 @@ export default {
this.open = true; this.open = true;
this.title = "修改工作站"; this.title = "修改工作站";
this.optType = "edit"; this.optType = "edit";
this.getBarcodeUrl(); this.$nextTick(()=>{
this.$refs.barcodeImg.getBarcode();
})
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@ -643,10 +642,10 @@ export default {
getBarcodeUrl(){ getBarcodeUrl(){
this.barcodeParams.bussinessId = this.form.workstationId; this.barcodeParams.bussinessId = this.form.workstationId;
this.barcodeParams.bussinessCode = this.form.workstationCode; this.barcodeParams.bussinessCode = this.form.workstationCode;
getBarcodeUrl(this.barcodeParams).then( response =>{ getBarcodeUrl(this.barcodeParams).then( response =>{
if(response.data != null){ if(response.data != null){
this.$set(this.form,'barcodeUrl',response.data.barcodeUrl);//强制刷新DOM this.$set(this.form,'barcodeUrl',response.data.barcodeUrl);//强制刷新DOM
} }
}); });
}, },
} }
@ -666,4 +665,4 @@ export default {
justify-content: center; /* 水平居中 */ justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */ align-items: center; /* 垂直居中 */
} }
</style> </style>

22
src/views/mes/tm/tool/index.vue
View File

@ -176,7 +176,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -237,13 +237,7 @@
</el-row> </el-row>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<div class="flex-container"> <BarcodeImg ref="barcodeImg" :bussinessId="form.toolId" :bussinessCode="form.toolCode" barcodeType="TOOL"></BarcodeImg>
<el-image class="barcodeClass" fit="scale-down" :src="form.barcodeUrl?form.barcodeUrl.toString():''">
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -326,8 +320,10 @@ import { listTool, getTool, delTool, addTool, updateTool } from "@/api/mes/tm/to
import { listAllTooltype } from "@/api/mes/tm/tooltype" import { listAllTooltype } from "@/api/mes/tm/tooltype"
import {genCode} from "@/api/system/autocode/rule" import {genCode} from "@/api/system/autocode/rule"
import {getBarcodeUrl} from "@/api/mes/wm/barcode"; import {getBarcodeUrl} from "@/api/mes/wm/barcode";
import BarcodeImg from "@/components/barcodeImg/index.vue";
export default { export default {
name: "Tool", name: "Tool",
components: {BarcodeImg},
dicts: ['mes_tool_status', 'mes_mainten_type'], dicts: ['mes_tool_status', 'mes_mainten_type'],
data() { data() {
return { return {
@ -491,11 +487,13 @@ export default {
this.reset(); this.reset();
const toolId = row.toolId || this.ids; const toolId = row.toolId || this.ids;
getTool(toolId).then(response => { getTool(toolId).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "查看工装夹具信息"; this.title = "查看工装夹具信息";
this.optType = "view"; this.optType = "view";
this.getBarcodeUrl(); this.$nextTick(()=>{
this.$refs.barcodeImg.getBarcode();
})
}); });
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
@ -507,7 +505,9 @@ export default {
this.open = true; this.open = true;
this.title = "修改工装夹具清单"; this.title = "修改工装夹具清单";
this.optType = "edit"; this.optType = "edit";
this.getBarcodeUrl(); this.$nextTick(()=>{
this.$refs.barcodeImg.getBarcode();
})
}); });
}, },
//获取二维码地址 //获取二维码地址