Merge branch 'master' into rongxin_dev

src/views/notice/index.vue

@@ -19,7 +19,10 @@
         >
           <van-cell v-for="(item,index) in noticeList" icon="play" :key="index" :title="item.projectName" :to="{name:'noticeDetailCJ', query: {id:item.id}}">
             <template #label>
-              项目编号：{{item.projectCode}} <p style="float: right;">{{item.dealTime.substr(0,10)}}</p>
+
+              <div v-if="item.projectStatus == '2'" style="color: #c12e2a;">项目终止</div>
+              <div v-else>项目编号：{{item.projectCode}} <p style="float: right;">{{item.dealTime.substr(0,10)}}</p></div>
+
             </template>
           </van-cell>
         </van-list>

src/views/notice/inviteTendersDetail.vue

@@ -72,12 +72,13 @@ export default {
       let query = {
         tableName: 't_transaction_tender',
         bizPath: 'transaction',
-        tableId:this.$route.query.id
+        tableId:this.$route.query.id,
+        fileType:'2'
       }
       attachmentQuery(query).then(response => {
         response.rows.forEach(res=>{
           if (res.fileType!=1){
-            console.log('aaaaaaaaaaaa')
+            // console.log('aaaaaaaaaaaa')
             this.attachmentQueryList.push(res)
           }
         })

src/views/notice/noticeDetail.vue

@@ -8,6 +8,9 @@
       @click-left="onClickLeft"
     />
     <van-cell title="项目名称" :value="noticeDetail.projectName" />
+
+    <van-cell v-if="noticeDetail.projectStatus == '2'" title="终止原因" type="textarea" :value="noticeDetail.terminateReason" />
+    <template v-else>
     <van-cell title="项目编号" :value="noticeDetail.projectCode" />
     <van-cell title="转出方式" :value="noticeDetail.rollout" />
     <van-cell title="交易方式" :value="noticeDetail.dealType" />
@@ -21,16 +24,27 @@
     <van-cell title="转出年限" :value="noticeDetail.outStartTime+'至'+noticeDetail.outStopTime" />
     <van-cell title="成交价格" :value="noticeDetail.dealMoney+noticeDetail.unit" />
     <van-cell title="成交金额" :value="noticeDetail.dealMoneySum" />
+    </template>
+    <div v-if="noticeDetail.projectStatus == '2'">
+      <van-divider>附件</van-divider>
+      <van-cell :title="item.fileName" :url="'/api'+item.fileUrl" is-link v-for="(item,index) in attachmentQueryList">
+        <!-- 使用 right-icon 插槽来自定义右侧图标 -->
+        <template #icon>
+          <img src="../../assets/images/file_icon.png" style="display: block;width: 24px;margin-right: 5px;" alt="">
+        </template>
+      </van-cell>
+    </div>
   </div>
 </template>
 
 <script>
-import { noticeDetails } from "@/api/notice/index";
+  import {attachmentQuery, noticeDetails} from "@/api/notice/index";
 export default {
   name: "noticeDetail",
   data() {
     return {
-      noticeDetail:''
+      noticeDetail:'',
+      attachmentQueryList:[]
     };
   },
   created() {
@@ -60,6 +74,15 @@ export default {
         this.getDicts("price_unit").then(res => {
           this.noticeDetail.unit = this.selectDictLabel(res.data,response.data.unit);
         });
+        let query = {
+          tableName: 't_transaction_deal_publicity',
+          bizPath: 'transaction',
+          tableId:this.$route.query.id,
+          fileType:''
+        }
+        attachmentQuery(query).then(response => {
+          this.attachmentQueryList = response.rows;
+        });
       });
     },
 

src/views/notice/winTheBiddingDetail.vue

@@ -84,14 +84,15 @@ export default {
             this.$set(this.attestationDetail,'dealFailReason',this.selectDictLabel(res.data,response2.data.dealFailReason))
           });
         });
-      });
-      let query = {
-        tableName: 't_transaction_tender_win',
-        bizPath: 'transaction',
-        tableId:this.$route.query.id
-      }
-      attachmentQuery(query).then(response => {
-        this.attachmentQueryList = response.rows;
+        let query = {
+          tableName: 't_transaction_tender_win',
+          bizPath: 'transaction',
+          tableId:this.$route.query.id,
+          fileType:response.data.dealType == '1'? '1' : response.data.dealType == '3'? '3' : '0'
+        }
+        attachmentQuery(query).then(response => {
+          this.attachmentQueryList = response.rows;
+        });
       });
     },