From 1861f6406bd9eb352b06758d478deeeccc2cb4b2 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 31 Jul 2024 19:38:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=9B=A8=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8D=95=E4=BB=B7=E5=92=8C=E6=80=BB=E4=BB=B7=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pum/order.vue          |   8 +-
 src/views/pum/order_form.vue     | 253 +++++++++++++++----------
 src/views/pum/orderitem.vue      |  38 ++++
 src/views/pum/orderitem_form.vue | 310 +++++++++++++++++++------------
 src/views/pum/plan.vue           |   2 +
 src/views/pum/planitem.vue       |  48 ++++-
 src/views/pum/planitem_form.vue  |  52 ++++++
 7 files changed, 480 insertions(+), 231 deletions(-)

diff --git a/src/views/pum/order.vue b/src/views/pum/order.vue
index 8b1e77f4..e1333697 100644
--- a/src/views/pum/order.vue
+++ b/src/views/pum/order.vue
@@ -47,14 +47,12 @@
 							v-for="item in scope.row.materials_"
 							v-bind:key="item.id"
 						>
-							<span
-								>{{ item.name }}[{{ item.specification }}][{{
-									item.model
-								}}]</span
-							>
+							<span>{{ item.full_name }}</span>
 						</div>
 					</template>
 				</el-table-column>
+				<el-table-column label="总价(元)" prop="total_price">
+				</el-table-column>
 				<el-table-column label="截止到货日期" prop="delivery_date">
 				</el-table-column>
 				<el-table-column label="状态" prop="state">
diff --git a/src/views/pum/order_form.vue b/src/views/pum/order_form.vue
index 8f865061..56c12ed2 100644
--- a/src/views/pum/order_form.vue
+++ b/src/views/pum/order_form.vue
@@ -1,109 +1,158 @@
 <template>
