From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/eam/modules/daily3MaintenanceOrder/StoveCategoryModal.vue |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/eam/modules/daily3MaintenanceOrder/StoveCategoryModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/StoveCategoryModal.vue
index 4e4920a..c154e4e 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/StoveCategoryModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/StoveCategoryModal.vue
@@ -7,16 +7,21 @@
     cancelText="鍏抽棴"
     @cancel="handleCancel"
     :confirmLoading="confirmLoading"
+    title="闄勫綍5"
   >
 
-    <!-- :title="title" -->
     <!-- <a-spin :spinning="confirmLoading"> -->
     <!-- <a-form :form="form"> -->
+    <span
+      class="ant-descriptions-title"
+      style="font-size: large;font-size: 15px;float: right;"
+    >{{this.model.receiptsNum}}</span>
+
     <a-divider
       orientation="center"
       style="font-size: large;font-style: normal;font-size: 30px;color: #66aeed;"
-    > 娓╁害鍧囧寑鎬ф娴嬫潯浠剁‘璁よ〃 </a-divider>
-
+    > {{this.model.receiptsName}} </a-divider>
+    <!-- 娓╁害鍧囧寑鎬ф娴嬫潯浠剁‘璁よ〃 -->
     <!-- <div :style="{height: '115px',float: 'left',width: '100%',border: '1px solid #e9e9e9',padding: '50px 20px',background: '#fff',}"> -->
     <span
       class="ant-descriptions-title"
@@ -606,13 +611,13 @@
 import pick from 'lodash.pick'
 import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
 import Tooltip from 'ant-design-vue/es/tooltip'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+// import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import { getFileAccessHttpUrl } from '@/api/manage';
 
 export default {
   name: "StoveCategoryModal",
-  mixins: [JeecgListMixin],
+  // mixins: [JeecgListMixin],
   components: {
     JMultiSelectTag,
     Tooltip,

--
Gitblit v1.9.3