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

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2036,7 +2036,7 @@
           if (minites < 10) {
             minites = '0' + minites
           }
-          if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4  ) {
+          if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4 || this.$store.getters.xt_user.org.id == 10013 || this.$store.getters.xt_user.org.id == 10014 ) {
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
           } else {
             if (schedual.schedule_type == 1) {

src/xt_pages/management/components/UserForm.vue

@@ -1670,6 +1670,8 @@ export default {
 
       this.$refs[formName].validate(valid => {
         if (valid) {
+          console.log("hhhh23233323",this.userform)
+       
           UpdateForm(this.userform).then(response => {
             if (response.data.state === 1) {
               var information = response.data.data.information;

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -170,7 +170,7 @@
                                                 <span v-if="hisPatientInfo.balance_accounts_type == 2">个人支付金额：<span
                                                         style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt}}元</span></span>
 
-                                                <span>个人账户金额：<span style="color:red;">{{ items.curPrescriptions.order.account_price?items.curPrescriptions.order.account_price:''}}元</span></span>
+                                                <span>个人账户金额：<span style="color:red;">{{ items.curPrescriptions.order.balc?items.curPrescriptions.order.balc:''}}元</span></span>
 
                                                 <span v-if="items.curPrescriptions.order_status  == 1">待结算</span>
                                                 <span v-if="items.curPrescriptions.order_status  == 2">已结算</span>

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -224,20 +224,19 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-     var start = window.sessionStorage.getItem('start_in_time')
-     console.log("start23323232322323",start)
-      var end =  window.sessionStorage.getItem('end_in_time')
-     if(start!= "null"){
-        console.log("hh232h23h32h3232322323")
-        this.start_time = start
-     }
      
+    var start_time =  window.sessionStorage.getItem('drug_start_in_time')
     
-     if(end != "null"){
-       
-        this.end_time = end
-     }
-   
+    var end_time =  window.sessionStorage.getItem('drug_end_in_time')
+    if(start_time !=null){
+      console.log("hh232323232红红火火")
+      this.start_time = start_time
+    }
+    if(end_time!=null){
+      this.end_time = end_time
+    }
+    window.sessionStorage.removeItem('drug_start_in_time')
+    window.sessionStorage.removeItem('drug_end_in_time')  
     this.GetConfigInfo()
     this.fetchAllAdminUsers()
     //获取入库单数据
@@ -333,6 +332,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
+        window.sessionStorage.setItem('drug_start_in_time',this.start_time)
         this.getlist()
         this.getDrugWarehouseInfoPrint()
       }
@@ -343,6 +343,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
+        window.sessionStorage.setItem('drug_end_in_time',this.end_time)
         this.getlist()
         this.getDrugWarehouseInfoPrint()
       }
@@ -460,8 +461,8 @@ export default {
       })
     },
     PrintAction(){
-      window.sessionStorage.setItem('start_in_time',this.start_time)
-      window.sessionStorage.setItem('end_in_time',this.end_time)
+      window.sessionStorage.setItem('drug_start_in_time',this.start_time)
+      window.sessionStorage.setItem('drug_end_in_time',this.end_time)
       this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     select(){

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -179,7 +179,7 @@
             {{scope.row.count}}
           </template>
         </el-table-column>
-        <el-table-column label="总价" align="center">
+        <el-table-column label="总价5555" align="center">
           <template slot-scope="scope">
             <!-- {{scope.row.price * scope.row.count}} -->
             {{scope.row.total_price}}
@@ -232,15 +232,15 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    var start = window.sessionStorage.getItem('start_out_time')
+    var start_time = window.sessionStorage.getItem('start_out_time')
     console.log("start",start)
-     var end =  window.sessionStorage.getItem('end_out_time')
-    if(start!="null"){
-       this.start_time = start   
+     var end_time =  window.sessionStorage.getItem('end_out_time')
+    if(start_time!=null){
+       this.start_time = start_time   
     }
-    if(end!="null"){
+    if(end_time!=null){
      
-      this.end_time = end
+      this.end_time = end_time
     }
     
     this.getDrugOutOrderPrint()
@@ -401,8 +401,8 @@ export default {
       }
     },
     PrintAction: function() {
-       window.sessionStorage.setItem('start_out_time',this.start_time)
-       window.sessionStorage.setItem('end_out_time',this.end_time)
+      //  window.sessionStorage.setItem('start_out_time',this.start_time)
+      //  window.sessionStorage.setItem('end_out_time',this.end_time)
        this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     getlist(){

src/xt_pages/stock/stockInOrderAdd.vue

@@ -86,10 +86,9 @@
               <span>批号</span>
             </template>
             <template slot-scope="scope">
-              <el-form-item style="padding-top: 20px">
+              <el-form-item style="padding-top: 20px" >
                 <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
               </el-form-item>
-
             </template>
           </el-table-column>
 
@@ -285,6 +284,9 @@
 
           good_id: [
             { validator: checkGoodId, trigger: 'blur' }
+          ],
+          number:[
+            { required: true, message: '批号不能为空', trigge: 'blur' }
           ]
 
         },

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -120,18 +120,20 @@
           
           <el-table-column  width="150" align="center">
              <template slot="header" slot-scope="scope">
-              <span>批号<span style="color: red"></span></span>
+              <span>批号<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-               <!-- <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input> -->
-                <el-select v-model="scope.row.number" filterable placeholder="请选择">
+              <el-form-item  
+                :rules="tableRules.number">
+                <el-select v-model="scope.row.number" filterable placeholder="请选择" @change="changeNumberList(scope.row)">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
-                    :value="item.number">
+                    :value="item.id">
                   </el-option>
                 </el-select>
+              </el-form-item>
             </template>
           </el-table-column>
 
@@ -324,7 +326,8 @@ export default {
       },
       tableRules: {
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
-        count: [{ required: true, message: "数量不能为空", trigge: "blur" }]
+        count: [{ required: true, message: "数量不能为空", trigge: "blur" }],
+        number:[{ required: true, message: "批号不能为空",trigge:"blur"}],
       },
       ruleForm: {
         manufacturer: [
@@ -456,10 +459,10 @@ export default {
       tempObj["good_unit"] = "";
       tempObj["number"] = ""
       tempObj["specification_name"] = ""
-      tempObj["number"] = ""
       tempObj["expiry_date"] = ""
       tempObj["product_date"] = ""
       tempObj["license_number"] = ""
+      tempObj["warehouse_info_id"] = 0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -587,6 +590,7 @@ export default {
            
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
           }
+          console.log("批次好",this.numberList)
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
@@ -598,12 +602,18 @@ export default {
                   this.recordInfo.recordData[i].dealer = this.dealerList[z].id
               }
             }
+          
+            for(let y=0;y<this.numberList.length;y++){
+               if(this.recordInfo.recordData[i].number == this.numberList[y].id){
+                   this.recordInfo.recordData[i].number = this.numberList[y].number
+               }
+            }
           }
           const params = {
             stockOut: this.recordInfo.recordData
           };
           console.log("2323223223",this.recordInfo.recordData);
-          
+     
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -619,7 +629,7 @@ export default {
                var msg = response.data.data.msg
                var good_name = response.data.data.good_name
                var specification_name = response.data.data.specification_name
-               var str = good_name +"*" + specification_name +"无库存,请入库"
+               var str = good_name +"*" + specification_name +"该批次无库存,请入库"
                console.log("msg222222222",msg)
                if(msg == 1){
                   this.$message.error(str)
@@ -711,9 +721,7 @@ export default {
          }
 
        
-      }
-
-       
+      }    
     },
 
     getStockBatchNumber(id){
@@ -731,6 +739,15 @@ export default {
     getDataConfig(module, filed_name) {
       return getDataConfig(module, filed_name)
     },
+    changeNumberList(val){
+       console.log("val232332323223232332",val)
+       for(let i=0;i<this.recordInfo.recordData.length;i++){
+         if(val.good_id == this.recordInfo.recordData[i].good_id){
+            this.recordInfo.recordData[i].warehouse_info_id = val.number
+         }
+       }  
+      console.log("表格",this.recordInfo.recordData)
+    }
   },
   created() {
     var nowDate = new Date();
@@ -752,9 +769,9 @@ export default {
     tempObj["good_unit"] = ""
     tempObj["number"] = ""
     tempObj["specification_name"] = ""
-    tempObj["number"] = ""
     tempObj["dealer"] = ""
     tempObj["license_number"] = ""
+    tempObj["warehouse_info_id"] = 0
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;