瀏覽代碼

统一页面风格

chenrui 4 年之前
父節點
當前提交
feecbca262
共有 28 個文件被更改,包括 93 次插入220 次删除
  1. 3 3
      src/views/allocationManagement/transferOut/basicInfoModal.vue
  2. 1 1
      src/views/common/chooseProductsModal.vue
  3. 1 1
      src/views/dealerManagement/marketingDivisionSet/editModal.vue
  4. 2 2
      src/views/dealerManagement/merchantInfoManagement/detailModal.vue
  5. 2 2
      src/views/financialManagement/returnConfirmation/detailModal.vue
  6. 2 2
      src/views/financialManagement/warehousingConfirmation/detailModal.vue
  7. 2 2
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  8. 1 1
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  9. 1 1
      src/views/productManagement/productBrand/detailModal.vue
  10. 3 3
      src/views/productManagement/productBrand/editModal.vue
  11. 1 1
      src/views/productManagement/productInfo/detailModal.vue
  12. 1 1
      src/views/productManagement/productLevel/editModal.vue
  13. 1 1
      src/views/productManagement/productPricing/auditModal.vue
  14. 1 1
      src/views/productManagement/productPricing/editModal.vue
  15. 2 2
      src/views/promotionRulesManagement/orderStatistics/detailModal.vue
  16. 2 2
      src/views/promotionRulesManagement/productStatistics/detailModal.vue
  17. 1 1
      src/views/promotionRulesManagement/promotionRules/basicInfoModal.vue
  18. 1 1
      src/views/promotionRulesManagement/promotionRules/choosePriceProductsModal.vue
  19. 1 1
      src/views/promotionRulesManagement/promotionRules/editRuleModal.vue
  20. 2 2
      src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue
  21. 1 1
      src/views/salesManagement/backorder/detailModal.vue
  22. 5 7
      src/views/salesManagement/salesReturn/queryPart.vue
  23. 9 14
      src/views/salesManagement/salesReturn/salesReturnCheck.vue
  24. 21 76
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  25. 23 88
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  26. 1 1
      src/views/setting/notice/detailModal.vue
  27. 1 1
      src/views/setting/noticeManagement/detailModal.vue
  28. 1 1
      src/views/setting/noticeManagement/editModal.vue

+ 3 - 3
src/views/allocationManagement/transferOut/basicInfoModal.vue

@@ -7,7 +7,7 @@
     title="新增"
     v-model="isShow"
     @cancle="isShow = false"
-    width="80%">
+    :width="800">
     <a-form-model
       id="allocateBill-basicInfo-form"
       ref="ruleForm"
@@ -76,8 +76,8 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       formItemLayout: {
-        labelCol: { span: 6 },
-        wrapperCol: { span: 16 }
+        labelCol: { span: 4 },
+        wrapperCol: { span: 20 }
       },
       form: {
         targetType: 'DEALER',

+ 1 - 1
src/views/common/chooseProductsModal.vue

@@ -7,7 +7,7 @@
     title="选择产品"
     v-model="isShow"
     @cancle="isShow=false"
-    :width="1000">
+    :width="900">
     <div class="products-con">
       <div>
         <!-- 搜索条件 -->

+ 1 - 1
src/views/dealerManagement/marketingDivisionSet/editModal.vue

@@ -7,7 +7,7 @@
     :title="modalTit"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="800">
     <!-- 表单 -->
     <div>
       <a-form-model

+ 2 - 2
src/views/dealerManagement/merchantInfoManagement/detailModal.vue

@@ -7,7 +7,7 @@
     :title="title"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <div v-if="form">
       <a-collapse :activeKey="['1','2','3']" class="merchantInfoManagement-cont-m">
         <a-collapse-panel key="1" header="基础信息">
@@ -191,7 +191,7 @@ export default {
       padding: 24px!important;
     }
     .ant-descriptions-item-label.ant-descriptions-item-colon{
-      width: 147px;
+      width: 130px;
     }
     .merchantInfoManagement-cont-m{
       margin-bottom: 10px;

+ 2 - 2
src/views/financialManagement/returnConfirmation/detailModal.vue

@@ -7,7 +7,7 @@
     title="详情"
     v-model="isShow"
     @cancle="isShow=false"
-    :width="1000">
+    :width="960">
     <div>
       <div style="padding: 0 12px;text-align: right;">
         <a-button id="outboundOrderDetail-preview-btn" style="margin-right: 15px;">打印预览</a-button>
@@ -137,7 +137,7 @@ export default {
     }
     .btn-cont {
       text-align: center;
-      margin: 35px 0 10px;
+      margin: 5px 0 10px;
     }
   }
 </style>

+ 2 - 2
src/views/financialManagement/warehousingConfirmation/detailModal.vue

@@ -7,7 +7,7 @@
     title="详情"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <div>
       <a-descriptions size="small" :column="3" style="margin-bottom: 10px;">
         <a-descriptions-item label="入库单号">{{ nowData&&nowData.stockPutNo || '--' }}</a-descriptions-item>
@@ -107,7 +107,7 @@ export default {
     }
     .btn-cont {
       text-align: center;
-      margin: 35px 0 10px;
+      margin: 5px 0 10px;
     }
   }
 </style>

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -7,7 +7,7 @@
     title="库存详情"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div class="ftext" slot="message">现有库存总数量(个):<strong>{{ stockQty }}</strong>;现有库存总成本(¥):<strong>{{ stockCost }}</strong>。</div>
