diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 3e21bab..ef65b83 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -823,6 +823,8 @@ export default {
       defaultSys: null,
       levelUnitList: [],
       maxLevel: 1,
+
+      editRowSwitch: false //产品标识编辑开关 没保存前其他编辑不能按
     }
 
   },
@@ -983,6 +985,7 @@ export default {
 
     //层级保存
     levelSave(row) {
+      this.editRowSwitch = false
       if (isBlank(row.nameCode)) {
         this.$message.error('层级标识不能为空')
         return
@@ -1057,9 +1060,16 @@ export default {
     },
 
     rowChange(index, val) {
-      this.selectedIndex = index
 
+
+      if(this.editRowSwitch == true ){
+        this.$message.error('请先保存当前产品标识编辑')
+        return
+      }
+
+      this.selectedIndex = index
       this.isSave = false
+      this.editRowSwitch = true
     },
 
     deleteLevel(index, row) {
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 045b3b4..4fc23f0 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -451,7 +451,8 @@ export default {
         code: this.orderFormData.invCode,
         spUse: 2,
         vueType: "supDelivery",
-        enable: true
+        enable: true,
+        productType:1
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
index 92b259d..1bb178b 100644
--- a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
+++ b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
@@ -451,7 +451,8 @@ export default {
         code: this.orderFormData.invCode,
         spUse: 2,
         vueType: "supDelivery",
-        enable: true
+        enable: true,
+        productType:2,
       };
       getLocalJoinByUser(query)
         .then((response) => {
diff --git a/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue b/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue
index fd48b8c..37c79da 100644
--- a/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue
+++ b/src/views/pharmaceuticals/distribution/DialogSelectProduct.vue
@@ -29,7 +29,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="规格型号:">
-              <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"
+              <el-input v-model="listQuery.bzgg" placeholder="包装规格" clearable="true"
                         style="width: 90%"></el-input>
             </el-form-item>
           </el-col>
@@ -95,11 +95,11 @@
           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="ggxh"-->
+        <!--  show-overflow-tooltip-->
+        <!--&gt;</el-table-column>-->
         <el-table-column
           label="包装单位"
           prop="packUnit"
diff --git a/src/views/pharmaceuticals/distribution/PanelCreateOrderBizDetail.vue b/src/views/pharmaceuticals/distribution/PanelCreateOrderBizDetail.vue
index 13cb4c0..9db74d5 100644
--- a/src/views/pharmaceuticals/distribution/PanelCreateOrderBizDetail.vue
+++ b/src/views/pharmaceuticals/distribution/PanelCreateOrderBizDetail.vue
@@ -34,8 +34,8 @@
                        show-overflow-tooltip
       ></el-table-column>
       <el-table-column width="150"
-                       label="规格型号"
-                       prop="spec"
+                       label="包装规格"
+                       prop="bzgg"
                        show-overflow-tooltip
       ></el-table-column>
       <el-table-column width="120" label="批次号">
diff --git a/src/views/supplier/drugProducts/supProductsAdd.vue b/src/views/supplier/drugProducts/supProductsAdd.vue
index 20c9f19..49d872d 100644
--- a/src/views/supplier/drugProducts/supProductsAdd.vue
+++ b/src/views/supplier/drugProducts/supProductsAdd.vue
@@ -38,7 +38,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" class="el-col">
-            <el-form-item label="规格型号:" prop="spec">
+            <el-form-item label="规格:" prop="spec">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
                         v-model.trim="newProductData.spec"></el-input>
             </el-form-item>
@@ -56,35 +56,29 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" class="el-col">
-            <el-form-item label="注册证号:" prop="registerNo">
+            <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="12" class="el-col">
-            <el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">
-              <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="newProductData.ylqxzcrbarmc"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">
-              <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" 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="12" class="el-col">
-            <el-form-item label="分类编码:" prop="flbm">
-              <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="newProductData.flbm"></el-input>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">-->
+          <!--    <el-input style="width: 90%" size="small" placeholder="请输入内容"-->
+          <!--              v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="12" 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="12" class="el-col">-->
+          <!--  <el-form-item label="分类编码:" prop="flbm">-->
+          <!--    <el-input style="width: 90%" size="small" placeholder="请输入内容"-->
+          <!--              v-model.trim="newProductData.flbm"></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="12" class="el-col">
             <el-form-item label="商品条码:" prop="sptm">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
@@ -103,184 +97,26 @@
                         v-model.trim="newProductData.tyshxydm"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="器械类别:" prop="qxlb">
-              <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="newProductData.qxlb"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="12" class="el-col">
             <el-form-item label="产品价格:" prop="price">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
                         v-model.trim="newProductData.price"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="采购类型" prop="purType">
-              <el-select
-                v-model="newProductData.purType"
-                placeholder="请选择"
-                clearable
-                style="width: 90%"
-              >
-                <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-col :span="12">
-            <el-form-item label="产品属性" prop="attributeType">
-              <el-select
-                v-model="newProductData.attributeType"
-                placeholder="请选择"
-                clearable
-                style="width: 90%"
-              >
-                <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-col :span="12">
-            <el-form-item label="耗材类别" prop="hcType">
-              <el-select
-                v-model="newProductData.hcType"
-                placeholder="请选择"
-                clearable
-                style="width: 90%"
-              >
-                <el-option label="高值耗材" :value="1"></el-option>
-                <el-option label="普通耗材" :value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否组套" prop="isStack">
-              <el-select
-                v-model="newProductData.isStack"
-                placeholder="请选择"
-                clearable
-                style="width: 90%"
-              >
-                <el-option label="是" :value="true"></el-option>
-                <el-option label="否" :value="false"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
-            <el-form-item :label="productRemarkSet.remarkTitle1+':'" prop="basicPrductRemak1">
-              <el-input
-                style="width: 90%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="newProductData.basicPrductRemak1"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
-            <el-form-item :label="productRemarkSet.remarkTitle2+':'" prop="basicPrductRemak2">
-              <el-input
-                style="width: 90%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="newProductData.basicPrductRemak2"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
-            <el-form-item :label="productRemarkSet.remarkTitle3+':'" prop="basicPrductRemak3">
-              <el-input
-                style="width: 90%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="newProductData.basicPrductRemak3"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
-            <el-form-item :label="productRemarkSet.remarkTitle4+':'" prop="basicPrductRemak4">
-              <el-input
-                style="width: 90%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="newProductData.basicPrductRemak4"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
-            <el-form-item :label="productRemarkSet.remarkTitle5+':'" prop="basicPrductRemak5">
-              <el-input
-                style="width: 90%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="newProductData.basicPrductRemak5"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
-            <el-form-item :label="productRemarkSet.remarkTitle6+':'" prop="basicPrductRemak6">
-              <el-select
-                v-model="newProductData.basicPrductRemak6"
-                placeholder="请选择"
-                clearable
-                style="width: 90%"
-              >
-                <el-option label="扣费" value="1"></el-option>
-                <el-option label="不扣费" value="0"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
-            <el-form-item :label="productRemarkSet.remarkTitle7+':'" prop="basicPrductRemak7">
-              <el-select
-                v-model="newProductData.basicPrductRemak7"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="请选择物资类别"
-                :remote-method="findThrTypeMethod"
-                style="width: 90%"
-              >
-                <el-option
-                  v-for="item in thrTypeOptions"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item.code"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
-            <el-form-item :label="productRemarkSet.remarkTitle8+':'" prop="basicPrductRemak8">
-              <el-select
-                v-model="newProductData.basicPrductRemak8"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="请选择物价类别"
-                :remote-method="findHsflMethod"
-                style="width: 90%"
-              >
-                <el-option
-                  v-for="item in hsflOptions"
-                  :key="item.hsbm"
-                  :label="item.hsmc"
-                  :value="item.hsbm"
-                >
-                  <span style="float: left">{{ item.hsmc }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.hsbm }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+          <!--  <el-form-item label="采购类型" prop="purType">-->
+          <!--    <el-select-->
+          <!--      v-model="newProductData.purType"-->
+          <!--      placeholder="请选择"-->
+          <!--      clearable-->
+          <!--      style="width: 90%"-->
+          <!--    >-->
+          <!--      <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>
           <el-col :span="23" class="el-col" style="margin-top: 12px">
diff --git a/src/views/supplier/drugProducts/supProductsAddDi.vue b/src/views/supplier/drugProducts/supProductsAddDi.vue
index ace96fe..e9abd99 100644
--- a/src/views/supplier/drugProducts/supProductsAddDi.vue
+++ b/src/views/supplier/drugProducts/supProductsAddDi.vue
@@ -383,7 +383,7 @@
     </el-dialog>
 
     <el-dialog
-      title="新增配送产品"
+      title="新增配送药品"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :visible.sync="addProductVisible"
@@ -430,10 +430,10 @@ import {
   delThrDiProducts,
   getDiProductDetail,
 } from "@/api/supplier/supProductsAddDi";
-import thrAddDiProductSelectUdi from "@/views/supplier/products/supAddDiProductSelectUdi";
-import thrAddProductSelectUdi from "@/views/supplier/products/supProductsAdd";
+import thrAddDiProductSelectUdi from "@/views/supplier/drugProducts/supAddDiProductSelectUdi";
+import thrAddProductSelectUdi from "@/views/supplier/drugProducts/supProductsAdd";
 import selectDiDetail from "./selectDIDetailDialog";
-import thrProductsDetail from "@/views/supplier/products/supProductsDetail";
+import thrProductsDetail from "@/views/supplier/drugProducts/supProductsDetail";
 import {
   getHead, executeFuc
 } from "@/utils/customConfig";