|
@@ -18,7 +18,6 @@
|
|
|
:label="'项目编号'"
|
|
|
:prop="'396'"
|
|
|
:placeholder="'请输入项目编号'"
|
|
|
- type="number"
|
|
|
:disabled="true"
|
|
|
/>
|
|
|
<!-- 省 398-->
|
|
@@ -66,7 +65,7 @@
|
|
|
:label="'合同定油品密度'"
|
|
|
:prop="'405'"
|
|
|
:placeholder="'请输入合同定油品密度'"
|
|
|
- type="number"
|
|
|
+ type="digit"
|
|
|
/>
|
|
|
<!-- 送油单价 406 -->
|
|
|
<wd-input
|
|
@@ -74,7 +73,7 @@
|
|
|
:label="'送油单价'"
|
|
|
:prop="'406'"
|
|
|
:placeholder="'请输入送油单价'"
|
|
|
- type="number"
|
|
|
+ type="digit"
|
|
|
/>
|
|
|
</wd-cell-group>
|
|
|
<view class="footer">
|
|
@@ -110,8 +109,11 @@ const rules = ref({
|
|
|
400: [{ required: true, message: '油品名称未填写' }],
|
|
|
// 油品型号必填
|
|
|
401: [{ required: true, message: '油品型号未填写' }],
|
|
|
- 406: [
|
|
|
- { pattern: /^\d+(\.\d+)?$/, message: '请输入数字',trigger: 'blur' },
|
|
|
+ 406: [{ pattern: /^\d+(\.\d+)?$/, message: '请输入数字', trigger: 'blur' }],
|
|
|
+ // 密度必填
|
|
|
+ 405: [
|
|
|
+ { required: true, message: '密度未填写' },
|
|
|
+ { pattern: /^\d+(\.\d+)?$/, message: '请输入数字', trigger: 'blur' },
|
|
|
],
|
|
|
});
|
|
|
function init() {
|
|
@@ -226,17 +228,25 @@ function projectNameChange({ value }) {
|
|
|
|
|
|
const form = ref();
|
|
|
const oldFormData = ref('');
|
|
|
+console.log('11')
|
|
|
function handleSubmit() {
|
|
|
form.value
|
|
|
.validate()
|
|
|
.then(({ valid, errors }) => {
|
|
|
if (valid) {
|
|
|
+ let paramsData = {}
|
|
|
+ // 过滤所有空值 为空字符 或者 null 或者 空数组
|
|
|
+ Object.keys(dataForm.value).map((key) => {
|
|
|
+ if (dataForm.value[key] !== '' && dataForm.value[key] !== null) {
|
|
|
+ paramsData[key] = dataForm.value[key];
|
|
|
+ }
|
|
|
+ });
|
|
|
const params = {
|
|
|
id: id.value ? '/' + id.value : '',
|
|
|
formKey: formKey.value,
|
|
|
data: [
|
|
|
{
|
|
|
- data: JSON.stringify(dataForm.value),
|
|
|
+ data: JSON.stringify(paramsData),
|
|
|
id: id.value ? id.value : '',
|
|
|
oldData: id.value ? oldFormData.value : null,
|
|
|
},
|
|
@@ -246,7 +256,6 @@ function handleSubmit() {
|
|
|
if (id.value) {
|
|
|
DemoApi.getEditData(params).then((res) => {
|
|
|
toast.close();
|
|
|
-
|
|
|
if (res.code === 200) {
|
|
|
// 如果res.data是数组则提示新增成功
|
|
|
setTimeout(() => {
|