Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/new_stock/stock.js

@@ -16,3 +16,31 @@ export function GetDrugChangeStock(params) {
 
   })
 }
+
+
+export function getHisDrugCodeQueryList(params){
+
+  return request({
+    url:"/api/drug/gethisdrugcodequery",
+    method:"get",
+    params:params
+  })
+}
+
+export function createUploadDrugCode(params){
+ 
+  return request({
+    url:"/api/drug/createuploaddrugcode",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getPatientDrugCode(params){
+ 
+  return request({
+    url:"/api/drug/getpatientdrugcode",
+    method:"Get",
+    params:params,
+  })
+}

src/lang/en.js

@@ -130,6 +130,7 @@ export default {
     objectRegistration:'objectRegistration',
     Dialysisanalysis:'Dialysisanalysis',
     eleFaPiao:'eleFaPiao',
+
   },
   navbar: {
     logOut: 'Log Out',

src/lang/zh.js

@@ -313,6 +313,11 @@ export default {
     patientSettleDetail:"患者结算列表",
     fapiao:"电子发票列表",
 
+    drugStock:"药品盘存",
+    drugChange:"药品变更",
+    drugQuery:"药品查询",
+    drugCodeQuery:"药品追溯",
+    drugSourceCode:"药品追溯"
   },
   navbar: {
     logOut: '退出登录',

src/router/index.js

@@ -38,6 +38,8 @@ import hospitalCharges from './modules/hospitalCharges'
 import DepositManagement from './modules/DepositManagement'
 import hisTool from './modules/hisTool'
 import eleFaPiao from './modules/eleFaPiao'
+import drugSourceCode from './modules/drugSourceCode'
+
 
 import supply from './modules/supply'
 
@@ -210,6 +212,7 @@ var _asy_router_map = [
   Dialysisanalysis,// 新菜单6.1
   DialysisIndex,
   DialysisLogIndex,
+  drugSourceCode
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/router/modules/drugSourceCode.js

@@ -0,0 +1,43 @@
+import Layout from '@/views/layout/Layout'
+
+
+export default {
+  path: '/drugSourceCode',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'drugSourceCode',
+  alwaysShow: true,
+  meta: {
+    title: 'drugSourceCode',
+    icon: 'drugSourceCode',
+    isChild: true
+  },
+  children: [
+    {
+      path: '/drugSourceCode/drugStock',
+      component: () => import('@/xt_pages/drugSourceCode/drugStock'),
+      name: 'drugStock',
+      meta: { title: 'drugStock', noCache: true }
+    },
+    {
+      path: '/drugSourceCode/drugChange',
+      component: () => import('@/xt_pages/drugSourceCode/drugChange'),
+      name: 'drugChange',
+      meta: { title: 'drugChange', noCache: true },
+    },
+    {
+      path: '/drugSourceCode/drugQuery',
+      component: () => import('@/xt_pages/drugSourceCode/drugQuery'),
+      name: 'drugQuery',
+      meta: { title: 'drugQuery', noCache: true },
+    },
+    {
+      path: '/drugSourceCode/drugCodeQuery',
+      component: () => import('@/xt_pages/drugSourceCode/drugCodeQuery'),
+      name: 'drugCodeQuery',
+      meta: { title: 'drugCodeQuery', noCache: true },
+    },
+
+
+  ]
+}

src/router/modules/hisTool.js

@@ -101,7 +101,7 @@ export default {
     //   component: () => import('@/xt_pages/outpatientTool/fapiao'),
     //   name: 'faPiao',
     //   meta: { title: 'faPiao', noCache: true }
-    // }, 
+    // },
     {
       path: '/hisTool/yidiClear',
       component: () => import('@/xt_pages/outpatientTool/yidiClear'),
@@ -176,33 +176,6 @@ export default {
       meta: { title: 'orgExportData', noCache: true }
     },
 
-        { //药品盘存
-          path: '/outpatientTool/drugStock',
-          component: () => import('@/xt_pages/outpatientTool/drugStock'),
-          name: 'drugStock',
-          meta: {
-            title: '药品盘存',
-            noCache: true
-          }
-        },
-        {//药品变更
-          path: '/outpatientTool/drugChange',
-          component: () => import('@/xt_pages/outpatientTool/drugChange'),
-          name: 'drugChange',
-          meta: {
-            title: '药品变更',
-            noCache: true
-          }
-        },
-        {//药品查询
-          path: '/outpatientTool/drugQuery',
-          component: () => import('@/xt_pages/outpatientTool/drugQuery'),
-          name: 'drugQuery',
-          meta: {
-            title: '药品查询',
-            noCache: true
-          },
-        },
     // {
     //   path: '/fapiao/settle',
     //   component: () => import('@/xt_pages/fapiao/settleDetail'),

src/views/layout/components/Sidebar/index.vue

@@ -69,7 +69,7 @@ export default {
     navTitle:{
       handler(newVal,oldVal){
         if(newVal == 'HIS管理'){
-          let nameArr = ['hospitalStation','hospitalRecord','hospitalCharges','DepositManagement','hisTool','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord','eleFaPiao'];
+          let nameArr = ['hospitalStation','hospitalRecord','hospitalCharges','DepositManagement','hisTool','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord','eleFaPiao','drugSourceCode'];
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -142,7 +142,7 @@
               </el-option>
             </el-select>
           </div>
-          
+
 
           <div>
             <el-button type="primary" @click="toExport" v-if="state == 2"
@@ -228,7 +228,7 @@
             </el-table-column>
             <el-table-column label="药品追溯码" width="162" align="center">
               <template slot-scope="scope">
-                <div @click="getDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode,scope.$index)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div> 
+                <div @click="getDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode,scope.$index)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div>
               </template>
             </el-table-column>
             <el-table-column label="开立医生" width="150" align="center">
@@ -249,7 +249,7 @@
               </template>
             </el-table-column>
 
-        
+
             <el-table-column label="备注" width="170" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Remarks ? scope.row.Remarks : "" }}</span>
@@ -265,6 +265,11 @@
           <el-radio v-model="is_open" label="1">是</el-radio>
           <el-radio v-model="is_open" label="2">否</el-radio>
         </span>
+        <span style="font-size: 17px">请选择是否发药时上传追溯码</span>
+        <span style="display: block; padding: 18px 25px">
+          <el-radio v-model="is_drug_open" label="1">是</el-radio>
+          <el-radio v-model="is_drug_open" label="2">否</el-radio>
+        </span>
         <div
           style="
             height: 50px;
@@ -301,13 +306,15 @@
         <el-button type="primary" @click="saveTextArea()">确 定</el-button>
       </span>
       </el-dialog>
+
+
     </div>
 
     <patient-print
       ref="patientprint"
       :visibility="isVisibility"
       :propsTable="propsTable"
-      
+
     >
     </patient-print>
     <patientPrintTwo ref="patientprintTwo"
@@ -334,6 +341,7 @@ import {
   changeDrugCode
 } from "@/api/pharmacy";
 import dataDruguse from "../../router/modules/dataDruguse";
+import axios from 'axios'
 const moment = require("moment");
 export default {
   components: {
@@ -388,6 +396,11 @@ export default {
       drug_code:0,
       currentRow:{},
       currentIndex:0,
+      is_drug_open:"2",
+      textarea:"",
+
+
+      drug_code_open:0,
 
     };
   },
@@ -524,6 +537,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 = response.data.data.config.is_open
         }
       });
       // console.log("2222222")
@@ -610,7 +624,7 @@ export default {
             age:res.data.data.patients.age,
             gender: res.data.data.patients.gender,
             diagnose:res.data.data.patients.diagnose,
-            zhixing:res.data.data.patients.created_time      
+            zhixing:res.data.data.patients.created_time
           }
           this.patients =obj
           if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ||  this.$store.getters.xt_user.org.id == 0  ||  this.$store.getters.xt_user.org.id == 10480  ){
@@ -662,8 +676,8 @@ export default {
         }
       }
 
-      
-      
+
+
     },
     toExport() {
       import("@/vendor/Export2Excel").then((excel) => {
@@ -727,16 +741,93 @@ export default {
 
     // 药品发药
     dispense() {
-      var tmp = this.currentRow.PatientID;
-      var params = {
-        patient_id: this.currentRow.PatientID,
-        time: this.start_time,
-      };
-      this.$confirm("确定是否对该患者进行发药?", "患者发药", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning",
-      }).then(() => {
+      if (this.is_drug_open == 1){
+       var  that= this
+        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.$confirm("数据异常，请检查医保程序是否有打开", "提示", {
+              confirmButtonText: "确 定",
+              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
+                        } else {
+                          if (response.data.data.failed_code == -10) {
+                            that.$confirm(response.data.data.msg, '医保错误信息', {
+                              confirmButtonText: '确 定',
+                              type: 'warning'
+                            }).then(() => {
+
+                            }).catch(() => {
+                            })
+
+                          } else {
+
+                          }
+                        }
+                      })
+                      .catch(function(error) {
+                      })
+                  } else {
+                    that.$message.error(res.data.msg);
+                  }
+                });
+              })
+                .catch(() => {});
+            })
+              .catch(() => {});
+            return false
+          } else {
+
+          }
+        }).catch(function(error) {
+          that.$confirm("数据异常，请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+          })
+            .catch(() => {});
+        })
+
+      }else{
+        var tmp = this.currentRow.PatientID;
+        var params = {
+          patient_id: this.currentRow.PatientID,
+          time: this.start_time,
+        };
+        this.$confirm("确定是否对该患者进行发药?", "患者发药", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
           dispensingmedicine(params).then((res) => {
             if (res.data.state == 1) {
               this.$message.success("操作成功");
@@ -745,13 +836,18 @@ export default {
               this.tableData = null;
               this.fun4(tmp);
               this.state = 2;
-           
+
+
             } else {
               this.$message.error(res.data.msg);
             }
           });
         })
-        .catch(() => {});
+          .catch(() => {});
+      }
+
+
+
     },
 
     toSetting() {
@@ -760,34 +856,117 @@ export default {
           this.dialogVisible = true;
           var config = response.data.data.config;
           this.is_open = config.is_open.toString();
+          var codeConfig = response.data.data.codeConfig
+          this.is_drug_open = codeConfig.is_open.toString()
         }
       });
     },
     SaveSetting() {
       var params = {
         is_open: parseInt(this.is_open),
+        is_drug_open:parseInt(this.is_drug_open)
       };
       SaveSetting(params).then((response) => {
         if (response.data.state == 1) {
           var config = response.data.data.config;
           this.$message.success("保存成功!");
-         
+
           this.dialogVisible = false;
         }
       });
     },
     // 药品退药
     endispense() {
-      var tmp = this.currentRow.PatientID;
-      var params = {
-        patient_id: this.currentRow.PatientID,
-        time: this.start_time,
-      };
-      this.$confirm("确定是否对该患者进行退药?", "患者退药", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning",
-      }).then(() => {
+      if (this.is_drug_open == 1){
+        var  that= this
+        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.$confirm("数据异常，请检查医保程序是否有打开", "提示", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+
+            })
+              .catch(() => {
+
+              });
+            return false
+          } else {
+            var tmp = that.currentRow.PatientID;
+            var params = {
+              patient_id: that.currentRow.PatientID,
+              time: that.start_time,
+            };
+            that.$confirm("确定是否对该患者进行退药?", "患者退药", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+              drugwithdrawal(params).then((res) => {
+                if (res.data.state == 1) {
+                  that.$message.success("操作成功");
+                  that.gettodaynumber();
+                  that.searchAction();
+                  that.tableData = null;
+                  that.fun5(tmp);
+                  that.state = 1;
+
+                  //进行追溯码上传
+                  axios.get('http://127.0.0.1:9532/api/delete_xs_bg_two', {
+                    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 {
+
+                        }
+                      }
+                    })
+                    .catch(function(error) {
+                    })
+
+                } else {
+                  that.$message.error(res.data.msg);
+                }
+              });
+            })
+              .catch(() => {});
+
+          }
+        }).catch(function(error) {
+          that.$confirm("数据异常，请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+          })
+            .catch(() => {});
+        })
+      }else{
+        var tmp = this.currentRow.PatientID;
+        var params = {
+          patient_id: this.currentRow.PatientID,
+          time: this.start_time,
+        };
+        this.$confirm("确定是否对该患者进行退药?", "患者退药", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
           drugwithdrawal(params).then((res) => {
             if (res.data.state == 1) {
               this.$message.success("操作成功");
@@ -796,15 +975,20 @@ export default {
               this.tableData = null;
               this.fun5(tmp);
               this.state = 1;
+
+
             } else {
               this.$message.error(res.data.msg);
             }
           });
         })
-        .catch(() => {});
+          .catch(() => {});
+
+      }
+
     },
     getDrugName(drug_id){
-    
+
       var  medical_insurance_number = ""
       for(let i=0;i<this.drugList.length;i++){
        if(drug_id == this.drugList[i].id){
@@ -832,7 +1016,7 @@ export default {
        return spc
     },
     getDrugCode(id,DataSources,DrugCode,index){
-      this.id = id 
+      this.id = id
       var is_source =0
        if (DataSources == "his处方"){
         is_source = 1
@@ -870,12 +1054,14 @@ export default {
       if (event.key === 'Enter') {
         var textarea = ""
         textarea += this.textarea + ","
-        console.log("textarea-=----------------------",textarea)
+
         this.textarea = textarea
       }
-   
 
-    }
+
+    },
+
+
   },
 };
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -839,6 +839,40 @@
                             </td>
                           </tr>
                         </template>
+
+                        <tr v-for="(advice, advice_index) in record.his_project" :key="advice_index" v-if="org_id == 0 || org_id ==10206">
+                        <td height="32px;padding:1px 1px">
+                            <span v-if="advice.start_time">
+                                {{ getTime(advice.start_time, "{h}:{i}") }}
+                            </span>
+                        </td>
+                        <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
+                            <span style="padding-left:5px;display:inline-block;">
+                              <span v-if="advice.type ==2">{{ advice && advice.project ? advice.project.project_name : '' }} {{ advice.count }} {{ advice.unit }}</span>
+                              <span v-if="advice.type ==3">{{ advice && advice.good_info ? advice.good_info.good_name : '' }}  {{ advice && advice.good_info ? advice.good_info.specification_name : '' }} {{ advice.count }} {{ advice.unit }}</span>
+                            </span>
+                        </td>
+
+                        <td height="32px">
+                            <span v-if="setAdminUserES(advice, 'doctor') == ''">
+                                {{getAdminUser(advice, 'doctor')}}
+                            </span>
+                            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'doctor')" alt srcset />
+                            </span>
+                        </td>
+                        <td height="32px">
+                            <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
+                                {{getAdminUser(advice, 'execution_staff')}}
+                            </span>
+                            <span v-else>
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
+                            </span>
+                        </td>
+                        <td height="32px">
+                            <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
+                        </td>
+                        </tr>
                       </tbody>
                     </table>
                   </td>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -941,7 +941,7 @@
                             record.prescription &&
                             record.prescription.displace_liqui_value
                               ? record.prescription.displace_liqui_value
-                              : "/"
+                              : "0"
                           }}
                           </span>
                         </div>

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

