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

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

@@ -92,6 +92,12 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
+        {
+          title: '批号',
+          dataIndex: 'cbatch',
+          width: 120,
+          className: 'replacecolor'
+        },
         {
           title: '使用数量',
           dataIndex: 'iquantity',

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

@@ -1,6 +1,6 @@
 <template>
   <a-modal
-    title="余纱"
+    title="来源余纱"
     v-model="surplusYarnModVis"
     :confirmLoading="confirmLoading"
     width="86%"
@@ -93,6 +93,12 @@ export default {
           key: '',
           className: 'replacecolor'
         },
+        {
+          title: '批号',
+          dataIndex: 'cbatch',
+          width: 120,
+          className: 'replacecolor'
+        },
         {
           title: '使用数量',
           dataIndex: 'iquantity',