异常管理跟进记录新增处理方式字段，待出库必填字段更改

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

@@ -71,6 +71,10 @@
                   <span>（{{ activity.status ? "已完成" : "处理中" }}）</span>
                 </div>
                 <div style="margin-top: 5px">
+                  处理方式：
+                  {{ dictValueLabel(activity.processing, handleMethon) }}
+                </div>
+                <div style="margin-top: 5px">
                   跟进记录： {{ activity.explain }}
                 </div>
               </el-timeline-item>
@@ -500,11 +504,11 @@ const getDtl = (row) => {
 const handleMethon = ref([]);
 const getDict = () => {
   proxy.getDictOne(["handle_methon"]).then((res) => {
-    handleMethon.value = res["handle_methon"];
-    formConfigData[0][9].data = handleMethon.value.map((x) => ({
+    handleMethon.value = res["handle_methon"].map((x) => ({
       label: x.dictValue,
       value: x.dictKey,
     }));
+    formConfigData[0][9].data = handleMethon.value;
   });
 };
 getDict();

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

@@ -32,7 +32,7 @@
         :formConfig="formConfig"
         :formOption="formOption"
         v-model="formData.data"
-        :rules="submitType == 5 ? rulesOne : rules"
+        :rules="submitType == 5 ? rulesOne : submitType == 4 ? rulesTwo : rules"
         ref="byform"
       >
         <template #countryId>
@@ -230,6 +230,30 @@ let rules = ref({
   contacts: [{ required: true, message: "请输入收件人", trigger: "blur" }],
   phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
 });
+let rulesTwo = ref({
+  type: [
+    { required: true, message: "请选择仓库类型", trigger: ["blur", "change"] },
+  ],
+  warehouseId: [
+    { required: true, message: "请选择仓库名称", trigger: "change" },
+  ],
+  outWarehouseId: [
+    { required: true, message: "请选择调出仓库", trigger: "change" },
+  ],
+  inWarehouseId: [
+    { required: true, message: "请选择调入仓库", trigger: "change" },
+  ],
+  quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
+  logisticsCompanyCode: [
+    { required: true, message: "请选择物流/快递公司", trigger: "change" },
+  ],
+  logisticsCode: [
+    { required: true, message: "请输入物流/快递单号", trigger: "blur" },
+  ],
+  // countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  // contacts: [{ required: true, message: "请输入收件人", trigger: "blur" }],
+  // phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+});
 let rulesOne = ref({
   type: [
     { required: true, message: "请选择仓库类型", trigger: ["blur", "change"] },

src/views/WDLY/purchaseManage/payment/index.vue

@@ -65,6 +65,7 @@
       width="800"
       v-loading="submitLoading"
       destroy-on-close
+      :before-close="handleClose"
     >
       <byForm
         :formConfig="formConfig"