Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/architecture-dee/src/commonComponents/components/DeeUploadTable/index.vue

@@ -93,8 +93,8 @@ export default {
         align: 'center',
         headerAlign: 'center',
         key: 'target.contentType',
-        level: 1,
         parentKey: 'target',
+        level: 1,
         show: true,
         title: '附件用于',
         component: {
@@ -258,6 +258,7 @@ export default {
       val.forEach(r => {
         if (r.id && !r.operator) {
           r.operator = 'NO_CHANGE'
+          r.target.contentType = r.contentType
         }
         if (r.target && r.target.secretCode) {
           const secretDict = this.secretCodeOptions.find(m => m.value === r.target.secretCode)

applications/architecture-dee/src/commonComponents/components/DeeUploadTable/signleUpload.vue

@@ -485,7 +485,10 @@ export default {
       this.currentSelection = val
     },
     cellDataChange(val) {
-      this.$set(this.tableData, val.rowIndex, val.row)
+      const row = this.$utils._set(val.row, val.key, val.value)
+      row.operator = 'MODIFY'
+      row.contentType = row.target.contentType
+      this.$set(this.tableData, val.rowIndex, row)
       this.$emit('uploadData', this.tableData)
     },
     upload(file) {