物资字典代码迁移

src/api/basic/basicHospType.js

@@ -13,12 +13,21 @@ export function getBasicHospType(query) {
 export function getListMenu(query) {
   return axios({
     url: "/udiwms/basic/hosp/type/menuList",
+    method: "post",
+    data: query
+  });
+}
+
+export function getOneName(query) {
+  return axios({
+    url: "/udiwms/basic/hosp/type/getOneName",
     method: "get",
     params: query
   });
 }
 
 
+
 export function saveBasicHospType(query) {
   return axios({
     url: "/udiwms/basic/hosp/type/save",

src/api/basic/basicThirdSys.js

@@ -1,103 +1,103 @@
 import axios from "@/utils/request";
 
 export function getBasicThirdSys(query) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/filter",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/filter",
+    method: "get",
+    params: query
+  });
 }
 
 export function updateBasicThirdSys(query) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/update",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/update",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function getDetailBasicThirdSys(query) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/filterDetail",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/filterDetail",
+    method: "get",
+    params: query
+  });
 }
 
 export function filterDetailByKey(query) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/filterDetailByKey",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/filterDetailByKey",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function updateDetailBasicThirdSys(query) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/saveDetail",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/saveDetail",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function filterBusTypeDetail(query) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/filterBusTypeDetail",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/filterBusTypeDetail",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function saveBusTypeDetail(query) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/saveBusTypeDetail",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/saveBusTypeDetail",
+    method: "post",
+    data: query
+  });
 }
 
 export function saveBusTypes(data) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/saveBusTypes",
-        method: "post",
-        data: data
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/saveBusTypes",
+    method: "post",
+    data: data
+  });
 }
 
 export function deleteThirdSysBusType(params) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/delete",
-        method: "get",
-        params: params
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/delete",
+    method: "get",
+    params: params
+  });
 }
 
 export function updateInterfaceStatus(data) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/updateInterfaceStatus",
-        method: "post",
-        data: data
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/updateInterfaceStatus",
+    method: "post",
+    data: data
+  });
 }
 
 export function testThirdService(data) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/testThirdService",
-        method: "post",
-        data: data
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/testThirdService",
+    method: "post",
+    data: data
+  });
 }
 
 export function testThirdInter(data) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/testThirdInter",
-        method: "post",
-        data: data
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/testThirdInter",
+    method: "post",
+    data: data
+  });
 }
 
 

src/api/basic/udiInfo.js

@@ -1,34 +1,47 @@
 import axios from "@/utils/request";
 
 export function getUdiInfos(query) {
-    return axios({
-        url: "/udiwms/udiinfo/filterUdi",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/udiinfo/filterUdi",
+    method: "get",
+    params: query
+  });
 }
 
 export function filterCompany(query) {
-    return axios({
-        url: "/udiwms/udiinfo/filterCompany",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/udiinfo/filterCompany",
+    method: "get",
+    params: query
+  });
 }
 
 export function filterByUuid(query) {
-    return axios({
-        url: "/udiwms/udiinfo/local/filterByUuid",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/udiinfo/local/filterByUuid",
+    method: "get",
+    params: query
+  });
 }
 
 export function filterByVersion(query) {
-    return axios({
-        url: "/udiwms/syncdi/version",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/syncdi/version",
+    method: "get",
+    params: query
+  });
+}
+export function dlLastVersionByDi(query) {
+  return axios({
+    url: "/udiwms/udiinfo/dlLastVersionByDi",
+    method: "get",
+    params: query
+  });
+}
+export function superSearch(query) {
+  return axios({
+    url: "/udiwms/udiinfo/superSearch",
+    method: "get",
+    params: query
+  });
 }
-

src/api/basic/udiRelevance.js

@@ -8,6 +8,7 @@ export function getUdiInfos(query) {
   });
 }
 
