数据

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API: '"http://localhost:9531"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+    host: 'xt.test.sgjyun.com',
+    // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/stock/detail/stockInDetail.vue

@@ -8,13 +8,21 @@
       type="primary"
       >打印
     </el-button>
+   
+    <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetal"
+      type="primary"
+      >明细导出
+    </el-button>
 
     <el-button
       style="float: right;margin-right:10px"
       size="small"
       @click="exportList"
       type="primary"
-      >导出
+      >汇总导出
     </el-button>
 
     <div class="cell clearfix">
@@ -40,7 +48,7 @@
           v-model="start_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -54,7 +62,7 @@
           v-model="end_time"
           prefix-icon="el-icon-date"
           :editable="false"
-          style="width: 196px;"
+          style="width: 150px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
@@ -398,10 +406,10 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
-          var total_price = ""
-         
-        
+          var total_price = 0
+          console.log("收据3233232",response.data.data.list)
           for (let i = 0; i < response.data.data.list.length; i++) {
+            total_price += parseInt(response.data.data.list[i].warehousing_count) * response.data.data.list[i].price
             this.tableList.push(response.data.data.list[i])
             var obj = response.data.data.list[i];
             obj["is_total"] = 0;
@@ -411,7 +419,7 @@ export default {
           this.cancelStockDate.push({
             warehousing_order: "合计",
             is_total: 1,
-            total: response.data.data.total_price,
+            total:total_price.toFixed(2),
             Warehousing: {
               warehousing_time: 0
             }
@@ -747,8 +755,6 @@ export default {
     
       exportList(){
   
-        console.log("hhhh",this.tableInfo)
-       
         for(let i=0;i<this.tableInfo.length;i++){
           this.tableInfo[i].index = i+1  
           this.tableInfo[i].total_price = (this.tableInfo[i].warehousing_count * this.tableInfo[i].price).toFixed(2) 
@@ -769,6 +775,37 @@ export default {
             this.downloadLoading = false
         })
       },
+      exportListDetal(){
+        var obj = {index:"合计",total_price:0}
+        var total_price = 0
+        for(let i=0;i<this.cancelStockDate.length;i++){
+          this.cancelStockDate[i].index = i + 1
+          this.cancelStockDate[i].good_type_name = this.typeName(this.cancelStockDate[i].good_type_id)
+          this.cancelStockDate[i].good_name = this.typeNameOne(this.cancelStockDate[i].good_id)
+          this.cancelStockDate[i].specification_name = this.specificationName(this.cancelStockDate[i].good_id)
+          this.cancelStockDate[i].warehousing_time = this.getTime(this.cancelStockDate[i].Warehousing.warehousing_time)
+          this.cancelStockDate[i].user_name = this.getXuserName(this.cancelStockDate[i].Warehousing.creater)
+          this.cancelStockDate[i].total_price = (this.cancelStockDate[i].warehousing_count * this.cancelStockDate[i].price).toFixed(2)
+          total_price += this.cancelStockDate[i].warehousing_count * this.cancelStockDate[i].price
+        }
+        obj.total_price = total_price.toFixed(2)
+        this.cancelStockDate.push(obj)
+        import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','进货价','数量','总价']
+        const filterVal = ['index','warehousing_count', 'good_type_name', 'good_name','specification_name','warehousing_time','user_name','price','warehousing_count','total_price']
+        console.log("hhhhhhhh",this.cancelStockDate)
+      
+        
+        const data = this.formatJson(filterVal, this.cancelStockDate)
+        console.log("data222222222",data)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '耗材入库明细'
+          })
+            this.downloadLoading = false
+        })
+      },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -126,7 +126,7 @@
                       placeholder="请输入批号"
                       v-model="scope.row.batch_number"
                     ></el-input> -->
-                    <el-select v-model="scope.row.batch_number" filterable placeholder="请选择">
+                    <el-select v-model="scope.row.batch_number" filterable placeholder="请选择" >
                       <el-option
                         v-for="(item,index) in numberList"
                         :key="index"
@@ -155,7 +155,7 @@
                     type="number"
                     v-model="scope.row.count"
                   ></el-input>
-                  <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
+                  <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px" @change="changeUnit(scope.row)">
                     <el-option
                       v-for="(option, index) in unitList"
                       :key="index"
@@ -686,8 +686,9 @@ export default {
             this.recordInfo.recordData[i].max_unit = val.max_unit
             this.recordInfo.recordData[i].min_number = val.min_number
             this.recordInfo.recordData[i].min_unit = val.min_unit
-          
+            this.recordInfo.recordData[i].min_price = val.min_price
             this.recordInfo.recordData[i].number = val.number
+            this.recordInfo.recordData[i].unit = val.max_unit
             if(val.retail_price == 0){
               this.recordInfo.recordData[i].price = ""
             }else{
@@ -719,6 +720,25 @@ export default {
              this.numberList = list
            }
         })
+      },
+      changeUnit(val){
+        console.log("val2323232322323",val,this.recordInfo.recordData)
+        this.getDrugBatchNumber(val.drug_id)
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.recordInfo.recordData[i].drug_id == val.drug_id){
+             if(this.recordInfo.recordData[i].unit == val.max_unit){
+                this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price
+             }
+             if(this.recordInfo.recordData[i].min_unit == val.min_unit){
+               this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].min_price
+             }
+          }
+          for(let j=0;j<this.numberList.length;j++){
+            if(this.recordInfo.recordData[i].batch_number == this.numberList[j].id){
+               this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number
+            }
+          }
+        }
       }
   },
   created() {

src/xt_pages/stock/drugs/inventory.vue

@@ -111,7 +111,8 @@
         <el-dialog
         title="药品盘点"
         :visible.sync="dialogVisible"
-        width="1200px">
+        width="1200px"
+        class="addDrugsDialog">
             <el-form :model="form" class="modifyDialog" label-width="120px">
                 <el-form-item label="药品ID">
                     <el-input v-model="form.drug_id" :disabled="true"></el-input>
@@ -147,11 +148,19 @@
                 <el-form-item label="规格">
                     <el-input v-model="form.specification_name" :disabled="true"></el-input>
                 </el-form-item>
-                <!-- <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
-                </el-form-item> -->
-                 <el-form-item prop="max_unit" label="单位">
-                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
+                <el-form-item label="进货价">
+                    <el-input v-model="form.last_price" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
+                </el-form-item>
+
+                <div style="width:100%;display:flex;">
+                    <el-form-item prop="dose" label="盘点数量" >
+                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="dose_unit" class="noMargin">
+                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位">
                       <el-option
                         v-for="(item,index) in getDataConfig('hemodialysis','units')"
                         :key="index"
@@ -159,16 +168,22 @@
                         :value="item.name">
                       </el-option>
                     </el-select>
-                </el-form-item>
-                <el-form-item label="进货价">
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
-                </el-form-item>
-                <el-form-item label="盘点数量">
-                    <el-input v-model="form.count"></el-input>
-                </el-form-item>
+                    </el-form-item>
+                    <el-form-item prop="min_count" class="noMargin">
+                     <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="min_unit" class="noMargin">
+                     <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位">
+                      <el-option
+                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                      </el-option>
+                    </el-select>
+                    </el-form-item>
+                </div>
+
                 <el-form-item label="库存">
                     <el-input v-model="form.total" :disabled="true"></el-input>
                 </el-form-item>
@@ -572,6 +587,8 @@ export default {
                 expiry_date:"",
                 warehouse_info_id:"",
                 proof_count:"",
+                min_count:"",
+                min_unit:"",
             },
             total: 0,
             editdialogVisible:false,
@@ -1137,4 +1154,18 @@ export default {
     mounted() {
     },
 };
-</script>
+</script>
+<style lang="scss">
+    .addDrugsDialog {
+
+      .el-dialog__body {
+          padding-top: 0px;
+      }
+      .noMargin{
+        .el-form-item__content{
+          margin-left: 0 !important;
+        }
+      }
+
+    }
+</style>

src/xt_pages/stock/drugs/query.vue

@@ -178,7 +178,17 @@ import { min } from 'moment'
   export default {
     name: 'stockIn',
     created() {
-      
+      var start_time =  window.sessionStorage.getItem('start_time')
+      var end_time =  window.sessionStorage.getItem('end_time')
+      console.log("start_time",start_time,end_time)
+      if(start_time !=null){
+        this.start_time = start_time
+      }
+      if(end_time!=null){
+        this.end_time = end_time
+      }
+      window.sessionStorage.removeItem('start_time')
+      window.sessionStorage.removeItem('end_time')
       this.getlist()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
@@ -363,8 +373,8 @@ import { min } from 'moment'
       },
   
     startTimeChange: function(val) {
+      window.sessionStorage.removeItem('start_time')
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
-      
       if (time > 0) {
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
@@ -374,6 +384,7 @@ import { min } from 'moment'
       }
     },
     endTimeChange: function(val) {
+      window.sessionStorage.removeItem('end_time')
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");
@@ -462,6 +473,8 @@ import { min } from 'moment'
         this.getlist()
       },
       printOrder(){
+        window.sessionStorage.setItem('start_time',this.start_time)
+        window.sessionStorage.setItem('end_time',this.end_time)
         this.$router.push({
           name: "drugQueryPrint",
           query: {drug_type:this.drug_type,keyword:this.keywords,start_time:this.start_time,end_time:this.end_time,page:this.page,limit:this.limit}
@@ -497,6 +510,8 @@ import { min } from 'moment'
         }
         var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
         var overPlus = this.getOverFlushInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+        window.sessionStorage.setItem('start_time',this.start_time)
+        window.sessionStorage.setItem('end_time',this.end_time)
         this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+val.id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&overPlus="+overPlus})
       },
       handleBatch(val){
@@ -508,6 +523,8 @@ import { min } from 'moment'
         }
         var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
         var overPlus = this.getOverFlushInfo(val.drug_warehouse_info,val.max_unit,val.min_unit,val.min_number)
+        window.sessionStorage.setItem('start_time',this.start_time)
+        window.sessionStorage.setItem('end_time',this.end_time)
         this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+val.id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit+"&min_number="+val.min_number+"&max_unit="+val.max_unit+"&min_unit="+val.min_unit+"&overPlus="+overPlus})
       },
       getDrugCountList(){

src/xt_pages/stock/stockQuery.vue

@@ -520,6 +520,8 @@ export default {
        }
       specification_name = val.specification_name + "/" + val.packing_unit
       var overCount  = this.getOverplus(val.xt_warehouse_info)
+      window.sessionStorage.setItem('start_time',this.start_time)
+      window.sessionStorage.setItem('end_time',this.end_time)
       this.$router.push({path:"/stock/in/stockflow?id="+val.id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     toClickOne(val){
@@ -531,7 +533,9 @@ export default {
           }
        }
       specification_name = val.specification_name + "/" + val.packing_unit
-       var overCount  = this.getOverplus(val.xt_warehouse_info)
+      var overCount  = this.getOverplus(val.xt_warehouse_info)
+      window.sessionStorage.setItem('start_time',this.start_time)
+      window.sessionStorage.setItem('end_time',this.end_time)
       this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
     getStockDrugCount(){