-  <el-dialog :title="titleMap[mode]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
-    <el-container v-loading="loading">
-      <el-main style="padding: 0 20px 20px 20px">
-        <el-form ref="dialogForm" :model="form" :rules="rules" label-width="120px">
-          <el-row>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="订单编号" prop="number">
-                <el-input v-model="form.number" placeholder="订单编号" />
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="供应商" prop="supplier">
-                <el-select v-model="form.supplier" placeholder="供应商" clearable style="width:100%">
-                  <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="截止到货日期">
-                <el-date-picker v-model="form.delivery_date" type="date" placeholder="截止到货日期" value-format="YYYY-MM-DD"
-                  style="width:100%">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-main>
-      <el-footer>
-        <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-        <el-button @click="visible = false">取消</el-button>
-      </el-footer>
-    </el-container>
-  </el-dialog>
+	<el-dialog
+		:title="titleMap[mode]"
+		v-model="visible"
+		:size="1000"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<el-container v-loading="loading">
+			<el-main style="padding: 0 20px 20px 20px">
+				<el-form
+					ref="dialogForm"
+					:model="form"
+					:rules="rules"
+					label-width="120px"
+				>
+					<el-row>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="订单编号" prop="number">
+								<el-input
+									v-model="form.number"
+									placeholder="订单编号"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="供应商" prop="supplier">
+								<el-select
+									v-model="form.supplier"
+									placeholder="供应商"
+									clearable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in options"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="截止到货日期">
+								<el-date-picker
+									v-model="form.delivery_date"
+									type="date"
+									placeholder="截止到货日期"
+									value-format="YYYY-MM-DD"
+									style="width: 100%"
+								>
+								</el-date-picker>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-main>
+			<el-footer>
+				<el-button type="primary" :loading="isSaveing" @click="submit"
+					>保存</el-button
+				>
+				<el-button @click="visible = false">取消</el-button>
+			</el-footer>
+		</el-container>
+	</el-dialog>
 </template>
 <script>
 export default {
-  emits: ["success", "closed"],
-  data() {
-    return {
-      loading: false,
-      mode: "add",
-      titleMap: {
-        add: "新增采购订单",
-        edit: "编辑采购订单",
-        show: "查看采购订单",
-      },
-      form: {},
-      rules: {
-        number: [{ required: true, message: "请输入采购订单编号", trigger: "blur" }]
-      },
-      visible: false,
-      isSaveing: false,
-      options: [],
-      setFiltersVisible: false,
-    };
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    //显示
-    open(mode = "add", type) {
-      this.mode = mode;
-      this.visible = true;
-      return this;
-    },
-    getList() {
-      this.$API.pum.supplier.list.req({ page: 0 }).then(res => {
-        this.options = res;
-      })
-    },
-    //提交
-    submit() {
-      this.$refs.dialogForm.validate(async (valid) => {
-        if (valid) {
-          this.isSaveing = true;
-          try {
-            var res;
-            if (this.mode == "add") {
-              res = await this.$API.pum.order.create.req(this.form);
-            } else if (this.mode == "edit") {
-              res = await this.$API.pum.order.update.req(this.form.id, this.form);
-            }
-            this.isSaveing = false;
-            this.$emit("success", this.form, this.mode);
-            this.visible = false;
-            this.$message.success("操作成功");
-          } catch (err) {
-            //可以处理校验错误
-            this.isSaveing = false;
-            return err;
-          }
-        }
-      });
-    },
-    //表单注入数据
-    setData(data) {
-      Object.assign(this.form, data);
-    },
-    //设置过滤项
-    setFilters(filters) {
-      this.selectionFilters = filters;
-      this.setFiltersVisible = true;
-    },
-  },
+	emits: ["success", "closed"],
+	data() {
+		return {
+			loading: false,
+			mode: "add",
+			titleMap: {
+				add: "新增采购订单",
+				edit: "编辑采购订单",
+				show: "查看采购订单",
+			},
+			form: {},
+			rules: {
+				number: [
+					{
+						required: true,
+						message: "请输入采购订单编号",
+						trigger: "blur",
+					},
+				],
+				supplier: [
+					{
+						required: true,
+						message: "请选择供应商",
+						trigger: "blur",
+					},
+				],
+			},
+			visible: false,
+			isSaveing: false,
+			options: [],
+			setFiltersVisible: false,
+		};
+	},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		//显示
+		open(mode = "add", type) {
+			this.mode = mode;
+			this.visible = true;
+			return this;
+		},
+		getList() {
+			this.$API.pum.supplier.list.req({ page: 0 }).then((res) => {
+				this.options = res;
+			});
+		},
+		//提交
+		submit() {
+			this.$refs.dialogForm.validate(async (valid) => {
+				if (valid) {
+					this.isSaveing = true;
+					try {
+						var res;
+						if (this.mode == "add") {
+							res = await this.$API.pum.order.create.req(
+								this.form
+							);
+						} else if (this.mode == "edit") {
+							res = await this.$API.pum.order.update.req(
+								this.form.id,
+								this.form
+							);
+						}
+						this.isSaveing = false;
+						this.$emit("success", this.form, this.mode);
+						this.visible = false;
+						this.$message.success("操作成功");
+					} catch (err) {
+						//可以处理校验错误
+						this.isSaveing = false;
+						return err;
+					}
+				}
+			});
+		},
+		//表单注入数据
+		setData(data) {
+			Object.assign(this.form, data);
+		},
+		//设置过滤项
+		setFilters(filters) {
+			this.selectionFilters = filters;
+			this.setFiltersVisible = true;
+		},
+	},
 };
 </script>
 <style></style>
diff --git a/src/views/pum/orderitem.vue b/src/views/pum/orderitem.vue
index 800a483f..39500d8f 100644
--- a/src/views/pum/orderitem.vue
+++ b/src/views/pum/orderitem.vue
@@ -60,6 +60,8 @@
 						:query="query"
 						hidePagination
 						hideDo
+						:summary-method="getSummaries"
+						show-summary
 					>
 						<el-table-column type="index" width="50" />
 						<el-table-column
@@ -80,6 +82,10 @@
 							prop="delivered_count"
 						>
 						</el-table-column>
+						<el-table-column label="物料单价" prop="unit_price">
+						</el-table-column>
+						<el-table-column label="总价" prop="total_price">
+						</el-table-column>
 						<el-table-column
 							label="创建时间"
 							prop="create_time"
@@ -245,6 +251,38 @@ export default {
 				})
 				.catch(() => {});
 		},
