snow 1 year ago
parent
commit
1ca252ec0d

+ 7 - 11
.env.development

@@ -1,4 +1,3 @@
-# 项目本地运行端口号
 VITE_PORT = 8848
 
 # 开发环境读取配置文件路径
@@ -14,20 +13,17 @@ VITE_CORP_ID = "dingc78fa4301e1a424a35c2f4657eb6378f"
 # 企业微信appid
 VITE_APP_ID = "ww6076e6fd4268ee31"
 # 微信开发环境基础重定向url
-REDIRECT_BASE_URL = "http://cxinv.api.caixiao365.com"
+REDIRECT_BASE_URL = "http://webcx.test241.wanyuhengtong.com/"
 # 开发环境后端用户地址
-VITE_PROXY_USER_REAL = "http://cxinv.api.caixiao365.com"
+VITE_PROXY_USER_REAL = "http://stockinv.test241.wanyuhengtong.com"
 # 开发环境后端业务地址
-VITE_PROXY_DOMAIN_REAL = "http://cxinv.api.caixiao365.com"
+VITE_PROXY_DOMAIN_REAL = "http://cxinv.test241.wanyuhengtong.com"
 
-VITE_IS_PROD = true
+VITE_IS_PROD = false
 
 # 跳转结算地址
-VITE_PURCHASE_URL = 'http://pin.caixiao365.com/'
-
+VITE_PURCHASE_URL = 'http://webstock3.test241.wanyuhengtong.com/'
+# 跳转工单地址
+VITE_GD_URL='http://bugweb.test241.wanyuhengtong.com/'
 # token密钥
 VITE_SECRET_KEY = 'key123'
-
-# 跳转工单地址
-VITE_GD_URL='http://bug.caixiao365.com/'
-

+ 7 - 2
src/utils/details/sale.ts

@@ -129,10 +129,15 @@ export const ORDER_COLUMNS: DescriptionColumns = [
     render: (customer, { customerNo }) =>
       createTooltip(customer, "客户公司编码 : " + customerNo, 270)
   },
+  {
+    field: 'manager',
+    label: '项目经理',
+    span: 6
+  },
   {
     field: "poCode",
-    span: 24,
-    label: "平台订单编码"
+    label: "平台订单编码",
+    span: 18
   },
   {
     field: "sendType",

+ 5 - 5
src/views/InvoiceSales/sheetOrderPool/components/sheet-modal.vue

@@ -8,7 +8,7 @@ import { useAsync } from "/@/hooks/core/useAsync";
 const visible = ref(false);
 const { data, run, loading } = useAsync({
   initalData: {}
-});
+})
 
 const requesetSheetOrderDetail = sequenceNo => run(httpDetail({ sequenceNo }));
 
@@ -31,18 +31,18 @@ defineExpose({
     <div v-loading="loading">
       <BasicDescriptions
         v-loading="loading"
-        ref="defaultRef"
-        :data="data"
         :columns="ORDER_COLUMNS"
+        ref="defaultRef"
         :col-number="3"
+        :data="data"
       />
       <h1 text-18px my-2 text-center text="#303133">商品详情</h1>
       <BasicDescriptions
         v-loading="loading"
-        ref="defaultRef"
-        :data="data"
         :columns="GOOD_COLUMNS"
+        ref="defaultRef"
         :col-number="3"
+        :data="data"
       />
     </div>
   </ElDialog>

+ 8 - 22
src/views/InvoiceSales/sheetOrderPool/config/content.config.ts

@@ -1,17 +1,19 @@
 import { ContentConfig } from "/@/components/PageContent";
 import { httpList } from "/@/api/InvoiceSales/sheetOrderPool";
 
-import { h } from "vue";
+
+import { inv_open_status, retrun_status } from "./search.config";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 import { ElImage, ElTag } from "element-plus";
+import { h } from "vue";
+
 import {
-  useTypeOptions,
-  send_status_list,
+  xs_order_source_options,
   xs_order_type_options,
-  xs_order_source_options
+  send_status_list,
+  useTypeOptions
 } from "/@/utils/status";
 
-import { inv_open_status, retrun_status } from "./search.config";
-import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -20,12 +22,6 @@ const columns = [
     align: "center",
     fixed: "left"
   },
-  // {
-  //   label: "序号",
-  //   type: "index",
-  //   width: 70,
-  //   hide: ({ checkList }) => !checkList.includes("序号列")
-  // },
   {
     label: "销售订单编码",
     prop: "sequenceNo",
@@ -45,22 +41,12 @@ const columns = [
           useTypeOptions.find(s => s.value === row.platform_type)?.label || "--"
       })
   },
-  // {
-  //   label: "卖方公司编码",
-  //   prop: "companyNo",
-  //   width: 150
-  // },
   {
     label: "卖出方公司",
     prop: "companyName",
     minWidth: 160,
     ...renderIconLabelLeft('companyNo','companyName','卖出方公司编码:')
   },
-  // {
-  //   label: "客户编码",
-  //   prop: "customerNo",
-  //   width: 150
-  // },
   {
     label: "客户公司",
     prop: "customerName",

+ 4 - 3
src/views/InvoiceSales/sheetOrderPool/index.vue

@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import { ref } from "vue";
+import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
+import SheetModal from "./components/sheet-modal.vue";
+import { exportPageContent } from "/@/utils/export";
 import contentConfig from "./config/content.config";
 import searchConfig from "./config/search.config";
 import frontColumns from "./config/frontColumns";
-import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
-import SheetModal from "./components/sheet-modal.vue";
 import { ElMessage } from "element-plus";
-import { exportPageContent } from "/@/utils/export";
+
 import {
   send_status_list,
   xs_order_type_options,