diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue index ae2d0c0..8eadbca 100644 --- a/hb_client/src/components/customForm/index.vue +++ b/hb_client/src/components/customForm/index.vue @@ -246,7 +246,7 @@ if (imag.length > 0) { that.img = new Image(); 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; setTimeout(function () { that.canvasInit(); diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue index fcd78d3..6deb6f1 100644 --- a/hb_client/src/views/mtm/step.vue +++ b/hb_client/src/views/mtm/step.vue @@ -526,6 +526,7 @@ 'datetime': '日期时间', 'select': '单选', 'selects': '多选', + 'draw': '绘图模板', }, typeoption: [{ value: 1, diff --git a/hb_client/src/views/procurement/puorderitem.vue b/hb_client/src/views/procurement/puorderitem.vue index 7ac2299..e52e53a 100644 --- a/hb_client/src/views/procurement/puorderitem.vue +++ b/hb_client/src/views/procurement/puorderitem.vue @@ -30,6 +30,9 @@ + @@ -90,6 +93,9 @@ +
取消