原价￥
@@ -154,12 +142,12 @@
:placeholder="scope.row.unit"
@change="changeUnit(scope.row)"
>
-
+
+ />
@@ -172,7 +160,7 @@
:step="1"
step-strictly
controls-position="right"
- >
+ />
{{ type == "in" ? "入库" : "出库" }}前：
{{ returnStockNumber(scope.row, scope.row.number) }}
@@ -195,7 +183,7 @@
- 确定
+ 确定
@@ -248,7 +236,7 @@ export default {
{
label: "商品入库",
value: "goods",
- type: "purveyor",
+ type: "out",
},
{
label: "耗材入库",
@@ -257,22 +245,6 @@ export default {
},
],
shopTypesActive: 0,
- shopTypes: [
- {
- label: "供应商入库",
- value: "purveyor",
- },
- {
- label: "其他入库",
- value: "purchase",
- },
- ],
- shopTypes2: [
- {
- label: "供应商入库",
- value: "purveyor",
- },
- ],
resetForm: "",
queryFormLoading: false,
queryForm: {
@@ -314,11 +286,6 @@ export default {
timeout: null,
};
},
- mounted() {
- this.type = this.$route.query.type || "in";
- this.resetForm = { ...this.queryForm };
- this.tbShopPurveyorGet();
- },
computed: {
amountPayable() {
if (!this.tableData.list.length) return 0;
@@ -333,6 +300,11 @@ export default {
this.queryForm.amountPayable = newval;
},
},
+ mounted() {
+ this.type = this.$route.query.type || "in";
+ this.resetForm = { ...this.queryForm };
+ this.tbShopPurveyorGet();
+ },
methods: {
changeUnit(row) {
row.price = this.returnPrice(row, row.originPrice);
@@ -398,12 +370,13 @@ export default {
},
// 切换入库内容
- tabChange(value, type) {
- this.shopTypesActive = type == "in" ? 0 : 1;
+ tabChange(value) {
+ this.shopTypesActive = value == "in" ? 0 : 1;
this.inTabValue = value;
+ this.type = value;
this.resetHandle();
- this.$refs.shopList.reset(); //清除选项
- this.$refs.ConsumableList.reset(); //清除选项
+ // this.$refs.shopList.reset(); //清除选项
+ // this.$refs.ConsumableList.reset(); //清除选项
},
// 切换类型
changeTypeEnum(index) {
@@ -494,7 +467,8 @@ export default {
resetHandle() {
this.showResult = false;
this.queryForm = { ...this.resetForm };
- this.queryForm.type = this.inTabs.find((item) => item.value == this.inTabValue).type;
+ console.log(this.inTabs, this.inTabValue);
+ this.queryForm.type = this.inTabs.find((item) => item.type == this.inTabValue).type;
this.tableData.list = [];
this.$refs.queryForm.resetFields();
},
@@ -524,4 +498,4 @@ export default {
.app-container {
}
-
\ No newline at end of file
+
From d34a8c71e999c4d58dbaced206693b1ab2002ca8 Mon Sep 17 00:00:00 2001
From: wwz <1144797966@qq.com>
Date: Tue, 8 Apr 2025 11:18:36 +0800
Subject: [PATCH 06/51] =?UTF-8?q?feat:=20=E9=80=9A=E7=9F=A5=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.vscode/settings.json | 4 +
src/api/notifications/index.ts | 51 ++++++++++++
src/views/notifications/config/add.ts | 77 ++++++++++++++++++
src/views/notifications/config/config.ts | 46 +++++++++++
src/views/notifications/config/content.ts | 87 ++++++++++++++++++++
src/views/notifications/config/edit.ts | 75 +++++++++++++++++
src/views/notifications/config/search.ts | 53 ++++++++++++
src/views/notifications/index.vue | 99 +++++++++++++++++++++++
8 files changed, 492 insertions(+)
create mode 100644 src/api/notifications/index.ts
create mode 100644 src/views/notifications/config/add.ts
create mode 100644 src/views/notifications/config/config.ts
create mode 100644 src/views/notifications/config/content.ts
create mode 100644 src/views/notifications/config/edit.ts
create mode 100644 src/views/notifications/config/search.ts
create mode 100644 src/views/notifications/index.vue
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ca69dfc..a0228de 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -89,5 +89,9 @@
},
"[jsonc]": {
"editor.defaultFormatter": "vscode.json-language-features"
+ },
+ "files.associations": {
+ "*.ttml": "xml",
+ "*.ttss": "css"
}
}
diff --git a/src/api/notifications/index.ts b/src/api/notifications/index.ts
new file mode 100644
index 0000000..f8e9601
--- /dev/null
+++ b/src/api/notifications/index.ts
@@ -0,0 +1,51 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin";
+// 供应商
+const Api = {
+ /** 通知消息列表*/
+ getList(params: any) {
+ return request
({
+ url: `${baseURL}/syncNotice`,
+ method: "get",
+ params,
+ });
+ },
+ /** 全部*/
+ getAllList(params: any) {
+ return request({
+ url: `${baseURL}/list`,
+ method: "get",
+ params,
+ });
+ },
+ get(id: string | number) {
+ return request({
+ url: `${baseURL}/` + id,
+ method: "get",
+ });
+ },
+ add(data: any) {
+ return request({
+ url: `${baseURL}`,
+ method: "post",
+ data,
+ });
+ },
+ edit(data: any) {
+ return request({
+ url: `${baseURL}`,
+ method: "put",
+ data,
+ });
+ },
+
+ delete(id: string | number) {
+ return request({
+ url: `${baseURL}/` + id,
+ method: "delete",
+ });
+ },
+};
+
+export default Api;
diff --git a/src/views/notifications/config/add.ts b/src/views/notifications/config/add.ts
new file mode 100644
index 0000000..0f42129
--- /dev/null
+++ b/src/views/notifications/config/add.ts
@@ -0,0 +1,77 @@
+import Api from "@/api/product/vendor";
+import { returnOptions, switchAttr } from "./config";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig = {
+ pageName: "sys:user",
+ dialog: {
+ title: "添加供应商",
+ width: 800,
+ draggable: true,
+ },
+ form: {
+ labelWidth: 140,
+ },
+ formAction: function (data) {
+ return Api.add({ ...data });
+ },
+ beforeSubmit(data) {
+ console.log("提交之前处理", data);
+ },
+ formItems: [
+
+ {
+ label: "名称",
+ prop: "name",
+ rules: [{ required: true, message: "请输入名称", trigger: "blur" }],
+ attrs: {
+ placeholder: "请输入名称",
+ },
+ },
+ {
+ label: "联系人名字",
+ prop: "contactName",
+ rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+ attrs: {
+ placeholder: "请输入联系人名字",
+ },
+ },
+ {
+ label: "联系人电话",
+ prop: "telephone",
+ rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+ attrs: {
+ placeholder: "请输入联系人名字",
+ },
+ },
+ {
+ label: "供应商地址",
+ prop: "address",
+ rules: [{ required: false, message: "请输入供应商地址", trigger: "blur" }],
+ attrs: {
+ placeholder: "请输入供应商地址",
+ },
+ },
+ {
+ label: "备注",
+ prop: "remark",
+ rules: [{ required: false, message: "请输入备注", trigger: "blur" }],
+ attrs: {
+ placeholder: "请输入备注",
+ },
+ },
+ {
+ label: "排序",
+ prop: "sort",
+ rules: [{ required: true, message: "请输入排序", trigger: "blur" }],
+ type: "input-number",
+ attrs: {
+ placeholder: "请输入排序",
+ },
+ },
+
+ ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);
diff --git a/src/views/notifications/config/config.ts b/src/views/notifications/config/config.ts
new file mode 100644
index 0000000..2183658
--- /dev/null
+++ b/src/views/notifications/config/config.ts
@@ -0,0 +1,46 @@
+export interface options {
+ label: string;
+ value: string | number;
+ [property: string]: any;
+}
+export interface optionObject {
+ [property: string]: options[];
+}
+const options: optionObject = {
+ payType: [
+ { label: "现金", value: "cash" },
+ { label: "微信", value: "weixin" },
+ { label: "银行卡", value: "bank" },
+ { label: "会员支付", value: "member-account" },
+ { label: "支付宝", value: "alipay" },
+ { label: "刷卡", value: "deposit" },
+ { label: "挂账", value: "arrears" },
+ { label: "刷卡", value: "deposit" },
+ { label: "储值", value: "member-account" },
+ { label: "自定义", value: "virtual" },
+ ],
+ isIdeal: [
+ { label: "否", value: 0 },
+ { label: "是", value: 1 },
+ ],
+};
+
+export const switchAttr = {
+ "active-value": 1,
+ "inactive-value": 0,
+};
+
+export type optionsType = string;
+
+export function returnOptions(type: optionsType) {
+ return options[type];
+}
+
+export function returnOptionsLabel(optionsType: optionsType, value: string | number) {
+ const options = returnOptions(optionsType);
+ if (!options) {
+ return "";
+ }
+ const option = options.find((item) => item.value === value);
+ return option ? option.label : "";
+}
diff --git a/src/views/notifications/config/content.ts b/src/views/notifications/config/content.ts
new file mode 100644
index 0000000..036acfc
--- /dev/null
+++ b/src/views/notifications/config/content.ts
@@ -0,0 +1,87 @@
+import Api from "@/api/notifications";
+import type { IContentConfig } from "@/components/CURD/types";
+
+const contentConfig: IContentConfig = {
+ pageName: "sys:user",
+ table: {
+ border: true,
+ highlightCurrentRow: true,
+ },
+ pagination: {
+ background: true,
+ layout: "prev,pager,next,jumper,total,sizes",
+ pageSize: 20,
+ pageSizes: [10, 20, 30, 50],
+ },
+ indexAction: function (params) {
+ return Api.getList(params);
+ },
+ deleteAction: function (id) {
+ return Api.delete(id);
+ },
+ modifyAction: function (data) {
+ return Api.edit(data);
+ },
+ indexActionData: {},
+ pk: "id",
+ toolbar: [
+ // {
+ // text: "入库记录",
+ // name: "manual-in",
+ // auth: "",
+ // },
+ // {
+ // text: "出库记录",
+ // name: "manual-out",
+ // auth: "",
+ // },
+ // {
+ // text: "报损记录",
+ // name: "damage-out",
+ // auth: "",
+ // },
+ ],
+ defaultToolbar: ["refresh", "filter", "search"],
+ cols: [
+ // { type: "selection", width: 50, align: "center" },
+ {
+ label: "通知类型",
+ align: "center",
+ prop: "type",
+ },
+ {
+ label: "是否已读",
+ align: "center",
+ prop: "isRead",
+ slotName: "isRead",
+ templet: "custom",
+ },
+ {
+ label: "消息内容",
+ align: "center",
+ prop: "content",
+ slotName: "content",
+ templet: "list",
+ },
+ {
+ label: "商品/耗材",
+ align: "center",
+ prop: "extraJson",
+ },
+ {
+ label: "创建时间",
+ align: "center",
+ prop: "createTime",
+ },
+ // {
+ // label: "操作",
+ // align: "center",
+ // fixed: "right",
+ // width: 280,
+ // templet: "tool",
+ // operat: ["edit", "delete"],
+ // },
+ ],
+};
+
+export default contentConfig;
diff --git a/src/views/notifications/config/edit.ts b/src/views/notifications/config/edit.ts
new file mode 100644
index 0000000..4878c63
--- /dev/null
+++ b/src/views/notifications/config/edit.ts
@@ -0,0 +1,75 @@
+import Api from "@/api/product/vendor";
+import { returnOptions, switchAttr } from "./config";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig = {
+ pageName: "sys:user",
+ dialog: {
+ title: "编辑供应商",
+ width: 800,
+ draggable: true,
+ },
+ form: {
+ labelWidth: 140,
+ },
+ formAction: function (data) {
+ return Api.edit({ ...data });
+ },
+ beforeSubmit(data) {
+ console.log("提交之前处理", data);
+ },
+ formItems: [
+ {
+ label: "名称",
+ prop: "name",
+ rules: [{ required: true, message: "请输入名称", trigger: "blur" }],
+ attrs: {
+ placeholder: "请输入名称",
+ },
+ },
+ {
+ label: "联系人名字",
+ prop: "contactName",
+ rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+ attrs: {
+ placeholder: "请输入联系人名字",
+ },
+ },
+ {
+ label: "联系人电话",
+ prop: "telephone",
+ rules: [{ required: false, message: "请输入联系人名字", trigger: "blur" }],
+ attrs: {
+ placeholder: "请输入联系人名字",
+ },
+ },
+ {
+ label: "供应商地址",
+ prop: "address",
+ rules: [{ required: false, message: "请输入供应商地址", trigger: "blur" }],
+ attrs: {
+ placeholder: "请输入供应商地址",
+ },
+ },
+ {
+ label: "备注",
+ prop: "remark",
+ rules: [{ required: false, message: "请输入备注", trigger: "blur" }],
+ attrs: {
+ placeholder: "请输入备注",
+ },
+ },
+ {
+ label: "排序",
+ prop: "sort",
+ rules: [{ required: true, message: "请输入排序", trigger: "blur" }],
+ type: "input-number",
+ attrs: {
+ placeholder: "请输入排序",
+ },
+ },
+ ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);
diff --git a/src/views/notifications/config/search.ts b/src/views/notifications/config/search.ts
new file mode 100644
index 0000000..951dd38
--- /dev/null
+++ b/src/views/notifications/config/search.ts
@@ -0,0 +1,53 @@
+import type { ISearchConfig } from "@/components/CURD/types";
+const searchConfig: ISearchConfig = {
+ pageName: "sys:user",
+ isExpandable: false,
+ formItems: [
+ {
+ type: "select",
+ label: "通知类型 ",
+ prop: "type",
+ attrs: {
+ placeholder: "请选择",
+ clearable: true,
+ style: {
+ width: "200px",
+ },
+ },
+ options: [
+ {
+ label: "商品",
+ value: "0",
+ },
+ {
+ label: "耗材",
+ value: "1",
+ },
+ ],
+ },
+ {
+ type: "select",
+ label: "是否已读",
+ prop: "isRead",
+ attrs: {
+ placeholder: "请选择",
+ clearable: true,
+ style: {
+ width: "200px",
+ },
+ },
+ options: [
+ {
+ label: "未读",
+ value: "0",
+ },
+ {
+ label: "已读",
+ value: "1",
+ },
+ ],
+ },
+ ],
+};
+
+export default searchConfig;
diff --git a/src/views/notifications/index.vue b/src/views/notifications/index.vue
new file mode 100644
index 0000000..dab42d2
--- /dev/null
+++ b/src/views/notifications/index.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+ {{ scope.row.isRead == 1 ? "已读" : "未读" }}
+
+
+
+
+ {{ scope.row.isRead == 1 ? "已读" : "未读" }}
+
+
+
+
+
+
+
+
+
+
-
-
- ![]()
-
-
-
- {{ userStore.userInfo.shopName }}
-
-
-
-
-
-
- 门店 1
- 门店 2
- 门店 3
-
-
-
-
-
+
+
+
+
![]()
+
+
+
+ {{ state.shopName }}
+
+
+
+
+
+
+ {{ item.shopName }}
+
+
+
+
+
-
From dbf8f8f05d40ed25c5a04fe7e9dce3fcbbab11dc Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Thu, 10 Apr 2025 14:42:18 +0800
Subject: [PATCH 28/51] =?UTF-8?q?feat:=20=E4=BE=9B=E5=BA=94=E5=95=86?=
=?UTF-8?q?=E8=B4=A6=E5=8D=95=E9=BB=98=E8=AE=A4=E5=80=BC=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/finance/supplierBill/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/finance/supplierBill/index.vue b/src/views/finance/supplierBill/index.vue
index d4c0edd..582cfc2 100644
--- a/src/views/finance/supplierBill/index.vue
+++ b/src/views/finance/supplierBill/index.vue
@@ -21,16 +21,16 @@
账单总金额（全部/本月）
- {{ state.summaryData.amountPayable }} / {{ state.summaryData.mouthAmountPayable }}
+ {{ state.summaryData.amountPayable || 0 }} / {{ state.summaryData.mouthAmountPayable || 0 }}
已付款总金额（全部/本月）
- {{ state.summaryData.actualPaymentAmount }} / {{ state.summaryData.mouthActualPaymentAmount }}
+ {{ state.summaryData.actualPaymentAmount || 0 }} / {{ state.summaryData.mouthActualPaymentAmount || 0 }}
未付款总金额（全部/本月）
- {{ state.summaryData.unPaidAmount }} / {{ state.summaryData.mouthUnPaidAmount }}
+ {{ state.summaryData.unPaidAmount || 0 }} / {{ state.summaryData.mouthUnPaidAmount || 0 }}
From 61bd37de32880056140c0cd7a88d2436a05e0a10 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Thu, 10 Apr 2025 17:39:34 +0800
Subject: [PATCH 29/51] =?UTF-8?q?feat:=20=E4=BE=9B=E5=BA=94=E5=95=86?=
=?UTF-8?q?=E8=B4=A6=E5=8D=95=E4=BB=98=E6=AC=BE=E5=9B=9E=E6=98=BE=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/finance/supplierBill/billingRecord.vue | 1 +
src/views/finance/supplierBill/components/payment.vue | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/finance/supplierBill/billingRecord.vue b/src/views/finance/supplierBill/billingRecord.vue
index 08e346e..06e3860 100644
--- a/src/views/finance/supplierBill/billingRecord.vue
+++ b/src/views/finance/supplierBill/billingRecord.vue
@@ -113,6 +113,7 @@ const refPayment = ref();
function handlePayment(item) {
if (item != 'all') {
state.flowIdList = [item.id]
+ state.allAmount = item.unPaidAmount
} else {
if( state.flowIdList.length <= 0 ){
ElMessage({ type: "error", message: "请选择付款耗材" });
diff --git a/src/views/finance/supplierBill/components/payment.vue b/src/views/finance/supplierBill/components/payment.vue
index 741f925..28c769a 100644
--- a/src/views/finance/supplierBill/components/payment.vue
+++ b/src/views/finance/supplierBill/components/payment.vue
@@ -6,7 +6,7 @@
-
@@ -46,13 +46,13 @@ const form = reactive({
...basicForm,
});
const supplierName = ref('');
+const maxAmount = ref(0);
const show = ref(false);
function open(item) {
form.flowIdList = item.flowIdList
supplierName.value = item.supplierName
- if (item.flowIdList.length > 1 && item.allAmount) {
- form.amount = item.allAmount
- }
+ form.amount = item.allAmount
+ maxAmount.value = item.allAmount
// Object.assign(form, item);
show.value = true;
}
From 6cb1968b8081ec5fc2388574719177c3a532b852 Mon Sep 17 00:00:00 2001
From: wwz <1144797966@qq.com>
Date: Thu, 10 Apr 2025 17:51:14 +0800
Subject: [PATCH 30/51] =?UTF-8?q?feat:=20=E8=BF=9B=E9=94=80=E5=AD=98?=
=?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../consumables/components/DataStatistics.vue | 37 +++++-
.../inventory/consumables/config/content.ts | 10 +-
.../inventory/consumables/config/search.ts | 30 ++---
src/views/inventory/consumables/index.vue | 54 +++------
.../libraryrecords/config/content.ts | 5 -
.../components/consumableList.vue | 23 +---
src/views/inventory/operation_in/index.vue | 110 ++++--------------
7 files changed, 98 insertions(+), 171 deletions(-)
diff --git a/src/views/inventory/consumables/components/DataStatistics.vue b/src/views/inventory/consumables/components/DataStatistics.vue
index d1dbd19..6628105 100644
--- a/src/views/inventory/consumables/components/DataStatistics.vue
+++ b/src/views/inventory/consumables/components/DataStatistics.vue
@@ -77,7 +77,39 @@