合并

src/router/index.js

@@ -98,7 +98,7 @@ export const asyncRouterMap = [{
 			{
 				path: 'contracts/addcontract',
 				name: 'addcontract',
-				component: () => import('@/views/contracts/editcontract'),
+				component: () => import('@/views/contracts/new_file'),
 				meta: {
 					title: '新增合同',
 					roles: ['admin', 'salesman', 'supplier']

src/views/contracts/new_file.vue

@@ -28,7 +28,11 @@
         <span style="color: #d05c39"> *支持上传pdf、jpg/jpeg、png格式</span>
       </div>
       <div>
-        <Upload v-model="form.pics" />
+        <FileUpload
+        v-model="form.pics"
+        accept=".jpg, .jpeg, .png, .pdf"
+        />
+        <!--<Upload v-model="form.pics" />-->
       </div>
       <!-- 发票附件图片 -->
       <div class="titlesa">
@@ -36,7 +40,10 @@
         <span style="color: #d05c39">*支持上传pdf、jpg/jpeg、png格式</span>
       </div>
       <div>
-        <Upload v-model="form.invoicePics" />
+        <FileUpload
+        v-model="form.invoicePics"
+        accept=".jpg, .jpeg, .png, .pdf"
+        />
       </div>
       <!-- 贸易附件图片 -->
       <div class="titlesa">
@@ -44,7 +51,10 @@
         <span style="color: #d05c39">*支持上传pdf、jpg/jpeg、png格式</span>
       </div>
       <div>
-        <Upload v-model="form.tradePics" />
+        <FileUpload
+        v-model="form.tradePics"
+        accept=".jpg, .jpeg, .png, .pdf"
+        />
       </div>
 
       <el-form ref="form" :model="form" label-width="110px" label-position="right" class="form-container">
@@ -245,7 +255,7 @@
   </div>
 </template>
 <script>
-import { contractSubmitApi, contractsPageApi } from '@/api/contracts'
+import { contractSubmitApi, contractsPageApi, contractsDetailApi } from '@/api/contracts'
 import { maxLoanAmount, serviceCharge, interest } from '@/utils/calc'
 import DrawerSelect from '@/components/DrawerSelect/DrawerSelect.vue'
 import AcceptorSelect from '@/components/AcceptorSelect/AcceptorSelect.vue'
@@ -340,8 +350,27 @@ export default {
   },
   mounted() {
     // this.loadData()
+
+    // 编辑获取详情
+    this.getDetail()
   },
   methods: {
+    getDetail() {
+      const id = this.$route.query.id
+      if(!id){
+        return
+      }
+      contractsDetailApi(id).then((res) => {
+        console.log('detail=', res.data)
+        this.form.id   = res.data.id
+        this.form.name = res.data.name
+        this.form.contractNo = res.data.contractNo
+        this.form.invoicePics = res.data.invoicePicList
+        this.form.tradePics = res.data.tradePicList
+        this.form.pics = res.data.picList
+        this.form.contractDrafts = res.data.contractDraft.result
+      });
+    },
     loadData() {
       contractsPageApi({
         pageIndex: 1,