Merge branch 'v3.0' into sit

src/api/purchase/ticketReturn/index.ts

@@ -28,7 +28,7 @@ export const httpNewStatus = (data: object): any => {
 
 
 export const httpSupplierInfo = (data: object): any => {
-  return http.request("post", `http://stocknew.test241.wanyuhengtong.com/admin/supplerlist`, { data });
+  return http.request("post", `http://stock.api.caixiao365.com/admin/supplerlist`, { data });
 };
 
 //发票回票详情

src/store/modules/user.ts

@@ -58,10 +58,18 @@ export const useUserStore = defineStore({
     info: {}
   }),
   actions: {
-    SET_TOKEN(token) { this.token = token; },
-    SET_NAME(name) { this.name = name; },
-    SET_VERSION(version) { this.system_version = version; },
-    SET_LEVEL(level) { this.level = String(level); },
+    SET_TOKEN(token) {
+      this.token = token;
+    },
+    SET_NAME(name) {
+      this.name = name;
+    },
+    SET_VERSION(version) {
+      this.system_version = version;
+    },
+    SET_LEVEL(level) {
+      this.level = String(level);
+    },
     SET_VERIFYCODE(verifyCode) {
       this.verifyCode = verifyCode;
     },

src/utils/details/sale.ts

@@ -241,6 +241,11 @@ export const ORDER_COLUMNS: DescriptionColumns = [
       render(open_type){
         return  String(open_type) === "1" ? "原商品开票" : String(open_type) === "2"  ? "子商品开票" : '--' 
       }
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      span: 24
     }
     // {
     //   label: '商品开票类目编码',

src/utils/status.ts

@@ -233,11 +233,11 @@ export const ticketReturnStatusOptions = [
   { label: "待系统验证", value: "1" },
   { label: '待关联订单', value: '11' },
   { label: '订单关联完毕待财务审核', value: '12' },
-  // { label: "买方公司业务审核", value: "2" },
+  { label: "买方公司业务审核", value: "2" },
   { label: "待买方公司认证", value: "3" },
   { label: "认证成功", value: "4" },
   { label: "验证失败", value: "5" },
-  // { label: "买方审核驳回", value: "6" },
+  { label: "买方审核驳回", value: "6" },
   { label: "认证失败", value: "7" },
   { label: "回票流程终止", value: "8" },
   { label: "验证超过次数", value: "9" },

src/views/purchase/porder/index.vue

@@ -122,11 +122,11 @@ onMounted(() => {nextTick(()  =>  contentRef.value.onSearchPro({ size:15, page:1
       @content-select-change="items => (selectlist = items)"
     >
       <template #content_header>
-        <ElButton
-          type="primary"
+        <ElButton 
           @click="handleExport"
           :loading="loading"
-          >导出</ElButton
+          size="small"
+          >采购单导出</ElButton
         >
       </template>
     </PageContainer>

src/views/supply/porder/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, shallowRef ,onMounted, nextTick } from "vue";
+import { ref, shallowRef ,onMounted, nextTick} from "vue";
 import { ElMessage } from "element-plus";
 import contentConfig from "./config/content.config";
 import searchConfig from "./config/search.config";
@@ -21,7 +21,7 @@ const loading = shallowRef(false);
 const selectlist = ref<any[]>([]);
 const purchaseModalRef = ref<InstanceType<typeof PurchaseModal> | null>(null);
 const contentRef = ref<any>(null);
-const { hasPermissionWithCode } = usePermission(PageName);
+const {  hasPermissionWithCode } = usePermission("supplyPorder");
 const hooks: PageHooks = {
   pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
 };
@@ -34,6 +34,8 @@ const events: PageEvents = {
     reset: () => contentRef.value.onSearchPro({ size:15, page:1, total: "2" })
   }
 };
+
+
 async function handleExport() {
   if (selectlist.value.length === 0) {
     ElMessage.warning("请选择一条采购单");
@@ -49,23 +51,33 @@ async function handleExport() {
     _template["采购主单编码"] = item.cxCode;
     _template["销售订单编码"] = item.qrdCode;
     _template["供应商端"] = item.has_account
-      ? (hasAccountOptions.find(s => s.value == item.has_account + "") || {}).label || ""
+      ? (hasAccountOptions.find(s => s.value == item.has_account + "") || {})
+          .label || ""
       : "";
     _template["状态"] = item.status
-      ? (cgdStatusOptions.find(s => s.value == item.status + "") || {}).label || ""
+      ? (cgdStatusOptions.find(s => s.value == item.status + "") || {}).label ||
+        ""
       : "";
     _template["销售单发货状态"] = item.qrdSend
-      ? (send_status_list.find(s => s.value == item.qrdSend + "") || {}).label || ""
+      ? (send_status_list.find(s => s.value == item.qrdSend + "") || {})
+          .label || ""
       : "";
     _template["采购单状态"] = item.cgd_status
-      ? (sendStatusOptions.find(s => s.value == item.cgd_status + "") || {}).label || ""
+      ? (sendStatusOptions.find(s => s.value == item.cgd_status + "") || {})
+          .label || ""
       : "";
     _template["订单来源"] = item.cgdSource
-      ? (cg_order_source_options.find(s => s.value == item.cgdSource + "") || {}).label || ""
+      ? (
+          cg_order_source_options.find(s => s.value == item.cgdSource + "") ||
+          {}
+        ).label || ""
       : "";
     _template["商品来源"] = item.cgdType
-      ? (cg_order_type_options.find(s => s.value == item.cgdType + "") || {}).label || ""
+      ? (cg_order_type_options.find(s => s.value == item.cgdType + "") || {})
+          .label || ""
       : "";
+
+
     _template["商品编码"] = item.goodNo;
     _template["商品名称"] = item.goodName;
     _template["商品名称"] = item.goodName;
@@ -87,11 +99,11 @@ async function handleExport() {
     _template["创建时间"] = item.addtime;
     data.push(_template);
   });
-
   //创建数据表
   const workBook = utils.book_new();
   const workSheet = utils.json_to_sheet(data);
   utils.book_append_sheet(workBook, workSheet, "sheet");
+
   //导出模板
   writeFile(workBook, `${judieFilename}.xlsx`, { bookType: "xlsx" });
 }
@@ -106,16 +118,15 @@ onMounted(() => {nextTick(()  =>  contentRef.value.onSearchPro({ size:15, page:1
       :events="events"
       :contentConfig="contentConfig"
       :search-config="searchConfig"
-       :get-content-ref="ref => contentRef = ref"
+      :get-content-ref="ref => contentRef = ref"
       @content-select-change="items => (selectlist = items)"
     >
       <template #content_header>
-        <ElButton
-          type="primary"
-          v-if="hasPermissionWithCode('048')"
+        <ElButton 
           @click="handleExport"
           :loading="loading"
-          >导出</ElButton
+          size="small"
+          >采购单导出</ElButton
         >
       </template>
     </PageContainer>