diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 8446fc0..04aaa37 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -585,7 +585,6 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
                                     size="small"
                                     v-model="editQuery.manufactory"
                                     splaceholder="请输入内容"
@@ -601,7 +600,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
+                                    :disabled="true"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.scbssfbhph"
@@ -615,7 +614,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
+                                    :disabled="true"
                                     size="small"
                                     v-model="editQuery.scbssfbhxlh"
                                     splaceholder="请输入内容"
@@ -631,7 +630,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
+                                    :disabled="true"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.scbssfbhscrq"
@@ -645,7 +644,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
+                                    :disabled="true"
                                     v-model="editQuery.scbssfbhsxrq"
                                     size="small"
                                     splaceholder="请输入内容"
@@ -657,14 +656,13 @@
                         <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%"
-                                    :disabled="!checked"
                                     size="small"
                                     splaceholder="请输入内容"
-                                    v-model="editQuery.cpms"
+                                    v-model="editQuery.measname"
                                 ></el-input>
                             </div>
                         </el-col>
@@ -676,7 +674,7 @@
                                 </div>
                                 <el-input
                                     style="width: 35%"
-                                    :disabled="!checked"
+                                    :disabled="true"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.versionNumber"
@@ -689,6 +687,37 @@
                         </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-input
+                                    style="width: 65%"
+                                    size="small"
+                                    splaceholder="请输入内容"
+                                    v-model="editQuery.spmc"
+                                ></el-input>
+                            </div>
+                        </el-col>
+
+                        <el-col :span="12" class="el-col">
+                            <div class="text item">
+                                <div class="itemTag">
+                                    <span>产品描述:&nbsp;</span>
+                                </div>
+                                <el-input
+                                    style="width: 65%"
+                                    size="small"
+                                    splaceholder="请输入内容"
+                                    v-model="editQuery.cpms"
+                                ></el-input>
+                            </div>
+                        </el-col>
+                    </el-row>
+
                     <el-row :gutter="20" class="el-row" type="flex">
                         <el-col :span="24" class="el-col">
                             <div style="margin-top: 18px;margin-bottom: 18px">
@@ -844,8 +873,8 @@ export default {
                 isLock: null,
                 isAdavence: null,
                 allowNoBatch: null,
-                allowNoExpire:null,
-                allowNoProduct:null,
+                allowNoExpire: null,
+                allowNoProduct: null,
             },
             defaultSys: null,
             isImport: false,
@@ -962,8 +991,9 @@ export default {
         },
 
         handleDetail(row) {
+            let rlId = this.editQuery.rlId;
             this.editQuery = row;
-            console.log(row);
+            this.editQuery.rlId = rlId;
         },
 
 
@@ -1174,6 +1204,7 @@ export default {
             this.checked = row.isUseDy == 1;
 
             let ttquery = {
+                relId: this.relId,
                 uuid: row.uuid,
                 page: 1,
                 limit: 10,
diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue
index 4958e70..e67f095 100644
--- a/src/views/basic/basicCompanyProducts.vue
+++ b/src/views/basic/basicCompanyProducts.vue
@@ -579,7 +579,6 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
                                     size="small"
                                     v-model="editQuery.manufactory"
                                     splaceholder="请输入内容"
@@ -595,7 +594,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
+                                    :disabled="true"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.scbssfbhph"
@@ -609,7 +608,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
+                                    :disabled="true"
                                     size="small"
                                     v-model="editQuery.scbssfbhxlh"
                                     splaceholder="请输入内容"
@@ -625,7 +624,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
+                                    :disabled="true"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.scbssfbhscrq"
@@ -639,7 +638,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
-                                    :disabled="!checked"
+                                    :disabled="true"
                                     v-model="editQuery.scbssfbhsxrq"
                                     size="small"
                                     splaceholder="请输入内容"
@@ -651,14 +650,13 @@
                         <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%"
-                                    :disabled="!checked"
                                     size="small"
                                     splaceholder="请输入内容"
-                                    v-model="editQuery.cpms"
+                                    v-model="editQuery.spmc"
                                 ></el-input>
                             </div>
                         </el-col>
@@ -669,7 +667,7 @@
                                 </div>
                                 <el-input
                                     style="width: 35%"
-                                    :disabled="!checked"
+                                    :disabled="true"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.versionNumber"
@@ -696,6 +694,36 @@
                                 ></el-input>
                             </div>
                         </el-col>
+                        <el-col :span="12" class="el-col">
+                            <div class="text item">
+                                <div class="itemTag">
+                                    <span>计量单位:&nbsp;</span>
+                                </div>
+                                <el-input
+                                    style="width: 65%"
+                                    size="small"
+                                    splaceholder="请输入内容"
+                                    v-model="editQuery.measname"
+                                ></el-input>
+                            </div>
+                        </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-input
+                                    style="width: 65%"
+                                    size="small"
+                                    splaceholder="请输入内容"
+                                    v-model="editQuery.cpms"
+                                ></el-input>
+                            </div>
+                        </el-col>
                     </el-row>
                     <el-row :gutter="20" class="el-row" type="flex">
                         <el-col :span="24" class="el-col">
@@ -1475,6 +1503,7 @@ export default {
             },
             lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
             isUseDyCheck: false,
+            loading: false,
         };
     },
 
@@ -1541,8 +1570,9 @@ export default {
         },
 
         handleDetail(row) {
+            let rlId = this.editQuery.rlId;
             this.editQuery = row;
-            console.log(row);
+            this.editQuery.rlId = rlId;
         },
         deleteOrders(data) {
             this.loading = true;
@@ -1814,11 +1844,12 @@ export default {
                 isUseDy: row.isUseDy,
                 isDisable: row.isDisable,
                 isAdavence: row.isAdavence,
-                price:row.price,
+                price: row.price,
             };
             this.checked = row.isUseDy == 1;
 
             let ttquery = {
+                relId: this.relId,
                 uuid: row.uuid,
                 page: 1,
                 limit: 10,