Merge branch 'master' of http://gitlab.takedata.cc/zhangdong/web-purchase

src/pages/purchaser/bid/reviewed/inquiryAnnouncement.vue

@@ -393,6 +393,7 @@ export default {
                     item.name = item.fileName;
                     item.url = item.accessoryUrl;
                 }
+                data.accessoryPOList=data.accessoryVOList
                 this.ruleForm = data;
                 let userInfo = JSON.parse(localStorage.getItem('userInfo'));
                 this.ruleForm.purchaseAgent = userInfo.companyName;

src/pages/purchaser/bid/reviewed/tenderAnnouncement.vue

@@ -62,12 +62,13 @@ export default {
             }
         };
         return {
-            accessoryPOList: [],
+      
             editorOption: {},
             breads: ['招标管理', '招标项目管理', '工作台'],
             ruleForm: {
                 title: '',
-                content: ''
+                content: '',
+                 accessoryPOList: [],
             },
             rules: {
                 title: [
@@ -110,7 +111,7 @@ export default {
             for (let item of val) {
                 item.accessoryUrl = item.fileUrl;
             }
-            this.accessoryPOList = val;
+            this.ruleForm.accessoryPOList = val;
         },
         // 获取详情
         async getbiddingProjectId() {
@@ -129,7 +130,6 @@ export default {
         async submit() {
             let ruleForm = this.ruleForm;
             ruleForm.projectId = localStorage.getItem('projectId');
-            ruleForm.accessoryPOList = this.accessoryPOList;
             try {
                 const valid = await this.$refs['ruleForm'].validate();
                 if (valid) {
@@ -154,7 +154,6 @@ export default {
         async submit1() {
             let ruleForm = this.ruleForm;
             ruleForm.projectId = localStorage.getItem('projectId');
-            ruleForm.accessoryPOList = this.accessoryPOList;
             try {
                 const valid = await this.$refs['ruleForm'].validate();
                 if (valid) {

src/pages/supply/bid/joinProject/workbench.vue

@@ -78,7 +78,7 @@ export default {
                         {
                             id: 54,
                             label: '查看招标公告',
-                            url: '/supply/bid/signupOnline/seeAnnouncement',
+                             url: '/supply/bid/joinProject/seeInvitation',
                             bright: false
                         },
                         {