Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/views/wms/basicDataManage/customerManage/customer/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/customerdock/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/customeritem/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/project/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/saleprice/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/businesstype/index.vue

@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/plansetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/switch/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/dock/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue

@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/location/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/process/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/productionline/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/workshop/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/workstation/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/bom/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/itembasic/index.vue

@@ -27,7 +27,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row)"
           @button-base-click="buttonTableClick($event,row)"
         />

src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@@ -38,7 +38,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/packageunit/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase  :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore  :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/labelManage/barbasic/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/labelManage/barcode/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/labelManage/labeltype/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/labelManage/locationLabel/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/orderManage/carrier/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/orderManage/owner/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/orderManage/shift/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/orderManage/team/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/strategySetting/condition/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/strategySetting/configuration/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue

@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/strategySetting/rule/index.vue

@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/subject/mstr/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/subject/qadCostcentre/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/subject/qadProject/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/subject/subjectAccount/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/supplierManage/supplier/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue

@@ -49,7 +49,7 @@
         <Icon :size="16" v-show="row.sunday==1" icon="ep:check" />
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue

@@ -32,7 +32,7 @@
           <span>{{ row.id }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
+      <template #action="{ row, $index }">
         <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
@@ -165,10 +165,12 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:supplier-user:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplier-user:delete'}), // 删除
-]
+const butttondata =(row,$index) => {
+  return [
+      defaultButtons.mainListEditBtn({hasPermi:'wms:supplier-user:update'}), // 编辑
+      defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplier-user:delete' }), // 删除
+  ]
+}
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {

src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/buttMesManage/mesBarCode/index.vue

@@ -40,7 +40,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -674,7 +674,7 @@ export const DeliverRequestMain = useCrudSchemas(
       isDetail: false,
       isForm: false,
       table: {
-        width: 300,
+        width: 250,
         fixed: 'right'
       }
     }

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -36,7 +36,7 @@
       </template>
 
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/index.vue

@@ -36,7 +36,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" 
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" 
                    @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>

src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue

@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue

@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />

src/views/wms/deliversettlementManage/moldAllocation/customerStatementShareRecord/index.vue

@@ -38,7 +38,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row, $index)"
           @button-base-click="buttonTableClick($event, row)"
         />

src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row , $index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue

@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -35,7 +35,7 @@
 
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/index.vue

@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryManage/balance/index.vue

@@ -41,7 +41,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -393,7 +393,16 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
     if (res.list.length > 0) {
       // 判断物料 可采购
       detailListTableColumnsRules.value = cloneDeep(detailListTableColumnsRules)
-      enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' : ''
+      // enableBuyOrenableMake.value = res.list[0].enableBuy == "TRUE" ? 'enableBuy' : res.list[0].enableMake == "TRUE" ? 'enableMake' : ''
+      if (res.list[0].enableBuy == "TRUE") {
+        if (res.list[0].type == 'TOOL') {
+          enableBuyOrenableMake.value = 'enableBuyTool'
+        } else {
+          enableBuyOrenableMake.value = 'enableBuy'
+        }
+      } else if (res.list[0].enableMake == "TRUE") {
+         enableBuyOrenableMake.value = 'enableMake'
+      }
       enableBuy.value = res.list[0].enableBuy
       enableMake.value = res.list[0].enableMake
 
@@ -580,6 +589,7 @@ const footButtonClick = async (val) => {
     labelPointFormRef.value.dialogVisible = false
   }
 }
+// 打印标签
 const pointLabel = async () => {
   // const array =detatableData1.value.map(item=>{
   //   return {
@@ -608,8 +618,9 @@ const pointLabel = async () => {
   await PackageApi.batchPrintingBalanceLableForCreate(obj).then(res => {
     let src =ref('')
     // src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板
-
-     if (enableBuyOrenableMake.value == 'enableBuy') {
+    if (enableBuyOrenableMake.value == 'enableBuyTool') {
+       src.value = BASE_URL + '/jmreport/view/1027757375736582144?token=' + getAccessToken()+'&asn_number='+res//采购标签协定品模板
+    } else  if (enableBuyOrenableMake.value == 'enableBuy') {
       src.value = BASE_URL + '/jmreport/view/1022349139354537984?token=' + getAccessToken()+'&asn_number='+res//采购标签模板
     } else if(enableBuyOrenableMake.value == 'enableMake') {
      src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板

src/views/wms/inventoryManage/container/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryManage/containerinit/containerRepair/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryManage/expectin/index.vue

@@ -36,7 +36,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryManage/expectout/index.vue

@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryManage/package/index.vue

@@ -35,7 +35,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue

@@ -36,7 +36,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="[defaultButtons.mainListPointBtn(null)]" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="[defaultButtons.mainListPointBtn(null)]" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>