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

src/api/inspection.js

@@ -60,7 +60,6 @@ export function GetInitInspections(params) {
   })
 }
 
-
 export function CreatePatientPICInspection(id, data) {
   return request({
     url: '/api/patient/pic_inspection/create?patient=' + id,
@@ -77,7 +76,6 @@ export function editPatientPICInspection(id, data) {
   })
 }
 
-
 export function setRemind(params) {
   return request({
     url: '/api/patient/inspection_remind/set',
@@ -94,10 +92,8 @@ export function setRemindDialog(id,is_open) {
   })
 }
 
-
-
 export function getNewInspectionList(params){
- 
+
   return request({
     url:"/api/getnewinspectionList",
     method:"get",
@@ -114,9 +110,8 @@ export function getNewInspectionDetailList(params){
   })
 }
 
-
 export function EditPatientNewInspection(data){
- 
+
   return request({
     url:"/api/editpatientnewinspection",
     method:"post",
@@ -124,7 +119,23 @@ export function EditPatientNewInspection(data){
   })
 }
 
+// 新的检验检查接口
+export function getinspecitonbypatientgroup(params){
+  return request({//?patient_id=
+    url:'/api/getinspecitonbypatientgroup',
+    method:"Get",
+    params:params,
+  })
+}
 
+// 新的检验检查接口
+export function getinspectionchildlist(params){
+  return request({
+    url:'/api/getinspectionchildlist',
+    method:"Get",
+    params:params,
+  })
+}
 
 
 

src/lang/zh.js

@@ -314,7 +314,7 @@ export default {
     fapiao:"电子发票列表",
 
     drugStock:"药品盘存",
-    drugChange:"药品变更",
+    drugChange:"药品销售",
     drugQuery:"药品查询",
     drugCodeQuery:"药品追溯",
     drugSourceCode:"药品追溯"

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -398,7 +398,6 @@ export default {
       currentIndex:0,
       is_drug_open:"2",
       textarea:"",
-      drug_code_open:0,
       patientList:[]
 
     };
@@ -419,6 +418,7 @@ export default {
       getpartitionlist(params).then((res) => {
         if (res.data.state == 1) {
           this.fen = res.data.data.list;
+          this.is_drug_open = res.data.data.config.is_open
         }
       });
     },
@@ -536,7 +536,7 @@ export default {
           this.waitmount = res.data.data.itotal;
           this.alreadmount = res.data.data.wtotal;
           this.drugList = res.data.data.drug
-          this.drug_code_open = res.data.data.config.is_open
+          this.is_drug_open = res.data.data.config.is_open
         }
       });
       // console.log("2222222")
@@ -926,61 +926,68 @@ export default {
               cancelButtonText: "取 消",
               type: "warning",
             }).then(() => {
-              var tmp = that.currentRow.PatientID;
-              var params = {
-                patient_id: that.currentRow.PatientID,
-                time: that.start_time,
-              };
-              that.$confirm("确定是否对该患者进行发药?", "患者发药", {
-                confirmButtonText: "确 定",
-                cancelButtonText: "取 消",
-                type: "warning",
-              }).then(() => {
-                dispensingmedicine(params).then((res) => {
-                  if (res.data.state == 1) {
-                    that.$message.success("操作成功");
-                    that.gettodaynumber();
-                    that.searchAction();
-                    that.tableData = null;
-                    that.fun4(tmp);
-                    that.state = 2;
-
-                    //进行追溯码上传
-                    axios.get('http://127.0.0.1:9532/api/changedrug/four', {
-                      params:params
-                    })
-                      .then(function(response) {
-                        if (response.data.state == 0) {
-                          that.$message.error(response.data.msg)
-                          return false
+
+            })
+              .catch(() => {});
+            return false
+          } else {
+            var tmp = that.currentRow.PatientID;
+            var params = {
+              patient_id: that.currentRow.PatientID,
+              time: that.start_time,
+              admin_user_id: that.$store.getters.xt_user.user.id,
+            };
+            that.$confirm("确定是否对该患者进行发药?", "患者发药", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+              dispensingmedicine(params).then((res) => {
+                if (res.data.state == 1) {
+                  that.$message.success("操作成功");
+                  that.gettodaynumber();
+                  that.searchAction();
+                  that.tableData = null;
+                  that.fun4(tmp);
+                  that.state = 2;
+                  //进行追溯码上传
+                  axios.get('http://127.0.0.1:9532/api/changedrug/four', {
+                    params:params
+                  })
+                    .then(function(response) {
+                      if (response.data.state == 0) {
+                        that.$message.error(response.data.msg)
+                        return false
+                      } else {
+                        if (response.data.data.failed_code == -10) {
+                          that.$confirm(response.data.data.msg, '医保错误信息', {
+                            confirmButtonText: '确 定',
+                            type: 'warning'
+                          }).then(() => {
+
+                          }).catch(() => {
+                          })
                         } else {
-                          if (response.data.data.failed_code == -10) {
-                            that.$confirm(response.data.data.msg, '医保错误信息', {
+                          if(response.data.data.msg.length > 0){
+                            that.$confirm(response.data.data.msg, '上传信息', {
                               confirmButtonText: '确 定',
                               type: 'warning'
                             }).then(() => {
 
                             }).catch(() => {
                             })
-
-                          } else {
-
                           }
                         }
-                      })
-                      .catch(function(error) {
-                      })
-                  } else {
-                    that.$message.error(res.data.msg);
-                  }
-                });
-              })
-                .catch(() => {});
+                      }
+                    })
+                    .catch(function(error) {
+                    })
+                } else {
+                  that.$message.error(res.data.msg);
+                }
+              });
             })
               .catch(() => {});
-            return false
-          } else {
-
           }
         }).catch(function(error) {
           that.$confirm("数据异常，请检查医保程序是否有打开", "提示", {
@@ -1072,6 +1079,7 @@ export default {
             var tmp = that.currentRow.PatientID;
             var params = {
               patient_id: that.currentRow.PatientID,
+              admin_user_id: that.$store.getters.xt_user.user.id,
               time: that.start_time,
             };
             that.$confirm("确定是否对该患者进行退药?", "患者退药", {
@@ -1105,9 +1113,16 @@ export default {
 
                           }).catch(() => {
                           })
-
                         } else {
+                          if(response.data.data.msg.length > 0){
+                            that.$confirm(response.data.data.msg, '上传信息', {
+                              confirmButtonText: '确 定',
+                              type: 'warning'
+                            }).then(() => {
 
+                            }).catch(() => {
+                            })
+                          }
                         }
                       }
                     })

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -1036,21 +1036,35 @@
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
-                          {{
+                          <!-- {{
                             record.assessment_after_dislysis.systolic_blood_pressure
                               ? record.assessment_after_dislysis.systolic_blood_pressure
                               : "/"
-                          }}
+                          }} -->
+                          <span v-if="record.monitor_records.length>0">
+                            {{ 
+                              record.monitor_records[record.monitor_records.length-1].systolic_blood_pressure ?
+                              record.monitor_records[record.monitor_records.length-1].systolic_blood_pressure :'/'
+                            }}
+                          </span>
+                          <span v-else>/</span>
                         </div>
                         /
                         <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
-                          {{
+                          <!-- {{
                              record.assessment_after_dislysis.diastolic_blood_pressure
                               ?  record.assessment_after_dislysis.diastolic_blood_pressure
                               : "/"
-                          }}
+                          }} -->
+                          <span v-if="record.monitor_records.length>0">
+                            {{ 
+                              record.monitor_records[record.monitor_records.length-1].diastolic_blood_pressure ?
+                              record.monitor_records[record.monitor_records.length-1].diastolic_blood_pressure : '/'
+                            }}
+                          </span>
+                          <span v-else>/</span>
                         </div>
                         mmHg
                       </div>

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -876,22 +876,36 @@
                       <div class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{
+                        <!-- {{
                           afterdialysis.systolic_blood_pressure
                             ? afterdialysis.systolic_blood_pressure
                             : "/"
-                        }}
+                        }} -->
+                          <span v-if="monitors.length>0">
+                            {{ 
+                              monitors[monitors.length-1].systolic_blood_pressure ?
+                              monitors[monitors.length-1].systolic_blood_pressure :"/"
+                            }}
+                          </span>
+                           <span v-else>/</span>
                       </div>
                       /
                       <div
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{
+                        <!-- {{
                           afterdialysis.diastolic_blood_pressure
                             ? afterdialysis.diastolic_blood_pressure
                             : "/"
-                        }}
+                        }} -->
+                        <span v-if="monitors.length>0">
+                          {{ 
+                            monitors[monitors.length-1].diastolic_blood_pressure ?
+                              monitors[monitors.length-1].diastolic_blood_pressure :"/"
+                          }}
+                        </span>
+                        <span v-else>/</span>
                       </div>
                       mmHg
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -278,7 +278,7 @@
 
         <table class="print-table" border="1">
           <tr>
-            <td style="height:40px;line-height:40px">时间</td>
+            <td style="height:25px;line-height:25px">时间</td>
             <td>医嘱</td>
             <td>医师签名</td>
             <td>执行时间</td>
@@ -286,7 +286,7 @@
             <td>核对者签名</td>
           </tr>
           <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
-            <td style="height:35px;line-height:35px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+            <td style="height:25px;line-height:25px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
             <td class="parent">
               <span v-if="advice.parent_id > 0">---></span>
               <span>{{ advice.advice_name }}</span>
@@ -305,9 +305,9 @@
               </span>
               <span
                 v-else
-                style="display:flex;align-items:center;justify-content:space-around;height:36px;"
+                style="display:flex;align-items:center;justify-content:space-around;height:25px;"
               >
-                <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
+                <img style="height:25px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
               </span>
             </td>
             <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
@@ -319,16 +319,16 @@
               </span>
               <span
                 v-else
-                style="display:flex;align-items:center;justify-content:space-around;height:36px;"
+                style="display:flex;align-items:center;justify-content:space-around;height:25px;"
               >
-                <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
+                <img style="height:25px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
               </span>
             </td>
             <td>
               <span v-if="setAdminUserES(advice.checker) == ''">
                 {{ getAdminUser(advice.checker) }}
               </span>
-              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:30px;">
                 <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt srcset />
               </span>
             </td>
@@ -1238,18 +1238,18 @@ export default {
             this.tableAdvice = tableAdvice
           }
 
-          // if (tableAdvice.length >= 6 && tableAdvice.length <= 8) {
-          //   const length = 6 - tableAdvice.length
-          //   var obj = { advice_name: '', start_time: '' }
-          //   for (i = 0; i < length; i++) {
-          //     console.log(1)
-          //     tableAdvice.push(obj)
-          //   }
+          if (tableAdvice.length >= 6 && tableAdvice.length <= 8) {
+            const length = 6 - tableAdvice.length
+            var obj = { advice_name: '', start_time: '' }
+            for (i = 0; i < length; i++) {
+              console.log(1)
+              tableAdvice.push(obj)
+            }
 
-          //   this.tableAdvice = tableAdvice
-          // }else{
-          //   this.tableAdvice = tableAdvice
-          // }
+            this.tableAdvice = tableAdvice
+          }else{
+            this.tableAdvice = tableAdvice
+          }
           this.afterdialysis = response.data.data.AssessmentAfterDislysis
           console.log('透后评估', this.afterdialysis)
           this.operators = response.data.data.operators

src/xt_pages/drugSourceCode/drugChange.vue

@@ -48,25 +48,10 @@
             </el-option>
           </el-select>
         </div>
-        <div>
-          <span>变更状态:</span>
-          <el-select size="small" v-model="change_type" placeholder="请选择"
-                    style="width:100px;" @change="change">
-            <el-option
-              label="不限"
-              value="3">
-            </el-option>
-            <el-option
-              v-for="item,index in changes"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </div>
+
         <div>
           <el-button type="primary" @click="query()">查询</el-button>
-          <el-button type="primary" @click="change_stock()">销售变更</el-button>
+          <el-button type="primary" @click="change_stock()">批量销售上传</el-button>
           <el-button type="primary" @click="exportdata()">导出</el-button>
 
           <!--        <el-button type="primary" @click="change()">变更</el-button>-->
@@ -128,12 +113,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="total" label="变更状态">
-          <template slot-scope="scope">
-            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
-          </template>
-        </el-table-column>
-
         <el-table-column align="center" prop="total" label="盘存日期">
           <template slot-scope="scope">
             <div>{{scope.row.pc_date}}</div>
@@ -142,8 +121,8 @@
 
         <el-table-column label="操作" width="200">
           <template slot-scope="scope">
-            <el-button v-if="!scope.row.is_sale || scope.row.is_sale == 0 || scope.row.is_bg == 0" type="primary" @click="sigle_stock(scope.row)">销售变更</el-button>
-            <el-button v-if="scope.row.is_sale == 1 || scope.row.is_bg == 1" type="warning" @click="deleteStock(scope.row)">撤销</el-button>
+            <el-button v-if="!scope.row.is_sale || scope.row.is_sale == 0" type="primary" @click="sigle_stock(scope.row)">销售上传</el-button>
+            <el-button v-if="scope.row.is_sale == 1" type="warning" @click="deleteStock(scope.row)">撤销</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -210,12 +189,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="total" label="变更状态">
-          <template slot-scope="scope">
-            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
-          </template>
-        </el-table-column>
-
         <el-table-column align="center" prop="total" label="盘存日期">
           <template slot-scope="scope">
             <div>{{scope.row.pc_date}}</div>
@@ -291,7 +264,7 @@ export default {
       patientList:[],
       crumbs: [
         { path: false, name: '药品追溯' },
-        { path: false, name: '药品变更' }
+        { path: false, name: '药品销售' }
       ],
     }
   },
@@ -336,33 +309,51 @@ export default {
         ids:ids,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      this.isloading = true
-      axios.get('http://127.0.0.1:9532/api/delete_xs_bg',{params:params}).then(function(response) {
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          this.isloading = false
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+            axios.get('http://127.0.0.1:9532/api/delete_xs_bg',{params:params}).then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.data.msg);
+                return false
+              } else {
+                if(response.data.data.failed_code == -10){
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.GetDrugStock()
+
+                }
+              }
+            }).catch(function(error) {
+            })
 
