暂存

src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -10,10 +10,10 @@
         <el-descriptions-item  label="型号">{{ basic.model}}</el-descriptions-item>
         <el-descriptions-item  label="规格尺寸">{{ basic.spec}}</el-descriptions-item>
         <el-descriptions-item  label="计量单位组">{{ basic.unitname}}</el-descriptions-item>
-        <el-descriptions-item  label="存货类别">{{ basic.isonsale + '111'}}</el-descriptions-item>
+        <el-descriptions-item  label="存货类别"><span v-for="item in basic.itemclass" :key="item.index">{{ item.itemclassname}},</span></el-descriptions-item>
         <el-descriptions-item  label="领域"><span v-for="item in basic.tradefield" :key="item.index">{{ item.tradefield}},</span></el-descriptions-item>
-        <el-descriptions-item  label="品牌">{{ basic.brandname}}</el-descriptions-item>
-
+        <el-descriptions-item  label="品牌">{{ basic.brand?basic.brand[0].brandname:''}}</el-descriptions-item>
+        
         <el-descriptions-item  label="材质">{{ basic.material}}</el-descriptions-item>
         <el-descriptions-item  label="装置">{{ basic.device}}</el-descriptions-item>
         <el-descriptions-item  label="产线">{{ basic.prodline}}</el-descriptions-item>

src/HDrpManagement/ProductMag/modules/saleClass.vue

@@ -8,6 +8,7 @@
     <div>
       <tree :data="activeBrandData" node-key="itemclassid" :check-strictly="false"></tree>
     </div>
+    <el-button type="primary" size="small" @click="onSubmit">保存</el-button>
   </div>
 </template>
 

src/SDrpManagement/agentOrder/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">
@@ -25,6 +25,12 @@
       <div slot="slot1" >
         <product-list ref="prod"></product-list>
       </div>
+      <div slot="slot2" >
+        <product-list ref="prod"></product-list>
+      </div>
+      <div slot="slot3" >
+        <rebat></rebat>
+      </div>
     </basicDetails>
     <el-dialog append-to-body title="退回原因" :visible.sync="dialogVisible" width="400px">
       <el-input v-model="backreason" type="textarea" placeholder="请输入退回原因"></el-input>
@@ -37,8 +43,9 @@
 </template>
 
 <script>
-import defaultInfo from '../modules/defaultInfo.vue';
+import defaultInfo from './tabs/defaultInfo.vue';
 import productList from '../modules/productlist'
+import rebat from './tabs/rebatesettlement.vue'
 
 export default {
   name: "detail",
@@ -52,7 +59,8 @@ export default {
   },
   components:{
     defaultInfo,
-    productList
+    productList,
+    rebat
   },
   methods:{
     async queryMainData(id) {

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

@@ -0,0 +1,142 @@
+<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.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.rebate}}</el-descriptions-item>
+      <el-descriptions-item :labelStyle="{width:'120px'}" label="结算经销商">{{rebHeadData.sys_enterpriseid}}</el-descriptions-item>
+    </el-descriptions>
+    <el-table
+      :data="tableData"
+      border
+      size="mini"
+      style="width: 100%">
+      <el-table-column
+        prop="date"
+        label="产品"
+        width="itemname">
+      </el-table-column>
+      <el-table-column
+        prop="qty"
+        label="数量"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="marketprice"
+        label="牌价"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="discountrate"
+        label="折扣"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="price"
+        label="单价"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="amount"
+        label="金额"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="rebate_discountrate"
+        label="居间产品折扣"
+        width="150">
+      </el-table-column>
+      <el-table-column
+        prop="rebate_price"
+        label="居间产品单价"
+        width="150">
+      </el-table-column>
+      <el-table-column
+        prop="rebate_price"
+        label="居间产品单价"
+        width="150">
+      </el-table-column>
+      <el-table-column
+        prop="rebate_price"
+        label="居间单价"
+        width="120">
+      </el-table-column>
+      <el-table-column
+        prop="rebate"
+        label="居间费"
+        width="120">
+      </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 {
+      rebHeadData:{},
+      tableData:[],
+      param:{
+        "pageNumber": 1,
+        "pageSize": 20,
+      },
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async headData () {
+      const res = await this.$api.requested({
+        "id": "20230105194402",
+        "content": {
+          "sa_orderid": this.$route.query.id
+        },
+      })
+      this.rebHeadData = res.data
+      this.rebHeadData.sa_rebatesettlementid?this.listData():''
+    },
+    async listData () {
+      const res = await this.$api.requested({
+        "id": "20230105194902",
+        "content": {
+          "sa_rebatesettlementid": this.rebHeadData.sa_rebatesettlementid,
+          "pageNumber": this.param.pageNumber,
+          "pageSize": this.param.pageSize,
+          "where": {
+            "condition": ""
+          }
+        },
+      })
+      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.headData()
+  }
+}
+
+</script>
+<style>
+</style>

src/SDrpManagement/agentOrder/modules/add.vue

@@ -23,7 +23,7 @@
               </el-form-item>
             </el-col>
             <el-col v-if="form.type === '项目订单'" :span="12">
-              <el-form-item label="项目合同" prop="sa_contractid">
+              <el-form-item label="项目合同" prop="contractname">
                 <el-popover
                   placement="bottom"
                   trigger="click"
@@ -110,7 +110,7 @@ export default {
           message: '订货企业不能为空',
           trigger: 'blur'
         }],
-        sa_contractid:[{
+        contractname:[{
           required: true,
           message: '项目不能为空',
           trigger: 'blur'