Merge remote-tracking branch 'origin/master'

src/views/project/debit/contract/check-list.vue

@@ -56,7 +56,7 @@
                     <template v-if="menuType === 'add'">
                         <el-col :span="8">
                             <el-form-item label="清单节点：">
-                                <el-select v-model="formModel.isFormNode" block>
+                                <el-select v-model="formModel.isFormNode" block @change="changeAddFormType">
                                     <el-option label="是" :value="1" />
                                     <el-option label="否" :value="0" />
                                 </el-select>
@@ -64,12 +64,12 @@
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="中标单价：">
-                                <el-input v-model="formModel.bidPrice" :disabled="treeItem.isFormNode === 0" />
+                                <el-input-number v-model="formModel.bidPrice" :disabled="treeItem.isFormNode === 0" :controls="false" :min="0" class="w-100" :precision="2" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="合同数量：">
-                                <el-input v-model="formModel.contractTotal" :disabled="treeItem.isFormNode === 0" />
+                                <el-input-number v-model="formModel.contractTotal" :disabled="treeItem.isFormNode === 0" :controls="false" :min="0" class="w-100" :precision="2" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
@@ -94,27 +94,27 @@
                     <template v-if="menuType === 'edit' && treeItem.isFormNode === 1">
                         <el-col :span="8">
                             <el-form-item label="中标单价：">
-                                <el-input v-model="formModel.bidPrice" />
+                                <el-input-number v-model="formModel.bidPrice" :controls="false" :min="0" class="w-100" :precision="2" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="现行单价：">
-                                <el-input v-model="formModel.currentPrice" disabled />
+                                <el-input-number v-model="formModel.currentPrice" disabled :controls="false" :min="0" class="w-100" :precision="2" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="变更后单价：">
-                                <el-input v-model="formModel.changePrice" disabled />
+                                <el-input-number v-model="formModel.changePrice" disabled :controls="false" :min="0" class="w-100" :precision="2" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="合同数量：">
-                                <el-input v-model="formModel.contractTotal" />
+                                <el-input-number v-model="formModel.contractTotal" :controls="false" :min="0" class="w-100" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="变更后数量：">
-                                <el-input v-model="formModel.changeTotal" disabled />
+                                <el-input-number v-model="formModel.changeTotal" disabled :controls="false" :min="0" class="w-100" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
@@ -127,12 +127,12 @@
                     <template v-if="menuType === 'edit'">
                         <el-col :span="8">
                             <el-form-item label="合同金额：">
-                                <el-input v-model="formModel.contractMoney" disabled />
+                                <el-input-number v-model="formModel.contractMoney" disabled :controls="false" :min="0" class="w-100" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="变更后金额：">
-                                <el-input v-model="formModel.changeMoney" disabled />
+                                <el-input-number v-model="formModel.changeMoney" disabled :controls="false" :min="0" class="w-100" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="8">
@@ -142,7 +142,11 @@
                         </el-col>
                         <el-col :span="24">
                             <el-form-item label="清单节点：">
-                                <el-select v-model="formModel.isFormNode" block>
+                                <el-select v-if="treeItem.isFormNode === 0" v-model="formModel.isFormNode" block @change="FchangeIsForm">
+                                    <el-option label="是" :value="1" />
+                                    <el-option label="否" :value="0" />
+                                </el-select>
+                                <el-select v-if="treeItem.isFormNode === 1" v-model="formModel.isFormNode" block @click="IchangeIsForm">
                                     <el-option label="是" :value="1" />
                                     <el-option label="否" :value="0" />
                                 </el-select>
@@ -449,8 +453,9 @@ const treeMenuTap = ({ key, data, node }) => {
             treeModalTitle.value = '新增合同工程清单'
             treeModalShow.value = true
             formModel.value = {
-                isFormNode:1,
+                isFormNode:0,
                 formType:data?.formType,
+                chapterNumber:data?.chapterNumber,
                 contractId:contractId.value,
                 projectId:projectId.value,
                 parentId:data.id,
@@ -489,6 +494,31 @@ const treeMenuTap = ({ key, data, node }) => {
         handleLockNode()
     }
 }
+//、新增修改是否为清单节点限制
+const changeAddFormType = (val)=>{
+    const { formType } = treeItem.value
+    if (formType === 1 && val === 1) {
+        window.$message.warning('非清单节点才可新增下级清单节点')
+    }
+}
+//修改非清单节点是否为清单节点限制
+const FchangeIsForm = (val)=>{
+    const { hasChild } = treeItem.value
+    if (hasChild && val === 1) {
+        window.$message.warning('该节点下面存在子节点，不允许修改为清单节点')
+        formModel.value.isFormNode = 0
+        
+    }
+}
+//修改清单节点是否为清单节点限制
+const IchangeIsForm = (val)=>{
+    const { citeStatus } = treeItem.value
+    if (citeStatus && val === 0) {
+        window.$message.warning('当前清单已经被计量引用，则不允许修改为非清单节点')
+        formModel.value.isFormNode = 1
+        
+    }
+}
 //删除节点
 const delModalClick = () => {
     delMessageV2(async (action, instance, done) => {
@@ -662,14 +692,17 @@ const addsupply = ()=>{
     supplementsFormModel.value = {
         isFormNode:1,
         isSupplement:1,
-        formType:treeItem.value?.formType,
+        chapterNumber:treeItem.value?.chapterNumber,
+  
     }
     supplementsModalShow.value = true
 }
 const supplementsModalSave = async () => {
+    supplementsFormModel.value.isSupplement = 1
     console.log(supplementsFormModel.value, 'val')
     const res = await formValidate(supplementsFormRef.value)
     if (res) {
+       
         const { error, code } = await addNode({
             ...supplementsFormModel.value,
             isSupplement:1,

src/views/project/debit/contract/components/unit/row-data.vue

@@ -52,16 +52,16 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="施工金额：">
-                            <el-input v-model="formModel.buildPictureMoney" placeholder="施工图金额" disabled>
+                            <el-input-number v-model="formModel.buildPictureMoney" placeholder="施工图金额" disabled :controls="false" :min="0" class="w-100" :precision="2">
                                 <template #suffix>元</template>
-                            </el-input>
+                            </el-input-number>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="变更金额：">
-                            <el-input v-model="formModel.changeMoney" placeholder="变更后金额" disabled>
+                            <el-input-number v-model="formModel.changeMoney" placeholder="变更后金额" disabled :controls="false" :min="0" class="w-100" :precision="2">
                                 <template #suffix>元</template>
-                            </el-input>
+                            </el-input-number>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">

src/views/project/debit/contract/components/unit/tree-form.vue

@@ -113,11 +113,7 @@ const setSplitRef = () => {
     })
 }
 
-const treeDataList = ref([
-    { name: '测试' },
-    { name: '临时道路修建、养护与拆除(包括原道路的养护费)' },
-    { name: '征地拆迁放样（含挖边沟、埋界桩）' },
-])
+const treeDataList = ref([])
 const treeListClick = (item) => {
     tableData.value.push({
         nodeName: item.nodeName,
@@ -171,6 +167,7 @@ const modalSave = async () => {
         addNodeLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success(msg)
+            tableData.value = []
      
         }
         emit('finish')