Merge branch 'testing/3.29.0' into 'release'

Testing/3.29.0

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!466

src/utils/goods/index.js

@@ -194,7 +194,7 @@ export const getCategorysList = (params) => {
 export const saveMedList = (data) => {
   return fetch({
     headers,
-    url: getBaseUrl(`store/admin/medical/save`),
+    url: getBaseUrl(`store/admin/medical/saveAndReturn`),
     method: "post",
     data,
     description: "药品保存",

src/views/goods/create-good-new.scss

@@ -15,6 +15,10 @@
       .word-tip {
         color: #e6af7a;
       }
+      .word-show {
+        color: #449284;
+        cursor: pointer;
+      }
     }
     .suitableList-select {
       width: 445px;
@@ -319,5 +323,11 @@
       padding-right: 45px;
     }
   }
+}
+.example-dialog {
+  img {
+    width: 100%;
+    height: 100%;
+  }
 }
   }

src/views/goods/create-good-new.vue

@@ -81,13 +81,13 @@
             :data="choiceMedData" 
             ref="singlTable"
             class="show-goods-table">
-            <el-table-column property="productName" label="产品名称/通用名称" width="150"></el-table-column>
-            <el-table-column property="barCode" label="条形码" width="200"></el-table-column>
-            <el-table-column property="goodsName" label="商品名称"></el-table-column>
-            <el-table-column property="approvalNumber" label="批准文号" width="150"></el-table-column>
-            <el-table-column property="specifications" label="规格" width="200"></el-table-column>
-            <el-table-column property="productionCompany" label="生产企业"></el-table-column>
-            <el-table-column  label="操作"><span class="del-goods" @click="delGoods">删除</span></el-table-column>
+            <el-table-column property="productName" label="产品名称/通用名称" width="180"></el-table-column>
+            <el-table-column property="barCode" label="条形码"  width="180"></el-table-column>
+            <el-table-column property="goodsName" label="商品名称"  width="180"></el-table-column>
+            <el-table-column property="approvalNumber" label="批准文号" width="180"></el-table-column>
+            <el-table-column property="specifications" label="规格"  width="180"></el-table-column>
+            <el-table-column property="productionCompany" label="生产企业"  width="180"></el-table-column>
+            <el-table-column  label="操作"  width="180"><span class="del-goods" @click="delGoods">删除</span></el-table-column>
           </el-table>
           </el-form-item>
           <el-form-item label="商品名称" prop="goodsName">
@@ -115,6 +115,7 @@
                   show-word-limit
               ></el-input>
               <span class="word-tip">此文案可摘取药品说明书【功能主治】or【适应症】</span>
+              <span class="word-show" @click="shoImgDialog = true">查看展示位置</span>
             </el-col>
           </el-form-item>
 
@@ -531,6 +532,15 @@
         <el-button type="primary" @click="addNewMed">确 定</el-button>
       </div>
     </el-dialog>
+    <!-- 查看展示 -->
+    <el-dialog
+    title="查看展示"
+    :visible.sync="shoImgDialog"
+    width="40%"
+    class="example-dialog"
+    >
+    <img src="../../assets/image/s-example.png" alt="">
+  </el-dialog>
   </div>
 </template>
 <script>
@@ -552,6 +562,7 @@
     },
     data(){
       return{
+        shoImgDialog: false, // 查看展示
         medicalCategoryList: [], // 药品分类
         isShowGoodsMsg: false,
         medicationId: '', // 药品id (搜索药品列表)
@@ -901,6 +912,11 @@
               message: '新增药品成功!'
             });
             this.isNewMeddialog = false;
+            this.choiceMedData = [res.data]
+            this.formData3.medicationId = res.data.tradeMedicalLibId;
+            this.formData3.medicationDetailId = res.data.id;
+            this.isShowGoods = true;
+            console.log(this.choiceMedData , 'this.choiceMedData ')
           } else {
             this.$message({
             type: 'error',