-          that.$message.error(response.data.data.msg);
+          })
+            .catch(() => {});
           return false
         } else {
-          this.isloading = false
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
-
-            }).catch(() => {
-            })
-          }else{
-            that.GetDrugStock()
-
 
-          }
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
 
-
     },
     sigle_stock(row){
       var that = this;
@@ -370,24 +361,52 @@ export default {
         ids:row.id,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      axios.get('http://127.0.0.1:9532/api/changedrug',{params:params}).then(function(response) {
+
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          that.$message.error(response.data.data.msg);
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+
+
+          })
+            .catch(() => {});
           return false
         } else {
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
-            }).catch(() => {
-            })
-          }else{
 
-          }
+          axios.get('http://127.0.0.1:9532/api/changedrug',{params:params}).then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.data.msg);
+              return false
+            } else {
+              if(response.data.data.failed_code == -10){
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+                }).catch(() => {
+                })
+              }else{
+
+
+              }
+            }
+          }).catch(function(error) {
+          })
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
+
     },
     handleSizeChange(val) {
       this.limit = val
@@ -445,6 +464,7 @@ export default {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
     change_stock(){
+
       let ids  = ""
       for (var i = 0; i < this.selection.length; i++){
         if (ids.length == 0){
@@ -453,30 +473,64 @@ export default {
           ids = ids + "," + this.selection[i].id
         }
       }
+      if(ids.length == 0 ){
+        this.$message.error("请勾选需要上传的数据");
+        return
+      }
+
       var that = this;
       let params = {
         ids:ids,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      axios.get('http://127.0.0.1:9532/api/changedrug',{params:params}).then(function(response) {
+
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          that.$message.error(response.data.data.msg);
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+          })
+            .catch(() => {});
           return false
         } else {
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
-            }).catch(() => {
-            })
-          }else{
-
-          }
+          axios.get('http://127.0.0.1:9532/api/changedrug',{params:params}).then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.data.msg);
+              return false
+            } else {
+              if(response.data.data.failed_code == -10){
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+                }).catch(() => {
+                })
+              }else{
+
+              }
+            }
+          }).catch(function(error) {
+          })
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
 