@@ -1147,6 +1147,42 @@
                             <span v-if="record.prescription.anticoagulant == 7"
                               >&nbsp;低分子肝素钠</span
                             >
+                            <span v-if="record.prescription.anticoagulant == 8"
+                              >&nbsp;依诺肝素</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 9"
+                              >&nbsp;达肝素</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 10"
+                              >&nbsp;体外抗凝</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 11"
+                              >&nbsp;那屈肝素</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 12"
+                              >&nbsp;无抗凝剂</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 13"
+                              >&nbsp;那屈肝素钙</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 14"
+                              >&nbsp;肝素钙注射液</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 15"
+                              >&nbsp;甲磺酸萘莫司他</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 16"
+                              >&nbsp;低分子量肝素钙</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 17"
+                              >&nbsp;肝素钠</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 18"
+                              >&nbsp;贝米肝素钠注射液</span
+                            >
+                            <span v-if="record.prescription.anticoagulant == 19"
+                              >&nbsp;低分子量肝素钠</span
+                            >
                           </div>
                         </div>
                         <div class="inline_block" style="margin-left: 20px">
@@ -1162,7 +1198,7 @@
                                 : "/"
                             }}
                           </div>
-                          <span v-if="record.prescription.anticoagulant == 4"
+                          <span v-if="record.prescription.anticoagulant == 4 || record.prescription.anticoagulant == 15"
                             >mg</span
                           >
                           <span v-if="record.prescription.anticoagulant == 3"
