chenrui 4 سال پیش
والد
کامیت
3393ca31d4

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

@@ -78,7 +78,7 @@
           type="primary"
           style="margin-right: 50px;"
           @click="handleAudit">审核</a-button>
-        <a-button id="merchantInfoManagement-back" size="large" @click="isShow = false">返回列表</a-button>
+        <a-button id="merchantInfoManagement-back" size="large" @click="isShow = false" style="font-size: 12px;">返回列表</a-button>
       </div>
     </div>
     <div style="padding: 50px;text-align: center;" v-else>

+ 4 - 4
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -39,7 +39,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ y: 500 }"
+        :scroll="{ x: 1070, y: 500 }"
         bordered>
         <!-- 产品编码 -->
         <template slot="productCode" slot-scope="text, record">
@@ -65,12 +65,12 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, scopedSlots: { customRender: 'productCode' }, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, scopedSlots: { customRender: 'productCode' }, align: 'center' },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售数量', dataIndex: 'salesQty', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '本次下推数', dataIndex: 'qty', width: 200, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '本次下推数', dataIndex: 'qty', width: 130, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 2 - 0
src/views/salesManagement/salesQuery/edit.vue

@@ -403,8 +403,10 @@ export default {
     }
     .p-title{
       font-weight: bold;
+      font-size: 16px;
     }
     .p-notes{
+      font-size: 14px;
       span{
         color: #FF9900;
       }

+ 3 - 3
src/views/salesManagement/salesReturn/list.vue

@@ -93,7 +93,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 2300, y: tableHeight }"
+      :scroll="{ x: 2220, y: tableHeight }"
       bordered>
       <!-- 单号 -->
       <template slot="salesReturnBillNo" slot-scope="text, record">
@@ -195,7 +195,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '单据来源', dataIndex: 'salesReturnBillSourceDictValue', width: 120, align: 'center' },
+        { title: '单据来源', dataIndex: 'salesReturnBillSourceDictValue', width: 140, align: 'center' },
         { title: '客户采退单号', dataIndex: 'purchaseReturnBillNo', width: 260, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: 260, align: 'center' },
         { title: '退货客户', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -207,7 +207,7 @@ export default {
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center' },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 180, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 10 - 4
src/views/supplierManagement/supplierInfo/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="supplierInfoEdit-wrap">
-    <a-page-header :ghost="false" :backIcon="false" @back="handleBack" class="merchantInfoManagementEdit-cont">
+    <a-page-header :ghost="false" :backIcon="false" @back="handleBack" class="supplierInfoEdit-cont">
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <a id="merchantInfoManagement-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
@@ -235,9 +235,15 @@
         </a-collapse>
       </a-card>
     </a-form-model>
-    <a-affix :offset-bottom="0" style="z-index: 100;">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;z-index: 100;">
-        <a-button type="primary" id="supplierInfoEdit-submit-btn" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button
+          type="primary"
+          class="button-primary"
+          id="supplierInfoEdit-submit-btn"
+          size="large"
+          @click="handleSubmit"
+          style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
   </div>

+ 1 - 1
src/views/supplierManagement/supplierInfo/list.vue

@@ -62,7 +62,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '供应商名称', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '联系人', dataIndex: 'contact', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'totalProductCategory', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '产品款数', dataIndex: 'totalProductCategory', width: 140, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: 150, align: 'center', fixed: 'right' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],