@@ -134,7 +134,7 @@ export default {
   .inventoryQueryDetail-modal{
     .btn-cont {
       text-align: center;
-      margin: 35px 0 10px;
+      margin: 5px 0 10px;
     }
   }
 </style>

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -71,7 +71,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"

+ 1 - 1
src/views/productManagement/productBrand/detailModal.vue

@@ -7,7 +7,7 @@
     title="产品详情"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <div v-if="detailsData">
       <a-descriptions bordered size="default" :column="1">
         <a-descriptions-item label="品牌名称:">{{ detailsData.brandName || '--' }}</a-descriptions-item>

+ 3 - 3
src/views/productManagement/productBrand/editModal.vue

@@ -7,7 +7,7 @@
     :title="modalTit"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <!-- 表单 -->
     <div>
       <a-form-model
@@ -88,8 +88,8 @@ export default {
       sortCharList: dataList.sortCharList,
       isShow: this.openModal, //  是否打开弹框
       formItemLayout: {
-        labelCol: { span: 4 },
-        wrapperCol: { span: 20 }
+        labelCol: { span: 3 },
+        wrapperCol: { span: 19 }
       },
       form: {
         brandName: '', // 品牌名称

+ 1 - 1
src/views/productManagement/productInfo/detailModal.vue

@@ -7,7 +7,7 @@
     title="产品详情"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="800">
     <!-- 产品详情 -->
     <div v-if="detailsData">
       <a-descriptions bordered size="small" :column="2">

+ 1 - 1
src/views/productManagement/productLevel/editModal.vue

@@ -30,7 +30,7 @@
       </a-form-model>
       <div class="btn-cont">
         <a-button type="primary" id="productLevelEdit-save" @click="handleSave">保存</a-button>
-        <a-button id="productLevelEdit-cancel" @click="isShow = false" style="margin-left: 100px;">取消</a-button>
+        <a-button id="productLevelEdit-cancel" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
       </div>
     </div>
   </a-modal>

+ 1 - 1
src/views/productManagement/productPricing/auditModal.vue

@@ -12,7 +12,7 @@
     <div v-if="detailsData">
       <a-descriptions bordered :column="1">
         <a-descriptions-item label="成本价">
-          <div v-if="detailsData && detailsData.supplierProductList">
+          <div v-if="detailsData && detailsData.supplierProductList" style="margin-top: 8px;">
             <p v-for="(item, index) in detailsData.supplierProductList" :key="index" style="margin: 0;">{{ ((item.cost || item.cost==0) ? item.cost.toFixed(2) : '--') + ' 元 -- ' + item.supplierName + ';' }}</p>
           </div>
           <span v-else>--</span>

+ 1 - 1
src/views/productManagement/productPricing/editModal.vue

@@ -19,7 +19,7 @@
         :wrapper-col="formItemLayout.wrapperCol"
       >
         <a-form-model-item label="成本价">
-          <div v-if="detailData && detailData.supplierProductList">
+          <div v-if="detailData && detailData.supplierProductList" style="margin-top: 8px;">
             <p v-for="(item, index) in detailData.supplierProductList" :key="index" style="margin: 0;line-height: 1.5em;">{{ ((item.cost || item.cost==0) ? item.cost.toFixed(2) : '--') + ' 元 -- ' + item.supplierName + ';' }}</p>
           </div>
           <span v-else>--</span>

+ 2 - 2
src/views/promotionRulesManagement/orderStatistics/detailModal.vue

@@ -7,7 +7,7 @@
     title="促销品明细"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <div>
       <p>销售单号:{{ nowData ? (nowData.salesBillNo || '--') : '--' }}</p>
       <!-- 列表 -->
@@ -117,7 +117,7 @@ export default {
     }
     .btn-cont {
       text-align: center;
-      margin: 35px 0 10px;
+      margin: 5px 0 10px;
     }
   }
 </style>

+ 2 - 2
src/views/promotionRulesManagement/productStatistics/detailModal.vue

@@ -7,7 +7,7 @@
     title="促销品明细"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <div>
       <p>产品信息:
         {{ nowData ? (nowData.productEntity?(nowData.productEntity.name || '--') : '--') : '--' }}({{ nowData ? (nowData.productEntity?(nowData.productEntity.code || '--') : '--') : '--' }})
@@ -118,7 +118,7 @@ export default {
     }
     .btn-cont {
       text-align: center;
-      margin: 35px 0 10px;
+      margin: 5px 0 10px;
     }
   }
 </style>

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/basicInfoModal.vue

@@ -7,7 +7,7 @@
     title="新增"
     v-model="isShow"
     @cancle="isShow = false"
-    width="80%">
+    :width="960">
     <a-form-model
       id="promotionRules-basicInfo-form"
       ref="ruleForm"

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/choosePriceProductsModal.vue

@@ -7,7 +7,7 @@
     title="选择产品"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="900">
     <div class="table-operator">
       <a-button v-if="!(ruleType=='PROMO_PROD') && !((ruleType=='ADD_PRICE_PURCH') && (goodsType == 'promo'))" id="choosePosPriceProducts-brand" type="primary" class="button-error" @click="choosePModal('BRAND')">选择产品品牌</a-button>
       <a-button v-if="!(ruleType=='PROMO_PROD') && !((ruleType=='ADD_PRICE_PURCH') && (goodsType == 'promo'))" id="choosePosPriceProducts-type" type="primary" class="button-info" @click="choosePModal('CATEGORY')">选择产品分类</a-button>

+ 1 - 1
src/views/promotionRulesManagement/promotionRules/editRuleModal.vue

@@ -7,7 +7,7 @@
     :title="itemSn ? '编辑':'新增'"
     v-model="isShow"
     @cancle="isShow = false"
-    width="80%">
+    :width="960">
     <a-form-model
       id="promotionRules-rule-form"
       ref="ruleForm"

+ 2 - 2
src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue

@@ -7,7 +7,7 @@
     title="详情"
     v-model="isShow"
     @cancle="isShow=false"
-    :width="1000">
+    :width="960">
     <div style="padding: 0 12px;text-align: right;">
       <a-button id="bulkWarehousingOrderDetail-preview-btn" style="margin-right: 15px;">打印预览</a-button>
       <a-button type="primary" id="bulkWarehousingOrderDetail-print-btn">快速打印</a-button>
@@ -142,7 +142,7 @@ export default {
     }
     .btn-cont {
       text-align: center;
-      margin: 35px 0 10px;
+      margin: 5px 0 10px;
     }
   }
 </style>

