From a7ef3b0d5d8b1ef9b6dc80544aaeda451d2d86b2 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 16 Jan 2023 09:35:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8C=85=E8=A3=85=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/product/UdiInfoSelectLocalUdi.vue   | 555 +++++++++---------
 src/views/basic/product/product.vue           |  18 +-
 src/views/basic/product/productEdit.vue       |  32 +-
 3 files changed, 329 insertions(+), 276 deletions(-)

diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index 5c6069dd..6e941d72 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -2,80 +2,91 @@
   <div>
     <el-card class="el-card">
       <div>
-        <el-form :inline="true" :model="unionQuery" size="mini">
-          <el-row style="width: 1000px">
-            <el-form-item class="query-form-item">
-              <el-input v-model="unionQuery.udiCode"
-                        style="width: 600px"
-                        placeholder="请扫描或输入UDI码"
-                        clearable="true"
-                        @keyup.enter.native="keyup_submit($event)"></el-input>
-            </el-form-item>
+        <el-form :model="unionQuery" size="mini" label-width="125px">
+          <el-row>
+            <el-col :span="18">
+              <el-form-item class="query-form-item" label="UDI码:">
+                <el-input v-model="unionQuery.udiCode"
+                          placeholder="请扫描或输入UDI码"
+                          clearable="true"
+                          @keyup.enter.native="keyup_submit($event)"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
-
           <el-row>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="unionQuery.nameCode" clearable="true"
-                size="mini"
-                placeholder="请输入完整DI"
-                @keyup.enter.native="keyup_submit($event)"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-select
-                v-model="unionQuery.ylqxzcrbarmc"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="医疗器械注册人"
-                :remote-method="findMethod"
-                :loading="loading"
-              >
-                <el-option
-                  v-for="item in fromOptions"
-                  :key="item.ylqxzcrbarmc"
-                  :label="item.ylqxzcrbarmc"
-                  :value="item.ylqxzcrbarmc"
+            <el-col :span="6">
+              <el-form-item label="销售单元产品标识:" class="query-form-item">
+                <el-input
+                    v-model="unionQuery.nameCode" clearable="true"
+                    placeholder="请输入完整DI"
+                    @keyup.enter.native="keyup_submit($event)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="医疗器械注册人:" class="query-form-item">
+                <el-select
+                    v-model="unionQuery.ylqxzcrbarmc"
+                    filterable
+                    remote
+                    clearable="true"
+                    style="width: 100%"
+                    reserve-keyword
+                    placeholder="医疗器械注册人"
+                    :remote-method="findMethod"
+                    :loading="loading"
                 >
