Merge remote-tracking branch 'origin/dev_ml'

jshERP-web/src/views/bill/modules/SaleOrderModal.vue

@@ -425,8 +425,8 @@ export default {
           { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true },
           { title: '有效期', key: 'expirationDate', width: '7%', type: FormTypes.input, readonly: true },
           { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal },
-          { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal },
-          { title: '已出库', key: 'finishNumber', width: '4%', type: FormTypes.normal },
+          // { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal },
+          // { title: '已出库', key: 'finishNumber', width: '4%', type: FormTypes.normal },
           {
             title: '出库数量',
             key: 'operNumber',

jshERP-web/src/views/material/modules/MaterialModal.vue

@@ -540,8 +540,8 @@
               :actionButton="false"
             >
               <template #buttonAfter>
-                <a-button style="margin: 0px 0px 8px 0px" @click="batchSetStock('initStock')">期初库存-批量</a-button>
-                <a-button style="margin-left: 8px" @click="batchSetStock('lowSafeStock')">最低安全库存-批量</a-button>
+                <!-- <a-button style="margin: 0px 0px 8px 0px" @click="batchSetStock('initStock')">期初库存-批量</a-button> -->
+                <a-button style="margin: 0px 0px 8px 0px" @click="batchSetStock('lowSafeStock')">最低安全库存-批量</a-button>
                 <a-button style="margin-left: 8px" @click="batchSetStock('highSafeStock')">最高安全库存-批量</a-button>
               </template>
             </j-editable-table>
@@ -811,11 +811,12 @@ export default {
             type: FormTypes.normal,
           },
           {
-            title: '期初库存数量',
-            key: 'initStock',
+            title: '库存总数量',
+            key: 'currentStock',
             width: '15%',
             type: FormTypes.inputNumber,
             defaultValue: '',
+            disabled: true,
             placeholder: '请输入${title}',
           },
           {