中期支付项修改

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

@@ -10,7 +10,7 @@
                 </el-form-item>
                 <el-form-item label="支付项类型：">
                     <el-select v-model="formModel.payType" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option v-for="item in payOptions" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
                     </el-select>
                 </el-form-item>
                 <el-form-item class="nowrap" label="合同计算公式：">
@@ -30,27 +30,31 @@
                 </el-form-item>
                 <el-form-item label="是否为扣款项：">
                     <el-select v-model="formModel.isDeduct" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option label="是" :value="1" />
+                        <el-option label="否" :value="0" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="是否加粗：">
                     <el-select v-model="formModel.isBoldText" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option label="是" :value="1" />
+                        <el-option label="否" :value="0" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="是否手动输入：">
                     <el-select v-model="formModel.isManualInput" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option label="是" :value="1" />
+                        <el-option label="否" :value="0" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="是否显示百分比：">
                     <el-select v-model="formModel.isShowPercent" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option label="是" :value="1" />
+                        <el-option label="否" :value="0" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="支付项适用类型：">
                     <el-select v-model="formModel.payApplicableType" block>
-                        <el-option label="xx项" :value="1" />
+                        < <el-option v-for="item in payAppOptions" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="排序号：">
@@ -69,8 +73,9 @@
 import { ref, watch } from 'vue'
 import HcFormula from './formula.vue'
 import payApi from '~api/project/debit/contract/pay.js'
-import { getObjValue } from 'js-fast-way'
+import { getArrValue, getObjValue } from 'js-fast-way'
 import { useAppStore } from '~src/store'