+
+
+
+
+
+
     },
     query(){
       this.GetDrugStock()

src/xt_pages/drugSourceCode/drugCodeQuery.vue

@@ -30,8 +30,8 @@
             value-format="yyyy-MM-dd"
           ></el-date-picker>
         </div>
-  
-  
+
+
         <div>
           <div>上传状态:
             <el-select size="small" v-model="is_sale" placeholder="请选择" style="width:100px;" @change="changeStock">
@@ -44,7 +44,7 @@
             </el-select>
          </div>
         </div>
-  
+
         <div>
           <el-button type="primary" @click="query()">查询</el-button>
           <el-button type="primary" @click="exportdata()">导出</el-button>
@@ -74,7 +74,7 @@
         </el-table-column>
         <el-table-column align="center" prop="name" label="药品追溯码">
           <template slot-scope="scope">
-            <div @click="getDrugCode(scope.row.id,scope.row.DataSources,scope.row.drug_code,scope.$index)"><el-input style="width: 100;" v-model="scope.row.drug_code"></el-input></div> 
+            <div @click="getDrugCode(scope.row.id,scope.row.DataSources,scope.row.drug_code,scope.$index)"><el-input style="width: 100;" v-model="scope.row.drug_code"></el-input></div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="上传状态">
@@ -94,14 +94,14 @@
         <el-table-column align="center" prop="name" label="操作" width="200">
           <template slot-scope="scope">
             <div>
-             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">未上传</el-button>   
+             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">撤销</el-button>
             <el-button type="primary" v-if="scope.row.is_upload == 0 || scope.row.is_upload == 2" @click="toUpload(scope.row)">上传</el-button>
-            <el-button v-if="faShow == true" type="primary" @click="toFaYao(scope.row)">发药</el-button>   
+            <el-button v-if="faShow == true" type="primary" @click="toFaYao(scope.row)">发药</el-button>
             </div>
           </template>
         </el-table-column>
-  
-       
+
+
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"
@@ -112,10 +112,10 @@
         style="margin-top:20px;float: right"
         :total="value"
       ></el-pagination>
-  
-    
- 
-  
+
+
+
+
 
       <el-dialog
         title="药品追溯码"
@@ -137,18 +137,18 @@
       </span>
       </el-dialog>
     </div>
-  
-   
+
+
   </template>
-  
-  
+
+
   <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getHisDrugCodeQueryList,createUploadDrugCode,getPatientDrugCode } from '../../api/new_stock/stock'
   import { getDictionaryDataConfig } from "@/utils/data";
   import { uParseTime } from '@/utils/tools'
   import { changeDrugCode } from "@/api/pharmacy";
-  
+
   import axios from 'axios'
   const moment = require('moment')
   export default {
@@ -160,7 +160,7 @@
         drugTypeList: [{ id: 0, name: "全部" }],
         start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
         end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
-  
+
         tableData: [],
         change_type:"3",
         selection:[],
@@ -198,7 +198,7 @@
         }
        },
        getDrugCode(id,DataSources,DrugCode,index){
-            this.id = id 
+            this.id = id
             this.textarea = DrugCode
             this.currentIndex = index
             this.dialogVisibleOne = true
@@ -276,8 +276,8 @@
         this.selection = selection
       },
       delete(){
-  
-  
+
+
       },
       exportdata(){
         console.log("hahahahh",this.tableData)
@@ -301,7 +301,7 @@
              this.tableData[i].specification_name = this.getDrugSpec(this.tableData[i].drug_id)
            }
         }
-       
+
         import('@/vendor/Export2Excel').then(excel => {
           const tHeader = ['患者姓名', '处方日期', '药品名称', '规格', '开药总量', '药品追溯码','上传状态','发药状态']
           const filterVal = ['patient_name', 'advice_date_str', 'advice_name', 'specification_name', 'prescribing_numbers', 'drug_code','is_upload_name','is_medicine_name']
@@ -313,11 +313,11 @@
            filename: '药品追溯'
          })
         })
-  
+
       },formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
-    
+
       query(){
         this.getlist()
       },
@@ -328,9 +328,9 @@
             name = this.drugTypeList[i].name;
           }
         }
-  
+
         return name;
-      },  
+      },
       getTime(val) {
         if(val == "" || val == undefined){
           return ""
@@ -346,7 +346,7 @@
           page:this.page,
           limit:this.limit,
           is_sale:this.is_sale,
-        
+
         }
         getHisDrugCodeQueryList(params).then(response => {
           if (response.data.state == 0) {
@@ -389,7 +389,7 @@
         })
       },
       toFaYao(row){
-        
+
         if(this.is_open == 1){
           if(row.drug_code==''){
              this.$message.error("药品追溯码不能为空!")
@@ -405,7 +405,7 @@
           if(response.data.state == 1){
              this.$message.success("发药成功!")
              this.getlist()
-          } 
+          }
         })
       }
     },
@@ -416,5 +416,4 @@
     }
   }
   </script>
-  
-  
+

src/xt_pages/drugSourceCode/drugQuery.vue

@@ -1,5 +1,9 @@
 <template>
   <div>
+    <div class="position">
+      <BreadCrumb :crumbs="crumbs"></BreadCrumb>
+    </div>
+    <div class="app-container">
     <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
       <div class="cell clearfix">
         <span>入库时间:</span>
@@ -31,8 +35,7 @@
         ></el-date-picker>
       </div>
 
-
-      <div>
+      <div class="cell clearfix">
         <div>查询类型:</div>
         <el-select size="small" v-model="stock_type" placeholder="请选择"
                    style="width:100px;margin-left:10px;" @change="changeStockType">
@@ -45,7 +48,7 @@
         </el-select>
       </div>
 
-      <div>
+      <div class="cell clearfix">
         <div>药品:</div>
         <el-select size="small" v-model="drug_id" placeholder="请选择"
                    style="width:100px;margin-left:10px;" @change="change">
@@ -65,6 +68,7 @@
         <el-button type="primary" @click="query()">查询</el-button>
       </div>
     </div>
+    </div>
     <el-table v-if="stock_type == 1" :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               max-height="600"
@@ -609,7 +613,6 @@ export default {
 
     },
     query(){
-
       var that = this;
       let params = {
         id:this.drug_id,
@@ -617,162 +620,195 @@ export default {
         end_time:this.end_time,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      this.tableData = []
-      if(this.stock_type == 1){
-
-        axios.get('http://127.0.0.1:9532/api/3508',{params:params}).then(function(response) {
-          if (response.data.state == 0) {
-            that.$message.error(response.data.data.msg);
-            return false
-          } else {
-            if(response.data.data.failed_code == -10){
-              that.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
-              })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
-            }
-          }
-        }).catch(function(error) {
-        })
 
-      }else if(this.stock_type == 2){
-        axios.get('http://127.0.0.1:9532/api/3509',{params:params}).then(function(response) {
-          if (response.data.state == 0) {
-            that.$message.error(response.data.data.msg);
-            return false
-          } else {
-            if(response.data.data.failed_code == -10){
-              that.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
+        if (response.data.state == 0) {
+          that.isloading = false
+
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+
+            this.tableData = []
+            if(that.stock_type == 1){
+
+              axios.get('http://127.0.0.1:9532/api/3508',{params:params}).then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.data.msg);
+                  return false
+                } else {
+                  if(response.data.data.failed_code == -10){
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
               })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
-
-            }
-          }
-        }).catch(function(error) {
-        })
 
-      }else if(this.stock_type == 3){
-        axios.get('http://127.0.0.1:9532/api/3511',{params:params}).then(function(response) {
-          if (response.data.state == 0) {
-            that.$message.error(response.data.data.msg);
-            return false
-          } else {
-            if(response.data.data.failed_code == -10){
-              that.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
+            }else if(that.stock_type == 2){
+              axios.get('http://127.0.0.1:9532/api/3509',{params:params}).then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.data.msg);
+                  return false
+                } else {
+                  if(response.data.data.failed_code == -10){
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
               })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
-            }
-          }
-        }).catch(function(error) {
-        })
+            }else if(that.stock_type == 3){
+              axios.get('http://127.0.0.1:9532/api/3511',{params:params}).then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.data.msg);
+                  return false
+                } else {
+                  if(response.data.data.failed_code == -10){
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
+              })
 
-      }else if(this.stock_type == 4){
-        axios.get('http://127.0.0.1:9532/api/3512',{params:params}).then(function(response) {
-          if (response.data.state == 0) {
-            that.$message.error(response.data.data.msg);
-            return false
-          } else {
-            if(response.data.data.failed_code == -10){
-              that.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
+            }else if(that.stock_type == 4){
+              axios.get('http://127.0.0.1:9532/api/3512',{params:params}).then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.data.msg);
+                  return false
+                } else {
+                  if(response.data.data.failed_code == -10){
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
               })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
-            }
-          }
-        }).catch(function(error) {
-        })
+            }else if(that.stock_type == 5){
+              axios.get('http://127.0.0.1:9532/api/3513',{params:params}).then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.data.msg);
+                  return false
+                } else {
+                  if(response.data.data.failed_code == -10){
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
+              })
 
-      }else if(this.stock_type == 5){
-        axios.get('http://127.0.0.1:9532/api/3513',{params:params}).then(function(response) {
-          if (response.data.state == 0) {
-            that.$message.error(response.data.data.msg);
-            return false
-          } else {
-            if(response.data.data.failed_code == -10){
-              that.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
+            }else if(this.stock_type == 6){
+              axios.get('http://127.0.0.1:9532/api/35081',{params:params}).then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.data.msg);
+                  return false
+                } else {
+                  if(response.data.data.failed_code == -10){
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
               })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
+            }else if(that.stock_type == 7){
+              axios.get('http://127.0.0.1:9532/api/35082',{params:params}).then(function(response) {
+                if (response.data.state == 0) {
+                  that.$message.error(response.data.data.msg);
+                  return false
+                } else {
+                  if(response.data.data.failed_code == -10){
+                    that.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
+              })
             }
-          }
-        }).catch(function(error) {
-        })
 
-      }else if(this.stock_type == 6){
-        axios.get('http://127.0.0.1:9532/api/35081',{params:params}).then(function(response) {
-          if (response.data.state == 0) {
-            that.$message.error(response.data.data.msg);
-            return false
-          } else {
-            if(response.data.data.failed_code == -10){
-              that.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
-              })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
-            }
-          }
-        }).catch(function(error) {
+          })
+            .catch(() => {});
+          return false
+        } else {
+
+        }
+      }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
         })
+          .catch(() => {});
+      })
+
 
-      }else if(this.stock_type == 7){
-        axios.get('http://127.0.0.1:9532/api/35082',{params:params}).then(function(response) {
-          if (response.data.state == 0) {
-            that.$message.error(response.data.data.msg);
-            return false
-          } else {
-            if(response.data.data.failed_code == -10){
-              that.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
-              })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
-            }
-          }
-        }).catch(function(error) {
-        })
-      }
     },
     change(){
 

src/xt_pages/drugSourceCode/drugStock.vue

@@ -33,12 +33,10 @@
             value-format="yyyy-MM-dd"
             @change="endTimeChange"
           ></el-date-picker>
-        </div>
 
-        <div>
-          <span>盘存状态:</span>
+          <span>销售状态:</span>
           <el-select size="small" v-model="stock_type" placeholder="请选择"
-                    style="width:100px;" @change="changeStock">
+                     style="width:100px;" @change="changeStock">
             <el-option
               label="不限"
               value="0">
@@ -52,32 +50,19 @@
           </el-select>
         </div>
 
-        <div>
-          <span>变更状态:</span>
-          <el-select size="small" v-model="change_type" placeholder="请选择"
-                    style="width:100px;" @change="change">
-            <el-option
-              label="不限"
-              value="0">
-            </el-option>
-            <el-option
-              v-for="item,index in changes"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </div>
+<!--        <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"-->
+<!--                  @keyup.enter.native='searchAction'-->
+<!--                  placeholder="请输入药品名称"-->
+<!--                  class="filter-item"/>-->
+
         <div>
           <el-button type="primary" @click="query()" >查询</el-button>
           <el-button type="primary" v-loading="isloading" @click="stock()">盘存</el-button>
           <el-button type="primary" @click="exportdata()">导出</el-button>
-
-          <!--        <el-button type="primary" @click="change()">变更</el-button>-->
         </div>
       </div>
-      <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
-                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+      <el-table :data="tableData" border :row-style="{ color: '#303133', height: '40px' }" ref="table2"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266' }"
                 max-height="600"
                 @select="selectCostInfo"
                 @selection-change="changeCostInfoTableData"
@@ -96,17 +81,15 @@
           <template slot-scope="scope">{{scope.row.spec}}</template>
         </el-table-column>
 
-        <el-table-column align="center" prop="name" label="追溯码">
-          <template slot-scope="scope">{{scope.row.drug_code}}</template>
-        </el-table-column>
-
-        <el-table-column align="center" prop="name" label="批号">
+        <el-table-column  width="100px"   align="center" prop="name" label="追溯码">
           <template slot-scope="scope">{{scope.row.drug_code}}</template>
         </el-table-column>
 
         <el-table-column align="center" prop="name" label="批号">
           <template slot-scope="scope">{{scope.row.batch_number}}</template>
         </el-table-column>
+
+
         <el-table-column align="center" prop="name" label="入库数量">
           <template slot-scope="scope">
             <div>{{scope.row.count}}{{scope.row.unit}}</div>
@@ -129,11 +112,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="total" label="变更状态">
-          <template slot-scope="scope">
-            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
-          </template>
-        </el-table-column>
+
 
         <el-table-column align="center" prop="total" label="盘存日期">
           <template slot-scope="scope">
@@ -203,11 +182,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="total" label="变更状态">
-          <template slot-scope="scope">
-            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
-          </template>
-        </el-table-column>
 
         <el-table-column align="center" prop="total" label="盘存日期">
           <template slot-scope="scope">
@@ -239,6 +213,7 @@ export default {
   },
   data() {
     return {
+      keywords:"",
       drugTypeList: [{ id: 0, name: "全部" }],
       start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
       end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 3, 0).toLocaleDateString('en-CA'),
@@ -263,34 +238,66 @@ export default {
     }
   },
   methods: {
+    searchAction(){
+
+
+    },
     sigle_stock(row){
       let ids  = row.id
       var that = this;
+
       let params = {
         ids:ids,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
+
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          that.$message.error(response.data.data.msg);
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+
+
+          })
+            .catch(() => {});
           return false
         } else {
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
 
-            }).catch(() => {
-            })
-          }else{
-            that.GetDrugStock()
-
-          }
+          //有打开则调用接口
+          axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.data.msg);
+              return false
+            } else {
+              if(response.data.data.failed_code == -10){
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
+              }else{
+                that.GetDrugStock()
+              }
+            }
+          }).catch(function(error) {
+          })
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
 
