chenrui пре 4 година
родитељ
комит
f432cfedb4

+ 6 - 6
src/views/supplierManagement/associatedProduct/add.vue

@@ -8,7 +8,7 @@
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
-        <a-button key="2" type="primary" @click="newProduct=true" id="associatedProduct-addProduct-btn">增加产品</a-button>
+        <a-button key="2" type="primary" @click="newProduct=true" class="button-error" id="associatedProduct-addProduct-btn">增加产品</a-button>
         <a-button key="1" type="primary" class="button-success" id="associatedProduct-import-btn">批量导入</a-button>
       </template>
     </a-page-header>
@@ -60,11 +60,11 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 2150, y: tableHeight }"
+        :scroll="{ x: 1410, y: tableHeight }"
         bordered>
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">
-          <span v-if="record.product.productTypeName2 || record.product.productTypeName3">{{ record.product.productTypeName1 }} {{ record.product.productTypeName2 ? '>' : '' }} {{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
+          <span v-if="record.product.productTypeName2 || record.product.productTypeName3">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
           <span v-else>--</span>
         </template>
         <!-- 操作 -->
@@ -121,12 +121,12 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '产品品牌', dataIndex: 'product.productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 350, align: 'center' },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
         { title: '产品名称', dataIndex: 'product.name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'product.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'product.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', dataIndex: 'cost', width: 140, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' }
+        { title: '成本价', dataIndex: 'cost', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 3 - 3
src/views/supplierManagement/associatedProduct/chooseProduct.vue

@@ -49,7 +49,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -58,10 +58,10 @@
         bordered>
       </s-table>
       <div style="display: flex;justify-content: center;padding: 10px 0;">
-        <a-button size="large" type="primary" @click="handleSubmit">
+        <a-button size="large" type="primary" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">
           确定
         </a-button>
-        <a-button size="large" style="margin-left: 50px;" @click="cansel">
+        <a-button size="large" style="padding: 0 60px;margin-left: 15px;font-size: 12px;" @click="cansel">
           取消
         </a-button>
       </div>

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

@@ -50,11 +50,11 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ y: tableHeight }"
+      :scroll="{ x: 1470, y: tableHeight }"
       bordered>
       <!-- 产品分类 -->
       <template slot="productType" slot-scope="text, record">
-        <span v-if="record.product.productTypeName2 || record.product.productTypeName3">{{ record.product.productTypeName1 }} {{ record.product.productTypeName2 ? '>' : '' }} {{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
+        <span v-if="record.product.productTypeName2 || record.product.productTypeName3">{{ record.product.productTypeName2 }} {{ record.product.productTypeName3 ? '>' : '' }} {{ record.product.productTypeName3 }}</span>
         <span v-else>--</span>
       </template>
     </s-table>
@@ -89,8 +89,8 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '供应商名称', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '品牌', dataIndex: 'product.productBrandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 300, align: 'center' },
+        { title: '品牌', dataIndex: 'product.productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
         { title: '产品名称', dataIndex: 'product.name', width: 220, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'product.code', width: 220, align: 'center' },
         { title: '成本价(¥)', dataIndex: 'cost', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },