zhangqiOMG преди 2 години
родител
ревизия
cca46c3d59

+ 21 - 3
src/HDrpManagement/orderManage/details/index.vue

@@ -12,7 +12,7 @@
         delApiId="20221108152102"
         tags=""
         :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'提交'},{key:'status',value:'关闭'}]"
-        :tabs="['基本信息','订单明细','订单进度','居间费明细']"
+        :tabs="['基本信息','订单明细','订单进度','居间费明细','发货单']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation" class="inline-16">
@@ -23,6 +23,7 @@
           <el-button v-if="tool.checkAuth($route.name,'reback')" :disabled="mainData.status !== '提交' && mainData.status !== '交期待确认'" type="primary" size="mini" @click="dialogVisible = true">退 回</el-button>
           <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
           <el-button v-if="tool.checkAuth($route.name,'close')" :disabled="mainData.status !== '审核'" type="primary" size="mini" @click="closeOrder">关 闭</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
       </div>
       <div slot="slot0" >
         <default-info :mainData="mainData"></default-info>
@@ -36,6 +37,10 @@
       <div slot="slot3" >
         <rebat></rebat>
       </div>
+      <div slot="slot4" >
+        <dispatch></dispatch>
+      </div>
+      
     </basicDetails>
     <el-dialog append-to-body title="退回原因" :visible.sync="dialogVisible" width="400px">
       <el-input v-model="backreason" type="textarea" placeholder="请输入退回原因"></el-input>
@@ -53,6 +58,7 @@ import productList from './tabs/productlist.vue'
 import confirmDate from '../modules/confirmDate.vue'
 import rebat from './tabs/rebatesettlement.vue'
 import orderprogress from './tabs/orderpProgress.vue'
+import dispatch from './tabs/dispatch.vue'
 export default {
   name: "detail",
   data() {
@@ -68,7 +74,8 @@ export default {
     productList,
     confirmDate,
     rebat,
-    orderprogress
+    orderprogress,
+    dispatch
   },
   methods:{
     async queryMainData(id) {
@@ -241,7 +248,18 @@ export default {
       this.tool.showMessage(res,()=>{
         this.queryMainData()
       })
-    }
+    },
+    async onCopy () {
+      const res = await this.$api.requested({
+        "id": 20230102144502,
+        "content": {
+          "sa_orderid": this.$route.query.id
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.tool.showMessage(res)
+      })
+    },
   },
   mounted () {
     this.queryMainData(this.$route.query.id)

+ 80 - 0
src/HDrpManagement/orderManage/details/tabs/dispatch.vue

@@ -0,0 +1,80 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column
+        prop="billno"
+        label="发货单号"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="状态"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        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": 12,
+          "pageNumber": 1,
+          "pageSize": 17,
+          "where": {
+            "condition": ""
+          }
+        },
+      }
+    }
+  },
+  methods:{
+    async listData() {
+      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()
+    },
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

+ 5 - 10
src/HDrpManagement/orderManage/details/tabs/rebatesettlement.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-descriptions class="margin-top mt-10" title="居间明细" :column="2" size="small" border>
-      <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额比例">{{rebHeadData.discountrate}}</el-descriptions-item>
+      <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额比例">{{rebHeadData.orderratio}}</el-descriptions-item>
       <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额">{{rebHeadData.amount}}</el-descriptions-item>
-      <el-descriptions-item :labelStyle="{width:'120px'}" label="居间产品折扣">{{rebHeadData.rebate_discountrate}}</el-descriptions-item>
+      <el-descriptions-item :labelStyle="{width:'120px'}" label="居间产品折扣">{{rebHeadData.productdiscount}}</el-descriptions-item>
       <el-descriptions-item :labelStyle="{width:'120px'}" label="居间费">{{rebHeadData.rebate}}</el-descriptions-item>
-      <el-descriptions-item :labelStyle="{width:'120px'}" label="结算经销商">{{rebHeadData.sys_enterpriseid}}</el-descriptions-item>
+      <el-descriptions-item :labelStyle="{width:'120px'}" label="结算经销商">{{rebHeadData.enterprisename}}</el-descriptions-item>
     </el-descriptions>
     <el-table
       :data="tableData"
@@ -13,7 +13,7 @@
       size="mini"
       style="width: 100%">
       <el-table-column
-        prop="date"
+        prop="itemname"
         label="产品"
         width="itemname">
       </el-table-column>
@@ -53,12 +53,7 @@
         width="150">
       </el-table-column>
       <el-table-column
-        prop="rebate_price"
-        label="居间产品单价"
-        width="150">
-      </el-table-column>
-      <el-table-column
-        prop="rebate_price"
+        prop="rebate_unit_price"
         label="居间单价"
         width="120">
       </el-table-column>

+ 19 - 2
src/SDrpManagement/agentOrder/details/index.vue

@@ -18,6 +18,7 @@
         <div slot="customOperation" class="inline-16">
           <el-button :disabled="mainData.status !== '交期待确认'"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
           <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
       </div>
       <div slot="slot0" >
         <default-info :mainData="mainData"></default-info>
@@ -31,6 +32,9 @@
       <div slot="slot3" >
         <rebat></rebat>
       </div>
+      <div slot="slot3" >
+        <dispatch></dispatch>
+      </div>
     </basicDetails>
     <el-dialog append-to-body title="退回原因" :visible.sync="dialogVisible" width="400px">
       <el-input v-model="backreason" type="textarea" placeholder="请输入退回原因"></el-input>
@@ -47,6 +51,7 @@ import defaultInfo from './tabs/defaultInfo.vue';
 import productList from '../modules/productlist.vue'
 import rebat from './tabs/rebatesettlement.vue'
 import orderprogress from './tabs/orderpProgress.vue'
+import dispatch from './tabs/dispatch.vue'
 export default {
   name: "detail",
   data() {
@@ -61,7 +66,8 @@ export default {
     defaultInfo,
     productList,
     rebat,
-    orderprogress
+    orderprogress,
+    dispatch
   },
   methods:{
     async queryMainData(id) {
@@ -200,7 +206,18 @@ export default {
       this.tool.showMessage(res,()=>{
         this.queryMainData()
       })
-    }
+    },
+    async onCopy () {
+      const res = await this.$api.requested({
+        "id": 20230102144502,
+        "content": {
+          "sa_orderid": this.$route.query.id
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.tool.showMessage(res)
+      })
+    },
   },
   mounted () {
     this.queryMainData(this.$route.query.id)

+ 80 - 0
src/SDrpManagement/agentOrder/details/tabs/dispatch.vue

@@ -0,0 +1,80 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column
+        prop="date"
+        label="发货单号"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="状态"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        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": 12,
+          "pageNumber": 1,
+          "pageSize": 17,
+          "where": {
+            "condition": ""
+          }
+        },
+      }
+    }
+  },
+  methods:{
+    async listData() {
+      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()
+    },
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>