Merge branch 'master' of http://120.55.44.4:10080/xujunjie/WorkloadApp

merge
# Conflicts:
#	pages/daily/form.vue

pages/daily/form.vue

@@ -105,7 +105,6 @@ export default {
       },
     };
   },
-  onLoad() {},
   onLoad(options) {
     this.queryProjectList();
     if (options.id) {
@@ -122,21 +121,18 @@ export default {
   methods: {
     ...mapActions(["queryProjectList"]),
     getProjectName(id) {
-      const item = this.projectList.find((item) => item.ID == id);
-      return item ? item.Name : "-";
+      const item = this.projectList.find((item) => item.id == id);
+      return item ? item.project_name : "-";
     },
     selectProject(key, e) {
       const select = this.projectList[e.target.value];
-      const idx = this.formData.findIndex((item) => item.key == key);
-      const item = this.formData[idx];
-      const resultData = JSON.parse(JSON.stringify(this.formData));
-      resultData[idx] = {
-        ...item,
-        code_id: select.ID,
-        project_name: select.Name,
-      };
+      const item = this.formData.find((item) => item.key == key);
+      item.code_id = select.id;
+      item.project_name = select.project_name;
 
-      this.formData = resultData;
+      console.log(this.formData);
+
+      // this.formData = [...this.formData];
     },
     addFormData() {
       this.formData.push({

services/daily.js

@@ -13,7 +13,7 @@ export async function queryProjectDaily(params) {
   return await request(`v2/approval/log-projects/${params.project_id}`, "GET", params);
 }
 export async function queryProjectList() {
-  return await request("v2/workload/project", "GET");
+  return await request("v2/approval/list/simple", "GET");
 }
 export async function createDaily(data) {
   return await request("v2/approval/log", "POST", data);

store/index.js

@@ -68,7 +68,7 @@ const store = new Vuex.Store({
     },
     queryProjectList: async function ({ commit, state }, value) {
       const res = await queryProjectList();
-      commit("saveProjectList", res.data?.list);
+      commit("saveProjectList", res.data);
     },
     queryUserList: async function ({ commit, state }, value) {
       // 防止多次请求数据