+		getSummaries({ columns, data }) {
+			const sums = [];
+			columns.forEach((column, index) => {
+				if (index === 0) {
+					sums[index] = "合计";
+					return;
+				}
+				if (index == 5) {
+					const values = data.map((item) =>
+						Number(item[column.property])
+					);
+					if (!values.every((value) => Number.isNaN(value))) {
+						sums[index] = values.reduce((prev, curr) => {
+							const value = Number(curr); //Number转换为数值
+							let sum = Number(
+								Number(prev) + Number(curr)
+							).toFixed(2); //toFixed(2)数据项保留两位小数
+							if (!isNaN(value)) {
+								return sum;
+							} else {
+								return prev;
+							}
+						}, 0);
+						sums[index] += "元"; //给合计项添加单位
+					} else {
+						sums[index] = "0元";
+					}
+				}
+			});
+
+			return sums;
+		},
 		//本地更新数据
 		handleSaveSuccess(data, mode) {
 			if (mode == "add") {
diff --git a/src/views/pum/orderitem_form.vue b/src/views/pum/orderitem_form.vue
index a55b9bbf..5cf91a0e 100644
--- a/src/views/pum/orderitem_form.vue
+++ b/src/views/pum/orderitem_form.vue
@@ -1,129 +1,195 @@
 <template>
-  <el-dialog
-    :title="titleMap[mode]"
-    v-model="visible"
-    :size="1000"
-    destroy-on-close
-    @closed="$emit('closed')"
-  >
-    <el-container v-loading="loading">
-      <el-main style="padding: 0 20px 20px 20px">
-        <el-form
-          ref="dialogForm"
-          :model="form"
-          :rules="rules"
-          label-width="100px"
-        >
-          <el-row>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="物料" prop="material">
-                <el-select
-                  v-model="form.material"
-                  placeholder="物料"
-                  clearable
-                  style="width:100%"
-                >
-                  <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="所需数量" prop="place">
-                <el-input-number v-model="form.count"  :precision="0" :min="0" controls-position="right" placeholder="所需数量" style="width:100%"/>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-main>
-      <el-footer>
-        <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
-        <el-button @click="visible = false">取消</el-button>
-      </el-footer>
-    </el-container>
-  </el-dialog>
+	<el-dialog
+		:title="titleMap[mode]"
+		v-model="visible"
+		:size="1000"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<el-container v-loading="loading">
+			<el-main style="padding: 0 20px 20px 20px">
+				<el-form
+					ref="dialogForm"
+					:model="form"
+					:rules="rules"
+					label-width="100px"
+				>
+					<el-row>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="物料" prop="material">
+								<el-select
+									v-model="form.material"
+									placeholder="物料"
+									clearable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in options"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="所需数量" prop="place">
+								<el-input-number
+									v-model="form.count"
+									:precision="0"
+									:min="0"
+									controls-position="right"
+									placeholder="所需数量"
+									style="width: 100%"
+									@change="handleChange"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="物料单价" prop="unit_price">
+								<el-input-number
+									v-model="form.unit_price"
+									:precision="2"
+									:min="0"
+									controls-position="right"
+									placeholder="物料单价"
+									style="width: 100%"
+									@change="handleChange"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="物料总价">
+								<el-input-number
+									v-model="form.total_price"
+									:precision="2"
+									:min="0"
+									controls-position="right"
+									placeholder="物料总价"
+									style="width: 100%"
+								/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-main>
+			<el-footer>
+				<el-button type="primary" :loading="isSaveing" @click="submit"
+					>保存</el-button
+				>
+				<el-button @click="visible = false">取消</el-button>
+			</el-footer>
+		</el-container>
+	</el-dialog>
 </template>
 <script>
 export default {
-  emits: ["success", "closed"],
-  props:{
-    puOrder: { type: String, default: '' },
-  },
-  data() {
-    return {
-      loading: false,
-      mode: "add",
-      titleMap: {
-        add: "新增订单详情",
-        edit: "编辑订单详情",
-        show: "查看订单详情",
-      },
-      form: {},
-      rules: {
-        material: [{required: true, message: "请选择物料", trigger: "blur"}],
-      },
-      visible: false,
-      isSaveing: false,
-      options: [],
-      setFiltersVisible: false,
-    };
-  },
-  mounted() {
-    this.getList();
-  },
-  methods: {
-    //显示
-    open(mode = "add") {
-      this.mode = mode;
-      this.visible = true;
-      return this;
-    },
-    getList(){
-      this.$API.mtm.material.list.req({page:0}).then(res=>{
-        this.options = res;
-      })
-    },
-    //提交
-    submit() {
-      this.$refs.dialogForm.validate(async (valid) => {
-        if (valid) {
-          this.isSaveing = true;
-          try {
-            var res;
-            this.form.pu_order = this.puOrder;
-            if (this.mode == "add") {
-              res = await this.$API.pum.orderitem.create.req(this.form);
-            } else if (this.mode == "edit") {
-              res = await this.$API.pum.orderitem.update.req(this.form.id,this.form);
-            }
-            this.isSaveing = false;
-            this.$emit("success", this.form, this.mode);
-            this.visible = false;
-            this.$message.success("操作成功");
-          } catch (err) {
-            //可以处理校验错误
-            this.isSaveing = false;
-            return err;
-          }
-        }
-      });
-    },
-    //表单注入数据
-    setData(data) {
-      Object.assign(this.form, data);
-    },
-    //设置过滤项
-    setFilters(filters) {
-      this.selectionFilters = filters;
-      this.setFiltersVisible = true;
-    },
-  },
+	emits: ["success", "closed"],
+	props: {
+		puOrder: { type: String, default: "" },
+	},
+	data() {
+		return {
+			loading: false,
+			mode: "add",
+			titleMap: {
+				add: "新增订单详情",
+				edit: "编辑订单详情",
+				show: "查看订单详情",
+			},
+			form: {},
+			rules: {
+				material: [
+					{ required: true, message: "请选择物料", trigger: "blur" },
+				],
+				unit_price: [
+					{
+						required: true,
+						message: "请输入物料单价",
+						trigger: "blur",
+					},
+				],
+			},
+			visible: false,
+			isSaveing: false,
+			options: [],
+			setFiltersVisible: false,
+		};
+	},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		//显示
+		open(mode = "add") {
+			this.mode = mode;
+			this.visible = true;
+			return this;
+		},
+		getList() {
+			this.$API.mtm.material.list.req({ page: 0 }).then((res) => {
+				this.options = res;
+			});
+		},
+		handleChange() {
+			if (
+				this.form.unit_price !== 0 &&
+				this.form.unit_price !== "" &&
+				this.form.unit_price !== null
+			) {
+				if (
+					this.form.count !== 0 &&
+					this.form.count !== "" &&
+					this.form.count !== null
+				) {
+					this.form.total_price =
+						Number(this.form.count) * Number(this.form.unit_price);
+				}
+			} else {
+				this.form.total_price = "";
+			}
+		},
+		//提交
+		submit() {
+			this.$refs.dialogForm.validate(async (valid) => {
+				if (valid) {
+					this.isSaveing = true;
+					try {
+						var res;
+						this.form.pu_order = this.puOrder;
+						if (this.mode == "add") {
+							res = await this.$API.pum.orderitem.create.req(
+								this.form
+							);
+						} else if (this.mode == "edit") {
+							res = await this.$API.pum.orderitem.update.req(
+								this.form.id,
+								this.form
+							);
+						}
+						this.isSaveing = false;
+						this.$emit("success", this.form, this.mode);
+						this.visible = false;
+						this.$message.success("操作成功");
+					} catch (err) {
+						//可以处理校验错误
+						this.isSaveing = false;
+						return err;
+					}
+				}
+			});
+		},
+		//表单注入数据
+		setData(data) {
+			Object.assign(this.form, data);
+		},
+		//设置过滤项
+		setFilters(filters) {
+			this.selectionFilters = filters;
+			this.setFiltersVisible = true;
+		},
+	},
 };
 </script>
 
-<style>
-</style>
+<style></style>
diff --git a/src/views/pum/plan.vue b/src/views/pum/plan.vue
index 1f605f85..a52fba4c 100644
--- a/src/views/pum/plan.vue
+++ b/src/views/pum/plan.vue
@@ -41,6 +41,8 @@
 				</el-table-column>
 				<el-table-column label="计划编号" prop="number">
 				</el-table-column>
+				<el-table-column label="总价(元)" prop="total_price">
+				</el-table-column>
 				<el-table-column label="状态" prop="state">
 					<template #default="scope">
 						<span
diff --git a/src/views/pum/planitem.vue b/src/views/pum/planitem.vue
index d978881e..ea0d0fcf 100644
--- a/src/views/pum/planitem.vue
+++ b/src/views/pum/planitem.vue
@@ -44,6 +44,9 @@
 						:query="query"
 						hidePagination
 						hideDo
+						:summary-method="getSummaries"
+						:span-method="arraySpanMethod"
+						show-summary
 					>
 						<el-table-column type="index" width="50" />
 						<el-table-column
@@ -59,6 +62,10 @@
 						</el-table-column>
 						<el-table-column label="采购数量" prop="need_count">
 						</el-table-column>
+						<el-table-column label="物料单价" prop="unit_price">
+						</el-table-column>
+						<el-table-column label="总价" prop="total_price">
+						</el-table-column>
 						<el-table-column
 							label="需求日期"
 							prop="need_date"
@@ -93,7 +100,7 @@
 									type="primary"
 									@click="table_edit(scope.row)"
 									v-auth="'pu_planitem.update'"
-									v-if="orderObj == 10"
+									v-if="orderObj.state == 10"
 								>
 									编辑
 								</el-button>
@@ -102,7 +109,7 @@
 									type="danger"
 									@click="table_del(scope.row)"
 									v-auth="'pu_planitem.delete'"
-									v-if="orderObj == 10"
+									v-if="orderObj.state == 10"
 								>
 									删除
 								</el-button>
@@ -213,7 +220,44 @@ export default {
 				})
 				.catch(() => {});
 		},
