耗材字典相关迁移

src/views/basic/product/SelectDIDetailDialog.vue

@@ -458,6 +458,11 @@ export default {
     return {
       activeNames: ['1']
     }
+
+
+
+
+
   },
   methods: {},
 

src/views/basic/product/product.vue

@@ -3,19 +3,18 @@
     <el-card>
       <el-row>
         <el-col :span="3" v-show="showSearch">
-          <div style="height: 100%;margin-left: 0px">
+          <div style="height: 100%">
             <el-tree :data="treeList"
                      class="tree"
+                     :default-expand-all="true"
                      @node-click="handleNodeClick"
                      :expand-on-click-node="false">
                  <span class="custom-tree-node" slot-scope="{ node, data }">
-                   <span style="font-size: 12px;font-weight: 500;">{{ node.label }}</span></span>
+                   <span style="font-size: 14px;font-weight: 500;">{{ node.label }}</span></span>
             </el-tree>
           </div>
-          <el-divider direction="vertical"></el-divider>
         </el-col>
-
+        <el-col :span="21" style="border-left:  3px solid #dddddd">
-        <el-col :span="21" style="border-left: 1px solid rgb(229 224 224)">
           <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
             <el-row>
               <el-col :span="18">
@@ -37,8 +36,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="产品通用名:">
+                <el-form-item class="query-form-item" label="物资名称:">
-                  <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"
+                  <el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
                             style="width: 90%"></el-input>
                 </el-form-item>
               </el-col>
@@ -104,9 +103,9 @@
               <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
               <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
               <el-button type="primary" icon="el-icon-search" @click="submit">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">编辑菜单分类</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">添加DI信息</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">选入DI信息</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加产品信息</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加院内字典</el-button>
               <el-button type="primary" icon="el-icon-plus" @click="intentDetail">关联添加</el-button>
             </el-button-group>
           </div>
@@ -137,7 +136,7 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              label="产品通用名"
+              label="物资名称"
               prop="cpmctymc"
               show-overflow-tooltip
             ></el-table-column>
@@ -200,8 +199,8 @@
                 <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
                 <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
               </el-table>
             </el-card>
             <el-card>
@@ -215,7 +214,7 @@
               <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3"
                         highlight-current-row @current-change="handleDetail">
                 <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-                <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+                <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
               </el-table>
@@ -646,7 +645,7 @@
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
-                            <span>生产厂家:&nbsp;</span>
+                            <span>生产企业:&nbsp;</span>
                           </div>
                           <el-input
                             style="width: 65%"
@@ -985,7 +984,7 @@
             :visible.sync="editDiDialogVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
-            width="60%"
+            width="70%"
             v-if="editDiDialogVisible"
           >
             <product-edit
