518合并代码

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -132,18 +132,18 @@
                 style="padding-top: 10px"
               >
               <div style="display:flex;">
-                <!-- <el-input
+                <el-input
                   oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
                   style="width:120px"
-                ></el-input> -->
-                 <el-input
+                ></el-input>
+                 <!-- <el-input
                   placeholder="请输入入库数量"
                   v-model="scope.row.warehousing_count"
                   style="width:120px"
-                ></el-input>
+                ></el-input> -->
                  <!-- {{scope.row.max_unit}} -->
                   <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
                     <el-option

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -163,20 +163,20 @@
                 style="padding-top: 10px;"
               >
                 <div style="display:flex;">
-                  <!-- <el-input
+                  <el-input
                    :disabled="disabled"
                     oninput="value=value.replace(/\D|^0/g,'')"
                     placeholder="请输入入库数量"
                     type="number"
                     v-model="scope.row.warehousing_count"
                     style="width:80px"
-                  ></el-input> -->
-                   <el-input
+                  ></el-input>
+                   <!-- <el-input
                    :disabled="disabled"
                     placeholder="请输入入库数量"
                     v-model="scope.row.warehousing_count"
                     style="width:80px"
-                  ></el-input>
+                  ></el-input> -->
                    <!-- {{scope.row.max_unit}} -->
                    <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px"  :disabled="disabled">
                     <el-option

src/xt_pages/stock/stockInOrderAdd.vue

@@ -110,8 +110,8 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'"
                             :rules='tableRules.warehousing_count' style="padding-top: 20px">
-                <!-- <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"  oninput="value=value.replace(/\D|^0/g,'')"></el-input> -->
-                <el-input placeholder="请输入入库数量" v-model="scope.row.warehousing_count"></el-input>
+                <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"  oninput="value=value.replace(/\D|^0/g,'')"></el-input>
+                <!-- <el-input placeholder="请输入入库数量" v-model="scope.row.warehousing_count"></el-input> -->
                   {{scope.row.min_unit}}
               </el-form-item>
             

src/xt_pages/stock/stockInOrderEdit.vue

@@ -179,18 +179,18 @@
                 :rules="tableRules.warehousing_count"
                 style="padding-top: 20px"
               >
-                <!-- <el-input
+                <el-input
                   oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
                    :disabled ="disabled"
-                ></el-input> -->
-                 <el-input
+                ></el-input>
+                 <!-- <el-input
                   placeholder="请输入入库数量"
                   v-model="scope.row.warehousing_count"
                    :disabled ="disabled"
-                ></el-input>
+                ></el-input> -->
                 {{scope.row.min_unit}}
               </el-form-item>
             </template>