+		arraySpanMethod({ rowIndex, columnIndex }) {
+			console.log(rowIndex, columnIndex);
+			if (rowIndex === 0) {
+				// return [1, 2];
+			}
+		},
+		getSummaries({ columns, data }) {
+			const sums = [];
+			columns.forEach((column, index) => {
+				if (index === 0) {
+					sums[index] = "合计";
+					return;
+				}
+				if (index == 4) {
+					const values = data.map((item) =>
+						Number(item[column.property])
+					);
+					if (!values.every((value) => Number.isNaN(value))) {
+						sums[index] = values.reduce((prev, curr) => {
+							const value = Number(curr); //Number转换为数值
+							let sum = Number(
+								Number(prev) + Number(curr)
+							).toFixed(2); //toFixed(2)数据项保留两位小数
+							if (!isNaN(value)) {
+								return sum;
+							} else {
+								return prev;
+							}
+						}, 0);
+						sums[index] += "元"; //给合计项添加单位
+					} else {
+						sums[index] = "0元";
+					}
+				}
+			});
 
+			return sums;
+		},
 		//本地更新数据
 		handleSaveSuccess(data, mode) {
 			if (mode == "add") {
diff --git a/src/views/pum/planitem_form.vue b/src/views/pum/planitem_form.vue
index b76869b6..74299993 100644
--- a/src/views/pum/planitem_form.vue
+++ b/src/views/pum/planitem_form.vue
@@ -52,6 +52,32 @@
 									controls-position="right"
 									placeholder="所需数量"
 									style="width: 100%"
+									@change="handleChange"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="物料单价" prop="unit_price">
+								<el-input-number
+									v-model="form.unit_price"
+									:precision="2"
+									:min="0"
+									controls-position="right"
+									placeholder="物料单价"
+									style="width: 100%"
+									@change="handleChange"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="物料总价">
+								<el-input-number
+									v-model="form.total_price"
+									:precision="2"
+									:min="0"
+									controls-position="right"
+									placeholder="物料总价"
+									style="width: 100%"
 								/>
 							</el-form-item>
 						</el-col>
@@ -149,6 +175,13 @@ export default {
 						trigger: "blur",
 					},
 				],
+				unit_price: [
+					{
+						required: true,
+						message: "请输入物料单价",
+						trigger: "blur",
+					},
+				],
 			},
 			formMaterialName: "",
 			materialType: "planitem",
@@ -195,6 +228,25 @@ export default {
 					this.options = res;
 				});
 		},
+		handleChange() {
+			if (
+				this.form.unit_price !== 0 &&
+				this.form.unit_price !== "" &&
+				this.form.unit_price !== null
+			) {
+				if (
+					this.form.need_count !== 0 &&
+					this.form.need_count !== "" &&
+					this.form.need_count !== null
+				) {
+					this.form.total_price =
+						Number(this.form.need_count) *
+						Number(this.form.unit_price);
+				}
+			} else {
+				this.form.total_price = "";
+			}
+		},
 		//提交
 		submit() {
 			this.$refs.dialogForm.validate(async (valid) => {