diff --git a/src/api/basic/product/udiRelevance.js b/src/api/basic/product/udiRelevance.js
index 138b6dd5..4a941245 100644
--- a/src/api/basic/product/udiRelevance.js
+++ b/src/api/basic/product/udiRelevance.js
@@ -102,6 +102,13 @@ export function addProduct(query) {
     data: query
   });
 }
+export function addDrug(query) {
+  return axios({
+    url: "/udi/udirel/addDrug",
+    method: "post",
+    data: query
+  });
+}
 
 export function addAllErp(query) {
   return axios({
diff --git a/src/api/basic/sysWorkplaceManage.js b/src/api/basic/sysWorkplaceManage.js
new file mode 100644
index 00000000..6ae53150
--- /dev/null
+++ b/src/api/basic/sysWorkplaceManage.js
@@ -0,0 +1,53 @@
+import axios from "@/utils/request";
+import request from "@/utils/request";
+// import {BUSINESS_PRE, SYS_PRE} from "@/config/app";
+
+
+export function listPage(query) {
+  return axios({
+    url: "/udiwms/sysWorkplace/page",
+    method: "post",
+    data: query
+  });
+}
+
+
+
+export function addWorkplace(query) {
+  return axios({
+    url: "/udiwms/sysWorkplace/addWorkplace",
+    method: "post",
+    data: query
+  });
+}
+
+
+export function updateWorkplace(query) {
+  return axios({
+    url: "/udiwms/sysWorkplace/updateWorkplace",
+    method: "post",
+    data: query
+  });
+}
+
+
+export function deleteWorkplace(query) {
+  return axios({
+    url: "/udiwms/sysWorkplace/deleteWorkplace",
+    method: "post",
+    data: query
+  });
+}
+
+
+
+export function createWorkplaceId(query) {
+  return axios({
+    url: "/udiwms/sysWorkplace/createWorkplaceId",
+    method: "post",
+    data: query
+  });
+}
+
+
+
diff --git a/src/views/basic/product/drugAdd.vue b/src/views/basic/product/drugAdd.vue
new file mode 100644
index 00000000..c1283f7f
--- /dev/null
+++ b/src/views/basic/product/drugAdd.vue
@@ -0,0 +1,452 @@
+<template>
+  <div>
+      <el-form :model="newProductData" label-width="120px">
+        <el-collapse v-model="activeNames">
+          <el-collapse-item name="1">
+            <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="name">
+              <el-input style="width: 90%" size="small" placeholder="请输入药品通用名称"
+                        v-model.trim="newProductData.name"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="商品名称:" prop="spmc">
+              <el-input style="width: 90%" size="small" placeholder="请输入商品名称" v-model.trim="newProductData.spmc"
+              ></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="bzgg">
+              <el-input style="width: 90%" size="small" placeholder="请输入包装规格" v-model.trim="newProductData.bzgg"
+              ></el-input>
+            </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="请输入包装单位"
+                        v-model.trim="newProductData.packUnit"
+              ></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="prepnSpec">
+              <el-input style="width: 90%" size="small" placeholder="请输入制剂规格"
+                        v-model.trim="newProductData.prepnSpec"
+              ></el-input>
+            </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="请输入制剂单位"
+                        v-model.trim="newProductData.prepnUnit"
+              ></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="packMatrial">
+              <el-input style="width: 90%" size="small" placeholder="请输入包装材质"
+                        v-model.trim="newProductData.packMatrial"
+              ></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-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="请输入生产企业"
+                        v-model.trim="newProductData.manufactory"
+              ></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-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-col :span="11" type="flex">
+            <el-form-item label="药品分类:" prop="majorType">
+              <el-select v-model="newProductData.majorType" 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-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="选择医保分类" clearable>
+                <el-option label="甲类" :value="1"></el-option>
+                <el-option label="乙类" :value="2"></el-option>
+                <el-option label="丙类" :value="3"></el-option>
+              </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"
+              ></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"
+                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="请输入存储条件"
+                        v-model.trim="newProductData.storageCondition"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="运输条件:" prop="transportCondition">
+              <el-input style="width: 90%" size="small" placeholder="请输入运输条件"
+                        v-model.trim="newProductData.transportCondition"
+              ></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="flbm">-->
+        <!--          <el-select-->
+        <!--            size="small"-->
+        <!--            v-model="newProductData.flbm"-->
+        <!--            filterable-->
+        <!--            remote-->
+        <!--            clearable="true"-->
+        <!--            style="width: 90%"-->
+        <!--            reserve-keyword-->
+        <!--            placeholder="请选择"-->
+        <!--            :loading="loading"-->
+        <!--            @change="classifyChange()"-->
+        <!--          >-->
+        <!--            <el-option-->
+        <!--              v-for="item in classifyList"-->
+        <!--              :key="item.code"-->
+        <!--              :label="item.name"-->
+        <!--              :value="item.code">-->
+        <!--              <span>{{ item.code }}</span>-->
+        <!--              <span>{{ item.name }}</span>-->
+        <!--            </el-option>-->
+        <!--          </el-select>-->
+        <!--&lt;!&ndash;          <el-input style="width: 90%" size="small" placeholder="请输入分类编码" v-model.trim="newProductData.flbm"></el-input>&ndash;&gt;-->
+        <!--        </el-form-item>-->
+        <!--      </el-col>-->
+        <!--    </el-row>-->
+        <!--<el-row type="flex">-->
+        <!--  <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-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="getYbHcData" ></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="majorStatus">
+              <el-select v-model="newProductData.majorStatus" style="width: 90%" placeholder="选择药品状态" clearable>
+                <el-option label="停用" :value="0"></el-option>
+                <el-option label="在用" :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!--<el-col :span="11" class="el-col">-->
+          <!--  <el-form-item label="产品描述:" prop="cpms">-->
+          <!--    <el-input style="width: 90%" type="textarea" size="mini" rows="1" placeholder="请输入产品描述"-->
+          <!--              v-model.trim="newProductData.cpms"-->
+          <!--    ></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>
+          </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">-->
+          <!--      <span>参数</span>-->
+          <!--    </el-col>-->
+          <!--    <el-divider direction="vertical"></el-divider>-->
+          <!--    <el-col :span="11" class="el-col">-->
+          <!--      <span>设置</span>-->
+          <!--    </el-col>-->
+          <!--    <el-divider direction="vertical"></el-divider>-->
+          <!--    <el-col :span="11" class="el-col">-->
+          <!--      <span>参数设置说明</span>-->
+          <!--    </el-col>-->
+          <!--  </el-row>-->
+          <!--  <el-row type="flex">-->
+          <!--    <el-col  :span="11" class="el-col">-->
+          <!--      <span class="sptext">是否禁用</span>-->
+          <!--    </el-col>-->
+          <!--    <el-divider direction="vertical"></el-divider>-->
+          <!--    <el-col  :span="11" class="el-col">-->
+          <!--      <el-switch-->
+          <!--        v-model="newProductData.status"-->
+          <!--        active-color="#13ce66"-->
+          <!--        inactive-color="#ff4949">-->
+          <!--      </el-switch>-->
+          <!--    </el-col>-->
+          <!--    <el-divider direction="vertical"></el-divider>-->
+          <!--    <el-col  :span="11" class="el-col">-->
+          <!--      <span class="sptext">禁用后该药品将无法扫码使用</span>-->
+          <!--    </el-col>-->
+          <!--  </el-row>-->
+          <!--</el-collapse-item>-->
+        </el-collapse>
+      </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>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getYbHcflDetail, addProduct, addDrug } from '@/api/basic/product/udiRelevance'
+import { filterClassify } from '@/api/purchase/classifyCode'
+
+export default {
+  name: 'drugAdd',
+  props: {
+    closeUdi: {
+      type: Function,
+      required: true
+    },
+    rowData: {
+      type: Object,
+      required: false,
+    }
+  },
+  data() {
+    return {
+      ybHcflDetail: {},
+      newProductData: {
+        name: null,
+        bzgg: null,
+        spmc: null,
+        measname: null,
+        manufactory: null,
+        ybbm: null,
+        cpms: null,
+        //高级设置默认开启扫码
+        productsType: 2,
+      },
+      thirdSys: [],
+      classifyList: [],
+      saveLoading: false,
+      activeNames: ["1"],
+    }
+
+  },
+  methods: {
+    classifyChange() {
+      this.classifyChange(this.newProductData.flbm)
+      let item = this.classifyList.find(item => item.code == this.newProductData.flbm)
+      if (item != null) this.newProductData.requireScanCode = item.requireScanCode
+    },
+    classifySearch(key) {
+      let query = {
+        key: key
+      }
+      filterClassify(query)
+        .then(response => {
+          this.loading = false
+          this.classifyList = response.data.list || []
+        })
+        .catch(() => {
+          this.loading = false
+          this.classifyList = []
+        })
+    },
+    getYbHcData() {
+      let query = {
+        specificationCode: this.newProductData.ybbm
+      }
+      getYbHcflDetail(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.$forceUpdate()
+        } else {
+          this.newProductData.catalogname1 = ''
+          this.newProductData.catalogname2 = ''
+          this.newProductData.catalogname3 = ''
+          this.newProductData.matrial = ''
+          this.$forceUpdate()
+        }
+      }).catch(() => {
+      })
+
+    },
+    saveNewProduct() {
+      this.addProductDialogVisible = false
+      // if (this.$isBlank(this.newProductData.name)) {
+      //   this.$message.warning('产品名称不能为空！')
+      //   return
+      // }
+      // if (this.$isBlank(this.newProductData.hcType)) {
+      //   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
+      // }
+      // if (this.$isBlank(this.newProductData.attributeType)) {
+      //   this.$message.warning('产品属性不能为空！')
+      //   return
+      // }
+      this.saveLoading = true
+      addDrug(this.newProductData).then((res) => {
+        this.saveLoading = false
+        if (res.code == 20000) {
+          this.$message.success('添加成功')
+          //清空弹窗数据
+          this.$emit('closeUdi', true)
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch((error) => {
+        this.saveLoading = false
+        this.$message.error(error.message)
+      })
+    },
+    closeAddDialog() {
+      this.$emit('closeUdi', false)
+    }
+  },
+  created() {
+    if (this.rowData != null){
+      console.log("thisis data",this.rowData)
+      this.newProductData = this.rowData
+      this.newProductData.name = this.rowData.cpmctymc
+    }
+  },
+  directives: {
+    'debounce-input': {
+      inserted(el, binding) {
+        let timeout
+        el.addEventListener('input', () => {
+          clearTimeout(timeout)
+          timeout = setTimeout(() => {
+            binding.value()
+          }, parseInt(binding.arg) || 300)
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-title {
+  font-size: 16px;
+  font-family: Noto Sans SC;
+  font-weight: bold;
+  color: #303133;
+  padding-bottom: 17px;
+  padding-top: 17px;
+}
+
+</style>
diff --git a/src/views/basic/product/drugMaintain.vue b/src/views/basic/product/drugMaintain.vue
new file mode 100644
index 00000000..4cf7633a
--- /dev/null
+++ b/src/views/basic/product/drugMaintain.vue
@@ -0,0 +1,303 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" v-show="showSearch" label-width="auto">
+        <!--<el-row :gutter="20">-->
+        <!--  <el-col :span="24">-->
+        <!--    <el-form-item label="UDI码:" class="query-form-item">-->
+        <!--      <el-input v-model="query.udiCode"-->
+        <!--                size="mini"-->
+        <!--                style="width: 97.5%"-->
+        <!--                placeholder="请扫描医疗器械包装内的UDI条码"-->
+        <!--                clearable-->
+        <!--                @keyup.enter.native="keyup_submit($event)"></el-input>-->
+        <!--    </el-form-item>-->
+        <!--  </el-col>-->
+        <!--</el-row>-->
+
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="药品编码:" class="query-form-item">
+              <el-input v-model="filterQuery.nameCode"
+                        placeholder="请输入药品编码"
+                        clearable
+                        @keyup.enter.native="keyup_submit($event)"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="药品通用名:" class="query-form-item">
+              <el-input
+                clearable
+                v-model="filterQuery.cpmctymc"
+                placeholder="请输入药品通用名"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="医保编码:" class="query-form-item">
+              <el-input
+                clearable
+                v-model="filterQuery.ybbm"
+                placeholder="请输入医保编码"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="批准文号:" class="query-form-item">
+              <el-input
+                clearable
+                v-model="filterQuery.zczbhhzbapzbh"
+                placeholder="请输入批准文号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <!--          <el-col :span="8">-->
+          <!--            <el-form-item label="医疗器械注册人:" class="query-form-item">-->
+          <!--              <el-input-->
+          <!--                clearable-->
+          <!--                v-model="filterQuery.ylqxzcrbarmc"-->
+          <!--                placeholder="请输入医疗器械注册人"-->
+          <!--              ></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <el-col :span="8">
+            <el-form-item label="生产企业:" class="query-form-item">
+              <el-input
+                clearable
+                v-model="filterQuery.manufactory"
+                placeholder="请输入生产企业"
+              ></el-input>
+            </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>
+          </el-col>
+
+          <!--<el-col :span="8">-->
+          <!--  <el-form-item label="是否禁用:" class="query-form-item">-->
+          <!--    <el-select v-model="filterQuery.isDisable" 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-divider/>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <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="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="90"></el-table-column>
+        <el-table-column label="药品通用名称" prop="cpmctymc" width="100"></el-table-column>
+        <el-table-column label="包装规格" prop="bzgg" width="90"></el-table-column>
+        <!--<el-table-column label="规格型号" prop="ggxh" width="90"></el-table-column>-->
+        <el-table-column label="包装单位" prop="prepnUnit" width="90"></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="zczbhhzbapzbh" width="90"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" width="90"></el-table-column>
+        <el-table-column label="收费项目编码" prop="remake" width="100"></el-table-column>
+        <el-table-column label="医保编码" prop="ybbm" width="90"></el-table-column>
+        <el-table-column label="药品状态" prop="majorStatus" width="90">
+          <template slot-scope="scope">
+            <el-tag :type="(scope.row.majorStatus) | statusFilterType">
+              {{ statusMap[scope.row.majorStatus] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="160">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="edit(scope.row)"
+            >对照
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="edit(scope.row)"
+            >详情
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="editDrug(scope.row)"
+            >编辑
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteDrug(scope.row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-dialog
+        title="新增-药品信息"
+        :title="fromMap[fromName]"
+        :visible.sync="addDrugVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="addDrugVisible"
+      >
+        <drugAdd
+          :rowData="rowData"
+        >
+        </drugAdd>
+      </el-dialog>
+
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {
+  getUdiInfos,
+  deletetUdiInfos,
+  updatetUdiInfos,
+  updatetSingleUdiInfo,
+  updateErpProduct,
+  uploadSmp,
+  thirdSysDetail,
+  removeRl,
+  sysFilterOptimize,
+  spcombie,
+  lockStatus,
+  removeDiRl,
+  disableUdi
+} from '@/api/basic/product/udiRelevance'
+import drugAdd from '@/views/basic/product/drugAdd'
+
+export default {
+  components: {drugAdd},
+  name: 'drugMaintain',
+  data() {
+    return {
+      showSearch: true,
+      filterBadInv: true,
+      query: {},
+      list: [],
+      filterQuery: {
+        productsType: 2,
+        page: 1,
+        limit: 20,
+        addType: 1
+      },
+      addDrugVisible: false,
+      statusMap: {
+        0: "停用",
+        1: "在用"
+      },
+      fromName: '',
+      rowData: {},
+      fromMap: {
+        'add' : '新增-药品信息',
+        'edit' : '编辑-药品信息',
+      }
+    }
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        productsType: 2,
+        page: 1,
+        limit: 20,
+        addType: 1
+      };
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList()
+    },
+    addDrug(){
+      this.fromName = 'add'
+      this.addDrugVisible = true
+    },
+    getList() {
+      getUdiInfos(this.filterQuery)
+        .then((response) => {
+          this.loading = false
+          this.list = response.data.list || []
+          this.total = response.data.total || 0
+        })
+        .catch(() => {
+          this.loading = false
+          this.list = []
+          this.total = 0
+        })
+    },
+    deleteDrug(row){
+      this.$confirm("此操作将永久删除该药品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let tquery = {
+          id: row.id + "",
+        };
+        deletetUdiInfos(tquery).then(res => {
+          if (res.code != 20000){
+            this.$message.error("删除错误")
+            this.getList()
+          }else {
+            this.$message.success("删除成功！")
+            this.getList()
+          }
+        }).catch(() => {
+          this.$message.error("删除错误")
+        })
+      })
+    },
+    editDrug(row){
+      this.fromName = 'edit'
+      this.rowData = row
+      this.addDrugVisible = true;
+    }
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        0: "info",
+        1: "success",
+      };
+      return statusMap[status];
+    }
+    ,
+  },
+  created() {
+    this.getList()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
new file mode 100644
index 00000000..5a86df8a
--- /dev/null
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -0,0 +1,293 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="当前仓库:" class="query-form-item">
+              <invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="编码/名称:" class="query-form-item">
+              <el-input v-model="query.key" placeholder="请输入编码/工位名称" clearable>
+              </el-input>
+              <!--<el-form-item label="所属仓库:">-->
+
+              <!--              :isDisable.sync="defaultInv"-->
+              <!--</el-form-item>-->
+              <!--<el-select-->
+              <!--  v-model="query.key"-->
+              <!--  placeholder="请选择仓库">-->
+              <!--  <el-option v-for="item in unitStorageList"-->
+              <!--             :key="item.name"-->
+              <!--             :label="item.name"-->
+              <!--             :value="item.code"></el-option>-->
+              <!--</el-select>-->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group>
+          <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="addWorkplace">新增工位</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="workplaceId" width="90"></el-table-column>
+        <el-table-column label="工位名称" prop="workplaceName" width="90"></el-table-column>
+        <el-table-column label="所属仓库" prop="invName" width="90"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
+        <el-table-column label="备注" prop="remake" width="90"></el-table-column>
+        <el-table-column label="操作" fixed="right" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="edit(scope.row)"
+            >编辑
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteWorkplace(scope.row)"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+      <el-dialog
+        :title="fromMap[fromName]"
+        :visible.sync="addWorkplaceDialogVisible"
+        width="40%"
+        v-if="addWorkplaceDialogVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+      >
+        <el-form :model="formData" style="width: 60%;" ref="dataForm"
+                 label-width="auto"
+        >
+          <el-row :gutter="20" class="el-row">
+            <el-col :span="24" class="el-col">
+              <el-form-item label="工位编码:" prop="title" class="query-form-item">
+                <el-input
+                  disabled
+                  v-model="formData.workplaceId" style="width: 80%"
+                  auto-complete="off"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" class="el-col">
+              <el-form-item label="工位名称:" prop="name" class="query-form-item">
+                <el-input
+                  v-model="formData.workplaceName" style="width: 80%"
+                  auto-complete="off"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="24" class="el-col">
+              <el-form-item label="所属仓库:" prop="name" class="query-form-item">
+                <invSelect :value.sync="formData.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"
+                           style="width: 80%"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="24" class="el-col">
+              <el-form-item label="备注:" prop="name" class="query-form-item">
+                <el-input
+                  v-model="formData.remake" style="width: 80%"
+                  auto-complete="off"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click.native="hideForm">取消</el-button>
+          <el-button
+            type="primary"
+            @click.native="formSubmit()"
+          >提交
+          </el-button
+          >
+        </div>
+      </el-dialog>
+
+
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {
+  listPage,
+  addWorkplace,
+  updateWorkplace,
+  deleteWorkplace,
+  createWorkplaceId
+} from '@/api/basic/sysWorkplaceManage'
+
+
+export default {
+  data() {
+    return {
+      query: {
+        invCode: this.$store.getters.locInvCode,
+        page: 1,
+        limit: 20
+      },
+      showSearch: true,
+      loading: false,
+      list: [],
+      addWorkplaceDialogVisible: false,
+      fromName: 'add',
+      fromMap: {
+        'add': '新增工位',
+        'edit': '编辑工位'
+      },
+      formData: {},
+      workplaceCode: '6001',
+      unitStorageList: [],
+      filterBadInv: true
+    }
+  },
+  methods: {
+    hideSearch() {
+      this.showSearch = !this.showSearch
+    },
+    onSubmit() {
+      this.query.page = 1
+      this.getList()
+    },
+    onReset() {
+      this.$router.push({
+        path: ''
+      })
+      this.query = {
+        page: 1,
+        limit: 20
+      }
+      this.getList()
+    },
+    getList() {
+      listPage(this.query).then(res => {
+        if (res.code != 20000) {
+          return this.$message.error('错误错误')
+        }
+        this.list = res.data.list || []
+      })
+    },
+    addWorkplace() {
+      this.fromName = 'add'
+      createWorkplaceId().then(res => {
+        if (res.code == 20000) {
+          if (res.data == null) {
+            this.formData.workplaceId = this.workplaceCode + 1001
+            this.addWorkplaceDialogVisible = true
+          } else {
+            this.formData = {}
+            this.formData.workplaceId = res.data
+            this.addWorkplaceDialogVisible = true
+          }
+        } else {
+          this.$message.error('获取错误')
+        }
+      }).catch(() => {
+        this.$message.error('获取错误')
+      })
+    },
+    hideForm() {
+      this.addWorkplaceDialogVisible = false
+    },
+    invChange(invCode) {
+      this.filterQuery.invCode = invCode
+      this.getFromStorage()
+    },
+    getFromStorage() {
+      let query = {}
+      filterFromAllByUser(query)
+        .then((response) => {
+          this.unitStorageList = response.data || []
+          console.log(this.filterQuery.invCode)
+          if (this.filterQuery.invCode) {
+            this.unitStorageList = this.unitStorageList.filter(item => item.code != this.filterQuery.invCode) || []
+          }
+          console.log(this.unitStorageList)
+        })
+        .catch(() => {
+        })
+    },
+    formSubmit() {
+      if (this.fromName == 'add') {
+        addWorkplace(this.formData).then(res => {
+          if (res.code != 20000) {
+            return this.$message.error('新增错误')
+          }
+          this.addWorkplaceDialogVisible = false
+          this.$message.success(res.data)
+          this.getList()
+        }).cache(() => {
+          this.addWorkplaceDialogVisible = false
+          this.$message.error('新增错误')
+        })
+      } else {
+        updateWorkplace(this.formData).then(res => {
+          if (res.code != 20000) {
+            return this.$message.error('更新错误')
+          }
+          this.addWorkplaceDialogVisible = false
+          this.$message.success(res.data)
+          this.getList()
+        }).catch(() => {
+          this.addWorkplaceDialogVisible = false
+          this.$message.error('更新错误')
+        })
+      }
+
+    },
+    edit(row) {
+      this.formData = row
+      this.fromName = 'edit'
+      this.addWorkplaceDialogVisible = true
+    },
+    deleteWorkplace(row) {
+      this.$confirm('此操作将永久删除该工位, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteWorkplace(row).then(res => {
+          if (res.code != 20000) {
+            this.$message.error('删除错误')
+          } else {
+            this.$message.success(res.data)
+            this.getList()
+          }
+        })
+      }).catch(() => {
+
+      })
+    }
+  },
+  created() {
+    this.getList()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/receive/receiveAddDrug.vue b/src/views/inout/receive/receiveAddDrug.vue
new file mode 100644
index 00000000..3784eefe
--- /dev/null
+++ b/src/views/inout/receive/receiveAddDrug.vue
@@ -0,0 +1,737 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" label-width="100px">
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="领用单号:">-->
+<!--              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="领用仓库:">-->
+<!--              <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;">-->
+<!--                <el-option-->
+<!--                  v-for="item in invList"-->
+<!--                  :key="item.code"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.code">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="往来信息:">-->
+<!--              <el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"-->
+<!--                         filterable-->
+<!--                         remote-->
+<!--                         reserve-keyword-->
+<!--                         :remote-method="finCorpList"-->
+<!--                         :loading="loading"-->
+<!--                         style="width: 100%;">-->
+<!--                <el-option-->
+<!--                  v-for="item in corpList"-->
+<!--                  :key="item.code"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.name">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="创建时间:">-->
+<!--              <el-date-picker-->
+<!--                style="width: 90%"-->
+<!--                :picker-options="pickerOptions"-->
+<!--                v-model="actDateRange"-->
+<!--                type="daterange"-->
+<!--                format="yyyy 年 MM 月 dd 日"-->
+<!--                value-format="yyyy-MM-dd"-->
+<!--                range-separator="至"-->
+<!--                start-placeholder="开始日期"-->
+<!--                end-placeholder="结束日期"-->
+<!--              >-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="filterQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="filterQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
+            </el-form-item>
+          </template>
+        </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="onSubmitFind">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">
+            新增单据
+          </el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border
+                @current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
+                :default-sort="defaultSort" @sort-change="handleSortChange">
+<!--        <el-table-column label="序号" type="index" width="60"></el-table-column>-->
+<!--        <el-table-column label="领用单号" prop="billNo" width="140"></el-table-column>-->
+<!--        <el-table-column label="领用部门" prop="deptName" width="100"></el-table-column>-->
+<!--        <el-table-column label="领用仓库" prop="invName" width="100"></el-table-column>-->
+<!--        <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"  width="180"></el-table-column>-->
+<!--        <el-table-column label="单据状态" prop="status"  width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag :type="(scope.row.status)">-->
+<!--              {{ statusMap[scope.row.status] }}-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="备注" prop="remark" show-overflow-tooltip="true"  width="160"></el-table-column>-->
+<!--        <el-table-column label="创建时间" prop="createTime"-->
+<!--                         sortable="custom" :sort-orders="['ascending', 'descending']"  width="160"></el-table-column>-->
+<!--        &lt;!&ndash;        <el-table-column label="领用类型" prop="billType"></el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="操作"  width="160"  fixed="right">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-button type="text" size="small" :disabled="scope.row.status==3  "-->
+<!--                       @click.native="newDistributionForm(scope.$index, scope.row)">编辑-->
+<!--            </el-button>-->
+<!--            <el-button type="text" size="small" @click.native.stop="printOrder(scope.row)"-->
+<!--            >打印-->
+<!--            </el-button>-->
+<!--            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+      ></pagination>
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
+<!--        <el-table-column label="序号" type="index" width="60"></el-table-column>-->
+<!--        <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>-->
+<!--        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>-->
+<!--        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>-->
+<!--        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>-->
+<!--        <el-table-column label="领用数量" prop="count"></el-table-column>-->
+<!--        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>-->
+<!--        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>-->
+<!--        <el-table-column label="供应商" prop="supName"></el-table-column>-->
+        <template v-for="(item, index) in tableHeader2">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+    </el-card>
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="newSpDistributionVisible"
+      width="80%"
+      v-if="newSpDistributionVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <thrOrderNew
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+        :closeConfirmFunction="closeConfirmFunction"
+        :editType="formName"
+      ></thrOrderNew>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {delReceive} from "@/api/thrsys/thrOrderReceive";
+import thrOrderNew from "./DialogNewReceive";
+import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
+import {getBusChange} from "@/api/basic/busTypeChange";
+import {filterSubAllOptimize, findInvByUserOptimize} from "@/api/system/invSubWarehouse";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  data() {
+    return {
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      showSearch: true,
+      filterQuery: {
+        billType: null,
+        billNo: "",
+        page: 1,
+        limit: 10,
+        type: 1,
+        invCode: '',
+        editStatus: 1,
+        thirdPartyDate: 2,
+        startDate: null,
+        endDate: null,
+      },
+      invList: [],
+      formName: null,
+      formMap: {
+        add: "新增领用单据",
+        update: "编辑领用单据",
+      },
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
+      idQuery: {},
+      corpList: [],
+      total: 0,
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableHeader2:[],
+      queryList2:[],
+      fromList2:[],
+      options: {
+        finCurInv:[],
+        finCorpList:[],
+      },
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      uploadFileUrl: null,
+      fileList: [],
+      uploadData: {
+        thirdSys: "thirdId",
+      },
+      invCodebe: null,
+      closeConfirm: false,
+      loading: false,
+      actDateRange: [],
+      newSpDistributionVisible: false,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+        thirdPartyDate: 2,
+        invCode: this.invCodebe,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.filterQuery.sort = 'desc'
+      } else {
+        this.filterQuery.sort = 'asc'
+      }
+      this.filterQuery.orderBy = column.prop;
+      this.getList();
+    },
+
+
+    getList() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.isUser = true; //只查询自己
+      getReceiveOrder(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.detailList = []
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+    handleDetail(_this,row) {
+      var query = {};
+      query.orderIdFk = row.billNo;
+      getOrderDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          _this.detailList = response.data.list || [];
+        })
+        .catch(() => {
+          _this.detailList = [];
+        });
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    deleteDialog(_this,row) {
+      _this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            orderIdFk: row.billNo,
+          };
+          delReceive(dQuery)
+            .then((response) => {
+              if (response.code == 20000) {
+                _this.$message.success("删除成功");
+                _this.getList();
+                _this.detailList = null;
+              } else {
+                _this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+
+        })
+        .catch(() => {
+        });
+    },
+
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    closeDialog() {
+      this.newSpDistributionVisible = false;
+      this.getList();
+      this.detailList = [];
+    },
+    getBusType() {
+      let query = {
+        enable: true,
+        type: 1,
+      };
+      getBusChange(query)
+        .then((response) => {
+          this.originTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
+    },
+    newDistributionForm(_this, row) {
+      if(_this == null){
+        _this = this
+      }
+      _this.idQuery.id = '';
+      if (_this.$isNotBlank(row) && _this.$isNotBlank(row.id)) {
+        _this.idQuery.id = row.id;
+        _this.idQuery.formData = row;
+        _this.formName = "update";
+      } else
+        _this.formName = "add";
+      _this.newSpDistributionVisible = true;
+    },
+    finCurInv(_this) {
+      let query = {
+        filter: 3
+      };
+      findInvByUserOptimize(query)
+        .then((response) => {
+          _this.options.finCurInv = response.data || [];
+          if (_this.options.finCurInv.length > 0) {
+            _this.filterQuery.invCode = this.options.finCurInv[0].code
+            _this.invCodebe = this.filterQuery.invCode
+          }
+          _this.getList();
+        })
+        .catch(() => {
+          this.options.finCurInv = [];
+        });
+    },
+    printOrder(_this,row) {
+      printOrder(row)
+        .then((response) => {
+          const binaryData = [];
+          binaryData.push(response);
+          //获取blob链接。
+          let url = window.URL.createObjectURL(
+            new Blob(binaryData, {type: "application/pdf"})
+          );
+          _this.loading = false;
+          window.open(url);//打开新标签页，预览pdf。
+          _this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    finCorpList(_this,val) {
+      let query = {
+        name: val,
+        page: 1,
+        limit: 10,
+      }
+      filterSubAllOptimize(query)
+        .then((response) => {
+          _this.loading = false;
+          _this.options.finCorpList = response.data || [];
+        })
+        .catch(() => {
+          _this.loading = false;
+          _this.options.finCorpList = [];
+        });
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  components: {
+    thrOrderNew,
+  },
+  mounted() {
+  },
+  created() {
+    this.finCurInv(this);
+    this.getBusType();
+    // this.finCorpList();
+    getHead("receiveAdd-1","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
+    getHead("receiveAdd-2","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
+  },
+};
+</script>
+<style scoped>
+.itemTag {
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
+}
+
+.text {
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+}
+
+
+.el-row {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.el-col {
+  border-radius: 4px;
+  flex-wrap: wrap;
+}
+</style>
+