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

src/api/drug/drug.js

@@ -428,9 +428,9 @@ export function modifyInventory(params) {
   })
 }
 
-export function deleteDrugInventory(params) {
+export function deleteDrugInventory(id, params) {
   return request({
-    url: '/api/drug/deletedruginventory',
+    url: '/api/drug/deletedruginventory?id=' + id,
     method: 'get',
     params: params
   })
@@ -467,3 +467,4 @@ export function getDrugWarehouseInfoTotal(params) {
     params: params
   })
 }
+

src/xt_pages/management/components/UserForm.vue

@@ -228,7 +228,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 20, 30]"
+        :page-sizes="[10, 20, 30,50,100,200,500,1000,2000,5000,10000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"
@@ -1692,7 +1692,7 @@ export default {
               var information = response.data.data.information;
               this.dialogVisible = false;
               this.$message.success("修改成功");
-              this.getInformationData();
+              // this.getInformationData();
               this.$forceUpdate();
             }
           });
@@ -2361,7 +2361,7 @@ export default {
   },
   created() {
     this.getAllSubregion();
-    this.getInformationData();
+    // this.getInformationData();
     this.getAllOrganization();
   },
   watch: {

src/xt_pages/management/home.vue

@@ -4330,9 +4330,6 @@ export default {
         var bednumbers = parseInt(bednumber)
         this.userform.bed_number = bednumbers
 
-        // var patientName = this.userform.patient_name
-        // var patient_name = parseInt(patientName)
-        // this.userform.patient_name = patient_name
         var dialysismode = this.userform.dialysis_mode
         var dialysis_mode = parseInt(dialysismode)
         this.userform.dialysis_mode = dialysis_mode
@@ -4425,7 +4422,12 @@ export default {
         if (this.userform.user_total === '0') {
           this.userform.user_total = 0
         }
-       
+        if (this.userform.user_total == ""){
+          this.userform.user_total = 0
+        }
+
+        console.log("user_form",this.userform)
+      
         this.$refs[formName].validate((valid) => {
           if (valid) {
             SaveInformation(this.equimentid, this.userform).then(response => {

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -384,8 +384,6 @@
             { required: true, message: '请选择生产厂商', trigger: 'blur' }
           ], good_unit: [
             { required: true, message: '请选择单位', trigger: 'blur' }
-          ], stock_warn_count: [
-            { required: true, message: '请输入库存警戒', trigger: 'blur' }
           ],social_security_directory_code:[
             {required:true,message:"请填写社保目录编码",trigger:'blur'}
           ],production_type:[

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -592,6 +592,7 @@ export default {
            getDrugWarehouseInfoList(params).then(response=>{
              if(response.data.state == 1){
                var list =   response.data.data.list
+              
                for(let i=0;i<list.length;i++){
                   list[i].stock_max_number = val.min_number * list[i].stock_max_number
                 }

src/xt_pages/stock/drugs/drugModifyPrice.vue

@@ -69,6 +69,11 @@
                    <template slot-scope="scope">
                     {{scope.row.specification_name}}
                   </template>  
+                </el-table-column>
+                 <el-table-column prop="date" label="原价格" width="100px"  align="center">
+                   <template slot-scope="scope">
+                    {{scope.row.retail_price}}
+                  </template>  
                 </el-table-column>
                  <el-table-column prop="date" label="现价格" width="100px"  align="center">
                    <template slot-scope="scope">
@@ -614,11 +619,12 @@ export default {
      getlist(){
          var params = {
             keyword:this.searchKey,
-            start_time:"",
-            end_time:"",
+            start_time:this.start_time,
+            end_time:this.end_time,
             limit:this.limit,
             page:this.page,
          }
+        console.log("params",params)
        getDrugPriceList(params).then(response=>{
           if(response.data.state == 1){
            var list =  response.data.data.list

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -76,7 +76,7 @@
              <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
               <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>
               <span v-if="scope.row.consumable_type == 4">{{scope.row.cancel_order_number}}</span>
-              <span v-if="scope.row.consumable_type == 5">{{scope.row.cancel_order_number}}</span>
+              <span v-if="scope.row.consumable_type == 5">{{scope.row.warehouse_out_order_number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">

src/xt_pages/stock/drugs/inventory.vue

@@ -530,7 +530,7 @@
 
 <script>
 import { uParseTime } from '@/utils/tools'
-import { postSearchDrugWarehouseList,getDrugWarehouseInfoList,saveDrugInventory,getDrugInventoryList,SaveDrugCheckedInventory,getDrugInventoryDetail,modifyInventory,SaveDrugProofInventory,getDrugWarehouseInfoTotal} from "@/api/drug/drug"
+import { postSearchDrugWarehouseList,getDrugWarehouseInfoList,saveDrugInventory,getDrugInventoryList,SaveDrugCheckedInventory,getDrugInventoryDetail,modifyInventory,SaveDrugProofInventory,getDrugWarehouseInfoTotal,deleteDrugInventory} from "@/api/drug/drug"
 import { getDrugBatchNumber } from  "@/api/drug/drug_stock"
 import { getDataConfig } from '@/utils/data'
 export default {
@@ -862,6 +862,7 @@ export default {
               tableData:this.tableData
            }
            console.log("parasm222",params)
+           
           saveDrugInventory(params).then(response=>{
             if(response.data.state == 1){
               var msg = response.data.data.msg
@@ -999,7 +1000,7 @@ export default {
          }
       })
      },
-     deleteDrugInventory(id,check_status){
+     deleteDrugInventory(id,check_status,index){
        if(check_status == 1){
           this.$message.error("已核对的不能编辑")
           return
@@ -1009,10 +1010,8 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          let params = {
-            id:id,
-          }
-       deleteDrugInventory(params).then(response => {
+        
+       deleteDrugInventory(id).then(response => {
             if (response.data.state == 1) {
               var msg = response.data.data.msg
               this.$message.success("保存成功")

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -180,6 +180,7 @@ export default {
              if(response.data.state == 1){
               this.total =  response.data.data.total
               this.tableData = response.data.data.list
+              console.log("比阿哥",this.tableData)
               this.doctorList = response.data.data.doctorList
              }
           })   

src/xt_pages/stock/inventory.vue

@@ -1008,10 +1008,8 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          let params = {
-            id:id,
-          }
-       deleteInventory(params).then(response => {
+          
+       deleteInventory(id).then(response => {
             if (response.data.state == 1) {
               var msg = response.data.data.msg
               this.$message.success("保存成功")

src/xt_pages/stock/stockModifyPrice.vue

@@ -106,7 +106,8 @@
                     </el-table-column>
                     <el-table-column label="核对人" width="100" align="center">
                       <template slot-scope="scope">
-                         {{getDoctor(scope.row.checker)}}
+                         {{getDoctorOne(scope.row.checker)}}
+                        
                       </template>
                     </el-table-column>
                     <el-table-column label="状态" width="100" align="center">
@@ -422,7 +423,7 @@
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
-import { postSearchGoodWarehouseList,saveAdjustPrice,getAllStockPrice,SaveCheckedPrice,getModifyPriceDetail,updateStockPrice,deleteStockPrice} from "@/api/stock"
+import { postSearchGoodList,saveAdjustPrice,getAllStockPrice,SaveCheckedPrice,getModifyPriceDetail,updateStockPrice,deleteStockPrice} from "@/api/stock"
 import { uParseTime } from '@/utils/tools'
 export default {
     name: "stockModifyPrice",
@@ -497,7 +498,7 @@ export default {
             if (keyword != undefined) {
              key = keyword
             }
-            postSearchGoodWarehouseList(key).then(response => {
+            postSearchGoodList(key).then(response => {
             if (response.data.state == 1) {
             
                 var list = response.data.data.list
@@ -535,21 +536,26 @@ export default {
         handleSelect(val){
           console.log("val23232323",val)
           this.form.id = val.id
-          this.form.good_id = val.good_id,
+          this.form.good_id = val.id,
           this.form.good_name = val.good_name
           this.form.packing_price = val.packing_price
-          this.form.warehousing_order = val.warehousing_order
-          this.form.license_number = val.license_number
+          if(val.xt_warehouse_info != null){
+              this.form.warehousing_order = val.warehousing_order
+          }else{
+             this.form.warehousing_order = ""
+          }
+        
+          if (val.xt_warehouse_info != null){
+             this.form.license_number = val.xt_warehouse_info[0].license_number
+          }else{
+            this.form.license_number = ""
+          }
           if(val.dealer == 0){
             this.form.dealer = ""
           }else{
             this.form.dealer = val.dealer
           }
-          // if(this.form.manufacturer == 0){
-          //   this.form.manufacturer = ""
-          // }else{
-          //   this.form.manufacturer = val.manufacturer
-          // }
+          
           this.form.manufacturer = val.manufacturer
           this.form.specification_name = val.specification_name
           this.form.remark = val.remark
@@ -684,11 +690,13 @@ export default {
         console.log("params",params)
        getAllStockPrice(params).then(response=>{
          if(response.data.state == 1){
+           this.tableList = []
            var list = response.data.data.list
            console.log("zhognguoffs",list)
            this.tableList = list
            var doctor = response.data.data.doctor
            console.log("doctor",doctor)
+           this.doctorList = []
            this.doctorList = doctor
            this.total = response.data.data.total
          }
@@ -703,6 +711,17 @@ export default {
        }
        return user_name
      },
+     getDoctorOne(id){
+       console.log("id233233",id)
+       console.log("hhhhh23323232",this.doctorList)
+       var user_name = ""
+       for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+             user_name = this.doctorList[i].user_name
+          }
+       }
+       return user_name
+     },
      changePrice(val){
        console.log("val23232322323",val)