lilei 2 роки тому
батько
коміт
0ccd7f1ff3

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1663721542481
+  "version": 1663727068490
 }

+ 8 - 6
src/views/notice/list.vue

@@ -36,7 +36,7 @@
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-badge :count="record.readFlag=='0'? 1 : 0" dot>
-          <a-button size="small" type="primary" class="button-success" @click="handleDetail(record)" id="noticeList-detail-btn">详情</a-button>
+          <a-button size="small" type="link" class="button-success" @click="handleDetail(record)" id="noticeList-detail-btn">详情</a-button>
         </a-badge>
       </template>
     </a-table>
@@ -76,10 +76,12 @@ export default {
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '发布时间', dataIndex: 'createDate', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '标题', dataIndex: 'notice.title', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '发布时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类别', dataIndex: 'notice.title', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '标题', dataIndex: 'notice.title', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '内容', dataIndex: 'notice.title', width: '35%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
       ],
       loadData: [],
       paginationProps: {
@@ -170,7 +172,7 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      this.itemId = row.notice.id
+      this.itemId = row.noticeId
       this.openModal = true
       // 设置已读
       if (row.readFlag == '0') {

+ 3 - 3
src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue

@@ -16,7 +16,7 @@
               <a-tooltip placement="right">
                 <template slot="title">
                   <p>待结金额:指客户已经扫码从数字货架取走配件,但还没有结算</p>
-                  <!-- <p>冻结金额:指客户已经下单,但还没有从数字货架取走配件</p> -->
+                  <p>冻结金额:指客户已经下单,但还没有从数字货架取走配件</p>
                 </template>
                 <a-icon type="question-circle" style="display: inline-block;margin: 12px 0 0 12px;"/>
               </a-tooltip>
@@ -28,9 +28,9 @@
               <a-descriptions-item label="待结金额">
                 <span>{{ total && toThousands(total.waitSettleAmount,2) }}</span>
               </a-descriptions-item>
-              <!-- <a-descriptions-item label="冻结金额">
+              <a-descriptions-item label="冻结金额">
                 <span>{{ total && toThousands(total.freezeAmount,2) }}</span>
-              </a-descriptions-item> -->
+              </a-descriptions-item>
               <a-descriptions-item label="可用额度">
                 <span>{{ total && toThousands(total.usableAmount,2) }}</span>
               </a-descriptions-item>