[update] 全局样式去掉最小宽度，防止出现双滚动条的情况；合同修改

src/views/workTeam/WorkTeam.vue

@@ -10,16 +10,21 @@
                 <a-input placeholder="请输入项目名称" v-model="queryParam.chargeProject" :maxLength="50"></a-input>
               </a-form-item>
             </a-col>
+<!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
+<!--              <a-form-item label="需要发票">-->
+<!--                <j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"-->
+<!--                                   v-model="queryParam.needInvoice"></j-dict-select-tag>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
+<!--              <a-form-item label="打包项目">-->
+<!--                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"-->
+<!--                                   v-model="queryParam.pack"></j-dict-select-tag>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
-              <a-form-item label="需要发票">
-                <j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"
-                                   v-model="queryParam.needInvoice"></j-dict-select-tag>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="8" :md="8" :sm="24">
-              <a-form-item label="打包项目">
-                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"
-                                   v-model="queryParam.pack"></j-dict-select-tag>
+              <a-form-item label="运行年份">
+                <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>
 
@@ -39,6 +44,7 @@
         <a-table
           ref="table"
           rowKey="id"
+          :scroll="{x: 1200}"
           :columns="columns"
           :dataSource="dataSource"
           :pagination="ipagination"
@@ -74,10 +80,11 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
 import MineContractModule from '@views/mineContract/modules/MineContractModule'
