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

src/xt_pages/Pharmacy/drugCode.vue

@@ -119,6 +119,7 @@
 
 
     </el-table>
+    
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -1336,6 +1336,7 @@ export default {
        
           this.outList = drugoutlist
           this.drugOutInfo = drugoutlist
+
           if (is_sys == 1) {
             if (drugFlowList.length > 0) {
               for (let i = 0; i < drugFlowList.length; i++) {
@@ -1362,9 +1363,12 @@ export default {
             this.drugFlowList = drugFlowList;
           }
 
+
+
           if (is_sys == 0 || is_sys == 12 || is_sys == 5) {
             //出库详情
             var flowlist = response.data.data.flowlist;
+            console.log("flowList========================",flowlist)
             this.drugFlowList = [];
             for (let i = 0; i < flowlist.length; i++) {
                flowlist[i].childOne = []
@@ -1429,6 +1433,9 @@ export default {
          
           this.tableList = list;
         }
+
+
+
         if(is_sys == 12){
           
           for(let i=0;i<list.length;i++){
@@ -1449,14 +1456,20 @@ export default {
           this.tableList = list;
         }
 
+
+
         if(is_sys == 0){
           console.log("list999992332232323",list)
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
-              console.log("hhhahhawiiw",this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehouse_info_id))
-               list[i].childOne[j].over_count_total = this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehouse_info_id)
+              console.log("hhhahhawiiw",this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].warehousing_detail_id))
+               list[i].childOne[j].over_count_total = this.getOutCountOne(list[i].childOne[j].batch_number,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id,list[i].childOne[j].warehousing_detail_id)
+
             }
+            
           }
+          console.log("中国list=====================",list)
+
 
          for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
@@ -1468,7 +1481,7 @@ export default {
           this.tableList = list;
         }
          
-         console.log("tableLIST==================",this.tableList)
+         console.log("hhahhahwotableLIST==================",this.tableList)
 
         }
       });
@@ -2038,9 +2051,7 @@ export default {
       return max_str + min_str;
     },
     getOutCountOne(batch_number,max_unit,min_unit,min_number,drug_id,warehousing_detail_id){
-      
-      console.log("warehousing_detail_id",warehousing_detail_id)
-      console.log("tabList-----------------",this.tabList)
+     
       var arr = []
       var total = 0
       var max_str = ""
@@ -2145,7 +2156,7 @@ export default {
       }
       total = this.getOutCountFive(warehouse_info_id,max_unit,min_unit,min_number,drug_id)
     
-      console.log("taolaa------",total,drug_id)
+     
       if(arr.length > 0){
         for(let i=0;i<arr.length;i++){
            price = arr[0].price

src/xt_pages/user/courseOfDisease_new.vue

@@ -65,7 +65,9 @@
                 记录时间:
                 <el-date-picker v-model="record_date" prefix-icon="el-icon-date" :editable="false"
                               style="width: 250px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
+                              format="yyyy-MM-dd HH:mm:ss"
+                               value-format="yyyy-MM-dd HH:mm:ss"
+                              type="datetime" placeholder="选择日期时间" align="right" 
                               ></el-date-picker>
               </div>
               <div style="flex: 1;">
@@ -1368,7 +1370,13 @@
       },
       getCurrentChangeOne(val){
         this.$refs.editor.contents = val.content
-        this.record_date = this.getTimeThree(val.record_time)
+        this.record_date = ""
+        if(val.id > 0){
+          this.record_date = this.getTimeThree(val.record_time)
+        }else{
+          this.record_date  = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        }
+        console.log("record_date----------------",this.record_date)
         this.admin_user_id = val.recorder
         if(this.admin_user_id == 0){
            this.admin_user_id = ""
@@ -1493,20 +1501,13 @@
         var params = {
           id:this.id,
           patient_id:this.patient_id,
-          record_date:"",
+          record_date:this.record_date,
           content:this.new_content,
           admin_user_id:this.admin_user_id,
         }
-        if(this.id == 0){
-          params.record_date = this.getTimeThree(this.record_date)
-        }
-        if(this.id > 0){
-          params.record_date = this.record_date
-        }
+       
         console.log("params",params)
 
-      
-
         createNewCourseOfDiseaseRecord(params).then(response => {
          if(response.data.state == 1){
            var msg = response.data.data.msg