Bladeren bron

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package-lock.json
chris 3 jaren geleden
bovenliggende
commit
0eb8cafa6d
2 gewijzigde bestanden met toevoegingen van 399 en 274 verwijderingen
  1. 391 274
      package-lock.json
  2. 8 0
      src/views/modules/tech/ctafts-add-or-detail.vue

File diff suppressed because it is too large
+ 391 - 274
package-lock.json


+ 8 - 0
src/views/modules/tech/ctafts-add-or-detail.vue

@@ -37,6 +37,9 @@
       <el-form-item label="备注说明">
         <el-input v-model="dataForm.notes" :disabled="display" placeholder="备注说明"></el-input>
       </el-form-item>
+      <el-form-item label="" label-width="0px">
+        <upload-component :display="display" :title="'文件上传'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess"/>
+      </el-form-item>
       <el-form-item label="工艺步骤" prop="nodeList">
       </el-form-item>
       <el-row class="my-row" style="height: 350px; background-color: #efefef;">
@@ -167,12 +170,14 @@
 <script>
   import { getInfo, getProduct, getWorkType, getStepId } from '@/api/crafts'
   import { uuid } from '../common/vue-super-flow/utils'
+  import UploadComponent from '../common/upload-component'
   const drawerType = {
     node: 0,
     link: 1
   }
   export default {
     name: 'add-or-update',
+    components: {UploadComponent},
     computed: {
       orgId: {
         get () { return this.$store.state.user.orgId }
@@ -645,6 +650,9 @@
             conf.visible = false
           }
         })
+      },
+      uploadSuccess (fileList) {
+        this.fileList = fileList
       }
     }
   }

Some files were not shown because too many files changed in this diff