-                  <span style="float: left">{{ item.ylqxzcrbarmc }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input
-                :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
-                v-model="unionQuery.cpmctymc" clearable="true"
-                size="mini"
-                placeholder="器械通用名称"
-              ></el-input>
-            </el-form-item>
+                  <el-option
+                      v-for="item in fromOptions"
+                      :key="item.ylqxzcrbarmc"
+                      :label="item.ylqxzcrbarmc"
+                      :value="item.ylqxzcrbarmc"
+                  >
+                    <span style="float: left">{{ item.ylqxzcrbarmc }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="器械通用名称:" class="query-form-item">
+                <el-input
+                    :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
+                    v-model="unionQuery.cpmctymc" clearable="true"
+                    placeholder="器械通用名称"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+
+
           </el-row>
 
           <el-row>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="unionQuery.ggxh" clearable="true"
-                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                placeholder="规格型号"
-                size="mini"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="unionQuery.zczbhhzbapzbh" clearable="true"
-                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                placeholder="注册证/备案号"
-                size="mini"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
+            <el-col :span="6">
+              <el-form-item label="规格型号:" class="query-form-item">
+                <el-input
+                    v-model="unionQuery.ggxh" clearable="true"
+                    :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
+                    placeholder="规格型号"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="注册证/备案号:" class="query-form-item">
+                <el-input
+                    v-model="unionQuery.zczbhhzbapzbh" clearable="true"
+                    :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
+                    placeholder="注册证/备案号"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+
+
+            <el-form-item>
               <el-button-group>
                 <el-button
-                  type="primary"
-                  icon="el-icon-refresh"
-                  @click="onReset"
+                    type="primary"
+                    icon="el-icon-refresh"
+                    @click="onReset"
                 ></el-button>
                 <el-button type="primary" icon="search" @click="searchList" size="mini"
                 >查询
@@ -97,54 +108,54 @@
         </el-form>
 
         <el-table
-          :data="udidlList"
-          style="width: 100%"
-          v-loading="loading"
-          highlight-current-row="true"
-          :row-class-name="tableRowClassName"
-          @current-change="handleErpChange"
-          @selection-change="handleSelectionUdiChange"
+            :data="udidlList"
+            style="width: 100%"
+            v-loading="loading"
+            highlight-current-row="true"
+            :row-class-name="tableRowClassName"
+            @current-change="handleErpChange"
+            @selection-change="handleSelectionUdiChange"
         >
 
           <el-table-column
-            v-if="relId==null"
-            type="selection"
-            :selectable="checkSelectable"
-            width="55"
+              v-if="relId==null"
+              type="selection"
+              :selectable="checkSelectable"
+              width="55"
           ></el-table-column>
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="产品标识"
-            prop="nameCode"
-            show-overflow-tooltip
+              label="产品标识"
+              prop="nameCode"
+              show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="产品名称"
-            prop="cpmctymc"
-            show-overflow-tooltip
+              label="产品名称"
+              prop="cpmctymc"
+              show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="规格型号"
-            prop="ggxh"
-            show-overflow-tooltip
+              label="规格型号"
+              prop="ggxh"
+              show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="医疗器械注册人"
-            prop="ylqxzcrbarmc"
-            show-overflow-tooltip
+              label="医疗器械注册人"
+              prop="ylqxzcrbarmc"
+              show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="注册证编号"
-            prop="zczbhhzbapzbh"
-            show-overflow-tooltip
+              label="注册证编号"
+              prop="zczbhhzbapzbh"
+              show-overflow-tooltip
           ></el-table-column>
 
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <el-button
-                type="text"
-                size="small"
-                @click="diDetail(scope.row)"
+                  type="text"
+                  size="small"
+                  @click="diDetail(scope.row)"
               >详情
               </el-button
               >
@@ -153,11 +164,11 @@
 
         </el-table>
         <el-pagination
-          :page-size="unionQuery.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
-          :total="total"
-          :current-page="unionQuery.page"
+            :page-size="unionQuery.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="total"
+            :current-page="unionQuery.page"
         ></el-pagination>
 
       </div>
@@ -171,11 +182,11 @@
                 <span>产品名称:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                size="small"
-                splaceholder="请输入内容"
-                :disabled="true"
-                v-model="data.cpmctymc"
+                  style="width: 60%"
+                  size="small"
+                  splaceholder="请输入内容"
+                  :disabled="true"
+                  v-model="data.cpmctymc"
               ></el-input>
             </div>
           </el-col>
@@ -185,11 +196,11 @@
                 <span>产品标识:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.nameCode"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.nameCode"
               ></el-input>
             </div>
           </el-col>
@@ -205,11 +216,11 @@
                 <span>规格型号:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.ggxh"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.ggxh"
               ></el-input>
             </div>
           </el-col>
@@ -219,11 +230,11 @@
                 <span>医疗器械注册人:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="ylqxzcrbarmc"
-                v-model="data.ylqxzcrbarmc"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="ylqxzcrbarmc"
+                  v-model="data.ylqxzcrbarmc"
               ></el-input>
             </div>
           </el-col>
@@ -237,11 +248,11 @@
                 <span>注册人英文名称:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.ylqxzcrbarywmc"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.ylqxzcrbarywmc"
               ></el-input>
             </div>
           </el-col>
@@ -251,11 +262,11 @@
                 <span>器械类别:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.qxlb"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.qxlb"
               ></el-input>
             </div>
           </el-col>
@@ -267,11 +278,11 @@
                 <span>产品类别:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.cplb"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.cplb"
               ></el-input>
             </div>
           </el-col>
@@ -281,11 +292,11 @@
                 <span>分类编码:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.flbm"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.flbm"
               ></el-input>
             </div>
           </el-col>
@@ -300,11 +311,11 @@
                 <span>商品条码:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.sptm"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.sptm"
               ></el-input>
             </div>
           </el-col>
@@ -314,11 +325,11 @@
                 <span>医保编码:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.ybbm"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.ybbm"
               ></el-input>
             </div>
           </el-col>
@@ -331,11 +342,11 @@
                 <span>统一社会信用号:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.tyshxydm"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.tyshxydm"
               ></el-input>
             </div>
           </el-col>
@@ -345,11 +356,11 @@
                 <span>注册证/备案号:&nbsp;</span>
               </div>
               <el-input
-                style="width: 60%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.zczbhhzbapzbh"
+                  style="width: 60%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.zczbhhzbapzbh"
               ></el-input>
             </div>
           </el-col>
@@ -357,13 +368,13 @@
       </div>
     </el-card>
     <el-dialog
-      title="器械信息详情"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :visible.sync="selectDialog"
-      width="65%"
-      append-to-body
-      v-if="selectDialog"
+        title="器械信息详情"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :visible.sync="selectDialog"
+        width="65%"
+        append-to-body
+        v-if="selectDialog"
     >
       <selectDiDetail :editQuery="diDetails"
       ></selectDiDetail>
@@ -459,7 +470,7 @@ export default {
         zczbhhzbapzbh: "",
         isCheck: 1
       },
-        this.actDateRange = [];
+          this.actDateRange = [];
       // this.getList();
     },
 
@@ -470,12 +481,12 @@ export default {
 
     getList() {
       if (
-        this.unionQuery.udiCode == "" &&
-        this.unionQuery.nameCode == "" &&
-        this.unionQuery.cpmctymc == "" &&
-        this.unionQuery.ylqxzcrbarmc == "" &&
-        this.unionQuery.ggxh == "" &&
-        this.unionQuery.zczbhhzbapzbh == ""
+          this.unionQuery.udiCode == "" &&
+          this.unionQuery.nameCode == "" &&
+          this.unionQuery.cpmctymc == "" &&
+          this.unionQuery.ylqxzcrbarmc == "" &&
+          this.unionQuery.ggxh == "" &&
+          this.unionQuery.zczbhhzbapzbh == ""
       ) {
         this.$message.warning("请输入查询条件");
         return;
@@ -483,22 +494,22 @@ export default {
       this.loading = true;
       // this.unionQuery.page = 1;
       getUdiInfos(this.unionQuery)
-        .then((response) => {
-          this.loading = false;
-          if (response.code == 20000) {
-            this.udidlList = response.data.list || [];
-            this.total = response.data.total || 0;
-          } else {
-            this.$message.error(response.message);
-          }
-
-
-        })
-        .catch(() => {
-          this.loading = false;
-          this.udidlList = [];
-          this.total = 0;
-        });
+          .then((response) => {
+            this.loading = false;
+            if (response.code == 20000) {
+              this.udidlList = response.data.list || [];
+              this.total = response.data.total || 0;
+            } else {
+              this.$message.error(response.message);
+            }
+
+
+          })
+          .catch(() => {
+            this.loading = false;
+            this.udidlList = [];
+            this.total = 0;
+          });
     },
 
     combineUdiAll() {
@@ -507,22 +518,22 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(() => {
-          combineAllUdi(this.unionQuery)
-            .then((response) => {
-              this.loading = false;
-              if (response.code == 20000) {
-                this.$message.success(response.data);
-                this.$emit("closeUdi", true);
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-            });
-        })
-        .catch(() => {
-        });
+          .then(() => {
+            combineAllUdi(this.unionQuery)
+                .then((response) => {
+                  this.loading = false;
+                  if (response.code == 20000) {
+                    this.$message.success(response.data);
+                    this.$emit("closeUdi", true);
+                  } else {
+                    this.$message.error(response.message);
+                  }
+                })
+                .catch(() => {
+                });
+          })
+          .catch(() => {
+          });
 
 
     },
@@ -586,51 +597,51 @@ export default {
       }
       this.combineLoading = true;
       checkExitUdi(this.combineQuery)
-        .then((response) => {
-          this.combineLoading = false;
-          if (response.code == 20000) {
-            this.combine();
-            // combineUdi(this.combineQuery)
-            //     .then((response) => {
-            //         this.combineLoading = false;
-            //         if (response.code == 20000) {
-            //             this.$emit("closeUdi", true);
-            //         } else {
-            //             this.$emit("closeUdi", false);
-            //         }
-            //     })
-            //     .catch(() => {
-            //         this.combineLoading = false;
-            //         this.$emit("closeUdi", false);
-            //     });
-          } else if (response.code == 499) {
-            this.$confirm(response.message, {type: "warning"})
-              .then(_ => {
-                this.combine();
-                // combineUdi(this.combineQuery)
-                //     .then((response) => {
-                //         this.combineLoading = false;
-                //         if (response.code == 20000) {
-                //             this.$emit("closeUdi", true);
-                //         } else {
-                //             this.$emit("closeUdi", false);
-                //         }
-                //     })
-                //     .catch(() => {
-                //         this.combineLoading = false;
-                //         this.$emit("closeUdi", false);
-                //     });
-              })
-              .catch(_ => {
-
-                this.combineQuery.keys = [];
-              });
-          }
-        })
-        .catch(() => {
-          this.combineLoading = false;
-          this.$emit("closeUdi", false);
-        });
+          .then((response) => {
+            this.combineLoading = false;
+            if (response.code == 20000) {
+              this.combine();
+              // combineUdi(this.combineQuery)
+              //     .then((response) => {
+              //         this.combineLoading = false;
+              //         if (response.code == 20000) {
+              //             this.$emit("closeUdi", true);
+              //         } else {
+              //             this.$emit("closeUdi", false);
+              //         }
+              //     })
+              //     .catch(() => {
+              //         this.combineLoading = false;
+              //         this.$emit("closeUdi", false);
+              //     });
+            } else if (response.code == 499) {
+              this.$confirm(response.message, {type: "warning"})
+                  .then(_ => {
+                    this.combine();
+                    // combineUdi(this.combineQuery)
+                    //     .then((response) => {
+                    //         this.combineLoading = false;
+                    //         if (response.code == 20000) {
+                    //             this.$emit("closeUdi", true);
+                    //         } else {
+                    //             this.$emit("closeUdi", false);
+                    //         }
+                    //     })
+                    //     .catch(() => {
+                    //         this.combineLoading = false;
+                    //         this.$emit("closeUdi", false);
+                    //     });
+                  })
+                  .catch(_ => {
+
+                    this.combineQuery.keys = [];
+                  });
+            }
+          })
+          .catch(() => {
+            this.combineLoading = false;
+            this.$emit("closeUdi", false);
+          });
 
 
     },
@@ -642,20 +653,20 @@ export default {
         this.combineQuery.erpName = this.data.thirdName;
       }
       combineUdi(this.combineQuery)
-        .then((response) => {
-          this.combineLoading = false;
-          if (response.code == 20000) {
-            this.$emit("closeUdi", true);
-          } else {
-            this.$message.error(response.message);
-            this.$emit("closeUdi", false);
-          }
-        })
-        .catch(() => {
-          this.combineLoading = false;
+          .then((response) => {
+            this.combineLoading = false;
+            if (response.code == 20000) {
+              this.$emit("closeUdi", true);
+            } else {
+              this.$message.error(response.message);
+              this.$emit("closeUdi", false);
+            }
+          })
+          .catch(() => {
+            this.combineLoading = false;
 
-          this.$emit("closeUdi", false);
-        });
+            this.$emit("closeUdi", false);
+          });
     },
 
     handleSelectionUdiChange(val) {
@@ -668,14 +679,14 @@ export default {
         limit: 10,
       };
       filterCompany(cQuery)
-        .then((response) => {
-          this.loading = false;
-          this.fromOptions = response.data || [];
-        })
-        .catch(() => {
-          this.loading = false;
-          this.fromOptions = [];
-        });
+          .then((response) => {
+            this.loading = false;
+            this.fromOptions = response.data || [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.fromOptions = [];
+          });
     },
   },
   components: {
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index e7cc5213..6a10541f 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -432,6 +432,23 @@
                 </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="请输入内容"
+                        type="number"
+                        :disabled="true"
+                        v-model="editQuery.packUnit"
+                      ></el-input>
+                    </div>
+                  </el-col>
+
                   <el-col :span="12" class="el-col">
                     <div class="text item">
                       <div class="itemTag">
@@ -447,7 +464,6 @@
                       ></el-input>
                     </div>
                   </el-col>
-
                 </el-row>
               </el-collapse-item>
 
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 3fa69f04..14c03b2a 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -175,40 +175,66 @@
             ></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.packUnit"
+            ></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row type="flex">
         <el-col :span="24">
           <div style="margin-bottom: 18px;margin-left: 25px">
             <el-checkbox v-model="editQuery.isDisable" class=""
                          @change="diableChange"
+                         style="width: 180px"
+                         border
             >是否禁用
             </el-checkbox>
             <el-checkbox v-model="editQuery.isAdavence" class=""
+                         border
+                         style="width: 180px"
             >是否寄售
             </el-checkbox>
             <el-checkbox v-model="editQuery.allowNoBatch" class=""
+                         border
+                         style="width: 180px"
             >允许无批次号
             </el-checkbox>
             <el-checkbox v-model="editQuery.allowNoExpire" class=""
+                         border
+                         style="width: 180px"
             >允许无失效日期
             </el-checkbox>
-            <el-checkbox v-model="editQuery.allowNoProduct" class=""
-            >允许无生产日期
-            </el-checkbox>
           </div>
         </el-col>
       </el-row>
       <el-row :gutter="20" class="el-row" type="flex">
         <el-col :span="24" class="el-col">
           <div style="margin-bottom: 18px;margin-left: 25px">
+
+            <el-checkbox v-model="editQuery.allowNoProduct" class=""
+                         border
+                         style="width: 180px"
+            >允许无生产日期
+            </el-checkbox>
             <el-checkbox v-model="checked" class=""
                          :disabled="!isUseDyCheck  || editQuery.useMuti==true "
                          @change="useDyCheckChange"
+                         style="width: 180px"
+                         border
             >启用使用单元
             </el-checkbox>
             <el-checkbox v-model="editQuery.useMuti" class=""
                          :disabled="checked"
                          @change="useMutiChange"
+                         style="width: 180px"
+                         border
             >允许科室多次使用出库
             </el-checkbox>
           </div>