|
@@ -24,7 +24,7 @@
|
|
label="节点名称"
|
|
label="节点名称"
|
|
name="title"
|
|
name="title"
|
|
>
|
|
>
|
|
- <a-input :disabled="item.isFinal == 1" v-model="item.name" placeholder="请输入"/>
|
|
|
|
|
|
+ <a-input :disabled="item.isFinal == -1" v-model="item.name" placeholder="请输入"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
@@ -32,15 +32,22 @@
|
|
label="审批人"
|
|
label="审批人"
|
|
name="createTime"
|
|
name="createTime"
|
|
>
|
|
>
|
|
- <div @click="handleShowAuditClick(index)">
|
|
|
|
|
|
+ <!-- <div @click="handleShowAuditClick(index)">
|
|
|
|
+ <a-select v-model="item.approverName" :showArrow="false" :open="false" placeholder="请选择组织部门授予知识访问权限"></a-select>
|
|
|
|
+ </div> -->
|
|
|
|
+ <div v-if="!index">
|
|
|
|
+ <a-input :disabled="item.isFinal == -1" v-model="item.approverName" placeholder="请输入"/>
|
|
|
|
+ </div>
|
|
|
|
+ <div v-else @click="handleShowAuditClick(index)">
|
|
<a-select v-model="item.approverName" :showArrow="false" :open="false" placeholder="请选择组织部门授予知识访问权限"></a-select>
|
|
<a-select v-model="item.approverName" :showArrow="false" :open="false" placeholder="请选择组织部门授予知识访问权限"></a-select>
|
|
</div>
|
|
</div>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
<a-row :gutter="24" type="flex" justify="end">
|
|
<a-row :gutter="24" type="flex" justify="end">
|
|
- <a-button :style="{display: item.isFinal == 1 ? 'none':''}" @click="delRow(index)" shape="circle" icon="delete"></a-button>
|
|
|
|
- <a-button v-if="formData.length != (index + 1)||formData.length==1" type="primary" @click="addRow(index)" shape="circle" icon="plus"></a-button>
|
|
|
|
|
|
+ <a-button :style="{display: item.isFinal == -1 ? 'none':''}" @click="delRow(index)" shape="circle" icon="delete"></a-button>
|
|
|
|
+ <!-- <a-button v-if="formData.length != (index + 1)||formData.length==1" type="primary" @click="addRow(index)" shape="circle" icon="plus"></a-button> -->
|
|
|
|
+ <a-button type="primary" @click="addRow(index)" shape="circle" icon="plus"></a-button>
|
|
</a-row>
|
|
</a-row>
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
@@ -68,7 +75,7 @@
|
|
label="节点名称"
|
|
label="节点名称"
|
|
name="title"
|
|
name="title"
|
|
>
|
|
>
|
|
- <a-input :disabled="item.isFinal == 1" v-model="item.name" placeholder="请输入"/>
|
|
|
|
|
|
+ <a-input :disabled="item.isFinal == -1" v-model="item.name" placeholder="请输入"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
@@ -76,15 +83,24 @@
|
|
label="审批人"
|
|
label="审批人"
|
|
name="createTime"
|
|
name="createTime"
|
|
>
|
|
>
|
|
- <div @click="handleShowAuditClick(index)">
|
|
|
|
|
|
+ <!-- <div @click="handleShowAuditClick(index)">
|
|
|
|
+ <a-select v-model="item.approverName" :showArrow="false" :open="false" placeholder="请选择组织部门授予知识访问权限"></a-select>
|
|
|
|
+ </div> -->
|
|
|
|
+ <div v-if="!index">
|
|
|
|
+ <a-input :disabled="item.isFinal == -1" v-model="item.approverName" placeholder="请输入"/>
|
|
|
|
+ </div>
|
|
|
|
+ <div v-else @click="handleShowAuditClick(index)">
|
|
<a-select v-model="item.approverName" :showArrow="false" :open="false" placeholder="请选择组织部门授予知识访问权限"></a-select>
|
|
<a-select v-model="item.approverName" :showArrow="false" :open="false" placeholder="请选择组织部门授予知识访问权限"></a-select>
|
|
</div>
|
|
</div>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
<a-row :gutter="24" type="flex" justify="end">
|
|
<a-row :gutter="24" type="flex" justify="end">
|
|
- <a-button :style="{display: item.isFinal == 1 ? 'none':''}" @click="delRow(index)" shape="circle" icon="delete"></a-button>
|
|
|
|
- <a-button v-if="formData.length != (index + 1)||formData.length==1" type="primary" @click="addRow(index)" shape="circle" icon="plus"></a-button>
|
|
|
|
|
|
+ <!-- <a-button :style="{display: item.isFinal == 1 ? 'none':''}" @click="delRow(index)" shape="circle" icon="delete"></a-button>
|
|
|
|
+ <a-button v-if="formData.length != (index + 1)||formData.length==1" type="primary" @click="addRow(index)" shape="circle" icon="plus"></a-button> -->
|
|
|
|
+ <a-button :style="{display: item.isFinal == -1 ? 'none':''}" @click="delRow(index)" shape="circle" icon="delete"></a-button>
|
|
|
|
+ <!-- <a-button v-if="formData.length != (index + 1)||formData.length==1" type="primary" @click="addRow(index)" shape="circle" icon="plus"></a-button> -->
|
|
|
|
+ <a-button type="primary" @click="addRow(index)" shape="circle" icon="plus"></a-button>
|
|
</a-row>
|
|
</a-row>
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
@@ -104,21 +120,29 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</rx-fit>
|
|
</rx-fit>
|
|
- <a-modal v-model="showAuditFlag"
|
|
|
|
|
|
+ <!-- <a-modal v-model="showAuditFlag"
|
|
width="1200"
|
|
width="1200"
|
|
title="选择组织人员"
|
|
title="选择组织人员"
|
|
centered
|
|
centered
|
|
okText="保存"
|
|
okText="保存"
|
|
@ok="handleOk">
|
|
@ok="handleOk">
|
|
<org-people style="width:1200px;height:65vh;" @transCheckedTarget="transCheckedTarget"></org-people>
|
|
<org-people style="width:1200px;height:65vh;" @transCheckedTarget="transCheckedTarget"></org-people>
|
|
- </a-modal>
|
|
|
|
|
|
+ </a-modal> -->
|
|
|
|
+ <a-modal v-model="showAuditFlag"
|
|
|
|
+ width="1100"
|
|
|
|
+ title="选择组织人员"
|
|
|
|
+ centered
|
|
|
|
+ okText="保存"
|
|
|
|
+ @ok="handleOk">
|
|
|
|
+ <org-people ref="orgPeopleRef" isUseUserNo :key="new Date().getTime()" style="width:1100px;height:540px;" @transCheckedTarget="transCheckedTarget"></org-people>
|
|
|
|
+ </a-modal>
|
|
</div>
|
|
</div>
|
|
</rx-layout>
|
|
</rx-layout>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import breadcrumb from '../components/breadcrumb'
|
|
import breadcrumb from '../components/breadcrumb'
|
|
-import orgPeople from './components/orgPeople'
|
|
|
|
|
|
+import orgPeople from '../warehouse/components/orgPeople.vue'
|
|
import api from '@/api/knowledge/album/checkProcess'
|
|
import api from '@/api/knowledge/album/checkProcess'
|
|
export default {
|
|
export default {
|
|
name: 'auditProcessMaintain',
|
|
name: 'auditProcessMaintain',
|
|
@@ -145,13 +169,6 @@ export default {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
init() {
|
|
init() {
|
|
- // let queryParam = {
|
|
|
|
- // "pageNo": 1,
|
|
|
|
- // "pageSize": 1000,
|
|
|
|
- // "sortField": "",
|
|
|
|
- // "sortOrder": "asc",
|
|
|
|
- // "params": {}
|
|
|
|
- // }
|
|
|
|
api.approveFlows({type: parseInt(this.tabsKeys)}).then(res => {
|
|
api.approveFlows({type: parseInt(this.tabsKeys)}).then(res => {
|
|
console.log(res)
|
|
console.log(res)
|
|
// this.formData = res.data.map(item => {
|
|
// this.formData = res.data.map(item => {
|
|
@@ -173,7 +190,7 @@ export default {
|
|
},
|
|
},
|
|
async handleSaveClick() {
|
|
async handleSaveClick() {
|
|
for(let i of this.formData) {
|
|
for(let i of this.formData) {
|
|
- if(!i.name || !i.approverId) {
|
|
|
|
|
|
+ if(!i.name || !i.approverName) {
|
|
console.log(i)
|
|
console.log(i)
|
|
this.$message.error("请将信息填全");
|
|
this.$message.error("请将信息填全");
|
|
return
|
|
return
|
|
@@ -208,11 +225,11 @@ export default {
|
|
approverName: undefined,
|
|
approverName: undefined,
|
|
isFinal: 0
|
|
isFinal: 0
|
|
}
|
|
}
|
|
- if(this.formData.length == 1) {
|
|
|
|
- this.formData.unshift(tempData)
|
|
|
|
- } else {
|
|
|
|
|
|
+ // if(this.formData.length == 1) {
|
|
|
|
+ // this.formData.unshift(tempData)
|
|
|
|
+ // } else {
|
|
this.formData.splice(index+1, 0,tempData)
|
|
this.formData.splice(index+1, 0,tempData)
|
|
- }
|
|
|
|
|
|
+ // }
|
|
},
|
|
},
|
|
handleShowAuditClick(index) {
|
|
handleShowAuditClick(index) {
|
|
this.showAuditFlag = true
|
|
this.showAuditFlag = true
|
|
@@ -223,6 +240,7 @@ export default {
|
|
this.approverData.approverName = arg.approverName
|
|
this.approverData.approverName = arg.approverName
|
|
},
|
|
},
|
|
handleOk() {
|
|
handleOk() {
|
|
|
|
+ console.log(this.approverData)
|
|
this.formData[this.tempDataIndex].approverId = this.approverData.approverId
|
|
this.formData[this.tempDataIndex].approverId = this.approverData.approverId
|
|
this.formData[this.tempDataIndex].approverName = this.approverData.approverName
|
|
this.formData[this.tempDataIndex].approverName = this.approverData.approverName
|
|
this.showAuditFlag = false
|
|
this.showAuditFlag = false
|