@@ -1207,6 +1243,9 @@
                                 : 0
                             }}
                           </div>
+                          <span v-if="record.prescription.anticoagulant == 15"
+                            >mg/h</span
+                          >
                           <span v-if="record.prescription.anticoagulant == 5"
                             >ml/h</span
                           >
@@ -1236,6 +1275,9 @@
                                 : "/"
                             }}
                           </div>
+                          <span v-if="record.prescription.anticoagulant == 15"
+                            >mg</span
+                          >
                           <span v-if="record.prescription.anticoagulant == 4"
                             >mg</span
                           >

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1921,7 +1921,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          if(this.org_id ==10206){
+          if(this.org_id ==10206 || this.org_id == 0){
             this.template_id = 80
             // this.template_id = 81
             console.log("templage-i233232323232322323233232323223",this.template_id)

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723) ||
               org_id == 10387
             "
           >
@@ -1681,7 +1681,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723) &&
                 org_id!=10387
             "
           >
@@ -1729,7 +1729,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723)
               || org_id == 10387
             "
           >
@@ -1802,7 +1802,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1876,7 +1876,8 @@
               org_id!=10697 &&
               org_id!=10635 &&
               org_id!=10702 &&
-              org_id!=10090
+              org_id!=10090 && 
+              org_id!=10723
               )
               || org_id == 10387 || org_id == 10694
             "

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -998,6 +998,14 @@
           type="primary"
           >打印</el-button
         >
