8月15日

src/xt_pages/data/components/dialysisAfter.vue

@@ -48,6 +48,16 @@
               @click="handleHide(scope.$index, scope.row)"
             >
             </el-button>
+
+            <el-button
+              v-if="scope.row.is_show == 2"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
+            
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
               size="small"
@@ -57,14 +67,7 @@
             >
             </el-button>
 
-             <el-button
-              v-if="scope.row.is_show == 2"
-              size="small"
-              type="primary"
-              icon="el-icon-view"
-              @click="handleShow(scope.$index, scope.row)"
-            >
-            </el-button>
+           
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
               size="small"

src/xt_pages/data/components/dialysisBefore.vue

@@ -47,14 +47,6 @@
               icon="el-icon-remove-outline"
               @click="handleHide(scope.$index, scope.row)"
             >
-            </el-button>
-            <el-button
-              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
-              size="small"
-              type="danger"
-              icon="el-icon-remove-outline"
-              @click="handleHideOne(scope.$index, scope.row)"
-            >
             </el-button>
 
              <el-button
@@ -65,6 +57,16 @@
               @click="handleShow(scope.$index, scope.row)"
             >
             </el-button>
+
+            <el-button
+              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHideOne(scope.$index, scope.row)"
+            >
+            </el-button>
+
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
               size="small"

src/xt_pages/data/components/dialysisComputer.vue

@@ -50,6 +50,14 @@
               @click="handleHide(scope.$index, scope.row)"
             >
             </el-button>
+            <el-button
+              v-if="scope.row.is_show == 2"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
               size="small"
@@ -59,14 +67,7 @@
             >
             </el-button>
 
-             <el-button
-              v-if="scope.row.is_show == 2"
-              size="small"
-              type="primary"
-              icon="el-icon-view"
-              @click="handleShow(scope.$index, scope.row)"
-            >
-            </el-button>
+            
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
               size="small"

src/xt_pages/data/components/dialysisMonitor.vue

@@ -48,6 +48,16 @@
               @click="handleHide(scope.$index, scope.row)"
             >
             </el-button>
+
+           <el-button
+              v-if="scope.row.is_show == 2"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
+            
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
               size="small"
@@ -57,14 +67,7 @@
             >
             </el-button>
 
-             <el-button
-              v-if="scope.row.is_show == 2"
-              size="small"
-              type="primary"
-              icon="el-icon-view"
-              @click="handleShow(scope.$index, scope.row)"
-            >
-            </el-button>
+            
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
               size="small"

src/xt_pages/data/components/dialysisOff.vue

@@ -47,6 +47,16 @@
               @click="handleHide(scope.$index, scope.row)"
             >
             </el-button>
+          
+            <el-button
+              v-if="scope.row.is_show == 2"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
+
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
               size="small"
@@ -56,14 +66,7 @@
             >
             </el-button>
 
-             <el-button
-              v-if="scope.row.is_show == 2"
-              size="small"
-              type="primary"
-              icon="el-icon-view"
-              @click="handleShow(scope.$index, scope.row)"
-            >
-            </el-button>
+           
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
               size="small"

src/xt_pages/data/components/dialysisPrescription.vue

@@ -48,14 +48,7 @@
               @click="handleHide(scope.$index, scope.row)"
             >
             </el-button>
-            <el-button
-              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
-              size="small"
-              type="danger"
-              icon="el-icon-remove-outline"
-              @click="handleHideOne(scope.$index, scope.row)"
-            >
-            </el-button>
+           
 
              <el-button
               v-if="scope.row.is_show == 2"
@@ -65,6 +58,16 @@
               @click="handleShow(scope.$index, scope.row)"
             >
             </el-button>
+
+           <el-button
+              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHideOne(scope.$index, scope.row)"
+            >
+            </el-button>
+
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
               size="small"
@@ -103,7 +106,8 @@ export default {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
-                is_show: response.data.data.is_show
+                is_show: response.data.data.is_show,
+                is_write:response.data.data.is_write,
               };
               store.dispatch("updateFiledConfigList", params).then(() => {});
               this.$emit("change", params);
