diff --git a/admin/src/api/pmdailymenu.js b/admin/src/api/pmdailymenu.js
index 459d9ef..21d9b3f 100644
--- a/admin/src/api/pmdailymenu.js
+++ b/admin/src/api/pmdailymenu.js
@@ -36,6 +36,18 @@ export function pmdailymenuDetailApi(id) {
})
}
+/**
+ * 获取当天菜单详情（用于修改页面）
+ * @param params
+ */
+export function pmdailymenuDayDetailApi(params) {
+ return request({
+ url: `autogencode/pmdailymenu/listByAll`,
+ method: 'GET',
+ params
+ })
+}
+
/**
* pmdailymenu批量删除
* @param ids
@@ -60,6 +72,52 @@ export function pmdailymenuBatchCreateApi(menus) {
})
}
+/**
+ * pmdailymenu批量更新
+ * @param menus
+ */
+export function pmdailymenuBatchUpdateApi(menus) {
+ return request({
+ url: `autogencode/pmdailymenu/batchUpdate`,
+ method: 'POST',
+ data: menus
+ })
+}
+
+/**
+ * pmdailymenu发布
+ * @param id
+ */
+export function pmdailymenuPublishApi(id) {
+ return request({
+ url: `autogencode/pmdailymenu/publish/${id}`,
+ method: 'POST'
+ })
+}
+
+/**
+ * pmdailymenu撤销发布
+ * @param id
+ */
+export function pmdailymenuCancelPublishApi(id) {
+ return request({
+ url: `autogencode/pmdailymenu/cancelPublish/${id}`,
+ method: 'POST'
+ })
+}
+
+/**
+ * pmdailymenu复制
+ * @param params
+ */
+export function pmdailymenuCopyApi(params) {
+ return request({
+ url: `autogencode/pmdailymenu/copy`,
+ method: 'POST',
+ data: params
+ })
+}
+
/**
* pmdailymenu列表
diff --git a/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue b/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue
index 738f737..6505c8b 100644
--- a/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue
+++ b/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue
@@ -202,28 +202,31 @@
header-align="center"
align="center"
label="单位"
- width="80">
+ >
+
+
+
+ >
+ >
+ >
@@ -239,7 +242,7 @@
-
+
@@ -286,7 +289,7 @@ export default {
props: {
},
- dicts: ['bm_measuring_unit', 'sys_origin_country', 'sys_curr_type', 'order_status'],
+ dicts: ['bm_measuring_unit', 'sys_measurement_unit', 'sys_origin_country', 'sys_curr_type', 'pm_order_status'],
computed: {
// 表格内容只读
tableReadonly() {
@@ -901,7 +904,12 @@ export default {
// 获取订单列表
getOrderList() {
this.orderLoading = true
- pmcanteenpurchaseorderListApi(this.orderSearchForm).then(res => {
+ const params = {
+ ...this.orderSearchForm,
+ status: 1 // 强制状态为1
+ }
+
+ pmcanteenpurchaseorderListApi(params).then(res => {
this.orderList = res.list
this.orderTotal = res.total
this.orderLoading = false
@@ -915,7 +923,8 @@ export default {
page: 1,
limit: 10,
orderNo: '',
- supplierName: ''
+ supplierName: '',
+ status: 1 // 重置时也默认状态1
}
this.getOrderList()
},
diff --git a/admin/src/views/pm/canteen/demand/DispatchList.vue b/admin/src/views/pm/canteen/demand/DispatchList.vue
index aa5bad9..9aadeb6 100644
--- a/admin/src/views/pm/canteen/demand/DispatchList.vue
+++ b/admin/src/views/pm/canteen/demand/DispatchList.vue
@@ -9,7 +9,11 @@
-
+
+
+
+
+
@@ -34,7 +38,12 @@
diff --git a/admin/src/views/pm/canteen/purchase/detail/pmcanteenpurchasedetail-add-and-update.vue b/admin/src/views/pm/canteen/purchase/detail/pmcanteenpurchasedetail-add-and-update.vue
index 4040a94..3192090 100644
--- a/admin/src/views/pm/canteen/purchase/detail/pmcanteenpurchasedetail-add-and-update.vue
+++ b/admin/src/views/pm/canteen/purchase/detail/pmcanteenpurchasedetail-add-and-update.vue
@@ -56,19 +56,38 @@
-
+
-
+
-
+
@@ -108,15 +127,21 @@
import * as api from '@/api/pmcanteenpurchasedetail.js'
import * as cmcustproductApi from '@/api/cmcustproduct.js'
export default {
+ props: {
+ planStatus: {
+ type: String,
+ default: '1' // 默认草稿状态
+ }
+ },
data () {
return {
visible: false,
goodsList: [],
dataForm: {
id: 0,
- planId: '' ,
- goodsId: '' ,
- custId: '' ,
+ planId: 0 ,
+ goodsId: 0 ,
+ custId: 0 ,
custName: '' ,
goodsName: '' ,
goodsCode: '' ,
@@ -201,13 +226,21 @@
if (this.dataForm.id) {
api.pmcanteenpurchasedetailDetailApi(id).then(function(res) {
this.dataForm = res;
+ this.calculatePlanAmount();
}.bind(this))
} else if (planId) {
// 新增记录时，自动设置 planId
this.dataForm.planId = planId;
+ this.calculatePlanAmount();
}
}.bind(this))
},
+ // 计算计划金额
+ calculatePlanAmount () {
+ const planQuantity = parseFloat(this.dataForm.planQuantity) || 0
+ const planPrice = parseFloat(this.dataForm.planPrice) || 0
+ this.dataForm.planAmount = parseFloat((planQuantity * planPrice).toFixed(2))
+ },
// 表单数据提交
dataSubmit () {
this.$refs['dataForm'].validate((valid) => {
diff --git a/admin/src/views/pm/canteen/purchase/order/OrderDetailList.vue b/admin/src/views/pm/canteen/purchase/order/OrderDetailList.vue
new file mode 100644
index 0000000..ada843e
--- /dev/null
+++ b/admin/src/views/pm/canteen/purchase/order/OrderDetailList.vue
@@ -0,0 +1,248 @@
+
+
+
+ 新增明细
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.orderQuantity }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.orderPrice }}
+
+
+
+
+
+
+ {{ Number(editForm.orderAmount || 0).toFixed(2) }}
+
+
+ {{ Number(scope.row.orderAmount || 0).toFixed(2) }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.remark }}
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+