Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/webapp/resources/view/vendor/forstore/vendor_storage.html

@@ -1456,7 +1456,7 @@
                                     <td><span ng-bind="list.kiName || '-'" title="{{list.kiName}}"></span></td>
                                     <td width="180"><span ng-bind="list.spec || '-'" title="{{list.spec}}"></span></td>
                                     <td width="100"><span ng-bind="list.qty || '-'" title="{{list.qty}}"></span></td>
-                                    <td width="80"><span ng-bind="list.price || '-'" title="{{list.price}}"></span></td>
+                                    <td width="80"><span ng-bind="list.taxUnitprice || '-'" title="{{list.taxUnitprice}}"></span></td>
                                 </tr>
                             </table>
                             <!--销售出库数据-->
@@ -1473,7 +1473,7 @@
                                         <span ng-if="list.number === list.shipQty">-</span>
                                         <input type="text" ng-pattern="/^[1-9]\d*$/" ng-model="list.sendCount" ng-change="onAmountChange(list, list.sendCount, 'sendCount', 9)" ng-blur="outBlurSendCount(list, list.sendCount)" ng-if="list.number !== list.shipQty" class="form-control">
                                     </td>
-                                    <td width="80"><span ng-bind="list.price || '-'" title="{{list.price}}"></span></td>
+                                    <td width="80"><span ng-bind="list.taxUnitprice || '-'" title="{{list.taxUnitprice}}"></span></td>
                                 </tr>
                             </table>
                         </div>