diff --git a/client/src/api/ability.js b/client/src/api/ability.js index ded8362..4f7fe26 100644 --- a/client/src/api/ability.js +++ b/client/src/api/ability.js @@ -184,6 +184,14 @@ export function createAbility(data) { data, }) } +//能力无新增 +export function abilityNoChange(data) { + return request({ + url:`/ability/qaction/ability_nochange/`, + method:'post', + data, + }) +} //新增资质 export function createQuali(data) { return request({ @@ -192,6 +200,13 @@ export function createQuali(data) { data, }) } +export function qualiNoChange(data) { + return request({ + url:`/ability/qaction/quali_nochange/`, + method:'post', + data, + }) +} //修改资质 export function updateQuali(data) { return request({ diff --git a/client/src/views/ability/mQualityTask.vue b/client/src/views/ability/mQualityTask.vue index 967c93d..8dd1f67 100644 --- a/client/src/views/ability/mQualityTask.vue +++ b/client/src/views/ability/mQualityTask.vue @@ -86,6 +86,14 @@ > 新增资质 + + 资质无新增 + 新增能力 + + 能力无新增 + 更新服务 更新资质 新增资质 + 能力无新增 + 资质无新增 @@ -129,9 +147,11 @@ {{scope.row.file_.name}} - - {{scope.row.value1.file_.name}} - + + + {{scope.row.value1.file_.name}} + + @@ -149,12 +169,12 @@ fixed="right" > - + - + + 更新服务 + 原始内容:{{showData.data.value1}} + 更新内容:{{showData.data.value2}} + + + 确认 + + + + 资质无新增 + + 确认 + + + + 能力无新增 + + 确认 + + + + 新增能力 + 能力类型 :{{showData.data.atype_name}} + 能力领域:{{showData.data.afield_name}} + 上传文件:{{showData.data.file_.name}} + {{showData.data.file_.name}} + + + 确认 + + + + + + @@ -629,7 +720,9 @@ updateService, provinceLists, cityLists, - qactionItem + qactionItem, + qualiNoChange, + abilityNoChange } from "@/api/ability"; import {getDictList} from "@/api/dict"; import {genTree} from "@/utils"; @@ -638,11 +731,12 @@ import checkPermission from "@/utils/permission"; import Pagination from "@/components/Pagination"; // secondary package based on el-pagination import Treeselect from "@riophae/vue-treeselect"; + import quliShow from "@/views/ability/quliShow"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import {upUrl, upHeaders} from "@/api/file"; export default { - components: {Pagination, Treeselect}, + components: {Pagination, Treeselect,quliShow}, name: "mQualityTask", data() { return { @@ -660,6 +754,7 @@ page_size: 10, task: null, }, + showData:{}, quliList: [], orgData: [], fileList: [], @@ -725,12 +820,16 @@ 'CNAS', 'OTHER' ], + fieldList2: [], atypeOptions: [], afieldOptions: [],//领域 gradeOptions: [ {id: 10, name: '国家级'}, {id: 20, name: '省级'}, {id: 30, name: '市级'} ],//等级 qtaskName: "", + atype_name: "", + afield_name: "", + actionType: "", filterOrgText: "", treeLoding: false, buttonsShow: false, @@ -753,6 +852,15 @@ }, methods: { + noChange(index){ + if(index==='1'){//资质无新增 + qualiNoChange({qtask:this.qtask}).then(res=>{ + }) + }else{//能力无新增 + abilityNoChange({qtask:this.qtask}).then(res=>{ + }) + } + }, getOptions() { getDictList({type__code: "field_type", is_used: true}).then((res) => { this.afieldOptions = genTree(res.data); @@ -812,6 +920,9 @@ if (response.data) { debugger; this.taskList = response.data; + this.buttonsShow = false; + this.qtaskName = ''; + this.recordList={count: 0,}; } this.listLoading = false; }); @@ -991,13 +1102,29 @@ } }); }, - /* handleDetail(id){ + handleDetail(type,item){ let that = this; that.drawer = true; - qactionItem(id).then(res=>{ - that.recordData = res.data.update_detail; + this.showData.id = item.id; + this.showData.data = item; + this.showData.type = item.action; + this.showData.action = type; + this.actionType = type; + this.fieldList2 =[]; + if(item.action==='ablity:create'||item.action==='service:update'){ + }else{ + qactionItem(item.id).then(res=>{ + if (res.code>=200) { + let updateDetail = res.data.update_detail;//更改字段 + updateDetail.forEach(item=>{ + this.fieldList2.push(item.field);//所有字段 + }); + this.drawer = true; + } + console.log(this.fieldList2) }) - },*/ + } + }, //删除操作 handleDelete(id) { let that = this; diff --git a/client/src/views/ability/qualityTaskDo.vue b/client/src/views/ability/qualityTaskDo.vue index da0d271..0d64d30 100644 --- a/client/src/views/ability/qualityTaskDo.vue +++ b/client/src/views/ability/qualityTaskDo.vue @@ -160,6 +160,8 @@ 更新服务 更新资质 新增资质 + 能力无新增 + 资质无新增 @@ -181,9 +183,11 @@ {{scope.row.file_.name}} - - {{scope.row.value1.file_.name}} - + + + {{scope.row.value1.file_.name}} + + + + 资质无新增 + + 确认 + + + + 能力无新增 + + 确认 + + { + qactionConfirm(this.showData.id).then(res => { if (res.code>=200) { this.drawer = false; this.getQactionList();
更新服务
原始内容:{{showData.data.value1}}
更新内容:{{showData.data.value2}}
资质无新增
能力无新增
新增能力
能力类型 :{{showData.data.atype_name}}
能力领域:{{showData.data.afield_name}}
上传文件:{{showData.data.file_.name}}