瀏覽代碼

样式修改

lilei 1 年之前
父節點
當前提交
7d754ee3de

+ 8 - 7
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -50,10 +50,11 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
+          :pageSize="30"
           :data="loadData"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
@@ -122,13 +123,13 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '供应商名称', dataIndex: 'supplierName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '供应商名称', dataIndex: 'supplierName', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'product.productBrandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '18%', align: 'center' },
-        { title: '产品名称', dataIndex: 'product.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '18%', align: 'left' },
+        { title: '产品名称', dataIndex: 'product.name', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '成本价', dataIndex: 'cost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       return arr
     }
@@ -160,7 +161,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 8 - 7
src/views/supplierManagement/costSetRecord/list.vue

@@ -53,11 +53,12 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -103,12 +104,12 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '变更时间', dataIndex: 'auditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '15%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'product.productBrandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'center' },
-        { title: '供应商名称', dataIndex: 'supplierName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'left' },
+        { title: '供应商名称', dataIndex: 'supplierName', width: '15%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '变更前', dataIndex: 'oldCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '变更后', dataIndex: 'newCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
 
@@ -173,7 +174,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 215
+      this.tableHeight = window.innerHeight - tableSearchH - 200
     }
   },
   watch: {

+ 6 - 6
src/views/supplierManagement/costSetting/addProductModal.vue

@@ -75,6 +75,12 @@
         </div>
         <!-- 按钮 -->
         <div class="btn-con">
+          <a-button
+            id="chooseProducts-cancel"
+            size="large"
+            class="button-cancel"
+            @click="isShow=false"
+            style="padding: 0 60px;margin-right: 15px;">取消</a-button>
           <a-button
             type="primary"
             id="chooseProducts-save"
@@ -82,12 +88,6 @@
             class="button-primary"
             @click="handleSave"
             style="padding: 0 60px;">保存</a-button>
-          <a-button
-            id="chooseProducts-cancel"
-            size="large"
-            class="button-cancel"
-            @click="isShow=false"
-            style="padding: 0 60px;margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

+ 7 - 6
src/views/supplierManagement/costSetting/list.vue

@@ -64,13 +64,13 @@
         <div class="table-operator">
           <a-button type="primary" v-if="$hasPermissions('B_costSetAddProduct')" class="button-error" @click="newProduct=true">新增</a-button>
           <a-button type="primary" v-if="$hasPermissions('B_costSetBatchImport')" class="button-warning" @click="handleBatchImport">批量导入</a-button>
-          <a-button type="primary" v-if="$hasPermissions('B_costSetAudit')" class="button-warning" @click="handleBatchAudit">批量审核</a-button>
+          <a-button type="primary" ghost v-if="$hasPermissions('B_costSetAudit')" @click="handleBatchAudit">批量审核</a-button>
         </div>
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.supplierProductSn"
           rowKeyName="supplierProductSn"
@@ -78,6 +78,7 @@
           @rowSelection="rowSelectionFun"
           :columns="columns"
           :data="loadData"
+          :pageSize="30"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           bordered>
@@ -190,10 +191,10 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'product.productBrandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'center' },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '12%', align: 'left' },
         { title: '供应商名称', dataIndex: 'supplierName', width: '12%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核状态', dataIndex: 'auditStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -315,7 +316,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 250
+      this.tableHeight = window.innerHeight - tableSearchH - 240
     }
   },
   watch: {

+ 3 - 3
src/views/supplierManagement/costSetting/settingCost.vue

@@ -42,12 +42,12 @@
               style="width: 100%;" />
           </a-form-model-item>
           <div style="display: flex;justify-content: center;padding: 30px 0;">
+            <a-button style="margin-right: 15px;" @click="cansel">
+              取消
+            </a-button>
             <a-button type="primary" @click="onSubmit">
               确定
             </a-button>
-            <a-button style="margin-left: 15px;" @click="cansel">
-              取消
-            </a-button>
           </div>
         </a-form-model></a-spin>
       </a-form-model>

+ 5 - 4
src/views/supplierManagement/supplierInfo/list.vue

@@ -22,16 +22,17 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button id="supplierInfoList-add" type="primary" v-if="$hasPermissions('B_supplierInfo_add')" class="button-error" @click="handleEdit()">新增</a-button>
+          <a-button id="supplierInfoList-add" type="primary" v-if="$hasPermissions('B_supplierInfo_add')" @click="handleEdit()">新增</a-button>
         </div>
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+84.5+'px' }"
+          :style="{ height: tableHeight+70+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
+          :pageSize="30"
           :data="loadData"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
@@ -84,7 +85,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '供应商名称', dataIndex: 'supplierName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '供应商名称', dataIndex: 'supplierName', width: '30%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '联系人', dataIndex: 'contact', align: 'center', width: '18%', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '产品款数', dataIndex: 'totalProductCategory', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: '10%', align: 'center' },
@@ -157,7 +158,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 255
+      this.tableHeight = window.innerHeight - tableSearchH - 238
     }
   },
   watch: {