明树Git Lab

Skip to content

J
jt_front
Commit 2d120db9 authored by zhanghan's avatar zhanghan
Browse files
Options

对应排序问题解决

parent 1aa77543
Pipeline #109375 passed with stage
    in 21 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 71 additions and 67 deletions
    src/views/castbehind/investmentCecoveryAdd.vue
    View file @ 2d120db9
    ......@@ -12,7 +12,7 @@
    >
    <el-collapse-item title="项目基本信息" name="项目基本信息">
    <el-row :gutter="24">
    <el-col :span="12">
    <el-col :span="24">
    <el-form-item label="年度" required>
    <el-date-picker
    v-model="formData.nd"
    ......@@ -41,14 +41,6 @@
    </el-select>
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label="所属行业">
    <CommonSelector
    v-model="formData.sshy"
    dictName="participation_industry"
    />
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label="项目公司名称">
    <el-input
    ......@@ -75,7 +67,7 @@
    />
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-col :span="6">
    <el-form-item label="项目阶段">
    <CommonSelector
    v-model="formData.xmjd"
    ......@@ -84,7 +76,15 @@
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-col :span="6">
    <el-form-item label="财务报表类型">
    <CommonSelector
    v-model="formData.cwbblx"
    dictName="cwbblx"
    />
    </el-form-item>
    </el-col>
    <el-col :span="6">
    <el-form-item label="项目类别">
    <CommonSelector
    v-model="formData.xmlx"
    ......@@ -92,7 +92,17 @@
    ></CommonSelector>
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-col :span="6">
    <el-form-item label="所属行业">
    <CommonSelector
    v-model="formData.sshy"
    dictName="participation_industry"
    />
    </el-form-item>
    </el-col>
    <el-col :span="6">
    <el-form-item label="投资模式分类">
    <CommonSelector
    v-model="formData.tzms"
    ......@@ -100,7 +110,7 @@
    />
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-col :span="6">
    <el-form-item label="投资回收方式">
    <CommonSelector
    v-model="formData.tzhsfs"
    ......@@ -109,7 +119,7 @@
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-col :span="6">
    <el-form-item label="下年项目阶段">
    <CommonSelector
    v-model="formData.xnxmjd"
    ......@@ -117,14 +127,6 @@
    />
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label="财务报表类型">
    <CommonSelector
    v-model="formData.cwbblx"
    dictName="cwbblx"
    />
    </el-form-item>
    </el-col>
    </el-row>
    <DynamicTable
    :columns="transferColumns"
    ......@@ -140,7 +142,7 @@
    ><el-row gutter="20">
    <el-col :span="12">
    <el-form-item
    label-width="260px"
    label-width="160px"
    label="项目投资总额（决策值）"
    >
    <el-input
    ......@@ -156,7 +158,7 @@
    </el-col>
    <el-col :span="12">
    <el-form-item
    label-width="260px"
    label-width="160px"
    label="我方资本金出资额-决策值"
    >
    <el-input
    ......@@ -171,7 +173,7 @@
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label-width="260px" label="投资总额-实际值">
    <el-form-item label-width="160px" label="投资总额-实际值">
    <el-input
    precision="2"
    v-model="formData.tzzesj"
    ......@@ -185,7 +187,7 @@
    </el-col>
    <el-col :span="12">
    <el-form-item
    label-width="260px"
    label-width="160px"
    label="我方资本金出资额--实际值"
    >
    <el-input
    ......@@ -200,7 +202,7 @@
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label-width="260px" label="投资总额-计划值">
    <el-form-item label-width="160px" label="投资总额-计划值">
    <el-input
    precision="2"
    v-model="formData.tzzejhz"
    ......@@ -222,7 +224,7 @@
    <el-row gutter="20">
    <el-col :span="12">
    <el-form-item
    label-width="260px"
    label-width="160px"
    label="本年完成 投资回收决策目标值"
    >
    <el-input
    ......@@ -239,7 +241,7 @@
    </el-col>
    <el-col :span="12">
    <el-form-item
    label-width="260px"
    label-width="160px"
    label="截止本年累计（决策目标值）"
    >
    <el-input
    ......@@ -255,7 +257,7 @@
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label-width="260px" label="下一年完成数">
    <el-form-item label-width="160px" label="下一年完成数">
    <el-input
    precision="2"
    v-model="formData.xynwcs"
    ......@@ -269,7 +271,7 @@
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label-width="260px" label="本年计划">
    <el-form-item label-width="160px" label="本年计划">
    <el-input
    precision="2"
    v-model="formData.bnjh"
    ......@@ -285,7 +287,7 @@
    <el-col :span="12">
    <el-form-item
    label-width="260px"
    label-width="160px"
    label="本年完成--投资回收实际值"
    >
    <el-input
    ......@@ -302,7 +304,7 @@
    </el-col>
    <el-col :span="12">
    <el-form-item
    label-width="260px"
    label-width="160px"
    label="截止本年累计--投资回收实际值"
    >
    <el-input
    ......@@ -318,7 +320,7 @@
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label-width="260px" label="累计欠收">
    <el-form-item label-width="160px" label="累计欠收">
    <el-input
    precision="2"
    v-model="formData.ljqs"
    ......@@ -332,7 +334,7 @@
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label-width="260px" label="完成率">
    <el-form-item label-width="160px" label="完成率">
    <el-input
    precision="2"
    v-model="formData.wcl"
    ......@@ -547,10 +549,10 @@ const transferColumns = ref([
    },
    {
    prop: "njfcgqk",
    label: "能建方持股情况",
    label: "能建外持股比例情况",
    type: "textarea",
    headerGroup: "能建以外",
    placeholder: "请填写能建方持股情况",
    placeholder: "请填写能建外持股比例情况",
    },
    {
    prop: "zwfcgbl",
    ......
    src/views/investingManage/constructionTimeAdd.vue
    View file @ 2d120db9
    ......@@ -5,14 +5,14 @@
    <div class="tabs-content">
    <div class="project-tab-content-wrapper">
    <div class="tab-content">
    <el-form :model="formData" label-width="150" :disabled="isPreview">
    <el-form :model="formData" label-width="120" :disabled="isPreview">
    <el-collapse
    v-model="activeCollapse"
    v-collapse-nav="navigationItems"
    >
    <el-collapse-item title="项目基本信息" name="项目基本信息">
    <el-row :gutter="24">
    <el-col :span="12">
    <el-col :span="24">
    <el-form-item label="年度" required>
    <el-date-picker
    v-model="formData.nd"
    ......@@ -41,14 +41,6 @@
    </el-select>
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label="所属行业">
    <CommonSelector
    v-model="formData.sshy"
    dictName="participation_industry"
    />
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label="项目公司名称">
    <el-input
    ......@@ -75,7 +67,7 @@
    />
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-col :span="6">
    <el-form-item label="项目阶段">
    <CommonSelector
    v-model="formData.xmjd"
    ......@@ -84,7 +76,15 @@
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-col :span="6">
    <el-form-item label="财务报表类型">
    <CommonSelector
    v-model="formData.cwbblx"
    dictName="cwbblx"
    />
    </el-form-item>
    </el-col>
    <el-col :span="6">
    <el-form-item label="项目类别">
    <CommonSelector
    v-model="formData.xmlx"
    ......@@ -92,7 +92,17 @@
    ></CommonSelector>
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-col :span="6">
    <el-form-item label="所属行业">
    <CommonSelector
    v-model="formData.sshy"
    dictName="participation_industry"
    />
    </el-form-item>
    </el-col>
    <el-col :span="6">
    <el-form-item label="投资模式分类">
    <CommonSelector
    v-model="formData.tzms"
    ......@@ -100,7 +110,7 @@
    />
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-col :span="6">
    <el-form-item label="投资回收方式">
    <CommonSelector
    v-model="formData.tzhsfs"
    ......@@ -109,7 +119,7 @@
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-col :span="6">
    <el-form-item label="下年项目阶段">
    <CommonSelector
    v-model="formData.xnxmjd"
    ......@@ -117,14 +127,6 @@
    />
    </el-form-item>
    </el-col>
    <el-col :span="12">
    <el-form-item label="财务报表类型">
    <CommonSelector
    v-model="formData.cwbblx"
    dictName="cwbblx"
    />
    </el-form-item>
    </el-col>
    </el-row>
    <DynamicTable
    :columns="transferColumns"
    ......@@ -538,6 +540,13 @@ const transferColumns = ref([
    headerGroup: "能建内容",
    placeholder: "请填写能建方持股比例",
    },
    {
    prop: "njwcgblqk",
    label: "能建外持股比例情况",
    type: "textarea",
    headerGroup: "能建以外",
    placeholder: "请填写能建外持股比例情况",
    },
    {
    prop: "zwfcgbl",
    label: "政府方持股比例",
    ......@@ -553,13 +562,6 @@ const transferColumns = ref([
    placeholder: "请填写能建方持股比例情况",
    },
    {
    prop: "njfcgqk",
    label: "能建方持股情况",
    type: "textarea",
    headerGroup: "能建以外",
    placeholder: "请填写能建方持股情况",
    },
    {
    prop: "jjcgbl",
    label: "基金持股比例",
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment