diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 79bd2bbd..285b8eea 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -56,9 +56,9 @@
         </el-table>
       </el-card>
 
-      <el-row type="flex" class="edit-row" style="margin-top: 20px">
+      <el-row type="flex"  class="edit-row" style="margin-top: 20px">
         <el-col :span="12">
-          <el-form-item label="计量单位:">
+          <el-form-item label="计量单位:" label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -68,7 +68,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="生产厂家:">
+          <el-form-item label="生产厂家:" label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -80,7 +80,7 @@
       </el-row>
       <el-row type="flex" class="edit-row">
         <el-col :span="12">
-          <el-form-item label="商品名称:">
+          <el-form-item label="商品名称:" label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -90,7 +90,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="产品描述:">
+          <el-form-item label="产品描述:" label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -102,7 +102,7 @@
       </el-row>
       <el-row type="flex" class="edit-row">
         <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
-          <el-form-item :label="productRemarkSet.remarkTitle1+':'" +>
+          <el-form-item :label="productRemarkSet.remarkTitle1+':'" + label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -112,7 +112,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
-          <el-form-item :label="productRemarkSet.remarkTitle2+':'" +>
+          <el-form-item :label="productRemarkSet.remarkTitle2+':'" + label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -124,7 +124,7 @@
       </el-row>
       <el-row type="flex" class="edit-row">
         <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
-          <el-form-item :label="productRemarkSet.remarkTitle3+':'" +>
+          <el-form-item :label="productRemarkSet.remarkTitle3+':'" + label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -134,7 +134,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
-          <el-form-item :label="productRemarkSet.remarkTitle4+':'" +>
+          <el-form-item :label="productRemarkSet.remarkTitle4+':'" + label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -146,7 +146,7 @@
       </el-row>
       <el-row type="flex" class="edit-row">
         <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
-          <el-form-item :label="productRemarkSet.remarkTitle5+':'" +>
+          <el-form-item :label="productRemarkSet.remarkTitle5+':'" + label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -156,7 +156,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
-          <el-form-item :label="productRemarkSet.remarkTitle6+':'" +>
+          <el-form-item :label="productRemarkSet.remarkTitle6+':'" label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -168,7 +168,7 @@
       </el-row>
       <el-row type="flex" class="edit-row">
         <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
-          <el-form-item :label="productRemarkSet.remarkTitle7+':'" +>
+          <el-form-item :label="productRemarkSet.remarkTitle7+':'" label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -178,7 +178,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
-          <el-form-item :label="productRemarkSet.remarkTitle8+':'" +>
+          <el-form-item :label="productRemarkSet.remarkTitle8+':'" label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -188,9 +188,9 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row type="flex" class="edit-row">
+      <el-row type="flex" class="edit-row" >
         <el-col :span="12">
-          <el-form-item label="医保编码:">
+          <el-form-item label="医保编码:" label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -200,7 +200,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="使用周期(天):">
+          <el-form-item label="使用周期(天):" label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
@@ -214,19 +214,67 @@
 
       <el-row>
         <el-col :span="12">
-          <el-form-item label="最小包装可使用次数:">
+          <el-form-item label="库存积压预警数量:" label-width="140px">
             <el-input
               style="width: 80%"
               size="small"
               splaceholder="请输入内容"
               :disabled="this.useNumEnable"
               type="number"
-              v-model="editQuery.useNum"
+              v-model="editQuery.overStockNum"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="低库存预警数量:" label-width="140px" >
+            <el-input
+              style="width: 80%"
+              size="small"
+              splaceholder="请输入内容"
+              type="number"
+              v-model="editQuery.lowStockNum"
             ></el-input>
           </el-form-item>
         </el-col>
+      </el-row>
 
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="最小包装可使用次数:" label-width="140px">
+            <el-input
+              style="width: 80%"
+              size="small"
+              splaceholder="请输入内容"
+              :disabled="this.useNumEnable"
+              type="number"
+              v-model="editQuery.useNum"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+          <el-col :span="6">
+            <el-form-item label="近效期预警时间:" label-width="140px">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                type="number"
+                v-model="editQuery.recentDateTime"
+              ></el-input>
+            </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="预警时间格式:" label-width="100px" style="margin-left: -25px">
+            <el-radio-group v-model="editQuery.isDateBy">
+            <el-radio  :label=1>天</el-radio>
+            <el-radio  :label=2>小时</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
       </el-row>
+
+
+
+
       <el-row type="flex">
         <el-col :span="24">
           <div style="margin-bottom: 18px;margin-left: 25px">
@@ -420,6 +468,10 @@ export default {
     ProductSingleEdit
   },
   created() {
+    if(this.editQuery.isDateBy==1){
+      this.editQuery.recentDateTime=this.editQuery.recentDateTime/24;
+    }
+    console.log(this.editQuery)
     this.useMutiChange(true)
     this.getThirdSysDetail();
     let ttquery = {