lilei 3 tahun lalu
induk
melakukan
b15d4eb446

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

@@ -94,6 +94,10 @@
                     style="cursor: pointer;"
                     @click="handlePicDetail(record)" />
                 </template>
+                <!-- 包装数 -->
+                <template slot="baozh" slot-scope="text, record">
+                  4支/盒
+                </template>
                 <!-- 产品编码 -->
                 <template slot="code" slot-scope="text, record">
                   <a-tooltip placement="top" v-if="record.stockState=='NOT_ENOUGH'">
@@ -280,8 +284,9 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '15%', align: 'center', sorter: true },
         { title: '产品名称', dataIndex: 'name', width: '23%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '箱/单位', dataIndex: 'unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
+        { title: '单位', dataIndex: 'unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '包装数', scopedSlots: { customRender: 'baozh' }, width: '10%', align: 'center' },
         { title: '成本价', dataIndex: 'purchasePrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
         { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
         { title: '车主零售价', dataIndex: 'carOwnersPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },

+ 4 - 4
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -41,14 +41,14 @@
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
-            type="primary"
+            type="link"
             class="button-success"
             v-if="record.defaultFlag!=1"
             @click="handleDefault(record)"
             id="chooseAddressList-default-btn">设为默认</a-button>
           <a-button
             size="small"
-            type="primary"
+            type="link"
             class="button-info"
             v-if="record.readOnlyFlag!=1"
             @click="handleEdit(record)"
@@ -56,7 +56,7 @@
           >编辑</a-button>
           <a-button
             size="small"
-            type="primary"
+            type="link"
             class="button-error"
             v-if="record.readOnlyFlag!=1"
             @click="handleDel(record)"
@@ -68,7 +68,7 @@
         <template slot="choose" slot-scope="text, record">
           <a-button
             size="small"
-            type="primary"
+            type="link"
             class="button-primary"
             @click="handleChoose(record)"
             id="chooseAddressList-choose-btn">选择</a-button>