Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

CD配唱片

2025-04-23 dce5b612f24808baa90028b878c51f2be33f4163

Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

 src/api/basicData/calendar.js

@@ -42,3 +42,12 @@
    method: 'delete'
  })
}

// 查询工厂管理列表
export function listAll_calendar(query) {
  return request({
    url: '/aps/calendar/listAll',
    method: 'get',
    params: query
  })
}

 src/views/basicData/event/index.vue

@@ -177,8 +177,12 @@
        </el-form-item>
        <el-form-item label="适用日历" prop="applicableCalendar">
          <el-select v-model="form.applicableCalendar" placeholder="请选择适用日历">
            <el-option label="Zone one" value="shanghai" />
            <el-option label="Zone two" value="beijing" />
            <el-option
                v-for="calendar in calendarList"
                :key="calendar.id"
                :label="calendar.description"
                :value="calendar.id">
            </el-option>
          </el-select>
        </el-form-item>
      </el-form>
@@ -199,6 +203,7 @@
import { selectProcessNameList } from "@/api/basicData/processRoute.js";
import HxlhTable from '@/components/HxlhTable'
import axios from "axios";
import {listAll_calendar} from "@/api/basicData/calendar.js";

const { proxy } = getCurrentInstance();

@@ -215,6 +220,7 @@
const shopList = ref([]);
const allShopList = ref([]);
const processList = ref([]);
const calendarList = ref([]);

const height = ref(document.documentElement.clientHeight - 230 + "px;")

@@ -374,12 +380,14 @@
    /** 查询工厂列表 */
    listAll_plant({}),
    /** 查询车间列表 */
    listAll_shop({})
    listAll_shop({}),
    listAll_calendar({})
  ])
  .then(axios.spread((response1, response2, response3) => {
  .then(axios.spread((response1, response2, response3, response4) => {
    eventList.value = response1.rows;
    plantList.value = response2.data;
    allShopList.value = response3.data;
    calendarList.value = response4.data;
    total.value = response1.total;
    loading.value = false;
  }))

 src/views/system/dept/index.vue

@@ -56,7 +56,8 @@
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
      >
         <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
         <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
          <el-table-column prop="orgCode" label="组织编码" width="150"></el-table-column>
         <el-table-column prop="orderNum" label="排序" width="150"></el-table-column>
         <el-table-column prop="status" label="状态" width="100">
            <template #default="scope">
               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -97,6 +98,11 @@
                     <el-input v-model="form.deptName" placeholder="请输入部门名称" />
                  </el-form-item>
               </el-col>
              <el-col :span="12">
                <el-form-item label="组织编码" prop="deptName">
                  <el-input v-model="form.orgCode" placeholder="请输入组织编码" />
                </el-form-item>
              </el-col>
               <el-col :span="12">
                  <el-form-item label="显示排序" prop="orderNum">
                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
@@ -165,8 +171,9 @@
    parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
    deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
    orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
    phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
    orgCode: [{ required: true, message: "组织编码不能为空", trigger: "blur" }],
  /*  email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
    phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]*/
  },
});

@@ -193,6 +200,7 @@
    deptId: undefined,
    parentId: undefined,
    deptName: undefined,
    orgCode: undefined,
    orderNum: 0,
    leader: undefined,
    phone: undefined,