Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/toolBorrowingMag/detail/index.vue

@@ -11,7 +11,7 @@
       ownertable="sa_order"
       delApiId="20230116100002"
       :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'交期待确认'},{key:'status',value:'提交'},{key:'status',value:'交期确认'}]"
-      :tabs="['借用单明细']"
+      :tabs="['借用单明细','发货单','物流单','收支明细']"
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation" class="inline-16">
@@ -45,7 +45,14 @@
       <div slot="slot0" >
         <toolList></toolList>
       </div>
-      <div slot="slot1" >
+       <div slot="slot1">
+        <dispatch></dispatch>
+      </div>
+      <div slot="slot2">
+        <logistics></logistics>
+      </div>
+      <div slot="slot3">
+        <revenue :data="mainData"></revenue>
       </div>
     </basicDetails>
     <el-dialog append-to-body title="退回原因" :visible.sync="dialogVisible" width="400px">
@@ -61,6 +68,9 @@
 <script>
 import toolList from './tabs/toolList.vue'
 import confirmDate from '../modules/confirmDate.vue'
+import dispatch from './tabs/dispatch.vue'
+import logistics from './tabs/logistics.vue'
+import revenue from './tabs/revenueAndExp.vue'
 
 export default {
   name: "detail",
@@ -77,7 +87,10 @@ export default {
   },
   components:{
     toolList,
-    confirmDate
+    confirmDate,
+    dispatch,
+    logistics,
+    revenue,
   },
   methods:{
     async orderreviewtype () {
@@ -93,6 +106,8 @@ export default {
         }
       })
       this.mainData = res.data
+      console.log(this.mainData);
+      
       this.changeDataStructure()
       this.orderreviewtype()
     },

src/HDrpManagement/toolBorrowingMag/detail/tabs/dispatch.vue

@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      size="small"
+      border>
+      <el-table-column
+        prop="billno"
+        label="发货单号"
+        width="180">
+        <template slot-scope="scope">
+          <a class="table_row_link" @click="linkDetail(scope.row)">{{scope.row.billno}}</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="状态"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="billdate"
+        label="发货日期">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="备注">
+      </el-table-column>
+    </el-table>
+    <div class="container normal-panel" style="text-align:right">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-sizes="[20, 50, 100, 200]"
+        layout="total,sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      tableData:[],
+      param:{
+        "id": 20221205111302,
+        "content": {
+          "sa_orderid": '',
+          "pageNumber": 1,
+          "pageSize": 17,
+          "where": {
+            "condition": ""
+          }
+        },
+      },
+      total:0,
+      currentPage:0,
+    }
+  },
+  methods:{
+    async listData() {
+      this.param.content.sa_orderid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      this.param.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      this.param.pageNumber = val
+      this.listData()
+    },
+    linkDetail (item) {
+        let route = this.$route
+        if (route.path !== '/taskDetails') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({path:'/dispatchdetail',query:{id:item.sa_dispatchid,rowindex:item.rowindex}})
+      }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/toolBorrowingMag/detail/tabs/logistics.vue

@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      size="small"
+      border>
+      <el-table-column
+        prop="billno"
+        label="物流单号"
+        width="180">
+        <template slot-scope="scope">
+          <a class="table_row_link" @click="linkDetail(scope.row)">{{scope.row.billno}}</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="状态"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="createdate"
+        label="单据日期">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="备注">
+      </el-table-column>
+    </el-table>
+    <div class="container normal-panel" style="text-align:right">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-sizes="[20, 50, 100, 200]"
+        layout="total,sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      tableData:[],
+      param:{
+        "id": 20221205111402,
+        "content": {
+          "sa_orderid": '',
+          "pageNumber": 1,
+          "pageSize": 17,
+          "where": {
+            "condition": ""
+          }
+        },
+      },
+      total:0,
+      currentPage:0,
+    }
+  },
+  methods:{
+    async listData() {
+      this.param.content.sa_orderid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      this.param.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      this.param.pageNumber = val
+      this.listData()
+    },
+    linkDetail (item) {
+        let route = this.$route
+        if (route.path !== '/taskDetails') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({path:'/logisticsdetail',query:{id:item.sa_logisticsid,rowindex:item.rowindex}})
+      }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/toolBorrowingMag/detail/tabs/revenueAndExp.vue

@@ -0,0 +1,70 @@
+<template>
+  <div>
+    <el-table
+      :data="list"
+      style="width: 100%"
+      size="mini"
+      border>
+      <el-table-column
+        prop="billno"
+        label="单据编号"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="source"
+        label="来源"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="amount"
+        label="金额">
+      </el-table-column>
+      <el-table-column
+        prop="remarks"
+        label="备注">
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data'],
+  data () {
+    return {
+      list:[],
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested({
+        "id": 20230221193203,
+        "content": {
+          "sa_orderid":this.data.sa_orderid
+        }
+      })
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>