Merge branch 'feature/med-goods-zs' into 'testing/3.29.0'

Feature/med goods zs

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

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

@@ -259,6 +259,13 @@
     }
   }
   .add-goods-dialog {
+    .el-dialog__body {
+      padding-left: 35px;
+      padding-right: 35px;
+    }
+    .add-btn-row {
+      text-align: right;
+    }
     .add-goods-table {
       margin-top: 10px;
       margin-bottom: 20px;

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

@@ -426,7 +426,7 @@
         ></el-pagination>
       </div>
       <el-row type="flex" class="row-bg" justify="end">
-        <el-col :span="6">
+        <el-col class="add-btn-row">
           <el-button  @click="baseAddVisible = false">取消</el-button>
           <el-button type="primary" @click="confirmAddGoods">确认</el-button>
         </el-col>
@@ -986,6 +986,7 @@
           this.formData = goodDet;
           this.formData3 =  { goodsName, goodsDescription, goodsHeaderImages, goodsVideoList, goodsType, expressLimitFlag,contractId, cooperationProjectId };
           this.formData3.medicationId = medicationInfo.tradeMedicalLibId;
+          this.formData3.medicationDetailId = medicationInfo.id;
           this.formData3.goodsCategoryIdList = this.getArr(goodsCategoryIdArr);
           console.log(this.formData3.goodsCategoryIdList, 'this.formData3.goodsCategoryIdListthis.formData3.goodsCategoryIdList')
           this.hasRepoFlag = hasRepoFlag;