Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
This commit is contained in:
+6
-5
@@ -163,15 +163,16 @@
|
|||||||
:prop="'dataList.'+index+'.deliverableType'"
|
:prop="'dataList.'+index+'.deliverableType'"
|
||||||
:rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
|
:rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
|
||||||
>
|
>
|
||||||
|
<!--
|
||||||
|
:maxTagCount="1"
|
||||||
|
tree-checkable-->
|
||||||
<a-tree-select
|
<a-tree-select
|
||||||
tree-node-filter-prop="title"
|
tree-node-filter-prop="title"
|
||||||
v-model="item.deliverableType"
|
v-model="item.deliverableType"
|
||||||
:maxTagCount="1"
|
|
||||||
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
:getPopupContainer="triggerNode=> triggerNode.parentNode"
|
||||||
class="box-input"
|
class="box-input"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
:tree-data="DeliverableTreeList"
|
:tree-data="DeliverableTreeList"
|
||||||
tree-checkable
|
|
||||||
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
|
:placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
|
||||||
/>
|
/>
|
||||||
</a-form-model-item>
|
</a-form-model-item>
|
||||||
@@ -740,16 +741,16 @@
|
|||||||
}
|
}
|
||||||
this.formInline = { ...this.formInline }
|
this.formInline = { ...this.formInline }
|
||||||
},
|
},
|
||||||
clickButtonToUpload(item, index,isTrue) {
|
clickButtonToUpload(item, index, isTrue) {
|
||||||
this.numIndex = index
|
this.numIndex = index
|
||||||
this.$refs.uploadFile.perentHandleFunc()
|
this.$refs.uploadFile.perentHandleFunc()
|
||||||
this.$refs.uploadFile.visible = true
|
this.$refs.uploadFile.visible = true
|
||||||
this.uploadName = item
|
this.uploadName = item
|
||||||
let ids = ''
|
let ids = ''
|
||||||
console.log(index)
|
console.log(index)
|
||||||
if (isTrue){
|
if (isTrue) {
|
||||||
ids = this.formInline.dataList[index][item]
|
ids = this.formInline.dataList[index][item]
|
||||||
}else{
|
} else {
|
||||||
ids = this.formInline[item]
|
ids = this.formInline[item]
|
||||||
}
|
}
|
||||||
getAction('sys/common/getFileInfos', { id: ids }).then((res) => {
|
getAction('sys/common/getFileInfos', { id: ids }).then((res) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user