Merge branch 'master' into 测试

src/components/makeProduct/subsidiary/index.vue

@@ -22,11 +22,11 @@
                 <div style="padding: 10px 20px">
                   <el-row :gutter="20">
                     <el-col :span="12">
-                      <div style="margin-bottom: 10px">
+                      <!-- <div style="margin-bottom: 10px">
                         <el-button type="primary" size="small" @click="clickSelectCommonPacking(props.$index)">选择常用包装</el-button>
                         <el-button type="success" size="small" @click="clickSaveCommonPacking(props)">保存常用包装</el-button>
                         <el-button type="primary" size="small" @click="clickPackingFittings(props)">选择包材配件</el-button>
-                      </div>
+                      </div> -->
                       <el-table :data="props.row.packagingMaterialList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
                         <el-table-column label="数量" width="120">
                           <template #default="{ row, $index }">
@@ -47,17 +47,17 @@
                           </template>
                         </el-table-column>
                         <el-table-column label="名称" prop="name" min-width="220" />
-                        <el-table-column label="操作" align="center" fixed="right" width="60">
+                        <!-- <el-table-column label="操作" align="center" fixed="right" width="60">
                           <template #default="{ $index }">
                             <el-button type="danger" @click="clickDeletePackingFittings(props.$index, $index)" text>删除</el-button>
                           </template>
-                        </el-table-column>
+                        </el-table-column> -->
                       </el-table>
                     </el-col>
                     <el-col :span="12">
-                      <div style="margin-bottom: 10px">
+                      <!-- <div style="margin-bottom: 10px">
                         <el-button type="primary" size="small" @click="clickExpressPacking(props)">选择快递包装</el-button>
-                      </div>
+                      </div> -->
                       <el-table :data="props.row.expressPackingList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
                         <el-table-column label="数量" width="120">
                           <template #default="{ row, $index }">
@@ -78,11 +78,11 @@
                           </template>
                         </el-table-column>
                         <el-table-column label="名称" prop="name" min-width="220" />
-                        <el-table-column label="操作" align="center" fixed="right" width="60">
+                        <!-- <el-table-column label="操作" align="center" fixed="right" width="60">
                           <template #default="{ $index }">
                             <el-button type="danger" @click="clickDeleteExpressPacking(props.$index, $index)" text>删除</el-button>
                           </template>
-                        </el-table-column>
+                        </el-table-column> -->
                       </el-table>
                     </el-col>
                   </el-row>

src/views/group/product/management/index.vue

@@ -19,9 +19,15 @@
           props.selectStatus
             ? {}
             : {
-                text: '批量修改',
+                text: '批量修改主材',
                 action: () => batchModification(),
               },
+          props.selectStatus
+            ? {}
+            : {
+                text: '批量修改包材',
+                action: () => batchPackagingModification(),
+              },
           // {
           //   text: '操作日志',
           //   action: () => viewLogs(),
@@ -88,9 +94,13 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="批量修改" v-if="openModification" v-model="openModification" width="96%">
+    <el-dialog title="批量修改主材" v-if="openModification" v-model="openModification" width="96%">
       <Modification :type="0" @clickCancel="clickModificationCancel"></Modification>
     </el-dialog>
+
+    <el-dialog title="批量修改包材" v-if="openPackagingModification" v-model="openPackagingModification" width="96%">
+      <ModificationSubsidiary @clickCancel="clickPackagingModificationCancel"></ModificationSubsidiary>
+    </el-dialog>
   </div>
 </template>
 
@@ -98,6 +108,7 @@
 import byTable from "/src/components/byTable/index";
 import MakeSKU from "/src/components/makeProduct/index";
 import Modification from "/src/components/makeProduct/modification/index";
+import ModificationSubsidiary from "/src/components/makeProduct/modification/subsidiary";
 
 const { proxy } = getCurrentInstance();
 const props = defineProps({
@@ -376,6 +387,16 @@ const clickModificationCancel = (status) => {
     getList();
   }
 };
+const openPackagingModification = ref(false);
+const batchPackagingModification = () => {
+  openPackagingModification.value = true;
+};
+const clickPackagingModificationCancel = (status) => {
+  openPackagingModification.value = false;
+  if (status) {
+    getList();
+  }
+};
 </script>
 
 <style lang="scss" scoped>

src/views/subsidiary/product/management/index.vue

@@ -1,6 +1,12 @@
 <template>
   <div>
     <el-card class="box-card">
+      <!-- :action-list="[
+          {
+            text: '批量修改',
+            action: () => batchModification(),
+          },
+        ]" -->
       <byTable
         :source="sourceList.data"
         :pagination="sourceList.pagination"
@@ -8,12 +14,6 @@
         :loading="loading"
         :searchConfig="searchConfig"
         highlight-current-row
-        :action-list="[
-          {
-            text: '批量修改',
-            action: () => batchModification(),
-          },
-        ]"
         @get-list="getList"
         @clickReset="clickReset">
         <template #typeExpand="{ item }">
@@ -57,7 +57,7 @@
     <el-dialog :title="modalTitle" v-if="openDialog" v-model="openDialog" width="90%">
       <MakeSKU :rowData="rowData" :detailStatus="detailStatus" @clickCancel="clickCancel"></MakeSKU>
     </el-dialog>
-    
+
     <el-dialog title="批量修改" v-if="openModification" v-model="openModification" width="96%">
       <ModificationSubsidiary @clickCancel="clickModificationCancel"></ModificationSubsidiary>
     </el-dialog>