diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index ebb2a74..b34a85f 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -83,50 +83,94 @@
             </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.overStockNum"-->
-        <!--              ></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="12">-->
-        <!--            <el-form-item label="低库存预警数量:">-->
-        <!--              <el-input-->
-        <!--                style="width: 80%"-->
-        <!--                size="small"-->
-        <!--                splaceholder="请输入内容"-->
-        <!--                v-model="editQuery.lowStockNum"-->
-        <!--              ></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"-->
-        <!--                splaceholder="请输入内容"-->
-        <!--                v-model="editQuery.recentDateTime"-->
-        <!--              ></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="12">-->
-        <!--            <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>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak1"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
+            <el-form-item :label="productRemarkSet.remarkTitle2+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak2"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
+            <el-form-item :label="productRemarkSet.remarkTitle3+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak3"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
+            <el-form-item :label="productRemarkSet.remarkTitle4+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak4"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
+            <el-form-item :label="productRemarkSet.remarkTitle5+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak5"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
+            <el-form-item :label="productRemarkSet.remarkTitle6+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak6"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
+            <el-form-item :label="productRemarkSet.remarkTitle7+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak7"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
+            <el-form-item :label="productRemarkSet.remarkTitle8+':'">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.basicPrductRemak8"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12">
             <el-form-item label="产品描述:">
@@ -134,16 +178,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item
-            label="是否可集采:"
-            prop="spUse"
-            class="query-form-item"
-          >
-            <el-radio-group v-model="editQuery.groupBuy">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
+            <el-form-item
+              label="是否可集采:"
+              prop="spUse"
+              class="query-form-item"
+            >
+              <el-radio-group v-model="editQuery.groupBuy">
+                <el-radio :label="true">是</el-radio>
+                <el-radio :label="false">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </el-col>
 
 
@@ -251,9 +295,9 @@ export default {
         lowStockNum: this.editQuery.lowStockNum,
         recentDateTime: this.editQuery.recentDateTime,
         isDateBy: this.editQuery.isDateBy,
-        relSupId:this.editQuery.id,
-        groupBuy:this.editQuery.groupBuy,
-        uid:this.editQuery.uid,
+        relSupId: this.editQuery.id,
+        groupBuy: this.editQuery.groupBuy,
+        uid: this.editQuery.uid,
       }
 
       updateById(data).then(res => {