数据

src/router/modules/patient.js

@@ -139,7 +139,7 @@ export default {
     }
   },
   {
-    path:"/patients/patients/:id/inspectionInfectious",
+    path: '/patients/patients/:id/inspectionInfectious',
     component: () => import('@/xt_pages/user/inspectionInfectious'),
     hidden: true,
     is_menu: false,
@@ -148,7 +148,17 @@ export default {
       title: 'inspectionInfectious',
       noCache: true
     }
-  
+  },
+  {
+    path: '/patients/patients/:id/templateSummary',
+    component: () => import('@/xt_pages/user/templateSummary'),
+    hidden: true,
+    is_menu: false,
+    name: 'templateSummary',
+    meta: {
+      title: 'templateSummary',
+      noCache: true
+    }
   },
   {
     path: '/patients/course',
@@ -193,5 +203,6 @@ export default {
       noCache: true
     }
   }
+
   ]
 }

src/xt_pages/data/template.vue

@@ -46,8 +46,8 @@ export default {
         { label: this.$t("data_config.special_record"), key: "special_record" },
         { label: this.$t("data_config.course_disease"), key: "course_disease" },
         { label: this.$t("data_config.rescue_record"), key: "rescue_record" },
-        // { label: this.$t("data_config.template_summary"), key: "template_summary" },
-        // { label: this.$t("data_config.template_plan"), key: "template_plan" }
+        { label: this.$t("data_config.template_summary"), key: "template_summary" },
+        { label: this.$t("data_config.template_plan"), key: "template_plan" }
       ],
       activeName: "education",
       createdTimes: 0

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

@@ -1283,42 +1283,44 @@
               })
               var msg = response.data.data.msg
               if(msg == 1){
-                this.$message.error("无库存,请入库")
-                return
+                var exid = response.data.data.advice.id
+                  if (response.data.data.advice.parent_id > 0) {
+                    exid = response.data.data.advice.parent_id
+                  }
+                
+                  this.currentRow.execution_state = 1
+                  this.currentRow.execution_staff =
+                    response.data.data.advice.execution_staff
+                  this.currentRow.execution_time =
+                    response.data.data.advice.execution_time
+                  var alen = this.doctor_advices.length
+
+                  for (var index in this.doctor_advices) {
+                    if (
+                      this.doctor_advices[index].id == exid ||
+                      this.doctor_advices[index].parent_id == exid
+                    ) {
+                      this.doctor_advices[index].execution_state = 1
+                      this.doctor_advices[index].execution_staff =
+                        response.data.data.advice.execution_staff
+                      this.doctor_advices[index].execution_time =
+                        response.data.data.advice.execution_time
+                      // this.doctor_advices[index].checker = response.data.data.advice.checker;
+                      break
+                    }
+                  }
+                  this.execTimeDialogVisible = false
+                  return false
               }
 
               if(msg == 2){
                 this.$message.error("库存不足,请入库")
                 return
               }
