picture
This commit is contained in:
parent
392ddf83cd
commit
db4adb4756
|
@ -246,7 +246,7 @@
|
||||||
if (imag.length > 0) {
|
if (imag.length > 0) {
|
||||||
that.img = new Image();
|
that.img = new Image();
|
||||||
that.img.crossOrigin = 'anonymous';
|
that.img.crossOrigin = 'anonymous';
|
||||||
let value = imag[0].field_value!==null ? imag[0].field_value : imag[0].draw_template;
|
let value = imag[0].field_value!==null&&imag[0].field_value!==undefined&&imag[0].field_value!=='' ? imag[0].field_value : imag[0].draw_template;
|
||||||
that.img =process.env.VUE_APP_BASE_API.replace('/api','')+ value;
|
that.img =process.env.VUE_APP_BASE_API.replace('/api','')+ value;
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
that.canvasInit();
|
that.canvasInit();
|
||||||
|
|
|
@ -526,6 +526,7 @@
|
||||||
'datetime': '日期时间',
|
'datetime': '日期时间',
|
||||||
'select': '单选',
|
'select': '单选',
|
||||||
'selects': '多选',
|
'selects': '多选',
|
||||||
|
'draw': '绘图模板',
|
||||||
},
|
},
|
||||||
typeoption: [{
|
typeoption: [{
|
||||||
value: 1,
|
value: 1,
|
||||||
|
|
|
@ -30,6 +30,9 @@
|
||||||
<el-table-column label="物料型号">
|
<el-table-column label="物料型号">
|
||||||
<template slot-scope="scope">{{ scope.row.material_.specification }}</template>
|
<template slot-scope="scope">{{ scope.row.material_.specification }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<!--<el-table-column label="物料品牌">
|
||||||
|
<template slot-scope="scope">{{ scope.row.brand }}</template>
|
||||||
|
</el-table-column>-->
|
||||||
<el-table-column label="采购数量">
|
<el-table-column label="采购数量">
|
||||||
<template slot-scope="scope">{{ scope.row.count }}</template>
|
<template slot-scope="scope">{{ scope.row.count }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
@ -90,6 +93,9 @@
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<!--<el-form-item label="物料品牌">
|
||||||
|
<el-input v-model="puorderTtem.brand" placeholder="规格型号"/>
|
||||||
|
</el-form-item>-->
|
||||||
</el-form>
|
</el-form>
|
||||||
<div style="text-align: right">
|
<div style="text-align: right">
|
||||||
<el-button type="danger" @click="dialogVisible = false">取消</el-button>
|
<el-button type="danger" @click="dialogVisible = false">取消</el-button>
|
||||||
|
|
Loading…
Reference in New Issue