@@ -1547,7 +1546,7 @@ export default {
       this.getList();
     },
     handleCurrentChange(val) {
-      this.filterQuery.page = val;
+      this.filterQuery.page = val.page;
       this.getList();
     },
     handleModifyClick(row) {

src/views/basic/product/productEdit.vue

@@ -11,11 +11,11 @@
         <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+          <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
           <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <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">
@@ -45,7 +45,7 @@
         <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row
                   @current-change="handleDetail">
           <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-          <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="180px">
@@ -55,11 +55,12 @@
           </el-table-column>
         </el-table>
       </el-card>
-
       <el-card>
+
+
         <el-row type="flex" class="edit-row" style="margin-top: 20px">
           <el-col :span="12">
-          <el-form-item label="计量单位:" label-width="140px">
+            <el-form-item label="计量单位:">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -69,7 +70,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item label="生产厂家:" label-width="140px">
+            <el-form-item label="生产企业:">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -81,7 +82,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12">
-          <el-form-item label="商品名称:" label-width="140px">
+            <el-form-item label="商品名称:">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -91,7 +92,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item label="产品描述:" label-width="140px">
+            <el-form-item label="产品描述:">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -101,9 +102,53 @@
             </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+':'" + label-width="140px">
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'" +>
               <el-input
                 style="width: 80%"
                 size="small"
@@ -113,7 +158,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
-          <el-form-item :label="productRemarkSet.remarkTitle2+':'" + label-width="140px">
+            <el-form-item :label="productRemarkSet.remarkTitle2+':'" +>
               <el-input
                 style="width: 80%"
                 size="small"
@@ -125,7 +170,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
-          <el-form-item :label="productRemarkSet.remarkTitle3+':'" + label-width="140px">
+            <el-form-item :label="productRemarkSet.remarkTitle3+':'" +>
               <el-input
                 style="width: 80%"
                 size="small"
@@ -135,7 +180,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
-          <el-form-item :label="productRemarkSet.remarkTitle4+':'" + label-width="140px">
+            <el-form-item :label="productRemarkSet.remarkTitle4+':'" +>
               <el-input
                 style="width: 80%"
                 size="small"
@@ -147,7 +192,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
-          <el-form-item :label="productRemarkSet.remarkTitle5+':'" + label-width="140px">
+            <el-form-item :label="productRemarkSet.remarkTitle5+':'" +>
               <el-input
                 style="width: 80%"
                 size="small"
@@ -157,7 +202,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
-          <el-form-item :label="productRemarkSet.remarkTitle6+':'" label-width="140px">
+            <el-form-item :label="productRemarkSet.remarkTitle6+':'" +>
               <el-input
                 style="width: 80%"
                 size="small"
@@ -169,7 +214,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
-          <el-form-item :label="productRemarkSet.remarkTitle7+':'" label-width="140px">
+            <el-form-item :label="productRemarkSet.remarkTitle7+':'" +>
               <el-input
                 style="width: 80%"
                 size="small"
@@ -179,7 +224,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
-          <el-form-item :label="productRemarkSet.remarkTitle8+':'" label-width="140px">
+            <el-form-item :label="productRemarkSet.remarkTitle8+':'" +>
               <el-input
                 style="width: 80%"
                 size="small"
@@ -191,7 +236,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12">
-          <el-form-item label="医保编码:" label-width="140px">
+            <el-form-item label="医保编码:">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -201,308 +246,263 @@
             </el-form-item>
           </el-col>
         </el-row>
-      </el-card>
-
-        <div style="margin: 12px 12px 12px 24px;font-size: 18px;font-weight: bold;" @click="chang">高级设置</div>
-          <div style="width: 97%;margin: 0 auto" v-show="isCart">
-            <el-descriptions class="margin-top"  :column="3" size="mini" border>
-              <el-descriptions-item :labelStyle='labelStyle' :contentStyle='contentStyle1'>库存积压预警数量</el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle' :contentStyle='contentStyle'>
-                 <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.overStockNum"></el-input>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                库存积压预警数量
-              </el-descriptions-item>
-              <el-descriptions-item>
-                低库存预警数量
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.lowStockNum"></el-input>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                低库存预警数量
-              </el-descriptions-item>
-
-
-              <el-descriptions-item>
-
-                最小包装可使用次数
-              </el-descriptions-item>
-              <el-descriptions-item>
-
-                <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.useNum"></el-input>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                最小包装可使用次数
-              </el-descriptions-item>
-
 
-              <el-descriptions-item>
+      </el-card>
-
-                近效期预警时间
-              </el-descriptions-item>
-              <el-descriptions-item>
-
-                <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.recentDateTime"></el-input>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                近效期预警时间
-              </el-descriptions-item>
-
-              <el-descriptions-item>
-
-                使用周期(天)
-              </el-descriptions-item>
-              <el-descriptions-item>
-
-                <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.useExpireTime"></el-input>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                使用周期(天)
-              </el-descriptions-item>
 
-              <el-descriptions-item>
+      <el-collapse v-model="activeNames" style="margin-top: 12px">
+        <el-collapse-item title="高级设置" name="1"
+                          style="font-size: 19px;
+          margin-left: 25px;
+          font-weight: bold;">
 
-                物资分类
-              </el-descriptions-item>
-              <el-descriptions-item>
 
+          <el-row type="flex" class="edit-row">
+            <el-col :span="12">
+              <el-form-item label="物资所属分类:">
                 <treeselect
                   v-model="editQuery.relCode"
                   :options="fromDeptOptions"
                   :normalizer="normalizer"
                   :show-count="true"
-                  style="width:150px;"
+                  style="width: 65%;"
-                  placeholder="选择物资分类"
+                  placeholder="选择物资所属分类"
                 />
-<!--                <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.useExpireTime"></el-input>-->
+              </el-form-item>
-
+            </el-col>
-              </el-descriptions-item>
+          </el-row>
-              <el-descriptions-item :labelStyle='labelStyle1'>
+          <el-divider></el-divider>
-                <template slot="label">
+          <div style="width: 96%;margin: 0 auto">
-                  <i class="el-icon-tickets"></i>
+            <el-row>
-                  描述
+              <el-col span="5">
-                </template>
+                <span>参数</span>
-                物资分类
+              </el-col>
-              </el-descriptions-item>
+              <el-divider direction="vertical"></el-divider>
-
+              <el-col span="5">
-
+                <span>设置</span>
-              <el-descriptions-item>
+              </el-col>
-
+              <el-divider direction="vertical"></el-divider>
-                是否禁用
+              <el-col span="13">
-              </el-descriptions-item>
+                <span>参数设置说明</span>
-              <el-descriptions-item>
+              </el-col>
-
+            </el-row>
-                <el-radio-group v-model="editQuery.isDisable">
+            <el-divider direction="horizontal"></el-divider>
-                  <el-radio :label="true" :value="true">是</el-radio>
-                  <el-radio :label="false" :value="false">否</el-radio>
-                </el-radio-group>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                是否禁用
-              </el-descriptions-item>
-
-              <el-descriptions-item>
-
-                是否寄售
-              </el-descriptions-item>
-              <el-descriptions-item>
-
-                <el-radio-group v-model="editQuery.isAdavence">
-                  <el-radio :label="true" :value="true">是</el-radio>
-                  <el-radio :label="false" :value="false">否</el-radio>
-                </el-radio-group>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                是否寄售
-              </el-descriptions-item>
-
-
 
-              <el-descriptions-item>
 
-                多次/重复使用耗材
+            <el-row>
-              </el-descriptions-item>
+              <el-col span="5">
-              <el-descriptions-item>
+                <span class="sptext">是否禁用</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.isDisable" style="width: 65%" 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>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.isAdavence" style="width: 65%" 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>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable"
+                          type="number" v-model="editQuery.useNum"></el-input>
+              </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>
+              </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>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.useMuti" style="width: 65%" 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>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.dispatch" style="width: 65%" 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-radio-group v-model="editQuery.useMuti">
-                  <el-radio :label="true" :value="true">是</el-radio>
-                  <el-radio :label="false" :value="false">否</el-radio>
-                </el-radio-group>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                多次/重复使用耗材
-              </el-descriptions-item>
 
+            <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.groupBuy" style="width: 65%" 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>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.allowNoBatch" style="width: 65%" 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-descriptions-item>
+            <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-descriptions-item>
+                <el-select v-model="editQuery.allowNoExpire" style="width: 65%" placeholder="状态" clearable>
-              <el-descriptions-item>
+                  <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-radio-group v-model="editQuery.dispatch">
+            <el-divider></el-divider>
-                  <el-radio :label="true" :value="true">是</el-radio>
+            <el-row>
-                  <el-radio :label="false" :value="false">否</el-radio>
+              <el-col span="5">
-                </el-radio-group>
+                <span class="sptext">允许无生产日期</span>
-              </el-descriptions-item>
+              </el-col>
-              <el-descriptions-item :labelStyle='labelStyle1'>
+              <el-divider direction="vertical"></el-divider>
-                <template slot="label">
+              <el-col span="5">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                是否可配送
-              </el-descriptions-item>
-              <el-descriptions-item>
-
-                是否集采产品
-              </el-descriptions-item>
-              <el-descriptions-item>
-
-                <el-radio-group v-model="editQuery.groupBuy">
-                  <el-radio :label="true" :value="true">是</el-radio>
-                  <el-radio :label="false" :value="false">否</el-radio>
-                </el-radio-group>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                是否集采产品
-              </el-descriptions-item>
 
+                <el-select v-model="editQuery.allowNoProduct" style="width: 65%" placeholder="状态" clearable>
+                  <el-option label="允许" :value="true"></el-option>
+                  <el-option label="不允许" :value="false"></el-option>
+                </el-select>
 
-              <el-descriptions-item>
+              </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-descriptions-item>
-              <el-descriptions-item>
 
-                <el-radio-group v-model="editQuery.allowNoBatch">
+            <el-row>
-                  <el-radio :label="true" :value="true">允许</el-radio>
+              <el-col span="5">
-                  <el-radio :label="false" :value="false">不允许</el-radio>
+                <span class="sptext">是否必须维护资质材料</span>
-                </el-radio-group>
+              </el-col>
-              </el-descriptions-item>
+              <el-divider direction="vertical"></el-divider>
-              <el-descriptions-item  :labelStyle='labelStyle1'>
+              <el-col span="5">
-                <template slot="label">
+                <el-select v-model="editQuery.needCert" style="width: 65%" placeholder="状态" clearable>
-                  <i class="el-icon-tickets"></i>
+                  <el-option label="是" :value="true"></el-option>
-                  描述
+                  <el-option label="否" :value="false"></el-option>
-                </template>
+                </el-select>
-                允许无批次
+              </el-col>
-              </el-descriptions-item>
+              <el-divider direction="vertical"></el-divider>
-
+              <el-col span="13">
-              <el-descriptions-item>
+                <span class="sptext">是否必须维护资质材料</span>
-
+              </el-col>
-                允许无失效日期
+            </el-row>
-              </el-descriptions-item>
+            <el-divider></el-divider>
-              <el-descriptions-item>
+            <el-row>
-
+              <el-col span="5">
-                <el-radio-group v-model="editQuery.allowNoExpire">
+                <span class="sptext">使用周期</span>
-                  <el-radio :label="true" :value="true">允许</el-radio>
+              </el-col>
-                  <el-radio :label="false" :value="false">不允许</el-radio>
+              <el-divider direction="vertical"></el-divider>
-                </el-radio-group>
+              <el-col span="5">
-              </el-descriptions-item>
+                <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable"
-              <el-descriptions-item :labelStyle='labelStyle1'>
+                          type="number" v-model="editQuery.useExpireTime"></el-input>
-                <template slot="label">
+              </el-col>
-                  <i class="el-icon-tickets"></i>
+              <el-divider direction="vertical"></el-divider>
-                  描述
+              <el-col span="13">
-                </template>
+                <span class="sptext">使用周期(天)</span>
-                允许无失效日期
+              </el-col>
-              </el-descriptions-item>
+            </el-row>
-
+            <el-divider></el-divider>
-              <el-descriptions-item>
-
-                允许无生产日期
-              </el-descriptions-item>
-              <el-descriptions-item>
-
-                <el-radio-group v-model="editQuery.allowNoProduct">
-                  <el-radio :label="true" :value="true">允许</el-radio>
-                  <el-radio :label="false" :value="false">不允许</el-radio>
-                </el-radio-group>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                允许无生产日期
-              </el-descriptions-item>
-
-              <el-descriptions-item>
-
-                预警时间格式
-              </el-descriptions-item>
-              <el-descriptions-item>
-
-                <el-radio-group v-model="editQuery.isDateBy">
-                  <el-radio :label="1" :value="1">天</el-radio>
-                  <el-radio :label="2" :value="2">小时</el-radio>
-                </el-radio-group>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                预警时间格式
-              </el-descriptions-item>
-
-              <el-descriptions-item>
-
-                启用使用单元
-              </el-descriptions-item>
-              <el-descriptions-item>
-
-                <el-radio-group v-model="checked">
-                  <el-radio :label="true" :value="true">启用</el-radio>
-                  <el-radio :label="false" :value="false">不启用</el-radio>
-                </el-radio-group>
-              </el-descriptions-item>
-              <el-descriptions-item :labelStyle='labelStyle1'>
-                <template slot="label">
-                  <i class="el-icon-tickets"></i>
-                  描述
-                </template>
-                启用使用单元
-              </el-descriptions-item>
-            </el-descriptions>
 
           </div>
-
+        </el-collapse-item>
+      </el-collapse>
 
 
     </el-form>
@@ -558,9 +558,9 @@ import {isBlank} from "@/utils/strUtil";
 import {filterByUuid} from "@/api/basic/product/udiInfo";
 import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
 import selectErp from "./udiInfoselectErpUdi";
-import {getListMenu} from "@/api/basic/basicHospType";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
+import {getListMenu} from "@/api/basic/basicHospType";
 
 
 export default {
@@ -606,12 +606,11 @@ export default {
       useNumEnable: true,
       sysList: [],
       detailList: [],
+      fromDeptOptions: [],
       defaultSys: null,
       isImport: false,
-      fromDeptOptions: [],
       selectErpDialogVisible: false,  //选入ERP产品
       editSingleDiDialogVisible: false,
-      isCart:false,
       editSingleFormat: {
         uuid: null,
         relId: null,
@@ -620,19 +619,6 @@ export default {
         measname: null,
         nameCode: null
       },
-      labelStyle: { 'width': '000px' },
-      labelStyle1: {
-        'width': '100px' ,
-        'font-weight': '900',
-        'font-size': '14px',
-        'color' : '#141414'
-      },
-      contentStyle: {
-        'width': '150px',
-      },
-      contentStyle1: {
-        'width': '170px'
-      },
     }
   },
   components: {
@@ -641,13 +627,13 @@ export default {
     Treeselect
   },
   created() {
+    this.useMutiChange(true)
+    this.getThirdSysDetail();
     if (this.editQuery.isDateBy == 1) {
       this.editQuery.recentDateTime = this.editQuery.recentDateTime / 24;
     }
     console.log(this.editQuery)
     this.getTreeselect();
-    this.useMutiChange(true)
-    this.getThirdSysDetail();
     let ttquery = {
       id: this.relevanceEdit.id
     }
@@ -676,9 +662,6 @@ export default {
       this.isImport = false;
       this.selectErpDialogVisible = true;
     },
-    chang(){
-      this.isCart=!this.isCart;
-    },
     removeDi() {
       this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
@@ -765,25 +748,6 @@ export default {
         .catch(() => {
         });
     },
-    getTreeselect() {
-      getListMenu().then(response => {
-        this.fromDeptOptions = [];
-        const menu = {id: 0, name: '主类目', children: []};
-        menu.children = this.handleTree(response.data,"code", "parentCode");
-        this.fromDeptOptions.push(menu);
-      });
-    },
-    /** 转换菜单数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.code,
-        label: node.name,
-        children: node.children
-      };
-    },
     useDyCheckChange(val) {
       this.editQuery.useNum = 0;
     },
@@ -824,11 +788,11 @@ export default {
       if (val) {
         this.useNumEnable = false;
         // this.editQuery.useNum = this.editQuery.zxxsbzbhsydysl;
-        // if (!isBlank(this.editQuery.zxxsbzbhsydysl)) {
+        if (!isBlank(this.editQuery.zxxsbzbhsydysl)) {
-        //   if (this.editQuery.zxxsbzbhsydysl > 0) {
+          if (this.editQuery.zxxsbzbhsydysl > 0) {
-        //     this.isUseDyCheck = true;
+            this.isUseDyCheck = true;
-        //   }
+          }
-        // }
+        }
       } else {
         this.useNumEnable = true;
         this.editQuery.useNum = 0;
@@ -848,21 +812,44 @@ export default {
         this.editQuery.dispatch = false;
       }
     },
+    getTreeselect() {
+      getListMenu().then(response => {
+        this.fromDeptOptions = [];
+        const menu = {id: 0, name: '主类目', children: []};
+        menu.children = this.handleTree(response.data, "code", "parentCode");
+        this.fromDeptOptions.push(menu);
+      });
+    },
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.code,
+        label: node.name,
+        children: node.children
+      };
+    },
   }
 }
 </script>
 
 <style scoped>
-.vue-treeselect >>> .vue-treeselect__placeholder {
+.vue-treeselect--searchable:not(.vue-treeselect--disabled) .vue-treeselect__value-container {
-  font-size: 12px;
+  cursor: text;
+  width: 500px;
 }
 
-.vue-treeselect >>> .vue-treeselect__value-container {
+.el-divider {
-  font-size: 12px;
+  margin: 6px 0px 8px 0px;
-  height: 30px;
+  background: 0 0;
+  border-top: 1px solid #E6EBF5;
 }
 
-.vue-treeselect >>> .vue-treeselect__control {
+.sptext {
-  height: 20px;
+  font-size: 13px;
+  font-weight: normal;
 }
+
 </style>

src/views/basic/product/productSingleEdit.vue

@@ -9,35 +9,55 @@
     >
 
       <el-row>
+        <el-col span="20">
           <el-form-item label="产品标识:">
-          <el-input style="width: 80%" size="small" :disabled="true"  v-model="editQuery.nameCode"></el-input>
+            <el-input
+              disabled
+              style="width: 90%"
+              size="small"
+              splaceholder="请输入内容"
+              v-model="editQuery.nameCode"
+            ></el-input>
           </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
-        <el-form-item label="产品通用名:">
+        <el-col span="20">
-          <el-input style="width: 80%" size="small"  :disabled="true" v-model="editQuery.cpmctymc"></el-input>
+          <el-form-item label="物资名称:">
+            <el-input
+              style="width: 90%"
+              size="small"
+              disabled
+              splaceholder="请输入内容"
+              v-model="editQuery.cpmctymc"
+            ></el-input>
           </el-form-item>
+        </el-col>
       </el-row>
 
       <el-row>
+        <el-col span="20">
           <el-form-item label="商品条码:">
             <el-input
-            style="width: 80%"
+              style="width: 90%"
               size="small"
               splaceholder="请输入内容"
               v-model="editQuery.sptm"
             ></el-input>
           </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
+        <el-col span="20">
           <el-form-item label="包装单位:">
             <el-input
-            style="width: 80%"
+              style="width: 90%"
               size="small"
               splaceholder="请输入内容"
               v-model="editQuery.packUnit"
             ></el-input>
           </el-form-item>
+        </el-col>
       </el-row>
       <!--      <el-row>-->
       <!--        <el-form-item label="计量单位:">-->

src/views/basic/product/productUdiType.vue

@@ -148,7 +148,6 @@ export default {
         // page: 1,
         // limit: 10,
       },
-      pCode:null,
       isShow: null,
       loading: true,
       list: [],
@@ -179,7 +178,7 @@ export default {
       checkSubThrWarehouseRow: null,
       selectHospProductVisible: false,
       selectUnBindHospProductVisible:false,
-
+      pCode:null,
       subTotal: 0,
       sysList: [],
       sysSubList: [],
@@ -226,9 +225,7 @@ export default {
       this.getTreeselect();
       this.subFormVisible = true;
     },
-    getTreeName(obj){
+
-      this.pCode=obj.parentCode;
-    },
     hideForm() {    // 新增，编辑---取消
       this.formVisible = false;
       this.subFormVisible = false;
@@ -329,6 +326,9 @@ export default {
           });
       }
     },
+    getTreeName(obj){
+      this.pCode=obj.parentCode;
+    },
     addHospProduct(data) {
       this.rId = data.code
       this.selectHospProductVisible = true;