Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/common/components/description/index.vue

@@ -13,6 +13,7 @@
                rowKey="key"
                :data-source="tableList"
                :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
+        <slot></slot>
       </a-table>
       <ThridMenu :list="tabList"
                  @selectMenu="changeTab" />

src/views/information/goods/components/add/index.vue

@@ -231,8 +231,8 @@
                           :getPopupContainer="(triggerNode) => triggerNode.parentNode"
                           placeholder="请选择套保品种">
                   <a-select-option v-for="item in goodsGroup"
-                                   :value="item.groupcategroyid"
-                                   :key="item.groupcategroyid">
+                                   :value="item.goodsgroupid"
+                                   :key="item.goodsgroupid">
                     {{item.goodsgroupname}}
                   </a-select-option>
                 </a-select>
@@ -383,10 +383,10 @@ export default defineComponent({
          * 切换套保品种时候，获取对应的单位
          */
         function middleChange(id: number, value: WRSConvertDetailEx) {
-            const obj = goodsGroup.value.find((e: any) => e.groupcategroyid === id);
+            const obj = goodsGroup.value.find((e: any) => e.goodsgroupid === id);
             if (obj) {
                 value.unitidName = obj.enumdicname;
-                value.unitid = obj.goodsgroupid;
+                value.unitid = obj.goodunitid;
             }
         }
         function closeAction() {

src/views/information/goods/components/modify/index.vue

@@ -399,7 +399,7 @@ export default defineComponent({
          * 切换套保品种时候，获取对应的单位
          */
         function middleChange(id: number, value: WRSConvertDetailEx) {
-            const obj = goodsGroup.value.find((e) => e.groupcategroyid === id);
+            const obj = goodsGroup.value.find((e) => e.goodsgroupid === id);
             if (obj) {
                 value.unitidName = obj.enumdicname;
                 value.unitid = obj.goodunitid;