订单发票新增开票单号、订单管理、订货业务新增关联合同

src/HDrpManagement/orderManage/details/index.vue

@@ -366,6 +366,10 @@ export default {
         {
           label:'项目备注',
           value:this.mainData.projectnote
+        },
+        {
+          label:'关联合同',
+          value:this.mainData.contract_title
         }
       ]
     },

src/HDrpManagement/orderManage/details/tabs/invoiceTable.vue

@@ -13,6 +13,11 @@
         type="selection"
         align="center">
       </el-table-column>
+      <el-table-column
+          prop="billno"
+          :label="$t(`开票单号`)"
+          width="180">
+      </el-table-column>
       <el-table-column
         prop="sa_invoicebillid"
         :label="$t(`发票ID`)"

src/HDrpManagement/orderManage/details/tabs/table.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
-    <el-table  ref="table" :fit="tool.calculatedColumnWidth($refs.table,layout)" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini"  :height="height" @row-click="rowClick" style="width:100%" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
+    <el-table  ref="table" :fit="tool.calculatedColumnWidth($refs.table,layout)" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini"  :height="height" @row-click="rowClick" style="width:100%;" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
               :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange">
       <el-table-column
           type="selection"
@@ -100,6 +100,10 @@ export default {
 
 </script>
 <style scoped>
+/* 设置滚动条常显示 */
+>>>.el-table__body-wrapper {
+  overflow: scroll;
+}
 /* 解决横向滚动条被固定列遮住的问题 */
 >>>.el-table__fixed, >>>.el-table__fixed-right {
   height: calc(100% - 15px) !important;

src/SDrpManagement/agentOrder/details/tabs/invoiceTable.vue

@@ -13,6 +13,11 @@
         type="selection"
         align="center">
       </el-table-column>
+      <el-table-column
+          prop="billno"
+          :label="$t(`开票单号`)"
+          width="180">
+      </el-table-column>
       <el-table-column
         prop="sa_invoicebillid"
         :label="$t(`发票ID`)"

src/SDrpManagement/salerOrder/details/index.vue

@@ -502,6 +502,10 @@ export default {
           label: "项目备注",
           value: this.mainData.projectnote,
         },
+        {
+          label:'关联合同',
+          value:this.mainData.contract_title
+        }
       ];
     },
     // 监听切换数据,上一页,下一页

src/SDrpManagement/salerOrder/details/tabs/invoiceTable.vue

@@ -11,6 +11,11 @@
       @row-click="activeRow"
     >
       <el-table-column type="selection" align="center"> </el-table-column>
+      <el-table-column
+          prop="billno"
+          :label="$t(`开票单号`)"
+          width="180">
+      </el-table-column>
       <el-table-column
         prop="sa_invoicebillid"
         :label="$t(`发票ID`)"

src/components/normal-basic-layout/details/index.vue

@@ -43,6 +43,15 @@
               </span>
               <span v-else>--</span>
             </span>
+            <span v-else-if="item.label === '关联合同'"  :style="item.style?item.style():''">
+              <span v-if="item.value !== ''">
+                <el-button v-if="item.value !== '--'" type="text" @click="onGoContract" style="margin: 0;padding: 0">
+                  {{$t(item.value)}}
+                </el-button>
+                <span v-else>--</span>
+              </span>
+              <span v-else>--</span>
+            </span>
             <span v-else :style="item.style?item.style():''">{{item.value !== ''?$t(item.value):'--'}}</span>
           </el-descriptions-item>
         </el-descriptions>
@@ -87,7 +96,17 @@
 
       </el-row>
     </div>
-
+    <el-drawer
+        :visible.sync="drawer"
+        :with-header="false"
+        direction="rtl"
+        size="90%"
+        append-to-body
+    >
+      <div class="detail__panel">
+        <router-view :key='$route.path'/>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -104,6 +123,7 @@ export default {
   props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler','mainData','status','typeTask','isGroup','isBatch','modelName','isDelete','column','attachmentDisabled'],
   data () {
     return {
+      drawer:false,
       isTop:true,
       routerName:'',
       rowindex:0,
@@ -450,6 +470,22 @@ export default {
     teamList(val){
       this.$emit('teamList',val)
     },
+    onGoContract(){
+      this.$store.dispatch('changeDetailDrawer',false)
+      this.$nextTick(()=>{
+        let route = this.$route
+        if (route.path !== 'orderdetail' || route.path !== 'saler_orderDetails') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        let type = this.editData.contract_type == '项目'?this.editData.contract_typemx == '直销'?'直销项目':'经销项目':this.editData.contract_type
+        this.$router.push({
+          path:'/contractDetail',
+          query:{id:this.editData.sa_contractid,rowindex:this.editData.rowindex, type:type}
+        })
+        this.$store.dispatch('changeDetailDrawer',true)
+      })
+    },
     logSuccess(){
       this.$emit('logSuccess')
     }