Browse Source

Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

ccjgmwz 3 năm trước cách đây
mục cha
commit
7f333999c2

+ 2 - 2
src/views/outboundManagement/weighingManagementNew.vue

@@ -231,8 +231,8 @@
                         (paramType == '2' || inWarehouseType == 1)
                         (paramType == '2' || inWarehouseType == 1)
                       ">
                       ">
                       <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous"
                       <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous"
-                        @input="calculation" placeholder="请输入扣重" maxlength="100" size="small" /> -->
-                    </ws-form-item>
+                        @input="calculation" placeholder="请输入扣重" maxlength="100" size="small" />
+                    </ws-form-item> -->
                     <ws-form-item label="净重(KG)" span="1" prop="netWeight" v-if="information == '毛重'">
                     <ws-form-item label="净重(KG)" span="1" prop="netWeight" v-if="information == '毛重'">
                       <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight"
                       <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight"
                         placeholder="自动计算,不可编辑" maxlength="100" size="small" disabled />
                         placeholder="自动计算,不可编辑" maxlength="100" size="small" disabled />