duy 1 年之前
父節點
當前提交
311e55eacf

+ 14 - 8
src/views/debit-pay/material/components/order/dataModal.vue

@@ -30,22 +30,22 @@
                             </el-col>
                             <el-col :span="8">
                                 <el-form-item label="单价:">
-                                    <el-input v-model="baseForm.price" />
+                                    <el-input v-model="baseForm.price" :controls="false" :min="0" class="w-100" :precision="2" @change="calculate" />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
                                 <el-form-item label="数量:">
-                                    <el-input v-model="baseForm.meterAmount" />
+                                    <el-input-number v-model="baseForm.meterAmount" :controls="false" class="w-100" @change="calculate" />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
                                 <el-form-item label="计量金额:">
-                                    <el-input v-model="baseForm.meterMoney" disabled />
+                                    <el-input v-model="baseForm.meterMoney" disabled :controls="false" :min="0" class="w-100" :precision="2" />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
                                 <el-form-item label="业务日期:">
-                                    <el-date-picker v-model="baseForm.businessDate" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" disabled />
+                                    <el-date-picker v-model="baseForm.businessDate" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD" />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
@@ -162,7 +162,10 @@ watch(isShow, (val) => {
         detailsModalShow()
     }
 })
-
+//计算计量金额
+const calculate = ()=>{
+    baseForm.value.meterMoney = baseForm.value?.meterAmount * baseForm.value?.price
+}
 const detailsModalShow = () => {
     nextTick(() => {
         window.$split(['#hc_modal_tree', '#hc_modal_form'], {
@@ -183,6 +186,9 @@ const getKey1Data = async ()=>{
     })
     if (!error && code === 200) {
         key1Data.value = getArrValue(data)
+        if (key1Data.value.length > 0) {
+            baseForm.value.meterPeriodId = key1Data.value[0].id
+        }
     } else {
         key1Data.value = []
     }
@@ -210,9 +216,9 @@ const getTreeData = async ()=>{
 const treeItem = ref({})
 const treeClick = ({ node, data, keys })=>{
     treeItem.value = data
-    if (key1Data.value.length > 0) {
-        baseForm.value.meterPeriodId = key1Data.value[0].id
-    }
+    baseForm.value.contractMaterialName = data.materialName
+    baseForm.value.price = data.price
+ 
 }
 
 

+ 4 - 0
src/views/debit-pay/material/order.vue

@@ -141,6 +141,10 @@ const getKey1Data = async ()=>{
     tableLoading.value = false
     if (!error && code === 200) {
         key1Data.value = getArrValue(data)
+        if (key1Data.value.length > 0) {
+            searchForm.value.meterPeriodId = key1Data.value[0].id
+        }
+        
     } else {
         key1Data.value = []
     }

+ 1 - 1
src/views/debit-pay/material/periods.vue

@@ -87,7 +87,7 @@ defineOptions({
 
 //获取年月等相关日期数据
 const year = Number(dayjs().format('YYYY')) + 8
-const yearData = getYearList(year, 2010)
+const yearData = getYearList(year, 2018)
 const monthData = getMonthList()
 
 //渲染完成

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

@@ -160,7 +160,7 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
+                    <el-col v-if="menuType === 'edit'" :span="8">
                         <el-form-item label="章编号:">
                             <el-input v-model="formModel.chapterNumber" :disabled="treeItem.nodeTier !== 0" />
                         </el-form-item>