Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -139,6 +139,11 @@
                   v-model="scope.row.warehousing_count"
                   style="width:120px"
                 ></el-input>
+                 <!-- <el-input
+                  placeholder="请输入入库数量"
+                  v-model="scope.row.warehousing_count"
+                  style="width:120px"
+                ></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

@@ -171,6 +171,12 @@
                     v-model="scope.row.warehousing_count"
                     style="width:80px"
                   ></el-input>
+                   <!-- <el-input
+                   :disabled="disabled"
+                    placeholder="请输入入库数量"
+                    v-model="scope.row.warehousing_count"
+                    style="width:80px"
+                  ></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

@@ -111,6 +111,7 @@
               <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> -->
                   {{scope.row.min_unit}}
               </el-form-item>
             
@@ -803,6 +804,7 @@
              // this.recordInfo.recordData[i].number =  val.number
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
+              this.recordInfo.recordData[i].license_number = val.number
            
               if(val.buy_price == 0){
                this.recordInfo.recordData[i].price = ""

src/xt_pages/stock/stockInOrderEdit.vue

@@ -186,6 +186,11 @@
                   v-model="scope.row.warehousing_count"
                    :disabled ="disabled"
                 ></el-input>
+                 <!-- <el-input
+                  placeholder="请输入入库数量"
+                  v-model="scope.row.warehousing_count"
+                   :disabled ="disabled"
+                ></el-input> -->
                 {{scope.row.min_unit}}
               </el-form-item>
             </template>
@@ -831,6 +836,7 @@ export default {
             // this.recordInfo.recordData[i].number =  val.number
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
+            this.recordInfo.recordData[i].license_number = val.number
             if(val.buy_price == 0){
                this.recordInfo.recordData[i].price= ""
             }else{

src/xt_pages/stock/test.vue

@@ -302,7 +302,16 @@ export default {
          hisStr:hisStr,
        }
       updatePharmacyBaseDrug(params).then(response=>{
-
+         if(response.data.state == 1){
+           var msg = response.data.data.msg
+           var medical =  response.data.data.medical
+           if(msg === 1){
+             this.$message.success("发药成功!")
+           }
+           if(msg == 2 || msg ===3){
+             this.$message.error("库存不足")
+           }
+         }
       })
     }
   },