+
     },
     selectCostInfo(selection, row) {
       this.selection = selection
@@ -306,32 +313,56 @@ export default {
         ids:ids,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      this.isloading = true
-      axios.get('http://127.0.0.1:9532/api/delete_pc_bg',{params:params}).then(function(response) {
+
+
+
+
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          this.isloading = false
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
 
-          that.$message.error(response.data.data.msg);
+
+          })
+            .catch(() => {});
           return false
         } else {
-          this.isloading = false
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
+          axios.get('http://127.0.0.1:9532/api/delete_pc_bg',{params:params}).then(function(response) {
+            if (response.data.state == 0) {
 
-            }).catch(() => {
-            })
-          }else{
-            that.GetDrugStock()
+              that.$message.error(response.data.data.msg);
+              return false
+            } else {
+              if(response.data.data.failed_code == -10){
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
 
+                }).catch(() => {
+                })
+              }else{
+                that.GetDrugStock()
 
-          }
+
+              }
+            }
+          }).catch(function(error) {
+          })
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
-
     },
     exportdata(){
       let list = []
@@ -381,38 +412,62 @@ export default {
       var that = this;
       let params = {
         ids:ids,
-        admin_user_id:this.$store.getters.xt_user.user.id
+        admin_user_id:that.$store.getters.xt_user.user.id
       };
-      this.isloading = true
-      axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
+      var  that= this
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          this.isloading = false
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+
 
-          that.$message.error(response.data.data.msg);
+          })
+            .catch(() => {});
           return false
         } else {
-          this.isloading = false
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
-
-            }).catch(() => {
-            })
-          }else{
-            that.GetDrugStock()
-
+          that.isloading = true
+          //有打开则调用接口
+          axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
+            if (response.data.state == 0) {
+              that.isloading = false
+              that.$message.error(response.data.data.msg);
+              return false
+            } else {
+              that.isloading = false
+              if(response.data.data.failed_code == -10){
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
+              }else{
+                that.GetDrugStock()
+              }
+            }
+          }).catch(function(error) {
+          })
 
-          }
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
+
     },
     query(){
       this.GetDrugStock()
 
-
     },
     change(){
 
@@ -461,6 +516,7 @@ export default {
             let obj = {
               id:response.data.data.info[i].id,
               drug_name:response.data.data.info[i].drug.drug_name,
+              drug_code:response.data.data.info[i].drug_code,
               drug_type:this.getDrugType(response.data.data.info[i].drug.drug_type),
               spec: response.data.data.info[i].drug.dose + response.data.data.info[i].drug.dose_unit + "*" + response.data.data.info[i].drug.min_number + response.data.data.info[i].drug.min_unit+"/" +response.data.data.info[i].drug.max_unit,
               code:response.data.data.info[i].drug.medical_insurance_number,

src/xt_pages/outpatientTool/components/settle.vue

@@ -214,7 +214,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="cash_pay" label="储值卡说明">
+        <el-table-column align="center" prop="card_desc" label="储值卡说明">
           <!--          <template slot-scope="scope">{{scope.row.cash_pay}}</template>-->
           <template slot-scope="scope" style="width: 100px">
             <el-input v-model="scope.row.card_desc" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
@@ -386,7 +386,7 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="item_name" label="其他说明">
+      <el-table-column align="center" prop="item_name" label="储值卡说明">
         <template slot-scope="scope">{{scope.row.card_desc}}</template>
         <!--        <template slot-scope="scope" style="width: 100px">-->
         <!--          <el-input v-model="scope.row.oth_desc"></el-input>-->

src/xt_pages/user/components/PatientSidebar.vue

@@ -423,7 +423,6 @@ export default {
         console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
        this.$router.push({path:'/patient/patient/'+this.id+'/deathSummary'})
       }
-
     },
     changePatient(value) {
       console.log(value)

src/xt_pages/user/inspection_new.vue

@@ -73,7 +73,7 @@
             >新增
             </el-button
             >
-            <el-button
+            <!-- <el-button
               size="small"
               class="filter-item"
               type="primary"
@@ -92,7 +92,7 @@
               :disabled="itemDate ? false : true"
             >删除
             </el-button
-            >
+            > -->
           </div>
           <div class="filter-container">
             <el-button class="filter-item" type="text" style="color:#000"
@@ -102,7 +102,7 @@
               ></el-button
             >
           </div>
-          <div v-if="!isPic">
+          <div>
             <el-table
               stripe
               :header-cell-style="{
@@ -115,7 +115,7 @@
               style="width: 100%"
               id="user-inspection-order"
               ref="inspect_table"
-            > 
+            >
               <el-table-column
                 fixed
                 prop="inspect_date"
@@ -125,15 +125,15 @@
                   {{ getTime(scope.row.inspect_date) }}
                 </template>
               </el-table-column>
-              
+
               <el-table-column v-for="(item,index) in list" :key="index"
                 :prop="item.item_id"
                 :label="item.item_name" align="center"
                 min-width="130"
-              > 
+              >
                 <template slot-scope="scope">
                   <span v-if="item.range_type == 3">
-                    {{ getItemValueOne(scope.row.inspect_date,item.item_name) }}
+                    {{ getItemValue(scope.row.inspect_date,item.item_name) }}
                   </span>
 
                   <span v-if="item.range_type == 2">
@@ -145,7 +145,7 @@
                     <span v-if="parseFloat(getItemValue(scope.row.inspect_date,item.item_name)) < parseFloat(getrange(item.range_min)) ">
                       {{ getItemValue(scope.row.inspect_date,item.item_name) }} <span style="color: blue;" v-if="getItemValue(scope.row.inspect_date,item.item_name)>0">↓</span>
                     </span>
-                    <span v-if="parseFloat(getrange(item.range_min))<= parseFloat( getItemValue(scope.row.inspect_date,item.item_name)) && 
+                    <span v-if="parseFloat(getrange(item.range_min))<= parseFloat( getItemValue(scope.row.inspect_date,item.item_name)) &&
                           parseFloat(getItemValue(scope.row.inspect_date,item.item_name))<= parseFloat(getrange(item.range_max)) ">
                       {{ getItemValue(scope.row.inspect_date,item.item_name) }}
                     </span>
@@ -159,9 +159,19 @@
                   </span>
                 </template>
               </el-table-column>
+              <el-table-column
+                fixed="right"
+                prop="inspect_date"
+                label="操作"
+                align="center" width="150" >
+                <template slot-scope="scope">
+                  <el-button size="small" type="primary" @click="openEdit(scope.row)">修改</el-button>
+                  <el-button size="small" type="danger" @click="deleteInspection(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
- 
+
           <!-- <el-pagination
             align="right"
             @current-change="handleCurrentChangePage"
@@ -236,6 +246,7 @@
       </div>
     </el-dialog>
 
+    <!-- 新增修改 -->
     <el-dialog
       :title="formTitle"
       :visible.sync="dialogFormVisible"
@@ -343,7 +354,7 @@
 <script>
 import PatientSidebar from './components/PatientSidebar'
 import { getToken } from '@/api/qiniu'
-
+import moment from "moment"
 import {
   CreatePatientInspection,
   CreatePatientPICInspection,
@@ -430,7 +441,7 @@ export default {
           return false
         }
         console.log('response.data.data11',response.data.data);
-        
+
       })
     },
     getchildlist(project){
@@ -447,11 +458,8 @@ export default {
           // inspection.forEach(item => {
           //   referenceList.forEach(ite => {
           //     item.Child.forEach(it =>{
-                
           //       if(ite.item_id == it.item_id){
-          //         it.range_type = ite.range_type
-          //         it.range_max = ite.range_max
-          //         it.range_min = ite.range_min
+          //         ite.inspect_value = it.inspect_value
           //       }
 
           //       // if()
@@ -462,14 +470,13 @@ export default {
           this.list = referenceList
           this.$nextTick(() => {
             this.$refs.inspect_table.doLayout();
-
             // table加ref="multipleTable"
           });
         }
         console.log('response.data.data22',response.data.data);
       })
     },