+import JYearDate from '@comp/jero/JYearDate'
 
 export default {
   name: 'WorkTeam',
-  components: { ProjectDetailModal, MineContractModule },
+  components: { ProjectDetailModal, MineContractModule, JYearDate },
   mixins: [JeroListMixin],
   data() {
     return {

src/views/workTeam/WorkTeamDetail.vue

@@ -6,7 +6,7 @@
         <h3 class="title">基本信息</h3>
         <a-spin :spinning="basicLoading">
           <a-row :gutter="10">
-            <a-col :span="24" class="basic-info-item"><label>项目名称：</label><span>{{ detail.name }}</span>
+            <a-col :span="24" class="basic-info-item"><label>项目名称：</label><span>{{ detail.chargeProject }}</span>
             </a-col>
             <a-col :span="8" class="basic-info-item"><label>项目负责人：</label><span>{{ detail.principalName }}</span>
             </a-col>
@@ -26,13 +26,11 @@
               <span>{{ detail.contractNum }}</span>
             </a-col>
             <!--        收费通知-->
-            <!--            v-if="detail.chargeWay === 3"-->
-            <a-col :span="8" class="basic-info-item">
+            <a-col :span="8" class="basic-info-item" v-if="detail.chargeWay === 3">
               <label>收费通知号：</label>
               <span>{{ detail.chargeNoticeNo }}</span>
             </a-col>
-            <!--            v-if="detail.chargeWay === 3"-->
-            <a-col :span="12" class="basic-info-item">
+            <a-col :span="12" class="basic-info-item" v-if="detail.chargeWay === 3">
               <label>收费通知：</label>
               <span style="width: 100%;">
                 <preview-file style="width: 80%" :file-id="detail.chargeNoticeId"></preview-file>
@@ -69,7 +67,50 @@
         
         </a-table>
       </div>
-      
+
+      <!--      付款信息-->
+      <div class="payment-info basic-box">
+        <div class="collapsible-title">
+          <h3 class="title">付款信息</h3>
+          <a-button type="link" @click="viewPaymentInfo">{{ showPaymentInfo ? '收起' : '查看' }}</a-button>
+        </div>
+        <div class="payment-info-box" v-show="showPaymentInfo">
+          <section class="payment-info-title">付款信息</section>
+          <template v-if="paymentInfoList && paymentInfoList.length > 0">
+            <div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">
+              {{ item.paymentDate }}付款{{ item.amountReceived }}元
+            </div>
+          </template>
+          <a-list v-else :data-source="[]"/>
+        </div>
+      </div>
+
+      <!--      开票邮寄信息-->
+      <div class="logistics-info basic-box">
+        <div class="collapsible-title">
+          <h3 class="title">开票邮寄信息</h3>
+          <a-button type="link" @click="viewMailInfo">{{ showMailInfo ? '收起' : '查看' }}</a-button>
+        </div>
+        <div class="wrap-table" v-show="showMailInfo">
+          <a-table
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :pagination="false"
+            :columns="mailColumns"
+            :dataSource="logisticsInfoList"
+            class="j-table-force-nowrap"
+          >
+        <span slot="action" slot-scope="record" class="action-span-cell">
+          <a @click="lookLogistics(record)" v-if="record.postStatus === 1">查看物流</a>
+        </span>
+            <!--          <p slot="expandedRowRender" slot-scope="record" style="margin: 0">-->
+            <!--            {{ record.sendDate }}-->
+            <!--          </p>-->
+          </a-table>
+        </div>
+      </div>
+
       <!--      工作组会议-->
       <div class="meeting basic-box">
         <h3 class="title">工作组会议</h3>
@@ -147,6 +188,55 @@ const fileColumns = [
     scopedSlots: { customRender: 'action' }
   }]
 
+const mailColumns = [
+  {
+    title: '开票人',
+    align: 'center',
+    dataIndex: 'realName'
+  },
+  {
+    title: '日期',
+    align: 'center',
+    dataIndex: 'billDate'
+  },
+  {
+    title: '金额(元)',
+    align: 'center',
+    dataIndex: 'invoiceAmount'
+  },
+  {
+    title: '票号',
+    align: 'center',
+    dataIndex: 'billNo'
+  },
+  {
+    title: '项目',
+    align: 'center',
+    dataIndex: 'projectName'
+  },
+  {
+    title: '邮寄人',
+    align: 'center',
+    dataIndex: 'mailName'
+  },
+  {
+    title: '快递',
+    align: 'center',
+    dataIndex: 'sendMethod_dictText'
+  },
+  {
+    title: '快递单号',
+    align: 'center',
+    dataIndex: 'postNo'
+  },
+  {
+    title: '操作',
+    align: 'center',
+    dataIndex: '',
+    scopedSlots: { customRender: 'action' }
+  }
+]
+
 export default {
   name: 'WorkTeamDetail',
   components: { MeetingList, FileList, UnderStudyFilesModal, PreviewFile },
@@ -161,6 +251,12 @@ export default {
       columns,
       // 过程文件表头
       fileColumns,
+      // 开票邮寄表头
+      mailColumns,
+      // 到账信息
+      paymentInfoList: [],
+      // 开票邮寄信息
+      logisticsInfoList: [],
       dataSource: [],
       /* 分页参数 */
       ipagination: {
@@ -174,7 +270,11 @@ export default {
         showSizeChanger: true,
         total: 0
       },
-      loading: false
+      loading: false,
+      // 显示付款信息
+      showPaymentInfo: false,
+      // 显示邮寄信息
+      showMailInfo: false
     }
   },
   created() {
@@ -223,10 +323,33 @@ export default {
       queryCommonProjectById(param).then(res => {
         if (res.success) {
           this.detail = res.result
+          // 到账信息
+          this.paymentInfoList = res.result.paymentRecord
+          // 开票邮寄信息
+          this.logisticsInfoList = res.result.mailBill
         } else {
           this.$message.warn(res.message)
         }
       })
+    },
+    /**
+     * 控制付款信息显隐
+     */
+    viewPaymentInfo() {
+      this.showPaymentInfo = !this.showPaymentInfo
+    },
+    /**
+     * 控制开票邮寄信息显隐
+     */
+    viewMailInfo() {
+      this.showMailInfo = !this.showMailInfo
+    },
+    /*
+    *  查看物流
+    * */
+    lookLogistics(record) {
+      const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
+      window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
     }
   }
 }
@@ -277,4 +400,57 @@ export default {
     margin-bottom: 5px;
   }
 }
+
+/*可收起的标题样式*/
+.collapsible-title {
+  display: flex;
+  justify-content: space-between;
+}
+
+/* 到账信息 */
+.payment-info {
+
+  &-box {
+    border: 1px solid #ccc;
+  }
+
+  &-title {
+    text-align: center;
+    font-size: 14px;
+    height: 35px;
+    line-height: 35px;
+    letter-spacing: 1px;
+    color: #fff;
+    background: #a2e6e4;
+  }
+
+  &-content {
+    color: #424242;
+    //background: #efefef;
+    padding: 5px;
+    padding-left: 10px;
+    //border: 1px solid #ccc;
+    border-top: none;
+  }
+}
+
+/* 查看 开票邮寄信息*/
+.logistics-info {
+  position: relative;
+
+  .wrap-table.hide {
+    height: 0;
+    display: none;
+    transition: all 0.5s ease-out;
+  }
+
+  .wrap-table {
+    transition: all 0.5s ease-out;
+  }
+
+  //.ant-table.hide{
+  //  height: 0;
+  //  display: none;
+  //}
+}
 </style>