明树Git Lab

Skip to content

J
jt_front
Commit 9ec31e45 authored by zhanghan's avatar zhanghan
Browse files
Options

1

parent 107054d7
Pipeline #109503 passed with stage
    in 22 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 58 additions and 45 deletions
    src/views/projectManage/addProject.vue
    View file @ 9ec31e45
    ...@@ -2,7 +2,12 @@ ...@@ -2,7 +2,12 @@
    <div class="add-project-container"> <div class="add-project-container">
    <div class="add-project-content" v-loading="loading"> <div class="add-project-content" v-loading="loading">
    <routerBack <routerBack
    :show-save="!loading && !isPreview && (!formData.projectLzType || ['1', '5', '7'].includes(formData.projectLzType.toString()))" :show-save="
    !loading &&
    !isPreview &&
    (!formData.projectLzType ||
    ['1', '5', '7'].includes(formData.projectLzType.toString()))
    "
    :loading="loading" :loading="loading"
    @save="() => saveClick('save')" @save="() => saveClick('save')"
    ></routerBack> ></routerBack>
    ...@@ -361,7 +366,7 @@ ...@@ -361,7 +366,7 @@
    <el-col :span="8"> <el-col :span="8">
    <el-form-item label="汇率"> <el-form-item label="汇率">
    <!-- 999.99 [20,4]--> <!-- 999.99 [20,4]-->
    <el-input-number <el-input
    v-model="formData.huilv" v-model="formData.huilv"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -723,7 +728,7 @@ ...@@ -723,7 +728,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.num" v-model="scope.row.num"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -825,7 +830,7 @@ ...@@ -825,7 +830,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="scope.$index < gdxxData.length - 1" v-if="scope.$index < gdxxData.length - 1"
    v-model="scope.row.cgbl" v-model="scope.row.cgbl"
    :min="0" :min="0"
    ...@@ -851,7 +856,7 @@ ...@@ -851,7 +856,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="scope.$index < gdxxData.length - 1" v-if="scope.$index < gdxxData.length - 1"
    v-model="scope.row.cze" v-model="scope.row.cze"
    :min="0" :min="0"
    ...@@ -879,7 +884,7 @@ ...@@ -879,7 +884,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="scope.$index < gdxxData.length - 1" v-if="scope.$index < gdxxData.length - 1"
    v-model="scope.row.yjzczb" v-model="scope.row.yjzczb"
    :min="0" :min="0"
    ...@@ -907,7 +912,7 @@ ...@@ -907,7 +912,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="scope.$index < gdxxData.length - 1" v-if="scope.$index < gdxxData.length - 1"
    v-model="scope.row.ycxmzbj" v-model="scope.row.ycxmzbj"
    :min="0" :min="0"
    ...@@ -1088,7 +1093,7 @@ ...@@ -1088,7 +1093,7 @@
    <el-table-column prop="dw" label="" width="70" /> <el-table-column prop="dw" label="" width="70" />
    <el-table-column prop="rmbjj" label="人民币计价"> <el-table-column prop="rmbjj" label="人民币计价">
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.rmbjj" v-model="scope.row.rmbjj"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -1115,7 +1120,7 @@ ...@@ -1115,7 +1120,7 @@
    label="投资评估阶段批复值" label="投资评估阶段批复值"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.num" v-model="scope.row.num"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -1172,7 +1177,7 @@ ...@@ -1172,7 +1177,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.dwgczjSz" v-model="scope.row.dwgczjSz"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -1209,7 +1214,7 @@ ...@@ -1209,7 +1214,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.xsfwnlSz" v-model="scope.row.xsfwnlSz"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -1230,7 +1235,7 @@ ...@@ -1230,7 +1235,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.njfhlSz" v-model="scope.row.njfhlSz"
    :min="0" :min="0"
    :max="99999.99" :max="99999.99"
    ...@@ -1251,7 +1256,7 @@ ...@@ -1251,7 +1256,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.dwscfwzcbSz" v-model="scope.row.dwscfwzcbSz"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -1272,7 +1277,7 @@ ...@@ -1272,7 +1277,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.dwsjSz" v-model="scope.row.dwsjSz"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -1318,7 +1323,7 @@ ...@@ -1318,7 +1323,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.ykphdsz" v-model="scope.row.ykphdsz"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -2170,7 +2175,7 @@ ...@@ -2170,7 +2175,7 @@
    </el-col> </el-col>
    <el-col :span="8"> <el-col :span="8">
    <el-form-item label="汇率"> <el-form-item label="汇率">
    <el-input-number <el-input
    v-model="jcFormData.huilv" v-model="jcFormData.huilv"
    :min="0" :min="0"
    controls-position="right" controls-position="right"
    ...@@ -2595,7 +2600,7 @@ ...@@ -2595,7 +2600,7 @@
    </el-table-column> </el-table-column>
    <el-table-column prop="num" label="数量"> <el-table-column prop="num" label="数量">
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.num" v-model="scope.row.num"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -2778,7 +2783,7 @@ ...@@ -2778,7 +2783,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="scope.$index < jcGdxxData.length - 1" v-if="scope.$index < jcGdxxData.length - 1"
    v-model="scope.row.mycgbl" v-model="scope.row.mycgbl"
    :min="0" :min="0"
    ...@@ -2806,7 +2811,7 @@ ...@@ -2806,7 +2811,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="scope.$index < jcGdxxData.length - 1" v-if="scope.$index < jcGdxxData.length - 1"
    v-model="scope.row.cgbl" v-model="scope.row.cgbl"
    :min="0" :min="0"
    ...@@ -2834,7 +2839,7 @@ ...@@ -2834,7 +2839,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="scope.$index < jcGdxxData.length - 1" v-if="scope.$index < jcGdxxData.length - 1"
    v-model="scope.row.lrfpbl" v-model="scope.row.lrfpbl"
    :min="0" :min="0"
    ...@@ -2862,7 +2867,7 @@ ...@@ -2862,7 +2867,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="scope.$index < jcGdxxData.length - 1" v-if="scope.$index < jcGdxxData.length - 1"
    v-model="scope.row.cze" v-model="scope.row.cze"
    :min="0" :min="0"
    ...@@ -2908,7 +2913,7 @@ ...@@ -2908,7 +2913,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="scope.$index < jcGdxxData.length - 1" v-if="scope.$index < jcGdxxData.length - 1"
    v-model="scope.row.yjzczb" v-model="scope.row.yjzczb"
    :min="0" :min="0"
    ...@@ -2936,7 +2941,7 @@ ...@@ -2936,7 +2941,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="scope.$index < jcGdxxData.length - 1" v-if="scope.$index < jcGdxxData.length - 1"
    v-model="scope.row.ycxmzbj" v-model="scope.row.ycxmzbj"
    :min="0" :min="0"
    ...@@ -3862,7 +3867,7 @@ ...@@ -3862,7 +3867,7 @@
    > >
    <template #default="scope_"> <template #default="scope_">
    <!-- 去掉空白单元行 --> <!-- 去掉空白单元行 -->
    <el-input-number <el-input
    v-if=" v-if="
    scope_.row[col.children[1].key] || scope_.row[col.children[1].key] ||
    scope_.row[col.children[1].key] === 0 scope_.row[col.children[1].key] === 0
    ...@@ -3947,7 +3952,7 @@ ...@@ -3947,7 +3952,7 @@
    > >
    <template #default="scope_"> <template #default="scope_">
    <!-- 去掉空白单元行 --> <!-- 去掉空白单元行 -->
    <el-input-number <el-input
    v-if=" v-if="
    scope_.row[col.children[1].key] || scope_.row[col.children[1].key] ||
    scope_.row[col.children[1].key] === 0 scope_.row[col.children[1].key] === 0
    ...@@ -4032,7 +4037,7 @@ ...@@ -4032,7 +4037,7 @@
    > >
    <template #default="scope_"> <template #default="scope_">
    <!-- 去掉空白单元行 --> <!-- 去掉空白单元行 -->
    <el-input-number <el-input
    v-if=" v-if="
    scope_.row[col.children[1].key] || scope_.row[col.children[1].key] ||
    scope_.row[col.children[1].key] === 0 scope_.row[col.children[1].key] === 0
    ...@@ -4117,7 +4122,7 @@ ...@@ -4117,7 +4122,7 @@
    > >
    <template #default="scope_"> <template #default="scope_">
    <!-- 去掉空白单元行 --> <!-- 去掉空白单元行 -->
    <el-input-number <el-input
    v-if=" v-if="
    scope_.row[col.children[1].key] || scope_.row[col.children[1].key] ||
    scope_.row[col.children[1].key] === 0 scope_.row[col.children[1].key] === 0
    ...@@ -4199,7 +4204,7 @@ ...@@ -4199,7 +4204,7 @@
    > >
    <template #default="scope_"> <template #default="scope_">
    <!-- 去掉空白单元行 --> <!-- 去掉空白单元行 -->
    <el-input-number <el-input
    v-if=" v-if="
    scope_.row[col.children[1].key] || scope_.row[col.children[1].key] ||
    scope_.row[col.children[1].key] === 0 scope_.row[col.children[1].key] === 0
    ...@@ -4249,7 +4254,7 @@ ...@@ -4249,7 +4254,7 @@
    <el-table-column prop="dw" label="" width="70" /> <el-table-column prop="dw" label="" width="70" />
    <el-table-column prop="rmbjj" label="人民币计价"> <el-table-column prop="rmbjj" label="人民币计价">
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-if="!['一', '二'].includes(scope.row.xh)" v-if="!['一', '二'].includes(scope.row.xh)"
    v-model="scope.row.rmbjj" v-model="scope.row.rmbjj"
    :min="0" :min="0"
    ...@@ -4281,7 +4286,7 @@ ...@@ -4281,7 +4286,7 @@
    v-model="scope.row.num" v-model="scope.row.num"
    v-if="scope.row.type === 'year'" v-if="scope.row.type === 'year'"
    /> />
    <el-input-number <el-input
    v-else v-else
    v-model="scope.row.num" v-model="scope.row.num"
    :min="0" :min="0"
    ...@@ -4339,7 +4344,7 @@ ...@@ -4339,7 +4344,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.dwgczjSz" v-model="scope.row.dwgczjSz"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -4376,7 +4381,7 @@ ...@@ -4376,7 +4381,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.xsfwnlSz" v-model="scope.row.xsfwnlSz"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -4397,7 +4402,7 @@ ...@@ -4397,7 +4402,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.njfhlSz" v-model="scope.row.njfhlSz"
    :min="0" :min="0"
    :max="99999.99" :max="99999.99"
    ...@@ -4418,7 +4423,7 @@ ...@@ -4418,7 +4423,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.dwscfwzcbSz" v-model="scope.row.dwscfwzcbSz"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -4439,7 +4444,7 @@ ...@@ -4439,7 +4444,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.dwsjSz" v-model="scope.row.dwsjSz"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -4485,7 +4490,7 @@ ...@@ -4485,7 +4490,7 @@
    width="180" width="180"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.ykphdsz" v-model="scope.row.ykphdsz"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -5262,7 +5267,7 @@ ...@@ -5262,7 +5267,7 @@
    </el-table-column> </el-table-column>
    <el-table-column prop="je" label="金额"> <el-table-column prop="je" label="金额">
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.je" v-model="scope.row.je"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -5364,7 +5369,7 @@ ...@@ -5364,7 +5369,7 @@
    </el-col> </el-col>
    <el-col :span="8"> <el-col :span="8">
    <el-form-item label="金额"> <el-form-item label="金额">
    <el-input-number <el-input
    v-model="jcFormData.zbjje" v-model="jcFormData.zbjje"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -5402,7 +5407,7 @@ ...@@ -5402,7 +5407,7 @@
    </el-col> </el-col>
    <el-col :span="8"> <el-col :span="8">
    <el-form-item label="金额"> <el-form-item label="金额">
    <el-input-number <el-input
    v-model="jcFormData.dkbje" v-model="jcFormData.dkbje"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -5802,7 +5807,7 @@ ...@@ -5802,7 +5807,7 @@
    label="净现金流（万元）" label="净现金流（万元）"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.je" v-model="scope.row.je"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -5852,7 +5857,7 @@ ...@@ -5852,7 +5857,7 @@
    label="净利润（万元）" label="净利润（万元）"
    > >
    <template #default="scope"> <template #default="scope">
    <el-input-number <el-input
    v-model="scope.row.je" v-model="scope.row.je"
    :min="0" :min="0"
    :max="99999999999.99999999" :max="99999999999.99999999"
    ...@@ -7393,7 +7398,7 @@ const changeJcTzznyjfl = (val) => { ...@@ -7393,7 +7398,7 @@ const changeJcTzznyjfl = (val) => {
    let hylxList = reactive([]); // 会议类型 let hylxList = reactive([]); // 会议类型
    let jcspyjlx = reactive([]); // 决策审批意见类型 let jcspyjlx = reactive([]); // 决策审批意见类型
    let isPreview = !!route.query.isPreview; let isPreview = !!(route.query.isPreview || route.query.isProjectView);
    let projectId = route.query.projectId; let projectId = route.query.projectId;
    const getProjectInfo = () => { const getProjectInfo = () => {
    loading.value = true; loading.value = true;
    ...@@ -7403,12 +7408,14 @@ const getProjectInfo = () => { ...@@ -7403,12 +7408,14 @@ const getProjectInfo = () => {
    id: projectId, id: projectId,
    }, },
    callback: (res) => { callback: (res) => {
    console.log(res, "resresres");
    loading.value = false; loading.value = false;
    let data = res.lixiang || {}; let data = res.lixiang || {};
    if (data.del === 1) { if (data.del === 1) {
    ElMessage.warning("该条数据已被删除"); ElMessage.warning("该条数据已被删除");
    } }
    Object.assign(formData, data); Object.assign(formData, data);
    Object.assign(swlzbData, data.projectJsgms); Object.assign(swlzbData, data.projectJsgms);
    Object.assign(gdxxData, data.projectGdxxs.concat([{}])); Object.assign(gdxxData, data.projectGdxxs.concat([{}]));
    changeGdxxSums(); changeGdxxSums();
    ...@@ -7704,6 +7711,8 @@ const getLrbData = () => { ...@@ -7704,6 +7711,8 @@ const getLrbData = () => {
    // 保存数据 // 保存数据
    const saveClick = (type) => { const saveClick = (type) => {
    if (!formData.projectLzType || formData.projectLzType.toString() === "1") { if (!formData.projectLzType || formData.projectLzType.toString() === "1") {
    console.log("111111");
    let url = formData.id let url = formData.id
    ? type === "submit" ? type === "submit"
    ? "startLixiang" ? "startLixiang"
    ...@@ -7731,12 +7740,17 @@ const saveClick = (type) => { ...@@ -7731,12 +7740,17 @@ const saveClick = (type) => {
    data: params, data: params,
    callback: (data) => { callback: (data) => {
    router.push("/projectDraft"); router.push("/projectDraft");
    router.back(-1);
    }, },
    }); });
    } else if ( } else if (
    jcFormData.projectLzType.toString() === "5" || jcFormData.projectLzType.toString() === "5" ||
    jcFormData.projectLzType.toString() === "7" jcFormData.projectLzType.toString() === "7" ||
    jcFormData.projectLzType.toString() === "8" ||
    jcFormData.projectLzType.toString() === "9"
    ) { ) {
    console.log("22222");
    let url = type === "submit" ? "startJuece" : "saveJuece"; let url = type === "submit" ? "startJuece" : "saveJuece";
    let gdxxNewArr = JSON.parse(JSON.stringify(jcGdxxData)); let gdxxNewArr = JSON.parse(JSON.stringify(jcGdxxData));
    gdxxNewArr.splice(-1); gdxxNewArr.splice(-1);
    ......
    src/views/projectManage/projectAllPage.vue
    View file @ 9ec31e45
    ...@@ -253,11 +253,10 @@ const handleCurrentPageChange = (page) => { ...@@ -253,11 +253,10 @@ const handleCurrentPageChange = (page) => {
    currentPage.value = page; currentPage.value = page;
    getProjectData(searchForm.value); getProjectData(searchForm.value);
    }; };
    const previewProject = (item) => { const previewProject = (item) => {
    router.push({ router.push({
    name: "xmdakDetaill", name: "xmdakDetaill",
    // name: "addProject",
    query: { query: {
    projectId: item.id, projectId: item.id,
    }, },
    ......
    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