-    
+
     changeInput(item) {
 
       if (item.item_name == '血清铁' || item.item_name == '总铁结合力') {
@@ -488,7 +495,11 @@ export default {
         })
       }
     },
-    deleteInspection() {
+    deleteInspection(row) {
+      this.project =row
+      this.itemDate = this.getTime(row.inspect_date)
+      console.log('itemDate',this.itemDate);
+
       if (this.project == null || this.itemDate == '') {
         this.$message.error('请先选择删除删除的记录')
         return false
@@ -505,6 +516,8 @@ export default {
             date: this.itemDate,
             project_id: this.project.project_id
           }
+          console.log('params');
+
           DeletePatientInspection(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -517,18 +530,18 @@ export default {
                 duration: 2000
               })
 
-              for (var index in this.projects) {
-                if (this.projects[index].project_id == params.project_id) {
-                  this.projects[index].count--
-                  break
-                }
-              }
-              this.total -= 1
+              // for (var index in this.projects) {
+              //   if (this.projects[index].project_id == params.project_id) {
+              //     this.projects[index].count--
+              //     break
+              //   }
+              // }
+              // this.total -= 1
               this.itemDate = ''
               this.items = []
               if (this.total > 0) {
                 this.queryParams.page = 1
-                this.fetchPatientInspections(this.queryParams)
+                this.getchildlist(this.project.project_id)
               }
             }
           })
@@ -585,19 +598,18 @@ export default {
           this.dialogRemindFormVisible = false
         }
       })
