From 5ce05fe25217b375956d31c9e365e01ed8aa73a7 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 7 Nov 2024 11:49:15 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/productEdit.vue       |   6 +-
 .../companyDrug/basicCompanyproductEdit.vue   | 201 +++++++++---------
 src/views/system/menu/index.vue               |  10 +-
 3 files changed, 110 insertions(+), 107 deletions(-)

diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 7f6a3a4..4b6a76e 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -70,8 +70,8 @@
                          :disabled="true"
                          style="width: 90%" placeholder="选择标识类型" clearable>
                 <el-option label="最小销售标识" :value="1"></el-option>
-                                  <el-option label="使用单元标识" :value="2"></el-option>
-                                  <el-option label="本体标识" :value="3"></el-option>
+                <el-option label="使用单元标识" :value="2"></el-option>
+                <!--                  <el-option label="本体标识" :value="3"></el-option>-->
                 <el-option label="外包装标识" :value="4"></el-option>
               </el-select>
             </template>
@@ -1328,7 +1328,6 @@ export default {
   },
   methods: {
     distributeLevelDiChange(val) {
-      console.log("gdgdgdgdgd",this.editQuery.distributeLevel)
       const matchingItem = this.detailList.find(item => item.nameCode == val);
       if (matchingItem) {
         this.editQuery.distributeLevelUnit = matchingItem.packUnit;
@@ -1399,6 +1398,7 @@ export default {
 
     },
     addDrugLevel() {
+      console.log('this.detailList',this.detailList)
       this.detailList.push({
         nameCode: '',
         packLevel: null,
diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
index 97c4f60..b495076 100644
--- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
+++ b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
@@ -144,106 +144,105 @@
             </el-table-column>
           </el-table>
 
-          <template>
-            <p class="form-title2">流通时采用的计量单位设置</p>
-          </template>
-          <el-row :gutter="20">
-            <el-col :span="11" class="el-col">
-              <el-form-item label="计量单位:" prop="distributeLevel" label-width="160px">
+<!--          <template>-->
+<!--            <p class="form-title2">流通时采用的计量单位设置</p>-->
+<!--          </template>-->
+<!--          <el-row :gutter="20">-->
+<!--            <el-col :span="11" class="el-col">-->
+<!--              <el-form-item label="计量单位:" prop="distributeLevel" label-width="160px">-->
 
-                <el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"
-                           @change="distributeLevelDiChange"
-                           placeholder="请选择计量单位"
-                >
-                  <el-option
-                    v-for="item in levelUnitList"
-                    :key="item.packLevel"
-                    :value="item.packLevel"
-                    :label="item.packUnit"
-                  >
-                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
-                    <span style="float: left">层级:{{ item.packLevel }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+<!--                <el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"-->
+<!--                           @change="distributeLevelDiChange"-->
+<!--                           placeholder="请选择计量单位"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="item in levelUnitList"-->
+<!--                    :key="item.packLevel"-->
+<!--                    :value="item.packLevel"-->
+<!--                    :label="item.packUnit"-->
+<!--                  >-->
+<!--                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
+<!--                    <span style="float: left">层级:{{ item.packLevel }}</span>-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
 
-            <el-col :span="11" class="el-col">
-              <el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px">
-                <el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%"
-                           placeholder="请选择允许采集的最大层级"
-                >
-                  <el-option
-                    v-for="item in levelUnitList"
-                    :key="item.packLevel"
-                    :value="item.packLevel"
-                    :label="item.packLevel"
-                  >
-                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
-                    <span style="float: left">层级:{{ item.packLevel }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-divider></el-divider>
-          <template>
-            <p class="form-title2">使用时采用的计量单位设置</p>
-          </template>
-          <el-row :gutter="20">
-            <el-col :span="11" class="el-col">
-              <el-form-item label="计量单位:" prop="useLevel" label-width="160px">
-
-                <el-select v-model="newProductData.useLevel" size="small" style="width: 90%"
-                           clearable
-                           @change="useLevelDiChange"
-                           placeholder="请选择计量单位"
-                >
-                  <el-option
-                    v-for="item in levelUnitList"
-                    :key="item.packLevel"
-                    :value="item.packLevel"
-                    :label="item.packUnit"
-                  >
-                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
-                    <span style="float: left">层级:{{ item.packLevel }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="11" class="el-col">-->
+<!--              <el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px">-->
+<!--                <el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%"-->
+<!--                           placeholder="请选择允许采集的最大层级"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="item in levelUnitList"-->
+<!--                    :key="item.packLevel"-->
+<!--                    :value="item.packLevel"-->
+<!--                    :label="item.packLevel"-->
+<!--                  >-->
+<!--                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
+<!--                    <span style="float: left">层级:{{ item.packLevel }}</span>-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
+<!--          <el-divider></el-divider>-->
+<!--          <template>-->
+<!--            <p class="form-title2">使用时采用的计量单位设置</p>-->
+<!--          </template>-->
+<!--          <el-row :gutter="20">-->
+<!--            <el-col :span="11" class="el-col">-->
+<!--              <el-form-item label="计量单位:" prop="useLevel" label-width="160px">-->
 
-            <el-col :span="11" class="el-col">
-              <el-form-item label="允许采集的最大层级:" prop="useMaxLevel" label-width="160px">
-                <el-select v-model="newProductData.useMaxLevel" size="small" style="width: 90%"
-                           clearable
-                           placeholder="请选择允许采集的最大层级"
-                >
-                  <el-option
-                    v-for="item in levelUnitList"
-                    :key="item.packLevel"
-                    :value="item.packLevel"
-                    :label="item.packLevel"
-                  >
-                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
-                    <span style="float: left">层级:{{ item.packLevel }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
+<!--                <el-select v-model="newProductData.useLevel" size="small" style="width: 90%"-->
+<!--                           clearable-->
+<!--                           @change="useLevelDiChange"-->
+<!--                           placeholder="请选择计量单位"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="item in levelUnitList"-->
+<!--                    :key="item.packLevel"-->
+<!--                    :value="item.packLevel"-->
+<!--                    :label="item.packUnit"-->
+<!--                  >-->
+<!--                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
+<!--                    <span style="float: left">层级:{{ item.packLevel }}</span>-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
 
-          <el-row :gutter="20">
-            <el-col :span="11" class="el-col">
-              <el-form-item label="拆包后可用时长(小时):" prop="unpackUseTime" label-width="160px">
+<!--            <el-col :span="11" class="el-col">-->
+<!--              <el-form-item label="允许采集的最大层级:" prop="useMaxLevel" label-width="160px">-->
+<!--                <el-select v-model="newProductData.useMaxLevel" size="small" style="width: 90%"-->
+<!--                           clearable-->
+<!--                           placeholder="请选择允许采集的最大层级"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="item in levelUnitList"-->
+<!--                    :key="item.packLevel"-->
+<!--                    :value="item.packLevel"-->
+<!--                    :label="item.packLevel"-->
+<!--                  >-->
+<!--                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
+<!--                    <span style="float: left">层级:{{ item.packLevel }}</span>-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
+<!--          <el-row :gutter="20">-->
+<!--            <el-col :span="11" class="el-col">-->
+<!--              <el-form-item label="拆包后可用时长(小时):" prop="unpackUseTime" label-width="160px">-->
 
-                <el-input v-model="newProductData.unpackUseTime" size="small" style="width: 90%"
-                          clearable
-                          placeholder="请输入拆包后可用时长(小时)"
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
+<!--                <el-input v-model="newProductData.unpackUseTime" size="small" style="width: 90%"-->
+<!--                          clearable-->
+<!--                          placeholder="请输入拆包后可用时长(小时)"-->
+<!--                >-->
+<!--                </el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
         </el-collapse-item>
         <el-collapse-item name="2">
           <template slot="title">
@@ -925,16 +924,16 @@ export default {
                   return
                 }
               }
-              const isLevel1 = this.detailList.some(item => item.packLevel === 1)
-              if (!isLevel1) {
-                this.$message.error('药品层级缺少一级标识！')
-              }
+              // const isLevel1 = this.detailList.some(item => item.packLevel === 1)
+              // if (!isLevel1) {
+              //   this.$message.error('药品层级缺少一级标识！')
+              // }
               this.newProductData.drugLevelLists = this.detailList
 
             }
             this.saveLoading = true
-
-            addDrug(this.newProductData).then((res) => {
+            this.newProductData.relId = this.newProductData.rlId
+            updatetDrug(this.newProductData).then((res) => {
               this.saveLoading = false
               if (res.code == 20000) {
                 this.$message.success('添加成功')
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 3f152fa..69009e6 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -450,9 +450,13 @@ export default {
     handleDelete(row) {
       this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function () {
         return delMenu(row.menuId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
+      }).then((res) => {
+        if (res.code == 20000) {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        } else {
+          this.$modal.msgSuccess(res.message);
+        }
       }).catch(() => {
       });
     }