snow %!s(int64=2) %!d(string=hai) anos
pai
achega
e8f3503a06

+ 13 - 1
src/App.vue

@@ -34,6 +34,12 @@ import { storageSession } from "@pureadmin/utils";
 //   removeToken();
 //   router.replace({ path: "/login" });
 // }
+
+// 
+const redirectUrl = "http://webcx.test241.wanyuhengtong.com/";
+const appid = "ww6076e6fd4268ee31"
+const oauthUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirectUrl}&response_type=code&scope=SCOPE&state=STATE#wechat_redirect`
+
 const code = ref("");
 function testing() {
   dd?.ready(() => {
@@ -73,11 +79,17 @@ function setcode(code) {
       }
       console.log(res);
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 onMounted(() => {
+  //钉钉登录
   if (JudgeEnvironment() === "isDingDing") {
     testing();
   }
+
+  //企业微信登录
+  if (JudgeEnvironment() === "wxwork") { 
+    window.location.href = oauthUrl;
+  }
 });
 </script>

+ 2 - 1
src/components/BasicDescriptions/src/types.ts

@@ -4,7 +4,8 @@ export const basicDescriptionsProps = {
     type: String
   },
   colNumber: {
-    type: Number
+    type: Number,
+    default: 4
   },
   columns: {
     type: Array as PropType<Array<DescriptionColumn>>

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

@@ -284,11 +284,11 @@ export const SALE_COLUMNS: DescriptionColumns = [
 export const ORDER_COLUMNS: DescriptionColumns = [
   {
     field: "sequenceNo",
-    label: "销售单编号"
+    label: "销售单编号",
   },
   {
     field: "ownerName",
-    label: "销售员"
+    label: "销售员",
   },
   {
     field: "department",

+ 1 - 1
src/views/InvoiceSales/returnTicket/components/create-return-ticket/index.vue

@@ -98,7 +98,7 @@ function handleCreate() {
         :columns="ORDER_COLUMNS"
       />
     </el-form-item>
-
+n
     <Invoice mt-5 v-if="invNumber" :inv-number="invNumber" type="sale"/>
 
     <div mt-5 />