Browse Source

邮箱样式隐藏

cz 1 year ago
parent
commit
6dffa02cb0

+ 16 - 14
src/views/connect/E-mail/mail/com/mailList.vue

@@ -4,7 +4,7 @@
       <el-icon @click="handleRefresh" style="cursor: pointer">
         <Refresh />
       </el-icon>
-      <div class="vertical-line"></div>
+      <!-- <div class="vertical-line"></div>
       <div>
         <el-checkbox
           v-model="isCheckAll"
@@ -49,7 +49,7 @@
       />
       <el-button @click="handleMove" :disabled="selectData.length === 0"
         >删除</el-button
-      >
+      > -->
     </div>
     <div style="padding: 10px 15px; width: 100%">
       <el-table
@@ -59,7 +59,7 @@
         @selection-change="handleSelectionChange"
         v-loading="loading"
       >
-        <el-table-column label=" " width="40" align="center">
+        <!-- <el-table-column label=" " width="40" align="center">
           <template #default="{ row, $index }">
             <div>
               <el-checkbox
@@ -70,7 +70,7 @@
               />
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="状态" width="70">
           <template #default="{ row, $index }">
             <div style="cursor: pointer" @click="handleRowClick(row, $index)">
@@ -343,17 +343,19 @@ const getOtherData = () => {
       });
   }, 1000);
 
-  proxy
-    .post("/myTag/page", {
-      pageNum: 1,
-      pageSize: 9999,
-      id: useUserStore().user.userId,
-    })
-    .then((res) => {
-      tagData.value = res.rows;
-    });
+  setTimeout(() => {
+    proxy
+      .post("/myTag/page", {
+        pageNum: 1,
+        pageSize: 9999,
+        id: useUserStore().user.userId,
+      })
+      .then((res) => {
+        tagData.value = res.rows;
+      });
+  }, 1000);
 };
-getOtherData();
+// getOtherData();
 const isCheckAll = ref(false);
 const selectTag = ref("");
 const selectFolder = ref("");

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

@@ -36,7 +36,16 @@
       v-loading="loading"
       :height="tableHeight"
     >
-      <el-table-column prop="code" label="单号" width="115" fixed="left" />
+      <el-table-column prop="code" label="单号" width="130" fixed="left">
+        <template #default="{ row }">
+          <div
+            style="cursor: pointer; color: #409eff"
+            @click="handleClickContractCode(row)"
+          >
+            {{ row.code }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column prop="createTime" label="日期" width="140" />
       <el-table-column prop="buyContactName" label="客户" min-width="150" />
       <el-table-column prop="amount" label="报价" width="100">
@@ -135,6 +144,7 @@ const handleCurrentChange = (val) => {
 
 getData();
 onMounted(() => {});
+
 const handleMakeNew = () => {
   proxy.$router.replace({
     path: "/platform_manage/process/processApproval",
@@ -145,6 +155,15 @@ const handleMakeNew = () => {
     },
   });
 };
+
+const handleClickContractCode = (row) => {
+  proxy.$router.push({
+    path: "/ERP/saleContract/contract",
+    query: {
+      code: row.code,
+    },
+  });
+};
 </script>
   
 <style lang="scss" scoped>

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

@@ -36,7 +36,16 @@
       v-loading="loading"
       :height="tableHeight"
     >
-      <el-table-column prop="code" label="单号" width="115" fixed="left" />
+      <el-table-column prop="code" label="单号" width="130" fixed="left">
+        <template #default="{ row }">
+          <div
+            style="cursor: pointer; color: #409eff"
+            @click="handleClickContractCode(row)"
+          >
+            {{ row.code }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column prop="createTime" label="日期" width="140" />
       <el-table-column prop="buyContactName" label="客户" min-width="150" />
       <el-table-column prop="amount" label="报价" width="100">
@@ -146,6 +155,14 @@ const handleMakeNew = () => {
     },
   });
 };
+const handleClickContractCode = (row) => {
+  proxy.$router.push({
+    path: "/ERP/saleContract/priceSheet",
+    query: {
+      code: row.code,
+    },
+  });
+};
 </script>
   
 <style lang="scss" scoped>

+ 1 - 0
src/views/production/project/bom/index.vue

@@ -36,6 +36,7 @@
       v-model="dialogVisible"
       width="800"
       v-loading="loading"
+      destroy-on-close
     >
       <byForm
         :formConfig="formConfig"

+ 4 - 1
src/views/purchaseSales/outAndInWarehouse/waitingForDelivery/index.vue

@@ -244,7 +244,10 @@ const getList = async (req) => {
   proxy
     .post("/stockWaitDetails/page", sourceList.value.pagination)
     .then((res) => {
-      sourceList.value.data = res.rows;
+      sourceList.value.data = res.rows.map((x) => ({
+        ...x,
+        quantity: x.quantity - x.receiptQuantity,
+      }));
       sourceList.value.pagination.total = res.total;
       setTimeout(() => {
         loading.value = false;

+ 4 - 1
src/views/purchaseSales/outAndInWarehouse/waitingForStorage/index.vue

@@ -240,7 +240,10 @@ const getList = async (req) => {
   proxy
     .post("/stockWaitDetails/page", sourceList.value.pagination)
     .then((res) => {
-      sourceList.value.data = res.rows;
+      sourceList.value.data = res.rows.map((x) => ({
+        ...x,
+        quantity: x.quantity - x.receiptQuantity,
+      }));
       sourceList.value.pagination.total = res.total;
       setTimeout(() => {
         loading.value = false;

+ 4 - 0
src/views/salesMange/saleContract/contract/index.vue

@@ -237,6 +237,7 @@ import { computed, ref } from "vue";
 import byTable from "@/components/byTable/index";
 import useUserStore from "@/store/modules/user";
 import { ElMessage, ElMessageBox } from "element-plus";
+const route = useRoute();
 
 const { proxy } = getCurrentInstance();
 const contractType = ref([]);
@@ -632,6 +633,9 @@ const getList = async (req) => {
   });
 };
 getDict();
+if(route.query.code){
+    sourceList.value.pagination.keyword=route.query.code
+}
 getList();
 const newContract = () => {
   proxy.$router.replace({

+ 4 - 0
src/views/salesMange/saleContract/priceSheet/index.vue

@@ -227,6 +227,7 @@ import { computed, ref } from "vue";
 import byTable from "@/components/byTable/index";
 import moment from "moment";
 import useUserStore from "@/store/modules/user";
+const route = useRoute();
 
 const { proxy } = getCurrentInstance();
 const accountList = ref([]);
@@ -498,6 +499,9 @@ const getList = async (req) => {
   });
 };
 getDict();
+if(route.query.code){
+    sourceList.value.pagination.keyword=route.query.code
+}
 getList();
 const newPriceSheet = () => {
   proxy.$router.replace({