Browse Source

518合并代码

XMLWAN 2 years ago
parent
commit
ef75bc92ec

+ 4 - 4
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue View File

132
                 style="padding-top: 10px"
132
                 style="padding-top: 10px"
133
               >
133
               >
134
               <div style="display:flex;">
134
               <div style="display:flex;">
135
-                <!-- <el-input
135
+                <el-input
136
                   oninput="value=value.replace(/\D|^0/g,'')"
136
                   oninput="value=value.replace(/\D|^0/g,'')"
137
                   placeholder="请输入入库数量"
137
                   placeholder="请输入入库数量"
138
                   type="number"
138
                   type="number"
139
                   v-model="scope.row.warehousing_count"
139
                   v-model="scope.row.warehousing_count"
140
                   style="width:120px"
140
                   style="width:120px"
141
-                ></el-input> -->
142
-                 <el-input
141
+                ></el-input>
142
+                 <!-- <el-input
143
                   placeholder="请输入入库数量"
143
                   placeholder="请输入入库数量"
144
                   v-model="scope.row.warehousing_count"
144
                   v-model="scope.row.warehousing_count"
145
                   style="width:120px"
145
                   style="width:120px"
146
-                ></el-input>
146
+                ></el-input> -->
147
                  <!-- {{scope.row.max_unit}} -->
147
                  <!-- {{scope.row.max_unit}} -->
148
                   <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
148
                   <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
149
                     <el-option
149
                     <el-option

+ 4 - 4
src/xt_pages/stock/drugs/drugStockInOrderEdit.vue View File

163
                 style="padding-top: 10px;"
163
                 style="padding-top: 10px;"
164
               >
164
               >
165
                 <div style="display:flex;">
165
                 <div style="display:flex;">
166
-                  <!-- <el-input
166
+                  <el-input
167
                    :disabled="disabled"
167
                    :disabled="disabled"
168
                     oninput="value=value.replace(/\D|^0/g,'')"
168
                     oninput="value=value.replace(/\D|^0/g,'')"
169
                     placeholder="请输入入库数量"
169
                     placeholder="请输入入库数量"
170
                     type="number"
170
                     type="number"
171
                     v-model="scope.row.warehousing_count"
171
                     v-model="scope.row.warehousing_count"
172
                     style="width:80px"
172
                     style="width:80px"
173
-                  ></el-input> -->
174
-                   <el-input
173
+                  ></el-input>
174
+                   <!-- <el-input
175
                    :disabled="disabled"
175
                    :disabled="disabled"
176
                     placeholder="请输入入库数量"
176
                     placeholder="请输入入库数量"
177
                     v-model="scope.row.warehousing_count"
177
                     v-model="scope.row.warehousing_count"
178
                     style="width:80px"
178
                     style="width:80px"
179
-                  ></el-input>
179
+                  ></el-input> -->
180
                    <!-- {{scope.row.max_unit}} -->
180
                    <!-- {{scope.row.max_unit}} -->
181
                    <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px"  :disabled="disabled">
181
                    <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px"  :disabled="disabled">
182
                     <el-option
182
                     <el-option

+ 2 - 2
src/xt_pages/stock/stockInOrderAdd.vue View File

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

+ 4 - 4
src/xt_pages/stock/stockInOrderEdit.vue View File

179
                 :rules="tableRules.warehousing_count"
179
                 :rules="tableRules.warehousing_count"
180
                 style="padding-top: 20px"
180
                 style="padding-top: 20px"
181
               >
181
               >
182
-                <!-- <el-input
182
+                <el-input
183
                   oninput="value=value.replace(/\D|^0/g,'')"
183
                   oninput="value=value.replace(/\D|^0/g,'')"
184
                   placeholder="请输入入库数量"
184
                   placeholder="请输入入库数量"
185
                   type="number"
185
                   type="number"
186
                   v-model="scope.row.warehousing_count"
186
                   v-model="scope.row.warehousing_count"
187
                    :disabled ="disabled"
187
                    :disabled ="disabled"
188
-                ></el-input> -->
189
-                 <el-input
188
+                ></el-input>
189
+                 <!-- <el-input
190
                   placeholder="请输入入库数量"
190
                   placeholder="请输入入库数量"
191
                   v-model="scope.row.warehousing_count"
191
                   v-model="scope.row.warehousing_count"
192
                    :disabled ="disabled"
192
                    :disabled ="disabled"
193
-                ></el-input>
193
+                ></el-input> -->
194
                 {{scope.row.min_unit}}
194
                 {{scope.row.min_unit}}
195
               </el-form-item>
195
               </el-form-item>
196
             </template>
196
             </template>