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_stock.js

@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type, storehouse_id) {
+export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type, storehouse_id, warehousing_id) {
   return request({
-    url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
+    url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id + '&warehousing_id=' + warehousing_id,
     method: 'post',
     data: params
   })
@@ -72,9 +72,9 @@ export function getDrugWarehouseOutInfoList(params) {
   })
 }
 
-export function postDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id) {
+export function postDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id, warehouse_out_id) {
   return request({
-    url: '/api/drugwarehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
+    url: '/api/drugwarehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id + '&warehouse_out_id=' + warehouse_out_id,
     method: 'post',
     data: params
   })
@@ -321,9 +321,9 @@ export function deleteDrugCancelStockInfo(params) {
   })
 }
 
-export function postDrugCancelStock(params, cancelStockTime, manufacturer_id, dealer_id, type, storehouse_id) {
+export function postDrugCancelStock(params, cancelStockTime, manufacturer_id, dealer_id, type, storehouse_id, cancelstock_id) {
   return request({
-    url: '/api/drugcancelstock/create?time=' + cancelStockTime + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
+    url: '/api/drugcancelstock/create?time=' + cancelStockTime + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id + '&cancelstock_id=' + cancelstock_id,
     method: 'post',
     data: params
   })
@@ -582,9 +582,57 @@ export function getDrugOutOrderPrint(params) {
   })
 }
 
-export function GetAllConfigOne() {
+export function GetAllConfigOne(params) {
   return request({
     url: '/api/drugstock/config/list',
-    method: 'get'
+    method: 'get',
+    params: params
+  })
+}
+
+export function toCheckWarehousingInfo(params) {
+  return request({
+    url: '/api/drug/checkwarehouseinginfo',
+    method: 'get',
+    params: params
+  })
+}
+
+export function toReturnCheckWarehousing(params) {
+  return request({
+    url: '/api/drug/returncheckwarehouseinginfo',
+    method: 'Get',
+    params: params
+  })
+}
+export function toCheckDrugOut(params) {
+  return request({
+    url: '/api/drug/tocheckdrugout',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function toReturnCheck(params) {
+  return request({
+    url: '/api/drug/toreturncheck',
+    method: 'get',
+    params: params
+  })
+}
+
+export function checkCancelDrugStock(params) {
+  return request({
+    url: '/api/drug/checkcanceldrugstock',
+    method: 'get',
+    params: params
+  })
+}
+
+export function returnDrugCancelStock(params) {
+  return request({
+    url: '/api/drug/returndrugcancelstock',
+    method: 'Get',
+    params: params
   })
 }

src/api/stock.js

@@ -201,11 +201,11 @@ export function GetAllGoodInfo(params) {
   })
 }
 
-export function postWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type, storehouse_id) {
+export function postWarehouse(data, warehousing_time, type, storehouse_id, warehousing_info_id) {
   return request({
-    url: '/api/warehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
+    url: '/api/warehouse/create?warehousing_time=' + warehousing_time + '&type=' + type + '&storehouse_id=' + storehouse_id + '&warehousing_info_id=' + warehousing_info_id,
     method: 'post',
-    data: params
+    data: data
   })
 }
 
@@ -490,9 +490,9 @@ export function getCancelStockList(params) {
   })
 }
 
-export function editCancelStockInfo(params, cancel_stock_time, id, type, manufacturer_id, dealer_id) {
+export function editCancelStockInfo(params, cancel_stock_time, id, type, manufacturer_id, dealer_id, storehouse_id) {
   return request({
-    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
+    url: '/api/cancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -522,9 +522,9 @@ export function deleteCancelStockInfo(params) {
   })
 }
 
-export function postCancelStock(params, cancelStockTime, manufacturer_id, dealer_id, type, storehouse_id) {
+export function postCancelStock(params, cancelStockTime, manufacturer_id, dealer_id, type, storehouse_id, cancel_stock_id) {
   return request({
-    url: '/api/cancelstock/create?time=' + cancelStockTime + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
+    url: '/api/cancelstock/create?time=' + cancelStockTime + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id + '&cancel_stock_id=' + cancel_stock_id,
     method: 'post',
     data: params
   })
@@ -578,7 +578,6 @@ export function GetOutStockTotalCount(params) {
 }
 
 export function postGoodInformation(params) {
-  console.log('PARMAS22', params)
   return request({
     url: '/api/good/postgoodinformation',
     method: 'Post',
@@ -1009,3 +1008,59 @@ export function getmanufacturername(params) {
     params: params
   })
 }
+
+export function checkWarehouseOut(params) {
+  return request({
+    url: '/api/stock/checkwarehouseout',
+    method: 'get',
+    params: params
+  })
+}
+
+export function returnCheckWarehouseOut(params) {
+  return request({
+    url: '/api/stock/returncheckwarehouseout',
+    method: 'get',
+    params: params
+  })
+}
+
+export function toCheckWarehouseInfo(params) {
+  return request({
+    url: '/api/stock/tocheckwarehouseinfo',
+    method: 'get',
+    params: params
+  })
+}
+
+export function toReturnCheckWarehouseInfo(params) {
+  return request({
+    url: '/api/stock/returncheckwarehouseinfo',
+    method: 'get',
+    params: params
+  })
+}
+
+export function checkStockWarehouseInfo(params) {
+  return request({
+    url: '/api/stock/checkstockwarehouseinfo',
+    method: 'get',
+    params: params
+  })
+}
+
+export function checkRturnStockWarehouseInfo(params) {
+  return request({
+    url: '/api/stock/checkreturnstockwarehouseinfo',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getPrintList(params) {
+  return request({
+    url: '/api/stock/getprintlist',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/patient.js

@@ -226,17 +226,17 @@ export default {
       noCache: true
     }
   },
-  {
-    path: '/patient/patient/templateSummary/print_1',
-    component: () => import('@/xt_pages/user/templateSummaryPrint_1'),
-    hidden: true,
-    is_menu: false,
-    name: 'templateSummary_1',
-    meta: {
-      title: 'templateSummary_1',
-      noCache: true
-    }
-  },
+  // {
+  //   path: '/patient/patient/templateSummary/print_1',
+  //   component: () => import('@/xt_pages/user/templateSummaryPrint_1'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'templateSummary_1',
+  //   meta: {
+  //     title: 'templateSummary_1',
+  //     noCache: true
+  //   }
+  // },
   {
     path: '/patient/patient/hospitalSummary/print',
     component: () => import('@/xt_pages/user/hospitalSummaryPrint'),
@@ -247,7 +247,7 @@ export default {
       title: 'templateSummary',
       noCache: true
     }
-  },
+  }
 
   ]
 }

src/xt_pages/data/basicConfig.vue

@@ -39,9 +39,9 @@
             <p style="margin-top:20px;">耗材先出库再执行：
                 <el-switch v-model="is_open_is_type" @change="changeFuncType"></el-switch>
             </p>
-            <!-- <p style="margin-top:20px;">药品在保存处方时出库：
+            <p style="margin-top:20px;">药品在保存处方时出库：
                 <el-switch v-model="drug_out_open" @change="changeDrugOpen"></el-switch>
-            </p> -->
+            </p>
         </div>
 
 

src/xt_pages/data/components/consumables.vue

@@ -1451,9 +1451,7 @@
        let params = {
           'goods':tableData
         };
-
-
-
+        console.log("param2332323223",params)
         postGoodInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;

src/xt_pages/data/components/drugs.vue

@@ -118,6 +118,11 @@
           <div>{{scope.row.medical_insurance_number}}</div>
         </template>
       </el-table-column>
+      <el-table-column prop="date" label="批准文号" width="100" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.number}}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="date" label="药品本位码" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.code}}</div>
@@ -1109,9 +1114,17 @@
 
 
           if (results[i]['*拆零零售价'] === undefined) {
-                obj['retail_price'] = ''
+                obj['min_price'] = ''
               } else {
            if (key == '*拆零零售价') {
+               obj['min_price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['*包装零售价'] === undefined) {
+                obj['retail_price'] = ''
+              } else {
+           if (key == '*包装零售价') {
                obj['retail_price'] = results[i][key].replace(/\s/g,"")
               }
            }
@@ -1430,7 +1443,7 @@
         }
        }
        for(let i=0;i<tableData.length;i++){
-          tableData[i].dose = parseInt(tableData[i].dose)
+          tableData[i].dose = tableData[i].dose.toString()
        }
        let params = {
           'drugs':tableData

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -90,7 +90,7 @@
           >
         </div>
       </template>
-      <template v-if="this.template_id == 6 || this.template_id == 48">
+      <template v-if="this.template_id == 6 || this.template_id == 48 || this.template_id == 0">
         <el-button
           size="small"
           icon="el-icon-printer"

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -714,6 +714,9 @@ export default {
         case 2:
           return 'ml'
           break
+        case 3:
+          return 'kg'
+          break
       }
     },
     getSealingFluidDisposeName: function(id) {

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

@@ -377,7 +377,7 @@
                 :value="item.id"
                 :key="item.id"
               ></el-option>
-            </el-select>
+            </el-select> 
           </el-form-item>
         </el-col>
 
@@ -690,7 +690,7 @@ export default {
       symptomsOptions: [],
       internalFistulaOptions: [],
       vascularAccessOptions: [],
-      unit: [{ id: 1, name: 'g' }, { id: 2, name: 'ml' }],
+      unit: [{ id: 1, name: 'g' }, { id: 2, name: 'ml' },{ id: 3, name: 'kg' }],
       actualTreatmentHourShow: '',
       vascularAccessDescOptions: [],
       catheterOptions: [],

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

@@ -223,9 +223,10 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
-        @selection-change="handleSelectionChange"
+        
       >
-        <el-table-column type="selection"  width="55"></el-table-column>
+      <!-- @selection-change="handleSelectionChange" -->
+        <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
@@ -300,15 +301,13 @@
               {{getXuserName(scope.row.checker)}}
             </span>
 
+
           </template>
         </el-table-column>
       </el-table>
 
 
 
-
-
-
       <el-table
         v-if="his_is_open  == 1 || is_advice_open == 1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
@@ -322,15 +321,15 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
-        @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection"  width="55"></el-table-column>
+        <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
           </template>
         </el-table-column>
 
+
         <!--===================================-->
 <!--        <el-table-column prop="date" label="调试" align="center" min-width="26px">-->
 <!--          <template slot-scope="scope">-->
@@ -388,10 +387,10 @@
         </el-table-column>
         <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
           <template slot-scope="scope">
-            <span v-if="scope.row.parent_id == 0">
+            <span>
               {{getXuserName(scope.row.execution_staff)}}
             </span>
-            <span v-else>{{getXuserName(scope.row.execution_staff)}}</span>
+            <!-- <span v-else>{{getXuserName(scope.row.execution_staff)}}</span> -->
           </template>
         </el-table-column>
         <el-table-column

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

@@ -200,7 +200,7 @@
                     </el-col>
 
                     <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
                             <el-form-item
                                     v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987'
@@ -261,16 +261,16 @@
 
                     <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987  && this.$store.getters.xt_user.template_info.org_id != 54">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
                             </el-form-item>
                             <el-form-item :label="'维持(mg/h) : '"
-                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987  ">
+                                          v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 54  ">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -313,9 +313,9 @@
 
                     <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -323,7 +323,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54'
                                     :label="'总量(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -413,7 +413,9 @@
                     <el-col
                             :span="8"
                             v-if="isShows('钙剂量')"
-                    >
+                    ></el-col>
+                    
+                    <el-col :span="8" v-if="isShows('钙剂量')" >
                         <el-form-item label="钙剂量(ml) : ">
                             <el-input
                                     type="number"
@@ -1422,7 +1424,7 @@
               this.irrigations[i].name = this.irrigations[i].specification_name
             }
             this.InnerDialogProps.values = this.irrigations
-            this.InnerDialogProps.titles = '透析器'
+            this.InnerDialogProps.titles = '灌流器'
             this.InnerDialogProps.type = 'irrigations'
             this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_irrigation
             this.InnerDialogProps.isShowTextArea = false

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

@@ -232,6 +232,7 @@
                 template_id == 48 ||
                 template_id == 51 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -285,6 +286,7 @@
               template_id != 48 &&
               template_id != 51 &&
               template_id != 53 &&
+              template_id != 54 &&
               org_id!= 10210 &&
               org_id != 9555
             "
@@ -331,6 +333,7 @@
                 template_id == 46 ||
                 template_id == 48 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 47)
             "
           >
@@ -374,6 +377,7 @@
               template_id != 44 &&
               template_id != 46 &&
               template_id != 53 &&
+              template_id != 54 &&
               template_id != 48 &&
               template_id != 47
             "
@@ -431,6 +435,7 @@
                 template_id == 29 ||
                 template_id == 48 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 47)
             "
           >
@@ -454,6 +459,7 @@
               template_id != 29 &&
               template_id != 48 &&
               template_id != 53 &&
+              template_id != 54 &&
               template_id != 47
             "
           >
@@ -494,6 +500,7 @@
                 template_id == 26 ||
                 template_id == 29 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 48)
             "
           >
@@ -521,6 +528,7 @@
               template_id != 29 &&
               template_id != 43 &&
               template_id != 53 &&
+              template_id != 54 &&
               template_id != 48
             "
           >
@@ -686,18 +694,31 @@
             </template>
           </el-table-column>
 
-          <el-table-column
-            prop="heparin"
+         <el-table-column
+            prop="displacement_flow_quantity"
             align="center"
             label="累计血容量(ml)"
-            width="140"
-            v-if="isShow('累计血容量')"
+            width="100"
+            v-if="isShow('累计血容量') && template_id != 41"
+          >
+             <template slot-scope="scope">
+              {{ scope.row.accumulated_blood_volume }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="displacement_flow_quantity"
+            align="center"
+            label="累计血容量(L)"
+            width="100"
+            v-if="isShow('累计血容量') && template_id == 41"
           >
             <template slot-scope="scope">
               {{ scope.row.accumulated_blood_volume }}
             </template>
           </el-table-column>
 
+
+
           <el-table-column
             prop="heparin"
             align="center"
@@ -995,6 +1016,7 @@
                 template_id == 46 ||
                 template_id == 48 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 47)
             "
           >
@@ -1032,6 +1054,7 @@
               template_id != 46 &&
               template_id != 48 &&
               template_id != 53 &&
+              template_id != 54 &&
               template_id != 47
             "
           >
@@ -1076,6 +1099,7 @@
                 template_id == 48 ||
                 template_id == 51 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -1121,6 +1145,7 @@
               template_id != 51 &&
               template_id == 48 &&
               template_id == 53 &&
+              template_id == 54 &&
               org_id !=  10210 &&
               org_id != 9555
             "
@@ -1156,6 +1181,7 @@
               template_id != 46 &&
               template_id != 47 &&
               template_id != 48 &&
+              template_id != 54 &&
               template_id != 53
             "
           >
@@ -1176,6 +1202,7 @@
                 template_id == 46 ||
                 template_id == 47 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 48)
             "
           >
@@ -1201,6 +1228,7 @@
               template_id != 43 &&
               template_id != 46 &&
               template_id != 53 &&
+              template_id != 54 &&
               template_id != 48
             "
           >
@@ -1223,6 +1251,7 @@
                 template_id == 29 ||
                 template_id == 46 ||
                 template_id == 53 ||
+                template_id == 54 ||
                 template_id == 48)
             "
           >
@@ -1339,7 +1368,13 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('累计血容量')">
+          <el-col :span="8" v-if="isShow('累计血容量') && template_id == 41">
+            <el-form-item label="累计血容量(L)：">
+              <el-input v-model="form.accumulated_blood_volume"></el-input>
+            </el-form-item>
+          </el-col>
+         
+          <el-col :span="8" v-if="isShow('累计血容量') && template_id  != 41">
             <el-form-item label="累计血容量(ml)：">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,17 +14,17 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53)" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47 || template_id == 48 || template_id == 53) " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47 && template_id != 48 && template_id != 53" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47 || template_id == 48 || template_id == 53  || template_id == 54) " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47 && template_id != 48 && template_id != 53 && template_id != 54" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53)" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>
@@ -32,7 +32,10 @@
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
-          <th v-if="isShow('累计血容量')" width="92px">累计血容量(ml)</th>
+          <th v-if="isShow('累计血容量')" width="92px">累计血容量 
+            <span v-if="template_id !=41">(ml)</span>
+            <span v-if="template_id == 41">(L)</span>
+          </th>
           <th v-if="isShow('血容量')" width="92px">血容量(L)</th>
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -878,19 +878,17 @@
                   setAdminUserES(
                     prescription == null
                       ? 0
-                      : prescription.prescription_doctor
-                      ? prescription.prescription_doctor
+                      : prescription.creater
+                      ? prescription.creater
                       : ''
                   ) == ''
                 "
               >
                 {{
                   getAdminUser(
-                    prescription == null
-                      ? 0
-                      : prescription.prescription_doctor
-                      ? prescription.prescription_doctor
-                      : ""
+                    prescription == null? 0: prescription.creater ? prescription.prescription_doctor: ""
+                     
+                     
                   )
                 }}
               </span>
@@ -900,11 +898,11 @@
                   setAdminUserES(
                     prescription == null
                       ? 0
-                      : prescription.prescription_doctor
-                      ? prescription.prescription_doctor
+                      : prescription.creater
+                      ? prescription.creater
                       : ''
-                  )
-                "
+                  ) "
+               
                 alt=""
                 srcset=""
                 v-else

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -156,7 +156,18 @@
                 ></label-box>
 
                 <div style="display: flex; padding-left: 20px">
-                  其他
+                  <label-box
+                  :isChecked="
+                    predialysis.is_hemorrhage == 1 &&
+                    predialysis.hemorrhage.indexOf('女性经期') == -1&&
+                    predialysis.hemorrhage.indexOf('消化道出血') == -1&&
+                    predialysis.hemorrhage.indexOf('牙龈出血') == -1&&
+                    predialysis.hemorrhage.indexOf('穿刺点渗血') == -1
+                      ? true
+                      : false
+                      "
+                  showValue="其他"
+                ></label-box>
                   <div
                     style="
                       min-width: 200px;
@@ -498,7 +509,7 @@
                           ) == -1
                         "
                       >
-                        {{ predialysis.blood_access_part_opera_name }}
+                        {{ predialysis.blood_access_part_opera_name }} 
                       </span>
                     </span>
                   </span>
@@ -858,7 +869,7 @@
               {{
                 monitor.blood_oxygen_saturation
                   ? monitor.blood_oxygen_saturation
-                  : "0"
+                  : ""
               }}
             </span>
           </td>
@@ -921,26 +932,29 @@
               <span v-if="advice.parent_id == 0">{{
                 advice.execution_frequency
               }}</span>
+              <span>{{
+                advice.remark
+              }}</span>
             </td>
 
-            <td>
+            <td style="line-height: 30px;">
               <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                 getAdminUser(advice.execution_staff)
               }}</span>
               <img
-                style="height: 40px"
+                style="height: 30px"
                 :src="setAdminUserES(advice.execution_staff)"
                 alt=""
                 srcset=""
                 v-else
               />
             </td>
-            <td>
+            <td style="line-height: 30px;">
               <span v-if="setAdminUserES(advice.checker) == ''">{{
                 getAdminUser(advice.checker)
               }}</span>
               <img
-                style="height: 40px"
+                style="height: 30px"
                 :src="setAdminUserES(advice.checker)"
                 alt=""
                 srcset=""
@@ -1121,9 +1135,9 @@
     <!-- <div style="position: absolute; top: 1380px; left: 50%"></div> -->
     <div
       style="margin-top: 300px; padding-top: 50px"
-      v-if="this.totollength > 20"
+      v-if="this.totollength > 17"
     >
-      <template v-if="this.totollength > 20">
+      <template v-if="this.totollength > 17">
         <div class="dialysis-print-order">
           <div class="order-yy-name">{{ orgname }}</div>
           <div class="order-title">血液透析（滤过）记录表单</div>
@@ -1556,7 +1570,7 @@
         <table
           class="print-table"
           border="1"
-          v-if="doctor_advices_2.length > 0 || this.totollength > 20"
+          v-if="doctor_advices_2.length > 0 || this.totollength > 17"
         >
           <tr style="height: 50px; text-align: left; border: none">
             <td style="padding-left: 5px; border: none">