+
 export function getMutiUdiInfos(query) {
   return axios({
     url: "/udi/udirel/mutil/download",
@@ -43,6 +44,15 @@ export function updatetUdiInfos(query) {
 }
 
 
+export function updatetSingleUdiInfo(query) {
+  return axios({
+    url: "/udi/udirel/update/di",
+    method: "post",
+    data: query
+  });
+}
+
+
 export function checkExitUdi(query) {
   return axios({
     url: "/udi/udirel/check/udi",
@@ -174,6 +184,14 @@ export function changeVersion(query) {
   });
 }
 
+export function getGgxhList(params) {
+  return axios({
+    url: "/udiwms/udiinfo/getGgxhList",
+    method: "get",
+    params: params
+  });
+}
+
 
 
 

src/api/param/systemParamConfig.js

@@ -5,48 +5,48 @@ import axios from "@/utils/request";
 
 // 获取列表
 export function systemParamConfigList(query) {
-    return axios({
-        url: "/system/param/config/list",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/system/param/config/list",
+    method: "get",
+    params: query
+  });
 }
 
 // 保存
 export function systemParamConfigSave(data, formName, method = "post") {
-    let url =
-        formName === "add" ? "/system/param/config/save" : "/system/param/config/update";
-    return axios({
-        url: url,
-        method: method,
-        data: data
-    });
+  let url =
+    formName === "add" ? "/system/param/config/save" : "/system/param/config/update";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
 }
 
 //获取配置
 export function selectSysParamByKey(query) {
-    return axios({
-        url: "/udiwms/sys/config/selectByKey",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/sys/config/selectByKey",
+    method: "get",
+    params: query
+  });
 }
 
 export function selectIp(query) {
-    return axios({
-        url: "/udiwms/basic/thirdsys/selectIp",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/thirdsys/selectIp",
+    method: "get",
+    params: query
+  });
 }
 
 //获取产品信息设置
 export function finProductSet(query) {
-    return axios({
-        url: "/udiwms/sys/config/selectByBasic",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/sys/config/selectByBasic",
+    method: "get",
+    params: query
+  });
 }
 
 

src/views/basic/product/SelectDIDetailDialog.vue

@@ -91,7 +91,7 @@
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
-                    <span>产品名称:&nbsp;</span>
+                    <span>物资名称:&nbsp;</span>
                   </div>
                   <el-input
                     style="width: 65%"
@@ -458,11 +458,6 @@ export default {
     return {
       activeNames: ['1']
     }
-
-
-
-
-
   },
   methods: {},
 

src/views/basic/product/UdiInfoSelectLocalUdi.vue

@@ -32,9 +32,10 @@
                   clearable="true"
                   style="width: 100%"
                   reserve-keyword
-                  placeholder="医疗器械注册人"
+                  placeholder="请输入医疗器械注册人"
                   :remote-method="findMethod"
                   :loading="loading"
+                  @clear="clear"
                 >
                   <el-option
                     v-for="item in fromOptions"
@@ -52,7 +53,7 @@
                 <el-input
                   :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
                   v-model="unionQuery.cpmctymc" clearable="true"
-                  placeholder="器械通用名称"
+                  placeholder="请输入器械通用名称"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -63,7 +64,7 @@
                 <el-input
                   v-model="unionQuery.ggxh" clearable="true"
                   :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                  placeholder="规格型号"
+                  placeholder="请输入规格型号"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -72,7 +73,7 @@
                 <el-input
                   v-model="unionQuery.zczbhhzbapzbh" clearable="true"
                   :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                  placeholder="注册证/备案号"
+                  placeholder="请输入注册证/备案号"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -88,6 +89,10 @@
             >选入
             </el-button
             >
+            <el-button type="primary" icon="el-icon-search" @click="getSuperSeaech" size="mini"
+            >国家同步库查询
+            </el-button
+            >
           </el-button-group>
         </div>
         <el-divider style="margin: 15px"></el-divider>
@@ -117,7 +122,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="产品名称"
+            label="物资名称"
             prop="cpmctymc"
             show-overflow-tooltip
           ></el-table-column>
@@ -137,7 +142,7 @@
             show-overflow-tooltip
           ></el-table-column>
 
-          <el-table-column label="操作" >
+          <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button
                 type="text"
@@ -159,12 +164,12 @@
         />
       </div>
     </el-card>
-    <el-card class="el-card" v-if="isImport">
+    <el-card class="el-card" v-if="this.isImport">
       <div>
         <el-form label-width="120px">
           <el-row :gutter="20">
             <el-col :span="12">
-              <el-form-item label="产品名称:" class="query-form-item">
+              <el-form-item label="物资名称:" class="query-form-item">
                 <el-input
                   style="width: 80%"
                   size="small"
@@ -333,8 +338,10 @@
 
 <script>
 import {getUdiInfos, filterCompany} from "@/api/basic/product/udiInfo";
+import {superSearch} from "@/api/basic/udiInfo";
 import {combineUdi, combineAllUdi, checkExitUdi} from "@/api/basic/product/udiRelevance";
 import selectDiDetail from "./SelectDIDetailDialog"
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "closeDialog",
@@ -378,6 +385,7 @@ export default {
         zczbhhzbapzbh: "",
         isCheck: 1
       },
+      cpmctymc1: "",
       combineLoading: false,
       combineQuery: {
         idSpliUdi: false,
@@ -418,14 +426,52 @@ export default {
         ggxh: "",
         zczbhhzbapzbh: "",
         isCheck: 1
-      },
-        this.actDateRange = [];
+      };
+      this.actDateRange = [];
+      this.udidlList = [];
+    },
+    clear() {
+      this.unionQuery.ylqxzcrbarmc == null;
+      this.unionQuery.cpmctymc = null;
     },
-
     searchList() {
       this.unionQuery.page = 1;
       this.getList();
     },
+    getSuperSeaech() {
+
+      this.$confirm("此操作将访问国家库查询DI数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.unionQuery.nameCode == "") {
+            this.$message.warning("请输入完成DI信息进行查询！");
+            return;
+          }
+          this.loading = true;
+          superSearch(this.unionQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.udidlList = response.data.list || [];
+                this.total = response.data.total || 0;
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+              this.udidlList = [];
+              this.total = 0;
+            });
+        })
+        .catch(() => {
+        });
+
+
+    },
 
     getList() {
       if (
@@ -486,6 +532,7 @@ export default {
       return "";
     },
     handleErpChange(val) {
+      this.cpmctymc1 = val.cpmctymc;
       this.currentRow = val;
     },
     intentBack() {
@@ -493,6 +540,21 @@ export default {
     },
 
     checkCombine() {
+      if (isBlank(this.relId)) {
+        this.checkedUdi();
+      } else {
+        this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称" + this.data.cpmctymc, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.checkedUdi();
+          });
+      }
+    },
+
+    checkedUdi() {
       let selectData = this.multipleUdiSelection;
       let selected = null;
       if (this.multipleUdiSelection.length == 0) {
@@ -564,8 +626,6 @@ export default {
           this.combineLoading = false;
           this.$emit("closeUdi", false);
         });
-
-
     },
 
     combine() {

src/views/basic/product/UdiInfoSelectRel.vue

@@ -20,24 +20,24 @@
               <el-form-item class="query-form-item" label="产品编码:">
                 <el-input
                   v-model="erpQuery.code"
-                  placeholder="产品编码/商品条码/医保编码"
+                  placeholder="请输入产品编码/商品条码/医保编码"
                   clearable="true"
                   @keyup.enter.native="keyupErp_submit($event)"
                 ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item class="query-form-item" label="产品名称:">
+              <el-form-item class="query-form-item" label="物资名称:">
                 <el-input v-model="erpQuery.name"
                           clearable="true"
-                          placeholder="产品名称"></el-input>
+                          placeholder="请输入物资名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item class="query-form-item" label="注册/备案凭证号:">
+              <el-form-item class="query-form-item" label="注册/备案号:">
                 <el-input v-model="erpQuery.registerNo"
                           clearable="true"
-                          placeholder="注册/备案凭证号"></el-input>
+                          placeholder="请输入注册/备案号"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -47,7 +47,7 @@
               <el-form-item class="query-form-item" label="生产企业:">
                 <el-input v-model="erpQuery.manufactory"
                           clearable="true"
-                          placeholder="生产企业"></el-input>
+                          placeholder="请输入生产企业"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -55,7 +55,7 @@
                 <el-input
                   v-model="erpQuery.spec"
                   clearable="true"
-                  placeholder="规格型号"
+                  placeholder="请输入规格型号"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -94,10 +94,10 @@
         >
           <el-table-column label="序号" type="index"></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="name" show-overflow-tooltip></el-table-column>
           <el-table-column label="计量单位" prop="measname" 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="registerNo" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         </el-table>
         <pagination
@@ -134,7 +134,7 @@
                   clearable="true"
                   style="width: 100%"
                   reserve-keyword
-                  placeholder="医疗器械注册人"
+                  placeholder="请输入医疗器械注册人"
                   :remote-method="findMethod"
                   :loading="loading"
                 >
@@ -156,7 +156,7 @@
                   v-model="unionQuery.cpmctymc"
                   size="mini"
                   clearable="true"
-                  placeholder="器械通用名称"
+                  placeholder="请输入器械通用名称"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -166,7 +166,7 @@
               <el-form-item class="query-form-item" label="规格型号:">
                 <el-input
                   v-model="unionQuery.ggxh"
-                  placeholder="规格型号"
+                  placeholder="请输入规格型号"
                   clearable="true"
                   size="mini"
                   :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
@@ -174,12 +174,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item class="query-form-item" label="注册/备案凭证号:">
+              <el-form-item class="query-form-item" label="注册/备案号:">
                 <el-input
                   v-model="unionQuery.zczbhhzbapzbh"
                   clearable="true"
                   :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                  placeholder="注册/备案凭证号"
+                  placeholder="请输入注册/备案号"
                   size="mini"
                 ></el-input>
               </el-form-item>
@@ -191,6 +191,10 @@
             <el-button icon="el-icon-view" type="primary" @click="hideDiSearch">显示/隐藏搜索栏</el-button>
             <el-button type="primary" icon="el-icon-refresh" @click="onDiReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="serchList">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="getSuperSeaech" size="mini"
+            >国家同步库查询
+            </el-button
+            >
           </el-button-group>
         </div>
         <el-divider style="margin: 15px"></el-divider>
@@ -216,7 +220,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="产品名称"
+            label="物资名称"
             prop="cpmctymc"
             show-overflow-tooltip
           ></el-table-column>
@@ -277,6 +281,7 @@
 
 <script>
 import {getUdiInfos, filterCompany} from "@/api/basic/product/udiInfo";
+import {superSearch} from "@/api/basic/udiInfo";
 import {combineUdi} from "@/api/basic/product/udiRelevance";
 import {getBasicThirdSys} from "@/api/thrsys/basicThirdSys";
 import {getInvbasdoc} from "@/api/basic/product/getErps";
@@ -430,6 +435,40 @@ export default {
     serchList() {
       this.unionQuery.page = 1;
       this.getList();
+    },
+    getSuperSeaech() {
+
+      this.$confirm("此操作将访问国家库查询DI数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          if (this.unionQuery.nameCode == "") {
+            this.$message.warning("请输入完成DI信息进行查询！");
+            return;
+          }
+          this.loading = true;
+          superSearch(this.unionQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.udidlList = response.data.list || [];
+                this.total = response.data.total || 0;
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+              this.udidlList = [];
+              this.total = 0;
+            });
+        })
+        .catch(() => {
+        });
+
+
     },
     getList() {
       if (

src/views/basic/product/UdiinfoSelectVersion.vue

@@ -10,6 +10,7 @@
           :row-class-name="tableRowClassName"
           @current-change="handleErpChange"
           @selection-change="handleSelectionUdiChange"
+          border
         >
           <el-table-column label="序号" type="index"></el-table-column>
 
@@ -66,13 +67,13 @@
           </el-table-column>
 
         </el-table>
-        <el-pagination
-          :page-size="unionQuery.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
+        <pagination
+          v-show="total>0"
           :total="total"
-          :current-page="unionQuery.page"
-        ></el-pagination>
+          :limit.sync="unionQuery.limit"
+          :page.sync="unionQuery.page"
+          @pagination="handleCurrentChange"
+        ></pagination>
 
       </div>
     </el-card>
@@ -183,7 +184,7 @@ export default {
     },
 
     handleCurrentChange(val) {
-      this.unionQuery.page = val;
+      this.unionQuery.page = val.page;
       this.getList();
     },
     tableRowClassName({row, rowIndex}) {

src/views/basic/product/basicCompanyProductsImport.vue

@@ -4,7 +4,7 @@
         <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
           <el-row>
             <el-col :span="6">
-                <el-form-item label="产品编码:">
+                <el-form-item label="物资编码:">
                     <el-input v-model="filterQuery.unionCode"  style="width:90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
                 </el-form-item>
             </el-col>
@@ -32,8 +32,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="第三方产品编码:">
-                    <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
+                <el-form-item label="第三方物资编码:">
+                    <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码" clearable="true"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -52,7 +52,7 @@
             <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
-            <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
             <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
             <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>

src/views/basic/product/bindHospProduct.vue

@@ -22,8 +22,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="产品通用名:">
-              <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"
+            <el-form-item class="query-form-item" label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
                         style="width: 90%"></el-input>
             </el-form-item>
           </el-col>
@@ -74,14 +74,15 @@
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
-      <el-table v-loading="loading" :data="list" style="width: 100%;" @selection-change="handleSelectionChange" border key="1">
+      <el-table v-loading="loading" :data="list" style="width: 100%;" @selection-change="handleSelectionChange" border
+                key="1">
         <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column label="主系统产品编码" prop="mainId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="主系统编码" prop="mainId" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
       </el-table>
       <pagination
@@ -99,9 +100,8 @@
 <script>
 import {getUdiInfos, thirdSysDetail,} from "@/api/basic/product/udiRelevance";
 import {filterByUuid} from "@/api/basic/product/udiInfo";
-import {bindBasicHospProduct, saveBasicHospType,getBindList} from "@/api/basic/basicHospType";
-
-
+import {bindBasicHospProduct, saveBasicHospType, getBindList} from "@/api/basic/basicHospType";
+import {sysFilter} from '@/api/basic/udiRelevance'
 
 
 export default {
@@ -123,7 +123,8 @@ export default {
         addType: 1,
         thrPiId: null,
         filterType: null,
-        diType: 1
+        diType: 1,
+        bindType: 1
       },
       productList: [],
       loading: false,
@@ -167,6 +168,18 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
+    getSysFilter() {
+      sysFilter()
+        .then((response) => {
+          this.loading = false;
+          this.filterList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.filterList = [];
+        });
+
+    },
     getList() {
       getBindList(this.filterQuery)
         .then((response) => {
@@ -180,10 +193,10 @@ export default {
           this.total = 0;
         });
     },
-    selectable(row,index){
-      if(row.bindCheck==true){
+    selectable(row, index) {
+      if (row.bindCheck == true) {
         return false;
-      }else{
+      } else {
         return true;
       }
     },
@@ -197,17 +210,17 @@ export default {
       this.filterQuery.page = val.page;
       this.getList();
     },
-    instentProduct(){
-      if(this.productList.length<=0){
-        this.$message.error("请先选择解绑产品！");
+    instentProduct() {
+      if (this.productList.length <= 0) {
+        this.$message.error("请先选择要绑定的产品！");
         return;
       }
-      var ids=this.productList.map((item)=> item.id)
-      var data={code:this.rId,ids:ids}
+      var ids = this.productList.map((item) => item.id)
+      var data = {code: this.rId, ids: ids}
       bindBasicHospProduct(data).then((response) => {
         if (response.code == 20000) {
-            this.$message.success("绑定成功");
-            this.closeDialog();
+          this.$message.success("绑定成功");
+          this.closeDialog();
         } else {
           this.$message.error(response.message);
         }
@@ -218,12 +231,10 @@ export default {
   },
   mounted() {
   },
-  components: {
-
-  },
+  components: {},
   created() {
-    this.filterQuery.bindType=1
     this.getList();
+    this.getSysFilter();
 
   },
 };

src/views/basic/product/product.vue

@@ -29,21 +29,21 @@
             </el-row>
             <el-row>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="产品编码:">
-                  <el-input v-model="filterQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                <el-form-item class="query-form-item" label="最小销售标识:">
+                  <el-input v-model="filterQuery.unionCode" placeholder="请输入最小销售标识"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="物资名称:">
-                  <el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
+                  <el-input v-model="filterQuery.cpmctymc" placeholder="请输入物资名称" clearable="true"
                             style="width: 90%"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="规格型号:">
-                  <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable="true"
+                  <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号" clearable="true"
                             style="width: 90%"></el-input>
                 </el-form-item>
               </el-col>
@@ -63,24 +63,23 @@
               </el-col>
             </el-row>
             <el-row>
-
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="注册备案人:">
-                  <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                  <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="请输入注册备案人"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="外部产品编码:">
-                  <el-input v-model="filterQuery.thrPiId" placeholder="第三方产品编码"
+                <el-form-item class="query-form-item" label="第三方编码:">
+                  <el-input v-model="filterQuery.thrPiId" placeholder="请输入第三方主系统编码"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="集采状态">
-                  <el-select v-model="filterQuery.groupBuy" placeholder="集采状态" clearable>
+                <el-form-item class="query-form-item" label="集采状态:">
+                  <el-select v-model="filterQuery.groupBuy" placeholder="请选择集采状态" clearable style="width: 90%">
                     <el-option label="全部" value=""></el-option>
                     <el-option label="集采" value="true"></el-option>
                     <el-option label="非集采" value="false"></el-option>
@@ -88,8 +87,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="可配送状态">
-                  <el-select v-model="filterQuery.dispatch" placeholder="可配送状态" clearable>
+                <el-form-item class="query-form-item" label="可配送状态:">
+                  <el-select v-model="filterQuery.dispatch" placeholder="请选择可配送状态" clearable style="width: 90%">
                     <el-option label="全部" value=""></el-option>
                     <el-option label="可配送" value="true"></el-option>
                     <el-option label="不可配送" value="false"></el-option>
@@ -97,13 +96,30 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
+            <el-row>
+              <el-col :span="6">
+                <el-form-item class="query-form-item" label="注册/备案号:">
+                  <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册/备案号"
+                            style="width: 90%"
+                            clearable="true"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item class="query-form-item" label="生产企业:">
+                  <el-input v-model="filterQuery.manufactory" placeholder="请输入生产企业"
+                            style="width: 90%"
+                            clearable="true"></el-input>
+                </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="submit">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>
+              <!--              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>-->
               <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">选入DI信息</el-button>
               <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加院内字典</el-button>
               <el-button type="primary" icon="el-icon-plus" @click="intentDetail">关联添加</el-button>
@@ -119,43 +135,27 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column
-              label="最小销售产品标识"
-              prop="nameCode"
-              width="140"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              label="主系统产品编码"
-              prop="mainId"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              label="生产企业"
-              prop="ylqxzcrbarmc"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              label="物资名称"
-              prop="cpmctymc"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              label="规格型号"
-              prop="ggxh"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              label="注册/备案凭证"
-              prop="zczbhhzbapzbh"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              label="器械类别"
-              prop="qxlb"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column width="200" label="操作">
+            <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column label="主系统编码" prop="mainId" width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="规格型号" prop="ggxh" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column label="集采状态" prop="groupBuy" width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-tag :type="(scope.row.groupBuy) | statusFilterType">
+                  {{ groupBuyMap[scope.row.groupBuy] }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="可配送状态" prop="dispatch" width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-tag :type="(scope.row.dispatch) | statusFilterType">
+                  {{ dispatchMap[scope.row.dispatch] }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column width="180" label="操作" fixed="right">
               <template slot-scope="scope">
                 <el-button
                   type="text"
@@ -185,7 +185,7 @@
             </el-table-column>
           </el-table>
           <el-dialog
-            title="耗材字典-详情"
+            title="物资字典-详情"
             :visible.sync="editDialogVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
@@ -195,10 +195,11 @@
             <el-card>
               <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="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>
@@ -213,7 +214,7 @@
 
               <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3"
                         highlight-current-row @current-change="handleDetail">
-                <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+                <el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
                 <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
@@ -303,9 +304,9 @@
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
-                            <span>启用使用单元:&nbsp;</span>
+                            <span>允许无序列号:&nbsp;</span>
                           </div>
-                          <el-select v-model="editQuery.isUseDy" disabled style="width: 65%" size="small">
+                          <el-select v-model="editQuery.allowNoSerial" disabled style="width: 65%" size="small">
                             <el-option label="是" :value="true"></el-option>
                             <el-option label="否" :value="false"></el-option>
                             <el-option label="否" :value="null"></el-option>
@@ -314,6 +315,18 @@
                       </el-col>
                     </el-row>
                     <el-row :gutter="20" class="el-row" type="flex">
+                      <el-col :span="12" class="el-col">
+                        <div class="text item">
+                          <div class="itemTag">
+                            <span>启用使用单元:&nbsp;</span>
+                          </div>
+                          <el-select v-model="editQuery.isUseDy" disabled style="width: 65%" size="small">
+                            <el-option label="是" :value="true"></el-option>
+                            <el-option label="否" :value="false"></el-option>
+                            <el-option label="否" :value="null"></el-option>
+                          </el-select>
+                        </div>
+                      </el-col>
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
@@ -984,6 +997,7 @@
             :visible.sync="editDiDialogVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
+            :before-close="this.cancelDialog"
             width="70%"
             v-if="editDiDialogVisible"
           >
@@ -1192,7 +1206,7 @@ export default {
         filterType: null,
         dispatch: null,
         groupBuy: null,
-
+        zczbhhzbapzbh: null,
       },
       rId: null,
       selectUdiTypeVisible: false,
@@ -1211,6 +1225,14 @@ export default {
         measname: null,
         nameCode: null
       },
+      groupBuyMap: {
+        true: "集采",
+        false: "非集采"
+      },
+      dispatchMap: {
+        true: "可配送",
+        false: "不可配送"
+      },
       pId: 0,
       productRemarkSet: {},
       relevanceEdit: {
@@ -1223,6 +1245,7 @@ export default {
         allowNoBatch: null,
         allowNoExpire: null,
         allowNoProduct: null,
+        allowNoSerial: null,
         pId: null,
       },
       defaultSys: null,
@@ -1263,6 +1286,16 @@ export default {
       useNumEnable: true,
     };
   },
+  filters: {
+
+    statusFilterType(status) {
+      const statusMap = {
+        false: "warning",
+        true: "success",
+      };
+      return statusMap[status];
+    },
+  },
 
   methods: {
     onReset() {
@@ -1367,6 +1400,7 @@ export default {
 
       deletetUdiInfos(tquery)
         .then((response) => {
+          this.loading = false;
           if (response.code == 20000) {
             this.getList();
             this.$message({
@@ -1662,6 +1696,7 @@ export default {
     },
     onAddSubmit(relSubmit) {
       this.editFormat.relSubmit = relSubmit;
+      console.log(this.editFormat)
       updatetUdiInfos(this.editFormat)
         .then((response) => {
           if (response.code == 20000) {
@@ -1705,48 +1740,48 @@ export default {
       });
     },
 
-    selectSysParam() {
-      let query = {
-        paramKey: "smp_isUploadProuct",
-      };
-      spcombie().then((response) => {
-        if (response.code == 20000) {
-          if (response.data.paramValue == "1") {
-            this.isSpCombine = true;
-          } else {
-            this.isSpCombine = false;
-          }
-        }
-      });
-
-      selectSysParamByKey(query).then((response) => {
-        if (response.code == 20000) {
-          if (response.data.paramValue == "1") {
-            this.isUploadSmp = true;
-          } else {
-            this.isUploadSmp = false;
-          }
-        }
-      });
-      let query1 = {
-        paramKey: "upload_pi_file_enabled",
-      };
-      selectSysParamByKey(query1).then((response) => {
-        if (response.code == 20000) {
-          if (response.data.paramValue == "1") {
-            this.isImportFile = true;
-          }
-        }
-      });
-      let query2 = {
-        paramKey: "upload_pi_file_url",
-      };
-      selectSysParamByKey(query2).then((response) => {
-        if (response.code == 20000) {
-          this.uploadFileUrl = response.data.paramValue;
-        }
-      });
-    },
+    // selectSysParam() {
+    //   let query = {
+    //     paramKey: "smp_isUploadProuct",
+    //   };
+    //   spcombie().then((response) => {
+    //     if (response.code == 20000) {
+    //       if (response.data.paramValue == "1") {
+    //         this.isSpCombine = true;
+    //       } else {
+    //         this.isSpCombine = false;
+    //       }
+    //     }
+    //   });
+    //
+    //   selectSysParamByKey(query).then((response) => {
+    //     if (response.code == 20000) {
+    //       if (response.data.paramValue == "1") {
+    //         this.isUploadSmp = true;
+    //       } else {
+    //         this.isUploadSmp = false;
+    //       }
+    //     }
+    //   });
+    //   let query1 = {
+    //     paramKey: "upload_pi_file_enabled",
+    //   };
+    //   selectSysParamByKey(query1).then((response) => {
+    //     if (response.code == 20000) {
+    //       if (response.data.paramValue == "1") {
+    //         this.isImportFile = true;
+    //       }
+    //     }
+    //   });
+    //   let query2 = {
+    //     paramKey: "upload_pi_file_url",
+    //   };
+    //   selectSysParamByKey(query2).then((response) => {
+    //     if (response.code == 20000) {
+    //       this.uploadFileUrl = response.data.paramValue;
+    //     }
+    //   });
+    // },
 
     editUdiType() {
       this.selectUdiTypeVisible = true;
@@ -1807,7 +1842,7 @@ export default {
     this.findBasicProductSet();
     this.getList();
     this.getTerrList();
-    this.selectSysParam();
+    // this.selectSysParam();
     this.getSysFilter();
   },
 };

src/views/basic/product/productEdit.vue

@@ -5,15 +5,15 @@
       :rules="rules"
       ref="editQuery"
       border
-      label-width="120px"
+      label-width="130px"
     >
       <el-card>
         <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="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="操作">
@@ -44,7 +44,7 @@
         </div>
         <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row
                   @current-change="handleDetail">
-          <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+          <el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
           <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
@@ -56,8 +56,6 @@
         </el-table>
       </el-card>
       <el-card>
-
-
         <el-row type="flex" class="edit-row" style="margin-top: 20px">
           <el-col :span="12">
             <el-form-item label="计量单位:">
@@ -102,12 +100,38 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="物资所属分类:">
+              <treeselect
+                v-model="editQuery.relCode"
+                :options="fromDeptOptions"
+                :normalizer="normalizer"
+                :show-count="true"
+                style="width: 80%;"
+                placeholder="选择物资所属分类"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="医保编码:">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.ybbm"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12">
             <el-form-item label="库存积压预警数量:">
               <el-input
                 style="width: 80%"
                 size="small"
+                type="number"
+                oninput="value=value.replace(/[^\d]/g,'')"
                 splaceholder="请输入内容"
                 v-model="editQuery.overStockNum"
               ></el-input>
@@ -118,6 +142,8 @@
               <el-input
                 style="width: 80%"
                 size="small"
+                type="number"
+                oninput="value=value.replace(/[^\d]/g,'')"
                 splaceholder="请输入内容"
                 v-model="editQuery.lowStockNum"
               ></el-input>
@@ -130,13 +156,14 @@
               <el-input
                 style="width: 80%"
                 size="small"
+                type="number"
                 splaceholder="请输入内容"
                 v-model="editQuery.recentDateTime"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="预警时间格式:">
+            <el-form-item label="预警时间单位:">
               <el-select v-model="editQuery.isDateBy" style="width: 65%" placeholder="状态" clearable>
                 <el-option label="天" :value="1"></el-option>
                 <el-option label="小时" :value="2"></el-option>
@@ -234,43 +261,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row type="flex" class="edit-row">
-          <el-col :span="12">
-            <el-form-item label="医保编码:">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.ybbm"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
 
-      </el-card>
 
+      </el-card>
       <el-collapse v-model="activeNames" style="margin-top: 12px">
         <el-collapse-item title="高级设置" name="1"
                           style="font-size: 19px;
           margin-left: 25px;
           font-weight: bold;">
-
-
-          <el-row type="flex" class="edit-row">
-            <el-col :span="12">
-              <el-form-item label="物资所属分类:">
-                <treeselect
-                  v-model="editQuery.relCode"
-                  :options="fromDeptOptions"
-                  :normalizer="normalizer"
-                  :show-count="true"
-                  style="width: 65%;"
-                  placeholder="选择物资所属分类"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-divider></el-divider>
           <div style="width: 96%;margin: 0 auto">
             <el-row>
               <el-col span="5">
@@ -389,8 +387,6 @@
                 <span class="sptext">是否可配送</span>
               </el-col>
             </el-row>
-
-
             <el-divider></el-divider>
             <el-row>
               <el-col span="5">
@@ -467,6 +463,28 @@
 
             <el-divider></el-divider>
 
+
+            <el-row>
+              <el-col span="5">
+                <span class="sptext">允许无序列号</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+
+                <el-select v-model="editQuery.allowNoSerial" style="width: 65%" placeholder="状态" clearable>
+                  <el-option label="允许" :value="true"></el-option>
+                  <el-option label="不允许" :value="false"></el-option>
+                </el-select>
+
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">允许无序列号</span>
+              </el-col>
+            </el-row>
+
+            <el-divider></el-divider>
+
             <el-row>
               <el-col span="5">
                 <span class="sptext">是否必须维护资质材料</span>
@@ -560,7 +578,7 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
 import selectErp from "./udiInfoselectErpUdi";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
-import {getListMenu} from "@/api/basic/basicHospType";
+import { getListMenu, getOneName } from '@/api/basic/basicHospType'
 
 
 export default {
@@ -632,7 +650,6 @@ export default {
     if (this.editQuery.isDateBy == 1) {
       this.editQuery.recentDateTime = this.editQuery.recentDateTime / 24;
     }
-    console.log(this.editQuery)
     this.getTreeselect();
     let ttquery = {
       id: this.relevanceEdit.id
@@ -709,7 +726,10 @@ export default {
       updatetSingleUdiInfo(this.editSingleFormat)
         .then((response) => {
           if (response.code == 20000) {
-            this.$emit("closePre", true);
+            let ttquery = {
+              id: this.relevanceEdit.id
+            }
+            this.getDetailList(ttquery);
             this.editSingleDiDialogVisible = false;
           } else {
             this.$message.error(response.message);
@@ -766,12 +786,28 @@ export default {
         .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.editQuery.thirdId = item.thirdId;
+        } else if (item.sysId === "thirdId1") {
+          this.editQuery.thirdId1 = item.thirdId;
+        } else if (item.sysId === "thirdId2") {
+          this.editQuery.thirdId2 = item.thirdId;
+        } else if (item.sysId === "thirdId3") {
+          this.editQuery.thirdId3 = item.thirdId;
+        } else if (item.sysId === "thirdId4") {
+          this.editQuery.thirdId4 = item.thirdId;
+        }
+      })
+    },
     getDetailList(detailQuery) {
       this.loading = true;
       filterByUuid(detailQuery)
@@ -813,12 +849,15 @@ export default {
       }
     },
     getTreeselect() {
-      getListMenu().then(response => {
-        this.fromDeptOptions = [];
-        const menu = {id: 0, name: '主类目', children: []};
-        menu.children = this.handleTree(response.data, "code", "parentCode");
-        this.fromDeptOptions.push(menu);
-      });
+      getOneName().then(res =>{
+        const menu = {id: res.data.id,code:res.data.code, name: res.data.name, children: []};
+        getListMenu({}).then(response => {
+          this.fromDeptOptions = [];
+          menu.children = this.handleTree(response.data,"code", "parentCode");
+          console.log(menu)
+          this.fromDeptOptions.push(menu);
+        });
+      })
     },
     /** 转换菜单数据结构 */
     normalizer(node) {

src/views/basic/product/productSingleEdit.vue

@@ -5,12 +5,12 @@
       :rules="rules"
       ref="editQuery"
       border
-      label-width="120px"
+      label-width="130px"
     >
 
       <el-row>
         <el-col span="20">
-          <el-form-item label="产品标识:">
+          <el-form-item label="产品最小销售标识:">
             <el-input
               disabled
               style="width: 90%"

src/views/basic/product/productUdiType.vue

@@ -2,18 +2,17 @@
   <div>
     <el-card>
       <el-form :inline="true" :model="query" class="query-form" size="mini">
-        <el-form-item class="query-form-item" label="名称:">
+        <el-form-item class="query-form-item" label="分类名称:">
           <el-input
             v-model="query.name"
             clearable
-            placeholder="请输入名称"
+            placeholder="请输入分类名称"
           ></el-input>
         </el-form-item>
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <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="handleSubForm( pCode, 'add')">新增</el-button>
           </el-button-group>
         </el-form-item>
       </el-form>
@@ -29,9 +28,11 @@
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
         <el-table-column prop="name" label="名称"></el-table-column>
         <el-table-column prop="code" label="编码"></el-table-column>
+        <el-table-column prop="remark" label="备注"></el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
+            <el-button type="text"  @click="handleSubForm( scope.row, 'add')">新增</el-button>
+            <el-button type="text"  @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
             <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleDelInv(scope.row)">删除</el-button>
             <el-button type="text" v-if="scope.row.code!=10000"  @click.native.stop="addHospProduct( scope.row)">绑定</el-button>
             <el-button type="text" v-if="scope.row.code!=10000"   @click.native.stop="removeHospProduct(scope.row)">解绑</el-button>
@@ -53,9 +54,11 @@
             <el-col :span="12" class="el-col">
               <el-form-item label="上级菜单" prop="parentCode">
                 <treeselect
+                  :disabled="formName=='add' || subData.code==10000"
                   v-model="subData.parentCode"
                   :options="fromDeptOptions"
                   :normalizer="normalizer"
+                  :clearable = "false"
                   :show-count="true"
                   placeholder="选择上级菜单"
                 />
@@ -73,7 +76,7 @@
           </el-row>
           <el-row class="el-row" type="flex">
             <el-col class="el-col">
-              <el-form-item label="备注" prop="remark" class="query-form-item">
+              <el-form-item label="备注:" prop="remark" class="query-form-item">
                 <el-input
                   v-model="subData.remark"
                   type="textarea"
@@ -131,7 +134,7 @@
 <script>
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
-import {getBasicHospType, getListMenu, saveBasicHospType,uodateBasicHospType,deleteBasicHospType} from "@/api/basic/basicHospType";
+import {getBasicHospType, getListMenu, saveBasicHospType,uodateBasicHospType,deleteBasicHospType,getOneName} from "@/api/basic/basicHospType";
 
 import selectHospProduct from "@/views/basic/product/bindHospProduct";
 import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
@@ -154,8 +157,8 @@ export default {
       isExpandAll: true,
       total: 0,
       formMap: {
-        add: "新增",
-        edit: "编辑"
+        add: "新增物资字典分类",
+        edit: "编辑物资字典分类"
       },
       formName: null,
       configParms: {},
@@ -220,9 +223,11 @@ export default {
       if (formName === "edit") {
         this.subData = JSON.parse(JSON.stringify(data));
       } else if (formName === "add") {
-        this.subData.parentCode = JSON.parse(JSON.stringify(this.pCode));
+        this.subData= {
+          parentCode:JSON.parse(JSON.stringify(data)).code
+        };
       }
-      this.getTreeselect();
+      this.getTreeselect(data);
       this.subFormVisible = true;
     },
 
@@ -244,7 +249,7 @@ export default {
     },
     forInvSubmit() {    // 新增，编辑---提交
 
-      if(this.subData.parentCode==null){
+      if(this.subData.code!=10000 && this.subData.parentCode==null){
         this.$message.error("上级菜单不能为空");
         return
       }
@@ -259,7 +264,6 @@ export default {
             this.getList();
           } else {
             this.$message.error(response.message);
-            this.subFormVisible = false;
           }
         }).catch(() => {
           this.subFormVisible = false;
@@ -271,7 +275,6 @@ export default {
             this.getList();
           } else {
             this.$message.error(response.message);
-            this.subFormVisible = false;
           }
         }).catch(() => {
           this.subFormVisible = false;
@@ -280,13 +283,23 @@ export default {
     },
 
     /** 查询菜单下拉树结构 */
-    getTreeselect() {
-      getListMenu().then(response => {
-        this.fromDeptOptions = [];
-        const menu = {id: 0, name: '主类目', children: []};
-        menu.children = this.handleTree(response.data,"code", "parentCode");
-        this.fromDeptOptions.push(menu);
-      });
+    getTreeselect(row) {
+      debugger
+      if(row!=null){
+        var data={
+          code:row.code,
+          type:1
+        }
+      }
+      getOneName().then(res =>{
+        const menu = {id: res.data.id,code:res.data.code, name: res.data.name, children: []};
+        getListMenu(data).then(response => {
+          this.fromDeptOptions = [];
+          menu.children = this.handleTree(response.data,"code", "parentCode");
+          console.log(menu)
+          this.fromDeptOptions.push(menu);
+        });
+      })
     },
     /** 转换菜单数据结构 */
     normalizer(node) {

src/views/basic/product/unbindHospProduct.vue

@@ -22,8 +22,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="产品通用名:">
-              <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"
+            <el-form-item class="query-form-item" label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
                         style="width: 90%"></el-input>
             </el-form-item>
           </el-col>
@@ -77,11 +77,11 @@
       <el-table v-loading="loading" :data="list" style="width: 100%;" @selection-change="handleSelectionChange"  border key="1">
         <el-table-column type="selection" width="55" ></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column label="主系统产品编码" prop="mainId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="主系统编码" prop="mainId" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
       </el-table>
       <pagination
@@ -99,6 +99,7 @@
 <script>
 
 import {bindBasicHospProduct, saveBasicHospType,unbindBasicHospProduct,getBindList} from "@/api/basic/basicHospType";
+import { sysFilter } from '@/api/basic/udiRelevance'
 
 
 
@@ -151,15 +152,14 @@ export default {
         unionCode: null,
         udiCode: null,
         ylqxzcrbarmc: "",
-        cpmctymc: "",
-        thrPiId: null,
+        cpmctymc: "", thrPiId: null,
         nameCode: "",
         ggxh: null,
         page: 1,
         limit: 20,
         addType: 1,
         diType: 1,
-        relCode: this.rId
+        relCode:this.rId
       };
       this.getList();
     },
@@ -181,6 +181,18 @@ export default {
           this.total = 0;
         });
     },
+    getSysFilter() {
+      sysFilter()
+        .then((response) => {
+          this.loading = false;
+          this.filterList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.filterList = [];
+        });
+
+    },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
@@ -200,8 +212,8 @@ export default {
       var data={code:this.rId,ids:ids}
       unbindBasicHospProduct(data).then((response) => {
         if (response.code == 20000) {
-            this.$message.success("解绑成功");
-            this.closeDialog();
+          this.$message.success("解绑成功");
+          this.closeDialog();
         } else {
           this.$message.error(response.message);
         }
@@ -218,6 +230,7 @@ export default {
   created() {
     this.filterQuery.relCode=this.rId
     this.getList();
+    this.getSysFilter();
   },
 };
 </script>

src/views/inout/DialogSelectReceiveOrder.vue

@@ -112,7 +112,7 @@
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%">
         <el-table-column label="序号" type="index" width="120"></el-table-column>
-        <el-table-column label="产品编码" prop="nameCode"></el-table-column>
+        <el-table-column label="物资编码" 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="batchNo"></el-table-column>

src/views/inout/DialogSelectThrOrder.vue

@@ -6,16 +6,7 @@
                  v-show="showSearch"
                  label-width="100px">
           <el-row>
-            <el-col :span="6">
-              <el-form-item class="query-form-item" label="单据号:">
-                <el-input
-                  v-model="listQuery.billNo"
-                  placeholder="单据号"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item label="外部系统:">
                 <el-select v-model="listQuery.thirdSysFk" style="width: 90%" placeholder="请选择第三方系统"
                            clearable="true" @change="thirdSysChange">
@@ -30,9 +21,22 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="6">
+            <el-col :span="8">
+              <el-form-item class="query-form-item" label="单据号:" >
+                <el-input
+                  style="width: 90%"
+                  v-model="listQuery.billNo"
+                  placeholder="单据号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="8">
               <el-form-item class="query-form-item" label="单据类型:">
-                <el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" filterable clearable="true">
+                <el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" filterable clearable="true"
+                           style="width: 90%">
                   <el-option
                     v-for="item in originTypes"
                     :key="item.name"
@@ -48,7 +52,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item class="query-form-item" label="单据日期:">
                 <el-date-picker
                   :picker-options="pickerOptions"
@@ -58,7 +62,8 @@
                   value-format="yyyy-MM-dd"
                   range-separator="至"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期"
+                  end-placeholder="结束日期" style="width: 90%"
+
                 >
                 </el-date-picker>
               </el-form-item>

src/views/inout/IoCreateBusOrder.vue

@@ -110,9 +110,9 @@
           >
           <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
 
-          <!--          <el-button type="primary" icon="el-icon-bottom-left" @click="selectThrOrderFunction()"-->
-          <!--                     :loading="loading">选入第三方单据-->
-          <!--          </el-button>-->
+          <el-button type="primary" icon="el-icon-bottom-left" @click="selectThrOrderFunction()"
+                     :loading="loading">选入第三方单据
+          </el-button>
           <el-button type="primary" icon="el-icon-bottom-left" @click="selectReceive()"
                      :loading="loading">选入单据
           </el-button>

src/views/inventory/inner/innerOrder.vue

@@ -76,7 +76,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <el-table-column label="物资编码" prop="productId"></el-table-column>
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

src/views/purchase/purApply/purUdiRlDetailDialog.vue

@@ -97,8 +97,8 @@
 
         <el-row>
           <el-col :span="12" class="el-col">
-            <el-form-item label="上级产品编码" prop="sjcpbm">
-              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入上级产品编码" v-model="editQuery.sjcpbm"></el-input>
+            <el-form-item label="上级物资编码" prop="sjcpbm">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入上级物资编码" v-model="editQuery.sjcpbm"></el-input>
             </el-form-item>
           </el-col>
 
@@ -125,8 +125,8 @@
 
         <el-row>
           <el-col :span="12" class="el-col">
-            <el-form-item label="包含下级产品编码" prop="bhxjcpbm">
-              <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含下级产品编码" v-model="editQuery.bhxjcpbm"></el-input>
+            <el-form-item label="包含下级物资编码" prop="bhxjcpbm">
+              <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含下级物资编码" v-model="editQuery.bhxjcpbm"></el-input>
             </el-form-item>
           </el-col>
 

src/views/purchase/purOrder/purOrderSelectProduct.vue

@@ -9,8 +9,8 @@
                         </el-form-item>
                       </el-col>
                      <el-col :span="6">
-                       <el-form-item label="第三方产品编码:" class="query-form-item">
-                         <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
+                       <el-form-item label="第三方物资编码:" class="query-form-item">
+                         <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码" clearable="true"></el-input>
                      </el-form-item>
                   </el-col>
                     </el-row>
@@ -58,7 +58,7 @@
                     </el-table-column>
                     <el-table-column label="序号" type="index"></el-table-column>
                     <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
                     <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>

src/views/purchase/purPlan/purPlanOrderSelectProduct.vue

@@ -32,7 +32,7 @@
                                       clearable="true"></el-input>
                         </el-form-item>
                         <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
+                            <el-input v-model="listQuery.thrPiId" placeholder="第三方物资编码" clearable="true"></el-input>
                         </el-form-item>
 
                         <el-form-item>
@@ -71,7 +71,7 @@
                         show-overflow-tooltip
                     ></el-table-column>
                     <el-table-column
-                        label="产品编码"
+                        label="物资编码"
                         prop="thirdId"
                         show-overflow-tooltip
                     ></el-table-column>

src/views/thirdSys/invProducts/thrInvProductsSelect.vue

@@ -4,34 +4,34 @@
         <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
           <el-row>
             <el-col :span="6">
-              <el-form-item label="产品编码:">
-                <el-input  v-model="filterQuery.inventoryCode"   style="width: 90%" clearable  placeholder="请输入产品编码"></el-input>
+              <el-form-item label="物资编码:">
+                <el-input  v-model="filterQuery.inventoryCode"   style="width: 90%" clearable  placeholder="请输入物资编码"></el-input>
             </el-form-item>
             </el-col>
               <el-col :span="6">
-            <el-form-item label="产品编码:">
+            <el-form-item label="物资编码:">
                 <el-input v-model="filterQuery.inventoryName"  style="width: 90%" clearable placeholder="请输入产品名称"></el-input>
             </el-form-item>
               </el-col>
             <el-col :span="6">
-            <el-form-item label="产品编码:">
+            <el-form-item label="物资编码:">
                 <el-input v-model="filterQuery.spec" clearable   style="width: 90%"  placeholder="请输入规格型号"></el-input>
             </el-form-item>
             </el-col>
             <el-col :span="6">
-            <el-form-item label="产品编码:">
+            <el-form-item label="物资编码:">
                 <el-input v-model="filterQuery.registerCertNo"   style="width: 90%" clearable placeholder="请输入注册/备案凭证号"></el-input>
             </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
-            <el-form-item label="产品编码:">
+            <el-form-item label="物资编码:">
                 <el-input v-model="filterQuery.manufactory"   style="width: 90%" clearable placeholder="请输入生厂厂家"></el-input>
             </el-form-item>
             </el-col>
             <el-col :span="6">
-            <el-form-item label="产品编码:">
+            <el-form-item label="物资编码:">
                 <el-select v-model="filterQuery.filterCount"   style="width: 90%" placeholder="请选择过滤条件">
                     <el-option label="全部" value="0"></el-option>
                     <el-option label="库存等于0" value="1"></el-option>
@@ -40,7 +40,7 @@
             </el-form-item>
             </el-col>
             <el-col :span="6">
-            <el-form-item label="产品编码:">
+            <el-form-item label="物资编码:">
                 <el-select v-model="filterQuery.thirdSys"   style="width: 90%" placeholder="请选择第三方系统">
                     <el-option
                         v-for="item in thirdSys"
@@ -75,7 +75,7 @@
         <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row   @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column label="序号" type="index" width="70"></el-table-column>
-            <el-table-column label="产品编码" prop="code" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资编码" prop="code" show-overflow-tooltip></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="batchNo" show-overflow-tooltip></el-table-column>

src/views/thirdSys/order/thrOrder.vue

@@ -99,7 +99,7 @@
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
-        <el-table-column label="产品编码" prop="productId"></el-table-column>
+        <el-table-column label="物资编码" prop="productId"></el-table-column>
         <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>

src/views/thirdSys/product/thrProductsSelect.vue

@@ -4,8 +4,8 @@
       <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="产品编码:">
-              <el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" style="width: 90%" @keyup.enter.native="keyupErp_submit($event)"></el-input>
+            <el-form-item label="物资编码:">
+              <el-input v-model="filterQuery.code" placeholder="请输入物资编码/商品条码/医保编码" style="width: 90%" @keyup.enter.native="keyupErp_submit($event)"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -67,7 +67,7 @@
                 highlight-current-row>
         <el-table-column type="selection" width="55"></el-table-column>
         <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="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>