更新 #413

Merged
zwq merged 1 commits from projects/zg-zwq into projects/zg-test 2024-12-31 09:39:06 +08:00
5 changed files with 23 additions and 23 deletions

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 13:52:10 * @Date: 2023-08-01 13:52:10
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2024-04-11 09:05:16 * @LastEditTime: 2024-12-27 09:16:43
* @Description: * @Description:
--> -->
<template> <template>
@ -56,17 +56,17 @@
placeholder="选择结束时间"></el-date-picker> placeholder="选择结束时间"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="单价" prop="price"> <el-form-item label="单价" prop="price">
<el-input-number <el-input-number
:min="0" :min="0"
style="width: 75%" style="width: 75%"
v-model="dataForm.price" v-model="dataForm.price"
clearable clearable
placeholder="请输入允许留存时间" /> placeholder="请输入单价" />
{{ unit }} {{ unit }}
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input

View File

@ -63,11 +63,11 @@ const tableProps = [
label: '原料编码', label: '原料编码',
width: 180, width: 180,
}, },
{ // {
prop: 'price', // prop: 'price',
label: '单价(元/千克)', // label: '(/)',
align: 'right', // align: 'right',
}, // },
{ {
prop: 'createTime', prop: 'createTime',
label: '生效时间', label: '生效时间',

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2024-09-05 15:34:28 * @LastEditTime: 2024-12-27 09:18:43
* @Description: * @Description:
--> -->
<template> <template>
@ -22,7 +22,7 @@
placeholder="请输入原料名称" /> placeholder="请输入原料名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="单价" prop="matPrice"> <el-form-item label="单价" prop="matPrice">
<el-input <el-input
v-model="dataForm.matPrice" v-model="dataForm.matPrice"
@ -31,7 +31,7 @@
placeholder="请输入单价" /> placeholder="请输入单价" />
(/) (/)
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="累计用量" prop="quantity"> <el-form-item label="累计用量" prop="quantity">
<el-input-number <el-input-number

View File

@ -103,11 +103,11 @@ const tableProps = [
prop: 'quantity', prop: 'quantity',
label: '累计使用量(千克)', label: '累计使用量(千克)',
}, },
{ // {
prop: 'matPrice', // prop: 'matPrice',
label: '单价(元/千克)', // label: '(/)',
align: 'right', // align: 'right',
}, // },
{ {
prop: 'price', prop: 'price',
label: '总价(元)', label: '总价(元)',
@ -133,11 +133,11 @@ const tableProps2 = [
prop: 'quantity', prop: 'quantity',
label: '累计使用量(千克)', label: '累计使用量(千克)',
}, },
{ // {
prop: 'materialPrice', // prop: 'materialPrice',
label: '单价(元/千克)', // label: '(/)',
align: 'right', // align: 'right',
}, // },
{ {
prop: 'price', prop: 'price',
label: '总价(元)', label: '总价(元)',

View File

@ -298,7 +298,7 @@ export default {
loginForm: { loginForm: {
loginType: 'uname', loginType: 'uname',
username: '',//admin username: '',//admin
password: '',//admin123 password: '',//admin123 kszny123456
captchaVerification: '', captchaVerification: '',
mobile: '', mobile: '',
mobileCode: '', mobileCode: '',