1

src/views/WDLY/outInBound/waitOutBound/index.vue

@@ -12,11 +12,11 @@
         </template>
       </byTable>
     </div>
-    <el-dialog title="出库" v-model="dialogVisible" width="800" v-loading="submitLoading" destroy-on-close>
+    <el-dialog title="出库" v-model="dialogVisible" width="1000" v-loading="submitLoading" destroy-on-close>
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="submitType == 4 ?rulesTwo :rulesOne " ref="byform">
         <template #countryId>
-          <div>
-            <el-select v-model="formData.data.countryId" placeholder="国家" @change="(val) => getCityData(val, '20', true)"
+          <div style="width:100%">
+            <el-select v-model="formData.data.countryId" placeholder="国家" style="width:100%" @change="(val) => getCityData(val, '20', true)"
                        :disabled="submitType == 4 ||submitType == 5 ">
               <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id">
               </el-option>
@@ -25,7 +25,7 @@
         </template>
 
         <template #provinceId>
-          <div>
+          <div style="width:100%">
             <selectCity placeholder="省/洲" @change="(val) => getCityData(val, '30', true)" addressId="provinceId" addressName="provinceName"
                         v-model="formData.data" :data="provinceData" :disabled="submitType == 4 ||submitType == 5 ">
             </selectCity>
@@ -33,7 +33,7 @@
         </template>
 
         <template #cityId>
-          <div>
+          <div style="width:100%">
             <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData"
                         :disabled="submitType == 4 ||submitType == 5 ">
             </selectCity>
@@ -177,6 +177,9 @@ let rulesOne = ref({
   type: [
     { required: true, message: "请选择仓库类型", trigger: ["blur", "change"] },
   ],
+  deliveryTime: [
+    { required: true, message: "请选择预计送达时间", trigger: "change" },
+  ],
   warehouseId: [
     { required: true, message: "请选择仓库名称", trigger: "change" },
   ],
@@ -596,6 +599,17 @@ const configData = computed(() => [
       },
     },
     {
+      type: "date",
+      itemType: "datetime",
+      prop: "deliveryTime",
+      label: "预计送达时间",
+      itemWidth: 100,
+      disabled: false,
+      style: {
+        width: "53%",
+      },
+    },
+    {
       type: "select",
       prop: "logisticsCompanyCode",
       label: "物流/快递信息",