耗材字典新增包装单位字段

src/views/basic/product/UdiInfoSelectLocalUdi.vue

@@ -2,32 +2,35 @@
   <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-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"
-                        style="width: 600px"
                           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-col :span="6">
+              <el-form-item label="销售单元产品标识:" 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-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"
@@ -43,34 +46,42 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-            <el-form-item class="query-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"
-                size="mini"
                     placeholder="器械通用名称"
                 ></el-input>
               </el-form-item>
+            </el-col>
+
+
           </el-row>
 
           <el-row>
-            <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="规格型号"
-                size="mini"
                 ></el-input>
               </el-form-item>
-            <el-form-item class="query-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="注册证/备案号"
-                size="mini"
                 ></el-input>
               </el-form-item>
-            <el-form-item class="query-form-item">
+            </el-col>
+
+
+            <el-form-item>
               <el-button-group>
                 <el-button
                     type="primary"

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>
 

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>