+ 1 - 1
src/views/salesManagement/backorder/detailModal.vue

@@ -7,7 +7,7 @@
     title="详情"
     v-model="isShow"
     @cancle="isShow=false"
-    :width="1000">
+    :width="960">
     <!-- 基础信息 -->
     <a-card size="small" :bordered="false" class="backorderDetail-cont">
       <a-collapse :activeKey="['1']">

+ 5 - 7
src/views/salesManagement/salesReturn/queryPart.vue

@@ -30,7 +30,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -136,7 +136,7 @@ export default {
         title: '序号',
         dataIndex: 'no',
         align: 'center',
-        width: 100
+        width: 80
       },
       {
         title: '销售单号',
@@ -147,8 +147,7 @@ export default {
       {
         title: '产品编码',
         dataIndex: 'productEntity.code',
-        align: 'center',
-        width: 160
+        align: 'center'
       },
       {
         title: '产品名称',
@@ -195,14 +194,13 @@ export default {
         title: '序号',
         dataIndex: 'no',
         align: 'center',
-        width: 100
+        width: 80
       },
       {
         title: '产品编码',
         dataIndex: 'productCode',
         align: 'center',
-        customRender: function (text) { return text || '--' },
-        width: 160
+        customRender: function (text) { return text || '--' }
       },
       {
         title: '产品名称',

+ 9 - 14
src/views/salesManagement/salesReturn/salesReturnCheck.vue

@@ -1,17 +1,12 @@
 <template>
   <div>
-    <a-affix :target="() => this.$refs.container">
-      <a-page-header
-        :ghost="false"
-        @back="handleBack"
-        :backIcon="false"
-      >
-        <template slot="subTitle">
-          <a id="back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName }}</span>
-        </template>
-      </a-page-header>
-    </a-affix>
+    <a-page-header :ghost="false" :backIcon="false" class="salesReturnCheck-back" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="salesReturnCheck-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+        <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName }}</span>
+      </template>
+    </a-page-header>
     <a-card size="small" :bordered="false" class="pages-wrap">
       <div>
         <a-button type="primary" :loading="loading" class="button-error" @click="backStock">批量返库</a-button>
@@ -20,7 +15,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange, onSelectAll: onSelectAllChange }"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -41,7 +36,7 @@
     </a-card>
     <a-affix :offset-bottom="0">
       <div
-        style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        style="text-align: center;width: 100%;background-color: #fff;padding: 0 0 40px;box-shadow: 0 0 20px #dcdee2;">
         <a-button
           size="large"
           style="width: 150px;"

+ 21 - 76
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -1,28 +1,17 @@
 <template>
   <div>
-    <a-affix :target="() => this.$refs.container">
-      <a-page-header
-        :ghost="false"
-        @back="handleBack"
-        :backIcon="false"
-      >
-        <template slot="subTitle">
-          <a id="back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName }}</span>
-          <!-- <a-button size="small" @click="handleEditCustom" style="margin-left:50px" key="0">
-            编辑
-          </a-button> -->
-        </template>
-        <template slot="extra">
-          <a-button key="2">
-            打印预览
-          </a-button>
-          <a-button key="1" type="primary">
-            快速打印
-          </a-button>
-        </template>
-      </a-page-header>
-    </a-affix>
+    <a-page-header :ghost="false" :backIcon="false" class="salesReturnEdit-back" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+        <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName }}</span>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="salesReturnEdit-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="salesReturnEdit-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
 
     <a-card size="small" :bordered="false" class="pages-wrap" v-if="ordeDetail&&ordeDetail.salesReturnBillSource=='SALES'">
       <!-- 查询配件列表 -->
@@ -44,7 +33,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -127,58 +116,14 @@ export default {
       },
       // 表头
       columns: [
-        {
-          title: '序号',
-          dataIndex: 'no',
-          align: 'center',
-          width: 100
-        },
-        {
-          title: '产品编码',
-          dataIndex: 'productEntity.code',
-          align: 'center',
-          width: 160
-        },
-        {
-          title: '产品名称',
-          dataIndex: 'productEntity.name',
-          align: 'center',
-          width: 200
-        },
-        {
-          title: '退货数量',
-          dataIndex: 'qty',
-          align: 'center',
-          width: 150,
-          scopedSlots: { customRender: 'qty' }
-        },
-        {
-          title: '退货单价',
-          dataIndex: 'price',
-          customRender: function (text) { return '¥' + (text || 0) },
-          align: 'center',
-          width: 150
-        },
-        {
-          title: '单位',
-          dataIndex: 'productEntity.unit',
-          align: 'center',
-          width: 100
-        },
-        {
-          title: '退货小计',
-          align: 'center',
-          dataIndex: 'totalAmount',
-          customRender: function (text) { return '¥' + (text || 0) },
-          width: 100
-        },
-        {
-          title: '退货原因',
-          dataIndex: 'remark',
-          align: 'center',
-          width: 150,
-          scopedSlots: { customRender: 'remark' }
-        },
+        { title: '序号', dataIndex: 'no', align: 'center', width: 80 },
+        { title: '产品编码', dataIndex: 'productEntity.code', align: 'center' },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center' },
+        { title: '退货数量', dataIndex: 'qty', align: 'center', width: 150, scopedSlots: { customRender: 'qty' } },
+        { title: '退货单价', dataIndex: 'price', customRender: function (text) { return '¥' + (text || 0) }, align: 'center', width: 150 },
+        { title: '单位', dataIndex: 'productEntity.unit', align: 'center', width: 100 },
+        { title: '退货小计', align: 'center', dataIndex: 'totalAmount', customRender: function (text) { return '¥' + (text || 0) }, width: 100 },
+        { title: '退货原因', dataIndex: 'remark', align: 'center', width: 200, scopedSlots: { customRender: 'remark' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],

+ 23 - 88
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -1,28 +1,17 @@
 <template>
   <div>
-    <a-affix :target="() => this.$refs.container">
-      <a-page-header
-        :ghost="false"
-        @back="handleBack"
-        :backIcon="false"
-      >
-        <template slot="subTitle">
-          <a id="back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName }}</span>
-          <!-- <a-button size="small" @click="handleEditCustom" style="margin-left:50px" key="0">
-            编辑
-          </a-button> -->
-        </template>
-        <template slot="extra">
-          <a-button key="2">
-            打印预览
-          </a-button>
-          <a-button key="1" type="primary">
-            快速打印
-          </a-button>
-        </template>
-      </a-page-header>
-    </a-affix>
+    <a-page-header :ghost="false" :backIcon="false" class="salesReturnEdit-back" >
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+        <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName }}</span>
+      </template>
+      <!-- 操作区,位于 title 行的行尾 -->
+      <template slot="extra">
+        <a-button key="2" id="salesReturnEdit-preview-btn">打印预览</a-button>
+        <a-button key="1" type="primary" id="salesReturnEdit-print-btn">快速打印</a-button>
+      </template>
+    </a-page-header>
 
     <a-card size="small" :bordered="false" class="pages-wrap" v-if="ordeDetail&&ordeDetail.salesReturnBillSource=='SALES'">
       <!-- 查询配件列表 -->
@@ -44,7 +33,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -127,70 +116,16 @@ export default {
       },
       // 表头
       columns: [
-        {
-          title: '序号',
-          dataIndex: 'no',
-          align: 'center',
-          width: 100
-        },
-        {
-          title: '采购单号',
-          dataIndex: 'purchaseBillNo',
-          align: 'center',
-          width: 200
-        },
-        {
-          title: '产品编码',
-          dataIndex: 'productEntity.code',
-          align: 'center',
-          width: 160
-        },
-        {
-          title: '产品名称',
-          dataIndex: 'productEntity.name',
-          align: 'center',
-          width: 200
-        },
-        {
-          title: '剩余可退数量',
-          dataIndex: 'refundableQty',
-          align: 'center',
-          width: 100
-        },
-        {
-          title: '本次退货数量',
-          dataIndex: 'qty',
-          align: 'center',
-          width: 150,
-          scopedSlots: { customRender: 'qty' }
-        },
-        {
-          title: '退货单价',
-          dataIndex: 'price',
-          customRender: function (text) { return '¥' + (text || 0) },
-          align: 'center',
-          width: 150
-        },
-        {
-          title: '单位',
-          dataIndex: 'productEntity.unit',
-          align: 'center',
-          width: 100
-        },
-        {
-          title: '退货小计',
-          align: 'center',
-          dataIndex: 'totalAmount',
-          customRender: function (text) { return '¥' + (text || 0) },
-          width: 100
-        },
-        {
-          title: '退货原因',
-          dataIndex: 'remark',
-          align: 'center',
-          width: 150,
-          scopedSlots: { customRender: 'remark' }
-        },
+        { title: '序号', dataIndex: 'no', align: 'center', width: 80 },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', align: 'center', width: 200 },
+        { title: '产品编码', dataIndex: 'productEntity.code', align: 'center' },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center' },
+        { title: '剩余可退数量', dataIndex: 'refundableQty', align: 'center', width: 120, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次退货数量', dataIndex: 'qty', align: 'center', width: 150, scopedSlots: { customRender: 'qty' } },
+        { title: '退货单价', dataIndex: 'price', align: 'center', width: 150, customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '单位', dataIndex: 'productEntity.unit', align: 'center', width: 100 },
+        { title: '退货小计', align: 'center', width: 100, dataIndex: 'totalAmount', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '退货原因', dataIndex: 'remark', align: 'center', width: 150, scopedSlots: { customRender: 'remark' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],

+ 1 - 1
src/views/setting/notice/detailModal.vue

@@ -7,7 +7,7 @@
     title="公告详情"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="800">
     <div v-if="detailsData">
       <a-descriptions bordered size="small" :column="2">
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>

+ 1 - 1
src/views/setting/noticeManagement/detailModal.vue

@@ -7,7 +7,7 @@
     title="公告详情"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <div v-if="detailsData">
       <a-descriptions bordered size="small" :column="2">
         <a-descriptions-item label="类别">{{ typeDictValue }}</a-descriptions-item>

+ 1 - 1
src/views/setting/noticeManagement/editModal.vue

@@ -7,7 +7,7 @@
     :title="modalTit"
     v-model="isShow"
     @cancle="isShow=false"
-    width="80%">
+    :width="960">
     <!-- 表单 -->
     <div>
       <a-form-model