Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/pharmacy.js

     method:"get",
     params:params,
   })
-} 
+} 
+
+export function getDrugInventoryList(params){
+
+  return request({
+    url:"/api/pharmacy/getdruginventoryList",
+    method:"Get",
+    params:params,
+  })
+}

src/xt_pages/stock/drugs/drugInventory.vue

         style="height: 100%; display: flex; flex-direction: column"
         @tab-click="handleClick"
       >
-       <el-tab-pane label="药品盘点(模式一)" name="first">
+         <el-tab-pane label="药品盘点(模式一)" name="first">
           <drug-inventory></drug-inventory>
-        </el-tab-pane>
+           <!-- <historyDrugInvetory ref="childFirst"></historyDrugInvetory> -->
+         </el-tab-pane>
          <el-tab-pane label="药品盘点(模式二)" name="four">
           <drug-new-inventory ref="childFour"></drug-new-inventory>
         </el-tab-pane>
 import drugNewInventory from "./newDrugInventory"
 import inventoryDetails from "./inventoryDetails";
 import drugDamaged from "./drugDamaged.vue";
+import historyDrugInvetory from "./historyDrugInvetory";
 export default {
   name: "stockModifyPrice",
   components: {
     inventoryDetails,
     drugDamaged,
     drugNewInventory,
+    historyDrugInvetory,
   },
   data() {
     return {
   },
   methods: {
     handleClick() {
+      if (this.activeName == "first") {
+        this.$refs.childFirst.getDrugInventoryList();
+      }
      if (this.activeName == "four") {
         this.$refs.childFour.getlist();
       }

src/xt_pages/stock/historyInventory.vue

                  {{scope.row.stock_count}}
               </template>
             </el-table-column>
+            <el-table-column prop="name" label="盘点原因" width="180"  align="center">
+                <template slot-scope="scope">
+                   <el-select v-model="scope.row.type" placeholder="请选择">
+                      <el-option
+                        v-for="item in reasonList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                    </el-select>
+                 </template> 
+              </el-table-column>
             <el-table-column label="盘点后数量"  align="center">
               <template slot-scope="scope">
                 <el-input style="width:80px" v-model="scope.row.last_stock_count" type="number"></el-input>
         goodList:[],
         manufacturerList:[],
         user_name:this.$store.getters.xt_user.user.user_name,
-        infoList:[]
+        infoList:[],
+        reasonList:[
+          {id:6,name:"默认"},
+          {id:1,name:"到期退货"},
+          {id:2,name:"异常退货"},
+          {id:3,name:"退货"},
+          {id:4,name:"损坏"},
+          {id:5,name:"不计入报损分析"},
+          {id:7,name:"有效期到期"},
+         ],
       };
     },
     watch: {},
      handleCurrentChange(val){
        getGoodInventoryByGoodId(val.id).then(response=>{
           if(response.data.state ==1){
-             var obj = {}
-             this.infoList = response.data.data.infoList
+             
+             this.infoList = []
+             var infoList = response.data.data.infoList
+             for(let i=0;i<infoList.length;i++){
+               infoList[i].type = 6
+               infoList[i].last_stock_count = infoList[i].stock_count
+               this.infoList.push(infoList[i])
+             }
+            
+             console.log("infoList====================",this.infoList)
+            
+
           }
        })
      },
      UpdateWarehouseInfo(row){
-       if(parseInt(row.last_stock_count) >=parseInt(row.stock_count)){
+       if(parseInt(row.last_stock_count)<0){
+        this.$message.error("盘点后数量不能为负数!")
+        return false
+       }
+       if(parseInt(row.last_stock_count) >=parseInt(row.warehousing_count)){
          this.$message.error("该批次盘点后数量不能大于或等于入库数量!")
          return false
        }
             stock_count:parseInt(row.stock_count),
             last_stock_count:parseInt(row.last_stock_count),
             good_id:row.good_id,
-            storehouse_id:parseInt(val.storehouse_id), 
+            storehouse_id:parseInt(row.storehouse_id), 
+            is_type:parseInt(row.type)
         }
+        console.log("params22222222222222",params)
        updateInventoryWarehouseInfo(params).then(response=>{
           if(response.data.state ==1){
             var msg = response.data.data.msg
             this.$message.success("保存成功!")
+            row.id =row.good_id
+            this.handleCurrentChange(row)
           }
        })
      }

src/xt_pages/stock/stockInventory.vue

     </div>
     <div class="app-container">
         <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="耗材盘点(模式一)" name="first">
+            <!-- <el-tab-pane label="耗材盘点(模式一)" name="first">
                 <inventory></inventory>
+            </el-tab-pane> -->
+            <el-tab-pane label="耗材盘点(模式一)" name="first">
+                <history-inventory ref="childFive"></history-inventory>
             </el-tab-pane>
             <el-tab-pane label="耗材盘点(模式二)" name="four">
                 <new-inventory ref="childFour"></new-inventory>
             </el-tab-pane>
-            <!-- <el-tab-pane label="耗材盘点(模式三)" name="five">
-                <history-inventory ref="childFive"></history-inventory>
-            </el-tab-pane> -->
+          
             <el-tab-pane label="盘点列表" name="second">
                 <inventory-details ref="child"></inventory-details>
             </el-tab-pane>
     },
     methods:{
       handleClick(){
+      if(this.activeName == "first"){
+        this.$refs.childFive.getGoodInventoryList()
+      }
        if(this.activeName == "four"){
          this.$refs.childFour.open()
         }
         if(this.activeName =="three"){
           this.$refs.childOne.getlist()
         }
-        if(this.activeName == "five"){
-          this.$refs.childFive.getGoodInventoryList()
-        }
+       
       }
     },
     created(){