+        <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisTwoPage"
+            type="primary"
+            >打印医嘱单</el-button
+         >
         </div>
       </template>
       <template v-if="org_template_info.template_id == 81">
@@ -2606,6 +2614,15 @@ export default {
 
 
       }
+
+      if(this.org_id == 0 || this.org_id == 10206){
+        printJS({
+          printable: "dialysis-print-box-1-2",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
+      }
     },
 
     getNumber() {
@@ -2676,6 +2693,10 @@ export default {
             this.org_template_info = response.data.data.org_template_info;
             this.org_template_info.template_id= 80
           }
+
+          if(this.org_id == 0){
+            this.org_template_info.template_id= 80
+          }
           console.log('kkkkkkk222222',this.org_template_info);
           this.loading = false;
           //   this.adminUser = response.data.data.users

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -996,7 +996,7 @@
                         <span v-if="org_id!=10206&& org_id!=10510 && org_id!=0"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
-                            : "/"
+                            : "0"
                         }}
                         </span>
                       </div>
@@ -2232,12 +2232,11 @@
                             advice.execution_frequency
                           }}</span>
                           <span
-                            v-if="
-                              advice.parent_id == 0 && advice.remark.length > 0
+                            v-if="advice.parent_id == 0 && advice.remark.length > 0 && org_id!=10644
                             "
                             >({{ advice.remark }})</span
                           >
