|
|
@@ -91,7 +91,55 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="isTable ? 18 : 24">
|
|
|
+ <el-col v-if="isTable" :span="6">
|
|
|
+ <el-form-item label="是否允许自动计量:">
|
|
|
+ <el-select v-model="formModel.isAutoMeter" block>
|
|
|
+ <el-option label="是" :value="1" />
|
|
|
+ <el-option label="否" :value="0" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="isTable" :span="6">
|
|
|
+ <el-form-item label="是否为混凝土节点:">
|
|
|
+ <el-select v-model="formModel.isConcreteNode" block>
|
|
|
+ <el-option label="是" :value="1" />
|
|
|
+ <el-option label="否" :value="0" />
|
|
|
+ </el-select>
|
|
|
+ <!-- <el-input
|
|
|
+ v-model="formModel.isConcreteNode"
|
|
|
+ /> -->
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="isTable && formModel.isConcreteNode === 1" :span="6">
|
|
|
+ <el-form-item label="7d强度比例:" prop="sevenRatio">
|
|
|
+ <el-input
|
|
|
+ v-model="formModel.sevenRatio"
|
|
|
+ type="Number"
|
|
|
+ >
|
|
|
+ <template #append>%</template>
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="isTable && formModel.isConcreteNode === 1" :span="6">
|
|
|
+ <el-form-item label="28d强度比例:" prop="twentyEightRatio">
|
|
|
+ <el-input
|
|
|
+ v-model="formModel.twentyEightRatio"
|
|
|
+ type="Number"
|
|
|
+ >
|
|
|
+ <template #append>%</template>
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col v-if="isTable" :span="12">
|
|
|
+ <el-form-item label="计算式配置:">
|
|
|
+ <el-input
|
|
|
+ v-model="formModel.calculateFormula" :autosize="{ minRows: 4, maxRows: 8 }"
|
|
|
+ type="textarea"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :span="12">
|
|
|
<el-form-item label="备注：">
|
|
|
<el-input
|
|
|
v-model="formModel.remarks" :autosize="{ minRows: 4, maxRows: 8 }"
|
|
|
@@ -142,7 +190,7 @@ import { isNumberReg } from '~uti/tools'
|
|
|
import AddCheckList from './addCheckList.vue'
|
|
|
import unitApi from '~api/project/debit/contract/unit.js'
|
|
|
import { getDictionary } from '~api/other'
|
|
|
-import { getArrValue, getObjValue, isArrIndex, isNullES } from 'js-fast-way'
|
|
|
+import { formValidate, getArrValue, getObjValue, isArrIndex, isNullES } from 'js-fast-way'
|
|
|
import { delMessageV2 } from '~com/message/index.js'
|
|
|
import BigNumber from 'bignumber.js'
|
|
|
|
|
|
@@ -265,7 +313,18 @@ watch(isShow, (val) => {
|
|
|
//弹窗表单
|
|
|
const formRef = ref(null)
|
|
|
// const formModel = ref({})
|
|
|
-const formRules = ref({})
|
|
|
+const formRules = ref({
|
|
|
+ sevenRatio: {
|
|
|
+ required: true,
|
|
|
+ trigger: 'blur',
|
|
|
+ message: '请输入7天强度比例',
|
|
|
+ },
|
|
|
+ twentyEightRatio: {
|
|
|
+ required: true,
|
|
|
+ trigger: 'blur',
|
|
|
+ message: '请输入28天强度比例',
|
|
|
+ },
|
|
|
+})
|
|
|
|
|
|
//列表
|
|
|
const addNodeLoading = ref(false)
|
|
|
@@ -327,6 +386,8 @@ const changeBuildPictureTotal = (row) => {
|
|
|
}
|
|
|
|
|
|
const modalSave = async () => {
|
|
|
+ const isValidate = await formValidate(formRef.value)
|
|
|
+ if (!isValidate) return false
|
|
|
isCanSave.value = isArrIndex(tableData.value, 'isCanSave', true)
|
|
|
// if (isCanSave.value) {
|
|
|
// window.$message.warning('累计分解量 > 合同变更后量,不允许修改')
|