+import { getDictionary } from '~api/other'
 const props = defineProps({
     ids: {
         type: [String, Number],
@@ -139,4 +144,26 @@ const isFormulaShow = ref(false)
 const formulaClick = () => {
     isFormulaShow.value = true
 }
+//获支付项类型
+const payOptions = ref([])
+const gePayType = async () => {
+    const { data } = await getDictionary({
+        code: 'meter_pay_type',
+    })
+    payOptions.value = getArrValue(data)
+    payOptions.value.forEach((ele)=>{
+        ele.dictKey = Number(ele.dictKey)
+    })
+}
+//获支付项适用类型
+const payAppOptions = ref([])
+const gePayAppType = async () => {
+    const { data } = await getDictionary({
+        code: 'meter_pay_applicable_type',
+    })
+    payAppOptions.value = getArrValue(data)
+    payAppOptions.value.forEach((ele)=>{
+        ele.dictKey = Number(ele.dictKey)
+    })
+}
 </script>

src/views/project/debit/contract/pay.vue

@@ -120,10 +120,10 @@ const tableLoading = ref(false)
 const tableColumn = ref([
     { key: 'payNumber', name: '支付项编号', width: 140 },
     { key: 'payName', name: '支付项名称' },
-    { key: 'payType', name: '支付项类型', width: 160 },
+    { key: 'payTypeName', name: '支付项类型', width: 160 },
     { key: 'isDeduct', name: '是否为扣款项', width: 100 },
     { key: 'isTotalTerms', name: '是否合计项', width: 100 },
-    { key: 'payApplicableType', name: '适用类型', width: 100 },
+    { key: 'payApplicableTypeName', name: '适用类型', width: 100 },
     { key: 'action', name: '操作', width: 100 },
 ])
 const tableData = ref([])
@@ -164,7 +164,7 @@ const finishSystemPay = ()=>{
 const tableColumn1 = ref([
     { key: 'payNumber', name: '支付项编号' },
     { key: 'payName', name: '支付项名称' },
-    { key: 'payType', name: '支付项类型' },
+    { key: 'payTypeName', name: '支付项类型' },
     { key: 'contractFormulaIds', name: '合同计算公式' },
     { key: 'updateFormulaIds', name: '变更计算公式' },
     { key: 'currentFormulaIds', name: '本期计算公式' },

src/views/project/debit/project/components/pay/row-data.vue

@@ -10,7 +10,7 @@
                 </el-form-item>
                 <el-form-item label="支付项类型：">
                     <el-select v-model="formModel.payType" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option v-for="item in payOptions" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
                     </el-select>
                 </el-form-item>
                 <el-form-item class="nowrap" label="合同计算公式：">
@@ -30,27 +30,31 @@
                 </el-form-item>
                 <el-form-item label="是否为扣款项：">
                     <el-select v-model="formModel.isDeduct" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option label="是" :value="1" />
+                        <el-option label="否" :value="0" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="是否加粗：">
                     <el-select v-model="formModel.isBoldText" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option label="是" :value="1" />
+                        <el-option label="否" :value="0" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="是否手动输入：">
                     <el-select v-model="formModel.isManualInput" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option label="是" :value="1" />
+                        <el-option label="否" :value="0" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="是否显示百分比：">
                     <el-select v-model="formModel.isShowPercent" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option label="是" :value="1" />
+                        <el-option label="否" :value="0" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="支付项适用类型：">
                     <el-select v-model="formModel.payApplicableType" block>
-                        <el-option label="xx项" :value="1" />
+                        <el-option v-for="item in payAppOptions" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="排序号：">
@@ -69,8 +73,9 @@
 import { ref, watch } from 'vue'
 import HcFormula from './formula.vue'
 import payApi from '~api/project/debit/project/pay.js'
-import { getObjValue } from 'js-fast-way'
+import { getArrValue, getObjValue } from 'js-fast-way'
 import { useAppStore } from '~src/store'
+import { getDictionary } from '~api/other'
 const props = defineProps({
     ids: {
         type: [String, Number],
@@ -99,12 +104,37 @@ const getDetail = async (id)=>{
         formModel.value = {}
     }
 }
+//获支付项类型
+const payOptions = ref([])
+const gePayType = async () => {
+    const { data } = await getDictionary({
+        code: 'meter_pay_type',
+    })
+    payOptions.value = getArrValue(data)
+    payOptions.value.forEach((ele)=>{
+        ele.dictKey = Number(ele.dictKey)
+    })
+}
+//获支付项适用类型
+const payAppOptions = ref([])
+const gePayAppType = async () => {
+    const { data } = await getDictionary({
+        code: 'meter_pay_applicable_type',
+    })
+    payAppOptions.value = getArrValue(data)
+    payAppOptions.value.forEach((ele)=>{
+        ele.dictKey = Number(ele.dictKey)
+    })
+}
 //监听
 watch(() => [
     props.ids,
 ], ([ids]) => {
+    gePayType()
+    gePayAppType()
     console.log('ids', ids)
     getDetail(ids)
+    
 }, { immediate: true })
 
 //监听

src/views/project/debit/project/pay.vue

@@ -79,6 +79,7 @@ import payApi from '~api/project/debit/project/pay.js'
 import { arrToId, getArrValue, getObjValue } from 'js-fast-way'
 import { useAppStore } from '~src/store'
 import { delMessageV2 } from '~com/message/index.js'
+import { getDictionary } from '~api/other'
 const useAppState = useAppStore()
 const projectId = ref(useAppState.getProjectId)
 defineOptions({
@@ -90,6 +91,8 @@ const uuid = getRandom(4)
 //渲染完成
 onMounted(() => {
     setSplitRef()
+    gePayType()
+    gePayAppType()
     getTableData()
 })
 
@@ -105,6 +108,29 @@ const setSplitRef = () => {
     })
 }
 
+//获支付项类型
+const payOptions = ref([])
+const gePayType = async () => {
+    const { data } = await getDictionary({
+        code: 'meter_pay_type',
+    })
+    payOptions.value = getArrValue(data)
+    payOptions.value.forEach((ele)=>{
+        ele.dictKey = Number(ele.dictKey)
+    })
+}
+
+//获支付项适用类型
+const payAppOptions = ref([])
+const gePayAppType = async () => {
+    const { data } = await getDictionary({
+        code: 'meter_pay_applicable_type',
+    })
+    payAppOptions.value = getArrValue(data)
+    payAppOptions.value.forEach((ele)=>{
+        ele.dictKey = Number(ele.dictKey)
+    })
+}
 //搜索表单
 const searchForm = ref({ current: 1, size: 10, total: 0 })
 
@@ -119,10 +145,10 @@ const tableLoading = ref(false)
 const tableColumn = ref([
     { key: 'payNumber', name: '支付项编号', width: 140 },
     { key: 'payName', name: '支付项名称' },
-    { key: 'payType', name: '支付项类型', width: 160 },
+    { key: 'payTypeName', name: '支付项类型', width: 160 },
     { key: 'isDeduct', name: '是否为扣款项', width: 100 },
     { key: 'isTotalTerms', name: '是否合计项', width: 100 },
-    { key: 'payApplicableType', name: '适用类型', width: 100 },
+    { key: 'payApplicableTypeName', name: '适用类型', width: 100 },
     { key: 'action', name: '操作', width: 100 },
 ])
 const tableData = ref([])
@@ -163,7 +189,7 @@ const finishSystemPay = ()=>{
 const tableColumn1 = ref([
     { key: 'payNumber', name: '支付项编号' },
     { key: 'payName', name: '支付项名称' },
-    { key: 'payType', name: '支付项类型' },
+    { key: 'payTypeName', name: '支付项类型' },
     { key: 'contractFormulaIds', name: '合同计算公式' },
     { key: 'updateFormulaIds', name: '变更计算公式' },
     { key: 'currentFormulaIds', name: '本期计算公式' },
@@ -275,7 +301,7 @@ const removeCollectPay = async (id) => {
 const tableCollectColumn = ref([
     { key: 'payNumber', name: '支付项编号' },
     { key: 'payName', name: '支付项名称' },
-    { key: 'payType', name: '支付项类型' },
+    { key: 'payTypeName', name: '支付项类型' },
     { key: 'isDeduct', name: '是否为扣款项' },
     { key: 'isTotalTerms', name: '是否合计项' },
     { key: 'payApplicableType', name: '支付项适用类型' },