@@ -2001,7 +2015,7 @@ export default {
           this.prescription = response.data.data.dialysisPrescription;
           this.receiverTreatmentAccess =
             response.data.data.receiverTreatmentAccess;
-          this.assessmentafter = response.data.data.AssessmentAfterDislysis;
+          this.assessmentafter = response.data.data.assessmentAfterDislysis;
 
           this.sick_condition_arr.forEach((o) => {
             if (this.receiverTreatmentAccess.sick_condition == o.id) {
@@ -2058,8 +2072,8 @@ export default {
           this.monitors = response.data.data.monitors;
           this.summary = response.data.data.summary;
           this.org_template_info = response.data.data.org_template_info;
-          if (this.monitors.length < 8) {
-            var nl = 8 - this.monitors.length;
+          if (this.monitors.length < 10) {
+            var nl = 10 - this.monitors.length;
             for (let index = 0; index < nl; index++) {
               this.monitors.push([]);
             }
@@ -2422,6 +2436,7 @@ export default {
 .dialysis-print-order {
   width: 960px;
   margin: 0 auto;
+  
 }
 
 .dialysis-print-order .order-yy-name {

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -813,13 +813,13 @@
         </table>-->
         <table class="print-table" border="1">
           <tr style="text-align: center">
-            <td colspan="14" style="margin-left: 15px; font-size: 20px">
+            <td colspan="15" style="margin-left: 15px; font-size: 20px">
               治 疗 过 程 记 录
             </td>
           </tr>
           <tr>
             <td style="width: 60px" rowspan="2">时间</td>
-            <td colspan="4">透析参数</td>
+            <td colspan="5">透析参数</td>
             <td colspan="5">生命体征</td>
             <td colspan="2">治疗中病情变化</td>
             <td style="width: 80px" rowspan="2">护士签名</td>
@@ -841,7 +841,11 @@
               <p style="height: 20px; line-height: 20px">脱水量</p>
               <p style="height: 20px; line-height: 20px">ml</p>
             </th>
-            <th style="width: 30px">
+            <th style="width: 70px">
+              <p style="height: 20px; line-height: 20px">Kt/V</p>
+              <p style="height: 20px; line-height: 20px">ml</p>
+            </th>
+            <th style="width: 40px">
               <p style="height: 20px; line-height: 20px">T</p>
               <p style="height: 20px; line-height: 20px">℃</p>
             </th>
@@ -853,7 +857,7 @@
               <p style="height: 20px; line-height: 20px">R</p>
               <p style="height: 20px; line-height: 20px">bpm</p>
             </th>
-            <th style="width: 100px">
+            <th style="width: 90px">
               <p style="height: 20px; line-height: 20px">BP</p>
               <p style="height: 20px; line-height: 20px">mmHg</p>
             </th>
@@ -906,6 +910,15 @@
                 }}
               </span>
             </td>
+            <td>
+              <span v-if="getTime(monitor.operate_time) != ''">
+                {{
+                  monitor.ktv
+                    ? monitor.ktv
+                    : ""
+                }}
+              </span>
+            </td>
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{ monitor.temperature ? monitor.temperature : "0" }}

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -169,6 +169,8 @@
             <prescription-table v-if="dayorMonth == 'day'" ref="prescription_tables"
                                 :prescription="curPrescriptions"
                                 :preDrugs="preDrugs"
+                                v-bind="$attrs"
+                                v-on="$listeners"
                                 :activeType="customTabIndex"></prescription-table>
 
 
@@ -291,14 +293,17 @@
                     </el-table-column>
                     <el-table-column label="库存" width="60">
                       <template slot-scope="scope">
-                                          <span
-                                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 || org_id ==10340">
-                                              <span
-                                                  v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
-                                              <span
-                                                  v-if="scope.row.count%scope.row.min_number>0"> {{ scope.row.count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
-                                            </span>
-                        <span v-else> {{ scope.row.total }}{{ scope.row.total ? scope.row.min_unit : '' }}</span>
+                        <!-- <span
+                            v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10188 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 || org_id ==10340">
+                            <span
+                                v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
+                            <span
+                                v-if="scope.row.count%scope.row.min_number>0"> {{ scope.row.count % scope.row.min_number }}{{ scope.row.min_unit }}</span>
+                          </span>
+                        <span v-else> {{ scope.row.total }}{{ scope.row.total ? scope.row.min_unit : '' }}</span> -->
+                          <span v-if="scope.row.sum_count >0 && scope.row.max_unit!=scope.row.min_unit && scope.row.sum_count/scope.row.min_number >0">{{Math.floor(scope.row.sum_count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
+                          <span v-if="scope.row.sum_count >0 && scope.row.max_unit!=scope.row.min_unit && scope.row.sum_count%scope.row.min_number >0">{{Math.floor(scope.row.sum_count%scope.row.min_number)}}{{scope.row.min_unit}}</span>
+                          <span v-if="scope.row.sum_count >0 && scope.row.max_unit == scope.row.min_unit">{{scope.row.sum_count}}{{scope.row.max_unit}}</span>
                       </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
@@ -390,11 +395,12 @@
                     </el-table-column>
                     <el-table-column label="库存" width="40">
                       <template slot-scope="scope">
-                                                <span
-                                                    v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 || org_id ==10340">
-                                                    {{ scope.row.stock_count }}
-                                                </span>
-                        <span v-else> {{ scope.row.total }}</span>
+                          <!-- <span
+                              v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 || org_id ==10340">
+                              {{ scope.row.stock_count }}
+                          </span> -->
+                        <!-- <span v-else> {{ scope.row.total }}</span> -->
+                         <span v-if="scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{scope.row.good_info.sum_count}}</span>
                       </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
@@ -2196,6 +2202,7 @@ export default {
       }
     },
     open(index, isLoading) {
+     
       if (!isLoading) {
         if (this.dayorMonth == 'day') {
           if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0) {
@@ -2384,7 +2391,7 @@ export default {
                 'prescriptions': this.prescriptions
               }
               isLoading = true
-              console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
+             
               let num = 0
               // this.prescriptions.map(item => {
               //   if (item.advices.length > 0) {
@@ -2399,12 +2406,142 @@ export default {
               //   }
               // })
               if (num == 0) {
+                  var arr = []//新增处方
+                  var arr_one = []
+                for(let i=0;i<this.prescriptions.length;i++){
+                  if(this.prescriptions[i].id == 0){ 
+                  
+                    for(let j=0;j<this.prescriptions[i].advices.length;j++){
+                       arr.push(this.prescriptions[i].advices[j])
+                    }
+
+                    if(arr.length > 0){
+                      let objInfo = {};
+                      arr.forEach((item, index) => {
+                      let { id } = item.id;
+                      if (!objInfo[id]) {
+                          objInfo[id] = {
+                            drug_id:item.drug.id,
+                            child: [],
+                            sum_count:item.drug.sum_count,
+                            out_count:0,
+                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit
+                          };
+                        }
+                      });
+                      let newArr = Object.values(objInfo);
+                      console.log("newArr",newArr)
+                      
+                      for(let i=0;i<arr.length;i++){
+                        for(let j=0;j<newArr.length;j++){
+                          if(arr[i].id == newArr[j].drug_id){
+                            newArr[j].child.push(arr[i])
+                          }
+                        }
+                      }
+                      
+                      if(newArr.length >0){
+                        for(let i=0;i<newArr.length;i++){
+                          for(let j=0;j<newArr[i].child.length;j++){
+                            if(newArr[i].child[j].prescribing_number_unit == newArr[i].child[j].drug.max_unit){
+                                newArr[i].child[j].prescribing_number_total = parseInt(newArr[i].child[j].prescribing_number) * newArr[i].child[j].drug.min_number
+                            }  
+                            newArr[i].out_count +=  newArr[i].child[j].prescribing_number_total
+                          }
+                        }
+                      }
+                      
+                      if(newArr.length > 0){
+                        for(let i=0;i<newArr.length;i++){
+                          if(newArr[i].out_count > newArr[i].sum_count){
+                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                            isLoading = false
+                            this.$emit('editKeepLoad', false)
+                            return
+                          }
+                        }
+                      }
+                      console.log("newArr",newArr )
+                    }
+                  }
 
+                  if(this.prescriptions[i].id > 0){ //修改处方
+                   
+                     for(let j=0;j<this.prescriptions[i].advices.length;j++){
+                       if(this.prescriptions[i].advices[j].advice_id == 0){ //新增列
+                         arr_one.push(this.prescriptions[i].advices[j])
+                       }
+                     }
+
+                     if(arr_one.length > 0){
+                      let objInfo = {};
+                      arr_one.forEach((item, index) => {
+                      let { id } = item.id;
+                      if (!objInfo[id]) {
+                          objInfo[id] = {
+                            drug_id:item.drug.id,
+                            child: [],
+                            sum_count:item.drug.sum_count,
+                            out_count:0,
+                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit
+                          };
+                        }
+                      });
+                      let newArr = Object.values(objInfo);
+                      console.log("newArr",newArr)
+                      
+                      for(let i=0;i<arr_one.length;i++){
+                        for(let j=0;j<newArr.length;j++){
+                          if(arr_one[i].id == newArr[j].drug_id){
+                            newArr[j].child.push(arr_one[i])
+                          }
+                        }
+                      }
+                      
+                      if(newArr.length >0){
+                        for(let i=0;i<newArr.length;i++){
+                          for(let j=0;j<newArr[i].child.length;j++){
+                            //  newArr[i].child[j].prescribing_number_total = 0
+                            if(newArr[i].child[j].prescribing_number_unit == newArr[i].child[j].drug.max_unit && newArr[i].child[j].drug.max_unit!=newArr[i].child[j].drug.min_unit){
+                                newArr[i].child[j].prescribing_number_total = parseInt(newArr[i].child[j].prescribing_number) * newArr[i].child[j].drug.min_number
+                            }
+                            if(newArr[i].child[j].prescribing_number_unit == newArr[i].child[j].drug.min_unit && newArr[i].child[j].drug.max_unit!=newArr[i].child[j].drug.min_unit){
+                              newArr[i].child[j].prescribing_number_total = parseInt(newArr[i].child[j].prescribing_number)
+                             } 
+                             if(newArr[i].child[j].prescribing_number_unit == newArr[i].child[j].drug.max_unit && newArr[i].child[j].drug.max_unit ==newArr[i].child[j].drug.min_unit){
+                                newArr[i].child[j].prescribing_number_total = parseInt(newArr[i].child[j].prescribing_number)
+                             } 
+                          }
+                        }
+                         console.log("wodeshju",newArr)
+                         for(let i=0;i<newArr.length;i++){
+                          for(let j=0;j<newArr[i].child.length;j++){
+                             newArr[i].out_count +=  newArr[i].child[j].prescribing_number_total
+                          }
+                        }
+                      }
+                      
+                      if(newArr.length > 0){
+                        for(let i=0;i<newArr.length;i++){
+                          if(newArr[i].out_count > newArr[i].sum_count){
+                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                            isLoading = false
+                            this.$emit('editKeepLoad', false)
+                            return
+                          }
+                        }
+                      }
+                      console.log("newArr",newArr )
+                    }
+                  }
+                }
                 createHisPrescription(data, params).then(response => {
                   if (response.data.state == 1) {
                     this.$emit('change', this.patientInfo.id)
                     this.$message.success('保存成功')
                     this.$emit('editKeepLoad', false)
+                    this.$parent.getInitData()
+                    this.$parent.getInitDataOne()
                   } else {
                     this.$message.error(response.data.msg)
                     this.$emit('editKeepLoad', false)
@@ -2618,6 +2755,7 @@ export default {
             this.curPrescriptions = []
             this.curStatus = 0
           }
+          this.$parent.getInitDataOne(this.prescriptions)
         } else {
           let params = {
             'id': id
@@ -2656,6 +2794,9 @@ export default {
                 this.curPrescriptions = []
                 this.curStatus = 0
               }
+              this.$parent.getInitData()
+              this.$parent.getInitDataOne(this.prescriptions)
+
             } else {
               this.$message.success(response.data.msg)
             }
@@ -2743,25 +2884,39 @@ export default {
       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, row) {
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340) {
-        if (row.count <= 0) {
-          if (selection) {
-            selection.forEach(row => {
-              if (row.count <= 0) {
-                this.$refs.multipleTable.toggleRowSelection(row)
-              }
-            })
-          } else {
-            this.$refs.multipleTable.clearSelection()
-          }
-          this.$message.error(row.drug_name + '库存不足')
-          return
-        }
-      } else {
-        if (row.total <= 0) {
+      // if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340) {
+      //   if (row.count <= 0) {
+      //     if (selection) {
+      //       selection.forEach(row => {
+      //         if (row.count <= 0) {
+      //           this.$refs.multipleTable.toggleRowSelection(row)
+      //         }
+      //       })
+      //     } else {
+      //       this.$refs.multipleTable.clearSelection()
+      //     }
+      //     this.$message.error(row.drug_name + '库存不足')
+      //     return
+      //   }
+      // } else {
+      //   if (row.total <= 0) {
+      //     if (selection) {
+      //       selection.forEach(row => {
+      //         if (row.total <= 0) {
+      //           this.$refs.multipleTable.toggleRowSelection(row)
+      //         }
+      //       })
+      //     } else {
+      //       this.$refs.multipleTable.clearSelection()
+      //     }
+      //     this.$message.error(row.drug_name + '库存不足')
+      //     return
+      //   }
+      // }
+       if (row.sum_count <= 0) {
           if (selection) {
             selection.forEach(row => {
-              if (row.total <= 0) {
+              if (row.sum_count <= 0) {
                 this.$refs.multipleTable.toggleRowSelection(row)
               }
             })
@@ -2770,8 +2925,7 @@ export default {
           }
           this.$message.error(row.drug_name + '库存不足')
           return
-        }
-      }
+       }
       this.curDrugs = selection
     },
 
@@ -3031,40 +3185,55 @@ export default {
     },
     selectChange(selection, row) {
       console.log('row', row)
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340) {
-        if (row.stock_count <= 0) {
-          if (row.type == 3) {
-            if (selection) {
-              selection.forEach(row => {
-                if (row.stock_count <= 0) {
-                  this.$refs.tables.toggleRowSelection(row)
-                }
-              })
-            } else {
-              this.$refs.tables.clearSelection()
-            }
-            this.$message.error(row.project_name + '库存不足')
-            return
-          }
-        }
-      } else {
-        if (row.total <= 0) {
-          if (row.type == 3) {
-            if (selection) {
-              selection.forEach(row => {
-                if (row.total <= 0) {
-                  this.$refs.tables.toggleRowSelection(row)
-                }
-              })
-            } else {
-              this.$refs.tables.clearSelection()
-            }
-            this.$message.error(row.project_name + '库存不足')
-            return
+      // if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340) {
+      //   if (row.stock_count <= 0) {
+      //     if (row.type == 3) {
+      //       if (selection) {
+      //         selection.forEach(row => {
+      //           if (row.stock_count <= 0) {
+      //             this.$refs.tables.toggleRowSelection(row)
+      //           }
+      //         })
+      //       } else {
+      //         this.$refs.tables.clearSelection()
+      //       }
+      //       this.$message.error(row.project_name + '库存不足')
+      //       return
+      //     }
+      //   }
+      // } else {
+      //   if (row.total <= 0) {
+      //     if (row.type == 3) {
+      //       if (selection) {
+      //         selection.forEach(row => {
+      //           if (row.total <= 0) {
+      //             this.$refs.tables.toggleRowSelection(row)
+      //           }
+      //         })
+      //       } else {
+      //         this.$refs.tables.clearSelection()
+      //       }
+      //       this.$message.error(row.project_name + '库存不足')
+      //       return
+      //     }
+      //   }
+
+      // }
+       if (row.stock_count <= 0) {
+        if (row.type == 3) {
+          if (selection) {
+            selection.forEach(row => {
+              if (row.stock_count <= 0) {
+                this.$refs.tables.toggleRowSelection(row)
+              }
+            })
+          } else {
+            this.$refs.tables.clearSelection()
           }
+          this.$message.error(row.project_name + '库存不足')
+          return
         }
-
-      }
+       }
       this.teamList.push(row)
     },
     getlist() {
@@ -3231,7 +3400,7 @@ export default {
 
                 teamList.push(obj)
               } else if (project[i].type == 3 && project[i].status == 1) {
-                if (project[i].good_info.total <= 0) {
+                if (project[i].good_info.sum_count <= 0) {
                   num++
                   this.$refs.tabProjectTeam.toggleRowSelection(row)
                   this.$message.error(project[i].good_info.good_name + '库存不足')

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -360,6 +360,7 @@
                   temp2.splice(index, 1)
                   this.prescription.advices = temp2
                   this.$message.success(response.data.data.msg)
+                  this.$emit("getSunziValue",temp2)
                 }
               })
 
@@ -442,6 +443,7 @@
 
       },
       getAllChange(scope) {
+        console.log("2332323232我的",scope.row.drug)
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
             scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
@@ -460,11 +462,11 @@
         }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
-          if (scope.row.prescribing_number > scope.row.drug.total) {
+          if (scope.row.prescribing_number > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
           }
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
           }
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
@@ -504,11 +506,11 @@
       },
       changePrescribingNumber(scope) {
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          if (parseInt(scope.row.prescribing_number) > scope.row.drug.total) {
+          if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
           }
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
           }
         }

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -122,6 +122,7 @@
                                    ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                                    :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
                                    :org_id="org_id" @editKeepLoad="editKeepLoad"
+                                   v-on:getSunziValue="getSunziValue"
                                    v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
 
 
@@ -334,6 +335,7 @@
         fullHeight: document.documentElement.clientHeight,
         month_prescriptions: [],
         isloading: false,
+        loading:false,
         prescriptions: [
           {
             name: '处方1',
@@ -399,6 +401,10 @@
       }
     },
     methods: {
+     getSunziValue(val){
+       console.log("孙子发来的信息",val)
+       this.getInitData()
+     },
       editKeepLoad(data){
         this.saveLoading = data
       },
@@ -990,22 +996,23 @@
             return false
           } else {
             var drugs = response.data.data.drugs
-            for(let i=0;i<drugs.length;i++){
-                drugs[i].count = 0
-              if(drugs[i].stock_in.length > 0){
-                 for(let j=0;j<drugs[i].stock_in.length;j++){
-                    drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
-                 }
-              }
-            }
+            // for(let i=0;i<drugs.length;i++){
+            //     drugs[i].count = 0
+            //   if(drugs[i].stock_in.length > 0){
+            //      for(let j=0;j<drugs[i].stock_in.length;j++){
+            //         drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
+            //      }
+            //   }
+            // }
 
             this.drugs = drugs
-            console.log("所有药品信息",this.drugs)
+           
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
-
+          
             this.department = response.data.data.department
             this.sick = response.data.data.sick
+          
             this.diagnoses = response.data.data.diagnose
             this.additions = response.data.data.additions
 
@@ -1013,6 +1020,9 @@
         })
 
       },
+      getInitDataOne(val){
+        this.prescriptions = val
+      },
       getList() {
         let params = {
           'record_date': this.record_date,

src/xt_pages/outpatientCharges/components/dayPrescriptionTable.vue

@@ -261,7 +261,8 @@
           }
         })
 
-      },deleteDrug:function(index, row){
+      },
+      deleteDrug:function(index, row){
         if(this.prescription.order_status == 2){
           this.$message.error('该处方已经结算，无法删除')
           return

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -164,7 +164,10 @@
                         <prescription-table v-if="dayorMonth == 'day'" ref="prescription_tables"
                                             :prescription="curPrescriptions"
                                             :preDrugs="preDrugs"
-                                            :activeType="customTabIndex"></prescription-table>
+                                            :activeType="customTabIndex"
+                                            v-on="$listeners"
+                                            v-bind="$attrs"
+                                            ></prescription-table>
 
 
                     </el-tabs>
@@ -285,12 +288,14 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 ||org_id ==10340">
+                                               <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==record_date ||org_id ==10340">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
-                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span>
-
+                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span> -->
+                                               <span v-if="scope.row.sum_count >0 && scope.row.max_unit!=scope.row.min_unit && scope.row.sum_count/scope.row.min_number >0">{{Math.floor(scope.row.sum_count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
+                                               <span v-if="scope.row.sum_count >0 && scope.row.max_unit!=scope.row.min_unit && scope.row.sum_count%scope.row.min_number >0">{{Math.floor(scope.row.sum_count%scope.row.min_number)}}{{scope.row.min_unit}}</span>
+                                               <span v-if="scope.row.sum_count >0 && scope.row.max_unit == scope.row.min_unit">{{scope.row.sum_count}}{{scope.row.max_unit}}</span>
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
@@ -382,10 +387,11 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 || org_id ==10340">
+                                              <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id == 9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==10318 || org_id ==10340">
                                                    {{scope.row.stock_count}}
                                               </span>
-                                              <span v-else> {{ scope.row.total }}</span>
+                                              <span v-else> {{ scope.row.total }}</span> -->
+                                              <span v-if="scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{scope.row.good_info.sum_count}}</span>
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
@@ -1291,6 +1297,7 @@
         })
 
       }, saveTemplate(val) {
+        
         let params = {
           name: val.name,
           mode: val.mode,
@@ -1299,11 +1306,12 @@
         let data = {
           'prescriptions': val.prescriptions
         }
+      
         createdTemplate(params, data).then(response => {
           if (response.data.state == 1) {
             this.$refs.saveTemplate.hide()
-
             this.$message.success('保存成功')
+          
           } else {
             this.$message.error(response.data.msg)
           }
@@ -1807,6 +1815,7 @@
       },
 
       tabclickEvent(val) {
+       
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == val.name) {
             this.prescription_id = this.prescriptions[i].id
@@ -2187,6 +2196,10 @@
         }
       },
       open(index, isLoading) {
+
+        if(this.curStatus == 0){
+          this.prescriptions = []
+        }
         if(!isLoading){
           if (this.dayorMonth == 'day') {
             if (this.prescriptions[0].advices.length == 0 && this.prescriptions[0].project.length == 0) {
@@ -2381,6 +2394,7 @@
               }
               isLoading = true
               console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
+              console.log('this.prescriptionsthis.prescriptions', params)
               let num = 0
               // this.prescriptions.map(item => {
               //   if (item.advices.length > 0) {
@@ -2395,15 +2409,147 @@
               //   }
               // })
               if (num == 0) {
+                var arr = []//新增处方
+                var arr_one = []
+                console.log("ooo233323233232323232",this.prescriptions)
+                for(let i=0;i<this.prescriptions.length;i++){
+                  if(this.prescriptions[i].id == 0){ 
+                    for(let j=0;j<this.prescriptions[i].advices.length;j++){
+                       arr.push(this.prescriptions[i].advices[j])
+                    }
+                    console.log("arr99999999999999",arr)
+                    if(arr.length > 0){
+                      let objInfo = {};
+                      arr.forEach((item, index) => {
+                      let { id } = item.id;
+                      if (!objInfo[id]) {
+                          objInfo[id] = {
+                            drug_id:item.drug.id,
+                            child: [],
+                            sum_count:item.drug.sum_count,
+                            out_count:0,
+                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit,
+
+                          };
+                        }
+                      });
+                      let newArr = Object.values(objInfo);
+                   
+                      
+                      for(let i=0;i<arr.length;i++){
+                        for(let j=0;j<newArr.length;j++){
+                          if(arr[i].id == newArr[j].drug_id){
+                            newArr[j].child.push(arr[i])
+                          }
+                        }
+                      }
+                      console.log("河滨232332newArr",newArr)
+                      if(newArr.length >0){
+                        for(let i=0;i<newArr.length;i++){
+                          for(let j=0;j<newArr[i].child.length;j++){
+                            //  newArr[i].child[j].prescribing_number_total = 0
+                            if(newArr[i].child[j].prescribing_number_unit == newArr[i].child[j].drug.max_unit && newArr[i].child[j].drug.max_unit!=newArr[i].child[j].drug.min_unit){
+                                newArr[i].child[j].prescribing_number_total = parseInt(newArr[i].child[j].prescribing_number) * newArr[i].child[j].drug.min_number
+                            }
+                            if(newArr[i].child[j].prescribing_number_unit == newArr[i].child[j].drug.min_unit && newArr[i].child[j].drug.max_unit!=newArr[i].child[j].drug.min_unit){
+                              newArr[i].child[j].prescribing_number_total = parseInt(newArr[i].child[j].prescribing_number)
+                             } 
+                             if(newArr[i].child[j].prescribing_number_unit == newArr[i].child[j].drug.max_unit && newArr[i].child[j].drug.max_unit ==newArr[i].child[j].drug.min_unit){
+                                newArr[i].child[j].prescribing_number_total = parseInt(newArr[i].child[j].prescribing_number)
+                             } 
+                          }
+                        }
+                         console.log("wodeshju",newArr)
+                         for(let i=0;i<newArr.length;i++){
+                          for(let j=0;j<newArr[i].child.length;j++){
+                             newArr[i].out_count +=  newArr[i].child[j].prescribing_number_total
+                          }
+                        }
+                      }
+                      
+                      if(newArr.length > 0){
+                        for(let i=0;i<newArr.length;i++){
+                          if(newArr[i].out_count > newArr[i].sum_count){
+                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                            isLoading = false
+                            this.$emit('editKeepLoad', false)
+                            return
+                          }
+                        }
+                      }
+                      console.log("newArr",newArr )
+                    }
+                  }
 
+                  if(this.prescriptions[i].id > 0){ //修改处方
+                     
+                     for(let j=0;j<this.prescriptions[i].advices.length;j++){
+                       if(this.prescriptions[i].advices[j].advice_id == 0){ //新增列
+                         arr_one.push(this.prescriptions[i].advices[j])
+                       }
+                     }
+                     console.log("ara23322323233232",arr)
+                     if(arr_one.length > 0){
+                      let objInfo = {};
+                      arr_one.forEach((item, index) => {
+                      let { id } = item.id;
+                      if (!objInfo[id]) {
+                          objInfo[id] = {
+                            drug_id:item.drug.id,
+                            child: [],
+                            sum_count:item.drug.sum_count,
+                            out_count:0,
+                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit
+                          };
+                        }
+                      });
+                      let newArr = Object.values(objInfo);
+                      console.log("newArr",newArr)
+                      
+                      for(let i=0;i<arr_one.length;i++){
+                        for(let j=0;j<newArr.length;j++){
+                          if(arr_one[i].id == newArr[j].drug_id){
+                            newArr[j].child.push(arr_one[i])
+                          }
+                        }
+                      }
+                      
+                      if(newArr.length >0){
+                        for(let i=0;i<newArr.length;i++){
+                          for(let j=0;j<newArr[i].child.length;j++){
+                            if(newArr[i].child[j].prescribing_number_unit == newArr[i].child[j].drug.max_unit){
+                                newArr[i].child[j].prescribing_number_total = parseInt(newArr[i].child[j].prescribing_number) * newArr[i].child[j].drug.min_number
+                            }  
+                            newArr[i].out_count +=  newArr[i].child[j].prescribing_number_total
+                          }
+                        }
+                      }
+                      console.log("new233223322323",newArr)
+                      if(newArr.length > 0){
+                        for(let i=0;i<newArr.length;i++){
+                          if(newArr[i].out_count > newArr[i].sum_count){
+                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                            isLoading = false
+                            this.$emit('editKeepLoad', false)
+                            return
+                          }
+                        }
+                      }
+                      console.log("newArr",newArr )
+                    }
+                  }
+                }
+               
                 createHisPrescription(data, params).then(response => {
                   if (response.data.state == 1) {
                     this.$emit('change', this.patientInfo.id)
-                    this.$message.success('保存成功')
+                    this.$message.success('保存成功!')
                     this.$emit('editKeepLoad', false)
+                    this.$parent.getInitData()
                   } else {
                     this.$message.error(response.data.msg)
                     this.$emit('editKeepLoad', false)
+                    
                   }
                 })
               }
@@ -2566,6 +2712,7 @@
 
       },
       removeTab(targetName) {
+        console.log("处方了免费打打啊发发大发阿道夫")
         if (this.curPrescriptions.order_status == 2 || this.curPrescriptions.order_status == 5) {
           this.$message.error('该处方已经结算或者记账，无法删除')
           return
@@ -2598,7 +2745,7 @@
             }
             this.editableTabsValue = activeName
             this.prescriptions = tabs.filter(tab => tab.name !== targetName)
-
+           
             for (let i = 0; i < this.prescriptions.length; i++) {
               if (activeName == this.prescriptions[i].name) {
                 this.curPrescriptions = this.prescriptions[i]
@@ -2610,19 +2757,23 @@
                 }
               }
             }
+            console.log("oo233232233232323",this.prescriptions)
             if (this.prescriptions.length == 0) {
               this.curPrescriptions = []
               this.curStatus = 0
             }
+            this.$parent.getInitDataOne(this.prescriptions)
           } else {
             let params = {
               'id': id
             }
             delHisPrescription(params).then(response => {
               if (response.data.state == 1) {
-                this.$message.success('删除成功')
+                this.$message.success('删除成功!')
                 let tabs = this.prescriptions
                 let activeName = this.editableTabsValue
+                console.log("targetName",targetName)
+                console.log("activeName",activeName)
                 if (activeName === targetName) {
                   tabs.forEach((tab, index) => {
                     if (tab.name === targetName) {
@@ -2636,7 +2787,7 @@
                 }
                 this.editableTabsValue = activeName
                 this.prescriptions = tabs.filter(tab => tab.name !== targetName)
-
+               
                 for (let i = 0; i < this.prescriptions.length; i++) {
                   if (activeName == this.prescriptions[i].name) {
                     this.curPrescriptions = this.prescriptions[i]
@@ -2648,12 +2799,17 @@
                     }
                   }
                 }
+              
                 if (this.prescriptions.length == 0) {
                   this.curPrescriptions = []
                   this.curStatus = 0
                 }
+                
+                this.$parent.getInitData()
+                this.$parent.getInitDataOne(this.prescriptions)
+                console.log("删除后的数据是",this.prescriptions)
               } else {
-                this.$message.success(response.data.msg)
+                this.$message.error(response.data.msg)
               }
             })
           }
@@ -2739,37 +2895,50 @@
         this.$refs.additionalCharges.show()
       },
       selectDrugs(selection, row) {
-        console.log('selection', selection)
-        console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
-            if (row.count <= 0) {
-              if (selection) {
-                selection.forEach(row => {
-                  if (row.count <= 0) {
-                    this.$refs.multipleTable.toggleRowSelection(row)
-                  }
-                })
-              } else {
-                this.$refs.multipleTable.clearSelection()
-              }
-              this.$message.error(row.drug_name + '库存不足')
-              return
-            }
-        }else{
-           if (row.total <= 0) {
-              if (selection) {
-                selection.forEach(row => {
-                  if (row.total <= 0) {
-                    this.$refs.multipleTable.toggleRowSelection(row)
-                  }
-                })
-              } else {
-                this.$refs.multipleTable.clearSelection()
+        //console.log("row233232233232",row)
+        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
+        //     if (row.count <= 0) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.count <= 0) {
+        //             this.$refs.multipleTable.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.multipleTable.clearSelection()
+        //       }
+        //       this.$message.error(row.drug_name + '库存不足')
+        //       return
+        //     }
+        // }else{
+        //    if (row.total <= 0) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.total <= 0) {
+        //             this.$refs.multipleTable.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.multipleTable.clearSelection()
+        //       }
+        //       this.$message.error(row.drug_name + '库存不足')
+        //       return
+        //     }
+        // }
+
+        if (row.sum_count <= 0) {
+          if (selection) {
+            selection.forEach(row => {
+              if (row.sum_count <= 0) {
+                this.$refs.multipleTable.toggleRowSelection(row)
               }
-              this.$message.error(row.drug_name + '库存不足')
-              return
-            }
-        }
+            })
+          } else {
+            this.$refs.multipleTable.clearSelection()
+          }
+          this.$message.error(row.drug_name + '库存不足')
+          return
+         }
 
         this.curDrugs = selection
       },
@@ -2844,8 +3013,7 @@
 
           return
         }
-        console.log('this.teamList', this.teamList)
-        console.log('this.curPrescriptions.project', this.curPrescriptions.project)
+
         for (let i = 0; i < this.teamList.length; i++) {
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
@@ -2888,9 +3056,7 @@
             var temp2 = this.deepClone(this.teamList)
 
             var temp3 = this.deepClone(templateDrugs)
-            console.log('hhhhhhhhhhhhhh', temp)
-            console.log('hhhh23', temp2)
-            console.log('hhhh23', temp3)
+           
             if (temp3.length > 0) {
               for (let b = 0; b < temp3.length; b++) {
                 let obj = {
@@ -2950,7 +3116,7 @@
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
                   obj.prescribing_number = 1
                 }
-                console.log('obj', obj)
+               
                 this.prescriptions[i].advices.push(obj)
               }
               this.curStatus = 1
@@ -3021,8 +3187,42 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
-           if (row.stock_count <= 0) {
+        // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
+        //    if (row.stock_count <= 0) {
+        //     if (row.type == 3) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.stock_count <= 0) {
+        //             this.$refs.tables.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.tables.clearSelection()
+        //       }
+        //       this.$message.error(row.project_name + '库存不足')
+        //       return
+        //     }
+        //   }
+        // }else{
+        //    if (row.total <= 0) {
+        //     if (row.type == 3) {
+        //       if (selection) {
+        //         selection.forEach(row => {
+        //           if (row.total <= 0) {
+        //             this.$refs.tables.toggleRowSelection(row)
+        //           }
+        //         })
+        //       } else {
+        //         this.$refs.tables.clearSelection()
+        //       }
+        //       this.$message.error(row.project_name + '库存不足')
+        //       return
+        //     }
+        //   }
+
+        // }
+
+         if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {
                 selection.forEach(row => {
@@ -3035,26 +3235,8 @@
               }
               this.$message.error(row.project_name + '库存不足')
               return
-            }
-          }
-        }else{
-           if (row.total <= 0) {
-            if (row.type == 3) {
-              if (selection) {
-                selection.forEach(row => {
-                  if (row.total <= 0) {
-                    this.$refs.tables.toggleRowSelection(row)
-                  }
-                })
-              } else {
-                this.$refs.tables.clearSelection()
-              }
-              this.$message.error(row.project_name + '库存不足')
-              return
-            }
           }
-
-        }
+         }
 
         this.teamList.push(row)
       },
@@ -3222,7 +3404,7 @@
 
                   teamList.push(obj)
                 } else if (project[i].type == 3 && project[i].status == 1) {
-                  if (project[i].good_info.total <= 0) {
+                  if (project[i].good_info.sum_count <= 0) {
                     num++
                     this.$refs.tabProjectTeam.toggleRowSelection(row)
                     this.$message.error(project[i].good_info.good_name + '库存不足')

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -232,6 +232,7 @@
         }
       }
     },
+
     data() {
       return {
         advices: [],
@@ -348,6 +349,7 @@
                   temp2.splice(index, 1)
                   this.prescription.advices = temp2
                   this.$message.success(response.data.data.msg)
+                  this.$emit("getSunziValue",temp2)
                 }
               })
 
@@ -452,11 +454,11 @@
         }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
-          if (scope.row.prescribing_number > scope.row.drug.total) {
+          if (scope.row.prescribing_number > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
           }
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
           }
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
@@ -483,7 +485,7 @@
         //   scope.row.prescribing_number = 1
         // }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          scope.row.retail_price = scope.row.drug.min_price
+             scope.row.retail_price = scope.row.drug.min_price
           // if (scope.row.prescribing_number > scope.row.drug.total) {
           //   this.$message.error(scope.row.drug_name + '库存不足')
           // }
@@ -546,11 +548,11 @@
 
 
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          if (parseInt(scope.row.prescribing_number) > scope.row.drug.total) {
+          if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
           }
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
           }
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -155,6 +155,7 @@
                            :month_prescriptions="month_prescriptions"
                            :org_id="org_id"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
+                           v-on:getSunziValue = "getSunziValue"
                            :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
                            v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
 
@@ -425,7 +426,12 @@ export default {
       org_id: 0
     }
   },
+
   methods: {
+    getSunziValue(val){
+    //  this.drugs=[]
+     this.getInitData()
+    },
     editKeepLoad(data) {
       this.saveLoading = data
     },
@@ -1222,25 +1228,24 @@ export default {
           return false
         } else {
           var drugs = response.data.data.drugs
-          for (let i = 0; i < drugs.length; i++) {
-            drugs[i].count = 0
-            if (drugs[i].stock_in != null) {
-              if (drugs[i].stock_in.length > 0) {
-                for (let j = 0; j < drugs[i].stock_in.length; j++) {
-                  drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
-                }
-              }
-            }
-          }
-          // if(drugs.){
-
+          console.log("232323322323332",drugs)
+          // for (let i = 0; i < drugs.length; i++) {
+          //   drugs[i].count = 0
+          //   if (drugs[i].stock_in != null) {
+          //     if (drugs[i].stock_in.length > 0) {
+          //       for (let j = 0; j < drugs[i].stock_in.length; j++) {
+          //         drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
+          //       }
+          //     }
+          //   }
           // }
+       
           this.drugs = drugs
-          console.log('五一劳动节2332323322332', this.drugs)
+        
 
           this.allDrugs = response.data.data.drugs
           this.advices_template = response.data.data.advices_template
-
+         
           this.department = response.data.data.department
           this.sick = response.data.data.sick
           this.diagnoses = response.data.data.diagnose
@@ -4591,7 +4596,7 @@ export default {
       this.$refs.prescriptions.open_three()
     },
     open(index) {
-
+    
       this.index = index
       if (index == 1) {
         this.$refs.prescriptions.open(1, this.saveLoading)
@@ -4951,6 +4956,9 @@ export default {
         }
       })
 
+    },
+    getInitDataOne(val){
+      this.prescriptions = val
     }
   },
   created() {

src/xt_pages/stock/cancelStockOrder.vue

@@ -83,6 +83,17 @@
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
         <el-button size="small" type="primary" @click="toExport">导出</el-button>
+
+        <span>&nbsp;&nbsp;</span>
+        <label class="title"><span class="name">审核状态</span> :</label>
+        <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
+            <el-option
+              v-for="(option, index) in checkList"
+              :key="index"
+              :label="option.name"
+              :value="option.id">
+            </el-option>
+        </el-select>  
       </div>
 
       <el-row :gutter="12" style="margin-top: 10px">
@@ -126,6 +137,13 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="审核状态" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_check == 1">已审核</span>
+              <span v-if="scope.row.is_check == 2">未审核</span>
+            </template>
+          </el-table-column>
+
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
               <el-tooltip
@@ -345,6 +363,12 @@ export default {
       exportList:[],
       houseList:[],
       storehouse_id:0,
+      check_type:0,
+      checkList:[
+       {id:0,name:"全部"},
+       {id:1,name:"已审核"},
+       {id:2,name:"未审核"},
+      ]
     };
   },
   methods: {
@@ -357,6 +381,7 @@ export default {
         type: this.type,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        check_type:this.check_type,
       };
       this.cancelStockDate = [];
       getCancelStockList(Params).then(response => {
@@ -386,6 +411,7 @@ export default {
         end_time: this.end_time,
         type: this.type,
         storehouse_id:this.storehouse_id,
+        check_type:this.check_type,
       };
       this.cancelStockDate = [];
       getCancelStockList(Params).then(response => {
@@ -508,9 +534,13 @@ export default {
     },
     handleEdit: function(index, row) {
 
-      this.$router.push({"path":"/stock/cancel/cancelstockorderedit?id="+row.id})
+      this.$router.push({"path":"/stock/cancel/cancelstockorderedit?id="+row.id+"&is_check="+row.is_check+"&type="+row.type})
     },
     handleDelete: function(index, row) {
+      if(row.is_check == 1){
+        this.$message.error("已审核的单据不能删除!")
+        return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -566,12 +596,17 @@ export default {
       this.getCancelExportList()
     },
     batchDelete() {
+     
       if (this.selectedTableData.length <= 0) {
         this.$message.error("请选择要删除的记录");
         return;
       }
       const ids = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_check == 1){
+          this.$message.error("已审核的单据不能删除!");  
+          return
+        }
         ids.push(this.selectedTableData[i].id);
       }
       const idStr = ids.join(",");
@@ -699,6 +734,9 @@ export default {
     },
     changeStoreHouse(){
       this.GetCancelStock()
+    },
+    changeCheckType(){
+     this.GetCancelStock()
     }
   }
 };

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -19,7 +19,15 @@
           type="primary"
           @click="submit()"
           class="filter-item"
-          >保 存</el-button
+          >保 存</el-button>
+
+          <el-button
+          size="small"
+          type="primary"
+          @click="toCheck()"
+          class="filter-item"
+          v-show="showCheck"
+          >审核</el-button
         >
       </div>
     </div>
@@ -154,12 +162,13 @@
           </el-table-column>
           <el-table-column width="200" 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-form-item
-                :prop="'recordData.' + scope.$index + '.return_count'"
+                :prop="'recordData.' + scope.$index + '.number'"
                 style="padding-top: 17px"
+                :rules="tableRules.number"
               >
                <el-select v-model="scope.row.number" filterable placeholder="请选择">
                   <el-option
@@ -292,7 +301,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import { postCancelStock,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber } from "@/api/stock";
+import { postCancelStock,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber,checkStockWarehouseInfo } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
 
@@ -322,12 +331,15 @@ export default {
       },
       tableRules: {
         return_count: [
-          { required: true, message: "数量不能为空", trigge: "blur" }
+          { required: true, message: "数量不能为空", trigger: "blur" }
         
         ],
-        // price: [
-        //   { required: true, message: "单价不能为空", trigge: "blur" }
-        // ]
+        price: [
+          { required: true, message: "单价不能为空", trigger: "blur" }
+        ],
+        number: [
+          { required: true, message: "批次不能为空", trigger: "blur" }
+        ]
       },
       ruleForm: {
         manufacturer: [
@@ -358,6 +370,8 @@ export default {
       manufacturerList:[],
       list:[],
       storehouse_id:"",
+      cancel_stock_id:0,
+      showCheck:false,
     };
   },
   methods: {
@@ -453,6 +467,7 @@ export default {
       tempObj["total"] = ""
       tempObj["warehouse_info_id"] =  0
       tempObj["xt_warehouse_info"] = []
+      tempObj["id"] = 0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -461,6 +476,27 @@ export default {
         return;
       } else {
         this.recordInfo.recordData.splice(index, 1);
+        if(row.id > 0){
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该退库信息记录?', '删除退库信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteCancelStockInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('删除成功')
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
       }
     },
     calculate: function(val) {
@@ -571,6 +607,7 @@ export default {
                   this.recordInfo.recordData[i].number = this.recordInfo.recordData[i].xt_warehouse_info[j].number
                   this.recordInfo.recordData[i].warehouse_info_id = this.recordInfo.recordData[i].xt_warehouse_info[j].id
                }
+               this.recordInfo.recordData[i].return_count = this.recordInfo.recordData[i].return_count.toString()
             }     
           }
           const loading = this.$loading({
@@ -582,7 +619,6 @@ export default {
           const params = {
             cancelStock: this.recordInfo.recordData
           };
-         
           postCancelStock(
             params,
             this.return_time,
@@ -590,40 +626,41 @@ export default {
             this.form.dealer,
             this.type,
             this.storehouse_id,
+            this.cancel_stock_id
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
               loading.close()
               return false;
             } else {
-             var msg =  response.data.data.msg
-             var good_name = response.data.data.good_name
-             var specification_name = response.data.data.specification_name
-             var storehose_name = response.data.data.storehouse_name
-            var str = storehose_name + " " + good_name +"*" + specification_name +"该批次退库数量大于出库数量"
-             if (msg == 1){
-                this.$message.error("无出库记录")
-                return
-             }
-             if(msg == 2){
-               this.$message.error(str)
-             }
-              if(msg == 4){
-               this.$message.error(str)
-             }
-             if(msg == 5){
-              this.$message.error(str)
-             }
-             if(msg == 3){
-               this.$notify({
-                title: "成功",
-                message: "退库成功",
-                type: "success",
-                duration: 2000
-              });
+             this.$message.success("保存成功!")
+             var cancelStock = response.data.data.cancelStock
+             this.cancel_stock_id = cancelStock.id
+             var list = response.data.data.list
+             var manufacturerList = response.data.data.manufacturerList
+             var dealerList = response.data.data.dealerList
+             for(let i=0;i<list.length;i++){
+               for(let j=0;j<dealerList.length;j++){
+                    if(list[i].dealer == dealerList[i].id){
+                      list[i].dealer = dealerList[i].dealer_name
+                    }
+                }
+                for(let s=0;s<manufacturerList.length;s++){
+                  if(list[i].manufacturer == manufacturerList[s].id){
+                      list[i].manufacturer = manufacturerList[s].manufacturer_name
+                  }
+                } 
+                list[i].expiry_date = this.getTimeOne(list[i].expiry_date)
+                list[i].product_date = this.getTimeOne(list[i].product_date)
+                list[i].good_name = list[i].GoodInfo.good_name
+                list[i].name = list[i].GoodInfo.specification_name
+                list[i].return_count = list[i].count
+              }
               this.recordInfo.recordData = [];
-              this.$router.back(-1);
-             }  
+              this.recordInfo.recordData = list
+              this.showCheck = true
+              // this.$router.back(-1);
+             
              loading.close()      
             }
           });
@@ -678,9 +715,10 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-     
+      console.log("val23233232",val)
       for(let i=0;i<this.recordInfo.recordData.length;i++){
         if(this.currentIndex == i){
+          this.recordInfo.recordData[i].register_account = val.number
           this.recordInfo.recordData[i].good_name = val.good_name
           this.recordInfo.recordData[i].good_type_id = val.good_type_id
           this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
@@ -718,6 +756,43 @@ export default {
         }
      })
     },
+    getTimeOne(val) {
+        if(val < 0){
+          return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+    toCheck(){
+       const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+       var params = {
+         cancel_stock_id:this.cancel_stock_id,
+       }
+      checkStockWarehouseInfo(params).then(response=>{
+         if(response.data.state == 1){
+          if(response.data.data.msg == 1){
+            this.$message.success("审核成功!")
+            loading.close()
+            this.$router.back(-1);
+          }
+          if(response.data.data.msg == 2){
+            var good_name = response.data.data.good_name
+            var specification_name = response.data.data.specification_name
+            var str = good_name + specification_name +"退库数量大于出库数量,审核失败!"
+            this.$message.error(str)
+            loading.close()
+          }
+         }
+      })
+    }
   },
   created() {
     var nowDate = new Date();
@@ -744,6 +819,7 @@ export default {
     tempObj["total"] = ""
     tempObj["warehouse_info_id"] = 0
     tempObj["xt_warehouse_info"] = []
+    tempObj["id"] = 0
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -4,8 +4,10 @@
       <bread-crumb v-if="this.$route.query.type == 1" :crumbs='crumbs'></bread-crumb>
       <bread-crumb v-if="this.$route.query.type == 2" :crumbs='crumbs2'></bread-crumb>
       <div style="float:right;">
-        <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
+        <el-button size="small"  @click="back()" class="filter-item">取 消</el-button>
         <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
+        <el-button size="small"  type="primary" @click="toCheck()" class="filter-item" v-if="is_check == 2">审 核</el-button>
+        <el-button size="small"  type="primary" @click="toReturnCheck()" class="filter-item" v-if="is_check == 1">反 审 核</el-button>
       </div>
     </div>
     <div class="app-container">
@@ -29,7 +31,7 @@
         <label class="title"><span class="name">退库时间</span> : </label>
         <el-date-picker size="small" v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd"></el-date-picker>
+                        value-format="yyyy-MM-dd" :disabled="disabled"></el-date-picker>
       </div>
 
      
@@ -52,6 +54,7 @@
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
                     style="width:160px;"
+                    :disabled="disabled"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -70,7 +73,7 @@
             <template slot-scope="scope">
 
               <el-form-item style="padding-top: 20px">
-                <el-input placeholder="请输入规格名称" v-model="scope.row.name"></el-input>
+                <el-input placeholder="请输入规格名称" v-model="scope.row.name"  :disabled="disabled"></el-input>
               </el-form-item>
 
             </template>
@@ -84,7 +87,7 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
                             style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.count"  oninput="value=value.replace(/\D|^0/g,'')"></el-input>
+                <el-input type="number" v-model="scope.row.count"  oninput="value=value.replace(/\D|^0/g,'')"  :disabled="disabled"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -102,6 +105,7 @@
                   placeholder="请输入单价"
                   type="number"
                   v-model="scope.row.price"
+                  :disabled="disabled"
                 ></el-input>      
               </el-form-item>
               <!-- {{scope.row.packing_unit}} -->
@@ -114,14 +118,15 @@
           </el-table-column>
           <el-table-column width="200" 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-form-item
-                :prop="'recordData.' + scope.$index + '.return_count'"
+                :prop="'recordData.' + scope.$index + '.number'"
                 style="padding-top: 17px"
+                :rules="tableRules.number"
               >
-               <el-select v-model="scope.row.number" filterable placeholder="请选择" >
+               <el-select v-model="scope.row.number" filterable placeholder="请选择"  :disabled="disabled" >
                   <el-option
                     v-for="(item,index) in scope.row.xt_warehouse_info"
                     :key="index"
@@ -141,13 +146,13 @@
                 :prop="'recordData.' + scope.$index + '.return_count'"
                 style="padding-top: 17px"
               >
-              <el-input v-model="scope.row.register_account"></el-input>
+              <el-input v-model="scope.row.register_account"  :disabled="disabled"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
            <el-table-column label="生产厂家" width="160" align="center">
             <template slot-scope="scope">
-               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商"  :disabled="disabled">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
@@ -162,6 +167,7 @@
           <el-table-column label="生产日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
+               :disabled="disabled"
                 prefix-icon="el-icon-date"
                 style="width: 145px"
                 v-model="scope.row.product_date"
@@ -175,6 +181,7 @@
           <el-table-column label="有效日期" width="180" align="center">
             <template slot-scope="scope">
               <el-date-picker
+               :disabled="disabled"
                 prefix-icon="el-icon-date"
                 style="width: 145px"
                 v-model="scope.row.expiry_date"
@@ -188,7 +195,7 @@
 
         <el-table-column label="经销商" width="160" align="center">
             <template slot-scope="scope">
-                <el-select v-model="scope.row.dealer" filterable placeholder="请选择厂商">
+                <el-select v-model="scope.row.dealer" filterable placeholder="请选择厂商"  :disabled="disabled">
                 <el-option
                   v-for="(option, index) in dealerList"
                   :key="index"
@@ -208,7 +215,7 @@
                 :rules="tableRules.return_count"
                 style="padding-top: 17px"
               >
-              <el-input v-model="scope.row.remark"></el-input>
+              <el-input v-model="scope.row.remark"  :disabled="disabled"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -249,7 +256,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig,postSearchGoodList,getStockBatchNumber  } from '@/api/stock'
+  import { deleteCancelStockInfo, editCancelStockInfo, getCancelStockInfo,GetAllGoodInfoByID,GetAllConfig,postSearchGoodList,getStockBatchNumber,checkStockWarehouseInfo,checkRturnStockWarehouseInfo  } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
@@ -285,11 +292,14 @@
         },
         tableRules: {
           count: [
-            { required: true, message: '数量不能为空', trigge: 'blur' }
+            { required: true, message: '数量不能为空', trigger: 'blur' }
+          ],
+          price: [
+            { required: true, message: '单价不能为空', trigger: 'blur' }
           ],
-          // price: [
-          //   { required: true, message: '单价不能为空', trigge: 'blur' }
-          // ]
+          number: [
+          { required: true, message: "批次不能为空", trigger: "blur" }
+          ]
 
         },
         ruleForm: {
@@ -327,6 +337,8 @@
         numberShow:true,
         storehouse_id:"",
         list:[],
+        is_check:0,
+        disabled:false,
       }
     },
     methods: {
@@ -400,7 +412,12 @@
           }
         }
         return name
-      }, handleEdit: function(index, row) {
+      },
+       handleEdit: function(index, row) {
+        if(this.is_check == 1){
+          this.$message.error("已审核的单据不能新增!")
+          return false
+        }
         const tempObj = {}
         tempObj['id'] = 0
         tempObj['good_type_id'] = 0
@@ -415,14 +432,19 @@
         tempObj["warehouse_info_id"] = 0
         tempObj["xt_warehouse_info"] = []
         this.recordInfo.recordData.push(tempObj)
-      }, handleDelete: function(index, row) {
+      },
+       handleDelete: function(index, row) {
+        if(this.is_check == 1){
+          this.$message.error("已审核的单据不能删除!")
+          return false
+        }
         if (row.id == 0) {
           this.recordInfo.recordData.splice(index, 1)
         } else {
           const params = {
             id: row.id
           }
-          this.$confirm('确认删除该退库商品信息记录?', '删除退库商品信息记录', {
+          this.$confirm('确认删除该退库商品记录?', '删除退库商品记录', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -549,9 +571,8 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            
-           
-            editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
+            console.log("param2322332332333wo",params)
+            editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer,this.storehouse_id).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 loading.close()
@@ -572,14 +593,13 @@
                   this.$message.error("该批次退库数量大于入库数量")
                 }
                 if(msg == 3){
-                  this.$notify({
-                    title: "成功",
-                    message: "退库成功",
-                    type: "success",
-                    duration: 2000
-                  });
-                  this.recordInfo.recordData = [];
-                  this.$router.back(-1);
+                  // this.$notify({
+                  //   title: "成功",
+                  //   message: "保存成功",
+                  //   type: "success",
+                  //   duration: 2000
+                  // });
+                 this.$message.success("保存成功!")
                 }  
                 loading.close()       
               }
@@ -598,7 +618,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            console.log("猎豹323c",response.data.data.list)
+           
             for (let i = 0; i < response.data.data.list.length; i++) {
               response.data.data.list[i].good_name = response.data.data.list[i].GoodInfo.good_name
               response.data.data.list[i].name = response.data.data.list[i].GoodInfo.specification_name + "/" + response.data.data.list[i].GoodInfo.packing_unit
@@ -629,7 +649,7 @@
           this.manufacturerList = response.data.data.manufacturerList
           this.dealerList = []
           this.dealerList = response.data.data.dealerList
-          console.log("供应商2332322332232323232323",this.dealerList)
+         
 
         })
       },changeManufacturer(val) {
@@ -682,6 +702,7 @@
         //获取当前耗材的批号
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
+              this.recordInfo.recordData[i].register_account = val.number
               this.recordInfo.recordData[i].good_type_id = val.id
               this.recordInfo.recordData[i].good_name = val.good_name
               this.recordInfo.recordData[i].good_type_id = val.good_type_id
@@ -715,7 +736,7 @@
       getStockBatchNumber(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("list2243444",list)
+         
           this.numberList = list
         }
       })
@@ -726,12 +747,64 @@
       }
       return Math.round(parseFloat(val) * 100) / 100;
      },
+     toCheck(){
+       const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+       var params = {
+         cancel_stock_id:this.$route.query.id,
+       }
+      checkStockWarehouseInfo(params).then(response=>{
+         if(response.data.state == 1){
+          if(response.data.data.msg == 1){
+            this.$message.success("审核成功!")
+            this.$router.back(-1);
+            loading.close()
+          }
+          if(response.data.data.msg == 2){
+            var good_name = response.data.data.good_name
+            var specification_name = response.data.data.specification_name
+            var str = good_name + specification_name +"退库数量大于出库数量,审核失败!"
+            this.$message.error(str)
+            loading.close()
+          }
+         }
+      })
+    },
+    toReturnCheck(){
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      var params = {
+         cancel_stock_id:this.$route.query.id,
+       }
+       checkRturnStockWarehouseInfo(params).then(response=>{
+          if(response.data.state == 1){
+            this.$message.success("反审核成功!")
+            this.$router.back(-1);
+            loading.close()
+          }
+       })
+    }
     },
     created() {
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id
       this.GetOrderDetail(order_id)
+      this.is_check = this.$route.query.is_check
+      if(parseInt(this.$route.query.is_check) == 1){
+         this.disabled = true
+      }else{
+        this.disabled = false
+      }
+
     }
 
   }

src/xt_pages/stock/detail/print.vue

@@ -445,6 +445,27 @@
     //       }
     //   })
     // },
+    getWarehouseOut(good_id){
+      var total = 0
+      for(let i=0;i<this.wareOutList.length;i++){
+         if(this.wareOutList[i].good_id == good_id){
+            total += this.wareOutList[i].count
+         }
+      }
+      return total
+    },
+    
+     getPrintStockGood(){
+
+      getPrintStockGood(this.queryParams).then(response=>{
+          if(response.data.state == 1){
+            var list =  response.data.data.list
+            console.log("list23323232323232",list)
+            this.wareOutList = list
+
+          }
+      })
+    },
     getWarehouseOut(good_id){
       var total = 0
       for(let i=0;i<this.wareOutList.length;i++){

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -93,6 +93,16 @@
         <el-button size="small" type="primary" @click="toExport"
           >导出</el-button
         >
+        <span>&nbsp;&nbsp;</span>
+        <label class="title"><span class="name">审核状态</span> :</label>
+        <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
+            <el-option
+              v-for="(option, index) in checkList"
+              :key="index"
+              :label="option.name"
+              :value="option.id">
+            </el-option>
+        </el-select>  
       </div>
 
       <el-table
@@ -135,6 +145,13 @@
           </template>
         </el-table-column>
 
+       <el-table-column label="审核状态" align="center">
+          <template slot-scope="scope">
+             <span v-if="scope.row.is_check == 1">已审核</span>
+             <span v-if="scope.row.is_check == 2">未审核</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-tooltip
@@ -366,6 +383,12 @@ export default {
       exportList: [],
       houseList: [],
       storehouse_id: 0,
+      check_type:0,
+      checkList:[
+       {id:0,name:"全部"},
+       {id:1,name:"已审核"},
+       {id:2,name:"未审核"},
+      ]
     };
   },
   methods: {
@@ -378,6 +401,7 @@ export default {
         type: this.type,
         keywords: this.searchKey,
         storehouse_id: this.storehouse_id,
+        check_type:this.check_type,
       };
       this.cancelStockDate = [];
       getDrugCancelStockList(Params).then((response) => {
@@ -406,6 +430,7 @@ export default {
         end_time: this.end_time,
         type: this.type,
         storehouse_id: this.storehouse_id,
+        check_type:this.check_type,
       };
       this.cancelStockDate = [];
       getDrugCancelStockList(Params).then((response) => {
@@ -526,10 +551,14 @@ export default {
     },
     handleEdit: function (index, row) {
       this.$router.push({
-        path: "/drugstock/cancel/edit?id=" + row.id + "&type=" + this.type,
+        path: "/drugstock/cancel/edit?id=" + row.id + "&type=" + this.type+"&is_check="+row.is_check,
       });
     },
     handleDelete: function (index, row) {
+      if(row.is_check == 1){
+        this.$message.error("已审核的单据不能删除!")
+        return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -590,6 +619,10 @@ export default {
       }
       const ids = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_check == 1){
+          this.$message.error("已审核的单位不能删除!")
+          return false
+        }
         ids.push(this.selectedTableData[i].id);
       }
       const idStr = ids.join(",");
@@ -775,6 +808,9 @@ export default {
     changeStoreHouse() {
       this.GetCancelStock();
     },
+    changeCheckType(){
+      this.GetCancelStock();
+    }
   },
 };
 </script>

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -21,6 +21,14 @@
           class="filter-item"
           >保 存</el-button
         >
+        <el-button
+          size="small"
+          type="primary"
+          @click="toCheck()"
+          class="filter-item"
+          v-show="showCheck"
+          >审 核</el-button
+        >
       </div>
     </div>
 
@@ -173,12 +181,13 @@
 
           <el-table-column width="200" 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-form-item
-                :prop="'recordData.' + scope.$index + '.return_count'"
+                :prop="'recordData.' + scope.$index + '.batch_number'"
                 style="padding-top: 17px"
+                :rules="tableRules.batch_number"
               >
                <el-select v-model="scope.row.batch_number" filterable placeholder="请选择">
                   <el-option
@@ -312,7 +321,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import {  postDrugCancelStock,GetAllConfig,GetAllDrugInfoByID,getDrugBatchNumber } from "@/api/drug/drug_stock";
+import {  postDrugCancelStock,GetAllConfig,GetAllDrugInfoByID,getDrugBatchNumber,checkCancelDrugStock,deleteDrugCancelStockInfo } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import DrugsStockDialog from './drugsStockDialog/index'
 import {postSearchDrugList } from "@/api/data"
@@ -344,7 +353,14 @@ export default {
       tableRules: {
         return_count: [
           { required: true, message: "数量不能为空", trigger: "blur" }
+        ],
+        price: [
+          { required: true, message: "单价不能为空", trigger: "blur" }
+        ],
+        batch_number: [
+          { required: true, message: "批次不能为空", trigger: "blur" }
         ]
+
       },
       ruleForm: {
         manufacturer: [
@@ -376,6 +392,8 @@ export default {
       unitList:[],
       list:[],
       storehouse_id:"",
+      showCheck:false,
+      cancelstock_id:0,
     };
   },
   methods: {
@@ -481,11 +499,33 @@ export default {
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
+      console.log("index23322332232我的",index)
       if (this.recordInfo.recordData.length <= 1) {
         this.$message.error("只有一条记录的时候无法删除");
         return;
       } else {
         this.recordInfo.recordData.splice(index, 1);
+        if(row.id > 0){
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除该退库商品信息记录?', '删除退库商品信息记录', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteDrugCancelStockInfo(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('删除成功')
+                this.recordInfo.recordData.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+          })
+        }
       }
     },
     calculate: function(val) {
@@ -589,11 +629,12 @@ export default {
                   this.recordInfo.recordData[i].batch_number_id = this.recordInfo.recordData[i].drug_warehouse_info[j].id
                }
             }
+            this.recordInfo.recordData[i].retail_price = this.recordInfo.recordData[i].retail_price.toString()
           }
           const params = {
             cancelStock: this.recordInfo.recordData
           };
-         console.log("params2222",params,this.return_time)
+          console.log("param232222我的",params)
           
           postDrugCancelStock(
             params,
@@ -602,25 +643,50 @@ export default {
             this.form.dealer,
             this.type,
             this.storehouse_id,
+            this.cancelstock_id,
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
               return false;
             } else {
               if(response.data.data.msg == 1){
-                this.$notify({
-                  title: "成功",
-                  message: "退库成功",
-                  type: "success",
-                  duration: 2000
-                });
-                this.recordInfo.recordData = [];
-                this.$router.back(-1);
+                this.$message.success("保存成功!")
+                var list = response.data.data.list
+                var manufacturerList = response.data.data.manufacturerList
+                var dealerList = response.data.data.dealerList
+                var drugTypeList = response.data.data.drugTypeList
+                this.cancelstock_id = response.data.data.cancelStock.id
+                for(let i=0;i<list.length;i++){
+                  for(let j=0;j<manufacturerList.length;j++){
+                    if(list[i].manufacturer_id == manufacturerList[j].id){
+                        list[i].manufacturer_id = manufacturerList[j].manufacturer_name
+                    }
+                  }
+                  for(let s=0;s<dealerList.length;s++){
+                    if(list[i].dealer_id == dealerList[s].id){
+                      list[i].dealer_id = dealerList[s].manufacturer_name
+                    }
+                  }
+
+                  list[i].expiry_date = this.getTimeOne(list[i].expiry_date)
+                  list[i].product_date = this.getTimeOne(list[i].product_date)
+                  list[i].drug_name = list[i].BaseDrugLib.drug_name
+                  list[i].name = list[i].BaseDrugLib.dose + list[i].BaseDrugLib.dose_unit +"*"+list[i].BaseDrugLib.min_number +list[i].BaseDrugLib.min_unit+"/"+list[i].BaseDrugLib.max_unit
+                  for(let z=0;z<drugTypeList.length;z++){
+                    if(list[i].BaseDrugLib.drug_type == drugTypeList[z].value){
+                        list[i].drug_type = drugTypeList[z].name
+                    }
+                  }
+                  // list[i].last_price = list[i].price
+                  list[i].return_count = list[i].count.toString()
+                  
               }
-              if(response.data.data.msg == 2){
-                this.$message.error("退库数量大于出库数量")
+              this.showCheck = true
+              this.recordInfo.recordData = []
+              this.recordInfo.recordData = list
+              // this.$router.back(-1)
+              console.log("列表23322323我的",this.recordInfo.recordData)
               }
-             
             }
           });
         } else {
@@ -678,7 +744,7 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
-        console.log("val345555555555555555555",val)
+         console.log("val32323322323",val)
          var arr = []
          for(let i=0;i<this.recordInfo.recordData.length;i++){
             arr.push(this.recordInfo.recordData[i].drug_id)
@@ -691,6 +757,8 @@ export default {
         //  this.getDrugBatchNumber(val.id)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
+             this.recordInfo.recordData[i].id = 0
+             this.recordInfo.recordData[i].register_account = val.number
              this.recordInfo.recordData[i].drug_id  = val.id
              this.recordInfo.recordData[i].drug_name = val.drug_name
              this.recordInfo.recordData[i].drug_type = val.drug_type
@@ -730,6 +798,49 @@ export default {
       getDataConfig(module, filed_name){
        return getDataConfig(module, filed_name)
       },
+      getTimeOne(val) {
+       if(val < 0){
+          return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+     toCheck(){
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)",
+         });
+         var params = {
+           cancelstock_id:this.cancelstock_id,
+         }
+       checkCancelDrugStock(params).then(response=>{
+          if(response.data.state == 1){
+            var drug_name = response.data.data.drug_name   
+            var dose = response.data.data.dose
+            var dose_unit = response.data.data.dose_unit
+            var min_number = response.data.data.min_number
+            var min_unit =  response.data.data.min_unit
+            var max_unit = response.data.data.max_unit
+            var str = dose + dose_unit + "*" + min_number + min_unit +"/"+ max_unit
+            if(response.data.data.msg == 2){
+              this.$message.error(drug_name + str +"退库数量大于出库数量,审核失败!")
+              loading.close()
+              return
+            }
+            if(response.data.data.msg == 1){
+               this.$message.success("审核成功!")
+               loading.close()
+               this.$router.back(-1)
+               return
+            }
+          }
+       })
+     }
   },
   created() {
     var nowDate = new Date();
@@ -744,6 +855,7 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
 
     const tempObj = {};
+    tempObj["id"] = 0;
     tempObj["drug_id"] = 0;
     tempObj["return_count"] = "";
     tempObj["price"] = "";

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -6,6 +6,8 @@
       <div style="float:right;">
         <el-button size="small"  @click="back()" class="filter-item"   >取 消</el-button>
         <el-button size="small"  type="primary" @click="submit()" class="filter-item" >保 存</el-button>
+        <el-button size="small"  type="primary" @click="toCheck" v-if="is_check == 2" class="filter-item" >审 核</el-button>
+        <el-button size="small"  type="primary" @click="toReturnCheck" v-if="is_check == 1" class="filter-item" >反审核</el-button>
       </div>
     </div>
     <div class="app-container">
@@ -53,6 +55,7 @@
                     @select="handleSelect"
                     @input="changeDrugName(scope.$index)"
                     style="width:160px;"
+                    :disabled="disabled"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -69,6 +72,7 @@
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
+                
                   :disabled="true"
                   placeholder="请输入规格&单位"
                   v-model="scope.row.name"
@@ -89,13 +93,14 @@
               >
               <div style="display:flex;">
                 <el-input
+                :disabled="disabled"
                  oninput="value=value.replace(/\D|^0/g,'')"
                   style="width:100px"
                   placeholder="请输入退库数量"
                   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" :disabled="disabled">
                     <el-option
                       v-for="(option, index) in unitList"
                       :key="index"
@@ -119,6 +124,7 @@
                 style="padding-top: 17px"
               >
                 <el-input
+                 :disabled="disabled"
                   placeholder="请输入单价"
                   type="number"
                   v-model="scope.row.price"
@@ -135,16 +141,17 @@
 
           <el-table-column width="200" 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-form-item
-                :prop="'recordData.' + scope.$index + '.return_count'"
+                :prop="'recordData.' + scope.$index + '.batch_number'"
                 style="padding-top: 17px"
+                :rules="tableRules.batch_number"
               >
-               <el-select v-model="scope.row.batch_number" filterable placeholder="请选择" :disabled="canCelShow">
+               <el-select v-model="scope.row.batch_number" filterable placeholder="请选择" :disabled="disabled" >
                   <el-option
-                    v-for="(item,index) in numberList"
+                    v-for="(item,index) in scope.row.drug_warehouse_info"
                     :key="index"
                     :label="item.batch_number"
                     :value="item.id">
@@ -163,13 +170,13 @@
                 :prop="'recordData.' + scope.$index + '.register_account'"
                 style="padding-top: 17px"
               >
-              <el-input v-model="scope.row.register_account"></el-input>
+              <el-input v-model="scope.row.register_account" :disabled="disabled"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
            <el-table-column label="生产厂家" width="160" align="center">
             <template slot-scope="scope">
-               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商" :disabled="disabled">
                 <el-option
                   v-for="(option, index) in manufacturerList"
                   :key="index"
@@ -191,6 +198,7 @@
                 placeholder="选择日期时间"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                :disabled="disabled"
               ></el-date-picker>
             </template>
           </el-table-column>
@@ -204,6 +212,7 @@
                 placeholder="选择日期时间"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                :disabled="disabled"
               ></el-date-picker>
             </template>
           </el-table-column>
@@ -211,7 +220,7 @@
 
         <el-table-column label="经销商" width="160" align="center">
             <template slot-scope="scope">
-                <el-select v-model="scope.row.dealer" filterable placeholder="请选择厂商">
+                <el-select v-model="scope.row.dealer" filterable placeholder="请选择厂商" :disabled="disabled">
                 <el-option
                   v-for="(option, index) in dealerList"
                   :key="index"
@@ -230,7 +239,7 @@
                 :prop="'recordData.' + scope.$index + '.remark'"
                 style="padding-top: 17px"
               >
-              <el-input v-model="scope.row.remark"></el-input>
+              <el-input v-model="scope.row.remark" :disabled="disabled"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
@@ -278,10 +287,11 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteDrugCancelStockInfo, editDrugCancelStockInfo, getDrugCancelStockInfo,GetAllDrugInfoByID,GetAllConfig,getDrugBatchNumber  } from '@/api/drug/drug_stock'
+  import { deleteDrugCancelStockInfo, editDrugCancelStockInfo, getDrugCancelStockInfo,GetAllDrugInfoByID,GetAllConfig,getDrugBatchNumber,checkCancelDrugStock,returnDrugCancelStock  } from '@/api/drug/drug_stock'
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
   import {postSearchDrugList} from "@/api/data"
+  import { getDataConfig } from "@/utils/data";
   export default {
     components: { DrugsStockDialog, BreadCrumb },
     name: 'cancelStockOrderEdit',
@@ -315,8 +325,13 @@
         tableRules: {
           count: [
             { required: true, message: '数量不能为空', trigger: 'blur' }
+          ],
+          price: [
+            { required: true, message: "单价不能为空", trigger: "blur" }
+          ],
+          batch_number: [
+            { required: true, message: "批次不能为空", trigger: "blur" }
           ]
-
         },
         ruleForm: {
           manufacturer: [
@@ -353,6 +368,8 @@
         canCelShow:true,
         storehouse_id:"",
         houseList:[],
+        is_check:0,
+        disabled:false,
       }
     },
     methods: {
@@ -440,6 +457,10 @@
         return name;
       }, 
       handleEdit: function(index, row) {
+        if(this.is_check == 1){
+          this.$message.error("已审核的数据不能新增!")
+          return false
+        }
         this.canCelShow = false
         const tempObj = {}
         tempObj['id'] = 0
@@ -454,9 +475,15 @@
         tempObj["expiry_date"] = ""
         tempObj["batch_number"] = ""
         tempObj["batch_number_id"] = 0
-         tempObj["count"] = 0
+        tempObj["count"] = 0
+        tempObj["drug_warehouse_info"] = []
         this.recordInfo.recordData.push(tempObj)
-      }, handleDelete: function(index, row) {
+      },
+       handleDelete: function(index, row) {
+        if(this.is_check == 1){
+          this.$message.error("已审核的数据不能删除!")
+          return false
+        }
         if (row.id == 0) {
           this.recordInfo.recordData.splice(index, 1)
         } else {
@@ -553,10 +580,10 @@
             }
 
             for(let i=0;i<this.recordInfo.recordData.length;i++){
-              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
-                   this.recordInfo.recordData[i].batch_number_id = this.numberList[j].id
+              for(let j=0;j<this.recordInfo.recordData[i].drug_warehouse_info.length;j++){
+                 if(this.recordInfo.recordData[i].batch_number ==this.recordInfo.recordData[i].drug_warehouse_info[j].id){
+                   this.recordInfo.recordData[i].batch_number = this.recordInfo.recordData[i].drug_warehouse_info[j].batch_number
+                   this.recordInfo.recordData[i].batch_number_id = this.recordInfo.recordData[i].drug_warehouse_info[j].id
                  }
               }
               this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
@@ -573,15 +600,15 @@
                 return false
               } else {
                 if (response.data.data.msg == 1){
-                   this.$message.success('退库成功')
-                   this.$router.back(-1)
-                }
-                if(response.data.data.msg == 2){
-                   this.$message.error("该批次退库数量大于入库数量,请更改批次")
-                }
-                if(response.data.data.msg == 4){
-                  this.$message.error("该批次退库数量大于出库数量,请更改批次")
+                   this.$message.success('保存成功')
+                  //  this.$router.back(-1)
                 }
+                // if(response.data.data.msg == 2){
+                //    this.$message.error("该批次退库数量大于入库数量,请更改批次")
+                // }
+                // if(response.data.data.msg == 4){
+                //   this.$message.error("该批次退库数量大于出库数量,请更改批次")
+                // }
               
               }
             })
@@ -689,10 +716,11 @@
             this.$message.error("该药品已存在列表中")
             return
          }
-         this.getDrugBatchNumber(val.id)
+        // this.getDrugBatchNumber(val.id)
 
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
+             this.recordInfo.recordData[i].register_account = val.number
              this.recordInfo.recordData[i].drug_id  = val.id
              this.recordInfo.recordData[i].drug_name = val.drug_name
              this.recordInfo.recordData[i].drug_type = val.drug_type
@@ -703,6 +731,7 @@
              this.recordInfo.recordData[i].number =  val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit
              this.recordInfo.recordData[i].min_unit = val.min_unit
+             this.recordInfo.recordData[i].drug_warehouse_info = val.drug_warehouse_info
              if(val.dealer == 0){
                this.recordInfo.recordData[i].dealer = ""
              }else{
@@ -730,12 +759,72 @@
       getDataConfig(module, filed_name){
        return getDataConfig(module, filed_name)
       },
+      toCheck(){
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)",
+         });
+         var params = {
+           cancelstock_id:parseInt(this.$route.query.id),
+         }
+       checkCancelDrugStock(params).then(response=>{
+          if(response.data.state == 1){
+            var drug_name = response.data.data.drug_name   
+            var dose = response.data.data.dose
+            var dose_unit = response.data.data.dose_unit
+            var min_number = response.data.data.min_number
+            var min_unit =  response.data.data.min_unit
+            var max_unit = response.data.data.max_unit
+            var str = dose + dose_unit + "*" + min_number + min_unit +"/"+ max_unit
+            if(response.data.data.msg == 2){
+              this.$message.error(drug_name + str +"退库数量大于出库数量,审核失败!")
+              loading.close()
+              return
+            }
+            if(response.data.data.msg == 1){
+               this.$message.success("审核成功!")
+               loading.close()
+               this.$router.back(-1)
+               return
+            }
+          }
+       })
+     },
+     toReturnCheck(){
+       const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)",
+         });
+        var params = {
+          cancelstock_id:parseInt(this.$route.query.id),
+         }
+        returnDrugCancelStock(params).then(response=>{
+           if(response.data.state == 1){
+             this.$message.success("反审核成功!")
+             this.$router.back(-1)
+             loading.close()
+           }
+        })
+      }
     },
     created() {
+      this.unitList = getDataConfig('hemodialysis','units')
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id
       this.GetOrderDetail(order_id)
+      this.is_check = parseInt(this.$route.query.is_check)
+      if(this.is_check == 1){
+        this.disabled = true
+        this.canCelShow = true
+      }else{
+        this.disabled =false
+        this.canCelShow = false
+      }
     }
 
   }

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -112,6 +112,26 @@
         <el-button size="small" type="primary" @click="toExport()"
           >导出</el-button
         >
+        <div>
+          <span>&nbsp;&nbsp;</span>
+          <label class="title"><span class="name">审核状态</span> :</label>
+          <el-select
+            size="small"
+            v-model="check_type"
+            filterable
+            placeholder="请选择仓库"
+            style="width: 200px"
+            @change="changeCheckType"
+          >
+            <el-option
+              v-for="(option, index) in checkList"
+              :key="index"
+              :label="option.name"
+              :value="option.id"
+            >
+            </el-option>
+          </el-select>
+        </div>
       </div>
 
       <el-table
@@ -164,6 +184,13 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_check == 1">已审核</span>
+            <span v-if="scope.row.is_check == 2">未审核</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
             <el-tooltip
@@ -498,6 +525,12 @@ export default {
       exportList: [],
       houseList: [],
       storehouse_id: 0,
+      check_type: 0,
+      checkList: [
+        { id: 0, name: "全部" },
+        { id: 1, name: "已审核" },
+        { id: 2, name: "未审核" },
+      ],
     };
   },
 
@@ -534,6 +567,7 @@ export default {
         type: this.type,
         keywords: this.searchKey,
         storehouse_id: this.storehouse_id,
+        check_type: this.check_type,
       };
       this.Warehouse.warehouseDate = [];
       getDrugWarehouseList(Params).then((response) => {
@@ -559,6 +593,7 @@ export default {
         type: this.type,
         keywords: this.searchKey,
         storehouse_id: this.storehouse_id,
+        check_type: this.check_type,
       };
       this.Warehouse.warehouseDate = [];
       getDrugWarehouseList(Params).then((response) => {
@@ -720,6 +755,7 @@ export default {
           type: this.type,
           supply_warehouse_id: row.supply_warehouse_id,
           is_sys: row.is_sys,
+          is_check: row.is_check,
         },
       });
     },
@@ -759,6 +795,10 @@ export default {
         this.$message.error("自动入库数据不能删除!");
         return false;
       }
+      if (row.is_check == 1) {
+        this.$message.error("已审核的单据不能删除");
+        return false;
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -820,12 +860,18 @@ export default {
       const ids = [];
       const idOne = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if (this.selectedTableData[i].is_check == 1) {
+          this.$message.error("已审核单据不能删除!");
+          return false;
+        }
         if (this.selectedTableData[i].is_sys == 13) {
           this.$message.error("调拨入库数据不能删除!");
           return false;
         }
         ids.push(this.selectedTableData[i].id);
-        idOne.push(this.selectedTableData[i].supply_warehouse_id);
+        if (this.selectedTableData[i].supply_warehouse_id > 0) {
+          idOne.push(this.selectedTableData[i].supply_warehouse_id);
+        }
       }
 
       for (let i = 0; i < idOne.length; i++) {
@@ -1055,6 +1101,9 @@ export default {
     changeStoreHouse() {
       this.GetWarehouse();
     },
+    changeCheckType() {
+      this.GetWarehouse();
+    },
   },
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -15,6 +15,22 @@
           class="filter-item"
           >保 存</el-button
         >
+        <el-button
+          size="small"
+          type="primary"
+          @click="toCheck()"
+          v-show ="showCheck"
+          class="filter-item"
+          >审核</el-button
+        >
+       <!-- <el-button
+          size="small"
+          type="primary"
+          @click="toReturnCheck()"
+          v-show ="showReturnCheck"
+          class="filter-item"
+          >反审核</el-button
+        > -->
       </div>
     </div>
     <div class="app-container" v-loading="loading">
@@ -395,6 +411,8 @@ import {
   GetAllConfig,
   GetAllDrugInfoByID,
   postDrugWarehouse,
+  toCheckWarehousingInfo,
+  toReturnCheckWarehousing
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import DrugsStockDialog from "./drugsStockDialog/index";
@@ -437,7 +455,7 @@ export default {
       tableRules: {
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
         warehousing_count: [
-          { required: true, message: "数量不能为空", trigge: "blur" },
+          { required: true, message: "数量不能为空", trigger: "blur" },
         ],
 
         good_id: [{ validator: checkGoodId, trigger: "blur" }],
@@ -516,6 +534,9 @@ export default {
       loading: false,
       list: [],
       storehouse_id: "",
+      warehousing_id:0,
+      showCheck:false,
+      showReturnCheck:false,
     };
   },
   methods: {
@@ -620,8 +641,7 @@ export default {
           this.form.manufacturer = 0;
           this.form.dealer = 0;
           this.list = response.data.data.list;
-          this.storehouse_id =
-            response.data.data.configlist.drug_storehouse_info;
+          this.storehouse_id =response.data.data.configlist.drug_storehouse_info;
         }
         loading.close();
       });
@@ -662,6 +682,7 @@ export default {
     },
     handleEdit: function (index, row) {
       const tempObj = {};
+      tempObj["id"] = 0;
       tempObj["drug_name"] = "";
       tempObj["drug_id"] = 0;
       tempObj["number"] = "";
@@ -707,6 +728,16 @@ export default {
         return "";
       }
     },
+   getTimeOne(val) {
+        if(val < 0){
+          return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
     showDialog(index, row) {
       const loading = this.$loading({
         lock: true,
@@ -801,6 +832,7 @@ export default {
             this.$message.success("请添加入库商品");
             return;
           }
+
           for (let i = 0; i < this.recordInfo.recordData.length; i++) {
             if (this.recordInfo.recordData[i].dealer == "") {
               this.recordInfo.recordData[i].dealer = 0;
@@ -841,7 +873,8 @@ export default {
             this.form.manufacturer,
             this.form.dealer,
             this.type,
-            this.storehouse_id
+            this.storehouse_id,
+            this.warehousing_id,
           ).then((response) => {
             if (response.data.state == 0) {
               this.loading = false;
@@ -849,9 +882,43 @@ export default {
               return false;
             } else {
               this.loading = false;
-              this.$message.success("入库成功");
+              this.$message.success("保存成功");
               this.listLoading = false;
-              this.$router.back(-1);
+              var info = response.data.data.info
+              this.warehousing_id = info.id
+              var list = response.data.data.list
+              var manufacturerList = response.data.data.manufacturerList
+              var dealerList = response.data.data.dealerList
+              var drugTypeList = response.data.data.drugTypeList
+              for(let i=0;i<list.length;i++){
+                for(let j=0;j<manufacturerList.length;j++){
+                   if(list[i].manufacturer_id == manufacturerList[j].id){
+                      list[i].manufacturer_id = manufacturerList[j].manufacturer_name
+                   }
+                }
+                for(let s=0;s<dealerList.length;s++){
+                  if(list[i].dealer_id == dealerList[s].id){
+                     list[i].dealer_id = dealerList[s].manufacturer_name
+                  }
+                }
+
+                list[i].expiry_date = this.getTimeOne(list[i].expiry_date)
+                list[i].product_date = this.getTimeOne(list[i].product_date)
+                list[i].drug_name = list[i].drug.drug_name
+                list[i].name = list[i].drug.dose + list[i].drug.dose_unit +"*"+list[i].drug.min_number +list[i].drug.min_unit+"/"+list[i].drug.max_unit
+                for(let z=0;z<drugTypeList.length;z++){
+                   if(list[i].drug.drug_type == drugTypeList[z].value){
+                      list[i].drug_type = drugTypeList[z].name
+                   }
+                }
+                list[i].last_price = list[i].price
+                list[i].warehousing_count = list[i].warehousing_count.toString()
+              }
+              this.recordInfo.recordData = []
+              this.recordInfo.recordData = list
+              this.showCheck = true
+              this.showReturnCheck = false
+              // this.$router.back(-1);
             }
           });
         } else {
@@ -972,12 +1039,59 @@ export default {
         }
       }
     },
+    toCheck(){
+      const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+       var params = {
+         warehousing_id:this.warehousing_id,
+       }
+      toCheckWarehousingInfo(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           this.$message.success("审核成功!")
+           this.$router.back(-1);
+           this.showCheck = false
+           this.showReturnCheck = true
+           loading.close()
+         }else{
+          this.$message.error("审核失败!")
+          loading.close()
+         }
+      })
+    },
+    toReturnCheck(){
+       const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+        var params = {
+          warehousing_id:this.warehousing_id,
+        }
+      toReturnCheckWarehousing(params).then(response=>{
+         if(response.data.state == 1){
+          var list = response.data.data.list
+           this.$message.success("反审核成功!")
+           this.showCheck = true
+           this.showReturnCheck = false
+           loading.close()
+         }else{
+          this.$message.error("反审核失败!")
+          loading.close()
+         }
+      })
+    },
     changeUnit(val,index){
     // console.log("val3232323232",val)
     //  for(let i=0;i<this.recordInfo.recordData.length;i++){
     //    if(i == index){
     //      if(this.recordInfo.recordData[i].max_unit == this.recordInfo.recordData[i].count_unit){
-           
+
     //      }
     //      if(this.recordInfo.recordData[i].min_unit == this.recordInfo.recordData[i].count_unit){
 
@@ -1007,12 +1121,12 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     const tempObj = {};
-
+    tempObj["id"] = 0;
     tempObj["drug_id"] = 0;
     tempObj["drug_name"] = "";
     tempObj["dosage"] = "";
     tempObj["max_unit"] = "";
-    tempObj["min_unit"] = "", 
+    tempObj["min_unit"] = "",
     tempObj["lot_number"] = "";
     tempObj["product_date"] = "";
     tempObj["expiry_date"] = "";

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -18,9 +18,26 @@
           size="small"
           type="primary"
           @click="submit()"
+          v-if="is_check == 2"
           class="filter-item"
           >保 存</el-button
         >
+        <el-button
+          size="small"
+          type="primary"
+          v-if="is_check == 2"
+          @click="toCheck()"
+          class="filter-item"
+          >审核</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          v-if="is_check == 1"
+          @click="toReturnCheck()"
+          class="filter-item"
+          >反审核</el-button
+        >
       </div>
     </div>
 
@@ -206,6 +223,7 @@
                   placeholder="请输入拆零零售价"
                   type="number"
                   v-model="scope.row.retail_price"
+                  :disabled="disabled"
                 ></el-input>
                
               </el-form-item>
@@ -226,6 +244,7 @@
                     placeholder="请输入单价"
                     type="number"
                     v-model="scope.row.last_price"
+                    :disabled="disabled"
                   ></el-input>
                 
                 </el-form-item>
@@ -377,7 +396,9 @@ import {
   GetAllDrugInfoByID,
   getDrugWarehouseInfoList,
   DeleteDrugWarehouseInfoItem,
-  EditDrugWarehouse
+  EditDrugWarehouse,
+  toCheckWarehousingInfo,
+  toReturnCheckWarehousing
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import DrugsStockDialog from './drugsStockDialog/index'
@@ -469,6 +490,8 @@ export default {
       disabled:false,
       storehouse_id:"",
       list:[],
+      is_check:0,
+      drug_waresing_id:0,
     };
   },
   methods: {
@@ -565,6 +588,10 @@ export default {
       return name;
     },
     handleEdit: function(index, row) {
+      if(parseInt(this.$route.query.is_check) == 1){
+        this.$message.error("已审核的单据不能新增!")
+        return false
+      }
       if(parseInt(this.$route.query.is_sys)==13){
         this.$message.error("调拨入库数据不能新增!")
         return false
@@ -580,6 +607,7 @@ export default {
       tempObj["product_date"] = "";
       tempObj["expiry_date"] = "";
       tempObj["warehousing_count"] = "";
+      tempObj["last_price"] = "";
       tempObj["price"] = "";
       tempObj["remark"] = "";
       tempObj["dealer"] = "";
@@ -590,6 +618,10 @@ export default {
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
+      if(parseInt(this.$route.query.is_check) == 1){
+        this.$message.error("已审核的单据不能删除!")
+        return false
+      }
       if(parseInt(this.$route.query.is_sys)==13){
         this.$message.error("调拨入库数据不能删除!")
         return false
@@ -636,55 +668,7 @@ export default {
         return "";
       }
     },
-    // showDialog(index, row) {
-    //   this.currentIndex = index;
-    //   const loading = this.$loading({
-    //     lock: true,
-    //     text: "Loading",
-    //     spinner: "el-icon-loading",
-    //     background: "rgba(0, 0, 0, 0.7)"
-    //   });
-
-    //   const params = {
-    //     manufacturer_id: this.form.manufacturer,
-    //     dealer_id: this.form.dealer
-    //   };
-    //   GetAllDrugInfoByID(params).then(response => {
-    //     if (response.data.state == 0) {
-    //       this.$message.error(response.data.msg);
-    //       return false;
-    //     } else {
-    //       if (response.data.data.drugs.length <= 0) {
-    //         this.$message.error("该厂商或经销商没有药品信息");
-    //         loading.close();
-
-    //         return;
-    //       }
-    //       this.$refs.dialog.show();
-    //       for (let i = 0; i < response.data.data.drugs.length; i++) {
-    //         this.propForm.goods.push(
-    //           response.data.data.drugs[i]
-    //         );
-    //       }
-    //       const obj = {};
-    //       this.propForm.goods = this.propForm.goods.reduce(
-    //         (cur, next) => {
-    //           obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
-    //           return cur;
-    //         },
-    //         []
-    //       ); // 设置cur默认类型为数组，并且初始值为空的数组
-    //     }
-
-    //     for (let i = 0; i < this.propForm.goods.length; i++) {
-    //       for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
-    //         var respObj = this.propForm.goods[i].drug_specs[a];
-    //         respObj["isSelected"] = false;
-    //       }
-    //     }
-    //     loading.close();
-    //   });
-    // },
+    
     back() {
       this.$router.go(-1);
     },
@@ -749,9 +733,38 @@ export default {
               return false;
             } else {
               this.loading = false
-              this.$message.success("入库成功");
+              this.$message.success("保存成功");
+              var list = response.data.data.list
+              var manufacturerList = response.data.data.manufacturerList
+              var dealerList = response.data.data.dealerList
+              var drugTypeList = response.data.data.drugTypeList
+              for(let i=0;i<list.length;i++){
+                for(let j=0;j<manufacturerList.length;j++){
+                   if(list[i].manufacturer_id == manufacturerList[j].id){
+                      list[i].manufacturer_id = manufacturerList[j].manufacturer_name
+                   }
+                }
+                for(let s=0;s<dealerList.length;s++){
+                  if(list[i].dealer_id == dealerList[s].id){
+                     list[i].dealer_id = dealerList[s].manufacturer_name
+                  }
+                }
+
+                list[i].expiry_date = this.getTimeOne(list[i].expiry_date)
+                list[i].product_date = this.getTimeOne(list[i].product_date)
+                list[i].drug_name = list[i].drug.drug_name
+                list[i].name = list[i].drug.dose + list[i].drug.dose_unit +"*"+list[i].drug.min_number +list[i].drug.min_unit+"/"+list[i].drug.max_unit
+                for(let z=0;z<drugTypeList.length;z++){
+                   if(list[i].drug.drug_type == drugTypeList[z].value){
+                      list[i].drug_type = drugTypeList[z].name
+                   }
+                }
+                list[i].last_price = list[i].price
+                list[i].warehousing_count = list[i].warehousing_count.toString()
+              }
+              this.recordInfo.recordData = []
+              this.recordInfo.recordData = list
               this.listLoading = false
-              this.$router.back(-1);
             }
           });
         } else {
@@ -916,8 +929,60 @@ export default {
            }
         }
       },
-    
-
+     toCheck(){
+       const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+       var params = {
+         warehousing_id:parseInt(this.$route.query.id),
+       }
+      toCheckWarehousingInfo(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           this.$message.success("审核成功!")
+           this.$router.back(-1);
+           loading.close()
+         }else{
+          this.$message.error("审核失败!")
+          loading.close()
+         }
+      })
+    },
+    toReturnCheck(){
+       const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+        var params = {
+          warehousing_id:parseInt(this.$route.query.id),
+        }
+      toReturnCheckWarehousing(params).then(response=>{
+         if(response.data.state == 1){
+           this.$message.success(response.data.data.msg)
+           this.$router.back(-1);
+           loading.close()
+         }else{
+            this.$message.error(response.data.msg)
+            loading.close()
+            this.$router.back(-1);
+         }
+      })
+    },
+   getTimeOne(val) {
+        if(val < 0){
+          return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+    },
   },
   created() {
    
@@ -925,11 +990,12 @@ export default {
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
     this.GetOrderDetail(order_id);
+    this.is_check = parseInt(this.$route.query.is_check)
     this.unitList =  getDataConfig('hemodialysis','units')
     if( parseInt(this.$route.query.supply_warehouse_id)>0){
       this.disabled = true
     }
-    if(parseInt(this.$route.query.is_sys) == 13){
+    if(parseInt(this.$route.query.is_sys) == 13 || this.is_check == 1 ){
       this.disabled = true
     }
 

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -76,6 +76,8 @@
             @change="endTimeChange"
           ></el-date-picker>
         </div>
+
+
          <!-- <div style="margin-left: 10px">
           <span>审核状态:</span>
           <el-select
@@ -110,7 +112,7 @@
           >导出</el-button
         >
 
-        <!-- <span>&nbsp;&nbsp;</span>
+        <span>&nbsp;&nbsp;</span>
         <label class="title"><span class="name">出库方式</span> :</label>
         <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
             <el-option
@@ -119,7 +121,18 @@
               :label="option.name"
               :value="option.id">
             </el-option>
-        </el-select>  -->
+        </el-select>
+
+      <span>&nbsp;&nbsp;</span>
+      <label class="title"><span class="name">审核状态</span> :</label>
+      <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
+          <el-option
+            v-for="(option, index) in checkList"
+            :key="index"
+            :label="option.name"
+            :value="option.id">
+          </el-option>
+      </el-select>
       </div>
 
       <el-table
@@ -164,7 +177,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column min-width="35" align="center">
+        <el-table-column min-width="40" align="center">
           <template slot="header" slot-scope="scope">
             <span>出库方式</span>
           </template>
@@ -175,6 +188,17 @@
           </template>
         </el-table-column>
 
+        <el-table-column min-width="40" align="center">
+          <template slot="header" slot-scope="scope">
+            <span>审核状态</span>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_check == 1">已审核</span>
+            <span v-if="scope.row.is_check == 2">未审核</span>
+
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
             <el-tooltip
@@ -606,6 +630,12 @@ export default {
         { id: 2, name: "自动出库" },
         { id: 3, name: "调拨出库" },
       ],
+      check_type:0,
+      checkList:[
+       {id:0,name:"全部"},
+       {id:1,name:"已审核"},
+       {id:2,name:"未审核"},
+      ]
     };
   },
   methods: {
@@ -643,6 +673,7 @@ export default {
         keywords: this.searchKey,
         storehouse_id: this.storehouse_id,
         way_type: this.way_type,
+        check_type:this.check_type,
       };
       this.warehouseOutDate = [];
       getDrugWarehouseOutList(Params).then((response) => {
@@ -654,7 +685,12 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.warehouseOutDate.push(response.data.data.list[i]);
           }
-          this.houseList = response.data.data.houseList;
+          var obj = { id: 0, storehouse_name: "全部" };
+          this.houseList = [];
+          this.houseList.push(obj);
+          for (let i = 0; i < response.data.data.houseList.length; i++) {
+            this.houseList.push(response.data.data.houseList[i]);
+          }
         }
       });
     },
@@ -671,7 +707,7 @@ export default {
       });
       }
 
- 
+
     },
     GetWarehouseOut: function () {
       const Params = {
@@ -683,6 +719,7 @@ export default {
         keywords: this.searchKey,
         storehouse_id: this.storehouse_id,
         way_type: this.way_type,
+        check_type:this.check_type,
       };
       this.warehouseOutDate = [];
       getDrugWarehouseOutList(Params).then((response) => {
@@ -797,7 +834,8 @@ export default {
           "&is_sys=" +
           row.is_sys +
           "&supply_cancel_out_id=" +
-          row.supply_cancel_out_id,
+          row.supply_cancel_out_id+"&is_check="+row.is_check
+
       });
     },
     handleSearch(val) {
@@ -816,6 +854,10 @@ export default {
         this.$message.error("采购出库数据不能删除!");
         return;
       }
+      if(row.is_check == 1){
+       this.$message.error("已审核的单据不能删除!")
+       return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -879,6 +921,10 @@ export default {
       const ids = [];
       const idsOne = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_check == 1){
+          this.$message.error("已审核单据不能删除!")
+          return false
+        }
         if (this.selectedTableData[i].is_sys == 1) {
           this.$message.error("自动出库数据不能删除!");
           return false;
@@ -889,7 +935,10 @@ export default {
         }
         if (this.selectedTableData[i].is_sys == 0) {
           ids.push(this.selectedTableData[i].id);
-          idsOne.push(this.selectedTableData[i].supply_cancel_out_id);
+          if(this.selectedTableData[i].supply_cancel_out_id >0){
+             idsOne.push(this.selectedTableData[i].supply_cancel_out_id);
+          }
+
         }
       }
       if (idsOne.length > 0) {
@@ -1113,7 +1162,7 @@ export default {
           this.tableShow = true;
           this.tableList = [];
           var list = response.data.data.list;
-          console.log("lisrt233232323232233223", list);
+          // console.log("lisrt233232323232233223", list);
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
           var drugFlowList = response.data.data.drugFlowList;
@@ -1165,7 +1214,7 @@ export default {
             }
           }
           this.tableList = list;
-          console.log("单价23323232323232232332232323233223", this.tableList);
+          // console.log("单价23323232323232232332232323233223", this.tableList);
         }
       });
     },
@@ -1181,7 +1230,7 @@ export default {
       getAutoDrugDetail(params).then((response) => {
         if (response.data.state == 1) {
           this.userList = response.data.data.list;
-          console.log("自动出库数据", this.userList);
+          // console.log("自动出库数据", this.userList);
           if (val.is_sys == 1) {
             this.drugDialogVisible = true;
           }
@@ -1333,9 +1382,9 @@ export default {
       return total_price;
     },
     getDrugBatchNumber(drugid, count) {
-      console.log("drug_id2323", drugid);
-      console.log("count", count);
-      console.log("hhhhhhhhhhh", this.batchNumberList);
+      // console.log("drug_id2323", drugid);
+      // console.log("count", count);
+      // console.log("hhhhhhhhhhh", this.batchNumberList);
       var arr = [];
       for (let i = 0; i < this.batchNumberList.length; i++) {
         if (
@@ -1355,7 +1404,7 @@ export default {
       getExportOutOrderDrugList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
-          console.log("list22222", list);
+          // console.log("list22222", list);
           this.exportList = list;
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
@@ -1367,7 +1416,7 @@ export default {
         this.$message.error("请勾选出库单");
         return;
       }
-      console.log("hh2323232322323", this.exportList);
+      // console.log("hh2323232322323", this.exportList);
       for (let i = 0; i < this.exportList.length; i++) {
         if (this.exportList[i].dealer == 0) {
           this.exportList[i].dealer = "";
@@ -1500,6 +1549,9 @@ export default {
     changeWay() {
       this.GetWarehouseOut();
     },
+    changeCheckType(){
+      this.GetWarehouseOut();
+    }
   },
 };
 </script>

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -21,6 +21,23 @@
           class="filter-item"
           >保 存</el-button
         >
+         <el-button
+          size="small"
+          type="primary"
+          v-show="showCheck"
+          class="filter-item"
+          @click="toCheck"
+          >审 核</el-button
+        >
+
+        <!-- <el-button
+          size="small"
+          type="primary"
+          v-show="showReturnCheck"
+          @click="toReturnCheck"
+          class="filter-item"
+          >反 审 核</el-button
+        > -->
       </div>
     </div>
 
@@ -407,6 +424,8 @@ import {
   GetAllConfig,
   GetAllDrugInfoByID,
   getDrugBatchNumber,
+  toCheckDrugOut,
+  toReturnCheck
 } from "@/api/drug/drug_stock";
 
 import BreadCrumb from "../../components/bread-crumb";
@@ -480,6 +499,9 @@ export default {
       storehouse_id: "",
       list: [],
       doctorList: [],
+      showCheck:false,
+      showReturnCheck:false,
+      warehouse_out_id:0,
     };
   },
   methods: {
@@ -549,6 +571,7 @@ export default {
     },
     handleEdit: function (index, row) {
       const tempObj = {};
+      tempObj["id"] = 0;
       tempObj["drug_id"] = 0;
       tempObj["count"] = "";
       tempObj["price"] = "";
@@ -713,7 +736,8 @@ export default {
             this.form.dealer,
             this.form.manufacturer,
             this.type,
-            this.storehouse_id
+            this.storehouse_id,
+            this.warehouse_out_id,
           ).then((response) => {
             if (response.data.state == 0) {
               this.$message.error("库存不足");
@@ -729,24 +753,48 @@ export default {
               var min_number = response.data.data.min_number;
               var min_unit = response.data.data.min_unit;
               var max_unit = response.data.data.max_unit;
-              var str =
-                drug_name +
-                " " +
-                dose +
-                dose_unit +
-                "*" +
-                min_number +
-                min_unit +
-                "/" +
-                max_unit;
+              var str = drug_name +" " +dose +dose_unit +"*" + min_number + min_unit +"/" + max_unit;
+              var warehousingOutInfo = response.data.data.warehousingOutInfo
+              var warehouseOut = response.data.data.warehouseOut
+              this.warehouse_out_id = warehouseOut.id
+              var dealerList = response.data.data.dealerList
+              var manufacturerList = response.data.data.manufacturerList
+              var drugTypeList = response.data.data.drugTypeList
+              for(let i=0;i<warehousingOutInfo.length;i++){
+                for(let j=0;j<dealerList.length;j++){
+                   if(warehousingOutInfo[i].dealer == dealerList[j].id){
+                      warehousingOutInfo[i].dealer = dealerList[j].dealer_name
+                   }   
+                }
+
+                for(let z=0;z<manufacturerList.length;z++){
+                  if(warehousingOutInfo[i].manufacturer == manufacturerList[z].id){
+                     warehousingOutInfo[i].manufacturer = manufacturerList[z].manufacturer_name
+                  }
+                }
+                warehousingOutInfo[i].drug_name = warehousingOutInfo[i].drug.drug_name
+                warehousingOutInfo[i].name = warehousingOutInfo[i].drug.dose + warehousingOutInfo[i].drug.dose_unit +"*"+warehousingOutInfo[i].drug.min_number +warehousingOutInfo[i].drug.min_unit+"/"+warehousingOutInfo[i].drug.max_unit
+                warehousingOutInfo[i].product_date = this.getTimeOne(warehousingOutInfo[i].product_date)
+                warehousingOutInfo[i].expiry_date =  this.getTimeOne(warehousingOutInfo[i].expiry_date)
+                warehousingOutInfo[i].last_price = warehousingOutInfo[i].price
+                warehousingOutInfo[i].max_unit = warehousingOutInfo[i].count_unit
+                warehousingOutInfo[i].count = warehousingOutInfo[i].count.toString()
 
+                for(let z=0;z<drugTypeList.length;z++){
+                   if(warehousingOutInfo[i].drug.drug_type == drugTypeList[z].value){
+                      warehousingOutInfo[i].drug_type = drugTypeList[z].name
+                   }
+                }
+              }
               if (msg == 1) {
                 this.$message.error(str + "库存不足");
               } else {
                 loading.close();
-                this.$message.success("出库成功");
+                this.$message.success("保存成功");
                 this.recordInfo.recordData = [];
-                this.$router.back(-1);
+                this.recordInfo.recordData = warehousingOutInfo
+                this.showCheck = true
+               
               }
             }
           });
@@ -1029,6 +1077,78 @@ export default {
       }
       console.log("count_toal23233232", count_total);
     },
+     getTimeOne(val) {
+        if(val < 0){
+          return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+    toCheck(){
+       const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+       var params = {
+        warehouse_out_id:this.warehouse_out_id
+       }
+      toCheckDrugOut(params).then(response=>{
+        if(response.data.state == 1){
+          var warehousingOutInfoList = response.data.data.warehousingOutInfoList
+          var msg =response.data.data.msg
+          if(msg == 1){
+            this.$message.success("审核成功!")
+            this.showCheck = false
+            this.showReturnCheck = true
+            this.$router.back(-1)
+          }
+          if(msg == 2){
+            var drug_name = response.data.data.drug_name
+            var dose = response.data.data.dose
+            var dose_unit = response.data.data.dose_unit
+            var min_number = response.data.data.min_number
+            var min_unit = response.data.data.min_unit
+            var max_unit = response.data.data.max_unit
+            var str = drug_name +" " +dose +dose_unit +"*" + min_number + min_unit +"/" + max_unit;
+            this.$message.error(str+"库存不足，审核失败!")
+          }
+          loading.close()
+        }else{
+          this.$message.error("审核失败!")
+          loading.close()
+        }
+      })
+    },
+    toReturnCheck(){
+       const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+       var params = {
+        warehouse_out_id:this.warehouse_out_id
+       }
+      toReturnCheck(params).then(response=>{
+        if(response.data.state == 1){
+          var out = response.data.data.out
+          this.$message.success("反审核成功!")
+          this.showCheck = true
+          this.showReturnCheck = false
+          loading.close()
+          this.$router.back(-1)
+        }else{
+          this.$message.error("反审核失败!")
+          loading.close()
+          this.$router.back(-1)
+        }
+      })
+    }
   },
   created() {
     if (this.$route.path == "/Pharmacy/out/add") {
@@ -1050,6 +1170,7 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     const tempObj = {};
+    tempObj["id"] = 0;
     tempObj["drug_id"] = 0;
     tempObj["max_unit"] = "";
     (tempObj["min_unit"] = ""), (tempObj["return_count"] = 0);

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9671 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
+        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -68,7 +68,7 @@
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="orgId == 9671 || orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
+      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -123,7 +123,7 @@
                 <span v-else> {{(item.count * item.price).toFixed(2)}}</span>
                
              </td>
-             <td>{{item.batch_number}}</td>
+             <td>{{item.drug_warehouse_info.batch_number}}</td>
              <td>{{(getTime(item.product_date))}}</td>
              <td>{{(getTime(item.expiry_date))}}</td>
             </tr>
@@ -144,7 +144,7 @@
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
-            <div style="width:70px;">领药人：</div><div style="width:60px;"></div>
+            <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
@@ -157,6 +157,7 @@
 
     </div>
   </div>
+  </div>
 
 </template>
 

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -11,16 +11,31 @@
       ></bread-crumb>
 
       <div style="float: right">
-        <el-button size="small" @click="back()" class="filter-item"
-          >取 消</el-button
-        >
+        <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
         <el-button
           size="small"
           type="primary"
           @click="submit()"
+          v-if="is_check == 2 && parseInt(this.$route.query.is_sys) == 0"
           class="filter-item"
           >保 存</el-button
         >
+        <el-button
+          size="small"
+          type="primary"
+          v-if="is_check == 2 && parseInt(this.$route.query.is_sys) == 0"
+          class="filter-item"
+          @click="toCheck"
+          >审 核</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"
+          @click="toReturnCheck"
+          class="filter-item"
+          >反 审 核</el-button
+        >
       </div>
     </div>
 
@@ -441,6 +456,8 @@ import {
   GetAllConfigOne,
   GetAllDrugInfoByID,
   getDrugBatchNumber,
+  toCheckDrugOut,
+  toReturnCheck,
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import DrugsStockDialog from "./drugsStockDialog/index";
@@ -511,6 +528,8 @@ export default {
       numberList: [],
       houstList: [],
       storehouse_id: "",
+      is_check:0,
+      order_id:0,
     };
   },
   methods: {
@@ -611,6 +630,10 @@ export default {
         this.$message.error("采购出库数据不能新增!");
         return;
       }
+      if(this.is_check == 1){
+        this.$message.error("已审核的单据不能新增!");
+        return;
+      }
       this.unitShow = false;
       if (this.drug_show == true) {
         this.$message.error("自动出库数据不能编辑");
@@ -623,7 +646,7 @@ export default {
       tempObj["count"] = "";
       tempObj["max_unit"] = "";
       tempObj["min_unit"] = "";
-      tempObj["price"] = "";
+      tempObj["price"] = 0;
       tempObj["remark"] = "";
       tempObj["batch_number"] = "";
       tempObj["number"] = "";
@@ -632,7 +655,7 @@ export default {
       tempObj["manufacturer"] = "";
       tempObj["warehouse_info_id"] = 0;
       tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name;
-      tempObj["last_price"] = "";
+      tempObj["last_price"] = 0;
       tempObj["stock_count"] = "";
       tempObj["total_count"] = 0;
       tempObj["max_unit_fisrt"] = 0;
@@ -644,6 +667,10 @@ export default {
         this.$message.error("调拨出库数据不能删除!");
         return;
       }
+     if(parseInt(this.$route.query.is_check) == 1){
+        this.$message.error("已审核的单据不能删除!")
+        return false
+      }
       if (row.supply_cancel_out_id > 0) {
         this.$message.error("采购出库数据不能删除!");
         return;
@@ -653,6 +680,10 @@ export default {
         this.$message.error("采购出库数据不能编辑");
         return;
       }
+      if (this.is_checks == 2) {
+        this.$message.error("已审核的单据不能删除!");
+        return;
+      }
       if (row.id == 0) {
         this.recordInfo.recordData.splice(index, 1);
       } else {
@@ -818,7 +849,6 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData,
           };
-
           editDrugWarehouseoutInfo(
             params,
             this.warehouse_out_time,
@@ -851,14 +881,15 @@ export default {
                 "/" +
                 max_unit;
               loading.close();
+
               if (msg == 1) {
                 this.$message.error(str + "库存不足,请入库");
                 loading.close();
               } else {
-                this.$message.success("出库成功");
+                this.$message.success("保存成功");
                 this.recordInfo.recordData = [];
-                this.$router.back(-1);
                 loading.close();
+                this.GetOrderDetail(this.order_id)
               }
             }
           });
@@ -949,10 +980,7 @@ export default {
               response.data.data.list[i].last_price;
             this.recordInfo.recordData.push(response.data.data.list[i]);
           }
-          console.log(
-            "我爱的我的2级大风32323232323",
-            this.recordInfo.recordData
-          );
+
           for (let j = 0; j < this.recordInfo.recordData.length; j++) {
             for (let i = 0; i < manulist.length; i++) {
               if (
@@ -1190,12 +1218,74 @@ export default {
       }
       console.log("count_toal23233232", count_total);
     },
+   toCheck(){
+     const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      var params = {
+      warehouse_out_id:parseInt(this.$route.query.id)
+      }
+
+    toCheckDrugOut(params).then(response=>{
+      if(response.data.state == 1){
+        var warehousingOutInfoList = response.data.data.warehousingOutInfoList
+        var msg =response.data.data.msg
+        if(msg == 1){
+          this.$message.success("审核成功!")
+          this.showCheck = false
+          this.showReturnCheck = true
+          this.$router.back(-1)
+        }
+        if(msg == 2){
+          var drug_name = response.data.data.drug_name
+          var dose = response.data.data.dose
+          var dose_unit = response.data.data.dose_unit
+          var min_number = response.data.data.min_number
+          var min_unit = response.data.data.min_unit
+          var max_unit = response.data.data.max_unit
+          var str = drug_name +" " +dose +dose_unit +"*" + min_number + min_unit +"/" + max_unit;
+          this.$message.error(str+"库存不足，审核失败!")
+        }
+        loading.close()
+       }
+     })
+    },
+    toReturnCheck(){
+       
+       const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+       var params = {
+        warehouse_out_id:parseInt(this.$route.query.id)
+       }
+      toReturnCheck(params).then(response=>{
+        if(response.data.state == 1){
+          var out = response.data.data.out
+          this.$message.success("反审核成功!")
+          this.showCheck = true
+          this.showReturnCheck = false
+          loading.close()
+          this.$router.back(-1)
+        }else{
+          this.$message.error("审核失败!")
+          loading.close()
+          this.$router.back(-1)
+        }
+      })
+    }
   },
   created() {
     this.drugTypeList = getDictionaryDataConfig("system", "drug_type");
-    // this.GetConfigInfo()
+
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
+    this.order_id = order_id
     this.GetOrderDetail(order_id);
     var sys = this.$route.query.is_sys;
     if (sys == 0) {
@@ -1207,9 +1297,10 @@ export default {
     if (sys == 12) {
       this.drug_show = true;
     }
-    if (parseInt(this.$route.query.supply_cancel_out_id) > 0) {
+    if (parseInt(this.$route.query.supply_cancel_out_id) > 0 || parseInt(this.$route.query.is_check) == 1) {
       this.drug_show = true;
     }
+    this.is_check =  parseInt(this.$route.query.is_check)
     this.unitList = getDataConfig("hemodialysis", "units");
   },
 };

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -133,6 +133,7 @@ export default {
             limit:10,
             page:1,
             storehouse_id:0,
+            houseList:[],
         }
     },
     methods:{
@@ -143,7 +144,7 @@ export default {
             this.$router.push({path:'/stock/drugs/inventoryPrint'}) 
         },
         print_1(){
-           this.$router.push({path:'/stock/drugs/print'}) 
+           this.$router.push({path:'/stock/drugs/print?storehouse_id='+this.storehouse_id+"&drug_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page}) 
         },
         handleSizeChange(val){
          this.limit = val

src/xt_pages/stock/drugs/print.vue

@@ -32,17 +32,27 @@
                         
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
-                        <td>{{item.good_name}}</td>
+                        <td>{{item.drug_name}}</td>
                         <td>{{item.specification_name}}</td>
-                        <td>{{item.packing_unit}}</td>
-                        <td>{{item.number}}</td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
+                        <td>{{item.warehousing_unit}}</td>
+                        <td>{{getNumber(item.id)}}</td>
+                        <td>{{item.manufacturer}}</td>
+                        <td>{{item.storehouse_id}}</td>
+                        <td> 
+                            <span v-if="item.stock_max_number>0">{{item.stock_max_number}}{{item.warehousing_unit}} </span>  
+                            <span v-if="item.stock_min_number>0">{{item.stock_min_number}}{{item.min_unit}}</span>
+                            <span v-if="item.stock_max_number == 0 && item.stock_min_number == 0">0</span></td>
+                        <td>
+                            <span v-if="item.last_stock_max_number > 0">{{item.last_stock_max_number}}{{item.warehousing_unit}}</span>  
+                            <span v-if="item.last_stock_min_number>0">{{item.last_stock_min_number}}{{item.min_unit}}</span>
+                            <span v-if="item.last_stock_max_number == 0 && item.last_stock_min_number == 0">0</span>
+                        </td>
+                        <td>
+                          <span v-if="item.inventory_type == 10">盘盈</span>
+                          <span v-if="item.inventory_type == 11">盘亏</span>  
+                        </td>
+                        <td>{{getPrice(item.id)}}</td>
+                        <td>{{getTotalPrice(item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id,item.stock_max_number,item.stock_min_number)}}</td>
                     </tr>
                     </tbody>
                 </table>
@@ -55,7 +65,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
-import { getInventoryExportList } from "@/api/stock"
+import { getInventoryDetailList } from "@/api/drug/drug"
 import print from "print-js";
 export default {
     components:{
@@ -68,10 +78,12 @@ export default {
             { path: false, name: '耗材管理' },
             { path: false, name: '耗材盘点打印' },
           ],
-          org_name:"",
+          org_name: this.$store.getters.xt_user.org.org_name,
           ids:"",
           tableData:[],
           manufacturerList:[],
+          houseList:[],
+          inventoryList:[],
         }
     },
     methods:{
@@ -95,15 +107,23 @@ export default {
             return uParseTime(val, '{y}-{m}-{d}')
          }
         },
-        getlist(){
-         getInventoryExportList().then(response=>{
-           if(response.data.state == 1){
-             var list =  response.data.data.list
-             console.log("list233233232323",list)
-             this.tableData = list
-             this.manufacturerList = response.data.data.manufacturerList
-           }
-         })
+       getlist(){
+            var params = {
+              limit:this.$route.query.limit,
+              page:this.$route.query.page,
+              keyword:this.$route.query.drug_name,
+              storehouse_id:this.$route.query.storehouse_id,
+            }
+          getInventoryDetailList(params).then(response=>{
+             if(response.data.state == 1){
+              this.total =  response.data.data.total
+              this.tableData = response.data.data.list
+              this.houseList = response.data.data.houseList
+              this.inventoryList = response.data.data.inventoryList
+              console.log("hhahhh2o2o233oo2332",this.inventoryList)
+              
+             }
+          })   
         },
         getManufacturerName(id){
 
@@ -114,9 +134,47 @@ export default {
               }
            }
            return name
-        }
+        },
+        getNumber(id){
+          var number = ""
+          for(let i=0;i<this.inventoryList.length;i++){
+            if(id == this.inventoryList[i].id){
+                number = this.inventoryList[i].drug_warehouse_info.batch_number
+            }
+          }
+          return number
+         },
+         getTotalPrice(last_stock_max_number,last_stock_min_number,min_number,id,stock_max_number,stock_min_number){
+           var retail_price = 0
+           var totail_price =0
+           for(let i=0;i<this.inventoryList.length;i++){
+            if(id == this.inventoryList[i].id){
+              retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+            }
+          }
+          var totail_price = (stock_max_number*min_number +stock_min_number - last_stock_max_number * min_number + last_stock_min_number) * retail_price
+        //  var totail_price = last_stock_max_number * min_number * retail_price + last_stock_min_number * retail_price 
+          if(totail_price > 0){
+             return totail_price.toFixed(4)
+          }else{
+            return ""
+          }
+         },
+         getPrice(id){
+           var retail_price = 0
+           for(let i=0;i<this.inventoryList.length;i++){
+            if(id == this.inventoryList[i].id){
+               retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+            }
+          }
+          if(retail_price > 0){
+          return retail_price
+          }
+          
+         }
     },
     created(){
+
       this.getlist()
     }
 }

src/xt_pages/stock/inventoryDetails.vue

@@ -26,7 +26,7 @@
                 @click="search">搜索</el-button>
             </div>
             <div>
-              <el-button type="primary" @click="toprint">打印</el-button>
+              <!-- <el-button type="primary" @click="toprint">打印</el-button> -->
               <el-button type="primary" @click="inventoryExportList">盘点模版打印</el-button>
             </div>
             <!-- <div>
@@ -130,7 +130,7 @@ export default {
     },
     methods:{
         toprint(){
-          this.$router.push({path:'/stock/print_all'})
+          this.$router.push({path:'/stock/print_all?storehouse_id='+this.storehouse_id+"&good_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page})
         },
 
         search(){

src/xt_pages/stock/print_all.vue

@@ -36,13 +36,18 @@
                         <td>{{item.specification_name}}</td>
                         <td>{{item.packing_unit}}</td>
                         <td>{{item.number}}</td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
+                        <td>{{item.manufacturer}}</td>
+                        <td>{{getHouseName(item.storehouse_id)}}</td>
+                        <td>{{item.stock_count}}</td>
+                        <td>{{item.last_stock_count}}</td>
+                        <td>  
+                          <span v-if="item.stock_count > item.last_stock_count">盘亏</span>
+                          <span v-if="item.stock_count < item.last_stock_count">盘盈</span>
+                        </td>
+                        <td>{{item.buy_price}}</td>
+                        <td>
+                          <span v-if="item.stock_count > item.last_stock_count">{{((item.stock_count - item.last_stock_count)  * item.buy_price).toFixed(2)}}</span> 
+                        </td>
                     </tr>
                     </tbody>
                 </table>
@@ -55,7 +60,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
-import { getInventoryExportList } from "@/api/stock"
+import { getPrintList } from "@/api/stock"
 import print from "print-js";
 export default {
     components:{
@@ -68,10 +73,11 @@ export default {
             { path: false, name: '耗材管理' },
             { path: false, name: '耗材盘点打印' },
           ],
-          org_name:"",
+          org_name: this.$store.getters.xt_user.org.org_name,
           ids:"",
           tableData:[],
           manufacturerList:[],
+          houseList:[],
         }
     },
     methods:{
@@ -96,14 +102,20 @@ export default {
          }
         },
         getlist(){
-        //  getInventoryExportList().then(response=>{
-        //    if(response.data.state == 1){
-        //      var list =  response.data.data.list
-        //      console.log("list233233232323",list)
-        //      this.tableData = list
-        //      this.manufacturerList = response.data.data.manufacturerList
-        //    }
-        //  })
+          var params = {
+            storehouse_id:this.$route.query.storehouse_id,
+            good_name:this.$route.query.good_name,
+            limit:this.$route.query.limit,
+            page:this.$route.query.page,
+          }
+         getPrintList(params).then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list233233232323",list)
+             this.tableData = list
+             this.houseList = response.data.data.houseList
+           }
+         })
         },
         getManufacturerName(id){
            var name = ""
@@ -113,9 +125,23 @@ export default {
               }
            }
            return name
-        }
+        },
+        getHouseName(id){
+         var storehouse_name = ""
+         for(let i=0;i<this.houseList.length;i++){
+           if(id == this.houseList[i].id){
+              storehouse_name = this.houseList[i].storehouse_name
+           }
+         }
+         if(storehouse_name == "全部"){
+           return ""
+         }else{
+           return storehouse_name
+         }
+       }
     },
     created(){
+
       this.getlist()
     }
 }

src/xt_pages/stock/stockInOrder.vue

@@ -88,7 +88,7 @@
             </el-option>
           </el-select>
         </div> -->
- 
+
       </div>
 
 
@@ -105,6 +105,17 @@
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
 
         <el-button size="small" type="primary" @click="toExport">导出</el-button>
+
+          <span>&nbsp;&nbsp;</span>
+          <label class="title"><span class="name">审核状态</span> :</label>
+          <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
+              <el-option
+                v-for="(option, index) in checkList"
+                :key="index"
+                :label="option.name"
+                :value="option.id">
+              </el-option>
+          </el-select>
       </div>
 
       <el-table
@@ -157,6 +168,13 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_check == 1">已审核</span>
+            <span v-if="scope.row.is_check == 2">未审核</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
             <el-tooltip
@@ -829,6 +847,12 @@ export default {
       checkAllStatus:false,
       list:[],
       storehouse_id:0,
+      check_type:0,
+      checkList:[
+       {id:0,name:"全部"},
+       {id:1,name:"已审核"},
+       {id:2,name:"未审核"},
+      ],
       check_id: 0,
     };
 
@@ -857,6 +881,9 @@ export default {
           this.doctorList = response.data.data.doctorList;
         }
       });
+    },
+    changeCheckType(){
+      this.GetWarehouse()
     },
      changeCheck() {
       this.$refs.multipleTable.clearSelection();
@@ -873,6 +900,7 @@ export default {
         type: this.type,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        check_type:this.check_type,
       };
       this.Warehouse.warehouseDate = [];
       getWarehouseList(Params).then(response => {
@@ -898,6 +926,7 @@ export default {
         end_time: this.end_time,
         type: this.type,
         storehouse_id:this.storehouse_id,
+        check_type:this.check_type,
       };
 
       this.Warehouse.warehouseDate = [];
@@ -1143,7 +1172,8 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      this.$router.push({path:"/stock/in/order/edit?id="+row.id+"&supply_warehouse_id="+row.supply_warehouse_id+"&is_sys="+row.is_sys})
+
+      this.$router.push({path:"/stock/in/order/edit?id="+row.id+"&supply_warehouse_id="+row.supply_warehouse_id+"&is_sys="+row.is_sys+"&is_check="+row.is_check+"&type="+row.type})
     },
     handleDelete: function(index, row) {
       if(row.is_sys== 12){
@@ -1154,6 +1184,10 @@ export default {
         this.$message.error("采购入库单不能删除!")
         return false
       }
+      if(row.is_check == 1){
+        this.$message.error("已审核的单据不能删除!")
+        return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -1211,12 +1245,19 @@ export default {
       const ids = [];
       const idOne = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_check == 1){
+          this.$message.error("已审核单据不能删除!")
+          return false
+        }
         if(this.selectedTableData[i].is_sys ==12){
           this.$message.error("调拨入库数据不能删除!")
           return false
         }
         ids.push(this.selectedTableData[i].id);
-        idOne.push(this.selectedTableData[i].supply_warehouse_id)
+        if(this.selectedTableData[i].supply_warehouse_id >0){
+          idOne.push(this.selectedTableData[i].supply_warehouse_id)
+        }
+
       }
       for(let i=0;i<idOne.length;i++){
         if(idOne[i] >0){
@@ -1233,8 +1274,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      })
-        .then(() => {
+      }).then(() => {
           deleteWarehouseInfo(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -1450,7 +1490,7 @@ export default {
               this.$message.error(response.data.msg);
               return false;
             } else {
-              this.$message.success("入库成功");
+              this.$message.success("保存成功");
               this.dialogVisible = false
               this.editDialogVisible = false
 

src/xt_pages/stock/stockInOrderAdd.vue

@@ -8,6 +8,8 @@
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
         <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+        <el-button size="small" type="primary" v-show="showCheck" @click="toCheck()" class="filter-item">审 核</el-button>
+        <!-- <el-button size="small" type="primary" v-show="showReturnCheck" @click="toReturnCheck()" class="filter-item">反 审 核</el-button> -->
       </div>
     </div>
     <div class="app-container" v-loading="loading">
@@ -35,7 +37,7 @@
                         value-format="yyyy-MM-dd"></el-date-picker>
       </div>
 
-    
+
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" border
                   style="width: 100%"
@@ -65,11 +67,11 @@
             </template>
           </el-table-column>
           <el-table-column align="center" width="140">
-            
+
             <template slot="header" slot-scope="scope">
               <span>耗材类型<span style="color: red">*</span></span>
             </template>
-     
+
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px;">
                 <el-input placeholder="请输入耗材类型" v-model="scope.row.good_type_id" :value="typeName(scope.row.good_type_id)"></el-input>
@@ -77,7 +79,7 @@
             </template>
           </el-table-column>
           <el-table-column align="center" width="140">
-            
+
             <template slot="header" slot-scope="scope">
               <span>规格&单位<span style="color: red">*</span></span>
             </template>
@@ -89,7 +91,7 @@
 
             </template>
           </el-table-column>
-        
+
           <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
               <span>批号<span style="color: red">*</span></span>
@@ -114,16 +116,16 @@
                 <!-- <el-input placeholder="请输入入库数量" v-model="scope.row.warehousing_count"></el-input> -->
                   {{scope.row.min_unit}}
               </el-form-item>
-            
+
             </template>
           </el-table-column>
-        
+
           <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>零售价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-            
+
               <el-form-item :prop="'recordData.' + scope.$index + '.packing_price'" :rules='tableRules.packing_price'
                             style="padding-top: 20px">
                 <el-input placeholder="请输入单价" type="number" v-model="scope.row.packing_price"></el-input>
@@ -137,7 +139,7 @@
               <span>进货单价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-            
+
               <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
                             style="padding-top: 20px">
                 <el-input placeholder="请输入单价" type="number" v-model="scope.row.price"></el-input>
@@ -166,8 +168,8 @@
              </el-form-item>
             </template>
           </el-table-column>
-        
-        
+
+
           <el-table-column label="生产日期" align="center" width="180">
             <template slot-scope="scope">
               <el-date-picker prefix-icon="el-icon-date" v-model="scope.row.product_date" style="width: 145px"
@@ -177,7 +179,7 @@
 
             </template>
           </el-table-column>
-       
+
          <el-table-column label="生产厂家" align="center" width="150">
              <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
@@ -276,7 +278,9 @@
     getWarehouseInfoByOrdeNumber,
     modifyWarehouseInfo,
     postWarehouse,
-    postSearchGoodList
+    postSearchGoodList,
+    toCheckWarehouseInfo,
+    toReturnCheckWarehouseInfo
   } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
 
@@ -323,17 +327,17 @@
             { required: true, message: '零售价不能为空', trigger: 'blur' }
           ],
           warehousing_count: [
-            { required: true, message: '数量不能为空', trigge: 'blur' }
+            { required: true, message: '数量不能为空', trigger: 'blur' }
           ],
 
           good_id: [
             { validator: checkGoodId, trigger: 'blur' }
           ],
           number:[
-            { required: true, message: '批号不能为空', trigge: 'blur' }
+            { required: true, message: '批号不能为空', trigger: 'blur' }
           ],
           expiry_date:[
-            { required: true, message: '有效日期不能为空', trigge: 'blur' }
+            { required: true, message: '有效日期不能为空', trigger: 'blur' }
           ],
 
         },
@@ -400,6 +404,9 @@
         loading:false,
         list:[],
         storehouse_id:"",
+        showCheck:false,
+        showReturnCheck:false,
+        warehousing_info_id:0,
       }
     },
     methods: {
@@ -465,7 +472,7 @@
         this.propForm.goodType = []
         this.propForm.goods = []
         this.$refs.dialog.hide()
-      }, 
+      },
       GetAllGoodType: function() {
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
@@ -477,7 +484,7 @@
             }
           }
         })
-      }, 
+      },
       GetAllGoodInfo: function() {
         GetAllGoodInfo().then(response => {
           if (response.data.state == 0) {
@@ -528,7 +535,7 @@
         }
         return name
       }, specificationName: function(good_info_id) {
-      
+
         let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == good_info_id) {
@@ -536,7 +543,7 @@
           }
         }
         return name
-      }, 
+      },
       handleEdit: function(index, row) {
         const tempObj = {}
         tempObj['good_type_id'] = 0
@@ -554,6 +561,7 @@
         tempObj['name'] = ''
         tempObj['license_number'] = ""
         tempObj["packing_price"] = ""
+        tempObj["id"] = 0
         tempObj['register_number'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
@@ -568,7 +576,7 @@
           return ''
         }
         return Math.round(parseFloat(val) * 100) / 100
-      }, 
+      },
       GetWarehouseInfoByOrdeNumber: function() {
         const params = {
           'warehousing_order': sessionStorage.getItem('warehousing_orders')
@@ -576,7 +584,7 @@
         this.recordInfo.recordData = []
         getWarehouseInfoByOrdeNumber(params).then(response => {
           if (response.data.state != 0) {
-            
+
             for (let i = 0; i < response.data.data.info.length; i++) {
               this.recordInfo.recordData.push(response.data.data.info[i])
             }
@@ -714,7 +722,7 @@
              }
               for(let j=0;j<this.manufacturerList.length;j++){
                  if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
-               
+
                   this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
                  }
               }
@@ -726,6 +734,7 @@
                     this.recordInfo.recordData[i].dealer = this.dealerList[j].id
                  }
               }
+              this.recordInfo.recordData[i].warehousing_count = this.recordInfo.recordData[i].warehousing_count.toString()
             }
             const loading = this.$loading({
               lock: true,
@@ -736,8 +745,9 @@
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-           
-            postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type,this.storehouse_id).then(response => {
+            console.log("param232232323232323w",params)
+   
+            postWarehouse(params, this.warehousing_time, this.type,this.storehouse_id,this.warehousing_info_id).then(response => {
               if (response.data.state == 0) {
                 this.loading = false
                 this.$message.error(response.data.msg)
@@ -746,8 +756,33 @@
               } else {
                 loading.close()
                 this.loading = false
-                this.$message.success('入库成功')
-                this.$router.back(-1)
+                this.$message.success('保存成功')
+                var list = response.data.data.list
+                console.log("list2332323323",list)
+                var dealerList = response.data.data.dealerList
+                var manufacturerList = response.data.data.manufacturerList
+                var info =  response.data.data.info
+                this.warehousing_info_id  = info.id
+                for(let i=0;i<list.length;i++){
+                  for(let j=0;j<dealerList.length;j++){
+                     if(list[i].dealer == dealerList[i].id){
+                        list[i].dealer = dealerList[i].dealer_name
+                     }
+                  }
+                  for(let s=0;s<manufacturerList.length;s++){
+                    if(list[i].manufacturer == manufacturerList[s].id){
+                       list[i].manufacturer = manufacturerList[s].manufacturer_name
+                    }
+                  }
+                  list[i].expiry_date = this.getTimeOne(list[i].expiry_date)
+                  list[i].product_date = this.getTimeOne(list[i].product_date)
+                  list[i].good_name = list[i].GoodInfo.good_name
+                  list[i].name = list[i].GoodInfo.specification_name +"/"+ list[i].GoodInfo.packing_unit
+                }
+                this.recordInfo.recordData = []
+                this.recordInfo.recordData = list
+                this.showCheck = true
+                // this.$router.back(-1)
               }
             })
           } else {
@@ -758,7 +793,7 @@
       ,
       changeManufacturer(val) {
 
-      }, 
+      },
       changeDealer(val) {
 
       },
@@ -772,9 +807,9 @@
         }
         postSearchGoodList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
-           
+
              var list = response.data.data.list
-             
+
              this.goodList = list
              var manufacturerList = response.data.data.manufacturerList
              this.manufacturerList = manufacturerList
@@ -795,7 +830,7 @@
                   }
                }
              }
-           
+
              cb(this.goodList)
           } else {
             cb([])
@@ -809,11 +844,12 @@
         console.log("al32323232323223",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
+              this.recordInfo.recordData[i].id = 0
               this.recordInfo.recordData[i].good_type_id = val.id
               this.recordInfo.recordData[i].good_name = val.good_name
               this.recordInfo.recordData[i].good_type_id = val.good_type_id
               this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
-             // this.recordInfo.recordData[i].number =  val.number
+
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
               this.recordInfo.recordData[i].license_number = val.number
@@ -829,7 +865,7 @@
               }else{
                 this.recordInfo.recordData[i].packing_price = val.packing_price
               }
-              
+
               this.recordInfo.recordData[i].specification_name = val.specification_name
               this.recordInfo.recordData[i].good_id = val.id
               this.recordInfo.recordData[i].packing_unit = val.packing_unit
@@ -838,11 +874,69 @@
               }else{
                 this.recordInfo.recordData[i].dealer = val.dealer
               }
-             
+
            }
          }
       },
-   
+     getTimeOne(val) {
+        if(val < 0){
+          return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+     toCheck(){
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
+        var params = {
+          warehousing_info_id:this.warehousing_info_id,
+        }
+       toCheckWarehouseInfo(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            this.$message.success("审核成功!")
+            this.showCheck = false
+            this.showReturnCheck = true
+            this.$router.back(-1)
+            loading.close()
+          }else{
+            this.$message.error("审核失败")
+            loading.close()
+          }
+       })
+     },
+     toReturnCheck(){
+       const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+       var params = {
+          warehousing_info_id:this.warehousing_info_id,
+        }
+       toReturnCheckWarehouseInfo(params).then(response=>{
+          if(response.data.state == 1){
+             var list = response.data.data.list
+             this.$message.success("反审核成功!")
+             this.showCheck = true
+             this.showReturnCheck = false
+             loading.close()
+             this.$router.back(-1)
+          }else{
+            this.$message.error("反审核失败!")
+            loading.close()
+          }
+       })
+     }
     }
     ,
     created() {
@@ -873,6 +967,7 @@
       tempObj['name'] = ''
       tempObj['license_number'] = ''
       tempObj['packing_price']= ''
+      tempObj['id']= 0
       tempObj['register_number'] = ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
@@ -905,7 +1000,7 @@
     margin-top: 15px;
     margin-bottom: 15px;
   }
-  
+
 
 </style>
 
@@ -920,6 +1015,6 @@
   .el-autocomplete-suggestion{
     width: 400px !important;
   }
-  
+
 
 </style>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -18,9 +18,26 @@
           size="small"
           type="primary"
           @click="submit()"
+          v-if="is_check == 2"
           class="filter-item"
           >保 存</el-button
         >
+        <el-button
+          size="small"
+          type="primary"
+          @click="toCheck()"
+          v-if="is_check == 2"
+          class="filter-item"
+          >审核</el-button
+        >
+        <el-button
+          size="small"
+          type="primary"
+          v-if="is_check == 1"
+          @click="toReturnCheck()"
+          class="filter-item"
+          >反审核</el-button
+        >
       </div>
     </div>
 
@@ -142,7 +159,7 @@
             
               <el-form-item :prop="'recordData.' + scope.$index + '.packing_price'" :rules='tableRules.packing_price'
                             style="padding-top: 20px">
-                <el-input placeholder="请输入单价" type="number" v-model="scope.row.packing_price"></el-input>
+                <el-input placeholder="请输入单价" type="number" v-model="scope.row.packing_price" :disabled ="disabled"></el-input>
               </el-form-item>
 
 
@@ -160,6 +177,7 @@
                 style="padding-top: 20px"
               >
                 <el-input
+                 :disabled ="disabled"
                   placeholder="请输入单价"
                   type="number"
                   v-model="scope.row.price"
@@ -341,7 +359,9 @@ import {
   GetAllGoodInfoByID,
   DeleteWarehouseInfoItem,
   EditWarehouse,
-  postSearchGoodList
+  postSearchGoodList,
+  toCheckWarehouseInfo,
+  toReturnCheckWarehouseInfo
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 
@@ -385,7 +405,7 @@ export default {
           { required: true, message: '零售价不能为空', trigger: 'blur' }
         ],
         warehousing_count: [
-          { required: true, message: "数量不能为空", trigge: "blur" }
+          { required: true, message: "数量不能为空", trigger: "blur" }
         ],
 
         good_id: [{ validator: checkGoodId, trigger: "blur" }],
@@ -426,6 +446,8 @@ export default {
       disabled:false,
       storehouse_id:0,
       list:[],
+      is_check:0,
+      order_id:0,
     };
   },
   methods: {
@@ -527,6 +549,10 @@ export default {
         this.$message.error("调拨入库数据不能新增!")
         return false
       }
+      if(parseInt(this.$route.query.is_check) == 1){
+        this.$message.error("已审核的单据不能新增!")
+        return false
+      }
       const tempObj = {};
       tempObj["id"] = 0;
       tempObj["good_type_id"] = 0;
@@ -552,6 +578,10 @@ export default {
         this.$message.error("采购入库数据不能删除!")
         return false
       }
+     if(parseInt(this.$route.query.is_check) == 1){
+        this.$message.error("已审核的单据不能删除!")
+        return false
+      }
       if (row.id == 0) {
         this.recordInfo.recordData.splice(index, 1);
       } else {
@@ -694,12 +724,13 @@ export default {
                   this.recordInfo.recordData[i].dealer = this.dealerList[z].id
                }
              }
+             this.recordInfo.recordData[i].warehousing_count = this.recordInfo.recordData[i].warehousing_count.toString() 
           }
          
           const params = {
             stockIn: this.recordInfo.recordData
           };
-          
+          console.log("param22332322332",params)
           const loading = this.$loading({
             lock: true,
             text: 'Loading',
@@ -723,8 +754,28 @@ export default {
             } else {
               loading.close()
               this.loading = false
-              this.$message.success("入库成功");
-              this.$router.back(-1);
+              var list = response.data.data.list
+              var manufacturerList = response.data.data.manufacturerList
+              var dealerList = response.data.data.dealerList
+              for(let i=0;i<list.length;i++){
+                for(let j=0;j<dealerList.length;j++){
+                 if(list[i].dealer == dealerList[i].id){
+                    list[i].dealer = dealerList[i].dealer_name
+                  }
+                }
+                for(let s=0;s<manufacturerList.length;s++){
+                  if(list[i].manufacturer == manufacturerList[s].id){
+                    list[i].manufacturer = manufacturerList[s].manufacturer_name
+                  }
+                } 
+                list[i].expiry_date = this.getTimeOne(list[i].expiry_date)
+                list[i].product_date = this.getTimeOne(list[i].product_date)
+                list[i].good_name = list[i].GoodInfo.good_name
+                list[i].name = list[i].GoodInfo.specification_name
+               }
+              this.recordInfo.recordData = []
+              this.recordInfo.recordData = list
+              this.$message.success("保存成功");
             }
           });
         } else {
@@ -870,18 +921,76 @@ export default {
           }
         }
      
-    }
+    },
+    toCheck(){
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        var params = {
+          warehousing_info_id:this.order_id,
+        }
+       toCheckWarehouseInfo(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            this.$message.success("审核成功!")
+            loading.close()
+            this.$router.back(-1)
+          }else{
+            this.$message.error("审核失败!")
+            loading.close()
+          }
+       })
+     },
+     toReturnCheck(){
+       const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+       var params = {
+          warehousing_info_id:this.order_id,
+        }
+
+       toReturnCheckWarehouseInfo(params).then(response=>{
+          if(response.data.state == 1){
+             this.$message.success(response.data.data.msg)
+             loading.close()
+             this.$router.back(-1)
+          }else{
+            this.$message.error(response.data.msg)
+            loading.close()
+            this.$router.back(-1)
+          }
+       })
+     },
+     getTimeOne(val) {
+        if(val < 0){
+          return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
   },
   created() {
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
+    this.order_id = order_id
     var supply_warehouse_id =  parseInt(this.$route.query.supply_warehouse_id)  
     var is_sys = parseInt(this.$route.query.is_sys)
+    this.is_check = parseInt(this.$route.query.is_check)
+   
     if(supply_warehouse_id > 0){
       this.disabled = true
     }
-    if(is_sys == 12){
+    if(is_sys == 12 || this.is_check == 1){
       this.disabled = true
     }
     this.GetOrderDetail(order_id);

src/xt_pages/stock/stockOutOrder.vue

@@ -109,7 +109,7 @@
         <el-button size="small" type="primary" @click="toExport"
           >导出</el-button
         >
-        <!-- <span>&nbsp;&nbsp;</span>
+        <span>&nbsp;&nbsp;</span>
         <label class="title"><span class="name">出库方式</span> :</label>
         <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
             <el-option
@@ -118,7 +118,18 @@
               :label="option.name"
               :value="option.id">
             </el-option>
-        </el-select>  -->
+        </el-select> 
+
+       <span>&nbsp;&nbsp;</span>
+          <label class="title"><span class="name">审核状态</span> :</label>
+          <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
+              <el-option
+                v-for="(option, index) in checkList"
+                :key="index"
+                :label="option.name"
+                :value="option.id">
+              </el-option>
+          </el-select>
       </div>
 
       <el-table
@@ -171,6 +182,13 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_check == 1">已审核</span>
+            <span v-if="scope.row.is_check == 2">未审核</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
             <el-tooltip
@@ -997,6 +1015,13 @@ export default {
         { id: 2, name: "自动出库" },
         { id: 3, name: "调拨出库" },
       ],
+      check_type:0,
+      checkList:[
+       {id:0,name:"全部"},
+       {id:1,name:"已审核"},
+       {id:2,name:"未审核"},
+      ],
+      check_id: 0,
     };
   },
   methods: {
@@ -1033,6 +1058,7 @@ export default {
         keywords: this.searchKey,
         storehouse_id: this.storehouse_id,
         way_type: this.way_type,
+        check_type:this.check_type,
       };
       this.warehouseOutDate = [];
       getWarehouseOutList(Params).then((response) => {
@@ -1062,6 +1088,7 @@ export default {
         type: this.type,
         storehouse_id: this.storehouse_id,
         way_type: this.way_type,
+        check_type:this.check_type,
       };
       this.warehouseOutDate = [];
       getWarehouseOutList(Params).then((response) => {
@@ -1195,7 +1222,8 @@ export default {
           "&is_sys=" +
           row.is_sys +
           "&supply_cancel_out_id=" +
-          row.supply_cancel_out_id,
+          row.supply_cancel_out_id+
+          "&type="+row.type+"&is_check="+row.is_check,
       });
     },
     handleDelete: function (index, row) {
@@ -1207,6 +1235,10 @@ export default {
         this.$message.error("采购出库数据不能删除!");
         return false;
       }
+      if(row.is_check == 1){
+        this.$message.error("已审核的单据不能删除!")
+        return false
+      }
       const ids = [];
       ids.push(row.id);
       const idStr = ids.join(",");
@@ -1271,6 +1303,10 @@ export default {
       const ids = [];
       const idOne = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_check == 1){
+          this.$message.error("已审核单据不能删除!")
+          return false
+        }
         if (this.selectedTableData[i].is_sys == 1) {
           this.$message.error("自动出库数据不能删除!");
           return false;
@@ -1281,7 +1317,10 @@ export default {
         }
         if (this.selectedTableData[i].is_sys == 0) {
           ids.push(this.selectedTableData[i].id);
-          idOne.push(this.selectedTableData[i].supply_cancel_out_id);
+          if(this.selectedTableData[i].supply_cancel_out_id >0){
+            idOne.push(this.selectedTableData[i].supply_cancel_out_id);
+          }
+          
         }
       }
       if (idOne.length > 0) {
@@ -1989,6 +2028,9 @@ export default {
     changeWay() {
       this.GetWarehouseOut();
     },
+    changeCheckType(){
+      this.GetWarehouseOut()
+    }
   },
 };
 </script>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -21,11 +21,27 @@
           class="filter-item"
           >保 存</el-button
         >
+        <el-button
+          size="small"
+          type="primary"
+          @click="toCheck()"
+          class="filter-item"
+          v-show="showCheck"
+          >审核</el-button
+        >
+        <!-- <el-button
+          size="small"
+          type="primary"
+          @click="toReturnCheck()"
+          class="filter-item"
+          v-show="showReturnCheck"
+          >反审核</el-button
+        > -->
       </div>
     </div>
 
     <div class="app-container">
-    
+
 
       <stock-in-dialog
         ref="dialog" :propForm="propForm"
@@ -61,7 +77,7 @@
         ></el-date-picker>
       </div>
 
-    
+
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
           :data="recordInfo.recordData"
@@ -103,7 +119,7 @@
             </template>
 
             <template slot-scope="scope">
-             
+
 
               <el-form-item style="padding-top: 20px">
                 <el-input
@@ -114,8 +130,8 @@
               </el-form-item>
             </template>
           </el-table-column>
-      
-          
+
+
           <el-table-column width="140" align="center">
             <template slot="header" slot-scope="scope">
               <span>规格&单位<span style="color: red">*</span></span>
@@ -126,7 +142,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          
+
           <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>剩余库存</span>
@@ -145,7 +161,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-      
+
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -159,7 +175,7 @@
               >
                 <el-input
                  @input="getSupplyCount(scope.row.count,scope.row.stock_count,scope.$index)"
-                 oninput="value=value.replace(/\D|^0/g,'')"
+                  oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入出库数量"
                   type="number"
                   v-model="scope.row.count"
@@ -178,9 +194,9 @@
                   :value="option.admin_user_id">
                 </el-option>
                </el-select>
-            </template>   
+            </template>
           </el-table-column>
-<!-- 
+<!--
           <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>进货价</span>
@@ -238,7 +254,7 @@
                   :value="option.id">
                 </el-option>
                </el-select>
-            </template>   
+            </template>
           </el-table-column>
 
          <el-table-column label="生产日期"  width="150" align="center">
@@ -268,7 +284,7 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-         
+
           <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
             <span>批准文号<span style="color: red" ></span></span>
@@ -277,7 +293,7 @@
               <el-input placeholder="请输入批准文号" v-model="scope.row.license_number" ></el-input>
           </template>
         </el-table-column>
-       
+
         <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
               <span>注册编码</span>
@@ -299,7 +315,7 @@
                   :value="option.id">
                 </el-option>
                </el-select>
-            </template>   
+            </template>
           </el-table-column>
 
 
@@ -350,7 +366,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import {  postWarehouseOut,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber } from "@/api/stock";
+import {  postWarehouseOut,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber,checkWarehouseOut } from "@/api/stock";
 
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
@@ -380,8 +396,7 @@ export default {
       },
       tableRules: {
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
-        count: [{ required: true, message: "数量不能为空", trigge: "blur" }],
-        // number:[{ required: true, message: "批号不能为空",trigge:"blur"}],
+        count: [{ required: true, message: "数量不能为空", trigger: "blur" }],
       },
       ruleForm: {
         manufacturer: [
@@ -413,6 +428,11 @@ export default {
       storehouse_id:"",
       list:[],
       doctorList:[],
+      showCheck:false,
+      showReturnCheck:false,
+      warehouseOut:{},
+      warehouseOut_id:0,
+      is_check:0,
     };
   },
   methods: {
@@ -421,7 +441,7 @@ export default {
       this.propForm.goods = []
 
       this.$refs.dialog.hide()
-    
+
       if (val.selectedGoodInfo.length > 0) {
         for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
           if (i == 0) {
@@ -444,7 +464,7 @@ export default {
 
       this.currentIndex = -1
 
-    
+
     },
     cancle: function() {
       this.$refs.dialog.hide();
@@ -525,6 +545,7 @@ export default {
       tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
       tempObj["buy_price"]= ""
       tempObj["stock_count"] = ""
+      tempObj["id"] = 0
       tempObj['register_number'] = ''
       this.recordInfo.recordData.push(tempObj);
     },
@@ -552,6 +573,16 @@ export default {
         return "";
       }
     },
+   getTimeOne(val) {
+      if(val < 0){
+        return ""
+      }
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
     showDialog(index, row) {
       const loading = this.$loading({
         lock: true,
@@ -610,7 +641,7 @@ export default {
             this.propForm.goods.push(goodObj)
 
           }
-       
+
         }
       )
 
@@ -639,25 +670,28 @@ export default {
             this.$message.success("请添加出库商品");
             return;
           }
-       
+
           for(let i=0;i<this.recordInfo.recordData.length;i++){
              if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
              }
             if(this.recordInfo.recordData[i].expiry_date == "" || this.recordInfo.recordData[i].expiry_date == undefined){
               this.recordInfo.recordData[i].expiry_date = ""
-            } 
+            }
             if(this.recordInfo.recordData[i].product_date == "" || this.recordInfo.recordData[i].product_date == undefined){
               this.recordInfo.recordData[i].product_date = ""
             }
-           
+
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
 
              this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString()
 
              this.recordInfo.recordData[i].buy_price = this.recordInfo.recordData[i].buy_price.toString()
+
+              this.recordInfo.recordData[i].count = this.recordInfo.recordData[i].count.toString()
+
           }
-       
+
           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){
@@ -669,13 +703,13 @@ 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
                }
             }
-            
+
             for(let s=0;s<this.doctorList.length;s++){
 
               if(this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name){
@@ -687,8 +721,7 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
-         
-         
+
           const loading = this.$loading({
             lock: true,
             text: 'Loading',
@@ -701,7 +734,8 @@ export default {
             this.form.dealer,
             this.form.manufacturer,
             this.type,
-            this.storehouse_id
+            this.storehouse_id,
+            this.warehouseOut_id
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error("库存不足")
@@ -713,18 +747,51 @@ export default {
                var specification_name = response.data.data.specification_name
                var storehose_name = response.data.data.storehose_name
                var str = storehose_name + " " + good_name +"*" + specification_name +"无库存,请入库"
-             
+               var warehouseOut =  response.data.data.warehouseOut
+               this.warehouseOut = warehouseOut
+              this.warehouseOut_id = warehouseOut.id
+
                if(msg == 1){
                   this.$message.error(str)
                }
-              
+
                if(msg == 2){
-                 this.$message.success("出库成功");
+                 this.$message.success("保存成功");
                  this.recordInfo.recordData = [];
-                 this.$router.back(-1);
+                 var warehouseOutInfoList =  response.data.data.warehouseOutInfoList
+                 var manufacturerList = response.data.data.manufacturerList
+                 var dealerList = response.data.data.dealerList
+
+                 var doctorList = response.data.data.doctorList
+                 for(let i=0;i<warehouseOutInfoList.length;i++){
+                    for(let j=0;j<manufacturerList.length;j++){
+                       if(warehouseOutInfoList[i].manufacturer_id == manufacturerList[i].id){
+                          warehouseOutInfoList[i].manufacturer_id = manufacturerList[i].manufacturer_name
+                       }
+                    }
+                    for(let z=0;z<dealerList.length;z++){
+                      if(warehouseOutInfoList[i].dealer_id == dealerList[z].id){
+                         warehouseOutInfoList[i].dealer_id = dealerList[z].dealer_name
+                      }
+                    }
+                    for(let s=0;s<doctorList.length;s++){
+                       if(warehouseOutInfoList[i].admin_user_id == doctorList[s].admin_user_id){
+                          warehouseOutInfoList[i].admin_user_id = doctorList[s].user_name
+                       }
+                    }
+                    warehouseOutInfoList[i].good_name = warehouseOutInfoList[i].GoodInfo.good_name
+
+                    warehouseOutInfoList[i].name =  warehouseOutInfoList[i].GoodInfo.specification_name +"/"+ warehouseOutInfoList[i].GoodInfo.packing_unit
+                    warehouseOutInfoList[i].expiry_date = this.getTimeOne(warehouseOutInfoList[i].expiry_date)
+                    warehouseOutInfoList[i].product_date = this.getTimeOne(warehouseOutInfoList[i].product_date)
+
+                 }
+                 this.recordInfo.recordData = warehouseOutInfoList
+
+                 this.showCheck = true
                }
                loading.close()
-             
+
             }
           });
         } else {
@@ -747,7 +814,7 @@ export default {
       postSearchGoodList(key,this.storehouse_id).then(response => {
         if (response.data.state == 1) {
             var list = response.data.data.list
-          
+
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
@@ -766,8 +833,8 @@ export default {
                 }
               }
             }
-         
-          
+
+
             cb(this.goodList)
         } else {
           cb([])
@@ -778,15 +845,12 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-      //  console.log("val232332322323323232323",val)
         var arr = []
-       
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            arr.push(this.recordInfo.recordData[i].good_id)
         }
-       
         var str = arr.join(",")
-       
+
         if(str.indexOf(val.id)!=-1){
           this.$message.error("该耗材已存在列表中")
           return
@@ -800,8 +864,7 @@ export default {
 
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
-           
-            this.recordInfo.recordData[i].good_type_id = val.id
+            this.recordInfo.recordData[i].id = 0
             this.recordInfo.recordData[i].good_name = val.good_name
             this.recordInfo.recordData[i].good_type_id = val.good_type_id
             this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
@@ -816,7 +879,7 @@ export default {
             }else{
               this.recordInfo.recordData[i].price = val.packing_price
             }
-           
+
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
             if(val.dealer == 0){
@@ -826,8 +889,8 @@ export default {
             }
          }
 
-       
-      }    
+
+      }
     },
 
     getStockBatchNumber(id){
@@ -837,7 +900,7 @@ export default {
       getStockBatchNumber(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
- 
+
           this.numberList = list
         }
      })
@@ -850,11 +913,11 @@ export default {
          if(index == i){
           this.recordInfo.recordData[i].warehouse_info_id = val.number
          }
-       }  
-    
+       }
+
     },
     getSupplyCount(count,sum_count,index){
-    
+
       if(sum_count < count){
         this.$message.error("出库数量不能大于剩余库存")
         for(let i=0;i<this.recordInfo.recordData.length;i++){
@@ -871,12 +934,70 @@ export default {
           return
         }
       }
- 
+
+    },
+    toCheck(){
+       const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+       var params = {
+         id:this.warehouseOut.id
+       }
+      checkWarehouseOut(params).then(response=>{
+        if(response.data.state == 1){
+          var msg = response.data.data.msg
+          var good_name = response.data.data.good_name
+          var specification_name = response.data.data.specification_name
+          var storehose_name = response.data.data.storehose_name
+          var str = storehose_name + " " + good_name +"*" + specification_name +"库存不足,请入库"
+          if(msg == 1){
+            this.$message.error(str)
+            loading.close()
+           }
+           if(msg == 2){
+            this.$message.success("审核成功!")
+            this.recordInfo.recordData = [];
+            this.$router.back(-1);
+            this.showCheck = false
+            this.showReturnCheck = true
+            loading.close()
+           }
+        }else{
+          this.$message.error("审核失败!")
+          loading.close()
+        }
+      })
+    },
+    toReturnCheck(){
+       const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+       var params = {
+         id:this.warehouseOut_id,
+       }
+      returnCheckWarehouseOut(params).then(response=>{
+         if(response.data.state == 1){
+            var list = response.dat.data.list
+            this.$message.success("反审核成功")
+             this.showCheck = true
+            this.showReturnCheck = false
+            loading.close()
+         }else{
+          this.$message.error("反审核失败!")
+          loading.close()
+         }
+      })
     }
-    
+
   },
   created() {
-   
+
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -902,13 +1023,13 @@ export default {
     tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
     tempObj["buy_price"]= ""
     tempObj["stock_count"] = ""
+    tempObj["id"] = 0
     tempObj['register_number'] = ''
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
-  
     this.propForm.goodUnit = this.$store.getters.good_unit;
     this.unitList =  getDataConfig('hemodialysis','units')
- 
+
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -395,6 +395,7 @@ export default {
       }
       return total;
     },
+  
     },
     created(){
       this.orgName = this.$store.getters.xt_user.org.org_name;

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -7,7 +7,9 @@
 
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item" v-if="is_check == 2 && parseInt(this.$route.query.is_sys) == 0">保 存</el-button>
+       <el-button size="small" type="primary" @click="toCheck()" v-if="is_check == 2 && parseInt(this.$route.query.is_sys) == 0"  class="filter-item">审 核</el-button>
+       <el-button size="small" type="primary" @click="toReturnCheck()" v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"  class="filter-item">反 审 核</el-button>
       </div>
     </div>
 
@@ -257,7 +259,7 @@
             <span>批准文号<span style="color: red"></span></span>
           </template>
           <template slot-scope="scope">
-              <el-input placeholder="请输入批准文号" v-model="scope.row.license_number" ></el-input>
+              <el-input placeholder="请输入批准文号" v-model="scope.row.license_number" :disabled="stockShow"></el-input>
           </template>
         </el-table-column>
 
@@ -324,7 +326,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteWarehouseOutInfo, editWarehouseoutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getSingleOutOrderDetail,getStockBatchNumber } from '@/api/stock'
+  import { deleteWarehouseOutInfo, editWarehouseoutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getSingleOutOrderDetail,getStockBatchNumber,checkWarehouseOut,returnCheckWarehouseOut } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
@@ -397,6 +399,8 @@
         storelist:[],
         storehouse_id:"",
         doctorList:[],
+        showCheck:false,
+        showReturnCheck:false,
       }
     },
     methods: {
@@ -484,6 +488,10 @@
           this.$message.error("采购出库数据不能新增!")
           return
         }
+        if(this.is_check == 1){
+          this.$message.error("已审核的数据不能新增")
+          return
+        }
         this.stockTrue = false
         if(this.stockShow == true){
          this.$message.error("自动出库数据无法编辑")
@@ -516,6 +524,11 @@
           return
         }
 
+        if(this.is_check == 1){
+          this.$message.error("已审核的数据不能删除!")
+          return
+        }
+
         if(this.stockShow == true){
          this.$message.error("自动出库数据无法删除")
          return
@@ -697,7 +710,7 @@
               } else {
                 if(response.data.data.msg == 1){
                   this.$message.success('保存成功')
-                  this.$router.back(-1)
+                  // this.$router.back(-1)
                   loading.close()
                 }
 
@@ -904,7 +917,65 @@
           return
         }
       }
-     }
+     },
+     toCheck(){
+       const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+       var params = {
+         id:parseInt(this.$route.query.id)
+       }
+      checkWarehouseOut(params).then(response=>{
+        if(response.data.state == 1){
+          var msg = response.data.data.msg
+          var good_name = response.data.data.good_name
+          var specification_name = response.data.data.specification_name
+          var storehose_name = response.data.data.storehose_name
+          var str = storehose_name + " " + good_name +"*" + specification_name +"库存不足,请入库"
+          if(msg == 1){
+            this.$message.error(str)
+            loading.close()
+           } 
+           if(msg == 2){
+            this.$message.success("审核成功!")
+            this.recordInfo.recordData = [];
+            this.is_check = 1
+            this.$router.back(-1);
+            loading.close()
+           }
+        }else{
+          this.$message.error("审核失败!")
+          loading.close()
+        }
+      }) 
+    },
+    toReturnCheck(){
+       const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+       var params = {
+         id:parseInt(this.$route.query.id),
+       }
+      returnCheckWarehouseOut(params).then(response=>{
+         if(response.data.state == 1){
+            var list = response.data.data.list
+            this.$message.success("反审核成功")
+            this.is_check = 2
+            this.$router.back(-1);
+            loading.close()
+         }else{
+           this.$message.error("反审核失败!")
+           loading.close()
+         }
+      })
+    }
+
     },
     created() {
       // var nowDate = new Date();
@@ -917,14 +988,16 @@
       //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       //   "-" +
       //   (nowDay < 10 ? "0" + nowDay : nowDay);
+      this.is_check = parseInt(this.$route.query.is_check) 
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id
+      
       this.getSingleOutOrderDetail(order_id)
       var is_sys = this.$route.query.is_sys
       if(is_sys == 0){
         this.stockShow = false
       }
-      if(is_sys == 1){
+      if(is_sys == 1 ||  this.is_check == 1){
         this.stockShow = true
       }
       if(is_sys == 12){

src/xt_pages/stock/stockQuery.vue

@@ -184,7 +184,7 @@
 
        <el-table-column label="总库存量" align="center">
          <template slot-scope="scope">
-           <span v-if="org_id == 9675 || org_id == 3907 || org_id == 9583">
+           <span v-if="org_id == 3907 || org_id == 9583">
               {{
               getWareInfo(scope.row.xt_warehouse_info) -
               getAutoCount(scope.row.id) -
@@ -192,7 +192,7 @@
               getCancelCount(scope.row.id)
               }}
            </span>
-           <span v-if="org_id != 9675 && org_id != 3907 && org_id != 9583">
+           <span v-if="org_id != 3907 && org_id != 9583">
                {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
            </span>
          </template>

src/xt_pages/supply/components/addGoodOrder.vue

@@ -1328,9 +1328,7 @@ export default {
     },
     MofyGoodOrder() {
       var id = this.warese_out_id;
-      console.log("采购单ID",id)
       var warehousing_id = this.id
-      console.log("采购订单ID",warehousing_id)
       var params = {
         id: id,
         warehousing_id:warehousing_id,
@@ -1347,18 +1345,17 @@ export default {
           }
           if (msg == 2) {
             var cancelList = response.data.data.cancelList
-            console.log("cancelLIST2332322332232323",cancelList)
             this.orderList = cancelList
             this.$refs.Popup.dialogVisible = true
             return
           }
 
           var purcaseOrder = response.data.data.purcaseOrder;
-          console.log("采购订单", purcaseOrder);
+         
           var goodOrder = response.data.data.goodOrder;
-          console.log("采购单", goodOrder);
+          
           var drugList = response.data.data.drugList;
-          console.log("druglist23323223", drugList);
+          
           var ids = "";
           // 如果采购单没有数据，则代表改订单第一次生成采购订单数据,未入库
           if (goodOrder.length == 0) {

src/xt_pages/user/dialysisSolution.vue

@@ -397,14 +397,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShows('置换量')" v-show="zhiShow">
-            <el-form-item label="置换量(L) : " prop="replacement_total">
-              <el-input
-                v-model="addPlan.replacement_total"
-                type="number"
-              ></el-input>
-            </el-form-item>
-          </el-col>
+         
 
           <el-col :span="8" v-if="isShows('钾')">
             <el-form-item label="钾（mmol/L）: " prop="kalium">
@@ -517,15 +510,18 @@
               <el-input v-model="addPlan.special_medicine_other"></el-input>
             </el-form-item>
           </el-col>
-
+           <el-col :span="8" v-if="isShows('置换量') && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)">
+            <el-form-item label="置换量(L) : " prop="replacement_total">
+              <el-input
+                v-model="addPlan.replacement_total"
+                type="number"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item
-              label="置换液："
-              v-if="
-                isShows('置换液') &&
-                  this.$store.getters.xt_user.template_info.template_id != 6
+              label="置换液：" v-if="isShows('置换液') &&   (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)
               "
-              v-show="huShow"
             >
               <el-select
                 v-model="addPlan.displace_liqui_part"
@@ -541,11 +537,10 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item
+            <!-- <el-form-item
               label="置换方式："
               v-if="
-                isShows('置换液') &&
-                  this.$store.getters.xt_user.template_info.template_id == 6
+                isShows('置换液')   && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)
               "
             >
               <el-select
@@ -560,10 +555,10 @@
                   :value="option.id"
                 ></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
 
-          <el-col :span="8" v-if="isShows('置换液总量')" v-show="totalShow">
+          <el-col :span="8" v-if="isShows('置换液总量')  && (addPlan.mode == 2 || addPlan.mode == 5 || addPlan.mode == 12)">
             <el-form-item label="置换液总量(L)">
               <el-input v-model="addPlan.displace_liqui_value"></el-input>
             </el-form-item>
@@ -900,7 +895,7 @@ export default {
         epo:"",
         epo_count:"",
         max_ultrafiltration_rate:"",
-   
+        
       },
       childPlan: {
         mode: '',
@@ -1406,7 +1401,7 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              this.$refs[formName].resetFields()
+              
               this.dialogFormVisible = false
               this.tableData[this.current_index].doctor =
                 response.data.data.solution.doctor
@@ -1415,6 +1410,7 @@ export default {
               this.tableData[this.current_index].initiate_mode =
                 response.data.data.solution.initiate_mode
               this.current_index = -1
+              this.$refs[formName].resetFields()
               return false
             }
           })
@@ -1489,7 +1485,7 @@ export default {
           }
           this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
           this.addPlan.dialysis_irrigation = this.dialysis_irrigation
-
+          this.addPlan.mode_id = parseInt(this.addPlan.mode_id)
           editPatientDialysisSolution(this.patientID,this.addPlan.id,this.addPlan, mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1501,10 +1497,8 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              this.$refs[formName].resetFields()
-
               this.dialogVisible = false
-
+              // this.$refs[formName].resetFields()
               for (var dindex in response.data.data.solution) {
                 if (dindex == 'id') {
                   continue
@@ -1517,6 +1511,7 @@ export default {
               // this.tableData[this.current_index].updated_time = response.data.data.solution.updated_time;
 
               this.current_index = -1
+              this.fetchPatientDialysisSolutions()
               return false
             }
           })
@@ -1531,6 +1526,7 @@ export default {
           const mode = '1'
           this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
           this.addPlan.dialysis_irrigation = this.dialysis_irrigation
+          this.addPlan.mode_id = parseInt(this.addPlan.mode_id)
           console.log("add",this.addPlan)
           createPatientDialysisSolution(
             this.patientID,
@@ -1547,13 +1543,14 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              this.$refs[formName].resetFields()
               this.dialogVisible = false
-              this.tableData.unshift(response.data.data.solution)
+              // this.tableData.unshift(response.data.data.solution)
               if (this.tableData.length > 10) {
                 this.tableData.pop()
               }
               this.total += 1
+              // this.$refs[formName].resetFields()
+              this.fetchPatientDialysisSolutions()
               return false
             }
           })
@@ -1574,7 +1571,6 @@ export default {
     openEdit(index, row) {
       console.log("ro2333333",row)
       this.current_index = index
-
       this.addPlan.id = row.id
       this.addPlan.mode = row.mode_id
       this.addPlan.mode_name = row.mode_name
@@ -1950,7 +1946,6 @@ export default {
 
     addPlanModeChange() {
       var thismode = parseInt(this.addPlan.mode)
-      console.log("addplan22323",this.addPlan.mode)
       if(thismode == 2 || thismode == 5 || thismode ==12){
           this.zhiShow = true
           this.huShow= true
@@ -2201,7 +2196,7 @@ export default {
     this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
     this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis','bilirubin_adsorption_column')
     this.queryParams.id = this.patientID
-    // this.fetchAllDoctorAndNurse();
+  
 
   }
 }