From 96e7d44285d23740b5fff533466a0104b1c892f0 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 14 Oct 2024 15:03:01 +0800
Subject: [PATCH] =?UTF-8?q?10/14=20=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/product/drugUdiinfos.js         |  52 +
 src/api/basic/product/udiInfo.js              |   8 +
 .../basic/product/drug/chooseHouseDrug.vue    | 640 ++++++++++++
 src/views/basic/product/drug/drugAdd.vue      | 951 +++++++++++++-----
 src/views/basic/product/drug/drugMaintain.vue | 119 ++-
 src/views/thirdSys/drug/thrDrug.vue           | 362 +++++++
 src/views/thirdSys/drug/thrDrugAdd.vue        | 256 +++++
 src/views/thirdSys/drug/thrDrugDetail.vue     | 113 +++
 src/views/thirdSys/drug/thrDrugEdit.vue       | 224 +++++
 9 files changed, 2485 insertions(+), 240 deletions(-)
 create mode 100644 src/api/basic/product/drugUdiinfos.js
 create mode 100644 src/views/basic/product/drug/chooseHouseDrug.vue
 create mode 100644 src/views/thirdSys/drug/thrDrug.vue
 create mode 100644 src/views/thirdSys/drug/thrDrugAdd.vue
 create mode 100644 src/views/thirdSys/drug/thrDrugDetail.vue
 create mode 100644 src/views/thirdSys/drug/thrDrugEdit.vue

diff --git a/src/api/basic/product/drugUdiinfos.js b/src/api/basic/product/drugUdiinfos.js
new file mode 100644
index 0000000..7aa1fd5
--- /dev/null
+++ b/src/api/basic/product/drugUdiinfos.js
@@ -0,0 +1,52 @@
+import axios from "@/utils/request";
+
+export function addDrug(query) {
+  return axios({
+    url: "/udi/udirel/addDrug",
+    method: "post",
+    data: query
+  });
+}
+
+export function updatetDrug(query) {
+  return axios({
+    url: "/udi/udirel/updatetDrug",
+    method: "post",
+    data: query
+  });
+}
+
+export function updateLevelDrug(query) {
+  return axios({
+    url: "/udi/udirel/updateLevelDrug",
+    method: "post",
+    data: query
+  });
+}
+
+
+export function delDrugLevel(query) {
+  return axios({
+    url: "udi/udirel/drug/delLevel",
+    method: "post",
+    data: query
+  });
+}
+
+export function calculateDistCount(query) {
+  return axios({
+    url: "udi/udirel/calculateDistCount",
+    method: "post",
+    data: query
+  });
+}
+
+export function calculateUseCount(query) {
+  return axios({
+    url: "udi/udirel/calculateUseCount",
+    method: "post",
+    data: query
+  });
+}
+
+
diff --git a/src/api/basic/product/udiInfo.js b/src/api/basic/product/udiInfo.js
index 481d302..d1ed975 100644
--- a/src/api/basic/product/udiInfo.js
+++ b/src/api/basic/product/udiInfo.js
@@ -50,3 +50,11 @@ export function selectOriginuuid(query) {
 }
 
 
+export function levelByUuid(query) {
+  return axios({
+    url: "/udiwms/udi/local/levelByUuid",
+    method: "get",
+    params: query
+  });
+}
+
diff --git a/src/views/basic/product/drug/chooseHouseDrug.vue b/src/views/basic/product/drug/chooseHouseDrug.vue
new file mode 100644
index 0000000..01728eb
--- /dev/null
+++ b/src/views/basic/product/drug/chooseHouseDrug.vue
@@ -0,0 +1,640 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="erpQuery" label-width="120px" v-if="showSearch">
+        <el-row>
+          <el-col :span="6">
+              <el-form-item label="医保编码:">
+                <el-input v-model="erpQuery.ybbm" style="width: 90%" clearable="true" placeholder="请输入医保编码"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          <el-col :span="6">
+            <el-form-item label="物资编码:">
+              <el-input v-model="erpQuery.code" style="width: 90%" placeholder="请输入药品编码" clearable="true"
+                        @keyup.enter.native="keyupErp_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="药品名称:">
+              <el-input v-model="erpQuery.name" style="width: 90%" placeholder="请输入药品名称" clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格/单位:">
+              <el-input v-model="erpQuery.spec" style="width: 90%" placeholder="包装/制剂 规格/单位" clearable="true"
+                        @keyup.enter.native="keyupErp_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="批准文号:">
+              <el-input v-model="erpQuery.registerNo" style="width: 90%" clearable="true" placeholder="请输入批准文号"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:">
+              <el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产企业"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="配送企业:">
+              <el-input v-model="erpQuery.supName" style="width: 90%" clearable="true" placeholder="请输入配送企业"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外部系统:">
+              <el-select v-model="thirdSysFk" style="width: 90%" placeholder="请设置主系统" disabled="isImport">
+                <el-option
+                  v-for="item in thirdSys"
+                  :key="item.value"
+                  :label="item.thirdName"
+                  :value="item.thirdId">
+                  <span style="float: left">{{ item.thirdName }}</span>
+                  <span
+                    style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="searchErpList">查询</el-button>
+          <el-button type="primary" icon="el-icon-bottom-left" @click="combine" :loading="combineLoading">选入</el-button>
+          <el-button type="primary" icon="el-icon-bottom-left" @click="combineAll" v-if="isImport  &&  !supEnable">结果全部选入</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table :data="erpList" style="width: 100%" highlight-current-row="true" border ref="multipleTable" @row-click="handleRowClick"
+                v-loading="erpLloading" @current-change="handleErpChange" @selection-change="handleSelectionChange">
+        <el-table-column v-if="isImport" type="selection" width="55" :selectable="checkSelectable"></el-table-column>
+        <el-table-column label width="45" v-if="!isImport">
+          <template slot-scope="scope">
+            <el-radio :label="scope.row.id" v-model="chenck" ><span></span></el-radio>
+          </template>
+        </el-table-column>
+        <!--<el-table-column v-if="!isImport" type="selection" width="55"></el-table-column>-->
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="医保编码" prop="ybbm"></el-table-column>
+        <el-table-column label="物资编码" prop="code"></el-table-column>
+        <el-table-column label="物资名称" prop="name"></el-table-column>
+        <el-table-column label="计量单位" prop="measname"></el-table-column>
+        <el-table-column label="包装规格" prop="spec"></el-table-column>
+        <el-table-column label="制剂规格" prop="prepnSpec"></el-table-column>
+        <el-table-column label="制剂单位" prop="prepnUnit"></el-table-column>
+        <el-table-column label="批准文号" prop="registerNo"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory"></el-table-column>
+        <el-table-column label="配送企业" prop="supName"></el-table-column>
+        <el-table-column label="操作" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+
+      </el-table>
+      <pagination
+        v-show="pageTotal>0"
+        :total="pageTotal"
+        :page.sync="erpQuery.page"
+        :limit.sync="erpQuery.limit"
+        @pagination="handleErpPageChange"
+      ></pagination>
+    </el-card>
+
+    <el-card class="el-card" v-if="!isImport">
+      <el-form label-width="120px">
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="物资名称:">
+              <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
+                        v-model="data.cpmctymc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="产品标识:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.nameCode"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="包装规格:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.bzgg"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="批准文号:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.zczbhhzbapzbh"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <el-form-item label="注册人英文名称:">-->
+          <!--    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"-->
+          <!--              v-model="data.ylqxzcrbarywmc"></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <el-form-item label="器械类别:">-->
+          <!--    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"-->
+          <!--              v-model="data.qxlb"></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+        </el-row>
+
+        <el-row>
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <el-form-item label="产品类别:">-->
+          <!--    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"-->
+          <!--              v-model="data.cplb"></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <el-form-item label="分类编码:">-->
+          <!--    <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"-->
+          <!--              v-model="data.flbm"></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="商品条码:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.sptm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="医保编码:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.ybbm"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="统一社会信用号:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.tyshxydm"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-dialog
+      title="药品信息详情"
+      :visible.sync="thrProductsDetailVisible"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="thrProductsDetailVisible"
+    >
+      <thrProductsDetail
+        :data="thisData"
+      ></thrProductsDetail>
+    </el-dialog>
+
+  </div>
+
+</template>
+
+<script>
+import {modifyRel, addErp, addAllErp, combineUdi} from "@/api/basic/udiRelevance";
+import {getInvbasdoc} from "@/api/basic/getErps";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
+import thrProductsDetail from "../../../thirdSys/drug/thrDrugDetail";
+
+export default {
+  name: "closeDialog",
+  props: {
+    uuid: {
+      type: Object,
+      required: true,
+    },
+
+    data: {
+      type: Object,
+      required: true,
+    },
+
+    relId: {
+      type: Number,
+      required: true,
+    },
+
+    isImport: {
+      type: Boolean,
+      required: true,
+    },
+
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    defaultSys: {
+      type: Object,
+      required: true,
+    },
+    supEnable: {
+      type: Object,
+      required: true,
+    },
+    intentThirdId: {
+      type: Object,
+      required: true,
+    },
+    mainIds: {
+      type: Array,
+      required: true,
+    }
+
+  },
+
+  data() {
+    return {
+      showSearch: true,
+      erpQuery: {
+        code: null,
+        name: null,
+        spec: null,
+        registerNo: null,
+        manufactory: null,
+        thirdSys: null,
+        supName: null,
+        measname: null,
+        page: 1,
+        limit: 10,
+        productType:2
+      },
+      thisData: null,
+      thrProductsDetailVisible: false,
+      combineLoading: false,
+      combineQuery: {
+        thirdId: "",
+        relId: "",
+        erpName: "",
+        keys: [],
+        thirdIds: [],
+        thirdSys: null,
+        query: null,
+        isRlInv: null,
+        manufactory: null,
+        measname: null,
+        ybbm: null,
+        sptm: null,
+      },
+
+      udidlList: [],
+      erpList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      loading: false,
+      erpLloading: false,
+      multipleUdiSelection: [],
+      thirdSys: [],
+      thirdSysFk: null,
+      chenck: '',
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.erpQuery = {
+        code: null,
+        name: null,
+        spec: null,
+        registerNo: null,
+        manufactory: null,
+        thirdSys: null,
+        supName: null,
+        measname: null,
+        page: 1,
+        limit: 10,
+        productType:2
+      };
+      this.getErpList();
+    },
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+
+    detailDialog(row) {
+      this.thisData = row;
+      this.thrProductsDetailVisible = true;
+    },
+
+    // checkSelectable(row) {
+    //   return !row.checked;
+    // },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleErpChange(val,currentRow, oldCurrentRow) {
+      if (!this.isImport){
+        this.chenck = val.id
+        this.currentRow = val;
+      }
+    },
+    handleRowClick(row){
+      row.isSelected = !row.isSelected;
+      let isTrue = this.checkSelectable(row)
+      if (isTrue){
+        this.$refs.multipleTable.toggleRowSelection(row);
+      }
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleErpPageChange(val) {
+      this.erpQuery.page = val.page;
+      this.getErpList();
+    },
+
+    searchErpList() {
+      this.erpQuery.page = 1;
+      this.getErpList();
+    },
+
+    keyup_submit(event) {
+
+      this.erpQuery.page = 1;
+      this.getErpList();
+      event.target.select();
+    },
+    getErpList() {
+      this.erplLoading = true;
+      this.erpQuery.thirdSys = this.thirdSysFk;
+      getInvbasdoc(this.erpQuery)
+        .then((response) => {
+          this.erplLoading = false;
+          if (response.code == 20000) {
+            this.erpList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.erpList = [];
+            this.pageTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.erplLoading = false;
+          this.erpList = [];
+          this.pageTotal = 0;
+        });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
+
+    combineAll() {
+
+      this.$confirm("此操作将在后台自动下载所有查询结果, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.combineQuery.thirdSys = this.thirdSysFk;
+          this.combineQuery.query = this.erpQuery;
+          addAllErp(this.combineQuery)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.$message.success(response.data);
+                this.closeDialog()
+              } else {
+                this.$message.error(response.message);
+                this.closeDialog()
+              }
+            })
+            .catch(() => {
+              this.closeDialog()
+            });
+        })
+        .catch(() => {
+        });
+
+
+    },
+
+    combine() {
+      this.combineQuery.query = null;
+      this.combineQuery.relId = this.relId;
+      this.combineQuery.thirdSys = this.thirdSysFk;
+      this.combineQuery.supEnable = this.supEnable;
+      if (this.isImport) {
+        this.combineQuery.thirdId = null;
+        let selectData = this.multipleUdiSelection;
+        let selected = '';
+        selectData.forEach((row) => {
+
+          if (row.checked) {
+            selected = selected + row.code + ",";
+          }
+          this.combineQuery.thirdIds.push(row.code);
+          this.combineQuery.manufactory = row.manufactory;
+          this.combineQuery.measname = row.measname;
+
+        });
+        if (this.currentRow != null) {
+          this.combineQuery.manufactory = this.currentRow.manufactory;
+          this.combineQuery.measname = this.currentRow.measname;
+        }
+
+
+        if (selectData.length == 0) {
+          this.$message.warning("未选择产品");
+          return;
+        }
+        if (selected != '') {
+          this.$confirm("物资编码：" + selected + "已被添加,是否继续添加", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.combineLoading = true;
+              combineUdi(this.combineQuery)
+                .then((response) => {
+                  this.combineLoading = false;
+                  if (response.code == 20000) {
+                    this.closeDialog()
+                    this.$message.success(response.data);
+                  } else {
+                    this.$message.error(response.message);
+                  }
+                })
+                .catch(() => {
+                  this.combineLoading = false;
+                  this.combineQuery.thirdIds = [];
+                  this.$emit("closeUdi", false);
+
+                });
+            })
+            .catch(() => {
+              this.combineQuery.thirdIds = [];
+            });
+        } else {
+          combineUdi(this.combineQuery)
+            .then((response) => {
+              this.combineLoading = false;
+              if (response.code == 20000) {
+                this.closeDialog()
+                this.$message.success(response.data);
+              } else {
+                this.closeDialog()
+                this.$message.warning(response.message);
+              }
+            })
+            .catch(() => {
+              this.combineLoading = false;
+              this.closeDialog()
+            });
+        }
+
+      } else {
+        this.combineQuery.thirdId = this.currentRow.code;
+        this.combineQuery.erpName = this.currentRow.name;
+        this.combineQuery.manufactory = this.currentRow.manufactory;
+        this.combineQuery.measname = this.currentRow.measname;
+        this.combineQuery.ybbm = this.currentRow.ybbm;
+        this.combineQuery.sptm = this.currentRow.sptm;
+        this.erpQuery.manufactory = this.currentRow.manufactory;
+        this.erpQuery.measname = this.currentRow.measname;
+        this.combineQuery.price = this.currentRow.price;
+
+
+        if (this.currentRow.checked) {
+
+          this.$confirm("物资编码：" + this.currentRow.code + "已被选入,是否继续选入", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.combineLoading = true;
+              modifyRel(this.combineQuery)
+                .then((response) => {
+                  this.combineLoading = false;
+                  if (response.code == 20000) {
+                    this.$emit("closeUdi", true);
+                  } else {
+                    this.$emit("closeUdi", false);
+                    this.$message.error(response.message);
+                  }
+                })
+                .catch(() => {
+                  this.combineLoading = false;
+                  this.$emit("closeUdi", false);
+                });
+            })
+        } else {
+          this.combineLoading = true;
+          modifyRel(this.combineQuery)
+            .then((response) => {
+              this.combineLoading = false;
+              if (response.code == 20000) {
+                this.$message.success("更新成功")
+                this.$emit("closeUdi", false);
+              } else {
+                this.$emit("closeUdi", false);
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.combineLoading = false;
+              this.$emit("closeUdi", false);
+            });
+        }
+
+      }
+    },
+
+    handleSelectionChange(val) {
+      this.multipleUdiSelection = val;
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+        mainSys: false,
+        filter: true,
+      };
+      if (this.isImport) {
+        query.mainSys = true;
+      }
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.thirdSysFk = this.thirdSys[0].thirdId;
+          if (this.defaultSys != null) {
+            this.thirdSysFk = this.defaultSys;
+          }
+          this.searchErpList();
+
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+    checkSelectable(row) {
+      if (this.mainIds == null) {
+        return true
+      } else {
+        if (this.mainIds.length > 0) {
+          return this.mainIds.indexOf(row.code) === -1
+        } else {
+          return true
+        }
+      }
+    }
+  },
+
+  components: {
+    thrProductsDetail
+  },
+
+  created() {
+    this.getBasicThirdSys();
+    this.erpQuery.code = this.intentThirdId;
+  },
+};
+</script>
+
+<style scoped>
+
+div /deep/ .el-table .warning-row {
+  background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+  background: #ffffff;
+}
+</style>
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 11e5b52..acfb08a 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -1,16 +1,44 @@
 <template>
   <div>
     <el-form :model="newProductData" :rules="formRules" label-width="140px" ref="dataForm">
