请款回显

src/components/process/SendFunds.vue

@@ -5,6 +5,7 @@
       :rules="rules"
       ref="formDom"
       label-position="top"
+      :disabled="props.queryData.accountRequestFundsDetailList ? true : false"
     >
       <div class="_t">基础信息</div>
       <el-row :gutter="10">
@@ -112,12 +113,12 @@
       </el-form-item>
       <div style="margin-bottom: 15px">
         <el-tag
-          style="margin-right: 10px"
+          style="margin-right: 10px; margin-top: 5px"
           class="ml-2"
           type="info"
           v-for="(item, index) in formData.data.fileList"
           :key="index"
-          closable
+          :closable="!route.query.processType"
           @close="handleClose(index)"
           >{{ item.fileName }}</el-tag
         >
@@ -286,7 +287,8 @@
 <script setup>
 import { ElMessage, ElMessageBox } from "element-plus";
 import useUserStore from "@/store/modules/user";
-
+import { useRouter, useRoute } from "vue-router";
+const route = useRoute();
 const { proxy } = getCurrentInstance();
 
 let formData = reactive({
@@ -356,6 +358,17 @@ const tenantId = userInfo.tenantId;
 onMounted(() => {
   formData.data.paymentTime = proxy.parseTime(new Date());
   getDictData();
+  // if (route.query.processType) {
+  //   console.log(route.query.processType, props.queryData, "adada");
+  // }
+  setTimeout(() => {
+    if (
+      props.queryData &&
+      (route.query.processType == 10 || route.query.processType == 20)
+    ) {
+      formData.data = props.queryData;
+    }
+  }, 2000);
 });
 const companyData = ref([]);
 const accountData = ref([]);

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

@@ -356,6 +356,7 @@ const configData = computed(() => [
         width: "100%",
       },
       data: logisticsData.value,
+      filterable: true,
     },
     {
       type: "input",
@@ -419,6 +420,7 @@ const configData = computed(() => [
         width: "100%",
       },
       data: logisticsData.value,
+      filterable: true,
     },
     {
       type: "input",

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

@@ -906,7 +906,7 @@ let formConfigTwo = computed(() => [
   },
   {
     type: "title",
-    title: "收获信息",
+    title: "收货信息",
   },
   {
     type: "input",
@@ -1072,19 +1072,19 @@ const submitForm = () => {
           type: "info",
         });
       }
-      for (let i = 0; i < list.length; i++) {
-        const e = list[i];
-        if (
-          Number(e.alreadyDeliverGoodsQuantity) +
-            Number(e.deliverGoodsQuantity) >
-          Number(e.count)
-        ) {
-          return ElMessage({
-            message: `本次发货加累计发货不可大于采购数量！`,
-            type: "info",
-          });
-        }
-      }
+      // for (let i = 0; i < list.length; i++) {
+      //   const e = list[i];
+      //   if (
+      //     Number(e.alreadyDeliverGoodsQuantity) +
+      //       Number(e.deliverGoodsQuantity) >
+      //     Number(e.count)
+      //   ) {
+      //     return ElMessage({
+      //       message: `本次发货加累计发货不可大于采购数量！`,
+      //       type: "info",
+      //     });
+      //   }
+      // }
       submitLoading.value = true;
       formData.data.deliverGoodsDetailsList = list.map((x) => ({
         purchaseDetailId: x.purchaseDetailId,

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

@@ -181,18 +181,44 @@ let rules = ref({
   ],
 });
 const { proxy } = getCurrentInstance();
-const afterSalesType = ref([]);
-const afterSalesStatus = ref([]);
+const arrivalStatus = ref([
+  {
+    label: "未到货",
+    value: "0",
+  },
+  {
+    label: "部分到货",
+    value: "10",
+  },
+  {
+    label: "已到货",
+    value: "20",
+  },
+]);
+const paymentStatus = ref([
+  {
+    label: "未付款",
+    value: "0",
+  },
+  {
+    label: "部分付款",
+    value: "10",
+  },
+  {
+    label: "已付款",
+    value: "20",
+  },
+]);
 const selectConfig = computed(() => [
   {
     label: "到货状态",
     prop: "type",
-    data: afterSalesType.value,
+    data: arrivalStatus.value,
   },
   {
     label: "付款状态",
     prop: "status",
-    data: afterSalesStatus.value,
+    data: paymentStatus.value,
   },
 ]);
 const config = computed(() => {

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

@@ -1,6 +1,7 @@
 <template>
   <div v-loading="loading" class="box">
     <div class="top">
+      <!-- <div class="top-row"></div> -->
       <div class="top-row">
         <div class="label">发 件 人：</div>
         <div class="value">
@@ -79,7 +80,8 @@ const getDetails = () => {
   loading.value = true;
   proxy
     .post("/mailService/getMessageDetail", {
-      ...mailStore.currentMenu,
+      type: mailStore.currentMenu.type,
+      messageId: mailStore.currentMenu.messageId,
     })
     .then((res) => {
       detailsData.data = res;

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

@@ -21,7 +21,7 @@
     >
       <template #icon="{ item }">
         <div>
-          <span v-if="item.readStatus == 0">
+          <span v-if="!item.flags.includes('6')">
             <img
               src="@/assets/images/mail/message.png"
               alt=""
@@ -29,7 +29,15 @@
               class="messageImg"
             />
           </span>
-          <span v-if="item.readStatus == 1">
+          <span v-if="item.flags.includes('6') && item.flags.includes('1')">
+            <img
+              src="@/assets/images/mail/replied.png"
+              alt=""
+              title="已回复"
+              class="messageImg"
+            />
+          </span>
+          <span v-if="item.flags.includes('6')">
             <img
               src="@/assets/images/mail/message-open.png"
               alt=""

src/views/connect/E-mail/mail/com/right/contract/pi.vue

@@ -50,13 +50,13 @@
         width="80"
         :formatter="getStatus"
       />
-      <el-table-column label="操作" width="60" fixed="right" align="center">
+      <!-- <el-table-column label="操作" width="60" fixed="right" align="center">
         <template #default="{ row }">
           <el-button type="primary" text
             ><i class="iconfont icon-iconm_wofqd"></i
           ></el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <el-pagination
       style="margin-top: 10px"

src/views/connect/E-mail/mail/com/right/contract/quotation.vue

@@ -50,13 +50,13 @@
         width="80"
         :formatter="getStatus"
       />
-      <el-table-column label="操作" width="60" fixed="right" align="center">
+      <!-- <el-table-column label="操作" width="60" fixed="right" align="center">
         <template #default="{ row }">
           <el-button type="primary" text
             ><i class="iconfont icon-iconm_wofqd"></i
           ></el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <el-pagination
       style="margin-top: 10px"

src/views/connect/E-mail/mail/com/right/documents/index.vue

@@ -33,13 +33,13 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="60" fixed="right" align="center">
+      <!-- <el-table-column label="操作" width="60" fixed="right" align="center">
         <template #default="{ row }">
           <el-button type="primary" text
             ><i class="iconfont icon-iconm_wofqd"></i
           ></el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <el-pagination
       style="margin-top: 10px"

src/views/connect/E-mail/mail/com/right/netdisk/enterprise.vue

@@ -36,7 +36,7 @@
         >
           <el-table-column prop="name" label="文件名" width="115" />
           <el-table-column prop="createTime" label="上传时间" width="140" />
-          <el-table-column
+          <!-- <el-table-column
             label="操作"
             width="60"
             fixed="right"
@@ -48,7 +48,7 @@
                 ><i class="iconfont icon-iconm_wofqd"></i
               ></el-button>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
 
         <el-pagination

src/views/connect/E-mail/mail/com/right/purchase/index.vue

@@ -47,13 +47,13 @@
         width="100"
         :formatter="getStatus"
       />
-      <el-table-column label="操作" width="60" fixed="right" align="center">
+      <!-- <el-table-column label="操作" width="60" fixed="right" align="center">
         <template #default="{ row }">
           <el-button type="primary" text
             ><i class="iconfont icon-iconm_wofqd"></i
           ></el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <el-pagination

src/views/connect/E-mail/mail/index.vue

@@ -87,7 +87,7 @@ onMounted(() => {
   // border-radius: 5px;
   border-top-left-radius: 5px;
   border-bottom-left-radius: 5px;
-  z-index: 2000;
+  z-index: 1000;
   position: fixed;
   margin-top: 100px;
   top: 0;

src/views/process/processApproval/index.vue

@@ -459,7 +459,6 @@ onMounted(() => {
   //processType 10 为修改 20为查看
   if (route.query.processType == 10 || route.query.processType == 20) {
     proxy.post("/flowProcess/getStartData", { flowId: route.query.id }).then((res) => {
-      console.log(res, "adawwww");
       queryData.data = { ...res };
     });
   } else {

vite.config.js

@@ -1,11 +1,19 @@
-import { defineConfig, loadEnv } from 'vite'
+import {
+  defineConfig,
+  loadEnv
+} from 'vite'
 import path from 'path'
 import createVitePlugins from './vite/plugins'
 
 // https://vitejs.dev/config/
-export default defineConfig(({ mode, command }) => {
+export default defineConfig(({
+  mode,
+  command
+}) => {
   const env = loadEnv(mode, process.cwd())
-  const { VITE_APP_ENV } = env
+  const {
+    VITE_APP_ENV
+  } = env
   return {
     // 部署生产环境和开发环境下的URL。
     // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
@@ -32,6 +40,7 @@ export default defineConfig(({ mode, command }) => {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
           target: 'http://36.134.91.96:9898/test-api',
+          // target:"http://139.159.251.109/prod-api",
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }
@@ -40,19 +49,17 @@ export default defineConfig(({ mode, command }) => {
     //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
     css: {
       postcss: {
-        plugins: [
-          {
-            postcssPlugin: 'internal:charset-removal',
-            AtRule: {
-              charset: (atRule) => {
-                if (atRule.name === 'charset') {
-                  atRule.remove();
-                }
+        plugins: [{
+          postcssPlugin: 'internal:charset-removal',
+          AtRule: {
+            charset: (atRule) => {
+              if (atRule.name === 'charset') {
+                atRule.remove();
               }
             }
           }
-        ]
+        }]
       }
     }
   }
-})
+})