WMS、SCP中所有弹出页最大化后，宽度和高度都要展示到显示器的最大宽度和高度

5 months ago · 050e600b64
15 changed files with 28 additions and 33 deletions
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue
@ -1,7 +1,7 @@
 <!-- 到货验货任务拆分策略弹出层 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <!-- 规则 -->
      <el-form
        ref="formRef"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue
@ -1,7 +1,7 @@
 <!-- 批次策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="800px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <el-form
        ref="formRef"
        :model="formData"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@ -1,7 +1,7 @@
 <!-- 下架策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <el-form
        ref="formRef"
        :model="formData"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue
@ -1,8 +1,8 @@

 <!-- 检验策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px" >
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <el-form
        ref="formRef"
        :model="formData"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
@ -1,7 +1,7 @@
 <!-- 管理精度策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <el-form
        ref="formRef"
        :model="formData"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
@ -1,8 +1,8 @@

 <!-- 采购收货任务拆分策略弹出层 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <!-- 规则 -->
      <el-form
        ref="formRef"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
@ -1,7 +1,7 @@
 <!-- 补料策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <el-form
        ref="formRef"
        :model="formData"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
@ -1,7 +1,7 @@
 <!-- 存储容量策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <el-form
        ref="formRef"
        :model="formData"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@ -1,8 +1,8 @@

 <!-- 采购计划策略弹出层 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <el-form
        ref="formRef"
        :model="formData"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@ -1,7 +1,7 @@
 <!-- 上架策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <el-form
        ref="formRef"
        :model="formData"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue
@ -1,7 +1,7 @@
 <!-- 器具容量策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <el-form
        ref="formRef"
        :model="formData"
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
@ -1,7 +1,7 @@
 <!-- 库位存储策略弹窗弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
-    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
+    <div class="p-20px m--10px" style="max-height: 80vh; overflow-y: auto">
      <el-form
        ref="formRef"
        :model="formData"
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@ -127,7 +127,7 @@
    :isShowFooterButtton="false"
  />
  <!-- 标签打印 -->
-  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
+  <SearchTable width="905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
  <el-dialog
      v-model="showQualityReport"
      :title="t('质检明细')"
@ -459,7 +459,7 @@ const labelPrint = async (row) => {
  tableObject.loading = false
  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
  tableColumns.forEach((item) => {
-    item.width = item.table?.width || 150
+    item.width = item.table?.width
  })
  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
 }
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@ -154,7 +154,7 @@
  </BasicForm>

  <!-- 标签打印 -->
-  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
+  <SearchTable width="905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" >
    <!-- <template #actions>
      <el-button type="primary" @click="printAllClick">打印全部</el-button>
    </template> -->
@ -894,7 +894,7 @@ const labelPrint = async (row) => {
  tableObject.loading = false
  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
  tableColumns.forEach((item) => {
-    item.width = item.table?.width || 150
+    item.width = item.table?.width
  })
  searchTableRef.value.openData(t('ts.标签信息'),tableObjectPrint,{tableColumns},true)
 }
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@ -1694,7 +1694,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
    sort: 'custom',
    isSearch: true,
    table: {
-      width: 180,
      fixed: 'left'
    },
  },
@ -1704,7 +1703,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
    sort: 'custom',
    isSearch: true,
    table: {
-      width: 150,
    },
  },
 {
@ -1713,7 +1711,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
    sort: 'custom',
    isSearch: true,
    table: {
-      width: 150,
    },
  },
  {
@ -1721,7 +1718,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
    field: 'qty',
    sort: 'custom',
    table: {
-      width: 150,
    },
  },
  {
@ -1734,7 +1730,6 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
      component: 'SelectV2'
    },
    table: {
-      width: 150,
    },
  },