From 1faedc0334667d7e6e402acf8f2bf2663e6b14d6 Mon Sep 17 00:00:00 2001
From: xiao-fajia <1665375861@qq.com>
Date: Sat, 14 Sep 2024 11:33:58 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/repair/stockOperate/stockOperate.js | 10 ++
src/views/repair/Components/PartChoose.vue | 58 ++++++--
.../repair/stockOperate/Components/SoInfo.vue | 41 ++++--
.../stockOperate/Components/SoTable.vue | 126 +++++++++++++++---
4 files changed, 201 insertions(+), 34 deletions(-)
diff --git a/src/api/repair/stockOperate/stockOperate.js b/src/api/repair/stockOperate/stockOperate.js
index 543ea86..23d957c 100644
--- a/src/api/repair/stockOperate/stockOperate.js
+++ b/src/api/repair/stockOperate/stockOperate.js
@@ -1 +1,11 @@
import request from '@/utils/request'
+
+const preUrl = "/repair/so"
+
+export function createRepairSo(data){
+ return request({
+ url: preUrl + "/create",
+ method: "post",
+ data
+ })
+}
diff --git a/src/views/repair/Components/PartChoose.vue b/src/views/repair/Components/PartChoose.vue
index 8565f20..f80cbfc 100644
--- a/src/views/repair/Components/PartChoose.vue
+++ b/src/views/repair/Components/PartChoose.vue
@@ -2,17 +2,17 @@
-
+
{{ scope.$index + 1 }}
-
-
-
-
-
-
+
+
+
+
+
+
@@ -26,8 +26,48 @@ export default {
return{
partSelected: null,
partList: [
- {id: 1, name: '张胜男', age:20, gender: 1},
- {id: 2, name: '张胜妇', age:20, gender: 1}
+ {
+ id: 1,
+ tenantId: 1,
+ barCode: "12344564632463",
+ code: "12312312",
+ name: "测试1",
+ model: "12321",
+ price: "100",
+ type: "不知道",
+ unit: "个",
+ warehouse: "d1",
+ miniStock: 100,
+ maxStock: 100,
+ stock: 20,
+ img: '',
+ attribute: "123213123",
+ corpId: 1,
+ coverImage: '',
+ carModel: "大车",
+ remark: "没有",
+ },
+ {
+ id: 2,
+ tenantId: 1,
+ barCode: "12344564632463",
+ code: "12312312",
+ name: "测试2",
+ model: "12321",
+ price: "10",
+ type: "不知道",
+ unit: "个",
+ warehouse: "d2",
+ miniStock: 10,
+ maxStock: 10,
+ stock: 5,
+ img: '',
+ attribute: "123213123",
+ corpId: 1,
+ coverImage: '',
+ carModel: "大车",
+ remark: "没有",
+ }
],
queryParams:{
pageNo: 1,
diff --git a/src/views/repair/stockOperate/Components/SoInfo.vue b/src/views/repair/stockOperate/Components/SoInfo.vue
index 7b00eb6..7ab2e92 100644
--- a/src/views/repair/stockOperate/Components/SoInfo.vue
+++ b/src/views/repair/stockOperate/Components/SoInfo.vue
@@ -36,19 +36,24 @@
-
+
-
+
+
+
+
+
+
-
-
+
+
-
- 结算
+
+ 结算
确定
@@ -63,6 +68,7 @@ import PartChoose from "@/views/repair/Components/PartChoose.vue";
import SoTable from "@/views/repair/stockOperate/Components/SoTable.vue";
import SupplierChoose from "@/views/repair/Components/SupplierChoose.vue";
import {createUniqueCodeByHead} from "@/utils/createUniqueCode";
+import {createRepairSo} from "@/api/repair/stockOperate/stockOperate";
export default {
name: "SoInfo",
@@ -77,7 +83,7 @@ export default {
type: Boolean,
defaultValue: true,
required: true
- }
+ },
},
data() {
return {
@@ -88,7 +94,13 @@ export default {
soTime: Date.now(),
userId: null,
userName: null,
- partList: []
+ partList: [],
+ totalPrice: null,
+ soType: this.soByType ? "01" : "02",
+ purchaseType: "01",
+ itemCount: 0,
+ soStatus: this.soByType ? "01" : "04",
+ remark: null,
},
staffRole: "采购员",
partList: [],
@@ -106,7 +118,8 @@ export default {
},
// 得到选择的供应商
getSupplier(data) {
- console.log(data)
+ this.formData.supplierId = data.id
+ this.formData.supplierName = data.name
},
// 得到选择的商品
async getPart(data) {
@@ -124,6 +137,16 @@ export default {
// 删除数据
deleteItem(index) {
this.partList.splice(index, 1)
+ },
+ // 表格的数据
+ tableData(data){
+ this.formData.totalPrice = data.reduce((x, y) => {return x + y.totalPrice}, 0)
+ this.formData.itemCount = data.reduce((x, y) => {return x + y.count}, 0)
+ this.formData.partList = data
+ },
+ async handleSubmit(){
+ const res = await createRepairSo(this.formData)
+ console.log(res)
}
}
}
diff --git a/src/views/repair/stockOperate/Components/SoTable.vue b/src/views/repair/stockOperate/Components/SoTable.vue
index 0a73902..524e9c7 100644
--- a/src/views/repair/stockOperate/Components/SoTable.vue
+++ b/src/views/repair/stockOperate/Components/SoTable.vue
@@ -1,21 +1,53 @@
-
+
{{ scope.$index + 1 }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ scope.row.count }}
+
+
+
+
+
+
+ {{ scope.row.newPrice }}
+
+
+
+
+
+
+ {{ scope.row.remark }}
+
+
export default {
name: "SoTable",
- props:{
- soByType:{
+ props: {
+ soByType: {
type: Boolean,
defaultValue: true,
required: true
},
- partList:{
+ partList: {
type: Array,
defaultValue: false,
required: true
@@ -45,13 +77,75 @@ export default {
return {
loading: false,
list: [],
+ includeColumn: ['count', 'totalPrice'],
+ randomKey: Math.random(),
+ }
+ },
+ watch: {
+ partList(val) {
+ const data = val[val.length - 1]
+ const newData = {
+ ...data,
+ count: 1,
+ totalPrice: data.price * 1,
+ remark: '',
+ newPrice: data.price,
+ }
+ this.list.push(newData)
+ },
+ list: {
+ handler(newVal, oldVal) {
+ this.$emit("tableData", newVal)
+ },
+ deep: true
}
},
methods: {
// 通知父组件，删除数据
- deleteItem(index){
+ deleteItem(index) {
this.$emit("deleteItem", index)
- }
+ },
+ // 设置不统计的字段
+ getSummaries(param) {
+ const {columns, data} = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '合计';
+ return;
+ }
+ const values = data.map(item => Number(item[column.property]));
+ if (this.includeColumn.includes(column.property)) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0);
+ sums[index];
+ }
+ });
+ return sums
+ },
+ editData(row, column) {
+ row[column.property + "isShow"] = true
+ //refreshTable是table数据改动时，刷新table的
+ this.refreshTable()
+ this.$nextTick(() => {
+ this.$refs[column.property] && this.$refs[column.property].focus()
+ })
+ },
+ alterData(row, column) {
+ row[column.property + "isShow"] = false
+ const data = this.list.find(item => item.id === row.id)
+ data.totalPrice = data.newPrice * data.count
+ this.refreshTable()
+ },
+ refreshTable() {
+ this.randomKey = Math.random()
+ },
}
}
From 9fd0101266519c06cf9ed6b33eda84b40dd587f4 Mon Sep 17 00:00:00 2001
From: nyoung <12190070+nyoungo@user.noreply.gitee.com>
Date: Sat, 14 Sep 2024 11:50:34 +0800
Subject: [PATCH 2/4] 1
---
src/views/system/appBase/appSwiper/api.js | 44 +++
src/views/system/appBase/appSwiper/index.vue | 266 +++++++++++++++++++
2 files changed, 310 insertions(+)
create mode 100644 src/views/system/appBase/appSwiper/api.js
create mode 100644 src/views/system/appBase/appSwiper/index.vue
diff --git a/src/views/system/appBase/appSwiper/api.js b/src/views/system/appBase/appSwiper/api.js
new file mode 100644
index 0000000..86fe978
--- /dev/null
+++ b/src/views/system/appBase/appSwiper/api.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询app轮播图列表
+export function listSwiper(query) {
+ return request({
+ url: '/system/appSwiper/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询app轮播图详细
+export function getSwiper(swiperId) {
+ return request({
+ url: '/system/appSwiper/' + swiperId,
+ method: 'get'
+ })
+}
+
+// 新增app轮播图
+export function addSwiper(data) {
+ return request({
+ url: '/system/appSwiper/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改app轮播图
+export function updateSwiper(data) {
+ return request({
+ url: '/system/appSwiper/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除app轮播图
+export function delSwiper(swiperId) {
+ return request({
+ url: '/system/appSwiper/del?idList=' + swiperId,
+ method: 'post'
+ })
+}
diff --git a/src/views/system/appBase/appSwiper/index.vue b/src/views/system/appBase/appSwiper/index.vue
new file mode 100644
index 0000000..6fae34d
--- /dev/null
+++ b/src/views/system/appBase/appSwiper/index.vue
@@ -0,0 +1,266 @@
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+