ソースを参照

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

lilei 4 年 前
コミット
96c82e83ed

+ 6 - 1
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -73,7 +73,7 @@
           style="padding: 0 60px;">保存并返回</a-button>
       </div>
     </a-affix>
-    <spare-parts-product-modal :openModal="openModal" :itemSn="itemSn" :nowData="productTotal" @ok="$refs.table.refresh(true)" @close="openModal=false" />
+    <spare-parts-product-modal :openModal="openModal" :itemSn="itemSn" :nowData="productTotal" @ok="$refs.table.refresh(true)" @close="closeModal" />
   </div>
 </template>
 
@@ -123,6 +123,11 @@ export default {
       this.itemSn = (row && row.sparePartsDetailSn) ? row.sparePartsDetailSn : null
       this.openModal = true
     },
+    // 关闭
+    closeModal () {
+      this.itemSn = ''
+      this.openModal = false
+    },
     //  删除
     handleDel (row) {
       const _this = this

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

@@ -62,7 +62,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: 160, 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', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品款数', dataIndex: 'totalProductCategory', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: 150, align: 'center', fixed: 'right' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],