-              var exid = response.data.data.advice.id
-              if (response.data.data.advice.parent_id > 0) {
-                exid = response.data.data.advice.parent_id
-              }
-             
-              this.currentRow.execution_state = 1
-              this.currentRow.execution_staff =
-                response.data.data.advice.execution_staff
-              this.currentRow.execution_time =
-                response.data.data.advice.execution_time
-              var alen = this.doctor_advices.length
-
-              for (var index in this.doctor_advices) {
-                if (
-                  this.doctor_advices[index].id == exid ||
-                  this.doctor_advices[index].parent_id == exid
-                ) {
-                  this.doctor_advices[index].execution_state = 1
-                  this.doctor_advices[index].execution_staff =
-                    response.data.data.advice.execution_staff
-                  this.doctor_advices[index].execution_time =
-                    response.data.data.advice.execution_time
-                  // this.doctor_advices[index].checker = response.data.data.advice.checker;
-                  break
-                }
+              if(msg == 3){
+                this.$message.error("无库存,请入库")
               }
-              this.execTimeDialogVisible = false
-              return false
+              
             }
           })
           .catch(() => {

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -157,7 +157,7 @@
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
-                    :value="item.number">
+                    :value="item.id">
                   </el-option>
               </el-select>
               </el-form-item>
@@ -314,7 +314,11 @@ export default {
       tableRules: {
         return_count: [
           { required: true, message: "数量不能为空", trigge: "blur" }
-        ]
+        
+        ],
+        // price: [
+        //   { required: true, message: "单价不能为空", trigge: "blur" }
+        // ]
       },
       ruleForm: {
         manufacturer: [
@@ -340,7 +344,9 @@ export default {
       dealer: [],
       goodType: [],
       goodInfo:[],
-      numberList:[]
+      numberList:[],
+      dealerList:[],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -432,6 +438,7 @@ export default {
       tempObj["remark"] = ""
       tempObj["price"] = ""
       tempObj["total"] = ""
+      tempObj["warehouse_info_id"] =  0
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -539,12 +546,27 @@ export default {
             this.$message.success("请添加退库商品");
             return;
           }
+          console.log("hhhhh2h332",this.recordInfo.recordData)
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+            if(this.recordInfo.recordData[i].good_id == 0){
+               this.$message.error("耗材规格不能为空")
+               return
+            }
+
+            for(let j=0;j<this.numberList.length;j++){
+              if(this.recordInfo.recordData[i].number == this.numberList[j].id){
+                this.recordInfo.recordData[i].number = this.numberList[j].number
+                this.recordInfo.recordData[i].warehouse_info_id = this.numberList[j].id
+              }
+            }
+            
+          }
 
           const params = {
             cancelStock: this.recordInfo.recordData
           };
           console.log("params",params)
- 
+         
           postCancelStock(
             params,
             this.return_time,
@@ -563,6 +585,9 @@ export default {
              }
              if(msg == 2){
                this.$message.error("退库数量大于出库数量")
+             }
+              if(msg == 4){
+               this.$message.error("该批次退库数量大于入库数量")
              }
              if(msg == 3){
                this.$notify({
@@ -693,6 +718,7 @@ export default {
     tempObj["remark"] = ""
     tempObj["price"] = ""
     tempObj["total"] = ""
+    tempObj["warehouse_info_id"] = 0
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -112,12 +112,12 @@
                 :prop="'recordData.' + scope.$index + '.return_count'"
                 style="padding-top: 17px"
               >
-               <el-select v-model="scope.row.number" filterable placeholder="请选择">
+               <el-select v-model="scope.row.number" filterable placeholder="请选择" >
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
-                    :value="item.number">
+                    :value="item.id">
                   </el-option>
               </el-select>
               </el-form-item>
@@ -277,7 +277,10 @@
         tableRules: {
           count: [
             { required: true, message: '数量不能为空', trigge: 'blur' }
-          ]
+          ],
+          // price: [
+          //   { required: true, message: '单价不能为空', trigge: 'blur' }
+          // ]
 
         },
         ruleForm: {
@@ -311,7 +314,8 @@
         goodList:[],
         manufacturerList:[],
         dealerList:[],
-        numberList:[]
+        numberList:[],
+        numberShow:true
       }
     },
     methods: {
@@ -395,6 +399,7 @@
         tempObj["register_account"] = ""
         tempObj["remark"] = ""
         tempObj["price"] = ""
+        tempObj["warehouse_info_id"] = 0
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (row.id == 0) {
@@ -509,19 +514,50 @@
               array[i].price = array[i].price.toString()
             }
 
+            for(let i=0;i<this.recordInfo.recordData.length;i++){
+               if(this.recordInfo.recordData[i].good_id == 0){
+                  this.$message.error("耗材规格不能为空")
+                  return
+               }
+             for(let j=0;j<this.numberList.length;j++){
+                if(this.recordInfo.recordData[i].number == this.numberList[j].id){
+                  this.recordInfo.recordData[i].number = this.numberList[j].number
+                  this.recordInfo.recordData[i].warehouse_info_id = this.numberList[j].id
+                }
+             }
+            }
+
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
             console.log("parasm23232",params)
-         
+           
             editCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                this.$message.success('退库成功')
-
-                this.$router.back(-1)
+                var msg =  response.data.data.msg
+                if (msg == 1){
+                    this.$message.error("该耗材无出库记录")
+                    return
+                }
+                if(msg == 2){
+                  this.$message.error("退库数量大于出库数量")
+                }
+                  if(msg == 4){
+                  this.$message.error("该批次退库数量大于入库数量")
+                }
+                if(msg == 3){
+                  this.$notify({
+                    title: "成功",
+                    message: "退库成功",
+                    type: "success",
+                    duration: 2000
+                  });
+                  this.recordInfo.recordData = [];
+                  this.$router.back(-1);
+                }        
               }
             })
           } else {

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -499,6 +499,7 @@ export default {
       tempObj["product_date"] = ""
       tempObj["expiry_date"] = ""
       tempObj["batch_number"] = ""
+      tempObj["max_unit"] = ""
       tempObj["batch_number_id"] = 0
       this.recordInfo.recordData.push(tempObj);
     },
@@ -598,10 +599,12 @@ export default {
             return;
           }
           for(let i=0;i<this.recordInfo.recordData.length;i++){
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
              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
+                 
                 }
              }
           }
@@ -756,6 +759,7 @@ export default {
     tempObj["expiry_date"] = ""
     tempObj["batch_number"] = ""
     tempObj["batch_number_id"] = 0
+    tempObj["max_unit"] = ""
     this.unitList =  getDataConfig('hemodialysis','units')
     console.log("单位",this.unitList)
     this.recordInfo.recordData.push(tempObj);

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -858,7 +858,7 @@ export default {
          
      
         console.log("table",this.exportList)
-        return
+       
         const data = this.formatJson(filterVal, this.exportList)
         excel.export_json_to_excel({
           header: tHeader,

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -657,7 +657,7 @@ export default {
              }
 
              this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
-            //  this.recordInfo.recordData[i].manufacturer = this.recordInfo.recordData[i].drug.manufacturer
+             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].last_price.toString()
             
             for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
@@ -676,7 +676,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params22222222222",params)
-          
+         
           EditDrugWarehouse(
             params,
             this.warehousing_time,

src/xt_pages/stock/stockBatchNumber.vue

@@ -7,7 +7,7 @@
       <div class="cell clearfix">
         耗材名称:{{this.$route.query.good_name}} &nbsp;
         <!-- 库存: {{getInCount(this.$route.query.id)- getOutCount(this.$route.query.id) - getAutoCount(this.$route.query.id) + getCancelCount(this.$route.query.id)}}{{this.$route.query.packing_unit}}&nbsp; -->
-         {{getStockCount(this.$route.query.id)}}
+        库存: {{getStockCount(this.$route.query.id)}}
         规格:{{this.$route.query.specification_name}} &nbsp;
         厂家:{{this.$route.query.manufacturer}} 
       </div>

src/xt_pages/stock/stockQuery.vue

@@ -114,13 +114,13 @@
          </template>
        </el-table-column>
 
-       <el-table-column label="退库数量" align="center">
+       <!-- <el-table-column label="退库数量" align="center">
          <template slot-scope="scope">
            <span>{{getCancelCount(scope.row.good_id)}}{{scope.row.packing_unit}}</span>
 
          </template>
        </el-table-column>
-      
+       -->
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
            <!-- {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id) + getCancelCount(scope.row.good_id)}} {{scope.row.packing_unit}} -->

src/xt_pages/user/components/PatientSidebar.vue

@@ -102,6 +102,10 @@ export default {
               name: '1-2',
               label: '病程管理'
             },
+            // {
+            //   name: '1-9',
+            //   label: '阶段小结'
+            // },
             {
               name: '1-3',
               label: '检验检查'
@@ -183,7 +187,8 @@ export default {
         this.$router.push({path:'/patients/patient/'+this.id+'/vascularAccess'})
       }else if (name == '1-8'){
         this.$router.push({path:'/patients/patients/'+this.id+'/inspectionInfectious'})
-
+      }else if (name == '1-9'){
+        this.$router.push({path:'/patients/patients/'+6092+'/templateSummary'})
       }
     },
     changePatient(value) {
@@ -328,6 +333,8 @@ export default {
         this.$router.push({
           path: '/patients/patient/' + this.id + '/proeducation'
         })
+      }else if (patientKey == '1-9'){
+        this.$router.push({path:'/patients/patients/'+this.id+'/templateSummary'})
       }
     
      }else{