Merge branch 'master' of http://36.137.93.232:3000/hf/byte-sailing-new

src/components/process/SendFunds.vue

@@ -99,7 +99,7 @@
       </el-form-item>
       <el-form-item label="上传附件">
         <el-upload
-          v-model="fileList"
+          v-model="formData.data.fileList"
           :show-file-list="false"
           class="upload-demo"
           action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
@@ -115,7 +115,7 @@
           style="margin-right: 10px"
           class="ml-2"
           type="info"
-          v-for="(item, index) in fileList"
+          v-for="(item, index) in formData.data.fileList"
           :key="index"
           closable
           @close="handleClose(index)"
@@ -293,6 +293,7 @@ let formData = reactive({
   data: {
     paymentTime: "",
     accountRequestFundsDetailList: [],
+    fileList: [],
   },
 });
 let rules = ref({
@@ -467,11 +468,10 @@ const handleChangeAmount = () => {
 };
 // 上传附件
 const uploadData = ref({});
-const fileList = ref([]);
 const handleBeforeUpload = async (file) => {
   const res = await proxy.post("/fileInfo/getSing", { fileName: file.name });
   uploadData.value = res.uploadBody;
-  fileList.value.push({
+  formData.data.fileList.push({
     id: res.id,
     fileName: res.fileName,
     path: res.fileUrl,
@@ -480,7 +480,7 @@ const handleBeforeUpload = async (file) => {
   });
 };
 const handleClose = (index) => {
-  fileList.value.splice(index, 1);
+  formData.data.fileList.splice(index, 1);
 };
 // 向父组件暴露
 defineExpose({

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

@@ -34,6 +34,37 @@
         :rules="rules"
         ref="byform"
       >
+        <template #detail>
+          <div style="width">
+            <el-table :data="formData.data.qualityDetailList">
+              <el-table-column prop="productCode" label="货品编码" />
+              <el-table-column prop="productName" label="货品名称" />
+              <el-table-column prop="productSpec" label="采购数量" />
+              <el-table-column prop="productUnit" label="本次发货" />
+              <el-table-column prop="count" label="已入库" />
+              <el-table-column
+                prop="qualifiedCount"
+                label="本次入库"
+                min-width="150"
+              >
+                <template #default="{ row, $index }">
+                  <el-form-item
+                    :prop="'qualityDetailList.' + $index + '.qualifiedCount'"
+                    :rules="rules.qualifiedCount"
+                    :inline-message="true"
+                  >
+                    <el-input-number
+                      v-model="row.qualifiedCount"
+                      :precision="4"
+                      :controls="false"
+                      :min="0"
+                    />
+                  </el-form-item>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
@@ -186,34 +217,38 @@ const formConfig = reactive([
   {
     type: "select",
     prop: "type",
-    label: "仓库类型",
+    label: "入库类型",
     required: true,
+    itemWidth: 100,
     data: [],
   },
   {
-    type: "input",
+    type: "select",
     prop: "name",
     label: "仓库名称",
-  },
-  {
-    type: "select",
-    prop: "keeperId",
-    label: "仓管员",
+    itemWidth: 33,
     isLoad: {
-      url: `/tenantUser/list?pageNum=1&pageSize=9999&tenantId=${
-        useUserStore().user.tenantId
-      }`,
-      labelKey: "nickName",
-      labelVal: "userId",
-      method: "get",
+      url: "/warehouse/page",
+      req: {
+        pageNum: 1,
+        pageSize: 9999,
+      },
+      labelKey: "name",
+      labelVal: "id",
+      method: "post",
       resUrl: "rows",
     },
   },
   {
     type: "input",
-    itemType: "textarea",
     prop: "remark",
-    label: "备注",
+    label: "物流信息",
+    itemWidth: 33,
+  },
+  {
+    type: "slot",
+    slotName: "detail",
+    label: "入库明细",
   },
 ]);
 const getList = async (req) => {

src/views/connect/E-mail/mail/com/left.vue

@@ -96,10 +96,12 @@ const handleOpenMenu = (item) => {
     folderId: item.id,
     id: "floder" + "," + item.id,
   };
+  // 如没有这个菜单则push
   const menuItem = mailStore.mailMenuList.find((x) => x.id === menu.id);
   if (menuItem === undefined) {
     mailStore.mailMenuList.push(menu);
   }
+  // 更新当前选择的tab数据和tab的Id值
   mailStore.currentMenu = menu;
   mailStore.currentId = menu.id;
 };

src/views/connect/E-mail/mail/com/main.vue

@@ -37,7 +37,7 @@ import mailWrite from "./mailWrite.vue";
 
 import useMailStore from "@/store/modules/mail";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { nextTick } from "vue";
+import { nextTick, watch } from "vue";
 
 const mailStore = useMailStore();
 const { proxy } = getCurrentInstance();
@@ -47,17 +47,6 @@ let activeMenu = ref("");
 mailStore.$subscribe((mutations, state) => {
   activeMenu.value = state.currentId;
   menuList.value = state.mailMenuList;
-  // 判断是文件夹还是邮件详情
-  const currentMenu = state.currentMenu;
-  let type = "";
-  if (currentMenu.id.includes("floder")) {
-    type = "floder";
-  } else if (currentMenu.id.includes("detail")) {
-    type = "detail";
-  } else {
-    type = "write";
-  }
-  checkType(currentMenu, type);
 });
 
 const handleTabRemove = (id) => {
@@ -89,23 +78,27 @@ const checkType = (menu, type) => {
   const index = menuList.value.findIndex((x) => x.id === activeMenu.value);
   const dom = type + index.toString();
   nextTick(() => {
-    console.log(dom, "wss");
     proxy.$refs[dom][0].initFn();
   });
 };
 
-// const handleTabChange = () => {
-//   // 判断是文件夹还是邮件详情
-//   let type = "";
-//   if (activeMenu.value.id.includes("floder")) {
-//     type = "floder";
-//   } else if (activeMenu.value.id.includes("detail")) {
-//     type = "detail";
-//   } else {
-//     type = "write";
-//   }
-//   checkType(currentMenu, type);
-// };
+const handleTabChange = (val) => {
+  const currentMenu = menuList.value.find((x) => x.id === val);
+  mailStore.$patch({
+    currentId: val,
+    currentMenu: currentMenu,
+  });
+  // 判断是文件夹还是邮件详情
+  let type = "";
+  if (currentMenu.id.includes("floder")) {
+    type = "floder";
+  } else if (currentMenu.id.includes("detail")) {
+    type = "detail";
+  } else {
+    type = "write";
+  }
+  checkType(currentMenu, type);
+};
 
 onMounted(() => {});
 </script>

src/views/finance/fundManage/funds/index.vue

@@ -253,7 +253,13 @@ const config = computed(() => {
         prop: "status",
       },
       render(status) {
-        return proxy.dictDataEcho(status, fundsPaymentMethod.value);
+        return status == 10
+          ? "审批中"
+          : status == 20
+          ? "驳回"
+          : status == 30
+          ? "已通过"
+          : "";
       },
     },
     {
@@ -275,8 +281,8 @@ const config = computed(() => {
         return [
           {
             attrs: {
-              label: "作废",
-              type: "danger",
+              label: "打印",
+              type: "primary",
               text: true,
             },
             el: "button",
@@ -342,7 +348,7 @@ const openModal = () => {
   proxy.$router.replace({
     path: "/platform_manage/process/processApproval",
     query: {
-      isSubscribe: "30",
+      flowKey: "account_request_funds_flow",
     },
   });
 };

src/views/process/processApproval/index.vue

@@ -14,7 +14,7 @@
         ></SendPurchase>
         <SendFunds
           ref="makeDom"
-          v-else-if="flowForm.flowKey == '30'"
+          v-else-if="flowForm.flowKey == 'account_request_funds_flow'"
           :queryData="queryData.data"
         ></SendFunds>
         <ReturnGood
@@ -171,7 +171,7 @@ const handleSubmit = async () => {
               price: x.price,
               amount: x.amount,
             }));
-          } else if (flowForm.flowKey == "30") {
+          } else if (flowForm.flowKey == "account_request_funds_flow") {
           } else if (flowForm.flowKey == "40") {
           }
           proxy
@@ -203,7 +203,7 @@ const skipPage = () => {
     router.replace({
       path: "/purchaseManage/purchaseManage/purchase",
     });
-  } else if (flowForm.flowKey == "30") {
+  } else if (flowForm.flowKey == "account_request_funds_flow") {
     router.replace({
       path: "/finance/fundManage/funds",
     });