预警迁移到供应商维护

src/views/basic/product/productEdit.vue

@@ -337,7 +337,25 @@
               </el-col>
             </el-row>
             <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.isUseDy" style="width: 65%"
+                           :disabled="editQuery.useMuti==true "
+                           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>

src/views/supplier/company/basicCompanyProducts.vue

@@ -85,7 +85,7 @@
             {{ lockStatusMap[scope.row.lockStatus] }}
           </template>
         </el-table-column>
-        <el-table-column width="180" label="操作">
+        <el-table-column width="180" label="操作" fixed="right">
           <template slot-scope="scope">
             <el-button v-if="isSpCombine" type="text" size="small"
                        :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
@@ -705,6 +705,7 @@ export default {
         });
     },
     handleModifyClick(row) {
+      debugger
       this.editQuery = row;
       this.editDialogVisible = true;
     },

src/views/supplier/company/basicCompanyproductEdit.vue

@@ -12,8 +12,11 @@
         <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">关联</el-button>
+            <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">
-            <el-button type="text" @click.native.stop="removeErp(scope.row)" :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
+              关联
+            </el-button>
+            <el-button type="text" @click.native.stop="removeErp(scope.row)"
+                       :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
             </el-button>
           </template>
         </el-table-column>
@@ -29,7 +32,8 @@
       <div style=" float: right;
                         text-align: right;
                         margin-bottom: 8px;">
-        <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1" style="text-align:right">解绑DI器械信息
+        <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1"
+                   style="text-align:right">解绑DI器械信息
         </el-button>
       </div>
       <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row>
@@ -74,15 +78,59 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item label="产品描述:">
+            <el-form-item label="医保编码:">
-            <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
+              <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-form-item label="库存积压预警数量:">
-            <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"></el-input>
+              <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">
+            <el-form-item label="产品描述:">
+              <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -176,7 +224,7 @@ export default {
 
   methods: {
     submitUpload() {
-
+      debugger
       var data = {
         id: this.editQuery.prid,
         sptm: this.editQuery.sptm,
@@ -185,7 +233,11 @@ export default {
         manufactory: this.editQuery.manufactory,
         price: this.editQuery.price,
         cpms: this.editQuery.cpms,
-        ybbm: this.editQuery.ybbm
+        ybbm: this.editQuery.ybbm,
+        overStockNum: this.editQuery.overStockNum,
+        lowStockNum: this.editQuery.lowStockNum,
+        recentDateTime: this.editQuery.recentDateTime,
+        isDateBy: this.editQuery.isDateBy,
       }
 
       updateById(data).then(res => {