feat:合并

This commit is contained in:
lixg
2022-11-26 09:40:47 +08:00
42 changed files with 4078 additions and 2207 deletions

View File

@@ -1045,7 +1045,6 @@ import * as api from "../../api/indexTemplate";
import draggable from "vuedraggable";
import { storage } from "../../api/storage";
import UnlockMode from "../../components/drawers/UnlockMode.vue";
import { useStore } from "vuex";
// import * as api1 from "../../api/index1";
const drawercolumns = [
@@ -1106,7 +1105,6 @@ export default {
UnlockMode,
},
setup() {
const store = useStore();
const state = reactive({
projectId: storage.get("projectId")
? JSON.parse(storage.get("projectId"))
@@ -1509,7 +1507,7 @@ export default {
const getTask = () => {
state.tableData = [];
api
.templateDetail(store.state.projectTemplateId)
.templateDetail(localStorage.getItem("projectTemplateId"))
.then((res) => {
if (res.status == 200) {
console.log("22222", res.data.data.stageList);
@@ -1709,7 +1707,7 @@ export default {
if (state.updateStageID) {
let obj = {
name: state.valuesname,
projectTemplateId: store.state.projectTemplateId,
projectTemplateId: localStorage.getItem("templateStageId"),
remark: state.valuesnotice,
stageId: state.updateStageID,
};
@@ -1731,7 +1729,7 @@ export default {
} else {
let obj = {
name: state.valuesname,
projectTemplateId: store.state.projectTemplateId,
projectTemplateId: localStorage.getItem("templateStageId"),
remark: state.valuesnotice,
stageId: 0,
};