ソースを参照

统一页面样式

chenrui 4 年 前
コミット
3a06a875e0

+ 2 - 2
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -67,8 +67,8 @@
       </s-table>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="chainTransferInEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="chainTransferInEdit-submit" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
   </div>

+ 2 - 2
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -192,8 +192,8 @@
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="chainTransferOutEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="chainTransferOutEdit-submit" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
     <!-- 选择基本信息弹框 -->

+ 10 - 16
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -4,6 +4,8 @@
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <a id="storeTransferOutEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+        <span style="margin: 0 15px;color: #666;">调往对象名称:{{ (basicInfoData&&basicInfoData.putPersonName) || '--' }}</span>
+        <!-- <a-button id="storeTransferOutEdit-edit-btn" size="small" @click="handleEditInfo" style="margin-left:10px" key="0">编辑</a-button> -->
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
@@ -11,20 +13,6 @@
         <a-button key="1" type="primary" id="storeTransferOutEdit-print-btn">快速打印</a-button>
       </template>
     </a-page-header>
-    <!-- 基础信息 -->
-    <a-card size="small" :bordered="false" class="storeTransferOutEdit-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1">
-          <template slot="header">
-            基础信息
-            <!-- <a-button type="primary" shape="circle" size="small" icon="edit" class="edit-circle-btn" id="storeTransferOutEdit-circle-btn" @click.stop="handleEditInfo" /> -->
-          </template>
-          <a-descriptions :column="3">
-            <a-descriptions-item label="调往对象名称">{{ (basicInfoData&&basicInfoData.putPersonName) || '--' }}</a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
     <!-- 选择产品 -->
     <a-card size="small" :bordered="false" class="storeTransferOutEdit-cont">
       <a-collapse :activeKey="['1']">
@@ -176,8 +164,14 @@
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="storeTransferOutEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button
+          type="primary"
+          id="storeTransferOutEdit-submit"
+          size="large"
+          class="button-primary"
+          @click="handleSubmit"
+          style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
     <!-- 选择基本信息弹框 -->

+ 2 - 1
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -300,11 +300,12 @@
     </a-card>
     <a-affix :offset-bottom="0">
       <div
-        style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
         <a-button
           type="primary"
           id="warehouseAllocationEdit-submit"
           size="large"
+          class="button-primary"
           :loading="submitLoading"
           @click="handleSubmit"
           style="padding: 0 60px;">提交</a-button>

+ 2 - 2
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -148,8 +148,8 @@
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="bulkReturnGoodsEdit-submit-btn" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="bulkReturnGoodsEdit-submit-btn" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
     <!-- 选择基本信息弹框 -->

+ 2 - 2
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -217,8 +217,8 @@
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="bulkWarehousingOrderEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="bulkWarehousingOrderEdit-submit" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
     <!-- 选择基本信息弹框 -->

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/paymentSlip.vue

@@ -148,8 +148,8 @@
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="paymentSlipEdit-submit-btn" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="paymentSlipEdit-submit-btn" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
   </div>

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/receipt.vue

@@ -148,8 +148,8 @@
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="receiptEdit-submit-btn" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="receiptEdit-submit-btn" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
   </div>

+ 2 - 2
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -65,8 +65,8 @@
       </s-table>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="makeInventory-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="makeInventory-submit" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
   </div>

+ 2 - 2
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -27,8 +27,8 @@
       </s-table>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="inventoryChecking-overall-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="inventoryChecking-overall-submit" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
   </div>

+ 2 - 2
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -149,8 +149,8 @@
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="warehouseAllocationEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="warehouseAllocationEdit-submit" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
   </div>

+ 1 - 1
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -27,7 +27,7 @@
       <div class="table-operator">
         <a-button v-if="$hasPermissions('B_inventory_warehouse_storingLocation_add')" id="storingLocationList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
-      <strong style="display: block;margin: 30px 0 20px;">所属仓库:{{ $route.query.name }}</strong>
+      <strong style="display: block;margin: 10px 0 20px;">所属仓库:{{ $route.query.name }}</strong>
       <!-- 列表 -->
       <s-table
         class="sTable"

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -165,8 +165,8 @@
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="purchaseOrderEdit-submit-btn" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="purchaseOrderEdit-submit-btn" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
     <!-- 选择基本信息弹框 -->

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -76,7 +76,7 @@
       </s-table>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
         <a-button type="primary" id="purchaseOrderWarehousing-warehousing" size="large" @click="handleWarehousing" style="padding: 0 60px;">确认入库</a-button>
       </div>
     </a-affix>

+ 9 - 12
src/views/purchasingManagement/purchaseReturn/edit.vue

@@ -4,18 +4,9 @@
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <a id="purchaseReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+        <span style="margin: 0 15px;color: #666;">供应商名称:箭冠营销总部</span>
       </template>
     </a-page-header>
-    <!-- 基础信息 -->
-    <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions :column="3">
-            <a-descriptions-item label="供应商名称">箭冠营销总部</a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
     <!-- 选择产品 -->
     <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
       <a-collapse :activeKey="['1']">
@@ -133,8 +124,14 @@
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="purchaseReturnEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button
+          type="primary"
+          id="purchaseReturnEdit-submit"
+          size="large"
+          class="button-primary"
+          @click="handleSubmit"
+          style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
   </div>

+ 1 - 1
src/views/salesManagement/quotation/edit.vue

@@ -185,7 +185,7 @@
       </a-collapse>
     </a-card>
     <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
         <a-button type="danger" id="quotationEdit-transfer-order" size="large" @click="handleTransferOrder" style="padding: 0 60px;margin: 0 30px;">转销售单</a-button>
         <a-button type="primary" id="quotationEdit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;margin: 0 30px;">提交</a-button>
       </div>

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

@@ -121,11 +121,12 @@
     </a-card>
     <a-affix :offset-bottom="0">
       <div
-        style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
         <a-button
           size="large"
           style="width: 150px;"
           type="primary"
+          class="button-primary"
           @click="handleSubmit()"
           id="productInfoList-handleSubmit">提交</a-button>
       </div>

+ 7 - 4
src/views/salesManagement/salesQuery/list.vue

@@ -106,8 +106,12 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 2040, y:300 }"
+      :scroll="{ x: 2050, y:300 }"
       bordered>
+      <!-- 销售单号 -->
+      <template slot="salesBillNo" slot-scope="text, record">
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+      </template>
       <!-- 急件 -->
       <template slot="oosFlag" slot-scope="text, record">
         <a-tag :color="record.oosFlag==1?'red':'#ccc'" >{{ record.oosFlagDictValue }}</a-tag>
@@ -135,7 +139,6 @@
           v-if="record.billStatus !== 'CANCEL' && record.billStatus !== 'FINISH' && record.billStatus != 'WAIT_OUT_STOCK'"
           @click="handleEdit(record)"
           id="salesManagementList-edit-btn">编辑</a-button>
-        <a-button size="small" type="primary" class="button-success" @click="handleDetail(record)" id="salesManagementList-detail-btn">明细</a-button>
         <a-button
           size="small"
           type="primary"
@@ -190,7 +193,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
         { title: '来源', dataIndex: 'salesBillSourceDictValue', width: 120, align: 'center' },
-        { title: '销售单号', dataIndex: 'salesBillNo', width: 180, align: 'center' },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 180, align: 'center' },
         { title: '采购单号', dataIndex: 'purchaseBillNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -201,7 +204,7 @@ export default {
         { title: '急件', dataIndex: 'oosFlag', scopedSlots: { customRender: 'oosFlag' }, width: 100, align: 'center' },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center' },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', width: 110, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {