Browse Source

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into deploy

lilei 4 years ago
parent
commit
132471977d

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

@@ -49,9 +49,9 @@ export default {
     return {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '调拨类别', dataIndex: 'allocateCategoryDictValue', width: 200, align: 'center' },
-        { title: '调拨类型名称', dataIndex: 'name', align: 'center', ellipsis: true },
+        { 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' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 2 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -86,7 +86,8 @@
       bordered>
       <!-- 单号 -->
       <template slot="outBizNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.outBizNo }}</span>
+        <span v-if="record.outBizNo" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.outBizNo }}</span>
+        <span v-else>--</span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">