数据定价更新

lxs
Showing 3 changed files with 81 additions and 28 deletions
src/router/modules/dataPricing.ts
src/views/data_entry/index.vue
src/views/data_pricing/calculateConfig.vue
--- a/src/router/modules/dataPricing.ts
View file @c9f1214
+++ b/src/router/modules/dataPricing.ts
View file @c9f1214
@@ -78,7 +78,6 @@ const routes: RouteRecordRaw[] = [
          sidebar: false,
          breadcrumb: false,
          cache: true,
-          reuse: true,
          editPage: true,
          activeMenu: '/data-pricing/pricing-manage/price-config'
        },
@@ -109,7 +108,6 @@ const routes: RouteRecordRaw[] = [
          sidebar: false,
          breadcrumb: false,
          cache: true,
-          reuse: true,
          editPage: true,
          activeMenu: '/data-pricing/pricing-manage/price-calculate'
        },
--- a/src/views/data_entry/index.vue
View file @c9f1214
+++ b/src/views/data_entry/index.vue
View file @c9f1214
@@ -77,7 +77,7 @@ const costForm = ref({
      placeholder: "请选择",
      clearable: true,
      required: true,
-      visible: false,
+      visible: true,
      popperClass: 'date-year-popper',
      disabledDate: (date) => {
        const curr = new Date();
@@ -92,7 +92,7 @@ const costForm = ref({
      placeholder: "请选择",
      clearable: true,
      required: true,
-      visible: false,
+      visible: true,
      style: { width: 'calc(33.33% - 70px)', 'margin-right': '8px' },
      popperClass: 'date-month-popper',
      disabledDate: (date) => {
@@ -321,6 +321,7 @@ const getCostData = () => {
    })
    levelList.level1.map(l => allMapList.value.push(l));
    setAllMapList(levelList, allMapList.value, 2);
  }).catch((res) => {
    loading.value = false;
  });
@@ -339,10 +340,10 @@ const setAllMapList = (mapObj, arr, level) => {
 const setStep = async () => {
  const info = costFormInfo.value;
  await setFormItems(info, 'cost');
-  costForm.value.items[0].disabled = step.value > 0;
+  // costForm.value.items[0].disabled = step.value > 0;
-  costForm.value.items[1].visible = step.value == 1;
+  // costForm.value.items[1].visible = step.value == 1;
-  costForm.value.items[2].visible = step.value == 1;
+  // costForm.value.items[2].visible = step.value == 1;
-  costForm.value.items[3].visible = step.value == 1;
+  // costForm.value.items[3].visible = step.value == 1;
  if (step.value == 1) {
    setSumRow();
  }
@@ -793,6 +794,61 @@ const btnClick = async (btn, bType = null) => {
  }
 };
+const initTableFileds = () => {
+  let fields = [
+    {
+      label: "累计投入", field: "total", width: 120, align: 'right', getName: (scope) => {
+        return changeNum(scope.row.total, 2, true);
+      }
+    },
+  ]
+  const hasLevel1 = checkedList.value.find(c => c.level == 1);
+  if (hasLevel1) {
+    fields.splice(-1, 0, { label: "指标", field: "level1", width: 120 });
+  }
+  const hasLevel2 = checkedList.value.find(c => c.level == 2);
+  if (hasLevel2) {
+    fields.splice(-1, 0, { label: "一级分类", field: "level2", width: 120 });
+  }
+  const hasLevel3 = checkedList.value.find(c => c.level == 3);
+  if (hasLevel3) {
+    fields.splice(-1, 0, { label: "二级分类", field: "level3", width: 120 });
+  }
+  const hasLevel4 = checkedList.value.find(c => c.level == 4);
+  if (hasLevel4) {
+    fields.splice(-1, 0, { label: "三级分类", field: "level4", width: 120 });
+  }
+  tableField.value.splice(0);
+  tableField.value.push(...fields);
+  initField.value = JSON.parse(JSON.stringify(tableField.value));
+  const datas = JSON.parse(JSON.stringify(checkedData.value));
+  datas.sort((a, b) => a.code.localeCompare(b.code));
+  const dGuid = datas.map(d => d.guid);
+  let tDatas = tableData.value.filter(t => dGuid.indexOf(t.guid) > -1);
+  datas.forEach((td, t) => {
+    if (tGuids.indexOf(td.guid) == -1) {
+      tDatas.splice(t, 0, td)
+    } else {
+      tDatas.map(d => {
+        if (d.guid == td.guid) {
+          d.name = td.name;
+          d.level1 = td.level1;
+          d.level2 = td.level2;
+          d.level3 = td.level3;
+          d.level4 = td.level4;
+        }
+      })
+    }
+  })
+  tableData.value.splice(0);
+  tableData.value = tDatas;
+  // if (tGuids.length > 0 && costFormInfo.value.baseDate && costFormInfo.value.investYear) {
+  //   setTableFields(costFormInfo.value);
+  //   besure.value = true;
+  // }
+  getMergeRow();
+};
 const setShowLevel4 = () => {
  nextTick(() => {
    const box4 = document.querySelectorAll('.grid-panel-box.box3 .grid-items');
@@ -1368,33 +1424,27 @@ watch(showLevel4, (newVal, oldVal) => {
 <template>
  <div class="container_wrap">
    <div class="content_main">
-      <div class="top_tool_wrap">
+      <!-- <div class="top_tool_wrap">
        <StepBar :steps-info="stepsInfo" />
-      </div>
+      </div> -->
-      <div class="operator_panel_wrap" :style="{ 'min-height': step == 0 ? 'calc(100% - 112px)' : 'unset' }"
+      <div class="operator_panel_wrap" :style="{ 'min-height': 'unset' }" v-loading="loading">
-        v-loading="loading">
-        <ContentWrap title="入表类型" description="" :expandSwicth="false" v-show="step == 1">
-          <Form ref="entryFormRef" :itemList="entryForm.items" formId="dam-base-form" :rules="entryForm.rules"
-            col="col3" @selectChange="selectChange" />
-        </ContentWrap>
        <div class="v-tip" v-show="step == 0">
          <div class="tip-icon"></div>
          <div class="tip-des">
            本工具提供的入表评估结果仅为初步测算参考，基于用户输入参数生成，不代表最终入表金额。实际入表需遵循《企业数据资源相关会计处理暂行规定》及会计准则要求，经专业审计机构确认后方可生效。
          </div>
        </div>
-        <ContentWrap :title="step == 0 ? '设置成本项' : step == 1 ? '填写成本明细' : '文件预览'"
+        <ContentWrap :title="step == 0 ? '设置成本项' : '文件预览'" description="" :expandSwicth="false"
-          description=""
+          :style="step == 1 ? { 'margin-top': '16px' } : {}">
-          :expandSwicth="false" :style="step == 1 ? { 'margin-top': '16px' } : {}">
          <div class="table_tool_wrap">
            <Form ref="costFormRef" :itemList="costForm.items" formId="dam-base-form" :rules="costForm.rules" col="col3"
              @btnClick="btnClick" @selectChange="selectChange" />
-            <div class="tool_btn" v-if="step == 2">
+            <div class="tool_btn" v-if="step == 1">
              <el-button type="primary" @click="exportClick">下载文件</el-button>
              <!-- <el-button type="primary" plain @click="senMessage">入表咨询</el-button>  -->
            </div>
          </div>
-          <div class="grid-box-wrap" v-show="step == 0">
+          <div class="grid-box-wrap" v-show="step == 3">
            <!-- 头部标题 -->
            <div class="grid-panel-wrap header" :class="{ col4: showLevel4 }">
              <template v-for="(list, l) in gridList" :key="'panel'+l">
@@ -1497,14 +1547,14 @@ watch(showLevel4, (newVal, oldVal) => {
              </div>
            </div>
          </div>
-          <div class="table_panel_wrap" v-show="step > 0">
+          <div class="table_panel_wrap">
-            <div class="amount_tool" v-if="step == 1">
+            <div class="amount_tool">
              <span class="amount_text">累计投入:</span>
              <span class="amount_num">{{ changeNum(amount, 2, true) }}</span>
              <span>元</span>
            </div>
            <div class="table_panel">
-              <el-table id="cost-table" v-show="step == 1" ref="costTableRef" :data="tableData"
+              <el-table id="cost-table" v-show="step == 0" ref="costTableRef" :data="tableData"
                :span-method="tableSpanMethod" :summary-method="tableSummaryMethod" show-summary border
                :cell-class-name="isMergedCell">
                <el-table-column v-for="(item, i) in tableField" :label="item.label" :width="item.width"
@@ -1525,7 +1575,7 @@ watch(showLevel4, (newVal, oldVal) => {
                  </template>
                </el-table-column>
              </el-table>
-              <el-table id="entry-table" ref="entryTableRef" :data="transposedData" stripe border v-show="step == 2">
+              <el-table id="entry-table" ref="entryTableRef" :data="transposedData" stripe border v-show="step == 1">
                <el-table-column prop="title" label="项目" :width="140">
                  <template v-slot="{ row }">
                    <span>{{ setLabel(row.title) }}</span>
@@ -1545,14 +1595,19 @@ watch(showLevel4, (newVal, oldVal) => {
            </div>
          </div>
        </ContentWrap>
+        <ContentWrap title="入表类型" description="" :expandSwicth="false" v-show="step == 0">
+          <Form ref="entryFormRef" :itemList="entryForm.items" formId="dam-base-form" :rules="entryForm.rules"
+            col="col3" @selectChange="selectChange" />
+        </ContentWrap>
      </div>
    </div>
    <div class="tool_btns">
      <div class="btns">
        <el-button @click="btnClick({ value: 'refresh' })">重置</el-button>
-        <el-button @click="btnClick({ value: 'prev' })" v-if="step == 1">上一步</el-button>
+        <el-button @click="btnClick({ value: 'next' })" v-if="step == 0">入表</el-button>
+        <!-- <el-button @click="btnClick({ value: 'prev' })" v-if="step == 1">上一步</el-button>
        <el-button type="primary" @click="btnClick({ value: 'prev' })" v-if="step == 2">上一步</el-button>
-        <el-button type="primary" @click="btnClick({ value: 'next' })" v-if="step < 2">下一步</el-button>
+        <el-button type="primary" @click="btnClick({ value: 'next' })" v-if="step < 2">下一步</el-button> -->
      </div>
    </div>
  </div>
@@ -1848,7 +1903,7 @@ watch(showLevel4, (newVal, oldVal) => {
      background: #FFFBF2;
      border: 1px solid rgba(255, 241, 212, 1);
      border-radius: 4px;
-      margin: 5px 0px 8px;
+      margin: 16px 0px 8px;
      padding: 2px 0px;
      .tip-icon {
--- a/src/views/data_pricing/calculateConfig.vue
View file @c9f1214
+++ b/src/views/data_pricing/calculateConfig.vue
View file @c9f1214