Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/views/system/jbdScan/goods/caigourukudan.vue

@@ -81,7 +81,7 @@
                         <th style="width: 60px">生产商/品牌</th>
                         <th style="width: 70px">数量</th>
                         <th style="width: 30px">单位</th>
-                        <th style="width: 50px">单价（含税）</th>
+                        <th style="width: 50px">单价(含税)</th>
                         <th style="width: 50px">税率</th>
                         <th style="width: 40px">单价</th>
                         <th style="width: 40px">税额</th>

src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -51,7 +51,7 @@
                         <th >生产商/品牌</th>
                         <th >数量</th>
                         <th >单位</th>
-                        <th >单价（含税）</th>
+                        <th >单价(含税)</th>
                         <th >税率</th>
                         <th >单价</th>
                         <th >税额</th>

src/views/system/jbdScan/wuliao/caigourukudan.vue

@@ -60,7 +60,7 @@
                         <th>生产商/品牌</th>
                         <th>数量</th>
                         <th>单位</th>
-                        <th>单价（含税）</th>
+                        <th>单价(含税)</th>
                         <th>税率</th>
                         <th>单价</th>
                         <th>税额</th>

src/views/system/jbdScan/wuliao/chnangguirukudan.vue

@@ -50,7 +50,7 @@
                         <th>生产商/品牌</th>
                         <th>数量</th>
                         <th>单位</th>
-                        <th>单价（含税）</th>
+                        <th>单价(含税)</th>
                         <th>税率</th>
                         <th>单价</th>
                         <th>税额</th>
@@ -69,9 +69,9 @@
                         <td style="width: 120px"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
                         <td style="width: 45px">{{ item.shu_liang_ }}</td>
                         <td style="width: 45px">{{ item.dan_wei_ }}</td>
-                        <td style="width: 60px">{{ item.dan_jia_han_shui_|numToFixed }}</td>
-                        <td style="width: 45px">{{ item.shui_lv_ }}</td>
-                        <td style="width: 45px">{{ item.dan_jia_|numToFixed}}</td>
+                        <td style="width: 100px">{{ item.dan_jia_han_shui_|numToFixed }}</td>
+                        <td style="width: 40px">{{ item.shui_lv_ }}</td>
+                        <td style="width: 40px">{{ item.dan_jia_|numToFixed}}</td>
                         <td style="width: 45px"> {{ item.dan_jia_han_shui_|shuieToFixed(item.shu_liang_,item.dan_jia_) }}</td>
                         <td style="width: 45px">{{ item.dan_jia_|jineToFixed(item.shu_liang_)}}</td>
                         <td style="width: 60px">{{ item.dan_jia_han_shui_|jineToFixed(item.shu_liang_) }}</td>