|
|
@@ -110,7 +110,7 @@
|
|
|
<vxe-table-column field="company" title="单位" :edit-render="{}"
|
|
|
:rules="[{ required: true, message: '请填写单位', trigger: 'blur' }]">
|
|
|
<template v-slot:edit="scope">
|
|
|
- <el-input v-model="scope.row.company"></el-input>
|
|
|
+ <el-input disabled v-model="scope.row.company"></el-input>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
<vxe-table-column field="remarks" title="备注" :edit-render="{}">
|
|
|
@@ -120,11 +120,14 @@
|
|
|
</vxe-table-column>
|
|
|
<vxe-table-column title="操作" width="300">
|
|
|
<template v-slot="scope">
|
|
|
- <vxe-button size="small" status="danger" :disabled="formReadOnly"
|
|
|
+ <vxe-button size="small" status="danger"
|
|
|
+ :disabled="method === 'view' || status == 'audit' || this.formReadOnly"
|
|
|
@click="removeEvent(scope.row, scope.$rowIndex, 'detail')">删除</vxe-button>
|
|
|
- <vxe-button size="small" status="primary" :disabled="formReadOnly"
|
|
|
+ <vxe-button size="small" status="primary"
|
|
|
+ :disabled="method === 'view' || status == 'audit' || this.formReadOnly"
|
|
|
@click="sss(scope.$rowIndex)">上传附件</vxe-button>
|
|
|
- <vxe-button size="small" status="primary" v-if="formReadOnly" :disabled="false"
|
|
|
+ <vxe-button size="small" status="primary"
|
|
|
+ v-if="method === 'view' || status == 'audit' || this.formReadOnly" :disabled="false"
|
|
|
@click="seeFileInfo(scope.$rowIndex)">查看文件详情</vxe-button>
|
|
|
</template>
|
|
|
</vxe-table-column>
|
|
|
@@ -304,7 +307,8 @@ export default {
|
|
|
recordList: [],
|
|
|
// amountInfos: [],
|
|
|
files: [], // 附件信息
|
|
|
- procInsId: ''
|
|
|
+ procInsId: '',
|
|
|
+ processDefinitionId: ''
|
|
|
},
|
|
|
clientTableKey: '',
|
|
|
keyWatch: '',
|
|
|
@@ -409,7 +413,8 @@ export default {
|
|
|
recordList: [],
|
|
|
// amountInfos: [],
|
|
|
files: [], // 附件信息
|
|
|
- procInsId: ''
|
|
|
+ procInsId: '',
|
|
|
+ processDefinitionId: ''
|
|
|
}
|
|
|
if (method === 'add') {
|
|
|
this.title = `新建领用类型`
|
|
|
@@ -704,7 +709,7 @@ export default {
|
|
|
this.inputForm.files = this.$refs.uploadComponent.getDataList()
|
|
|
this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
|
|
|
if (this.commonJS.isNotEmpty(data)) {
|
|
|
- if (data === '仓库管理员审核') {
|
|
|
+ if (data === '老板审核') {
|
|
|
this.inputForm.status = '5'
|
|
|
}
|
|
|
}
|
|
|
@@ -952,6 +957,7 @@ export default {
|
|
|
this.inputForm.detailInfos[this.indexRow].goodsName = row.tradeName
|
|
|
this.inputForm.detailInfos[this.indexRow].produceDate = row.produceDate
|
|
|
this.inputForm.detailInfos[this.indexRow].spec = row.spec
|
|
|
+ this.inputForm.detailInfos[this.indexRow].company = row.company
|
|
|
|
|
|
// 去除重复的领用详情
|
|
|
let i = this.inputForm.detailInfos.length
|
huangguoce