电子邮箱

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

@@ -351,6 +351,7 @@ const submitForm = () => {
           type: "info",
         });
       }
+      delete e.id
     }
     submitLoading.value = true;
     proxy.post("/qualityInfo/" + modalType.value, formData.data).then(

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

@@ -1,9 +1,49 @@
 <template>
-  <div>aa</div>
+  <div style="height: calc(100vh - 50px - 50px - 10px - 30px)">
+    <el-radio-group v-model="headRadio" size="mini">
+      <el-radio-button label="1">合同制作</el-radio-button>
+      <el-radio-button label="2">单证</el-radio-button>
+      <el-radio-button label="3">采购合同</el-radio-button>
+      <el-radio-button label="4">网盘资料</el-radio-button>
+    </el-radio-group>
+    <div v-show="headRadio === '1'">
+      <Contract></Contract>
+    </div>
+    <div v-show="headRadio === '2'">
+      <Documents></Documents>
+    </div>
+    <div v-show="headRadio === '3'">
+      <Purchase></Purchase>
+    </div>
+    <div v-show="headRadio === '4'">d</div>
+  </div>
 </template>
 
 <script setup>
-</script>
+import Contract from "./right/contract/index.vue";
+import Documents from "./right/documents/index.vue";
+import Purchase from "./right/purchase/index.vue";
 
+const headRadio = ref("");
+onMounted(() => {
+  headRadio.value = "1";
+});
+</script>
 <style lang="scss" scoped>
-</style>
+* {
+  font-size: 12px;
+}
+:deep(.el-radio-button__inner) {
+  font-size: 12px;
+  padding: 6px 10px;
+}
+:deep(.el-tabs__item) {
+  font-size: 12px;
+  line-height: 30px;
+  height: 30px;
+  font-weight: normal;
+}
+:deep(.el-tabs__header) {
+  margin: 10px 0;
+}
+</style>

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

@@ -0,0 +1,20 @@
+<template>
+  <div>
+    <el-tabs v-model="contractName" style="font-size: 12px">
+      <el-tab-pane label="报价单" name="1">
+        <Quotation> </Quotation>
+      </el-tab-pane>
+      <el-tab-pane label="PI" name="2"> <Pi></Pi> </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script setup>
+import Quotation from "./quotation";
+import Pi from "./pi";
+const contractName = ref("");
+contractName.value = "1";
+</script>
+
+<style lang="scss" scoped>
+</style>

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

@@ -0,0 +1,164 @@
+<template>
+  <div>
+    <el-button type="primary" size="mini" class="btn" @click="handleMakeNew"
+      >制作合同</el-button
+    >
+    <div style="margin: 10px 0; display: flex; align-items: center">
+      <el-input
+        class="input_content"
+        placeholder="请输入内容"
+        v-model="sourceList.pagination.keyword"
+        style="width: 50%"
+        clearable
+        size="small"
+      ></el-input>
+      <el-select
+        v-model="sourceList.pagination.status"
+        clearable
+        filterable
+        style="width: 40%; margin-left: 10px"
+        size="small"
+      >
+        <el-option
+          v-for="(item, index) in statusData"
+          :key="index"
+          :value="item.value"
+          :label="item.label"
+        ></el-option>
+      </el-select>
+      <div style="text-align: center; width: 10%">
+        <el-icon style="cursor: pointer" @click="getData"><Search /></el-icon>
+      </div>
+    </div>
+    <el-table
+      :data="sourceList.data"
+      style="width: 100%; margin-top: 10px"
+      v-loading="loading"
+      height="390"
+    >
+      <el-table-column prop="code" label="单号" width="115" fixed="left" />
+      <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">
+        <template #default="{ row }">
+          <div>{{ row.currency }} {{ moneyFormat(row.amount, 2) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="状态"
+        width="80"
+        :formatter="getStatus"
+      />
+      <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>
+    <el-pagination
+      style="margin-top: 10px"
+      v-model:current-page="sourceList.pagination.pageNum"
+      :page-size="10"
+      layout="total, prev, pager, next"
+      :total="sourceList.pagination.total"
+      prev-text="上一页"
+      next-text="下一页"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+  
+<script setup>
+const loading = ref(false);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 300,
+    pageNum: 1,
+    pageSize: 10,
+  },
+});
+const statusData = [
+  {
+    label: "草稿",
+    value: 0,
+  },
+  {
+    label: "审批中",
+    value: 10,
+  },
+  {
+    label: "驳回",
+    value: 20,
+  },
+  {
+    label: "通过",
+    value: 30,
+  },
+  {
+    label: "终止",
+    value: 99,
+  },
+];
+const { proxy } = getCurrentInstance();
+const getStatus = (row) => {
+  const current = statusData.find((x) => x.value == row.status);
+  if (current) return current.label;
+};
+
+const getData = () => {
+  loading.value = true;
+  proxy.post("/contract/page", sourceList.value.pagination).then((res) => {
+    sourceList.value.data = res.rows;
+    sourceList.value.pagination.total = res.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
+};
+
+const handleCurrentChange = (val) => {
+  sourceList.value.pagination.pageNum = val;
+  getData();
+};
+
+getData();
+onMounted(() => {});
+const handleMakeNew = () => {
+  proxy.$router.replace({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "contract_flow",
+      flowName: "销售合同审批流程",
+      random: proxy.random(),
+    },
+  });
+};
+</script>
+  
+<style lang="scss" scoped>
+* {
+  font-size: 12px;
+}
+.el-button {
+  padding: 0px;
+}
+.btn {
+  width: 100%;
+  border-radius: 10px;
+  padding: 6px 10px;
+  height: 24px;
+}
+.el-pagination {
+  padding-left: 30px;
+}
+:deep(.el-pagination button, .el-pager li) {
+  font-size: 12px;
+}
+:deep(.el-table .el-table__cell) {
+  padding: 2px 0px;
+}
+</style>

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

@@ -0,0 +1,163 @@
+<template>
+  <div>
+    <el-button type="primary" size="mini" class="btn" @click="handleMakeNew"
+      >制作报价单</el-button
+    >
+    <div style="margin: 10px 0; display: flex; align-items: center">
+      <el-input
+        class="input_content"
+        placeholder="请输入内容"
+        v-model="sourceList.pagination.keyword"
+        style="width: 50%"
+        clearable
+        size="small"
+      ></el-input>
+      <el-select
+        v-model="sourceList.pagination.status"
+        style="width: 40%; margin-left: 10px"
+        size="small"
+      >
+        <el-option
+          v-for="item in statusData"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+      <div style="text-align: center; width: 10%">
+        <el-icon style="cursor: pointer" @click="getData"><Search /></el-icon>
+      </div>
+    </div>
+    <el-table
+      :data="sourceList.data"
+      style="width: 100%; margin-top: 10px"
+      v-loading="loading"
+      height="390"
+    >
+      <el-table-column prop="code" label="单号" width="115" fixed="left" />
+      <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">
+        <template #default="{ row }">
+          <div>{{ row.currency }} {{ moneyFormat(row.amount, 2) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="状态"
+        width="80"
+        :formatter="getStatus"
+      />
+      <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>
+    <el-pagination
+      style="margin-top: 10px"
+      v-model:current-page="sourceList.pagination.pageNum"
+      :page-size="10"
+      layout="total, prev, pager, next"
+      :total="sourceList.pagination.total"
+      prev-text="上一页"
+      next-text="下一页"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+  
+<script setup>
+const loading = ref(false);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 300,
+    pageNum: 1,
+    pageSize: 10,
+    keyword: "",
+  },
+});
+const statusData = ref([
+  {
+    label: "草稿",
+    value: 0,
+  },
+  {
+    label: "审批中",
+    value: 10,
+  },
+  {
+    label: "驳回",
+    value: 20,
+  },
+  {
+    label: "通过",
+    value: 30,
+  },
+  {
+    label: "终止",
+    value: 99,
+  },
+]);
+const { proxy } = getCurrentInstance();
+const getStatus = (row) => {
+  const current = statusData.value.find((x) => x.value == row.status);
+  if (current) return current.label;
+};
+
+const getData = () => {
+  loading.value = true;
+  proxy.post("/saleQuotation/page", sourceList.value.pagination).then((res) => {
+    sourceList.value.data = res.rows;
+    sourceList.value.pagination.total = res.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
+};
+
+const handleCurrentChange = (val) => {
+  sourceList.value.pagination.pageNum = val;
+  getData();
+};
+
+getData();
+onMounted(() => {});
+const handleMakeNew = () => {
+  proxy.$router.replace({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "sale_quotation_flow",
+      flowName: "报价审批流程",
+      random: proxy.random(),
+    },
+  });
+};
+</script>
+  
+<style lang="scss" scoped>
+* {
+  font-size: 12px;
+}
+.el-button {
+  padding: 0px;
+}
+.btn {
+  width: 100%;
+  border-radius: 10px;
+  padding: 6px 10px;
+  height: 24px;
+}
+.el-pagination {
+  padding-left: 30px;
+}
+:deep(.el-pagination button, .el-pager li) {
+  font-size: 12px;
+}
+:deep(.el-table .el-table__cell) {
+  padding: 2px 0px;
+}
+</style>

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

@@ -0,0 +1,108 @@
+<template>
+  <div>
+    <div style="margin: 10px 0; display: flex; align-items: center">
+      <el-input
+        class="input_content"
+        placeholder="请输入内容"
+        v-model="sourceList.pagination.keyword"
+        style="width: 90%"
+        clearable
+        size="small"
+      ></el-input>
+      <div style="text-align: center; width: 10%">
+        <el-icon style="cursor: pointer" @click="getData"><Search /></el-icon>
+      </div>
+    </div>
+    <el-table
+      :data="sourceList.data"
+      style="width: 100%; margin-top: 10px"
+      v-loading="loading"
+      height="463"
+    >
+      <el-table-column
+        prop="buyCorporationName"
+        label="客户"
+        min-width="120"
+        fixed="left"
+      />
+      <el-table-column prop="code" label="主合同号" width="100" />
+      <el-table-column prop="amount" label="货运" min-width="150">
+        <template #default="{ row }">
+          <div style="color: #409eff" v-if="row.acceptCode">
+            {{ row.acceptCarriage }} ({{ row.acceptCode }})
+          </div>
+        </template>
+      </el-table-column>
+      <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>
+    <el-pagination
+      style="margin-top: 10px"
+      v-model:current-page="sourceList.pagination.pageNum"
+      :page-size="10"
+      layout="total, prev, pager, next"
+      :total="sourceList.pagination.total"
+      prev-text="上一页"
+      next-text="下一页"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+  
+<script setup>
+const loading = ref(false);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 300,
+    pageNum: 1,
+    pageSize: 10,
+  },
+});
+const { proxy } = getCurrentInstance();
+const getData = () => {
+  loading.value = true;
+  proxy.post("/documents/page", sourceList.value.pagination).then((res) => {
+    sourceList.value.data = res.rows;
+    sourceList.value.pagination.total = res.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
+};
+const handleCurrentChange = (val) => {
+  sourceList.value.pagination.pageNum = val;
+  getData();
+};
+getData();
+onMounted(() => {});
+</script>
+  
+<style lang="scss" scoped>
+* {
+  font-size: 12px;
+}
+.el-button {
+  padding: 0px;
+}
+.btn {
+  width: 100%;
+  border-radius: 10px;
+  padding: 6px 10px;
+  height: 24px;
+}
+.el-pagination {
+  padding-left: 30px;
+}
+:deep(.el-pagination button, .el-pager li) {
+  font-size: 12px;
+}
+:deep(.el-table .el-table__cell) {
+  padding: 2px 0px;
+}
+</style>

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

@@ -0,0 +1,118 @@
+<template>
+  <div>
+    <div style="margin: 10px 0; display: flex; align-items: center">
+      <el-input
+        class="input_content"
+        placeholder="请输入内容"
+        v-model="sourceList.pagination.keyword"
+        style="width: 50%"
+        clearable
+        size="small"
+      ></el-input>
+      <el-select
+        v-model="sourceList.pagination.status"
+        clearable
+        filterable
+        style="width: 40%; margin-left: 10px"
+        size="small"
+      >
+        <el-option
+          v-for="(item, index) in statusData"
+          :key="index"
+          :value="item.value"
+          :label="item.label"
+        ></el-option>
+      </el-select>
+      <div style="text-align: center; width: 10%">
+        <el-icon style="cursor: pointer" @click="getData"><Search /></el-icon>
+      </div>
+    </div>
+    <el-table
+      :data="sourceList.data"
+      style="width: 100%; margin-top: 10px"
+      v-loading="loading"
+      height="463"
+    >
+      <el-table-column prop="code" label="单号" width="100" fixed="left" />
+      <el-table-column prop="createTime" label="日期" width="150" />
+      <el-table-column prop="supplyName" label="供应商" min-width="150" />
+      <el-table-column prop="amount" label="采购总价" width="100">
+        <template #default="{ row }">
+          <div>{{ moneyFormat(row.amount, 2) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="purchaseStatus" label="状态" width="100" />
+      <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>
+
+    <el-pagination
+      style="margin-top: 10px"
+      v-model:current-page="sourceList.pagination.pageNum"
+      :page-size="10"
+      layout="total, prev, pager, next"
+      :total="sourceList.pagination.total"
+      prev-text="上一页"
+      next-text="下一页"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+  
+<script setup>
+const loading = ref(false);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    total: 300,
+    pageNum: 1,
+    pageSize: 10,
+  },
+});
+const { proxy } = getCurrentInstance();
+const getData = () => {
+  loading.value = true;
+  proxy.post("/purchase/page", sourceList.value.pagination).then((res) => {
+    sourceList.value.data = res.rows;
+    sourceList.value.pagination.total = res.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
+};
+const handleCurrentChange = (val) => {
+  sourceList.value.pagination.pageNum = val;
+  getData();
+};
+getData();
+onMounted(() => {});
+</script>
+  
+<style lang="scss" scoped>
+* {
+  font-size: 12px;
+}
+.el-button {
+  padding: 0px;
+}
+.btn {
+  width: 100%;
+  border-radius: 10px;
+  padding: 6px 10px;
+  height: 24px;
+}
+.el-pagination {
+  padding-left: 30px;
+}
+:deep(.el-pagination button, .el-pager li) {
+  font-size: 12px;
+}
+:deep(.el-table .el-table__cell) {
+  padding: 2px 0px;
+}
+</style>

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

@@ -27,7 +27,7 @@ import mailRight from "./com/right.vue";
 const mailCon = ref("mail-right-con");
 const iconCon = ref("icon-con");
 const iconClose = ref("iconfont icon-iconm_yewtx");
-const showRight = ref(false);
+const showRight = ref(true);
 const handleClose = (icon) => {
   let iconConArr = "";
   let iconArr = "";

src/views/customer/analysis/index.vue

@@ -19,13 +19,14 @@
         </el-form-item>
         <el-form-item label="日期">
           <el-date-picker
-            v-model="queryForm.arr"
+            v-model="queryForm.timeArr"
             type="daterange"
             unlink-panels
             range-separator="-"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             value-format="YYYY-MM-DD"
+            @change="onQuery"
           />
         </el-form-item>
         <el-form-item>
@@ -52,11 +53,45 @@
           <div class="bottom">
             <div class="_box" style="margin-right: 20px">
               <span class="t"> 新增 </span>
-              <span class="val"> 20 </span>
+              <span class="val">
+                {{ allData.sourceData.incrementAmount }}
+              </span>
+            </div>
+            <div class="_box">
+              <span class="t"> 存量 </span>
+              <span class="val"> {{ allData.sourceData.stockAmount }} </span>
+            </div>
+          </div>
+        </div>
+        <div
+          class="item"
+          v-for="(item, index) in allData.sourceData.stockList"
+          :key="index"
+          v-if="
+            allData.sourceData.stockList &&
+            allData.sourceData.stockList.length > 0
+          "
+        >
+          <div class="top">
+            <div class="_title">
+              <div class="icon icon_one">
+                <img
+                  src="@/assets/images/portrait/iconm_kehd.png"
+                  alt=""
+                  class="img"
+                />
+              </div>
+              <div class="name">{{ item.source }}</div>
+            </div>
+          </div>
+          <div class="bottom">
+            <div class="_box" style="margin-right: 20px">
+              <span class="t"> 新增 </span>
+              <span class="val"> {{ item.incrementAmount }} </span>
             </div>
             <div class="_box">
               <span class="t"> 存量 </span>
-              <span class="val"> 20 </span>
+              <span class="val"> {{ item.stockAmount }} </span>
             </div>
           </div>
         </div>
@@ -81,11 +116,42 @@
           <div class="bottom">
             <div class="_box" style="margin-right: 20px">
               <span class="t"> 询盘（单） </span>
-              <span class="val"> 20 </span>
+              <span class="val"> {{ allData.typeData.saleAmount }} </span>
+            </div>
+            <div class="_box">
+              <span class="t"> 成交（单） </span>
+              <span class="val"> {{ allData.typeData.contractAmount }} </span>
+            </div>
+          </div>
+        </div>
+        <div
+          class="item"
+          v-for="(item, index) in allData.typeData.saleList"
+          :key="index"
+          v-if="
+            allData.typeData.saleList && allData.typeData.saleList.length > 0
+          "
+        >
+          <div class="top">
+            <div class="_title">
+              <div class="icon icon_two">
+                <img
+                  src="@/assets/images/portrait/iconm_kehd.png"
+                  alt=""
+                  class="img"
+                />
+              </div>
+              <div class="name">{{ item.status }}</div>
+            </div>
+          </div>
+          <div class="bottom">
+            <div class="_box" style="margin-right: 20px">
+              <span class="t"> 询盘（单） </span>
+              <span class="val"> {{ item.saleAmount }} </span>
             </div>
             <div class="_box">
               <span class="t"> 成交（单） </span>
-              <span class="val"> 20 </span>
+              <span class="val"> {{ item.contractAmount }} </span>
             </div>
           </div>
         </div>
@@ -105,8 +171,17 @@ import TitleInfo from "@/components/TitleInfo/index.vue";
 const titleList = ["客户来源统计", "类型统计", "趋势分析"];
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
-const queryForm = reactive({});
+const queryForm = reactive({
+  countryId: "",
+  beginTime: "",
+  endTime: "",
+  timeArr: "",
+});
 const countryData = ref([]);
+const allData = reactive({
+  sourceData: {},
+  typeData: {},
+});
 //图表
 const echartDom = ref(null);
 let myChart = null;
@@ -116,7 +191,7 @@ const option = reactive({
       trigger: "axis",
     },
     grid: {
-      left: "0%",
+      left: "1%",
       right: "2%",
       bottom: "15%",
       top: "30px",
@@ -234,20 +309,51 @@ const option = reactive({
     ],
   },
 });
+const getData = () => {
+  proxy.post("/saleQuotation/sourceStatistics", queryForm).then((res) => {
+    allData.sourceData = res;
+  });
+  proxy.post("/saleQuotation/typeStatistics", queryForm).then((res) => {
+    allData.typeData = res;
+  });
+  proxy.post("/saleQuotation/trendAnalysis", queryForm).then((res) => {
+    let listOne = res.contractStatisticsList.map((x) => x.count);
+    let listTwo = res.saleStatisticList.map((x) => x.count);
+    let listThree = res.sourceIncrementList.map((x) => x.count);
+    let listFour = res.sourceStockList.map((x) => x.count);
+    const months = res.contractStatisticsList.map((x) => x.month);
+    option.data.xAxis.data = months;
+    option.data.series[0].data = listFour;
+    option.data.series[1].data = listTwo;
+    option.data.series[2].data = listOne;
+    option.data.series[3].data = listThree;
+    myChart.setOption(option.data);
+  });
+};
 const onQuery = () => {
-  console.log(queryForm, "ad");
+  queryForm.beginTime = queryForm.timeArr[0];
+  queryForm.endTime = queryForm.timeArr[1];
+  getData();
 };
-
 const getCountryData = () => {
   proxy.post("/areaInfo/list", { parentId: "0" }).then((res) => {
     countryData.value = res;
     queryForm.countryId = "China";
+    let endData = new Date();
+    let beginDate = new Date();
+    beginDate.setFullYear(endData.getFullYear() - 1);
+    queryForm.timeArr = [
+      proxy.parseTime(beginDate, "{y}-{m}-{d}"),
+      proxy.parseTime(endData, "{y}-{m}-{d}"),
+    ];
+    queryForm.beginTime = queryForm.timeArr[0];
+    queryForm.endTime = queryForm.timeArr[1];
+    getData();
   });
 };
 getCountryData();
 onMounted(() => {
   myChart = echarts.init(echartDom.value);
-  myChart.setOption(option.data);
   window.addEventListener("resize", () => {
     myChart.resize();
   });
@@ -275,8 +381,11 @@ onMounted(() => {
   .statistics {
     display: flex;
     margin-top: 10px;
+    // justify-content: space-around;
     .item {
-      // min-width: 250px;
+      margin: 0 20px;
+      min-width: 200px;
+      flex: 1;
       display: flex;
       flex-direction: column;
       justify-content: space-around;

src/views/purchaseManage/purchaseManage/arrival/index.vue

@@ -471,9 +471,6 @@ onMounted(() => {});
 .tenant {
   padding: 20px;
 }
-// /deep/.el-checkbox {
-//   display: none;
-// }
 :deep(.el-table__header-wrapper .el-checkbox) {
   display: none;
 }