+
       <el-collapse v-model="activeNames">
+        <el-collapse-item name="0" v-if="type != 1">
+          <template slot="title">
+            <p class="form-title">第三方信息</p>
+          </template>
+          <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+            <el-table-column label="第三方系统药品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+            <el-table-column label="第三方系统药品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+            <el-table-column label="第三方系统包装规格" prop="spec" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册号" prop="registerNo" show-overflow-tooltip></el-table-column>
+            <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==rowData.nameCode">
+                  关联
+                </el-button>
+                <el-button type="text" @click.native.stop="removeErp(scope.row)"
+                           :disabled=" scope.row.thirdId==null || scope.row.thirdId==''"
+                >解绑
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
         <el-collapse-item name="1">
           <template slot="title">
             <p class="form-title">药品层级</p>
           </template>
           <div style=" float: right;
                         text-align: right;
-                        margin-bottom: 8px;">
+                        margin-bottom: 8px;"
+          >
             <el-button type="primary" size="mini" icon="search" @click="addDrugLevel"
-                       style="text-align:right">新增药品层级
+                       style="text-align:right"
+            >新增药品层级
             </el-button>
           </div>
           <el-table
@@ -25,12 +53,24 @@
             <el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip width="160">
               <template slot-scope="scope">
                 <el-input size="small" v-model="scope.row.nameCode" style="width: 100%;margin: 4px;"
-
                           :disabled="scope.$index !== selectedIndex"
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip width="160">
+            <!--            1.主标识，2，使用单元标识，3.本体标识，4，包装标识-->
+            <el-table-column label="标识类型" prop="diType" show-overflow-tooltip width="160">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.diType"
+                           :disabled="scope.$index !== selectedIndex"
+                           style="width: 90%" placeholder="选择标识类型" clearable>
+                  <el-option label="最小销售标识" :value="1"></el-option>
+                  <!--                  <el-option label="使用单元标识" :value="2"></el-option>-->
+                  <!--                  <el-option label="本体标识" :value="3"></el-option>-->
+                  <el-option label="外包装标识" :value="4"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip width="100">
               <template slot-scope="scope">
                 <el-input size="small" v-model="scope.row.packLevel" style="width: 100%"
                           type="number"
@@ -38,16 +78,24 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="层级单位" prop="packUnit" show-overflow-tooltip width="100">
+            <el-table-column label="层级单位" prop="packUnit" show-overflow-tooltip width="120">
               <template slot-scope="scope">
                 <el-input size="small" v-model="scope.row.packUnit" style="width: 100%"
                           :disabled="scope.$index !== selectedIndex"
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="上级标识" prop="sjcpbm" show-overflow-tooltip width="160">
+            <el-table-column label="下级数量" prop="bhxjsl" show-overflow-tooltip width="100">
               <template slot-scope="scope">
-                <el-input size="small" v-model="scope.row.sjcpbm" style="width: 100%"
+                <el-input size="small" v-model="scope.row.bhxjsl" style="width: 100%"
+                          type="number"
+                          :disabled="scope.$index !== selectedIndex"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="下级单位" prop="xjdw" show-overflow-tooltip width="120">
+              <template slot-scope="scope">
+                <el-input size="small" v-model="scope.row.xjdw" style="width: 100%"
                           :disabled="scope.$index !== selectedIndex"
                 ></el-input>
               </template>
@@ -55,47 +103,169 @@
             <el-table-column label="下级标识" prop="bhxjcpbm" show-overflow-tooltip width="160">
               <template slot-scope="scope">
                 <el-input size="small" v-model="scope.row.bhxjcpbm" style="width: 100%"
-                          :disabled="scope.$index !== selectedIndex"
+                          :disabled="scope.$index !== selectedIndex "
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="下级数量" prop="bhxjsl" show-overflow-tooltip width="100">
+            <el-table-column label="上级标识" prop="sjcpbm" show-overflow-tooltip width="160">
               <template slot-scope="scope">
-                <el-input size="small" v-model="scope.row.bhxjsl" style="width: 100%"
-                          type="number"
+                <el-input size="small" v-model="scope.row.sjcpbm" style="width: 100%"
                           :disabled="scope.$index !== selectedIndex"
                 ></el-input>
               </template>
             </el-table-column>
+
             <el-table-column label="操作" width="180px" fixed="right">
               <template slot-scope="scope">
-                <el-button type="text" size="small" v-if="scope.$index == selectedIndex" @click.stop="true"
-                           @click.native="levelSave(scope.row)">保存
+                <el-button type="text" size="small" v-if="scope.$index == selectedIndex " @click.stop="true"
+                           @click.native="levelSave(scope.row)"
+                >保存
                 </el-button>
                 <el-button
                   type="text"
                   size="small"
-                  v-if="scope.$index != selectedIndex  "
+                  v-if="scope.$index != selectedIndex "
                   @click.stop="true"
                   @click.native="rowChange(scope.$index,scope.row)"
                 >编辑
                 </el-button>
+
+                <!--:disabled=" scope.row.id != null"-->
                 <el-button
                   type="text"
                   size="small"
                   @click.stop="true"
-                  :disabled="scope.$index == selectedIndex  ||  scope.row.id == null"
                   @click.native="deleteLevel(scope.$index, scope.row)"
                 >删除
+
                 </el-button>
               </template>
             </el-table-column>
           </el-table>
