From 6ea3d5caa30f460f1eb9c3880d90f41275c3c274 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 03 七月 2025 09:25:08 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
/dev/null | 292 ------------------------------------------------
zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template1.vue | 15 +
zy-asrs-admin/src/components/print/locsPrint/locTemplate.vue | 2
3 files changed, 11 insertions(+), 298 deletions(-)
diff --git a/zy-asrs-admin/src/components/print/locsPrint/locTemplate.vue b/zy-asrs-admin/src/components/print/locsPrint/locTemplate.vue
index d61f2b0..ef45383 100644
--- a/zy-asrs-admin/src/components/print/locsPrint/locTemplate.vue
+++ b/zy-asrs-admin/src/components/print/locsPrint/locTemplate.vue
@@ -29,7 +29,7 @@
<td class="barcode" colspan="9" align="center" scope="col">
<img :src="globalState.url + '/api/code/auth?type=1¶m=' + item.locNo" width="90%;" height="180px"/>
<div style="letter-spacing: 2px;margin-top: 10px; text-align: center;">
- <span>{{ item.locNo }} </span>
+ <span style="font-size: 55px;">{{ item.locNo }} </span>
</div>
</td>
</tr>
diff --git a/zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template1.vue b/zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template1.vue
index 4439448..920c8ed 100644
--- a/zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template1.vue
+++ b/zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template1.vue
@@ -17,13 +17,13 @@
</script>
<template>
- <div id="printMe">
+ <div id="printMe" style="width: 700px;">
<div v-for="(item, index) in list" :key="index">
- <div v-for="count in repeatNum" style="font-size: 16px;margin-top: 20px;">
- <div style="text-align: center;">
- <img :src="globalState.url + '/api/code/auth?type=1¶m=' + item.barcode" />
+ <div v-for="count in repeatNum" style="font-size: 16px;margin-top: 40px;height: 300px;">
+ <div style="text-align: center; ">
+ <img :src="globalState.url + '/api/code/auth?type=1¶m=' + item.barcode" style="width: 600px; height: 180px;" />
</div>
- <div style="text-align: center;">
+ <div style="text-align: center; font-size: 55px; font-weight: 600;">
{{ item.barcode }}
</div>
</div>
@@ -32,6 +32,11 @@
</template>
<style>
+
+.ant-modal-content {
+ width: 700px;
+}
+
@media print {
body {
margin: 0;
diff --git a/zy-asrs-admin/src/views/base/container/edit.vue b/zy-asrs-admin/src/views/base/container/edit.vue
deleted file mode 100644
index 1220d0f..0000000
--- a/zy-asrs-admin/src/views/base/container/edit.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<script setup>
-import { ref, nextTick } from 'vue';
-import { get, post, postBlob, postForm } from '@/utils/request.js'
-import { formatMessage } from '@/utils/localeUtils.js';
-import { message } from 'ant-design-vue';
-
-const formTable = ref(null);
-const submitButton = ref(null);
-const isSave = ref(true);
-const open = ref(false);
-const initFormData = {}
-let formData = ref(initFormData);
-
-const emit = defineEmits(['tableReload'])
-
-const handleOk = (e) => {
- nextTick(() => {
- setTimeout(() => {
- submitButton.value.$el.click();
- }, 100);
- });
-};
-
-const onFinish = values => {
- // console.log('Success:', values);
- open.value = false;
- post(isSave.value ? '/api/container/save' : '/api/container/update', formData.value).then((resp) => {
- let result = resp.data;
- if (result.code === 200) {
- message.success(isSave.value ? formatMessage('page.add.success', '鏂板鎴愬姛') : formatMessage('page.update.success', '鏇存柊鎴愬姛'));
- } else {
- message.error(result.msg);
- }
- emit('tableReload', 'reload')
- nextTick(() => {
- formTable.value.resetFields()
- })
- })
-};
-const onFinishFailed = errorInfo => {
- console.log('Failed:', errorInfo);
-};
-
-const tenantQueryList = ref(null);
-tenantQuery();
-function tenantQuery() {
- postForm('/api/tenant/query', {}).then(resp => {
- let result = resp.data;
- tenantQueryList.value = result.data;
- })
-}
-const userQueryList = ref(null);
-userQuery();
-function userQuery() {
- postForm('/api/user/query', {}).then(resp => {
- let result = resp.data;
- userQueryList.value = result.data;
- })
-}
-
-
-defineExpose({
- open,
- formData,
- initFormData,
- isSave,
-})
-
-</script>
-
-<script>
-export default {
- name: '瀹瑰櫒绠＄悊-edit'
-}
-</script>
-
-<template>
- <div>
- <a-modal v-model:open="open"
- :title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
- style="width: 600px;">
- <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
- style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
- @finish="onFinish" @finishFailed="onFinishFailed">
- <a-form-item
- :label="formatMessage('db.man_container.name', '鍚嶇О') "
- name="name"
- style="width: 250px;"
- >
- <a-input
- v-model:value="formData.name"
- />
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.code', '瀹瑰櫒缂栫爜') "
- name="code"
- style="width: 250px;"
- :rules="[{ required: true }]"
- >
- <a-input
- v-model:value="formData.code"
- />
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.type', '瀹瑰櫒绫诲瀷') "
- name="type"
- style="width: 250px;"
- :rules="[{ required: true }]"
- >
- <a-select
- v-model:value="formData.type"
- :options="[
- { label: ' 閽㈡墭鐩�', value: 1 },
- { label: ' 鏈ㄦ墭鐩�', value: 2 },
- { label: ' 濉戞枡鏂欐', value: 3 },
- { label: '鎵樼洏绗肩', value: 4 },
- { label: '閽㈡枡鏋�', value: 5 },
- ]"
- >
- </a-select>
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.used', '浣跨敤娆℃暟') "
- name="used"
- style="width: 250px;"
- :rules="[{ required: true }]"
- >
- <a-input
- v-model:value="formData.used"
- />
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.length', '闀垮害') "
- name="length"
- style="width: 250px;"
- >
- <a-input
- v-model:value="formData.length"
- />
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.width', '瀹藉害') "
- name="width"
- style="width: 250px;"
- >
- <a-input
- v-model:value="formData.width"
- />
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.height', '楂樺害') "
- name="height"
- style="width: 250px;"
- >
- <a-input
- v-model:value="formData.height"
- />
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.vaild_time', '鏈夋晥鏈�') "
- name="vaildTime"
- style="width: 250px;"
- >
- <a-date-picker
- v-model:value="formData.vaildTime"
- show-time
- format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss"
- />
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.flag_rycle', '鏄惁鍥炴敹') "
- name="flagRycle"
- style="width: 250px;"
- :rules="[{ required: true }]"
- >
- <a-select
- v-model:value="formData.flagRycle"
- :options="[
- { label: '鏄�', value: 1 },
- { label: '鍚�', value: 0 },
- ]"
- >
- </a-select>
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.flag_logic', '鏄惁铏氭嫙') "
- name="flagLogic"
- style="width: 250px;"
- :rules="[{ required: true }]"
- >
- <a-select
- v-model:value="formData.flagLogic"
- :options="[
- { label: '鏄�', value: 1 },
- { label: '鍚�', value: 0 },
- ]"
- >
- </a-select>
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.status', '鐘舵��') "
- name="status"
- style="width: 250px;"
- :rules="[{ required: true }]"
- >
- <a-select
- v-model:value="formData.status"
- :options="[
- { label: '姝ｅ父', value: 1 },
- { label: '鍐荤粨', value: 0 },
- ]"
- >
- </a-select>
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.tenant_id', '绉熸埛') "
- name="tenantId"
- style="width: 250px;"
- >
- <a-select
- v-model:value="formData.tenantId"
- :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
- style="width: 100%"
- show-search
- :options="tenantQueryList"
- optionFilterProp="label"
- optionLabelProp="label"
- >
- </a-select>
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.create_by', '娣诲姞浜哄憳') "
- name="createBy"
- style="width: 250px;"
- >
- <a-select
- v-model:value="formData.createBy"
- :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
- style="width: 100%"
- show-search
- :options="userQueryList"
- optionFilterProp="label"
- optionLabelProp="label"
- >
- </a-select>
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.create_time', '娣诲姞鏃堕棿') "
- name="createTime"
- style="width: 250px;"
- :rules="[{ required: true }]"
- >
- <a-date-picker
- v-model:value="formData.createTime"
- show-time
- format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss"
- />
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.update_by', '淇敼浜哄憳') "
- name="updateBy"
- style="width: 250px;"
- >
- <a-select
- v-model:value="formData.updateBy"
- :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
- style="width: 100%"
- show-search
- :options="userQueryList"
- optionFilterProp="label"
- optionLabelProp="label"
- >
- </a-select>
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.update_time', '淇敼鏃堕棿') "
- name="updateTime"
- style="width: 250px;"
- :rules="[{ required: true }]"
- >
- <a-date-picker
- v-model:value="formData.updateTime"
- show-time
- format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss"
- />
- </a-form-item>
- <a-form-item
- :label="formatMessage('db.man_container.memo', '澶囨敞') "
- name="memo"
- style="width: 250px;"
- >
- <a-input
- v-model:value="formData.memo"
- />
- </a-form-item>
-
- <a-form-item>
- <a-button type="primary" html-type="submit" ref="submitButton"
- style="visibility: hidden;">Submit</a-button>
- </a-form-item>
- </a-form>
- </a-modal>
- </div>
-</template>
-
-<style></style>
diff --git a/zy-asrs-admin/src/views/base/container/index.vue b/zy-asrs-admin/src/views/base/container/index.vue
deleted file mode 100644
index 163cece..0000000
--- a/zy-asrs-admin/src/views/base/container/index.vue
+++ /dev/null
@@ -1,292 +0,0 @@
-<script setup>
-import { getCurrentInstance, ref, computed, reactive } from 'vue';
-import { useRouter } from "vue-router";
-import { get, post, postBlob } from '@/utils/request.js'
-import { message, Modal } from 'ant-design-vue';
-import { logout } from '@/config.js';
-import EditView from './edit.vue'
-import { formatMessage } from '@/utils/localeUtils.js';
-import useTableSearch from '@/utils/tableUtils.jsx';
-const context = getCurrentInstance()?.appContext.config.globalProperties;
-
-const router = useRouter();
-
-const TABLE_KEY = 'table-container';
-let currentPage = 1;
-let pageSize = 10;
-const searchInput = ref("")
-const editChild = ref(null)
-
-const state = reactive({
- selectedRowKeys: [],
- loading: false,
-});
-
-let tableData = ref([]);
-getPage();
-
-const {
- getColumnSearchProps,
- handleResizeColumn,
-} = useTableSearch();
-
-const columns = [
- {
- title: formatMessage('db.man_container.name', '鍚嶇О'),
- dataIndex: 'name',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('name'),
- },
- {
- title: formatMessage('db.man_container.code', '瀹瑰櫒缂栫爜'),
- dataIndex: 'code',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('code'),
- },
- {
- title: formatMessage('db.man_container.type', '瀹瑰櫒绫诲瀷'),
- dataIndex: 'type$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('type$'),
- },
- {
- title: formatMessage('db.man_container.used', '浣跨敤娆℃暟'),
- dataIndex: 'used',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('used'),
- },
- {
- title: formatMessage('db.man_container.length', '闀垮害'),
- dataIndex: 'length',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('length'),
- },
- {
- title: formatMessage('db.man_container.width', '瀹藉害'),
- dataIndex: 'width',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('width'),
- },
- {
- title: formatMessage('db.man_container.height', '楂樺害'),
- dataIndex: 'height',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('height'),
- },
- {
- title: formatMessage('db.man_container.vaild_time', '鏈夋晥鏈�'),
- dataIndex: 'vaildTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('vaildTime$'),
- },
- {
- title: formatMessage('db.man_container.flag_rycle', '鏄惁鍥炴敹'),
- dataIndex: 'flagRycle$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('flagRycle$'),
- },
- {
- title: formatMessage('db.man_container.flag_logic', '鏄惁铏氭嫙'),
- dataIndex: 'flagLogic$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('flagLogic$'),
- },
- {
- title: formatMessage('db.man_container.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('status$'),
- },
- {
- title: formatMessage('db.man_container.tenant_id', '绉熸埛'),
- dataIndex: 'tenantId',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('tenantId'),
- },
- {
- title: formatMessage('db.man_container.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createBy$'),
- },
- {
- title: formatMessage('db.man_container.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createTime$'),
- },
- {
- title: formatMessage('db.man_container.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateBy$'),
- },
- {
- title: formatMessage('db.man_container.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateTime$'),
- },
- {
- title: formatMessage('db.man_container.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('memo'),
- },
-
- {
- title: formatMessage('common.operation', '鎿嶄綔'),
- name: 'oper',
- dataIndex: 'oper',
- key: 'oper',
- width: 140,
- fixed: 'right',
- },
-];
-
-const hasSelected = computed(() => state.selectedRowKeys.length > 0);
-const start = () => {
- state.loading = true;
- // ajax request after empty completing
- setTimeout(() => {
- state.loading = false;
- state.selectedRowKeys = [];
- }, 1000);
-};
-const onSelectChange = selectedRowKeys => {
- // console.log('selectedRowKeys changed: ', selectedRowKeys);
- state.selectedRowKeys = selectedRowKeys;
-};
-
-function getPage() {
- state.loading = true;
- post('/api/container/page', {
- current: currentPage,
- pageSize: pageSize,
- condition: searchInput.value
- }).then((resp) => {
- let result = resp.data;
- if (result.code == 200) {
- let data = result.data;
- tableData.value = data;
-
- state.loading = false;
- } else if (result.code === 401) {
- message.error(result.msg);
- logout()
- } else {
- message.error(result.msg);
- }
- })
-}
-
-const handleEdit = (item) => {
- editChild.value.open = true;
- editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
- editChild.value.isSave = item == null;
-}
-
-const handleDel = (rows) => {
- Modal.confirm({
- title: formatMessage('page.delete', '鍒犻櫎'),
- content: formatMessage('page.delete.confirm', '纭畾鍒犻櫎璇ラ」鍚楋紵'),
- maskClosable: true,
- onOk: async () => {
- const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
- try {
- post('/api/container/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
- let result = resp.data;
- if (result.code === 200) {
- message.success(result.msg);
- } else {
- message.error(result.msg);
- }
- getPage()
- hide()
- })
- } catch (error) {
- message.error(formatMessage('common.fail', '璇锋眰澶辫触'));
- }
- },
- });
-}
-
-const handleExport = async (intl) => {
- postBlob('/api/container/export', {
- condition: searchInput.value
- }).then(result => {
- const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
- window.location.href = window.URL.createObjectURL(blob);
- return true;
- })
-};
-
-const onSearch = () => {
- // console.log('search');
- getPage()
-}
-
-const onPageChange = (page, size) => {
- currentPage = page;
- pageSize = size;
- getPage();
-}
-
-function handleTableReload(value) {
- getPage()
-}
-
-</script>
-
-<script>
-export default {
- name: '瀹瑰櫒绠＄悊'
-}
-</script>
-
-<template>
- <div>
- <EditView ref="editChild" @tableReload="handleTableReload" />
- <div class="table-header">
- <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
- <div class="table-header-right">
- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
- <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
- </div>
- </div>
- <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
- :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
- :pagination="{ total: tableData.total, onChange: onPageChange }"
- :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn" :loading="state.loading">
- <template #bodyCell="{ column, text, record }">
- <template v-if="column.dataIndex === 'oper'">
- <div style="display: flex;justify-content: space-evenly;">
- <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
- <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
- }}</a-button>
- </div>
- </template>
- </template>
- </a-table>
- </div>
-</template>
-
-<style></style>
--
Gitblit v1.9.1