wdly待出库新需求

src/router/index.js

@@ -71,7 +71,7 @@ export const constantRoutes = [
       {
         path: '/platform_manage/process/processApproval',
         component: () => import('@/views/process/processApproval/index.vue'),
-        name: 'processApproval',
+        name: 'ProcessApproval',
         meta: { title: '流程审批', icon: 'dashboard', affix: true }
       }
     ]

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

@@ -137,7 +137,7 @@ const typeData = [
     value: "40",
   },
   {
-    label: "待入库手动结束",
+    label: "入库数量差异",
     value: "50",
   },
 ];

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

@@ -82,7 +82,7 @@
         <template #products>
           <div style="width: 100%">
             <el-table :data="formData.data.jdOrderDetailsList">
-              <el-table-column prop="productCode" label="物品编码" />
+              <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <!-- <el-table-column
                 prop="productSpec"
@@ -224,6 +224,8 @@ let rules = ref({
     { 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: [
@@ -409,6 +411,113 @@ const configData = computed(() => [
       },
     },
     {
+      type: "input",
+      prop: "contacts",
+      label: "收件人",
+      itemWidth: 25,
+      placeholder: "收件人",
+      disabled: true,
+    },
+    {
+      type: "input",
+      prop: "phone",
+      label: "联系电话",
+      itemWidth: 60,
+      placeholder: "联系电话",
+      disabled: true,
+      style: {
+        width: "46%",
+      },
+    },
+    {
+      type: "slot",
+      slotName: "countryId",
+      prop: "countryId",
+      label: "收货信息",
+      itemWidth: 33.33,
+    },
+    {
+      type: "slot",
+      slotName: "provinceId",
+      label: " ",
+      itemWidth: 33.33,
+    },
+    {
+      type: "slot",
+      slotName: "cityId",
+      prop: "cityId",
+      label: " ",
+      itemWidth: 33.33,
+    },
+    {
+      type: "input",
+      itemType: "textarea",
+      prop: "areaDetail",
+    },
+    {
+      type: "title",
+      title: "出库明细",
+    },
+    {
+      type: "slot",
+      slotName: "products",
+    },
+  ],
+  [
+    {
+      type: "title",
+      title: "基础信息",
+    },
+    {
+      type: "select",
+      prop: "businessType",
+      label: "数据来源",
+      required: true,
+      disabled: true,
+      itemWidth: 25,
+      data: businessType,
+    },
+    {
+      type: "input",
+      prop: "businessCode",
+      label: "关联单号",
+      required: true,
+      disabled: true,
+      itemWidth: 30,
+    },
+    {
+      type: "select",
+      prop: "warehouseId",
+      label: "仓库名称",
+      itemWidth: 100,
+      data: warehouseList.value,
+      style: {
+        width: "53%",
+      },
+    },
+    {
+      type: "select",
+      prop: "logisticsCompanyCode",
+      label: "物流/快递信息",
+      placeholder: "物流/快递公司",
+      itemWidth: 25,
+      style: {
+        width: "100%",
+      },
+      data: logisticsData.value,
+      filterable: true,
+    },
+    {
+      type: "input",
+      prop: "logisticsCode",
+      label: " ",
+      placeholder: "物流/快递单号",
+      itemWidth: 60,
+      style: {
+        width: "46%",
+      },
+    },
+    {
       type: "slot",
       slotName: "countryId",
       prop: "countryId",
@@ -664,21 +773,40 @@ const outBound = (row) => {
         quantity: undefined,
       }));
       res.businessType = res.businessType + "";
+      if (res.purchaseBackInfo) {
+        res.contacts = res.purchaseBackInfo.contacts
+          ? res.purchaseBackInfo.contacts
+          : "";
+        res.phone = res.purchaseBackInfo.phone
+          ? res.purchaseBackInfo.phone
+          : "";
+        res.countryId = res.purchaseBackInfo.countryId
+          ? res.purchaseBackInfo.countryId
+          : "44";
+        res.provinceId = res.purchaseBackInfo.provinceId
+          ? res.purchaseBackInfo.provinceId
+          : "";
+        res.cityId = res.purchaseBackInfo.cityId
+          ? res.purchaseBackInfo.cityId
+          : "";
+      }
       formData.data = res;
-      formData.data.countryId = "44";
       getCityData(formData.data.countryId, "20");
+      if (res.provinceId) {
+        getCityData(formData.data.provinceId, "30");
+      }
       dialogVisible.value = true;
     });
   } else if (row.businessType == 5) {
     modalType.value = "add";
-    formConfig.value = configData.value[1];
+    formConfig.value = configData.value[2];
     proxy.post("/jdOrder/detail", { id: row.businessId }).then((res) => {
       res.jdOrderDetailsList = res.jdOrderDetailsList.map((x) => ({
         waitQuantity: x.quantity,
         quantity: undefined,
         productId: x.productId,
         id: x.id,
-        productCode: x.productCode,
+        productCustomCode: x.productCustomCode,
         productName: x.productName,
         productSpec: x.productSpec,
       }));
@@ -692,7 +820,7 @@ const outBound = (row) => {
     });
   } else if (row.businessType == 6) {
     modalType.value = "edit";
-    formConfig.value = configData.value[0];
+    formConfig.value = configData.value[1];
     proxy.post("/stockWait/detailByWdly", { id: row.id }).then((res) => {
       res.jdOrderDetailsList = res.stockWaitDetailsList.map((x) => ({
         ...x,

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

@@ -71,7 +71,7 @@
               link
               v-if="item.purchaseStatus == 30 && item.arrivalStatus == 0"
               @click="handleEdit(item, 99)"
-              >终止</el-button
+              >结束</el-button
             > -->
 
             <el-button
@@ -100,7 +100,7 @@
               link
               v-if="item.purchaseStatus != 99"
               @click="handleEdit(item, 99)"
-              >终止</el-button
+              >结束</el-button
             >
           </div>
         </template>
@@ -800,7 +800,7 @@ const statusData = ref([
     value: "30",
   },
   {
-    label: "终止",
+    label: "结束",
     value: "99",
   },
   {
@@ -1265,7 +1265,7 @@ const getDtl = (row) => {
 };
 
 const handleEdit = (row, status) => {
-  let purchaseStatusName = status == 88 ? "作废" : "终止";
+  let purchaseStatusName = status == 88 ? "作废" : "结束";
   const data = { ...row, purchaseStatus: status };
   // 弹窗提示是否删除
   ElMessageBox.confirm(

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

@@ -60,7 +60,7 @@
       </byTable>
     </div>
     <el-dialog
-      :title="modalType == 'add' ? '添加售后记录' : '添加跟进记录'"
+      :title="'付款'"
       v-model="dialogVisible"
       width="800"
       v-loading="submitLoading"
@@ -403,8 +403,8 @@ const selectRow = (data) => {
 };
 
 const handleClose = () => {
-  dialogVisible.value = false;
   selectData.value = [];
+  dialogVisible.value = false;
 };
 
 watch(selectData, (newVal, oldVal) => {