Browse Source

518合并代码

XMLWAN 2 years ago
parent
commit
612b693c34

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

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>
141
                 ></el-input>
142
+                 <!-- <el-input
143
+                  placeholder="请输入入库数量"
144
+                  v-model="scope.row.warehousing_count"
145
+                  style="width:120px"
146
+                ></el-input> -->
142
                  <!-- {{scope.row.max_unit}} -->
147
                  <!-- {{scope.row.max_unit}} -->
143
                   <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">
144
                     <el-option
149
                     <el-option

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

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>
173
                   ></el-input>
174
+                   <!-- <el-input
175
+                   :disabled="disabled"
176
+                    placeholder="请输入入库数量"
177
+                    v-model="scope.row.warehousing_count"
178
+                    style="width:80px"
179
+                  ></el-input> -->
174
                    <!-- {{scope.row.max_unit}} -->
180
                    <!-- {{scope.row.max_unit}} -->
175
                    <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">
176
                     <el-option
182
                     <el-option

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

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>
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> -->
114
                   {{scope.row.min_unit}}
115
                   {{scope.row.min_unit}}
115
               </el-form-item>
116
               </el-form-item>
116
             
117
             
803
              // this.recordInfo.recordData[i].number =  val.number
804
              // this.recordInfo.recordData[i].number =  val.number
804
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
805
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
805
               this.recordInfo.recordData[i].remark = val.remark
806
               this.recordInfo.recordData[i].remark = val.remark
807
+              this.recordInfo.recordData[i].license_number = val.number
806
            
808
            
807
               if(val.buy_price == 0){
809
               if(val.buy_price == 0){
808
                this.recordInfo.recordData[i].price = ""
810
                this.recordInfo.recordData[i].price = ""

+ 6 - 0
src/xt_pages/stock/stockInOrderEdit.vue View File

186
                   v-model="scope.row.warehousing_count"
186
                   v-model="scope.row.warehousing_count"
187
                    :disabled ="disabled"
187
                    :disabled ="disabled"
188
                 ></el-input>
188
                 ></el-input>
189
+                 <!-- <el-input
190
+                  placeholder="请输入入库数量"
191
+                  v-model="scope.row.warehousing_count"
192
+                   :disabled ="disabled"
193
+                ></el-input> -->
189
                 {{scope.row.min_unit}}
194
                 {{scope.row.min_unit}}
190
               </el-form-item>
195
               </el-form-item>
191
             </template>
196
             </template>
831
             // this.recordInfo.recordData[i].number =  val.number
836
             // this.recordInfo.recordData[i].number =  val.number
832
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
837
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
833
             this.recordInfo.recordData[i].remark = val.remark
838
             this.recordInfo.recordData[i].remark = val.remark
839
+            this.recordInfo.recordData[i].license_number = val.number
834
             if(val.buy_price == 0){
840
             if(val.buy_price == 0){
835
                this.recordInfo.recordData[i].price= ""
841
                this.recordInfo.recordData[i].price= ""
836
             }else{
842
             }else{

+ 10 - 1
src/xt_pages/stock/test.vue View File

302
          hisStr:hisStr,
302
          hisStr:hisStr,
303
        }
303
        }
304
       updatePharmacyBaseDrug(params).then(response=>{
304
       updatePharmacyBaseDrug(params).then(response=>{
305
-
305
+         if(response.data.state == 1){
306
+           var msg = response.data.data.msg
307
+           var medical =  response.data.data.medical
308
+           if(msg === 1){
309
+             this.$message.success("发药成功!")
310
+           }
311
+           if(msg == 2 || msg ===3){
312
+             this.$message.error("库存不足")
313
+           }
314
+         }
306
       })
315
       })
307
     }
316
     }
308
   },
317
   },