-                          <span v-if="org_id == 0 || org_id == 10644">({{ advice.remark }})</span>
+                          <span v-if="(org_id == 0 || org_id == 10644) && advice.remark.length>0" >({{ advice.remark }})</span>
                         </td>
 
                         <td height="32px">

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -754,7 +754,7 @@
                         </td>
                       </tr>
 
-                      <!-- <tr
+                     <tr
                         v-for="(advice, advice_index) in projectsOne"
                         :key="advice_index"
                       >
@@ -813,7 +813,7 @@
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
                         </td>
-                      </tr> -->
+                      </tr> 
 
                     </tbody>
                   </table>
@@ -1377,9 +1377,9 @@
         </div>
       </div>
       <div class="row" style="margin-top: 15px">
-        <div class="inline_block" style="">
+        <div  style="">
           诊断：
-          <div class="under_line" style="width:180px;text-align: left;white-space: normal;">
+          <div class="under_line" style="width: 95%;text-align: left;white-space: normal;">
             {{ patientInfo.diagnose }}
           </div>
         </div>

src/xt_pages/outpatientTool/drugChange.vue → src/xt_pages/drugSourceCode/drugChange.vue

@@ -86,15 +86,19 @@
       <el-table-column align="center" prop="name" label="药品名称">
         <template slot-scope="scope">{{scope.row.drug_name}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="药品类型">
-        <template slot-scope="scope">{{scope.row.drug_type}}</template>
-      </el-table-column>
+
       <el-table-column align="center" prop="name" label="规格单位">
         <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.code}}</template>
