Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-04-27 0927a960d1cba395682d1992b8b0d70f39be2c2a

Merge remote-tracking branch 'origin/dev' into dev

 src/views/basicData/calendar/index.vue

@@ -38,7 +38,7 @@
          plain
          icon="Plus"
          @click="handleAdd"
          v-hasPermi="['aps:calendar:update']"
          v-hasPermi="['aps:calendar:add']"
          >新增</el-button
        >
      </el-col>

 src/views/basicData/standardProcess/index.vue

@@ -430,6 +430,12 @@
    width: 150,
    align: "center",
  },
  {
    title: "专业",
    field: "major",
    width: 150,
    align: "center",
  },
]);

const data = reactive({

 src/views/mainPlan/gasPlanning/index.vue

@@ -156,7 +156,7 @@
                > -->
            <template #default="{ row }">
              <template v-if="hasEditStatus(row)">
                <el-button @click="saveRowEvent(row)">保存</el-button>
                <el-button @click="saveRowEvent(row)" v-hasPermi="['aps:gasPipelineCapacityPlan:add']">保存</el-button>
                <el-button @click="cancelRowEvent()">取消</el-button>
              </template>
              <template v-else>
@@ -286,7 +286,7 @@
                > -->
            <template #default="{ row }">
              <template v-if="hasEditStatus1(row)">
                <el-button @click="saveRowEvent1(row)">保存</el-button>
                <el-button @click="saveRowEvent1(row)" v-hasPermi="['aps:gasPipelineCapacityPlan:add']">保存</el-button>
                <el-button @click="cancelRowEvent1()">取消</el-button>
              </template>
              <template v-else>

 src/views/mainPlan/gasProduceStatics/index.vue

@@ -58,7 +58,7 @@
          plain
          icon="Download"
          @click="handleExport"
          v-hasPermi="['apsPartRouteStat:export']"
          v-hasPermi="['aps:apsGasPipingRouteStat:exportExcel']"
          >导出</el-button
        >
      </el-col>
@@ -68,7 +68,7 @@
          plain
          icon="Refresh"
          @click="handleRefresh"
          v-hasPermi="['apsPartRouteStat:edit']"
          v-hasPermi="['aps:apsGasPipingRouteStat:computeCapacity']"
          >更新</el-button
        >
      </el-col>

 src/views/mainPlan/pipeProduceStatics/index.vue

@@ -58,7 +58,7 @@
          plain
          icon="Download"
          @click="handleExport"
          v-hasPermi="['apsPartRouteStat:export']"
          v-hasPermi="['aps:apsGasPipingRouteStat:exportExcel']"
          >导出</el-button
        >
      </el-col>
@@ -68,7 +68,7 @@
          plain
          icon="Refresh"
          @click="handleRefresh"
          v-hasPermi="['apsPartRouteStat:edit']"
          v-hasPermi="['aps:apsGasPipingRouteStat:computeCapacity']"
          >更新</el-button
        >
      </el-col>