供应商bug

src/utils/request.js

@@ -67,7 +67,7 @@ service.interceptors.request.use(config => {
       const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '数据正在处理，请勿重复提交';
-        console.warn(`[${s_url}]: ` + message)
+        // console.warn(`[${s_url}]: ` + message)
         return Promise.reject(new Error(message))
       } else {
         cache.session.setJSON('sessionObj', requestObj)

src/views/WDLY/basic/product/index.vue

@@ -560,7 +560,7 @@ const formConfig = computed(() => {
       type: "treeSelect",
       prop: "productClassifyId",
       label: "产品分类",
-      data: [],
+      data: treeListData.value,
     },
     {
       type: "select",
@@ -849,7 +849,6 @@ const getTreeList = () => {
     .post("/productClassify/tree", { parentId: "", name: "", definition: "1" })
     .then((message) => {
       treeListData.value = message;
-      formConfig.value[0].data = message;
     });
 };
 const deptList = ref([]);
@@ -1071,5 +1070,4 @@ getDict();
 :deep(.el-date-picker__header .el-date-picker__header-label) {
   display: none;
 }
-
 </style>

src/views/WDLY/basic/supplier/index.vue

@@ -438,7 +438,8 @@ const formConfig = computed(() => {
           label: "账期",
           itemWidth: 33,
           controls: false,
-          precision: 0,
+          precision: 2,
+          min: 0,
           style: {
             width: "100%",
             "margin-right": "10px",
@@ -451,7 +452,8 @@ const formConfig = computed(() => {
           label: "退换货期限",
           itemWidth: 33,
           controls: false,
-          precision: 0,
+          precision: 2,
+          min: 0,
           style: {
             width: "100%",
             "text-align": "left",
@@ -528,21 +530,23 @@ const submitForm = () => {
         id: x.id,
         fileName: x.fileName,
       })) || [];
-    // if (JSON.parse(formData.data.victoriatouristJson).accountPeriod == "") {
-    //   return ElMessage({
-    //     message: "请输入账期！",
-    //     type: "info",
-    //   });
-    // }
-    // if (JSON.parse(formData.data.victoriatouristJson).returnPeriod == "") {
-    //   return ElMessage({
-    //     message: "请输入退换货期限！",
-    //     type: "info",
-    //   });
-    // }
-    // formData.data.victoriatouristJson = JSON.stringify(
-    //   formData.data.victoriatouristJson
-    // );
+    const obj = JSON.parse(formData.data.victoriatouristJson);
+    console.log(obj, "ss");
+    if (obj.accountPeriod === undefined || obj.accountPeriod === "") {
+      formData.data.victoriatouristJson = obj;
+      return ElMessage({
+        message: "请输入账期！",
+        type: "info",
+      });
+    }
+    if (obj.returnPeriod === undefined || obj.returnPeriod === "") {
+      formData.data.victoriatouristJson = obj;
+      return ElMessage({
+        message: "请输入退换货期限！",
+        type: "info",
+      });
+    }
+    formData.data.victoriatouristJson = JSON.stringify(obj);
     submitLoading.value = true;
     proxy.post("/supplierInfo/" + modalType.value, formData.data).then(
       (res) => {
@@ -564,13 +568,10 @@ const submitForm = () => {
 
 const getDtl = (row) => {
   modalType.value = "edit";
-  proxy.post("/supplierInfo/detail", { id: row.id }).then((res) => {
+  proxy.post("/supplierInfo/detailByWdly", { id: row.id }).then((res) => {
     proxy
       .post("/fileInfo/getList", { businessIdList: [row.id] })
       .then((fileObj) => {
-        console.log(fileObj[row.id], "wss");
-        console.log(res, "wss11");
-
         fileList.value = fileObj[row.id] || [];
         fileListCopy.value = [...fileList.value];
         getCityData(res.countryId, "20");

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

@@ -55,6 +55,18 @@
             {{ item.name }}
           </li>
         </ul>
+        <!-- <div style="margin-top: 10px">
+          <el-tree
+            :data="staffMailList"
+            ref="tree"
+            node-key="id"
+            @node-click="treeChange"
+            default-expand-all
+            :props="{
+              label: 'mailUser',
+            }"
+          ></el-tree>
+        </div> -->
       </div>
       <div v-if="activeName === 'second'">b</div>
       <div v-if="activeName === 'third'">c</div>
@@ -71,6 +83,7 @@ let selectMail = ref({});
 let activeName = ref("first");
 let selectFloderId = ref("");
 const mailList = ref([]);
+const staffMailList = ref([]);
 const getMialList = () => {
   proxy.get("/mailService/getUserEmailList").then((res) => {
     mailList.value = res.data;
@@ -82,18 +95,29 @@ const getMialList = () => {
       if (selectMail.value.mailFolderInfoList.length > 0) {
         handleOpenMenu(selectMail.value.mailFolderInfoList[0]);
       }
-      proxy
-        .post("/mailInfo/getUserEmailList", { id: useUserStore().user.userId })
-        .then((res) => {
-          console.log(res, "aa");
-        });
     }
   });
+  proxy
+    .post("/mailInfo/getUserEmailList", { id: useUserStore().user.userId })
+    .then((res) => {
+      staffMailList.value = [
+        {
+          mailUser: "员工邮箱",
+          id: "0",
+          children: res,
+        },
+      ];
+    });
 };
 
 const handleClickMail = (item) => {
+  mailStore.mailMenuList = [];
   selectMail.value = item;
   mailStore.selectMail = item;
+  // 默认打开第一邮箱文件夹
+  if (selectMail.value.mailFolderInfoList.length > 0) {
+    handleOpenMenu(selectMail.value.mailFolderInfoList[0]);
+  }
 };
 
 const handleOpenMenu = (item) => {

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

@@ -19,6 +19,26 @@
       }"
       @get-list="getList"
     >
+      <template #icon="{ item }">
+        <div>
+          <span v-if="item.readStatus == 0">
+            <img
+              src="@/assets/images/mail/message.png"
+              alt=""
+              title="未读"
+              class="messageImg"
+            />
+          </span>
+          <span v-if="item.readStatus == 1">
+            <img
+              src="@/assets/images/mail/message-open.png"
+              alt=""
+              title="已读"
+              class="messageImg"
+            />
+          </span>
+        </div>
+      </template>
     </byTable>
   </div>
 </template>
@@ -41,6 +61,13 @@ const config = computed(() => {
   return [
     {
       attrs: {
+        label: "状态",
+        slot: "icon",
+        width: 70,
+      },
+    },
+    {
+      attrs: {
         label: "发件人",
         prop: "fromPersonalName",
       },
@@ -118,4 +145,9 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
+.messageImg {
+  width: 18px;
+  height: 18px;
+  transform: translateY(5px);
+}
 </style>