+
+      <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="患者姓名">
+        <template slot-scope="scope">{{scope.row.p.name}}</template>
       </el-table-column>
+
       <el-table-column align="center" prop="name" label="批号">
         <template slot-scope="scope">{{scope.row.batch_number}}</template>
       </el-table-column>
@@ -111,13 +115,6 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="total" label="结算日期">
-        <template slot-scope="scope">
-          <div>{{scope.row.e_date}}</div>
-        </template>
-      </el-table-column>
-
-
       <el-table-column align="center" prop="total" label="销售状态">
         <template slot-scope="scope">
           <div>{{scope.row.is_sale?'已销售':'未销售'}}</div>
@@ -139,7 +136,7 @@
       <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 type="primary" @click="deleteStock(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>
         </template>
       </el-table-column>
     </el-table>

src/xt_pages/drugSourceCode/drugCodeQuery.vue

@@ -0,0 +1,419 @@
+<template>
+    <div>
+      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+        <div class="cell clearfix">
+          <span>发药时间:</span>
+          <el-date-picker
+            size="small"
+            v-model="start_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"
+            @change="changeStartTime"
+          ></el-date-picker>-
+          <el-date-picker
+           @change="changeEndTime"
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;margin-right:10px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            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">
+                <el-option
+                  v-for="item,index in items"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+            </el-select>
+         </div>
+        </div>
+  
+        <div>
+          <el-button type="primary" @click="query()">查询</el-button>
+          <el-button type="primary" @click="exportdata()">导出</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'}"
+                max-height="800"
+                @select="selectCostInfo"
+                @selection-change="changeCostInfoTableData"
+                @select-all="changeAllCostInfoTableData"
+                highlight-current-row>
+        <el-table-column align="center" prop="name" label="患者姓名">
+          <template slot-scope="scope">{{getPatientName(scope.row.patient_id) }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="处方日期">
+          <template slot-scope="scope">{{getTime(scope.row.advice_date)}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="药品名称">
+          <template slot-scope="scope">{{ scope.row.advice_name }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="规格">
+          <template slot-scope="scope">{{getDrugSpec(scope.row.drug_id)}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="开药总量">
+          <template slot-scope="scope">{{scope.row.prescribing_number}}{{ scope.row.prescribing_number_unit }}</template>
+        </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> 
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="上传状态">
+          <template slot-scope="scope">
+            <div v-if="scope.row.is_upload == 1">已上传</div>
+            <div v-if="scope.row.is_upload == 2 || scope.row.is_upload == 0">未上传</div>
+          </template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="发药状态">
+          <template slot-scope="scope">
+            <div v-if="scope.row.is_medicine == 1">已发药</div>
+            <div v-if="scope.row.is_medicine == 2 || scope.row.is_medicine == 0">未发药</div>
+          </template>
+        </el-table-column>
+
+        <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 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>   
+            </div>
+          </template>
+        </el-table-column>
+  
+       
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-size="5"
+        :page-sizes="[10, 20, 50, 100,500,1000,2000]"
+        background
+        style="margin-top:20px;float: right"
+        :total="value"
+      ></el-pagination>
+  
+    
+ 
+  
+
+      <el-dialog
+        title="药品追溯码"
+        :visible.sync="dialogVisibleOne"
+         width="40%">
+       <span>
+        <el-input
+          @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleOne = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </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 {
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        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:[],
+        page:1,
+        limit:10,
+        value:0,
+        is_sale:"0",
+        items: [
+          { id: "0", name: '全部' },
+          { id: "1", name: '已上传' },
+          { id: "2", name: '未上传' },
+        ],
+        patientList:[],
+        drugList:[],
+        dialogVisibleOne:false,
+        id:0,
+        is_source:0,
+        drug_code:0,
+        currentRow:{},
+        currentIndex:0,
+        is_drug_open:"2",
+        textarea:'',
+        total:0,
+        faShow:false,
+        is_open:false,
+      }
+    },
+    methods: {
+        changeText(event){
+        // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+        if (event.key === 'Enter') {
+            var textarea = ""
+            textarea += this.textarea + ","
+            this.textarea = textarea
+        }
+       },
+       getDrugCode(id,DataSources,DrugCode,index){
+            this.id = id 
+            this.textarea = DrugCode
+            this.currentIndex = index
+            this.dialogVisibleOne = true
+      },
+      saveTextArea(){
+       var params = {
+        id:this.id,
+        data_source:1,
+        drug_code:this.textarea,
+       }
+       console.log("paramss",params)
+      changeDrugCode(params).then(response=>{
+         if(response.data.state == 1){
+            this.$message.success("保存成功!")
+            for(let i=0;i<this.tableData.length;i++){
+             if(this.currentIndex == i){
+                this.tableData[i].drug_code = this.textarea
+             }
+            }
+            this.dialogVisibleOne = false
+         }
+      })
+    },
+    getPatientName(id){
+       var name = ""
+       for(let i=0;i<this.patientList.length;i++){
+          if(id == this.patientList[i].id){
+             name = this.patientList[i].name
+          }
+       }
+       return name
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      getDrugName(drug_id){
+        var drug_name = ""
+        for(let i=0;i<this.drugList.length;i++){
+           if(drug_id == this.drugList[i].id){
+              drug_name = this.drugList[i].drug_name
+           }
+        }
+        return drug_name
+      },
+      getDrugSpec(drug_id){
+        var specification_name = ""
+        for(let i=0;i<this.drugList.length;i++){
+          if(drug_id == this.drugList[i].id){
+            specification_name = this.drugList[i].specification_name
+          }
+        }
+        return specification_name
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getlist()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getlist()
+      },
+      selectCostInfo(selection, row) {
+        this.selection = selection
+      },
+       changeCostInfoTableData(val) {
+        this.selection = val
+      }, changeAllCostInfoTableData(selection) {
+        this.selection = selection
+      },
+      delete(){
+  
+  
+      },
+      exportdata(){
+        console.log("hahahahh",this.tableData)
+        if(this.tableData!=null && this.tableData.length>0){
+           for(let i=0;i<this.tableData.length;i++){
+             this.tableData[i].patient_name = this.getPatientName(this.tableData[i].patient_id)
+             this.tableData[i].advice_date_str = this.getTime(this.tableData[i].advice_date)
+             if(this.tableData[i].is_upload == 1){
+                this.tableData[i].is_upload_name = "已上传"
+             }
+             if(this.tableData[i].is_upload == 2 || this.tableData[i].is_upload == 0){
+                this.tableData[i].is_upload_name = "未上传"
+             }
+
+             if(this.tableData[i].is_medicine == 1){
+                this.tableData[i].is_medicine_name = "已发药"
+             }
+             if(this.tableData[i].is_medicine == 2 || this.tableData[i].is_medicine == 0){
+                this.tableData[i].is_medicine_name = "未发药"
+             }
+             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']
+
+          const data = this.formatJson(filterVal, this.tableData)
+           excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品追溯'
+         })
+        })
+  
+      },formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+      },
+    
+      query(){
+        this.getlist()
+      },
+      getDrugType(id) {
+        var name = "";
+        for (let i = 0; i < this.drugTypeList.length; i++) {
+          if (this.drugTypeList[i].id == id) {
+            name = this.drugTypeList[i].name;
+          }
+        }
+  
+        return name;
+      },  
+      getTime(val) {
+        if(val == "" || val == undefined){
+          return ""
+        }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
+      },
+      getlist(){
+        this.tableData = []
+        let params = {
+          start_time: this.start_time,
+          end_time: this.end_time,
+          page:this.page,
+          limit:this.limit,
+          is_sale:this.is_sale,
+        
+        }
+        getHisDrugCodeQueryList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+             this.tableData = response.data.data.list
+             this.total = response.data.data.total
+             this.drugList = response.data.data.drug
+             this.patientList = response.data.data.patients
+             this.is_open = response.data.data.codeConfig.is_open
+          }
+        })
+      },
+      changeStock(val){
+        this.is_sale = val
+        this.getlist()
+      },
+      changeStartTime(val){
+        this.start_time = val
+      },
+      changeEndTime(val){
+        this.end_time = val
+      },
+      toUpload(row){
+        if(row.is_medicine == 0 || row.is_is_medicine == 2){
+          this.$message.error("该药品未发药,请先发药")
+          this.faShow = true
+          return
+        }
+        var params = {
+          drug_id:row.drug_id,
+          patient_id:row.patient_id,
+         advice_date:row.advice_date,
+        }
+        createUploadDrugCode(params).then(response=>{
+          if(response.data.state == 1){
+            this.$message.success("上传成功!")
+          }
+        })
+      },
+      toFaYao(row){
+        
+        if(this.is_open == 1){
+          if(row.drug_code==''){
+             this.$message.error("药品追溯码不能为空!")
+             return
+          }
+        }
+          var params= {
+            drug_id:row.drug_id,
+            patient_id:row.patient_id,
+            advice_date:row.advice_date,
+          }
+        getPatientDrugCode(params).then(response=>{
+          if(response.data.state == 1){
+             this.$message.success("发药成功!")
+             this.getlist()
+          } 
+        })
+      }
+    },
+    created() {
+      var drugTypeList = getDictionaryDataConfig("system", "drug_type");
+      this.drugTypeList.push(...drugTypeList);
+      this.getlist()
+    }
+  }
+  </script>
+  
+  

