Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/reportForms/fabric-loss-table.vue

@@ -396,7 +396,25 @@ export default {
       // 采购订单 表头
       purchaseOrderColumns: [
         { title: '货物名称', width: 180, dataIndex: 'cinvName', className: 'replacecolor', align:'left'},
-        { title: '批号', width: 80, dataIndex: 'cbatch', className: 'replacecolor' },
+        { title: '批号', width: 80, dataIndex: 'cbatch', className: 'replacecolor',
+          customRender:function(text,record,index){
+            if (text == null || text == undefined){
+              return "";
+            }
+            if (text.indexOf(",")>-1){
+              const arr = text.split(',');
+              return (<div>
+              {
+                arr.map(t=>{
+                  return (<li>{t}</li>)
+                })
+              }
+              </div>)
+            }else{
+              return text;
+            }
+          }
+        },
         { title: '计划数量', dataIndex: 'iquantity', width: 80, className: 'replacecolor' },
         {
           title: '采购数量',