gaoluyang
4 天以前 5956b34b1bd9198a787a1e0ea290b2cd99d898f2
新疆-融邦环保
1.大屏展示数据修改
2.销售台账展示字段修改
已修改6个文件
55 ■■■■■ 文件已修改
src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportAnalysis/PSIDataAnalysis/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportAnalysis/PSIDataAnalysis/components/ProductTypeSwitch.vue
@@ -5,7 +5,6 @@
    @change="handleChange"
  >
    <el-radio-button :label="1">原材料</el-radio-button>
    <el-radio-button :label="3">半成品</el-radio-button>
    <el-radio-button :label="2">成品</el-radio-button>
  </el-radio-group>
</template>
@@ -16,7 +15,7 @@
const props = defineProps({
  modelValue: {
    type: Number,
    default: 1, // 默认选中"原材料"
    default: 2, // 默认选中"成品"
  },
})
src/views/reportAnalysis/PSIDataAnalysis/components/center-bottom.vue
@@ -30,7 +30,7 @@
import ProductTypeSwitch from './ProductTypeSwitch.vue'
import { productInOutAnalysis } from '@/api/viewIndex.js'
const productType = ref(1) // 1=原材料 2=半成品 3=成品
const productType = ref(2) // 1=原材料 2=成品
const chartStyle = { width: '100%', height: '130%' }
src/views/reportAnalysis/PSIDataAnalysis/index.vue
@@ -34,8 +34,9 @@
      <!-- 右侧区域 -->
      <div class="right-panel">
        <RightBottom />
        <RightTop />
        <!-- 右侧两块沿用 dataDashboard 的组件,这里默认看季度 -->
        <RightBottom :default-date-type="3" />
        <RightTop :default-date-type="3" />
      </div>
    </div>
    </div>
src/views/reportAnalysis/dataDashboard/components/basic/right-bottom.vue
@@ -33,7 +33,15 @@
  height: '100%',
}
const dateType = ref(1) // 1=周 2=月 3=季度
// 复用本组件的页面可指定初始周期,不传仍按「周」展示(dataDashboard 不受影响)
const props = defineProps({
  defaultDateType: {
    type: Number,
    default: 1, // 1=周 2=月 3=季度
  },
})
const dateType = ref(props.defaultDateType)
// 飞机图标 SVG path(与 right-top 一致)
const aircraft =
src/views/reportAnalysis/dataDashboard/components/basic/right-top.vue
@@ -32,7 +32,15 @@
  height: '100%',
}
const radio1 = ref(1)
// 复用本组件的页面可指定初始周期,不传仍按「周」展示(dataDashboard 不受影响)
const props = defineProps({
  defaultDateType: {
    type: Number,
    default: 1, // 1=周 2=月 3=季度
  },
})
const radio1 = ref(props.defaultDateType)
// 飞机图标 SVG path
const aircraft =
src/views/salesManagement/salesLedger/index.vue
@@ -115,31 +115,6 @@
              <el-table-column label="产品大类" prop="productCategory" />
              <el-table-column label="规格型号" prop="specificationModel" />
              <el-table-column label="单位" prop="unit" />
              <el-table-column label="审批中数量" width="120" align="center">
                <template #default="scope">
                  <span>{{ scope.row.pendingApprovalQuantity || 0 }}</span>
                </template>
              </el-table-column>
              <el-table-column label="发货车牌" minWidth="100px" align="center">
                <template #default="scope">
                  <div>
                    <el-tag type="success" v-if="scope.row.shippingCarNumber"
                      >{{ scope.row.shippingCarNumber }}
                    </el-tag>
                    <el-tag v-else type="info">- </el-tag>
                  </div>
                </template>
              </el-table-column>
              <el-table-column label="发货日期" minWidth="100px" align="center">
                <template #default="scope">
                  <div>
                    <div v-if="scope.row.shippingDate">
                      {{ scope.row.shippingDate }}
                    </div>
                    <el-tag v-else type="info">- </el-tag>
                  </div>
                </template>
              </el-table-column>
              <el-table-column label="数量" prop="quantity" />
              <el-table-column label="退货数量" prop="returnQuantity" />
              <el-table-column label="税率(%)" prop="taxRate" />