src/xt_pages/outpatientTool/drugQuery.vue → src/xt_pages/drugSourceCode/drugQuery.vue

@@ -49,6 +49,10 @@
         <div>药品:</div>
         <el-select size="small" v-model="drug_id" placeholder="请选择"
                    style="width:100px;margin-left:10px;" @change="change">
+          <el-option
+            label="全部"
+            value="0">
+          </el-option>
           <el-option
             v-for="item,index in drugs"
             :key="index"
@@ -586,7 +590,7 @@ export default {
           return false
         } else {
           this.drugs = response.data.data.drugs
-          this.drug_id = this.drugs[0].id
+          this.drug_id = "0"
         }
       })
 

src/xt_pages/outpatientTool/drugStock.vue → src/xt_pages/drugSourceCode/drugStock.vue

@@ -88,15 +88,19 @@
       <el-table-column align="center" prop="name" label="药品名称">
         <template slot-scope="scope">{{scope.row.drug_name}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="药品类型">
-        <template slot-scope="scope">{{scope.row.drug_type}}</template>
-      </el-table-column>
+
       <el-table-column align="center" prop="name" label="规格单位">
         <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.code}}</template>
+
+      <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="批号">
+        <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>
@@ -113,11 +117,7 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="total" label="有效日期">
-        <template slot-scope="scope">
-          <div>{{scope.row.e_date}}</div>
-        </template>
-      </el-table-column>
+
 
 
       <el-table-column align="center" prop="total" label="盘存状态">
@@ -141,7 +141,7 @@
       <el-table-column label="操作" width="200">
         <template slot-scope="scope">
           <el-button v-if="!scope.row.is_pc || scope.row.is_pc == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
-          <el-button  type="primary" @click="deleteStock(scope.row)">删除</el-button>
+          <el-button v-if="scope.row.is_pc == 1 || scope.row.is_pc == 1"  type="primary" @click="deleteStock(scope.row)">撤销</el-button>
         </template>
       </el-table-column>
     </el-table>