+
+          <template>
+            <p class="form-title2">流通时采用的计量单位设置</p>
+          </template>
+          <el-row :gutter="20">
+            <el-col :span="11" class="el-col">
+              <el-form-item label="计量单位:" prop="distributeLevel" label-width="160px">
+
+                <el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"
+                           @change="distributeLevelDiChange"
+                           placeholder="请选择计量单位"
+                >
+                  <el-option
+                    v-for="item in levelUnitList"
+                    :key="item.packLevel"
+                    :value="item.packLevel"
+                    :label="item.packUnit"
+                  >
+                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
+                    <span style="float: left">层级:{{ item.packLevel }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11" class="el-col">
+              <el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px">
+                <el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%"
+                           placeholder="请选择允许采集的最大层级"
+                >
+                  <el-option
+                    v-for="item in levelUnitList"
+                    :key="item.packLevel"
+                    :value="item.packLevel"
+                    :label="item.packLevel"
+                  >
+                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
+                    <span style="float: left">层级:{{ item.packLevel }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <template>
+            <p class="form-title2">使用时采用的计量单位设置</p>
+          </template>
+          <el-row :gutter="20">
+            <el-col :span="11" class="el-col">
+              <el-form-item label="计量单位:" prop="useLevel" label-width="160px">
+
+                <el-select v-model="newProductData.useLevel" size="small" style="width: 90%"
+                           clearable
+                           @change="useLevelDiChange"
+                           placeholder="请选择计量单位"
+                >
+                  <el-option
+                    v-for="item in levelUnitList"
+                    :key="item.packLevel"
+                    :value="item.packLevel"
+                    :label="item.packUnit"
+                  >
+                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
+                    <span style="float: left">层级:{{ item.packLevel }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11" class="el-col">
+              <el-form-item label="允许采集的最大层级:" prop="useMaxLevel" label-width="160px">
+                <el-select v-model="newProductData.useMaxLevel" size="small" style="width: 90%"
+                           clearable
+                           placeholder="请选择允许采集的最大层级"
+                >
+                  <el-option
+                    v-for="item in levelUnitList"
+                    :key="item.packLevel"
+                    :value="item.packLevel"
+                    :label="item.packLevel"
+                  >
+                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
+                    <span style="float: left">层级:{{ item.packLevel }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="11" class="el-col">
+              <el-form-item label="拆包后可用时长(小时):" prop="unpackUseTime" label-width="160px">
+
+                <el-input v-model="newProductData.unpackUseTime" size="small" style="width: 90%"
+                          clearable
+                          placeholder="请输入拆包后可用时长(小时)"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-collapse-item>
         <el-collapse-item name="2">
           <template slot="title">
             <p class="form-title">基本信息</p>
           </template>
+          <el-row type="flex">
+            <el-col :span="11" class="el-col">
+              <el-form-item label="医保编码:" prop="ybbm">
+                <el-input style="width: 90%" size="small" placeholder="请输入医保编码"
+                          v-model.trim="newProductData.ybbm"
+                          v-debounce-input:500ms="getYbDrugData"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11" class="el-col">
+              <el-form-item label="商品条码:" prop="sptm">
+                <el-input style="width: 90%" size="small" placeholder="请输入药品商品条码"
+                          v-model.trim="newProductData.sptm"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
           <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="药品通用名称:" prop="cpmctymc">
@@ -121,8 +291,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="11" class="el-col">
-              <el-form-item label="包装单位:" prop="packUnit">
-                <el-input style="width: 90%" size="small" placeholder="请输入包装单位"
+              <el-form-item label="最小包装单位:" prop="packUnit">
+                <el-input style="width: 90%" size="small" placeholder="请输入最小包装单位"
                           v-model.trim="newProductData.packUnit"
                 ></el-input>
               </el-form-item>
@@ -137,8 +307,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="11" class="el-col">
-              <el-form-item label="制剂单位:" prop="prepnUnit">
-                <el-input style="width: 90%" size="small" placeholder="请输入制剂单位"
+              <el-form-item label="剂型:" prop="prepnUnit">
+                <el-input style="width: 90%" size="small" placeholder="请输入剂型"
                           v-model.trim="newProductData.prepnUnit"
                 ></el-input>
               </el-form-item>
@@ -152,22 +322,23 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+            <!--<el-col :span="11" class="el-col">-->
+            <!--  <el-form-item label="包装比例:" prop="packRatio">-->
+            <!--    <el-input style="width: 90%" size="small" placeholder="请输入制剂单位"-->
+            <!--              v-model.trim="newProductData.packRatio"-->
+            <!--    ></el-input>-->
+            <!--  </el-form-item>-->
+            <!--</el-col>-->
             <el-col :span="11" class="el-col">
-              <el-form-item label="包装比例:" prop="packRatio">
-                <el-input style="width: 90%" size="small" placeholder="请输入制剂单位"
-                          v-model.trim="newProductData.packRatio"
+              <el-form-item label="批准文号:" prop="zczbhhzbapzbh">
+                <el-input style="width: 90%" size="small" placeholder="请输入批准文号"
+                          v-model="newProductData.zczbhhzbapzbh"
                 ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row type="flex">
-            <el-col :span="11" class="el-col">
-              <el-form-item label="批准文号:" prop="registerNo">
-                <el-input style="width: 90%" size="small" placeholder="请输入批准文号"
-                          v-model.trim="newProductData.registerNo"
-                ></el-input>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="11" class="el-col">
               <el-form-item label="生产企业:" prop="manufactory">
                 <el-input style="width: 90%" size="small" placeholder="请输入生产企业"
@@ -175,18 +346,19 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="药品类型:" prop="physicType">
-                <el-select v-model="newProductData.physicType" style="width: 90%" placeholder="选择药品类型" clearable>
+                <el-select v-model="newProductData.physicType" style="width: 90%" placeholder="选择药品类型">
+                  <el-option label="普通药品" :value="3"></el-option>
                   <el-option label="特殊药品原料药" :value="1"></el-option>
                   <el-option label="特殊药品制剂" :value="2"></el-option>
-                  <el-option label="普通药品" :value="3"></el-option>
                   <el-option label="未分类" :value="9"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row type="flex">
+
             <el-col :span="11" type="flex">
               <el-form-item label="药品分类:" prop="majorType">
                 <el-select v-model="newProductData.majorType" style="width: 90%" placeholder="选择药品分类" clearable>
@@ -196,15 +368,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row type="flex">
-            <el-col :span="11" class="el-col">
-              <el-form-item label="医保编码:" prop="ybbm">
-                <el-input style="width: 90%" size="small" placeholder="请输入医保编码"
-                          v-model.trim="newProductData.ybbm"
-                ></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="11" class="el-col">
               <el-form-item label="医保分类:" prop="medicareType">
                 <el-select v-model="newProductData.medicareType" style="width: 90%" placeholder="选择医保分类"
@@ -216,36 +379,22 @@
                 </el-select>
               </el-form-item>
             </el-col>
+
           </el-row>
           <el-row type="flex">
+
+
             <el-col :span="11" class="el-col">
               <el-form-item label="药品价格:" prop="price">
                 <el-input
                   style="width: 90%"
                   size="small"
                   placeholder="请输入药品价格"
-                  type="number"
-                  :precision="2"
-                  :min="0"
-                  v-model.number="newProductData.price"
+                  type="text"
+                  v-model="newProductData.price"
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="11" class="el-col">
-              <el-form-item label="有效期:" prop="indate">
-                <el-date-picker
-                  style="width: 90%"
-                  v-model="newProductData.indate"
-                  type="datetime"
-                  format="yyyy 年 MM 月 dd 日 HH 点 mm 分 ss 秒"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择有效期"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="存储条件:" prop="ylqxzcrbarmc">
                 <el-input style="width: 90%" size="small" placeholder="请输入存储条件"
@@ -253,6 +402,25 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+          </el-row>
+          <!--<el-row type="flex">-->
+
+          <!--  <el-col :span="11" class="el-col">-->
+          <!--    <el-form-item label="有效期:" prop="indate">-->
+          <!--      <el-date-picker-->
+          <!--          style="width: 90%"-->
+          <!--          v-model="newProductData.indate"-->
+          <!--          type="datetime"-->
+          <!--          format="yyyy 年 MM 月 dd 日 HH 点 mm 分 ss 秒"-->
+          <!--          value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--          placeholder="选择有效期"-->
+          <!--      >-->
+          <!--      </el-date-picker>-->
+          <!--    </el-form-item>-->
+          <!--  </el-col>-->
+          <!--</el-row>-->
+          <el-row type="flex">
+
             <el-col :span="11" class="el-col">
               <el-form-item label="运输条件:" prop="transportCondition">
                 <el-input style="width: 90%" size="small" placeholder="请输入运输条件"
@@ -260,8 +428,6 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="统一社会信用号:" prop="tyshxydm">
                 <el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号"
@@ -269,16 +435,50 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row type="flex">
+
             <el-col :span="11" class="el-col">
               <el-form-item label="药品状态:" prop="majorStatus">
-                <el-select v-model="newProductData.majorStatus" style="width: 90%" placeholder="选择药品状态" clearable>
+                <el-select v-model="newProductData.majorStatus" style="width: 90%" placeholder="选择药品状态">
                   <el-option label="停用" :value="0"></el-option>
                   <el-option label="在用" :value="1"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-
+          <!--<el-row type="flex" class="edit-row">-->
+          <!--<el-col :span="11">-->
+          <!--  <el-form-item label="收费项目编码:">-->
+          <!--    <el-input-->
+          <!--      style="width: 65%"-->
+          <!--      size="small"-->
+          <!--      placeholder="选择项目收费编码"-->
+          <!--      v-model="newProductData.payFeeCode"-->
+          <!--    ></el-input>-->
+          <!--    <el-button type="primary" size="mini" style="margin-left: 10px" @click="selectPayFeecode">选入-->
+          <!--    </el-button>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="11">-->
+          <!--  <el-form-item label="是否拆零:" prop="splitEnable">-->
+          <!--    <el-select v-model="newProductData.splitEnable" style="width: 90%" placeholder="是否拆零" clearable>-->
+          <!--      <el-option label="是" :value="true"></el-option>-->
+          <!--      <el-option label="否" :value="false"></el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--</el-row>-->
+          <!--<el-row type="flex" class="edit-row">-->
+          <!--<el-col :span="11">-->
+          <!--  <el-form-item label="是否自动赋码:" prop="autoCode">-->
+          <!--    <el-select v-model="newProductData.autoCode" style="width: 90%" placeholder="是否自动赋码" clearable>-->
+          <!--      <el-option label="是" :value="true"></el-option>-->
+          <!--      <el-option label="否" :value="false"></el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--</el-row>-->
           <el-row type="flex">
             <el-col :span="23" class="el-col">
               <el-form-item label="产品描述:" prop="cpms">
@@ -291,78 +491,83 @@
         </el-collapse-item>
 
 
-        <el-collapse-item name="3">
-          <template slot="title">
-            <p class="form-title">参数设置</p>
-          </template>
-          <el-row :gutter="20">
-            <el-col :span="11" class="el-col">
-              <el-form-item label="流通计量层级标识:" prop="distributeLevelDi" label-width="160px">
-                <el-select v-model="newProductData.distributeLevelDi" size="small" style="width: 90%"
-                           @change="distributeLevelDiChange"
-                           clearable
-                           placeholder="请选择流通计量层级标识">
-                  <el-option
-                    v-for="item in detailList"
-                    :key="item.nameCode"
-                    :value="item.nameCode"
-                    :label="item.nameCode">
-                    <span style="float: left">{{ item.nameCode }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11" class="el-col">
-              <el-form-item label="使用计量层级标识:" prop="useLevelDi" label-width="160px">
-                <el-select v-model="newProductData.useLevelDi" size="small" style="width: 90%"
-                           @change="useLevelDiChange"
-                           clearable
-                           placeholder="请选择流通计量层级标识">
-                  <el-option
-                    v-for="item in detailList"
-                    :key="item.nameCode"
-                    :value="item.nameCode"
-                    :label="item.nameCode">
-                    <span style="float: left">{{ item.nameCode }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11" class="el-col">
-              <el-form-item label="流通计量层级单位:" prop="distributeLevelUnit" label-width="160px">
-                <el-input style="width: 90%" size="small" placeholder="请输入流通计量层级单位"
-                          disabled
-                          v-model="newProductData.distributeLevelUnit"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11" class="el-col">
-              <el-form-item label="使用计量层级标识:" prop="useLevelUnit" label-width="160px">
-                <el-input style="width: 90%" size="small" placeholder="请输入使用计量层级标识"
-                          disabled
-                          v-model.trim="newProductData.useLevelUnit"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11" class="el-col">
-              <el-form-item label="流通时含计量单元数量:" prop="distributeLevelCount" label-width="160px">
-                <el-input style="width: 90%" size="small" placeholder="请输入流通时包含计量单元的数量"
-                          v-model.trim="newProductData.distributeLevelCount"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11" class="el-col">
-              <el-form-item label="使用时含计量单元数量:" prop="useLeverCount" label-width="160px">
-                <el-input style="width: 90%" size="small" placeholder="请输入使用时包含计量单元的数量"
-                          v-model.trim="newProductData.useLeverCount"
-                ></el-input>
-              </el-form-item>
-            </el-col>
+        <!--        <el-collapse-item name="3">-->
+        <!--          <template slot="title">-->
+        <!--            <p class="form-title">流通使用参数设置</p>-->
+        <!--          </template>-->
+        <!--          <el-row :gutter="20">-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="流通计量层级标识:" prop="distributeLevelDi" label-width="160px">-->
+        <!--                <el-select v-model="newProductData.distributeLevelDi" size="small" style="width: 90%"-->
+        <!--                           @change="distributeLevelDiChange"-->
+        <!--                           clearable-->
+        <!--                           placeholder="请选择流通计量层级标识"-->
+        <!--                >-->
+        <!--                  <el-option-->
+        <!--                    v-for="item in detailList"-->
+        <!--                    :key="item.nameCode"-->
+        <!--                    :value="item.nameCode"-->
+        <!--                    :label="item.nameCode"-->
+        <!--                  >-->
+        <!--                    <span style="float: left">{{ item.nameCode }}</span>-->
+        <!--                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>-->
+        <!--                  </el-option>-->
+        <!--                </el-select>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="使用计量层级标识:" prop="useLevelDi" label-width="160px">-->
+        <!--                <el-select v-model="newProductData.useLevelDi" size="small" style="width: 90%"-->
+        <!--                           @change="useLevelDiChange"-->
+        <!--                           clearable-->
+        <!--                           disabled-->
+        <!--                           placeholder="请选择流通计量层级标识"-->
+        <!--                >-->
+        <!--                  <el-option-->
+        <!--                    v-for="item in detailList"-->
+        <!--                    :key="item.nameCode"-->
+        <!--                    :value="item.nameCode"-->
+        <!--                    :label="item.nameCode"-->
+        <!--                  >-->
+        <!--                    <span style="float: left">{{ item.nameCode }}</span>-->
+        <!--                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>-->
+        <!--                  </el-option>-->
+        <!--                </el-select>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="流通计量层级单位:" prop="distributeLevelUnit" label-width="160px">-->
+        <!--                <el-input style="width: 90%" size="small" placeholder="请输入流通计量层级单位"-->
+        <!--                          disabled-->
+        <!--                          v-model="newProductData.distributeLevelUnit"-->
+        <!--                ></el-input>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="使用计量层级单位:" prop="useLevelUnit" label-width="160px">-->
+        <!--                <el-input style="width: 90%" size="small" placeholder="请输入使用计量层级标识"-->
+        <!--                          disabled-->
+        <!--                          v-model.trim="newProductData.useLevelUnit"-->
+        <!--                ></el-input>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="流通时含计量单元数量:" prop="distributeLevelCount" label-width="160px">-->
+        <!--                <el-input style="width: 90%" size="small" placeholder="请输入流通时包含计量单元的数量"-->
+        <!--                          v-model.trim="newProductData.distributeLevelCount"-->
+        <!--                ></el-input>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="使用时含计量单元数量:" prop="useLeverCount" label-width="160px">-->
+        <!--                <el-input style="width: 90%" size="small" placeholder="请输入使用时包含计量单元的数量"-->
+        <!--                          v-model.trim="newProductData.useLeverCount"-->
+        <!--                ></el-input>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
 
-          </el-row>
-        </el-collapse-item>
+        <!--          </el-row>-->
+        <!--        </el-collapse-item>-->
         <el-collapse-item name="4">
           <template slot="title">
             <p class="form-title">高级设置</p>
@@ -403,22 +608,74 @@
     </el-form>
     <div style="text-align: center; margin-top: 20px;">
       <el-button type="primary" @click="saveNewProduct" :loading="saveLoading">提交</el-button>
-      <el-button type="primary" @click="closeAddDialog">取消</el-button>
+      <el-button @click="closeAddDialog">取消</el-button>
     </div>
+
+    <!--<el-dialog-->
+    <!--  title="收费项目选入"-->
+    <!--  :visible.sync="tollProjectDialogVisible"-->
+    <!--  :close-on-click-modal="false"-->
+    <!--  :close-on-press-escape="false"-->
+    <!--  width="70%"-->
+    <!--  v-if="tollProjectDialogVisible"-->
+    <!--  append-to-body-->
+    <!--&gt;-->
+    <!--  &lt;!&ndash;<product-single-edit&ndash;&gt;-->
+    <!--  &lt;!&ndash;  :editQuery="editSingleFormat"&ndash;&gt;-->
+    <!--  &lt;!&ndash;&gt;</product-single-edit>&ndash;&gt;-->
+    <!--  <selectChargesProjectDialog-->
+    <!--    :getData="getData"-->
+    <!--  >-->
+    <!--  </selectChargesProjectDialog>-->
+    <!--  &lt;!&ndash;<div style="text-align: center;margin-top: 12px">&ndash;&gt;-->
+    <!--  &lt;!&ndash;  <el-button type="primary" size="small" icon="search" @click="onAddSingleSubmit(false)" :loading="addLoading"&ndash;&gt;-->
+    <!--  &lt;!&ndash;  >提交&ndash;&gt;-->
+    <!--  &lt;!&ndash;  </el-button>&ndash;&gt;-->
+    <!--  &lt;!&ndash;  <el-button type="primary" size="small" icon="search" @click="cancelDialog"&ndash;&gt;-->
+    <!--  &lt;!&ndash;  >取消&ndash;&gt;-->
+    <!--  &lt;!&ndash;  </el-button>&ndash;&gt;-->
+    <!--  &lt;!&ndash;</div>&ndash;&gt;-->
+    <!--</el-dialog>-->
+
+    <el-dialog
+      title="药品字典-从指定系统添加药品字典"
+      :visible.sync="chooseHouseDrugVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="chooseHouseDrugVisible"
+    >
+      <chooseHouseDrug
+        :uuid="uuid"
+        :relId="relId"
+        :isImport="isImport"
+        :data="thisData"
+        :defaultSys="defaultSys"
+        :supEnable="false"
+        @closeUdi="closeUdi"
+      ></chooseHouseDrug>
+    </el-dialog>
+
+
   </div>
 </template>
 
 <script>
 import {
-  getYbHcflDetail,
-  addProduct,
   addDrug,
   updatetDrug,
   delDrugLevel,
-  updateLevelDrug
+  updateLevelDrug, calculateDistCount, calculateUseCount
+} from '@/api/basic/product/drugUdiinfos'
+import {isBlank} from "@/utils/strUtil";
+
+import {
+  getYbDrugDetail, removeRl, thirdSysDetail
 } from '@/api/basic/product/udiRelevance'
 import {filterClassify} from '@/api/purchase/classifyCode'
-import {filterByUuid} from "@/api/basic/product/udiInfo";
+import {filterByUuid, levelByUuid} from '@/api/basic/product/udiInfo'
+// import selectChargesProjectDialog from './selectChargesProjectDialog'
+import chooseHouseDrug from './chooseHouseDrug'
 
 export default {
   name: 'drugAdd',
@@ -435,11 +692,29 @@ export default {
       //1：新增；2：编辑
       type: Object,
       required: false
+    },
+    uuid: {
+      type: Object,
+      required: true
+    },
+    relId: {
+      type: Object,
+      required: true
+    },
+    thisData: {
+      type: Object,
+      required: true
+    },
+    relevanceEdit: {
+      type: Object,
+      required: true
     }
   },
+  // components: {selectChargesProjectDialog, chooseHouseDrug},
+  components: { chooseHouseDrug},
   data() {
     return {
-      ybHcflDetail: {},
+      ybDrugDetail: {},
       productData: {},
       newProductData: {
         cpmctymc: null,
@@ -454,19 +729,24 @@ export default {
         status: false,
         relId: null,
         drugLevelLists: [],
+        productId: null,
 
         useLevelDi: null,
         distributeLevelDi: null,
         distributeLevelUnit: null,
         useLeverCount: null,
         distributeLevelCount: null,
-        useLevelUnit: null
+        useLevelUnit: null,
+        distributeLevel: null,
+        useLevel: null,
+        majorStatus: 1,
+        physicType: 3
 
       },
       thirdSys: [],
       classifyList: [],
       saveLoading: false,
-      activeNames: ['1', '2'],
+      activeNames: ['0', '1', '2'],
       formRules: {
         cpmctymc: [
           {required: true, message: '请输入药品通用名', trigger: 'blur'}
@@ -480,13 +760,13 @@ export default {
         prepnUnit: [
           {required: true, message: '请输入制剂单位', trigger: 'blur'}
         ],
-        packRatio: [
-          {required: true, message: '请输入包装比例', trigger: 'blur'}
-        ],
+        // packRatio: [
+        //   {required: true, message: '请输入包装比例', trigger: 'blur'}
+        // ],
         packMatrial: [
           {required: true, message: '请输入包装材质', trigger: 'blur'}
         ],
-        registerNo: [
+        zczbhhzbapzbh: [
           {required: true, message: '请输入批准文号', trigger: 'blur'}
         ],
         manufactory: [
@@ -500,16 +780,47 @@ export default {
         ],
         price: [
           {required: true, message: '药品价格不能为空', trigger: 'blur'}
-        ]
+        ],
+        majorStatus: [
+          {required: true, message: '请选择药品状态', trigger: 'blur'}
+        ],
+        distributeLevel: [
+          {required: true, message: '请选择计量单位', trigger: 'blur'}
+        ],
+        distributeMaxLevel: [
+          {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
+        ],
+        useLevel: [
+          {required: true, message: '请选择计量单位', trigger: 'blur'}
+        ],
+        useMaxLevel: [
+          {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
+        ],
       },
       detailList: [
         // 初始化一个空对象或包含默认值的对象
-        {nameCode: '', packLevel: null, bhxjsl: null, isDisabled: false, isUpDisabled: true, rowDisabled: false}
+        {
+          productId: null,
+          nameCode: '',
+          packLevel: null,
+          bhxjsl: null,
+          isDisabled: false,
+          isUpDisabled: true,
+          rowDisabled: false
+        }
       ],
       status: false,
       rowDisabled: false,
       selectedIndex: null,
+      isSave: true,
       loading: false,
+      tollProjectDialogVisible: false,
+      sysList: [],
+      chooseHouseDrugVisible: false,
+      isImport: false,
+      defaultSys: null,
+      levelUnitList: [],
+      maxLevel: 1,
     }
 
   },
@@ -533,31 +844,57 @@ export default {
           this.classifyList = []
         })
     },
-    getYbHcData() {
+    getYbDrugData() {
       let query = {
-        specificationCode: this.newProductData.ybbm
+        goodsCode: this.newProductData.ybbm
       }
-      getYbHcflDetail(query).then((response) => {
+      getYbDrugDetail(query).then((response) => {
         if (response.code == 20000) {
-          this.ybHcflDetail = response.data
-          this.newProductData.catalogname1 = this.ybHcflDetail.catalogname1
-          this.newProductData.catalogname2 = this.ybHcflDetail.catalogname2
-          this.newProductData.catalogname3 = this.ybHcflDetail.catalogname3
-          this.newProductData.matrial = this.ybHcflDetail.matrial
+          this.ybDrugDetail = response.data
+          //对照关系
+          this.newProductData.prepnSpec = this.ybDrugDetail.realityOutlook
+          this.newProductData.zczbhhzbapzbh = this.ybDrugDetail.approvalCode
+          this.newProductData.cpmctymc = this.ybDrugDetail.registeredProductName
+          this.newProductData.spmc = this.ybDrugDetail.goodsName
+          this.newProductData.bzgg = this.ybDrugDetail.factor + this.ybDrugDetail.minUnit + "/" + this.ybDrugDetail.unit
+          this.newProductData.matrial = this.ybDrugDetail.materialName
+          this.newProductData.packMatrial = this.ybDrugDetail.materialName
+          this.newProductData.packUnit = this.ybDrugDetail.unit
+          this.newProductData.bhxjsl = this.ybDrugDetail.factor
+          this.newProductData.manufactory = this.ybDrugDetail.companyNameSc
+          this.newProductData.prepnUnit = this.ybDrugDetail.realityMedicinemodel
+
+          if (this.ybDrugDetail.productInsuranceType != "" && this.ybDrugDetail.productInsuranceType != null) {
+            if ("甲" == this.ybDrugDetail.productInsuranceType) {
+              this.newProductData.medicareType = 1
+            } else if ("乙" == this.ybDrugDetail.productInsuranceType) {
+              this.newProductData.medicareType = 2
+            } else if ("丙" == this.ybDrugDetail.productInsuranceType) {
+              this.newProductData.medicareType = 3
+            } else {
+              this.newProductData.medicareType = null
+            }
+            console.log(this.newProductData.medicareType)
+
+          }
+
           this.$forceUpdate()
         } else {
-          this.newProductData.catalogname1 = ''
-          this.newProductData.catalogname2 = ''
-          this.newProductData.catalogname3 = ''
-          this.newProductData.matrial = ''
-          this.$forceUpdate()
+          // this.$forceUpdate()
         }
       }).catch(() => {
       })
 
     },
     saveNewProduct() {
+      if (!this.isSave) {
+        return this.$message.error("请先保存药品层级")
+      }
       this.addProductDialogVisible = false
+      this.newProductData.registerNo = this.newProductData.zczbhhzbapzbh
+      this.newProductData.splitEnable = true
+      this.newProductData.autoCode = true
+      // this.newProductData.updateLevelDrugRequests = this.detailList
       //新增
       if (this.type == 1) {
         this.$refs['dataForm'].validate((valid) => {
@@ -574,27 +911,28 @@ export default {
             } else {
               const validateItem = (item, fieldName, errorMessage) => {
                 if (!item[fieldName]) {
-                  this.$message.error(errorMessage);
-                  return false;
+                  this.$message.error(errorMessage)
+                  return false
                 }
-                return true;
-              };
+                return true
+              }
               for (let i = 0; i < this.detailList.length; i++) {
-                const item = this.detailList[i];
+                const item = this.detailList[i]
                 if (!validateItem(item, 'nameCode', '药品层级标识不能为空！') ||
                   !validateItem(item, 'packLevel', '包装级别不能为空') ||
                   !validateItem(item, 'packUnit', '层级单位不能为空')) {
-                  return;
+                  return
                 }
               }
-              const isLevel1 = this.detailList.some(item => item.packLevel === 1);
+              const isLevel1 = this.detailList.some(item => item.packLevel === 1)
               if (!isLevel1) {
-                this.$message.error('药品层级缺少一级标识！');
+                this.$message.error('药品层级缺少一级标识！')
               }
-              this.newProductData.drugLevelLists = this.detailList;
+              this.newProductData.drugLevelLists = this.detailList
 
             }
             this.saveLoading = true
+
             addDrug(this.newProductData).then((res) => {
               this.saveLoading = false
               if (res.code == 20000) {
@@ -611,23 +949,28 @@ export default {
           }
         })
       } else {
-        if (this.status) {
-          this.newProductData.requireScanCode = 1
-        } else {
-          this.newProductData.requireScanCode = 0
-        }
-        this.newProductData.uuid = this.rowData.uuid
-        this.newProductData.nameCode = this.rowData.nameCode
-        this.newProductData.relId = this.newProductData.id;
-        updatetDrug(this.newProductData).then(res => {
-          this.saveLoading = false
-          if (res.code == 20000) {
-            //清空弹窗数据
-            this.closeDialog()
-            this.$message.success('保存成功')
+        this.$refs['dataForm'].validate((valid) => {
+          if (!valid) {
+            return this.$message.error('请补充必要数据')
+          }
+          if (this.status) {
+            this.newProductData.requireScanCode = 1
           } else {
-            this.$message.error(res.message)
+            this.newProductData.requireScanCode = 0
           }
+          this.newProductData.uuid = this.rowData.uuid
+          this.newProductData.nameCode = this.rowData.nameCode
+          this.newProductData.relId = this.newProductData.id
+          updatetDrug(this.newProductData).then(res => {
+            this.saveLoading = false
+            if (res.code == 20000) {
+              //清空弹窗数据
+              this.closeDialog()
+              this.$message.success('保存成功')
+            } else {
+              this.$message.error(res.message)
+            }
+          })
         })
       }
 
@@ -638,16 +981,16 @@ export default {
 
     //层级保存
     levelSave(row) {
-      if (row.nameCode == null) {
-        this.$message.error("层级标识不能为空");
+      if (isBlank(row.nameCode)) {
+        this.$message.error('层级标识不能为空')
         return
       }
-      if (row.packLevel == null) {
-        this.$message.error("包装级别不能为空");
+      if (isBlank(row.packLevel)) {
+        this.$message.error('包装级别不能为空')
         return
       }
-      if (row.packUnit == null) {
-        this.$message.error("层级单位不能为空");
+      if (isBlank(row.packUnit)) {
+        this.$message.error('层级单位不能为空')
         return
       }
       let editQuery = {
@@ -658,17 +1001,21 @@ export default {
         bhxjcpbm: row.bhxjcpbm,
         bhxjsl: row.bhxjsl,
         relId: this.newProductData.id,
-        uuid: this.newProductData.uuid
+        uuid: this.newProductData.uuid,
+        productId: row.productId,
+        diType: row.diType,
+        xjdw: row.xjdw
       }
       updateLevelDrug(editQuery).then(res => {
         this.saveLoading = false
         if (res.code == 20000) {
-          this.$message.success("保存成功！");
-          this.selectedIndex = null;
-          if (this.newProductData.id != null)
-            this.getDetailList();
-
+          this.isSave = true
+          this.$message.success('保存成功！')
+          this.selectedIndex = null
+          this.getDetailList()
+          this.getDiLevel();
         } else {
+          this.isSave = true
           this.$message.error(res.message)
         }
       })
@@ -686,12 +1033,16 @@ export default {
         isDisabled: false,
         rowDisabled: false,
         isUpDisabled: true
-      });
+      })
+      this.newProductData.productId = null
+      this.selectedIndex = this.detailList.length - 1
+      this.isSave = false
     },
 
-
     rowChange(index, val) {
-      this.selectedIndex = index;
+      this.selectedIndex = index
+
+      this.isSave = false
     },
 
     deleteLevel(index, row) {
@@ -700,64 +1051,207 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let params = {nameCode: row.nameCode};
-        delDrugLevel(params).then((res) => {
-          if (res.code === 20000) {
-            this.$message.success("删除成功");
-            this.getList();
-          }
-        })
+        if (row.id != null) {
+          let params = {nameCode: row.nameCode}
+          delDrugLevel(params).then((res) => {
+            if (res.code === 20000) {
+              this.isSave = true
+              this.$message.success('删除成功')
+              this.getDetailList()
+              this.getDiLevel()
+              this.newProductData.distributeLevel = null
+              this.newProductData.distributeMaxLevel = null
+              this.newProductData.useLevel = null
+              this.newProductData.useMaxLevel = null
+            }
+          })
+        } else {
+          this.isSave = true
+          this.detailList.splice(index, 1)
+          this.$message.success('删除成功')
+        }
       }).catch(() => {
-      });
+      })
     },
 
     //获取层级标识
     getDetailList() {
-      this.loading = true;
       if (this.newProductData.uuid != null) {
         let query = {
           uuid: this.newProductData.uuid,
-          id: this.newProductData.id
+          id: this.newProductData.id,
+          nameCode: this.newProductData.nameCode,
+          productType: this.newProductData.productsType,
         }
+        this.loading = true
         filterByUuid(query)
           .then((response) => {
-            this.loading = false;
-            this.detailList = response.data || [];
+            this.loading = false
+            this.detailList = response.data || []
           })
           .catch(() => {
-            this.loading = false;
-            this.detailList = [];
-          });
+            this.loading = false
+            this.detailList = []
+          })
       }
     },
 
     distributeLevelDiChange(val) {
-
-      const matchingItem = this.detailList.find(item => item.nameCode == val);
+      const matchingItem = this.detailList.find(item => item.nameCode == val)
       if (matchingItem) {
-        this.newProductData.distributeLevelUnit = matchingItem.packUnit;
+        this.newProductData.distributeLevelUnit = matchingItem.packUnit
+        this.newProductData.distributeLevel = matchingItem.packLevel
       }
+      calculateDistCount(matchingItem).then((res) => {
+        this.newProductData = {
+          ...this.newProductData,
+          distributeLevelCount: res.data.distributeLevelCount
+        }
+      })
+
     },
     useLevelDiChange(val) {
-      const matchingItem = this.detailList.find(item => item.nameCode == val);
+      const matchingItem = this.detailList.find(item => item.nameCode == val)
       if (matchingItem) {
-        this.newProductData.useLevelUnit = matchingItem.packUnit;
+        this.newProductData.useLevelUnit = matchingItem.packUnit
+        this.newProductData.useLevel = matchingItem.packLevel
       }
-    }
+      calculateUseCount(matchingItem).then((res) => {
+        this.newProductData = {
+          ...this.newProductData,
+          useLeverCount: res.data.useLeverCount
+        }
+      })
+    },
+    getDiLevel() {
+      let query = {
+        id: this.relId
+      }
+      this.loading = true
+      levelByUuid(query)
+        .then((response) => {
+          this.loading = false
+          this.levelUnitList = response.data || []
+          this.findMaxLevelObject()
+        })
+        .catch(() => {
+          this.loading = false
+          this.levelUnitList = []
+        })
+    },
 
+    findMaxLevelObject() {
+      this.maxLevel = 1;
+      for (const obj of this.levelUnitList) {
+        if (obj.packLevel > this.maxLevel) {
+          this.maxLevel = Number(obj.packLevel);
+        }
+      }
+    },
+
+    /**
+     * 选择收费项目
+     */
+    selectPayFeecode() {
+      this.tollProjectDialogVisible = true
+    },
+
+    getData(data) {
+      this.tollProjectDialogVisible = false
+      this.newProductData.payFeeCode = data.medCatalogCode
+    },
+    /**
+     * 第三方系统药品信息
+     */
+    getThirdSysDetail() {
+      let query = {
+        id: this.relevanceEdit.id
+      }
+      thirdSysDetail(query)
+        .then((response) => {
+          this.loading = false
+          this.sysList = response.data.list || []
+          this.resetThirdId()
+        })
+        .catch(() => {
+          this.loading = false
+          this.sysList = []
+        })
+    },
+    resetThirdId() {
+      this.sysList.forEach((item) => {
+        if (item.sysId === 'thirdId') {
+          this.newProductData.thirdId = item.thirdId
+        } else if (item.sysId === 'thirdId1') {
+          this.newProductData.thirdId1 = item.thirdId
+        } else if (item.sysId === 'thirdId2') {
+          this.newProductData.thirdId2 = item.thirdId
+        } else if (item.sysId === 'thirdId3') {
+          this.newProductData.thirdId3 = item.thirdId
+        } else if (item.sysId === 'thirdId4') {
+          this.newProductData.thirdId4 = item.thirdId
+        }
+      })
+    },
+    /**
+     * 关联 第三方
+     */
+    addSelectErp(row) {
+      this.defaultSys = row.sysId
+      this.isImport = false
+      this.chooseHouseDrugVisible = true
+    },
+    removeErp(row) {
+      this.$confirm('此操作将解除该绑定药品信息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          let query = {
+            relId: this.relId,
+            thirdSys: row.sysId
+          }
+          removeRl(query)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.$message({
+                  type: 'success',
+                  message: '解绑成功！'
+                })
+                this.getThirdSysDetail()
+              } else {
+                this.$message.error(response.message)
+              }
+            })
+            .catch(() => {
+            })
+        })
+        .catch(() => {
+        })
+    },
+    closeUdi(val) {
+      this.chooseHouseDrugVisible = false
+      this.getThirdSysDetail()
+    }
 
   },
   created() {
     if (this.rowData != null) {
       this.newProductData = this.rowData
+      console.log("和水水水水",this.newProductData)
       this.newProductData.cpmctymc = this.rowData.cpmctymc
-      this.newProductData.registerNo = this.rowData.zczbhhzbapzbh
+      this.newProductData.zczbhhzbapzbh = this.rowData.zczbhhzbapzbh
       if (this.rowData.requireScanCode == 1) {
         this.status = true
       } else {
         this.status = false
       }
-      this.getDetailList();
+      this.getDiLevel()
+      this.getDetailList()
+      this.getThirdSysDetail()
+    } else {
+      this.selectedIndex = 0
     }
   },
   directives: {
@@ -786,4 +1280,11 @@ export default {
   padding-top: 17px;
 }
 
+.form-title2 {
+  font-size: 16px;
+  font-family: Noto Sans SC;
+  font-weight: bold;
+  color: #303133;
+}
+
 </style>
diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index 2dd80dc..ef5a07d 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -8,7 +8,6 @@
               <el-input v-model="filterQuery.nameCode"
                         placeholder="请输入药品编码"
                         clearable
-                        @keyup.enter.native="keyup_submit($event)"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -58,12 +57,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="药品描述:" class="query-form-item">
-              <el-input
-                clearable
-                v-model="filterQuery.cpms"
-                placeholder="请输入药品描述"
-              ></el-input>
+            <el-form-item label="对照条件:" class="query-form-item">
+              <el-select v-model="filterQuery.filterType" style="width: 100%" placeholder="对照条件" clearable>
+                <el-option label="全部" :value="0"></el-option>
+                <el-option label="对照完成" :value="1"></el-option>
+                <el-option label="未对照产品编码" :value="2"></el-option>
+                <!--<el-option label="未对照" :value="3"></el-option>-->
+                <el-option label="未对照其他产品编码" :value="4"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -83,22 +84,23 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="chooseDrug">选入药品信息</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addDrug">新增药品信息</el-button>
+          <!--<el-button type="primary" icon="el-icon-plus" @click="chooseDrug">选入药品信息</el-button>-->
+          <el-button type="primary" icon="el-icon-plus" @click="chooseHouseDrug">添加院内药品</el-button>
+          <!--          <el-button type="primary" icon="el-icon-plus" @click="addDrug">新增药品信息</el-button>-->
         </el-button-group>
       </div>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
       >
         <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column label="最小销售产品标识" prop="nameCode" width="160"></el-table-column>
-        <el-table-column label="收费项目编码" prop="payFeeCode" width="100"></el-table-column>
+        <el-table-column label="药品标识码" prop="nameCode" width="160"></el-table-column>
+        <!--<el-table-column label="收费项目编码" prop="payFeeCode" width="100"></el-table-column>-->
         <el-table-column label="药品通用名称" prop="cpmctymc" width="160"></el-table-column>
         <el-table-column label="制剂规格" prop="prepnSpec" width="90"></el-table-column>
         <el-table-column label="制剂单位" prop="prepnUnit" width="90"></el-table-column>
         <el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column>
         <el-table-column label="包装单位" prop="packUnit" width="90"></el-table-column>
-        <el-table-column label="包装比例" prop="packRatio" width="90"></el-table-column>
+        <!--<el-table-column label="包装比例" prop="packRatio" width="90"></el-table-column>-->
         <el-table-column label="价格" prop="price" width="90"></el-table-column>
         <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="90"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" width="90"></el-table-column>
@@ -127,6 +129,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <pagination
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      >
+      </pagination>
 
       <el-dialog
         :title="fromMap[fromName]"
@@ -135,11 +144,16 @@
         :close-on-press-escape="false"
         width="85%"
         v-if="addDrugVisible"
+        @close="closeDialog"
       >
         <drugAdd
           :closeDialog="closeDialog"
           :rowData="rowData"
           :type="type"
+          :relevanceEdit="relevanceEdit"
+          :uuid="uuid"
+          :relId="relId"
+          :thisData="thisData"
         >
         </drugAdd>
       </el-dialog>
@@ -157,6 +171,27 @@
         </chooseDrug>
       </el-dialog>
 
+      <el-dialog
+        title="药品字典-从指定系统添加药品字典"
+        :visible.sync="chooseHouseDrugVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="chooseHouseDrugVisible"
+      >
+        <chooseHouseDrug
+          :closeDialog="closeDialog"
+          :uuid="uuid"
+          :relId="relId"
+          :isImport="isImport"
+          :data="thisData"
+          :defaultSys="defaultSys"
+          :mainIds="mainIds"
+          @closeUdi="closeDialog"
+          :supEnable="false"
+        ></chooseHouseDrug>
+      </el-dialog>
+
     </el-card>
 
   </div>
@@ -180,9 +215,10 @@ import {
 } from '@/api/basic/product/udiRelevance'
 import drugAdd from '@/views/basic/product/drug/drugAdd'
 import chooseDrug from '@/views/basic/product/drug/chooseDrug'
+import chooseHouseDrug from '@/views/basic/product/drug/chooseHouseDrug'
 
 export default {
-  components: {drugAdd, chooseDrug},
+  components: {drugAdd, chooseDrug,chooseHouseDrug},
   name: 'drugMaintain',
   data() {
     return {
@@ -190,6 +226,7 @@ export default {
       filterBadInv: true,
       query: {},
       list: [],
+      mainIds:[],
       filterQuery: {
         productsType: 2,
         page: 1,
@@ -211,6 +248,30 @@ export default {
         'edit': '编辑-药品信息',
       },
       loading: false,
+      chooseHouseDrugVisible: false,
+      uuid: "111",
+      relId: "",
+      isImport: false,
+      pId: 0,
+      thisData: {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null,
+      },
+      relevanceEdit: {
+        id: null,
+        thirdId: "",
+        isDisable: null,
+        isUseDy: false,
+        isLock: null,
+        isAdavence: null,
+        allowNoBatch: null,
+        allowNoExpire: null,
+        allowNoProduct: null,
+        allowNoSerial: null,
+        pId: null,
+      },
+      total: 0
 
     }
   },
@@ -242,12 +303,22 @@ export default {
     },
     chooseDrug() {
       this.chooseDrugVisible = true
+
+    },
+    chooseHouseDrug(val){
+      this.defaultSys = null;
+      this.uuid = val.uuid;
+      this.relId = val.id;
+      this.isImport = true;
+      this.thisData = val;
+      this.chooseHouseDrugVisible = true
     },
     getList() {
       getUdiInfos(this.filterQuery)
         .then((response) => {
           this.loading = false
           this.list = response.data.list || []
+          this.mainIds = this.list.map(item => item.mainId);
           this.total = response.data.total || 0
         })
         .catch(() => {
@@ -280,13 +351,31 @@ export default {
     },
     editDrug(row) {
       this.fromName = 'edit'
-      this.rowData = row
+
       this.type = 2
+      this.uuid = row.uuid;
+      this.relId = row.id;
+      this.isImport = false;
+      this.thisData = row;
+      this.pId = row.id;
+      this.relevanceEdit = {
+        id: row.id,
+        isUseDy: row.isUseDy,
+        isDisable: row.isDisable,
+        isLock: row.isLock,
+        isAdavence: row.isAdavence,
+      };
+      this.editFormat = JSON.parse(JSON.stringify(row));
+      this.rowData = row
       this.addDrugVisible = true;
+    },
+    closeUdi(){
+
     },
     closeDialog() {
-      this.getList()
       this.addDrugVisible = false;
+      this.chooseHouseDrugVisible = false;
+      this.getList()
     }
   },
   filters: {
diff --git a/src/views/thirdSys/drug/thrDrug.vue b/src/views/thirdSys/drug/thrDrug.vue
new file mode 100644
index 0000000..73a3b3e
--- /dev/null
+++ b/src/views/thirdSys/drug/thrDrug.vue
@@ -0,0 +1,362 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" size="mini" label-width="100px" v-if="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="药品编码:">
+              <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable
+                        @keyup.enter.native="keyupErp_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="药品名称:">
+              <el-input v-model="filterQuery.name" clearable style="width: 90%" placeholder="请输入产品名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="包装规格:">
+              <el-input v-model="filterQuery.spec" clearable style="width: 90%" placeholder="请输入规格型号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="批准文号:">
+              <el-input v-model="filterQuery.registerNo" clearable style="width: 90%"
+                        placeholder="请输入注册/备案凭证"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:">
+              <el-input v-model="filterQuery.manufactory" clearable style="width: 90%" placeholder="请输入生产企业"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外部系统:">
+              <el-select v-model="filterQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in thirdSys"
+                  :key="item.value"
+                  :label="item.thirdName"
+                  :value="item.thirdId">
+                  <span style="float: left">{{ item.thirdName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true"
+                     :disabled="!configParms.basicThirdProducts">新增
+          </el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="80"></el-table-column>
+        <el-table-column label="药品编码" prop="code"></el-table-column>
+        <el-table-column label="药品名称" prop="name" show-overflow-tooltip></el-table-column>
+        <el-table-column label="包装规格" prop="spec" show-overflow-tooltip></el-table-column>
+        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
+        <el-table-column label="批准文号" prop="registerNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" width="180px">
+          <template slot-scope="scope">
+            <el-button type="text" @click.native.stop="detailDialog(scope.row)">编辑</el-button>
+            <el-button type="text" @click.native.stop="deleteDialog(scope.row)" v-if="thirdSysDetail.fromType!=0"
+                       :disabled="!configParms.basicThirdProducts">删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+
+    <el-dialog
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="药品信息编辑"
+      :visible.sync="thrProductsDetailVisible"
+      width="60%"
+      class="dialog-two"
+      top="5vh"
+      v-if="thrProductsDetailVisible"
+    >
+      <thrProductsEdit
+        :newProductData="thisData"
+        :closeAddDialog="closeAddDialog"
+      ></thrProductsEdit>
+    </el-dialog>
+
+    <el-dialog
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="新增配送药品"
+      :visible.sync="addProductVisible"
+      width="60%"
+      v-if="addProductVisible"
+      @close="closeAddDialog"
+      class="dialog-two"
+      top="5vh"
+    >
+
+      <ThrProductsAdd
+        :newType="newType"
+        :closeAddDialog="closeAddDialog"></ThrProductsAdd>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  delThrProducts, saveNewProduct
+} from "@/api/thrsys/thrProducts";
+import {getInvbasdoc} from "@/api/thrsys/getErps";
+import {getBasicThirdSys, filterDetailByKey} from "@/api/thrsys/basicThirdSys";
+import {selectIp} from "@/api/system/systemParamConfig";
+import thrProductsEdit from "./thrDrugEdit";
+import ThrProductsAdd from "./thrDrugAdd";
+import {findConfig} from "@/api/sync/spsSyncStatus";
+
+export default {
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        code: null,
+        name: "",
+        spec: null,
+        registerNo: null,
+        manufactory: null,
+        thirdSys: "thirdId",
+        page: 1,
+        limit: 20,
+        productType:2
+      },
+      mainThirdSys: '',
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      list: [],
+      uploadFileUrl: null,
+      fileList: [],
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      newType: 1,
+      thrProductsDetailVisible: false,
+      thisData: null,
+      loading: false,
+      addProductVisible: false,
+      newProductData: {
+        name: '',
+        code: null,
+        registerNo: null,
+        manufactory: null,
+        spec: null,
+        measname: null,
+        ylqxzcrbarmc: null,
+        ylqxzcrbarywmc: null,
+        cplb: null,
+        flbm: null,
+        sptm: null,
+        ybbm: null,
+        tyshxydm: null,
+        qxlb: null,
+        cplx: null,
+        cpms: null
+      },
+      configParms: {},
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        code: null,
+        spec: null,
+        registerNo: null,
+        manufactory: null,
+        name: "",
+        thirdSys: this.mainThirdSys,
+        page: 1,
+        limit: 20,
+        productType:2
+      };
+      this.getList();
+
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    search() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      if (this.filterQuery.thirdSys == null) {
+        this.$message.warning("请先选择第三方系统！")
+        return;
+      }
+      this.loading = true;
+      getInvbasdoc(this.filterQuery)
+        .then((response) => {
+          // this.loading = false;
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: row.id,
+          };
+          delThrProducts(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.success(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+
+        })
+        .catch(() => {
+        });
+    },
+
+    detailDialog(row) {
+      this.thisData = row;
+      this.thrProductsDetailVisible = true;
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          for (var i = 0; i < this.thirdSys.length; i++) {
+            if (this.thirdSys[i].mainSys) {
+              this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
+              this.mainThirdSys = this.thirdSys[i].thirdId;
+            }
+          }
+          this.uploadData.thirdSys = this.filterQuery.thirdSys;
+          this.getThirdSysDetail();
+          this.selectSysParam();
+          this.getList();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+    getThirdSysDetail() {
+      let query = {
+        thirdSysFk: this.filterQuery.thirdSys,
+        key: "piQueryUrl",
+      };
+      filterDetailByKey(query)
+        .then((response) => {
+          this.thirdSysDetail = response.data;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+
+    },
+    thirdSysChange() {
+      this.uploadData.thirdSys = this.filterQuery.thirdSys;
+      this.getThirdSysDetail();
+    },
+    saveNewProduct() {
+      this.addProductVisible = false;
+      saveNewProduct(this.newProductData).then((res) => {
+        if (res.code == 20000) {
+          this.$message.success("添加成功");
+          //清空弹窗数据
+          Object.keys(this.newProductData).forEach(key => this.newProductData[key] = null);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      })
+    },
+    closeAddDialog(val) {
+      this.thrProductsDetailVisible = false;
+      this.addProductVisible = false;
+      if (val) {
+        this.getList();
+      }
+      Object.keys(this.newProductData).forEach(key => this.newProductData[key] = null);
+    },
+    getSyncConfig() {
+      findConfig()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.configParms = response.data;
+          }
+        })
+        .catch(() => {
+        });
+    },
+  },
+  components: {
+    thrProductsEdit, ThrProductsAdd
+  },
+  mounted() {
+  },
+  created() {
+    this.getList();
+    this.getBasicThirdSys();
+    this.getSyncConfig();
+  },
+};
+</script>
+<style scoped>
+.el-form-item--mini.el-form-item {
+  margin-bottom: 9px;
+}
+</style>
diff --git a/src/views/thirdSys/drug/thrDrugAdd.vue b/src/views/thirdSys/drug/thrDrugAdd.vue
new file mode 100644
index 0000000..f8b863d
--- /dev/null
+++ b/src/views/thirdSys/drug/thrDrugAdd.vue
@@ -0,0 +1,256 @@
+<template>
+  <el-form :model="newProductData" label-width="120px">
+    <el-row type="flex">
+      <el-col :span="11" type="flex">
+        <el-form-item label="第三方系统" prop="thirdSysFk">
+          <el-select
+            style="width: 90%"
+            v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"
+          >
+            <el-option
+              v-for="item in thirdSys"
+              :key="item.value"
+              :label="item.thirdName"
+              :value="item.thirdId"
+            >
+              <span style="float: left">{{ item.thirdName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{
+                  item.thirdId
+                }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row type="flex">
+      <el-col :span="11" type="flex">
+        <el-form-item label="药品编码:" prop="code">
+          <el-input style="width: 90%" size="small" placeholder="请输入药品编码" v-model.trim="newProductData.code"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" type="flex">
+        <el-form-item label="药品名称:" prop="name">
+          <el-input style="width: 90%" size="small" placeholder="请输入药品名称" v-model.trim="newProductData.name"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row type="flex">
+      <el-col :span="11" class="el-col">
+        <el-form-item label="包装规格:" prop="spec">
+          <el-input style="width: 90%" size="small" placeholder="请输入包装规格" v-model.trim="newProductData.spec"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="计量单位:" prop="measname">
+          <el-input style="width: 90%" size="small" placeholder="请输入计量单位" v-model.trim="newProductData.measname"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row type="flex">
+      <el-col :span="11" class="el-col">
+        <el-form-item label="生产企业:" prop="manufactory">
+          <el-input style="width: 90%" size="small" placeholder="请输入生产企业"
+                    v-model.trim="newProductData.manufactory"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="批准文号:" prop="registerNo">
+          <el-input style="width: 90%" size="small" placeholder="请输入批准文号"
+                    v-model.trim="newProductData.registerNo"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row type="flex">
+      <el-col :span="11" class="el-col">
+        <el-form-item label="分类编码:" prop="flbm">
+          <el-input style="width: 90%" size="small" placeholder="请输入分类编码" v-model.trim="newProductData.flbm"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="药品条码:" prop="sptm">
+          <el-input style="width: 90%" size="small" placeholder="请输入药品条码" v-model.trim="newProductData.sptm"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row type="flex">
+      <el-col :span="11" class="el-col">
+        <el-form-item label="医保编码:" prop="ybbm">
+          <el-input style="width: 90%" size="small" placeholder="请输入医保编码" v-model.trim="newProductData.ybbm"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="统一社会信用号:" prop="tyshxydm">
+          <el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号"
+                    v-model.trim="newProductData.tyshxydm"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <!--<el-row type="flex">-->
+
+    <!--  <el-col :span="11" class="el-col">-->
+    <!--    <el-form-item label="器械类别:" prop="qxlb">-->
+    <!--      <el-input style="width: 90%" size="small" placeholder="请输入器械类别" v-model.trim="newProductData.qxlb"-->
+    <!--      ></el-input>-->
+    <!--    </el-form-item>-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
+
+    <el-row type="flex">
+      <el-col :span="23" class="el-col">
+        <el-form-item label="药品描述:" prop="cpms">
+          <el-input style="width: 92%" type="textarea" size="mini" rows="3" placeholder="请输入产品描述"
+                    v-model.trim="newProductData.cpms"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <div style="text-align: center; margin-bottom: 10px;">
+      <el-button type="primary" @click="saveNewProduct" :loading="saveLoading">提交</el-button>
+      <el-button type="primary" @click="closeAddDialog">取消</el-button>
+    </div>
+  </el-form>
+</template>
+
+<script>
+import { saveNewProduct } from '@/api/thrsys/thrProducts'
+
+import { getBasicThirdSys } from '@/api/thrsys/basicThirdSys'
+import { addProduct } from '@/api/thrsys/thrProductsAdd'
+
+export default {
+  name: 'ThrProductsAdd',
+  props: {
+    newType: {
+      type: Object,
+      required: true
+    },
+    closeAddDialog: {
+      type: Function,
+      required: true
+    }
+  },
+  data() {
+    return {
+      newProductData: {
+        name: '',
+        code: null,
+        registerNo: null,
+        manufactory: null,
+        spec: null,
+        measname: null,
+        ylqxzcrbarmc: null,
+        ylqxzcrbarywmc: null,
+        cplb: null,
+        flbm: null,
+        sptm: null,
+        ybbm: null,
+        tyshxydm: null,
+        qxlb: null,
+        cplx: null,
+        cpms: null,
+        thirdSysFk: null,
+        cpdls: null
+      },
+      thirdSys: [],
+      saveLoading: false,
+    }
+
+  },
+  methods: {
+    saveNewProduct() {
+      this.addProductVisible = false
+      if (this.$isBlank(this.newProductData.thirdSysFk)) {
+        this.$message.warning('第三方系统不能为空！')
+        return
+      }
+      if (this.$isBlank(this.newProductData.code)) {
+        this.$message.warning('产品编码为空！')
+        return
+      }
+      if (this.$isBlank(this.newProductData.name)) {
+        this.$message.warning('产品名称不能为空！')
+        return
+      }
+
+      if (this.$isBlank(this.newProductData.spec)) {
+        this.$message.warning('规格型号不能为空')
+        return
+      }
+      if (this.$isBlank(this.newProductData.measname)) {
+        this.$message.warning('计量单位不能为空！')
+        return
+      }
+      if (this.$isBlank(this.newProductData.manufactory)) {
+        this.$message.warning('生产企业不能为空！')
+        return
+      }
+      if (this.$isBlank(this.newProductData.registerNo)) {
+        this.$message.warning('注册证号不能为空！')
+        return
+      }
+      this.saveLoading = true
+      this.newProductData.productType = 2
+      if (this.newType == 1) {
+        saveNewProduct(this.newProductData).then((res) => {
+          this.saveLoading = false
+          if (res.code == 20000) {
+            this.$message.success('添加成功')
+            //清空弹窗数据
+            this.$emit('closeAddDialog', true)
+            this.closeAddDialog(true)
+          } else {
+            this.$message.error(res.message)
+          }
+        }).catch((error) => {
+          this.saveLoading = false
+          // this.$message.error(error.message);
+        })
+      } else if (this.newType == 2) {
+        addProduct(this.newProductData).then((res) => {
+          this.saveLoading = false
+          if (res.code == 20000) {
+            this.$message.success('添加成功')
+            //清空弹窗数据
+            this.closeAddDialog(true)
+          } else {
+            this.$message.error(res.message)
+          }
+        }).catch((error) => {
+          this.saveLoading = false
+          // this.$message.error(error.message);
+        })
+      }
+
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true
+      }
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || []
+        })
+        .catch(() => {
+          this.loading = false
+          this.list = []
+        })
+    }
+  },
+  created() {
+    this.getBasicThirdSys()
+  }
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/thirdSys/drug/thrDrugDetail.vue b/src/views/thirdSys/drug/thrDrugDetail.vue
new file mode 100644
index 0000000..ae0fc01
--- /dev/null
+++ b/src/views/thirdSys/drug/thrDrugDetail.vue
@@ -0,0 +1,113 @@
+<template>
+  <el-form  label-width="120px">
+            <div v-if="!isImport" style="margin-bottom: 20px">
+                <el-row type="flex">
+                    <el-col :span="11" class="el-col">
+                      <el-form-item label="第三方系统" prop="thirdSysFk">
+                            <el-input style="width: 90%" size="small" :disabled="true" v-model="data.thirdSysName"></el-input>
+                      </el-form-item>
+                    </el-col>
+                </el-row>
+              <el-row type="flex">
+                <el-col :span="11" type="flex">
+                  <el-form-item label="药品编码:" prop="code">
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.code"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" type="flex">
+                  <el-form-item label="药品名称:" prop="name">
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.name"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row  type="flex">
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="生产企业:" prop="manufactory">
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.manufactory"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="批准文号:" prop="registerNo">
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.registerNo"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row  type="flex">
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="包装规格:" prop="spec">
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.spec"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="计量单位:" prop="measname">
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.measname"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <!--<el-row type="flex">-->
+              <!--  <el-col :span="11" class="el-col">-->
+              <!--    <el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">-->
+              <!--      <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.ylqxzcrbarmc"></el-input>-->
+              <!--    </el-form-item>-->
+              <!--  </el-col>-->
+              <!--  <el-col :span="11" class="el-col">-->
+              <!--    <el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">-->
+              <!--      <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.ylqxzcrbarywmc"></el-input>-->
+              <!--    </el-form-item>-->
+              <!--  </el-col>-->
+              <!--</el-row>-->
+              <el-row  type="flex">
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="统一社会信用号:" prop="tyshxydm">
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.tyshxydm"></el-input>
+                  </el-form-item>
+                </el-col>
+                <!--<el-col :span="11" class="el-col">-->
+                <!--  <el-form-item label="产品类别:" prop="cplb">-->
+                <!--    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.cplb"></el-input>-->
+                <!--  </el-form-item>-->
+                <!--</el-col>-->
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="商品条码:" prop="sptm">
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.sptm"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row  type="flex">
+
+                <el-col :span="11" class="el-col">
+                  <el-form-item label="医保编码:" prop="ybbm">
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.ybbm"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row type="flex">
+
+              </el-row>
+              <el-row  type="flex">
+                <el-col :span="23" class="el-col">
+                  <el-form-item label="产品描述:" prop="cpms">
+                    <el-input style="width: 92%" type="textarea" size="mini" rows="3" :disabled="true" v-model.trim="data.cpms"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+  </el-form>
+</template>
+
+<script>
+    export default {
+        name: "thrDrugDetail",
+        props: {
+            data: {
+                type: Object,
+                required: true,
+            },
+        },
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/thirdSys/drug/thrDrugEdit.vue b/src/views/thirdSys/drug/thrDrugEdit.vue
new file mode 100644
index 0000000..8e4f8eb
--- /dev/null
+++ b/src/views/thirdSys/drug/thrDrugEdit.vue
@@ -0,0 +1,224 @@
+<template>
+  <el-form :model="newProductData" label-width="120px">
+    <el-row type="flex">
+      <el-col :span="11" type="flex">
+        <el-form-item label="第三方系统" prop="thirdSysFk">
+          <el-select
+            style="width: 90%"
+            disabled
+            v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"
+          >
+            <el-option
+              v-for="item in thirdSys"
+              :key="item.value"
+              :label="item.thirdName"
+              :value="item.thirdId">
+              <span style="float: left">{{ item.thirdName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{
+                  item.thirdId
+                }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row type="flex">
+      <el-col :span="11" type="flex">
+        <el-form-item label="产品编码:" prop="code">
+          <el-input style="width: 90%" size="small" placeholder="请输入药品编码"
+                    disabled
+                    v-model.trim="newProductData.code"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" type="flex">
+        <el-form-item label="产品名称:" prop="name">
+          <el-input style="width: 90%" size="small" placeholder="请输入药品名称" v-model.trim="newProductData.name"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row type="flex">
+      <el-col :span="11" class="el-col">
+        <el-form-item label="包装规格:" prop="spec">
+          <el-input style="width: 90%" size="small" placeholder="请输入包装规格" v-model.trim="newProductData.spec"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="计量单位:" prop="measname">
+          <el-input style="width: 90%" size="small" placeholder="请输入计量单位"
+                    v-model.trim="newProductData.measname"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row type="flex">
+      <el-col :span="11" class="el-col">
+        <el-form-item label="生产企业:" prop="manufactory">
+          <el-input style="width: 90%" size="small" placeholder="请输入生产企业"
+                    v-model.trim="newProductData.manufactory"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="注册证号:" prop="registerNo">
+          <el-input style="width: 90%" size="small" placeholder="请输入注册证号"
+                    v-model.trim="newProductData.registerNo"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <!--<el-row type="flex">-->
+    <!--  <el-col :span="11" class="el-col">-->
+    <!--    <el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">-->
+    <!--      <el-input style="width: 90%" size="small" placeholder="请输入医疗器械注册人"-->
+    <!--                v-model.trim="newProductData.ylqxzcrbarmc"></el-input>-->
+    <!--    </el-form-item>-->
+    <!--  </el-col>-->
+    <!--  <el-col :span="11" class="el-col">-->
+    <!--    <el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">-->
+    <!--      <el-input style="width: 90%" size="small" placeholder="请输入注册人英文名称"-->
+    <!--                v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>-->
+    <!--    </el-form-item>-->
+    <!--  </el-col>-->
+    <!--</el-row>-->
+    <el-row type="flex">
+      <!--<el-col :span="11" class="el-col">-->
+      <!--  <el-form-item label="产品类别:" prop="cplb">-->
+      <!--    <el-input style="width: 90%" size="small" placeholder="请输入产品类别" v-model.trim="newProductData.cplb"></el-input>-->
+      <!--  </el-form-item>-->
+      <!--</el-col>-->
+      <el-col :span="11" class="el-col">
+        <el-form-item label="医保编码:" prop="ybbm">
+          <el-input style="width: 90%" size="small" placeholder="请输入医保编码" v-model.trim="newProductData.ybbm"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="分类编码:" prop="flbm">
+          <el-input style="width: 90%" size="small" placeholder="请输入分类编码" v-model.trim="newProductData.flbm"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row type="flex">
+      <el-col :span="11" class="el-col">
+        <el-form-item label="统一社会信用号:" prop="tyshxydm">
+          <el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号"
+                    v-model.trim="newProductData.tyshxydm"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="11" class="el-col">
+        <el-form-item label="药品条码:" prop="sptm">
+          <el-input style="width: 90%" size="small" placeholder="请输入药品条码" v-model.trim="newProductData.sptm"></el-input>
+        </el-form-item>
+      </el-col>
+
+    </el-row>
+    <!--<el-row type="flex">-->
+
+      <!--<el-col :span="11" class="el-col">-->
+      <!--  <el-form-item label="器械类别:" prop="qxlb">-->
+      <!--    <el-input style="width: 90%" size="small" placeholder="请输入器械类别" v-model.trim="newProductData.qxlb"></el-input>-->
+      <!--  </el-form-item>-->
+      <!--</el-col>-->
+    <!--</el-row>-->
+
+    <el-row type="flex">
+      <el-col :span="23" class="el-col">
+        <el-form-item label="产品描述:" prop="cpms">
+          <el-input style="width: 92%" type="textarea" size="mini" rows="3" placeholder="请输入产品描述"
+                    v-model.trim="newProductData.cpms"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <div style='text-align: center; margin-bottom: 10px;'>
+      <el-button type="primary" @click="saveNewProduct">提交</el-button>
+      <el-button  @click="closeAddDialog">取消</el-button>
+    </div>
+  </el-form>
+</template>
+
+<script>
+import {updateProduct} from "@/api/thrsys/thrProducts";
+
+
+import {getBasicThirdSys} from "@/api/thrsys/basicThirdSys";
+
+export default {
+  name: "thrDrugEdit",
+  props: {
+    newProductData: {
+      type: Object,
+      required: true,
+    },
+    closeAddDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      thirdSys: [],
+    }
+
+  },
+  methods: {
+    saveNewProduct() {
+      this.addProductVisible = false;
+      if (this.$isBlank(this.newProductData.thirdSysFk)) {
+        this.$message.warning("第三方系统不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.code)) {
+        this.$message.warning("药品编码为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.name)) {
+        this.$message.warning("药品名称不能为空！");
+        return;
+      }
+
+      if (this.$isBlank(this.newProductData.spec)) {
+        this.$message.warning("包装规格不能为空");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.measname)) {
+        this.$message.warning("计量单位不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.manufactory)) {
+        this.$message.warning("生产企业不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.registerNo)) {
+        this.$message.warning("批准文号不能为空！");
+        return;
+      }
+      updateProduct(this.newProductData).then((res) => {
+        if (res.code == 20000) {
+          this.$message.success("修改成功");
+          this.closeAddDialog(true);
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+      })
+
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+  },
+  created() {
+    this.getBasicThirdSys();
+  },
+}
+</script>
+
+<style scoped>
+</style>