@@ -127,7 +131,8 @@ export default {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
-                is_show: response.data.data.is_show
+                is_show: response.data.data.is_show,
+                is_write:response.data.data.is_write,
               };
               store.dispatch("updateFiledConfigList", params).then(() => {});
               this.$emit("change", params);

src/xt_pages/data/components/dialysisSummary.vue

@@ -48,6 +48,15 @@
               @click="handleHide(scope.$index, scope.row)"
             >
             </el-button>
+          
+            <el-button
+              v-if="scope.row.is_show == 2"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
               size="small"
@@ -57,14 +66,7 @@
             >
             </el-button>
 
-             <el-button
-              v-if="scope.row.is_show == 2"
-              size="small"
-              type="primary"
-              icon="el-icon-view"
-              @click="handleShow(scope.$index, scope.row)"
-            >
-            </el-button>
+            
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
               size="small"
@@ -127,7 +129,7 @@ export default {
             if (response.data.state == 1) {
               let params = {
                 id: response.data.data.id,
-                is_show: response.data.data.is_show
+                is_show: response.data.data.is_show,
               };
               store.dispatch("updateFiledConfigList", params).then(() => {});
               this.$emit("change", params);
@@ -169,6 +171,7 @@ export default {
     },
   
     handleShowOne: function(index, row) {
+      console.log("row233223322332332wo",row)
       this.$confirm("是否将该字段设为必填?", "提示", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",

src/xt_pages/data/components/doubleCheck.vue

@@ -48,6 +48,16 @@
               @click="handleHide(scope.$index, scope.row)"
             >
             </el-button>
+
+           <el-button
+              v-if="scope.row.is_show == 2"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
+
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
               size="small"
@@ -57,14 +67,6 @@
             >
             </el-button>
 
-             <el-button
-              v-if="scope.row.is_show == 2"
-              size="small"
-              type="primary"
-              icon="el-icon-view"
-              @click="handleShow(scope.$index, scope.row)"
-            >
-            </el-button>
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
               size="small"

src/xt_pages/data/components/receiveTreatmentAsses.vue

@@ -48,6 +48,16 @@
               @click="handleHide(scope.$index, scope.row)"
             >
             </el-button>
+
+           <el-button
+              v-if="scope.row.is_show == 2"
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
+          
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
               size="small"
@@ -57,14 +67,7 @@
             >
             </el-button>
 
-             <el-button
-              v-if="scope.row.is_show == 2"
-              size="small"
-              type="primary"
-              icon="el-icon-view"
-              @click="handleShow(scope.$index, scope.row)"
-            >
-            </el-button>
+            
             <el-button
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
               size="small"

src/xt_pages/data/showConfig.vue

@@ -123,6 +123,7 @@ export default {
         if (this.dialysis_prescription_data[i].id == object.id) {
           this.dialysis_prescription_data[i].is_show = object.is_show;
            if(object.is_write!=undefined){
+            console.log("obj3323322332",object.is_write)
            this.dialysis_prescription_data[i].is_write = object.is_write
           }
         }

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

@@ -106,7 +106,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -737,7 +737,7 @@ export default {
                         parent_id:0,
                         groupno:0,
                         sort:item.device_number.sort,
-                        assess_time:item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+                        assess_time:item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
                       }
                       item.doctor_advice.push(obj)
                     })
@@ -762,7 +762,7 @@ export default {
            if(this.is_sort == 1){
               schedules.map(item => {
                   item.is_sort = item.device_number.sort
-                  item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+                  item.assess_time = item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
               })
               
                newList = schedules.sort(this.compare('is_sort'))
@@ -799,7 +799,6 @@ export default {
                     it.number = item.device_number.number
                     it.zone_name = item.device_number.zone.name
                     it.sort = item.device_number.sort,
-                   
                     arr.push(it)
                 })
                 item.is_sort = item.device_number.sort
@@ -868,7 +867,7 @@ export default {
            if(this.is_sort == 1){
               schedules.map(item => {
                   item.is_sort = item.device_number.sort
-                  item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+                  item.assess_time = item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
               })
               
                newList = schedules.sort(this.compare('is_sort'))
@@ -879,7 +878,7 @@ export default {
             if(this.is_sort == 2){
               schedules.map(item => {
                   item.is_sort = item.device_number.sort
-                  item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+                  item.assess_time = item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
               })
                newList = schedules.sort(this.compare('assess_time'))
             }
@@ -898,11 +897,11 @@ export default {
                     it.number = item.device_number.number
                     it.zone_name = item.device_number.zone.name
                     it.sort = item.device_number.sort,
-                   
                     arr.push(it)
                 })
               item.is_sort = item.device_number.sort
-              it.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+              
+              item.assess_time = item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
             })
             if(this.schedulType == 0){
                 newSchedules = arr

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -498,6 +498,7 @@
        getDrugFlow(params).then(response=>{
           if(response.data.state ==1){
             var list = response.data.data.list
+
             console.log("list2o2o33o23233o3oowo",list)
             this.tableList = list
             var total = response.data.data.total

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -293,7 +293,7 @@
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end:none;text-align: center">
                     <span v-if="is_sys==1 || is_sys == 5">{{getOutCountSix(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
-                    <!-- <span v-if="is_sys == 1"> {{getOutCount(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> -->
+                    <span v-if="is_sys == 12">{{getOutCountSeven(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
                     <span v-if="is_sys == 0"> {{getOutCountOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                   </td>
                </tr>
@@ -303,7 +303,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end:none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5">{{getBatchNumber(item.warehousing_detail_id)}}</span> 
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getBatchNumber(item.warehousing_detail_id)}}</span> 
                     <span v-if="is_sys == 0">{{getBatchNumberOne(item.batch_number)}}</span>
                   </td>
                </tr>
@@ -322,7 +322,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5">{{getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">
                          {{getPriceTwo(item.warehouse_out_id,item.drug_id)}}
@@ -341,7 +341,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
                       <span v-if="scope.row.child.length > 1">{{item.count * item.price}}</span> 
@@ -355,7 +355,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5"> {{getAllManufacturerName(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys == 1 || is_sys == 5  || is_sys == 12"> {{getAllManufacturerName(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
                     <span v-if="is_sys == 0"> {{getManufacturerName(scope.row.manufacturer)}}</span>
                   </td>
                </tr>
@@ -365,7 +365,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5"> {{getProductDate(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12"> {{getProductDate(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
                     <span v-if="is_sys == 0"> {{getTime(scope.row.product_date)}}</span>
                   </td>
                </tr>
@@ -375,7 +375,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                   <span v-if="is_sys == 1 || is_sys == 5"> {{getExpiryDate(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                   <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12"> {{getExpiryDate(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
                    <span v-if="is_sys == 0"> {{getTime(scope.row.expiry_date)}}</span>
                   </td>
                </tr>
@@ -385,7 +385,7 @@
             <template slot-scope="scope">
                 <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys ==1 || is_sys ==5">{{getDealer(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys ==1 || is_sys ==5 || is_sys ==12">{{getDealer(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
                     <span v-if="is_sys ==0">{{getDealerName(scope.row.dealer)}}</span>  
                   </td>
                </tr>
@@ -395,7 +395,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5">{{getNumber(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+                    <span v-if="is_sys == 1 || is_sys == 5  || is_sys == 12">{{getNumber(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
                     <span v-if="is_sys == 0">{{scope.row.number}}</span> 
                   </td>
                </tr>
@@ -405,7 +405,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5">{{getRemark(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getRemark(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
                     <span v-if="is_sys == 0">{{scope.row.remark}}</span>
                   </td>
                </tr>
@@ -1277,14 +1277,14 @@ export default {
               list[i].number = "";
             }
             list[i].child = []
-            if(list[i].is_sys == 1){
+            if(list[i].is_sys == 1 ){
               for(let j=0;j<drugListOne.length;j++){
                 if(list[i].drug_id == drugListOne[j].drug_id){
                   list[i].child.push(drugListOne[j])
                 }
              }
             }
-            if(list[i].is_sys == 0){
+            if(list[i].is_sys == 0 || list[i].is_sys == 5  || list[i].is_sys == 12){
               for(let j=0;j<drugListTwo.length;j++){
                 if(list[i].drug_id == drugListTwo[j].drug_id){
                   list[i].child.push(drugListTwo[j])
@@ -1656,12 +1656,14 @@ export default {
       var total = 0
       var max_str = ""
       var min_str = ""
+      console.log("outlist",this.outList)
+      console.log("warehouse_info_id",warehouse_info_id)
       for(let j=0;j<this.outList.length;j++){
         if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
            arr.push(this.outList[j])
         }
       }
-      
+       console.log("arr23322332",arr)
       if(arr.length > 0){
         for(let i=0;i<arr.length;i++){
            total +=arr[i].count
@@ -1685,6 +1687,46 @@ export default {
       }
       return max_str + min_str;
     },
+     getOutCountSeven(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
+      var arr = []
+      var total = 0
+      var max_str = ""
+      var min_str = ""
+      console.log("outlist",this.outList)
+      console.log("warehouse_info_id",warehouse_info_id)
+      for(let j=0;j<this.outList.length;j++){
+        if(this.outList[i].count_unit == max_unit){
+           this.outList[i].count = this.outList[i].count * min_number
+        }
+        if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
+           arr.push(this.outList[j])
+        }
+      }
+       console.log("arr23322332",arr)
+      if(arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+
+           total +=arr[i].count
+        }
+      }
+     
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+    },
     getOutCount(warehouse_info_id,max_unit,min_unit,min_number){
       var arr = []
       var total = 0

src/xt_pages/stock/stockFlow.vue

@@ -70,6 +70,7 @@
              <span v-if="scope.row.consumable_type == 11">盘亏</span>
              <span v-if="scope.row.consumable_type == 12">调拨出库</span>
              <span v-if="scope.row.consumable_type == 13">调拨入库</span>
+             <span v-if="scope.row.consumable_type == 15">结算出库</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
@@ -82,6 +83,7 @@
             <span v-if="scope.row.consumable_type == 11">{{scope.row.warehouse_out_order_number}}</span>
             <span v-if="scope.row.consumable_type == 12">{{scope.row.warehouse_out_order_number}}</span>
             <span v-if="scope.row.consumable_type == 13">{{scope.row.warehousing_order}}</span>
+            <span v-if="scope.row.consumable_type == 15">{{scope.row.warehouse_out_order_number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -223,6 +225,7 @@
           {id:11,name:"盘亏"},
           {id:12,name:"调拨出库"},
           {id:13,name:"调拨入库"},
+          {id:15,name:"结算出库"},
         ],
         countList:[],
         outCountList:[],

src/xt_pages/stock/stockOutOrder.vue

@@ -602,8 +602,12 @@
               <template slot="header" slot-scope="scope">
                 <span>使用人</span>
               </template>
-              <template slot-scope="scope"> 系统 </template>
+              <template slot-scope="scope"> 
+                <span v-if="scope.row.is_sys == 0">系统 </span> 
+                <span v-if="scope.row.is_sys == 5"> {{getRow(scope.row)}} </span> 
+              </template>
             </el-table-column>
+
             <el-table-column min-width="35" align="center">
               <template slot="header" slot-scope="scope">
                 <span>使用数量</span>
@@ -1968,6 +1972,7 @@ export default {
           for (let i = 0; i <arrTwo.length; i++) {
             var obj = arrTwo[i];
             obj["is_total"] = 0;
+            
             this.userList.push(obj);
             if(arrTwo[i].is_sys == 1){
               total = total + arrTwo[i].count - arrTwo[i].cancel_count;
@@ -1976,6 +1981,8 @@ export default {
             }
             
           }
+
+
          
           this.userList.push({
             is_total: 1,
@@ -1987,7 +1994,9 @@ export default {
           if (val.is_sys == 0 || val.is_sys == 5) {
             this.editdialogVisibleTwo = true;
           }
-          }
+
+           console.log("我的世界332323223我",this.userList)
+         }
 
    
         }
@@ -2361,6 +2370,19 @@ export default {
      }
      
      
+    },
+    getRow(row){
+      console.log("row233323232",row)
+      var name = ""
+      if(this.stockFlowList!=null && this.stockFlowList.length > 0){
+        for(let i=0;i<this.stockFlowList.length;i++){
+          if(row.patient_id == this.stockFlowList[i].patient_id){
+              name = this.stockFlowList[i].name
+          }
+        }
+      }
+     
+      return name
     }
   },
 };