加上二维码
This commit is contained in:
parent
e3acd3e919
commit
cc235f981b
|
|
@ -37,6 +37,7 @@
|
|||
"vue-i18n": "^8.18.2",
|
||||
"vue-json-excel": "^0.3.0",
|
||||
"vue-plugin-hiprint": "^0.0.48",
|
||||
"vue-qr": "^4.0.9",
|
||||
"vue-quill-editor": "^3.0.6",
|
||||
"vue-router": "^3.3.4",
|
||||
"vuedraggable": "^2.23.2",
|
||||
|
|
|
|||
|
|
@ -44,6 +44,18 @@
|
|||
<slot name="column1" :row="row"></slot>
|
||||
</template>
|
||||
|
||||
<template #column2="{ row }">
|
||||
<slot name="column2" :row="row"></slot>
|
||||
</template>
|
||||
<template #column3="{ row }">
|
||||
<slot name="column3" :row="row"></slot>
|
||||
</template>
|
||||
<template #column4="{ row }">
|
||||
<slot name="column4" :row="row"></slot>
|
||||
</template>
|
||||
<template #column5="{ row }">
|
||||
<slot name="column5" :row="row"></slot>
|
||||
</template>
|
||||
</vxe-grid>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,11 @@
|
|||
</div>
|
||||
<div class="right">
|
||||
|
||||
<basic-page-list ref="listPage" :desc="desc" @importData="pageImport" :options="pageOptions"></basic-page-list>
|
||||
<basic-page-list ref="listPage" :desc="desc" @importData="pageImport" :options="pageOptions">
|
||||
<template v-slot:column2="{ row }">
|
||||
<vue-qr class="qr-code" :text="row.qr_code" :size="120" />
|
||||
</template>
|
||||
</basic-page-list>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -38,11 +42,16 @@ let childrenFieldName = 'children';
|
|||
import { toArrayTree } from "xe-utils"
|
||||
const settings = require('../../basic/settings.js');
|
||||
|
||||
import vueQr from 'vue-qr';
|
||||
export default {
|
||||
i18n: require("./i18n"),
|
||||
props: {
|
||||
|
||||
},
|
||||
|
||||
components: {
|
||||
vueQr
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
pageOptions: {},
|
||||
|
|
@ -251,6 +260,7 @@ export default {
|
|||
|
||||
{ title: '操作', slots: { default: 'op' }, width: 120 },
|
||||
|
||||
{ slots: { default: 'column2' }, title: '扫码', width: 130 },
|
||||
// =============================== 表格列 自动生成 Start ===============================
|
||||
|
||||
//{ field: 'process_segment_id', sortable: true, title: '工序段id', width: 250 }, // 工序段id
|
||||
|
|
|
|||
|
|
@ -1,16 +1,26 @@
|
|||
<template>
|
||||
<basic-page-list :desc="desc" :options="pageOptions"></basic-page-list>
|
||||
<basic-page-list :desc="desc" :options="pageOptions">
|
||||
|
||||
<template v-slot:column2="{ row }">
|
||||
<vue-qr class="qr-code" :text="row.qr_code" :size="120" />
|
||||
</template>
|
||||
</basic-page-list>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import BASE_URL from '@/services/mes/api.js';
|
||||
|
||||
import vueQr from 'vue-qr';
|
||||
|
||||
export default {
|
||||
i18n: require("./i18n"),
|
||||
props: {
|
||||
|
||||
},
|
||||
|
||||
components: {
|
||||
vueQr
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
pageOptions: {}
|
||||
|
|
@ -40,8 +50,8 @@ export default {
|
|||
listFieldName: 'ProductionOrderArray',
|
||||
|
||||
|
||||
editPage: ()=> import("./Edit.vue"),
|
||||
editPageTitle:"随车联",
|
||||
editPage: () => import("./Edit.vue"),
|
||||
editPageTitle: "随车联",
|
||||
// 接口动作
|
||||
actions: { // Api 接口地址
|
||||
getList: `${BASE_URL.BASE_URL}/MesProductionOrder/v1/production/order/array/list`,
|
||||
|
|
@ -87,11 +97,12 @@ export default {
|
|||
|
||||
// 表格列配置
|
||||
columns: [
|
||||
{ type: 'checkbox', width: 'auto' }, // 多选框
|
||||
{ type: 'seq', width: 'auto' }, // 序号
|
||||
{ type: 'checkbox', width: 50 }, // 多选框
|
||||
{ type: 'seq', width: 50 }, // 序号
|
||||
|
||||
{ title: '操作', slots: { default: 'op' }, width: 120 },
|
||||
{ title: '操作', slots: { default: 'op' }, width: 100 },
|
||||
|
||||
{ slots: { default: 'column2' }, title: '扫码', width: 130 },
|
||||
{ field: 'batch_no', sortable: true, title: '批次编号', width: 150 },
|
||||
{ field: 'materials_name', title: '料品名称', width: 150 },
|
||||
{ field: 'production_number', title: '布产单编号', width: 150 },
|
||||
|
|
|
|||
|
|
@ -3,18 +3,26 @@
|
|||
<template v-slot:column1="{ row }">
|
||||
<img v-if="row && row.avatar" :src="row.avatar" style="width: 100px;" />
|
||||
</template>
|
||||
<template v-slot:column2="{ row }">
|
||||
<vue-qr class="qr-code" :text="row.qr_code" :size="120" />
|
||||
</template>
|
||||
</basic-page-list>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import BASE_URL from '@/services/mes/api.js';
|
||||
|
||||
import vueQr from 'vue-qr';
|
||||
|
||||
export default {
|
||||
i18n: require("./i18n"),
|
||||
props: {
|
||||
|
||||
},
|
||||
|
||||
components: {
|
||||
vueQr
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
pageOptions: {}
|
||||
|
|
@ -140,7 +148,8 @@ export default {
|
|||
|
||||
// =============================== 表格列 自动生成 Start ===============================
|
||||
|
||||
{ slots: { default: 'column1' }, title: '员工头像', width: 250 },
|
||||
{ slots: { default: 'column1' }, title: '员工头像', width: 130 },
|
||||
{ slots: { default: 'column2' }, title: '扫码', width: 130 },
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
78
yarn.lock
78
yarn.lock
|
|
@ -2384,6 +2384,13 @@
|
|||
"balanced-match" "^1.0.0"
|
||||
"concat-map" "0.0.1"
|
||||
|
||||
"brace-expansion@^2.0.1":
|
||||
"integrity" "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="
|
||||
"resolved" "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz"
|
||||
"version" "2.0.1"
|
||||
dependencies:
|
||||
"balanced-match" "^1.0.0"
|
||||
|
||||
"braces@^2.3.1", "braces@^2.3.2":
|
||||
"integrity" "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk="
|
||||
"resolved" "https://registry.npm.taobao.org/braces/download/braces-2.3.2.tgz"
|
||||
|
|
@ -3891,6 +3898,13 @@
|
|||
dependencies:
|
||||
"mimic-response" "^1.0.0"
|
||||
|
||||
"decompress-response@^6.0.0":
|
||||
"integrity" "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="
|
||||
"resolved" "https://registry.npmmirror.com/decompress-response/-/decompress-response-6.0.0.tgz"
|
||||
"version" "6.0.0"
|
||||
dependencies:
|
||||
"mimic-response" "^3.1.0"
|
||||
|
||||
"deep-equal@^1.0.1", "deep-equal@~1.1.1":
|
||||
"integrity" "sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o="
|
||||
"resolved" "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz"
|
||||
|
|
@ -5314,6 +5328,17 @@
|
|||
"once" "^1.3.0"
|
||||
"path-is-absolute" "^1.0.0"
|
||||
|
||||
"glob@^8.0.1":
|
||||
"integrity" "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="
|
||||
"resolved" "https://registry.npmmirror.com/glob/-/glob-8.1.0.tgz"
|
||||
"version" "8.1.0"
|
||||
dependencies:
|
||||
"fs.realpath" "^1.0.0"
|
||||
"inflight" "^1.0.4"
|
||||
"inherits" "2"
|
||||
"minimatch" "^5.0.1"
|
||||
"once" "^1.3.0"
|
||||
|
||||
"global-dirs@^2.0.1":
|
||||
"integrity" "sha1-rN87tmhbzVXLNeigUiZlaelGkgE="
|
||||
"resolved" "https://registry.npm.taobao.org/global-dirs/download/global-dirs-2.0.1.tgz"
|
||||
|
|
@ -6402,6 +6427,11 @@
|
|||
"resolved" "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz"
|
||||
"version" "2.6.4"
|
||||
|
||||
"js-binary-schema-parser@^2.0.2":
|
||||
"integrity" "sha512-xezGJmOb4lk/M1ZZLTR/jaBHQ4gG/lqQnJqdIv4721DMggsa1bDVlHXNeHYogaIEHD9vCRv0fcL4hMA+Coarkg=="
|
||||
"resolved" "https://registry.npmmirror.com/js-binary-schema-parser/-/js-binary-schema-parser-2.0.3.tgz"
|
||||
"version" "2.0.3"
|
||||
|
||||
"js-cookie@^2.2.1":
|
||||
"integrity" "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg="
|
||||
"resolved" "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz"
|
||||
|
|
@ -7144,6 +7174,11 @@
|
|||
"resolved" "https://registry.npm.taobao.org/mimic-response/download/mimic-response-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
|
||||
"mimic-response@^3.1.0":
|
||||
"integrity" "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
|
||||
"resolved" "https://registry.npmmirror.com/mimic-response/-/mimic-response-3.1.0.tgz"
|
||||
"version" "3.1.0"
|
||||
|
||||
"min-document@^2.19.0":
|
||||
"integrity" "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU="
|
||||
"resolved" "https://registry.npm.taobao.org/min-document/download/min-document-2.19.0.tgz"
|
||||
|
|
@ -7188,6 +7223,13 @@
|
|||
dependencies:
|
||||
"brace-expansion" "^1.1.7"
|
||||
|
||||
"minimatch@^5.0.1":
|
||||
"integrity" "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="
|
||||
"resolved" "https://registry.npmmirror.com/minimatch/-/minimatch-5.1.6.tgz"
|
||||
"version" "5.1.6"
|
||||
dependencies:
|
||||
"brace-expansion" "^2.0.1"
|
||||
|
||||
"minimist@^1.1.0", "minimist@^1.2.0", "minimist@^1.2.5", "minimist@~1.2.5":
|
||||
"integrity" "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
|
||||
"resolved" "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz"
|
||||
|
|
@ -7920,6 +7962,11 @@
|
|||
dependencies:
|
||||
"callsites" "^3.0.0"
|
||||
|
||||
"parenthesis@^3.1.5":
|
||||
"integrity" "sha512-KF/U8tk54BgQewkJPvB4s/US3VQY68BRDpH638+7O/n58TpnwiwnOtGIOsT2/i+M78s61BBpeC83STB88d8sqw=="
|
||||
"resolved" "https://registry.npmmirror.com/parenthesis/-/parenthesis-3.1.8.tgz"
|
||||
"version" "3.1.8"
|
||||
|
||||
"parse-asn1@^5.0.0", "parse-asn1@^5.1.5":
|
||||
"integrity" "sha1-ADJxND2ljclMrOSU+u89IUfs6g4="
|
||||
"resolved" "https://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.5.tgz"
|
||||
|
|
@ -9492,6 +9539,20 @@
|
|||
"resolved" "https://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.3.tgz"
|
||||
"version" "3.0.3"
|
||||
|
||||
"simple-concat@^1.0.0":
|
||||
"integrity" "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
|
||||
"resolved" "https://registry.npmmirror.com/simple-concat/-/simple-concat-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
|
||||
"simple-get@^4.0.1":
|
||||
"integrity" "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="
|
||||
"resolved" "https://registry.npmmirror.com/simple-get/-/simple-get-4.0.1.tgz"
|
||||
"version" "4.0.1"
|
||||
dependencies:
|
||||
"decompress-response" "^6.0.0"
|
||||
"once" "^1.3.1"
|
||||
"simple-concat" "^1.0.0"
|
||||
|
||||
"simple-statistics@^6.1.0":
|
||||
"integrity" "sha1-46B5n/xJkU1vQhxaSsWF9qE+K60="
|
||||
"resolved" "https://registry.npm.taobao.org/simple-statistics/download/simple-statistics-6.1.1.tgz"
|
||||
|
|
@ -9938,6 +9999,13 @@
|
|||
"resolved" "https://registry.npm.taobao.org/string-convert/download/string-convert-0.2.1.tgz"
|
||||
"version" "0.2.1"
|
||||
|
||||
"string-split-by@^1.0.0":
|
||||
"integrity" "sha512-KaJKY+hfpzNyet/emP81PJA9hTVSfxNLS9SFTWxdCnnW1/zOOwiV248+EfoX7IQFcBaOp4G5YE6xTJMF+pLg6A=="
|
||||
"resolved" "https://registry.npmmirror.com/string-split-by/-/string-split-by-1.0.0.tgz"
|
||||
"version" "1.0.0"
|
||||
dependencies:
|
||||
"parenthesis" "^3.1.5"
|
||||
|
||||
"string-width@^2.0.0":
|
||||
"integrity" "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4="
|
||||
"resolved" "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz"
|
||||
|
|
@ -10961,6 +11029,16 @@
|
|||
"nzh" "^1.0.8"
|
||||
"socket.io-client" "^4.5.1"
|
||||
|
||||
"vue-qr@^4.0.9":
|
||||
"integrity" "sha512-pAISV94T0MNEYA3NGjykUpsXRE2QfaNxlu9ZhEL6CERgqNc21hJYuP3hRVzAWfBQlgO18DPmZTbrFerJC3+Ikw=="
|
||||
"resolved" "https://registry.npmmirror.com/vue-qr/-/vue-qr-4.0.9.tgz"
|
||||
"version" "4.0.9"
|
||||
dependencies:
|
||||
"glob" "^8.0.1"
|
||||
"js-binary-schema-parser" "^2.0.2"
|
||||
"simple-get" "^4.0.1"
|
||||
"string-split-by" "^1.0.0"
|
||||
|
||||
"vue-quill-editor@^3.0.6":
|
||||
"integrity" "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ=="
|
||||
"resolved" "https://registry.npmmirror.com/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz"
|
||||
|
|
|
|||
Loading…
Reference in New Issue