销售主题分析

src/components/process/PurchasePayment.vue

@@ -179,6 +179,7 @@ const formConfig = computed(() => {
       propsTreeLabel: "deptName",
       propsTreeValue: "deptId",
       itemWidth: 33.33,
+      disabled: true,
     },
     {
       type: "number",
@@ -532,6 +533,7 @@ onMounted(async () => {
           });
       });
   }
+  formData.data.companyId = proxy.useUserStore().user.companyId;
 });
 const getFormData = () => {
   return proxy.deepClone(formData.data);

src/components/process/SF/ReturnGood.vue

@@ -80,6 +80,7 @@
 <script setup>
 import byForm from "@/components/byForm/index";
 import SelectPurchased from "@/views/EHSD/procurement/purchasedEHSD/selectPurchased.vue";
+import { nextTick } from "vue";
 import { useRoute } from "vue-router";
 const { proxy } = getCurrentInstance();
 const route = useRoute();
@@ -220,7 +221,7 @@ const totalAmount = () => {
 const handleSelect = (row) => {
   formData.data = {
     companyId: proxy.useUserStore().user.companyId,
-    purchaseCode: row.purchaseCode,
+    purchaseCode: row.code,
     supplierName: row.supplyName,
     purchaseAmount: row.amount,
     payAmount: row.sumPayMoney,
@@ -310,6 +311,15 @@ onMounted(() => {
     getAllData(route.query.businessId);
   }
   formData.data.companyId = proxy.useUserStore().user.companyId;
+  // 删除莫名多出的一个textarea
+  nextTick(() => {
+    setTimeout(() => {
+      let dom = document.getElementsByTagName("textarea");
+      if (dom && dom.length > 0) {
+        dom[0].style.display = "none";
+      }
+    }, 100);
+  });
 });
 
 const getFormData = () => {

src/views/EHSD/procurement/purchasedEHSD/index.vue

@@ -309,20 +309,6 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "采购人",
-        prop: "userName",
-        width: 140,
-      },
-    },
-    {
-      attrs: {
-        label: "采购时间",
-        prop: "createTime",
-        width: 160,
-      },
-    },
-    {
-      attrs: {
         label: "采购状态",
         prop: "status",
         width: 140,
@@ -344,6 +330,20 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "采购人",
+        prop: "userName",
+        width: 140,
+      },
+    },
+    {
+      attrs: {
+        label: "采购时间",
+        prop: "createTime",
+        width: 160,
+      },
+    },
+    {
+      attrs: {
         label: "操作",
         width: 200,
         align: "right",

src/views/EHSD/procurement/returnGood/index.vue

@@ -350,7 +350,6 @@ const clickAdd = (type) => {
 };
 
 const handleSelect = (row) => {
-  console.log(row, "ssa");
   formData.data = {
     code: row.code,
     supplyName: row.supplyName,

src/views/EHSD/saleContract/contractEHSD/index.vue

@@ -679,17 +679,17 @@ const config = computed(() => {
         align: "right",
       },
     },
-    {
-      attrs: {
-        label: "汇率",
-        prop: "rate",
-        width: 80,
-        align: "right",
-      },
-      render(rate) {
-        return proxy.moneyFormat(rate, 4);
-      },
-    },
+    // {
+    //   attrs: {
+    //     label: "汇率",
+    //     prop: "rate",
+    //     width: 80,
+    //     align: "right",
+    //   },
+    //   render(rate) {
+    //     return proxy.moneyFormat(rate, 4);
+    //   },
+    // },
     // {
     //   attrs: {
     //     label: "合同金额（CNY）",

src/views/EHSD/saleContract/salesThemeAnalysis/index.vue

@@ -5,6 +5,22 @@
                :selectConfig="selectConfig" :action-list="[
               
         ]" @get-list="getList">
+
+        <template #remark="{item}">
+          <div style="width: 100%">
+            <el-popover placement="top-start" :width="400" trigger="hover">
+              <div>
+                {{item.remark}}
+              </div>
+              <template #reference>
+                <div style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;cursor:pointer">
+                  {{item.remark}}
+                </div>
+              </template>
+            </el-popover>
+          </div>
+        </template>
+
       </byTable>
     </div>
     <el-dialog :title="modalType == 'add' ? '添加店铺' : '编辑店铺'" v-model="dialogVisible" width="500px" destroy-on-close>
@@ -36,9 +52,7 @@ const sourceList = ref({
     pageNum: 1,
     pageSize: 10,
     keyword: "",
-    produceStatus: "",
-    staDeliveryPeriod: "",
-    endDeliveryPeriod: "",
+    status: "",
     beginTime: "",
     endTime: "",
   },
@@ -49,16 +63,16 @@ const modalType = ref("add");
 const selectConfig = computed(() => [
   {
     label: "订单状态",
-    prop: "productionProcessesId",
+    prop: "status",
     data: jstShopStatus.value,
   },
   {
     type: "time",
     label: "订单时间",
     placeholder: "开始日期",
-    prop: "staDeliveryPeriod",
+    prop: "beginTime",
     placeholderOne: "结束日期",
-    propOne: "endDeliveryPeriod",
+    propOne: "endTime",
   },
 ]);
 const config = computed(() => {
@@ -66,199 +80,232 @@ const config = computed(() => {
     {
       attrs: {
         label: "内部订单号",
-        prop: "aa",
+        prop: "oid",
+        width: 100,
       },
     },
     {
       attrs: {
         label: "多标签",
-        prop: "aa",
+        prop: "labels",
+        width: 130,
       },
     },
     {
       attrs: {
         label: "订单类型",
-        prop: "aa",
+        prop: "type",
+        width: 150,
       },
     },
     {
       attrs: {
         label: "线上订单号",
-        prop: "aa",
+        prop: "soId",
+        width: 100,
       },
     },
     {
       attrs: {
         label: "订单状态",
-        prop: "aa",
+        prop: "status",
+        width: 90,
+      },
+      render(val) {
+        return proxy.dictKeyValue(val, jstShopStatus.value);
       },
     },
     {
       attrs: {
         label: "分销商",
-        prop: "aa",
+        prop: "drpFrom",
+        width: 120,
       },
     },
     {
       attrs: {
         label: "店铺",
-        prop: "aa",
+        prop: "shopName",
+        width: 120,
       },
     },
     {
       attrs: {
         label: "买家昵称",
-        prop: "aa",
+        prop: "shopBuyerId",
+        width: 100,
       },
     },
     {
       attrs: {
         label: "买家留言",
-        prop: "aa",
+        prop: "buyerMessage",
+        width: 150,
       },
     },
     {
       attrs: {
         label: "卖家备注",
-        prop: "aa",
+        slot: "remark",
+        width: 150,
       },
     },
     {
       attrs: {
         label: "订单日期",
-        prop: "aa",
+        prop: "orderDate",
+        width: 160,
       },
     },
 
     {
       attrs: {
         label: "发货日期",
-        prop: "aa",
+        prop: "sendDate",
+        width: 160,
       },
     },
     {
       attrs: {
         label: "确认收货日期",
-        prop: "aa",
+        prop: "endTime",
+        width: 160,
       },
     },
 
     {
       attrs: {
         label: "业务员",
-        prop: "processesName",
+        prop: "creatorName",
+        width: 100,
       },
     },
     {
       attrs: {
         label: "收件人姓名",
-        prop: "quantity",
+        prop: "receiverName",
+        width: 150,
       },
     },
     {
       attrs: {
         label: "省",
-        prop: "userName",
+        prop: "receiverState",
+        width: 80,
       },
     },
     {
       attrs: {
         label: "市",
-        prop: "createTime",
+        prop: "receiverCity",
+        width: 80,
       },
     },
     {
       attrs: {
         label: "区县",
-        prop: "orderCode",
+        prop: "receiverTown",
+        width: 80,
       },
     },
     {
       attrs: {
         label: "快递公司",
-        prop: "pic",
+        prop: "logisticsCompany",
+        width: 110,
       },
     },
     {
       attrs: {
         label: "快递单号",
-        prop: "productCode",
+        prop: "lid",
+        width: 150,
       },
     },
     {
       attrs: {
         label: "店铺站点",
-        prop: "productName",
+        prop: "shopSite",
+        width: 110,
       },
     },
     {
       attrs: {
         label: "订单来源",
-        slot: "size",
+        prop: "orderFrom",
+        width: 110,
       },
     },
     {
       attrs: {
         label: "店铺编号",
-        prop: "productColor",
+        prop: "shopId",
+        width: 110,
       },
     },
     {
       attrs: {
         label: "商品编码",
-        prop: "productColor",
+        prop: "skuId",
+        width: 110,
       },
     },
     {
       attrs: {
         label: "款式编码",
-        prop: "productColor",
+        prop: "iid",
+        width: 90,
       },
     },
-
     {
       attrs: {
         label: "原始线上单号",
-        prop: "productColor",
+        prop: "rawSoId",
+        width: 150,
       },
     },
     {
       attrs: {
         label: "商品名称",
-        prop: "productColor",
+        prop: "name",
+        width: 150,
       },
     },
     {
       attrs: {
         label: "店铺商品编码",
-        prop: "productColor",
+        prop: "shopSkuId",
+        width: 110,
       },
     },
     {
       attrs: {
         label: "基本售价",
-        prop: "productColor",
+        prop: "basePrice",
+        width: 100,
       },
     },
     {
       attrs: {
         label: "销售单价",
-        prop: "productColor",
+        prop: "price",
+        width: 100,
       },
     },
     {
       attrs: {
         label: "销售数量",
-        prop: "productColor",
+        prop: "qty",
+        width: 100,
       },
     },
     {
       attrs: {
         label: "销售金额",
-        prop: "productColor",
+        prop: "amount",
+        width: 100,
       },
     },
-
     // {
     //   attrs: {
     //     label: "操作",
@@ -331,7 +378,7 @@ const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
   proxy
-    .post("/productionReportingDetail/page", sourceList.value.pagination)
+    .post("/jstOrderInfo/thematicAnalysis", sourceList.value.pagination)
     .then((res) => {
       sourceList.value.data = res.rows;
       sourceList.value.pagination.total = res.total;

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

@@ -231,10 +231,12 @@ const config = computed(() => {
         width: 130,
       },
       render(type) {
-        if (type != "20") {
-          return "请款: " + proxy.dictValueLabel(type, fundsType.value);
-        } else {
+        if (type == 40) {
+          return "售后";
+        } else if (type == 20) {
           return "采购付款 - 申请";
+        } else {
+          return "请款: " + proxy.dictValueLabel(type, fundsType.value);
         }
       },
     },