-    }, 
-    openEdit() {
-
-      if (this.project == null) {
-        this.$message.error('请先选择项目')
-        return false
-      }
+    },
+    openEdit(row) {
+      console.log('row111',uParseTime(row.inspect_date, '{y}-{m}-{d} {h}:{i}'));
+      this.itemDate =''
+      this.itemDate = this.getTime(row.inspect_date)
+      this.project =row
       if(this.isPic){
         this.form.pic_method = 'edit'
         this.formTitle = '修改' + this.project.project_name
         this.form.project_id = this.project.project_id
-        this.form.inspect_date = this.itemDate
-        this.form.old_inspect_date = this.itemDate
+        this.form.inspect_date = this.project.inspect_date
+        this.form.old_inspect_date = this.project.inspect_date
         this.form.imgs = []
         this.form.delete_imgs = []
         for(var index in this.inspections){
@@ -610,12 +622,14 @@ export default {
         console.log(this.form.imgs)
         this.dialogPicFormVisible = true
       }else{
-        console.log("22222")
+        console.log("22222",this.itemDate)
         this.form.method = 'edit'
         this.formTitle = '修改' + this.project.project_name
         this.form.project_id = this.project.project_id
         this.form.inspect_date = this.itemDate
         this.form.old_inspect_date = this.itemDate
+        // this.form.inspect_date = this.project.inspect_date
+        // this.form.old_inspect_date = this.project.inspect_date
         if(this.form.project_id == 14) {
           this.form.remind_cycle = this.patient_info.remind_cycle
         }else{
@@ -623,42 +637,40 @@ export default {
         }
         console.log(this.form.remind_cycle)
 
-
         this.form.formItem = []
-        console.log("hhhhhhhhhhhhh",this.project.inspection_reference)
-        console.log("inspectionsMap",this.inspectionsMap)
-        for (var index in this.project.inspection_reference) {
+        console.log("hhhhhhhhhhhhh",this.list)
+        console.log("inspectionsMap",row)
+        for (var index in this.list) {
           if(this.org_id ==10138){
             this.form.formItem.push({
-              id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
-              project_id: this.project.inspection_reference[index].project_id,
-              project_name: this.project.inspection_reference[index].project_name,
-              item_id: this.project.inspection_reference[index].id,
-              item: this.project.inspection_reference[index].item,
-              item_name: this.project.inspection_reference[index].item_name,
-              range_type: this.project.inspection_reference[index].range_type,
-              value: this.project.inspection_reference[index].item_id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].item_id].inspect_value : '',
-              select_options: this.project.inspection_reference[index].range_options.split(','),
-              unit: this.project.inspection_reference[index].unit,
-              item_id:parseInt(this.project.inspection_reference[index].item_id) ,
+              id: this.list[index].id,
+              project_id: this.list[index].project_id,
+              project_name: this.list[index].project_name,
+              item_id: this.list[index].item_id,
+              item: this.list[index].item,
+              item_name: this.list[index].item_name,
+              range_type: this.list[index].range_type,
+              value: this.getvalue(this.list[index].item_id,row.inspect_date),
+              select_options: this.list[index].range_options.split(','),
+              unit: this.list[index].unit,
+              item_id:parseInt(this.list[index].item_id) ,
             })
           }else{
             this.form.formItem.push({
-            id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
-            project_id: this.project.inspection_reference[index].project_id,
-            project_name: this.project.inspection_reference[index].project_name,
-            item_id: this.project.inspection_reference[index].id,
-            item: this.project.inspection_reference[index].item,
-            item_name: this.project.inspection_reference[index].item_name,
-            range_type: this.project.inspection_reference[index].range_type,
-            value: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value : '',
-            select_options: this.project.inspection_reference[index].range_options.split(','),
-            unit: this.project.inspection_reference[index].unit
-          })
+              id: this.list[index].id,
+              project_id: this.list[index].project_id,
+              project_name: this.list[index].project_name,
+              item_id: this.list[index].item_id,
+              item_name: this.list[index].item_name,
+              range_type: this.list[index].range_type,
+              value: this.getvalue(this.list[index].item_id,row.inspect_date) ,
+              select_options: this.list[index].range_options.split(','),
+              unit: this.list[index].unit
+            })
           }
 
         }
-        console.log(this.form.formItem)
+        console.log('11111',this.form.formItem)
         this.dialogFormVisible = true
       }
 
@@ -669,12 +681,14 @@ export default {
     setRemind(){
       this.dialogRemindFormVisible = true
     },
- 
+
     openNew() {
+      console.log('this.project',this.project);
       if (this.project == null) {
         this.$message.error('请先选择项目')
         return false
       }
+
       this.form.method = 'add'
       this.formTitle = '新增' + this.project.project_name
       this.form.project_id = this.project.project_id
@@ -683,31 +697,31 @@ export default {
       }
       // this.form.remind_cycle = this.patient_info.remind_cycle
       var today = new Date()
-      this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
+      this.form.inspect_date = this.getTime(today)
       this.form.formItem = []
 
-      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhh",this.project.inspection_reference)
-      for (var index in this.project.inspection_reference) {
+      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhh",this.list)
+      for (var index in this.list) {
         var item_id =0
-        if(this.project.inspection_reference[index].item_id == 0){
-            item_id =  parseInt(this.project.inspection_reference[index].id) 
+        if(this.list[index].item_id == 0){
+            item_id =  parseInt(this.list[index].id)
         }
-        if(this.project.inspection_reference[index].item_id > 0){
-          item_id = parseInt(this.project.inspection_reference[index].item_id) 
+        if(this.list[index].item_id > 0){
+          item_id = parseInt(this.list[index].item_id)
         }
         this.form.formItem.push({
           id: 0,
-          project_id: this.project.inspection_reference[index].project_id,
-          project_name: this.project.inspection_reference[index].project_name,
+          project_id: this.list[index].project_id,
+          project_name: this.list[index].project_name,
           item_id:item_id,
-          item: this.project.inspection_reference[index].item,
-          item_name: this.project.inspection_reference[index].item_name,
-          range_type: this.project.inspection_reference[index].range_type,
+          item: this.list[index].item,
+          item_name: this.list[index].item_name,
+          range_type: this.list[index].range_type,
           value: '',
-          select_options: this.project.inspection_reference[
+          select_options: this.list[
             index
             ].range_options.split(','),
-          unit: this.project.inspection_reference[index].unit
+          unit: this.list[index].unit
         })
       }
       console.log('form.formItem', this.form.formItem)
@@ -805,7 +819,7 @@ export default {
 
           console.log("this.form",this.form)
 
-         
+
           CreatePatientInspection(
             this.patientID,
             this.form,
@@ -893,7 +907,7 @@ export default {
         }
       })
     },
- 
+
     deletePic(item,index){
       if(item.id == 0){
         this.form.imgs.splice(index,1)
@@ -920,7 +934,7 @@ export default {
             this.patient_info = patient_info
             this.pageLoading = false
             console.log('11111',response.data.data);
-            
+
             // this.form.remind_cycle = this.patient_info.remind_cycle
           } else {
             this.$message.error(response.data.msg)
@@ -1034,14 +1048,14 @@ export default {
     //               }else{
     //                 console.log('执行3',inspectionsMap,item);
     //                 if(this.org_id == 10702 || this.org_id == 0){
-    //                   if(item.project_name == '血常规'|| item.project_name == '透后肾功能' || 
+    //                   if(item.project_name == '血常规'|| item.project_name == '透后肾功能' ||
     //                       item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能'
     //                     ){
     //                     console.log('11111',inspectionsMap[items[index].id].inspect_value);
     //                     item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
     //                     item.item_name = inspectionsMap[items[index].id].item_name
     //                   }else{
-                        
+
     //                     item.value = ''
     //                     item.item_name = ''
     //                   }
@@ -1055,7 +1069,7 @@ export default {
     //               item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
     //               item.item_name = inspectionsMap[items[index].item_id].item_name
     //             }
-               
+
 
     //             if(this.org_id ==10191){
     //               if(item.project_name == "乙肝定性（五项)"){
@@ -1116,14 +1130,14 @@ export default {
     //   }, 1000)
     // },
     getTime(val) {
-        if(val < 0){
-          return ""
-        }
-        if(val == ""){
+      if(val < 0){
         return ""
-        }else {
-        return uParseTime(val, '{y}-{m}-{d}')
-        }
+      }
+      if(val == ""){
+      return ""
+      }else {
+        return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
+      }
     },
     getItemValue(inspect_date,item_name){
       var inspect_value = ""
@@ -1142,7 +1156,23 @@ export default {
       }else{
         return ''
       }
-      
+
+    },
+    getvalue(val,time){
+      console.log();
+      const options = this.items
+      for(let i in options){
+        if( options[i].inspect_date == time){
+          for(let j in options[i].Child){
+            if(options[i].Child[j].item_id == val){
+              console.log('options[i].inspect_value',options[i].inspect_value);
+              return options[i].Child[j].inspect_value
+            }
+
+          }
+        }
+
+      }
     }
   },
   created() {
@@ -1161,7 +1191,7 @@ export default {
     // this.fetchInspectionReference()
   },
   mounted(){
-    
+
   }
 }
 </script>