Browse Source

样式修改

zhangdan 3 năm trước cách đây
mục cha
commit
d24f4ebe9c

+ 5 - 5
src/views/basicData/transferTypeManagement/list.vue

@@ -58,11 +58,11 @@ export default {
       spinning: false,
       tableHeight: 0,
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨类别', dataIndex: 'allocateCategoryDictValue', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨类型名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { 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: 'allocateCategoryDictValue', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨类型名称', dataIndex: 'name', align: 'center', width: '40%',customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 3 - 3
src/views/basicData/warehouse/list.vue

@@ -80,9 +80,9 @@ export default {
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '仓库名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
+        { title: '仓库名称', dataIndex: 'name', align: 'center', width: '45%', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, align: 'center', width: '45%' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 3 - 3
src/views/basicData/warehouse/storingLocation/list.vue

@@ -83,9 +83,9 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '仓位名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 160, align: 'center' }
+        { title: '序号', dataIndex: 'no', width:'10%', align: 'center' },
+        { title: '仓位名称', dataIndex: 'name', align: 'center', width:'45%',customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width:'45%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 10 - 10
src/views/power/user/userList.vue

@@ -37,7 +37,7 @@
         rowKey="id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1350, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         style="word-break: break-all;"
         :defaultLoadData="false"
         bordered
@@ -107,15 +107,15 @@ export default {
       itemData: null, // 编辑行数据
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '用户名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '手机号码', dataIndex: 'phone', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '用户账号', dataIndex: 'loginName', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属分区', dataIndex: 'allSubareaName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '角色', dataIndex: 'roleNames', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', width: 100, align: 'center', scopedSlots: { customRender: 'status' }, fixed: 'right' },
-        { title: '操作', width: 160, align: 'center', scopedSlots: { customRender: 'action' }, fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '用户名称', dataIndex: 'name', align: 'center', width: '22%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '手机号码', dataIndex: 'phone', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '用户账号', dataIndex: 'loginName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属分区', dataIndex: 'allSubareaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '角色', dataIndex: 'roleNames', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', width: '6%', align: 'center', scopedSlots: { customRender: 'status' } },
+        { title: '操作', width: '12%', align: 'center', scopedSlots: { customRender: 'action' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

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

@@ -19,7 +19,7 @@
         :columns="columns"
         :data="loadData"
         :defaultLoadData="false"
-        :scroll="{ x: 1400, y: 400 }"
+        :scroll="{ y: 400 }"
         bordered>
       </s-table>
       <div class="btn-cont"><a-button id="orderStatisticsDetail-back" @click="isShow = false">返回列表</a-button></div>
@@ -55,17 +55,17 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原价', dataIndex: 'origPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '促销价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原价小计', dataIndex: 'priceSubtotal', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '促销价小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '节省金额小计', dataIndex: 'totalEconomizeAmount', width: 130, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '促销类型', dataIndex: 'promotionRulesName', width: 150, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原价', dataIndex: 'origPrice', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '促销价', dataIndex: 'price', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'qty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原价小计', dataIndex: 'priceSubtotal', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '促销价小计', dataIndex: 'totalAmount', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '节省金额小计', dataIndex: 'totalEconomizeAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '促销类型', dataIndex: 'promotionRulesName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 14 - 14
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -72,7 +72,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1510, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
         <!-- 操作 -->
@@ -124,19 +124,19 @@ export default {
       ],
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据来源', dataIndex: 'salesBillSourceDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', dataIndex: 'salesBillNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销名称', dataIndex: 'promoName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户名称', dataIndex: 'buyerName', width: 180, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '促销品款数', dataIndex: 'totalPromoCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '促销品数量', dataIndex: 'totalPromoQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '原价总额', dataIndex: 'promoTotal', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '促销品总额', dataIndex: 'totalPromoAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '节省总额', dataIndex: 'totalEconomizeAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据来源', dataIndex: 'salesBillSourceDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', dataIndex: 'salesBillNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销名称', dataIndex: 'promoName', align: 'center', width: '10%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'buyerName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '促销品款数', dataIndex: 'totalPromoCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '促销品数量', dataIndex: 'totalPromoQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '原价总额', dataIndex: 'promoTotal', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '促销品总额', dataIndex: 'totalPromoAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '节省总额', dataIndex: 'totalEconomizeAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '4%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

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

@@ -21,7 +21,7 @@
         :columns="columns"
         :data="loadData"
         :defaultLoadData="false"
-        :scroll="{ x: 1180, y: 400 }"
+        :scroll="{ y: 400 }"
         bordered>
       </s-table>
       <div class="btn-cont"><a-button id="orderStatisticsDetail-back" @click="isShow = false">返回列表</a-button></div>
@@ -57,16 +57,16 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原价', dataIndex: 'origPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '促销价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原价小计', dataIndex: 'priceSubtotal', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '促销价小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '节省金额小计', dataIndex: 'totalEconomizeAmount', width: 130, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '促销类型', dataIndex: 'promotionRulesName', width: 150, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', align: 'center', width: '26%', customRender: function (text) { return text || '--' } },
+        { title: '原价', dataIndex: 'origPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '促销价', dataIndex: 'price', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'qty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productEntity.unit', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原价小计', dataIndex: 'priceSubtotal', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '促销价小计', dataIndex: 'totalAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '节省金额小计', dataIndex: 'totalEconomizeAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '促销类型', dataIndex: 'promotionRulesName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 8 - 8
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -130,14 +130,14 @@ export default {
       ],
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '品牌', dataIndex: 'productEntity.productBrandName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '数量', dataIndex: 'qty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '节省金额', dataIndex: 'totalEconomizeAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥' + text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '品牌', dataIndex: 'productEntity.productBrandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', width: '28%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '数量', dataIndex: 'qty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productEntity.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '节省金额', dataIndex: 'totalEconomizeAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥' + text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

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

@@ -4,7 +4,7 @@
     class="promotionRules-basicInfo-modal"
     :footer="null"
     :maskClosable="false"
-    title="新增"
+    :title="itemSn?'编辑':'新增'"
     v-model="isShow"
     @cancle="isShow = false"
     :width="960">
@@ -18,135 +18,135 @@
         :wrapper-col="formItemLayout.wrapperCol"
       >
         <a-form-model-item label="活动名称" prop="name" :label-col="{span: 4}">
-        <a-input
-          id="promotionRules-basicInfo-name"
-          :maxLength="100"
-          v-model.trim="form.name"
-          placeholder="请输入活动名称(最多100个字符)"
-          allowClear />
+          <a-input
+            id="promotionRules-basicInfo-name"
+            :maxLength="100"
+            v-model.trim="form.name"
+            placeholder="请输入活动名称(最多100个字符)"
+            allowClear />
         </a-form-model-item>
         <a-row :gutter="15">
-        <a-col span="12">
-          <a-form-model-item label="活动时间" prop="activeDateEnable">
-          <a-select
-            id="promotionRules-basicInfo-activeDateEnable"
-            placeholder="请选择"
-            @change="handleChange('activeDateEnable')"
-            v-model="form.activeDateEnable"
-            style="width: 100%;">
-            <a-select-option v-for="item in rangeList" :key="item.val" :value="item.val">{{ item.name }}</a-select-option>
-          </a-select>
-          </a-form-model-item>
-        </a-col>
-        <a-col span="12" v-if="form.activeDateEnable=='1'">
-          <a-form-model-item prop="activeDate">
-          <a-range-picker
-            style="width:100%"
-            id="promotionRules-basicInfo-activeDate"
-            :disabledDate="disabledDate"
-            v-model="form.activeDate"
-            :format="dateFormat"
-            :placeholder="['开始时间', '结束时间']" />
-          </a-form-model-item>
-        </a-col>
+          <a-col span="12">
+            <a-form-model-item label="活动时间" prop="activeDateEnable">
+              <a-select
+                id="promotionRules-basicInfo-activeDateEnable"
+                placeholder="请选择"
+                @change="handleChange('activeDateEnable')"
+                v-model="form.activeDateEnable"
+                style="width: 100%;">
+                <a-select-option v-for="item in rangeList" :key="item.val" :value="item.val">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col span="12" v-if="form.activeDateEnable=='1'">
+            <a-form-model-item prop="activeDate">
+              <a-range-picker
+                style="width:100%"
+                id="promotionRules-basicInfo-activeDate"
+                :disabledDate="disabledDate"
+                v-model="form.activeDate"
+                :format="dateFormat"
+                :placeholder="['开始时间', '结束时间']" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
         <a-row :gutter="15">
-        <a-col span="12">
-          <a-form-model-item label="参与客户" prop="buyerLimitEnable">
-          <a-select
-            id="promotionRules-basicInfo-buyerLimitEnable"
-            placeholder="请选择"
-            @change="handleChange('buyerLimitEnable')"
-            v-model="form.buyerLimitEnable"
-            style="width: 100%;">
-            <a-select-option v-for="item in rangeCList" :key="item.val" :value="item.val">{{ item.name }}</a-select-option>
-          </a-select>
-          </a-form-model-item>
-        </a-col>
-        <a-col span="12" v-if="form.buyerLimitEnable=='1'">
-          <a-form-model-item prop="buyerSns">
-          <a-button id="promotionRules-basicInfo-choose" type="primary" class="button-success" @click="openCustomerModal=true">选择</a-button>
-          <span style="font-weight: bold;">当前已选:{{ chooseCust.length }}个</span>
-          </a-form-model-item>
-        </a-col>
+          <a-col span="12">
+            <a-form-model-item label="参与客户" prop="buyerLimitEnable">
+              <a-select
+                id="promotionRules-basicInfo-buyerLimitEnable"
+                placeholder="请选择"
+                @change="handleChange('buyerLimitEnable')"
+                v-model="form.buyerLimitEnable"
+                style="width: 100%;">
+                <a-select-option v-for="item in rangeCList" :key="item.val" :value="item.val">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col span="12" v-if="form.buyerLimitEnable=='1'">
+            <a-form-model-item prop="buyerSns">
+              <a-button id="promotionRules-basicInfo-choose" type="primary" class="button-success" @click="openCustomerModal=true">选择</a-button>
+              <span style="font-weight: bold;">当前已选:{{ chooseCust.length }}个</span>
+            </a-form-model-item>
+          </a-col>
         </a-row>
         <a-row :gutter="15">
-        <a-col span="12">
-          <a-form-model-item prop="activeAmountEnable">
-          <template slot="label">
-            <a-popover style="margin-top: 13px;">
-            <template slot="content">即促销品的销售价总额不能高于限值,达到后活动不能参与。</template>
-            <a-icon type="question-circle" theme="twoTone" />
-            </a-popover>
-            <span>活动经费上限</span>
-          </template>
-          <a-select
-            id="promotionRules-basicInfo-activeAmountEnable"
-            placeholder="请选择"
-            @change="handleChange('activeAmountEnable')"
-            v-model="form.activeAmountEnable"
-            style="width: 100%;">
-            <a-select-option v-for="item in rangeList" :key="item.val" :value="item.val">{{ item.name }}</a-select-option>
-          </a-select>
-          </a-form-model-item>
-        </a-col>
-        <a-col span="12" v-if="form.activeAmountEnable=='1'">
-          <a-form-model-item prop="activeAmount">
-          <a-input-number
-            id="promotionRules-basicInfo-activeAmount"
-            v-model="form.activeAmount"
-            :min="1"
-            :max="999999"
-            :precision="2"
-            style="width: 85%;margin-right: 5px;"
-            placeholder="请输入活动经费上限(1~999999)"
-            allowClear />
-          <span>万元</span>
-          </a-form-model-item>
-        </a-col>
+          <a-col span="12">
+            <a-form-model-item prop="activeAmountEnable">
+              <template slot="label">
+                <a-popover style="margin-top: 13px;">
+                  <template slot="content">即促销品的销售价总额不能高于限值,达到后活动不能参与。</template>
+                  <a-icon type="question-circle" theme="twoTone" />
+                </a-popover>
+                <span>活动经费上限</span>
+              </template>
+              <a-select
+                id="promotionRules-basicInfo-activeAmountEnable"
+                placeholder="请选择"
+                @change="handleChange('activeAmountEnable')"
+                v-model="form.activeAmountEnable"
+                style="width: 100%;">
+                <a-select-option v-for="item in rangeList" :key="item.val" :value="item.val">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col span="12" v-if="form.activeAmountEnable=='1'">
+            <a-form-model-item prop="activeAmount">
+              <a-input-number
+                id="promotionRules-basicInfo-activeAmount"
+                v-model="form.activeAmount"
+                :min="1"
+                :max="999999"
+                :precision="2"
+                style="width: 85%;margin-right: 5px;"
+                placeholder="请输入活动经费上限(1~999999)"
+                allowClear />
+              <span>万元</span>
+            </a-form-model-item>
+          </a-col>
         </a-row>
         <a-row :gutter="15">
-        <a-col span="12">
-          <a-form-model-item prop="orderAmountEnable">
-          <template slot="label">
-            <a-popover style="margin-top: 13px;">
-            <template slot="content">即限制每个采购单需达到下限金额才能参与促销。</template>
-            <a-icon type="question-circle" theme="twoTone" />
-            </a-popover>
-            <span>订单起订金额</span>
-          </template>
-          <a-select
-            id="promotionRules-basicInfo-orderAmountEnable"
-            placeholder="请选择"
-            @change="handleChange('orderAmountEnable')"
-            v-model="form.orderAmountEnable"
-            style="width: 100%;">
-            <a-select-option v-for="item in rangeList" :key="item.val" :value="item.val">{{ item.name }}</a-select-option>
-          </a-select>
-          </a-form-model-item>
-        </a-col>
-        <a-col span="12" v-if="form.orderAmountEnable=='1'">
-          <a-form-model-item prop="orderAmount">
-          <a-input-number
-            id="promotionRules-basicInfo-orderAmount"
-            v-model="form.orderAmount"
-            :min="1"
-            :max="999999"
-            :precision="2"
-            style="width: 85%;margin-right: 5px;"
-            placeholder="请输入订单起订金额(1~999999)"
-            allowClear />
-          <span>万元</span>
-          </a-form-model-item>
-        </a-col>
+          <a-col span="12">
+            <a-form-model-item prop="orderAmountEnable">
+              <template slot="label">
+                <a-popover style="margin-top: 13px;">
+                  <template slot="content">即限制每个采购单需达到下限金额才能参与促销。</template>
+                  <a-icon type="question-circle" theme="twoTone" />
+                </a-popover>
+                <span>订单起订金额</span>
+              </template>
+              <a-select
+                id="promotionRules-basicInfo-orderAmountEnable"
+                placeholder="请选择"
+                @change="handleChange('orderAmountEnable')"
+                v-model="form.orderAmountEnable"
+                style="width: 100%;">
+                <a-select-option v-for="item in rangeList" :key="item.val" :value="item.val">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col span="12" v-if="form.orderAmountEnable=='1'">
+            <a-form-model-item prop="orderAmount">
+              <a-input-number
+                id="promotionRules-basicInfo-orderAmount"
+                v-model="form.orderAmount"
+                :min="1"
+                :max="999999"
+                :precision="2"
+                style="width: 85%;margin-right: 5px;"
+                placeholder="请输入订单起订金额(1~999999)"
+                allowClear />
+              <span>万元</span>
+            </a-form-model-item>
+          </a-col>
         </a-row>
         <a-form-model-item label="备注" prop="remark" :label-col="{span: 4}">
-        <a-textarea
-          id="promotionRules-basicInfo-remark"
-          :maxLength="100"
-          v-model.trim="form.remark"
-          placeholder="请输入备注(最多100个字符)"
-          allowClear />
+          <a-textarea
+            id="promotionRules-basicInfo-remark"
+            :maxLength="100"
+            v-model.trim="form.remark"
+            placeholder="请输入备注(最多100个字符)"
+            allowClear />
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
@@ -293,7 +293,7 @@ export default {
                 _this.$emit('ok', res.data)
                 _this.spinning = false
               }, 1000)
-            }else{
+            } else {
               _this.spinning = false
             }
           })

+ 22 - 22
src/views/promotionRulesManagement/promotionRules/detail.vue

@@ -104,38 +104,38 @@ export default {
       tableHeight: 0,
       detailsData: null,
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销类型', dataIndex: 'promoRuleTypeDictValue', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销规则', dataIndex: 'promoRule', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { 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: 'promoRuleTypeDictValue', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销规则', dataIndex: 'promoRule', align: 'center', width: '37%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '18%', align: 'center' }
       ],
       loadData: [],
       openModal: false,
       custColumns: [
-        { title: '序号', scopedSlots: { customRender: 'no' }, width: 80, align: 'center' },
-        { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', scopedSlots: { customRender: 'no' }, width: '5%', align: 'center' },
+        { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '95%', customRender: function (text) { return text || '--' } }
       ],
       pColumns: [ //  正品
-        { title: '序号', scopedSlots: { customRender: 'no' }, width: 80, align: 'center' },
-        { title: '类型', dataIndex: 'goodsTypeName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型名称', dataIndex: 'goodsName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'goodsCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '起订量限制', scopedSlots: { customRender: 'orderGoodsUnit' }, align: 'center' }
+        { title: '序号', scopedSlots: { customRender: 'no' }, width: '4%', align: 'center' },
+        { title: '类型', dataIndex: 'goodsTypeName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型名称', dataIndex: 'goodsName', align: 'center', width: '25%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'name', align: 'center', width: '25%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'goodsCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '起订量限制', scopedSlots: { customRender: 'orderGoodsUnit' }, width: '14%', align: 'center' }
       ],
       promoColumns: [ //  促销品
-        { title: '序号', scopedSlots: { customRender: 'no' }, width: 80, align: 'center' },
-        { title: '类型', dataIndex: 'goodsTypeName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型名称', dataIndex: 'goodsName', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'goodsCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', scopedSlots: { customRender: 'no' }, width: '5%', align: 'center' },
+        { title: '类型', dataIndex: 'goodsTypeName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型名称', dataIndex: 'goodsName', width: '35%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'name', align: 'center', width: '35%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'goodsCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       promoSpecialColumns: [ //  特价产品/加价促销品
-        { title: '序号', scopedSlots: { customRender: 'no' }, width: 80, align: 'center' },
-        { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'goodsCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: this.promoRuleType == 'PROMO_PROD' ? '特惠单价(¥)' : '换购单价(¥)', scopedSlots: { customRender: 'goodsPrice' }, width: 200, align: 'center' }
+        { title: '序号', scopedSlots: { customRender: 'no' }, width: '5%', align: 'center' },
+        { title: '产品名称', dataIndex: 'name', align: 'center', width: '50%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'goodsCode', width: '30%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: this.promoRuleType == 'PROMO_PROD' ? '特惠单价(¥)' : '换购单价(¥)', width: '15%', scopedSlots: { customRender: 'goodsPrice' }, width: 200, align: 'center' }
       ],
       lookLoadData: [],
       promoRuleList: [],

+ 9 - 9
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -40,7 +40,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1210, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
         <!-- 促销时间 -->
@@ -113,14 +113,14 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '促销时间', scopedSlots: { customRender: 'activeDate' }, width: 170, align: 'center' },
-        { title: '参与客户', dataIndex: 'promoBuyerName', width: 180, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '备注', dataIndex: 'remark', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: 100, align: 'center', fixed: 'right' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销名称', dataIndex: 'name', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '促销时间', scopedSlots: { customRender: 'activeDate' }, width: '14%', align: 'center' },
+        { title: '参与客户', dataIndex: 'promoBuyerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '备注', dataIndex: 'remark', width: '13%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: '6%', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 5 - 5
src/views/promotionRulesManagement/promotionRules/rule.vue

@@ -59,11 +59,11 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0,
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销类型', dataIndex: 'promoRuleTypeDictValue', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销规则', dataIndex: 'promoRule', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销类型', dataIndex: 'promoRuleTypeDictValue', width: '30%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销规则', dataIndex: 'promoRule', align: 'center', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 9 - 9
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -52,7 +52,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1150, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         bordered>
         <!-- 产品分类 -->
@@ -91,14 +91,14 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       productType: [],
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '供应商名称', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'product.productBrandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 140, align: 'center' },
-        { title: '产品名称', dataIndex: 'product.name', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'product.code', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价(¥)', dataIndex: 'cost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '原厂编码', dataIndex: 'product.origCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '供应商名称', dataIndex: 'supplierName', width: '20%', align: 'center', 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: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价(¥)', dataIndex: 'cost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '原厂编码', dataIndex: 'product.origCode', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

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

@@ -75,13 +75,13 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 140, 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', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: 100, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '供应商名称', dataIndex: 'supplierName', width: '24%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '联系人', dataIndex: 'contact', align: 'center', width: '24%', 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' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
       ],
       total: 0,
       // 加载数据方法 必须为 Promise 对象