暂存

src/HDrpManagement/dispatch/details/index.vue

@@ -190,11 +190,11 @@ import defaultInfo from '../modules/defaultInfo.vue'
           }
         })
         
-        this.tool.showMessage(()=>{
+        this.tool.showMessage(res,()=>{
           let route = this.$route
           this.oldRoute = {path:route.path,query:route.query}
           this.$store.dispatch('setHistoryRouter',this.oldRoute)
-          this.$router.replace({path:'/logisticsdetail',query:{id:res.data.sa_logisticsid,rowindex:res.data.rowindex}})
+          this.$router.replace({path:'/logisticsdetail',query:{id:res.data[0].sa_logisticsid,rowindex:res.data[0].rowindex}})
         })
       }
     },

src/HDrpManagement/orderManage/details/index.vue

@@ -51,7 +51,10 @@
       <div slot="slot1">
         
         <product-list @select="select" :data="mainData" ref="prod">
-          <el-button :disabled="mainData.status !== '审核'" slot="operation" size="small" type="primary" style="margin-bottom:12px" @click="adddispatch">一键发货</el-button>
+          <div slot="operation">
+            <changeOrderMx v-if="mainData.status === '审核'" class="inline-16" :data="selection" @onSuccess="$refs['prod'].listData()"></changeOrderMx>
+            <el-button :disabled="mainData.status !== '审核' || selection.length === 0"  size="small" type="primary" style="margin-bottom:12px" @click="adddispatch">一键发货</el-button>
+          </div>
         </product-list>
       </div>
       <div slot="slot2">
@@ -69,7 +72,9 @@
       <div slot="slot6">
         <invoiceTable></invoiceTable>
       </div>
-      
+      <div slot="slot7">
+        <revenue :data="mainData"></revenue>
+      </div>
     </basicDetails>
     <el-dialog append-to-body title="退回原因" :visible.sync="dialogVisible" width="400px">
       <el-input v-model="backreason" type="textarea" placeholder="请输入退回原因"></el-input>
@@ -91,7 +96,8 @@ import dispatch from './tabs/dispatch.vue'
 import logistics from './tabs/logistics.vue'
 import invoiceTable from './tabs/invoiceTable.vue'
 import changeSaler from '@/template/selectSaler/index'
-
+import revenue from './tabs/revenueAndExp.vue'
+import changeOrderMx from './tabs/changeOrderMx.vue'
 
 export default {
   name: "detail",
@@ -116,7 +122,9 @@ export default {
     dispatch,
     logistics,
     invoiceTable,
-    changeSaler
+    changeSaler,
+    revenue,
+    changeOrderMx
   },
   methods:{
     async orderreviewtype () {
@@ -346,7 +354,7 @@ export default {
       this.selection = data
     },
     async adddispatch () {
-       const res = await this.$api.requested({
+      const res = await this.$api.requested({
         "id": "20230220100604",
         "content": {
           "sa_orderid":this.mainData.sa_orderid,
@@ -355,6 +363,16 @@ export default {
           })
         }
       })
+      this.tool.showMessage(res,()=>{
+
+        let route = this.$route
+
+        this.oldRoute = {path:route.path,query:route.query}
+
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+
+        this.$router.replace({path:'/dispatchdetail',query:{id:res.data.sa_dispatchid,rowindex:res.data.rowindex}})
+      })
     }
   },
   mounted () {

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

@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <el-button type="primary" size="small" :disabled="data.length !== 1" @click="onShow">明细变更</el-button>
+    <el-dialog title="明细变更" append-to-body :visible.sync="dialogVisible" width="400px">
+      <el-form :model="form" size="small">
+        <el-form-item label="产品" :label-width="formLabelWidth">
+          <el-input v-model="form.itemname" disabled autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="数量变更" :label-width="formLabelWidth">
+          <el-input v-model="form.qty" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false" size="small">取 消</el-button>
+        <el-button type="primary" @click="submit" size="small">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data'],
+  data () {
+    return {
+      formLabelWidth:'80px',
+      dialogVisible:false,
+      form:{
+        qty:''
+      }
+    }
+  },
+  methods:{
+    onShow () {
+      this.form = Object.assign({},this.form,this.data[0])
+      this.dialogVisible = true
+      console.log(this.form)
+    },
+    async submit () {
+      const res = await this.$api.requested({
+        "id": 20221110145302,
+        "content": {
+          "sa_orderitemsid":this.form.sa_orderitemsid,
+          "sa_orderid":this.form.sa_orderid,//订单ID
+          "itemid":this.form.itemid,//商品ID
+          "type":"数量",//调整类型，目前只支持数量
+          "newvalue":this.form.qty,//调整后值
+          "remarks":""
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.dialogVisible = false
+        this.$emit('onSuccess')
+      })
+    }
+  }
+}
+
+</script>
+<style>
+</style>

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

@@ -1,200 +1,209 @@
 <template>
-  <div>
-    <div class="flex-align-center">
-      <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
-      <slot name="operation"></slot>
-    </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      height="500px"
-      style="width: 100%;"
-      size="small"
-      stripe
-      border
-      @selection-change	="selectionChange">
-      <el-table-column
-        type="selection"
-        width="55"
-        align="center">
-      </el-table-column>
-      <el-table-column
-        prop="itemname"
-        label="产品名称"
-        width="180">
-      </el-table-column>
-      <el-table-column
-        prop="itemno"
-        label="产品编号"
-        width="180">
-      </el-table-column>
-      <el-table-column
-          prop="model"
-        label="型号/规格"
-        width="150">
-        <template slot-scope="scope">
-          <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
-        </template>
-      </el-table-column>
-      <el-table-column
-          prop="qty"
-        label="数量"
-        width="180">
-        <template slot-scope="scope">
-          <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit' || data.status === '审核'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-          <span v-else>{{scope.row.qty}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="needdate"
-        label="需求日期"
-        width="180">
-        <template slot="header" slot-scope="scope">
-          <div>
+  <el-row :gutter="10">
+    <el-col :span="setcol">
+      <div class="flex-align-center">
+        <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
+        <slot name="operation"></slot>
+        <el-button style="margin:0 0 10px 10px" size="small" type="primary" @click="setcol = 12">添 加</el-button>
+      </div>
+      <el-table
+        ref="multipleTable"
+        :data="tableData"
+        style="width: 100%;"
+        size="small"
+        stripe
+        border
+        @selection-change	="selectionChange">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="itemname"
+          label="产品名称"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="itemno"
+          label="产品编号"
+          width="180">
+        </el-table-column>
+        <el-table-column
+            prop="model"
+          label="型号/规格"
+          width="150">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="qty"
+          label="数量"
+          width="180">
+          <template slot-scope="scope">
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+            <span v-else>{{scope.row.qty}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="needdate"
+          label="需求日期"
+          width="180">
+          <template slot="header" slot-scope="scope">
+            <div>
+              <el-date-picker
+                style="width:150px"
+                v-if="type === 'edit'"
+                v-model="value2"
+                value-format="yyyy-MM-dd"
+                slot="reference"
+                align="right"
+                type="date"
+                size="mini"
+                placeholder="一键填写"
+                @change="dateChangeNeed">
+              </el-date-picker>
+              <span v-else>需求日期</span>
+            </div>
+          </template>
+          <template slot-scope="scope">
             <el-date-picker
-              style="width:150px"
-              v-if="type === 'edit'"
-              v-model="value2"
-              value-format="yyyy-MM-dd"
-              slot="reference"
-              align="right"
+              v-if="scope.row.delivery > 0 && type === 'edit'"
+              v-model="scope.row.needdate"
               type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
               size="mini"
-              placeholder="一键填写"
-              @change="dateChangeNeed">
+              style="width:150px"
+              :picker-options="pickerOptions"
+              @change="rowChange(scope.row)"
+              @focus="setPickerOptions(scope.row)">
             </el-date-picker>
-            <span v-else>需求日期</span>
-          </div>
-        </template>
-        <template slot-scope="scope">
-          <el-date-picker
-            v-if="scope.row.delivery > 0 && type === 'edit'"
-            v-model="scope.row.needdate"
-            type="date"
-            placeholder="选择日期"
-            value-format="yyyy-MM-dd"
-            size="mini"
-            style="width:150px"
-            :picker-options="pickerOptions"
-            @change="rowChange(scope.row)"
-            @focus="setPickerOptions(scope.row)">
-          </el-date-picker>
-          <div v-else>
-            <p v-if="scope.row.delivery === 0 ">不管控交期</p>
-            <p v-else>{{scope.row.needdate}}</p>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-          prop="deliverydate"
-          label="回复交期"
-          width="200">
-        <template slot="header" slot-scope="scope">
-          <div>
+            <div v-else>
+              <p v-if="scope.row.delivery === 0 ">不管控交期</p>
+              <p v-else>{{scope.row.needdate}}</p>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="deliverydate"
+            label="回复交期"
+            width="200">
+          <template slot="header" slot-scope="scope">
+            <div>
+              <el-date-picker
+                style="width:180px"
+                v-if="type === 'confirmdate'"
+                v-model="value2"
+                value-format="yyyy-MM-dd"
+                slot="reference"
+                align="right"
+                type="date"
+                size="mini"
+                placeholder="一键交期"
+                @change="dateChange">
+              </el-date-picker>
+              <span v-else>回复交期</span>
+            </div>
+          </template>
+          <template slot-scope="scope">
             <el-date-picker
-              style="width:180px"
-              v-if="type === 'confirmdate'"
-              v-model="value2"
-              value-format="yyyy-MM-dd"
-              slot="reference"
-              align="right"
+              v-if="scope.row.delivery > 0 && type === 'confirmdate'"
+              v-model="scope.row.deliverydate"
               type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
               size="mini"
-              placeholder="一键交期"
-              @change="dateChange">
+              style="width:150px"
+              :picker-options="pickerOptions"
+              @change="onDateChange(scope.row)"
+              @focus="setPickerOptions(scope.row)">
             </el-date-picker>
-            <span v-else>回复交期</span>
-          </div>
-        </template>
-        <template slot-scope="scope">
-          <el-date-picker
-            v-if="scope.row.delivery > 0 && type === 'confirmdate'"
-            v-model="scope.row.deliverydate"
-            type="date"
-            placeholder="选择日期"
-            value-format="yyyy-MM-dd"
-            size="mini"
-            style="width:150px"
-            :picker-options="pickerOptions"
-            @change="onDateChange(scope.row)"
-            @focus="setPickerOptions(scope.row)">
-          </el-date-picker>
-          <div v-else>
-            <p v-if="scope.row.delivery === 0 ">不管控交期</p>
-            <p v-else>{{scope.row.deliverydate}}</p>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="unit"
-        label="计量单位"
-        width="90">
-        <template slot-scope="scope">
-          <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="price"
-        label="价格"
-        width="100">
-        <template slot-scope="scope">
-           <el-input v-if="type === 'edit' && data.type === '特殊订单'" v-model.number="scope.row.price" @input="if(scope.row.price > scope.row.oldprice) scope.row.price  = scope.row.oldprice; if(scope.row.price  < 0) scope.row.price  = 0;" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
-          <p v-else style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="折后价格"
-        prop="totalprice">
-        <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="小计"
-        prop="totalprice">
-        <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="备注"
-        width="300"
-        prop="remarks">
-        <template slot-scope="scope">
-          <el-input v-if="type === 'edit'" v-model="scope.row.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
-          <p v-else>{{scope.row.remarks}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="type === 'edit'" width="90" fixed="right">
-        <template slot-scope="scope">
-          <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div style="margin-top:16px;text-align:right">
-      <el-pagination
-        background
-        small
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-size="param.content.pageSize"
-        layout="total, prev, pager, next, jumper"
-        :total="total">
-      </el-pagination>
-    </div>
-  </div>
+            <div v-else>
+              <p v-if="scope.row.delivery === 0 ">不管控交期</p>
+              <p v-else>{{scope.row.deliverydate}}</p>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="unit"
+          label="计量单位"
+          width="90">
+          <template slot-scope="scope">
+            <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="price"
+          label="价格"
+          width="100">
+          <template slot-scope="scope">
+            <el-input v-if="type === 'edit' && data.type === '特殊订单'" v-model.number="scope.row.price" @input="if(scope.row.price > scope.row.oldprice) scope.row.price  = scope.row.oldprice; if(scope.row.price  < 0) scope.row.price  = 0;" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
+            <p v-else style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="折后价格"
+          prop="totalprice">
+          <template slot-scope="scope">
+            <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="小计"
+          prop="totalprice">
+          <template slot-scope="scope">
+            <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="备注"
+          width="300"
+          prop="remarks">
+          <template slot-scope="scope">
+            <el-input v-if="type === 'edit'" v-model="scope.row.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
+            <p v-else>{{scope.row.remarks}}</p>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="type === 'edit'" width="90" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="margin-top:16px;text-align:right">
+        <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="param.content.pageSize"
+          layout="total, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+      </div>
+    </el-col>
+    <el-col :span="24 - setcol">
+      <addProduct :data="data" @onConfirm="onConfirm"></addProduct>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
+import addProduct from '@/template/orderCanUseProduct/index.vue'
+
 export default {
   props:['data','type'],
   components:{
     excel:() =>  import('../export_excel'),
+    addProduct
   },
   data () {
     return {
       dataRefresh:true,
+      setcol:24,
       tableData:[],
       tablecols:[],
       columnTitle:[],
@@ -252,6 +261,7 @@ export default {
         this.$emit('onSuccess')
       })
     },
+
     rowChange (val,index) {
       let that = this
      
@@ -260,36 +270,22 @@ export default {
         clearTimeout(this.time);
       }
       this.time = setTimeout(() => {
-        if (this.data.status === '审核') {
-          this.changeOrderQty({
-            "sa_orderitemsid":val.sa_orderitemsid,
-            "sa_orderid":this.data.sa_orderid,//订单ID
-            "itemid":val.itemid,//商品ID
-            "type":"数量",//调整类型，目前只支持数量
-            "newvalue":val.qty,//调整后值
-            "remarks":""
-          },()=>{
-            this.$set(this.tableData,index,val)
-          })
-           
-        } else {
-          that.updateOrder({
-            "sa_orderid": this.data.sa_orderid, //订单ID
-            "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
-            "sa_contractid": this.data.contacts.contactsid, //合同ID
-            "type": this.data.type, //订单类型
-            "items": [{
-              "sa_orderitemsid": val.sa_orderitemsid,//0表示新增
-              "itemid": val.itemid, //商品ID
-              "qty": val.qty, //数量
-              "needdate": val.needdate,//可以不传,修改交期
-              "price":val.price,
-              "remarks":val.remarks
-            }]
-          },()=>{
-            this.$set(this.tableData,index,val)
-          })
-        }
+        that.updateOrder({
+          "sa_orderid": this.data.sa_orderid, //订单ID
+          "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
+          "sa_contractid": this.data.contacts.contactsid, //合同ID
+          "type": this.data.type, //订单类型
+          "items": [{
+            "sa_orderitemsid": val.sa_orderitemsid,//0表示新增
+            "itemid": val.itemid, //商品ID
+            "qty": val.qty, //数量
+            "needdate": val.needdate,//可以不传,修改交期
+            "price":val.price,
+            "remarks":val.remarks
+          }]
+        },()=>{
+          this.$set(this.tableData,index,val)
+        })
       },1000)
     },
     onDateChange (val){
@@ -314,13 +310,6 @@ export default {
       })
       res.code === 1?fn():""
     },
-    async changeOrderQty (val,fn) {
-      const res = await this.$api.requested({
-        "id": 20221110145302,
-        "content": val
-      })
-      res.code === 1?fn():""
-    },
     async dateChangeNeed(val){
       const res = await this.$api.requested({
         "id": 20230104143802,
@@ -357,8 +346,32 @@ export default {
       })
     },
     selectionChange (selection) {
-      this.$emit('select',data)
-    }
+      this.$emit('select',selection)
+    },
+    // 订单添加商品
+    async onConfirm (data) {
+      const res = await this.$api.requested({
+        "id": 20221109093602,
+        "content": {
+          "sa_orderid": this.$route.query.id, //订单ID
+          "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
+          "type": this.data.type, //订单类型
+          "items": data.map(e=>{
+            return {
+              sa_orderitemsid:0,
+              itemid:e.itemid,
+              qty:e.orderminqty,
+              needdate:e.deliverydate
+            }
+          })
+        },
+      })
+      this.tool.showMessage(res,()=>{
+        this.setcol = 24
+        this.$refs['prolist'].listData()
+        // this.$emit('onSuccess')
+      })
+    },
   },
   mounted () {
     this.listData()

src/HDrpManagement/orderManage/details/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>

src/HDrpManagement/orderManage/modules/edit.vue

@@ -12,7 +12,7 @@
         <p><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>
         <!-- <label style="font-size:14px;margin-left:10px" for="">备注:</label>
         <input class="order__note__input" v-model="defaultData.remarks" type="text" placeholder="请输入订单备注"> -->
-         <p>运费:{{data.freefreightamount === 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
+         <p>运费:{{data.amount > data.freefreightamount >= 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">
@@ -351,7 +351,7 @@ export default {
         "content": {
           "sa_orderid": this.$route.query.id, //订单ID
           "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
-          "type": "标准订单", //订单类型
+          "type":this.data.type, //订单类型
           "items": data.map(e=>{
             return {
               sa_orderitemsid:0,

src/SDrpManagement/Products/modules/list.vue

@@ -102,14 +102,15 @@ export default {
       this.listData()
     },
     async insertToShopCart (item) {
+      console.log(item)
       const res = await this.$api.requested({
         "id": 20220924095102,
         "content": {
-          "sa_brandid": this.params.content.brandids[0], //品牌id
+          "sa_brandid": item.sa_brandid, //品牌id
           "itemid": item.itemid, //货品id
           "qty": item.orderminqty, //数量
           "itemno": item.itemno, //货品编号
-          "tradefield":this.params.content.tradefield
+          "tradefield":item.tradefield
         }
       })
       this.$notify({

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">
@@ -41,6 +41,9 @@
       <div slot="slot6">
         <invoiceTable></invoiceTable>
       </div>
+      <div slot="slot7">
+        <revenue :data="mainData"></revenue>
+      </div>
     </basicDetails>
     <el-dialog append-to-body title="退回原因" :visible.sync="dialogVisible" width="400px">
       <el-input v-model="backreason" type="textarea" placeholder="请输入退回原因"></el-input>
@@ -60,6 +63,7 @@ import orderprogress from './tabs/orderpProgress.vue'
 import logistics from './tabs/logistics.vue'
 import dispatch from './tabs/dispatch.vue'
 import invoiceTable from './tabs/invoiceTable.vue'
+import revenue from './tabs/revenueAndExp.vue'
 
 export default {
   name: "detail",
@@ -78,7 +82,8 @@ export default {
     orderprogress,
     dispatch,
     logistics,
-    invoiceTable
+    invoiceTable,
+    revenue
   },
   methods:{
     async queryMainData(id) {

src/SDrpManagement/agentOrder/details/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>

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -12,7 +12,7 @@
         <p class="inline-16"><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>
         <!-- <label style="font-size:14px;margin-left:10px" for="">备注:</label>
         <input class="order__note__input" v-model="defaultData.remarks" type="text" placeholder="请输入订单备注"> -->
-        <p>运费:{{data.freefreightamount === 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
+        <p>运费:{{data.amount > data.freefreightamount >= 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">

src/SDrpManagement/salerOrder/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">
@@ -41,6 +41,9 @@
       <div slot="slot6">
         <invoiceTable></invoiceTable>
       </div>
+       <div slot="slot7">
+        <revenue :data="mainData"></revenue>
+      </div>
     </basicDetails>
     <el-dialog append-to-body title="退回原因" :visible.sync="dialogVisible" width="400px">
       <el-input v-model="backreason" type="textarea" placeholder="请输入退回原因"></el-input>
@@ -60,6 +63,7 @@ import orderprogress from './tabs/orderpProgress.vue'
 import logistics from './tabs/logistics.vue'
 import dispatch from './tabs/dispatch.vue'
 import invoiceTable from './tabs/invoiceTable.vue'
+import revenue from './tabs/revenueAndExp.vue'
 
 export default {
   name: "detail",
@@ -78,7 +82,8 @@ export default {
     orderprogress,
     dispatch,
     logistics,
-    invoiceTable
+    invoiceTable,
+    revenue
   },
   methods:{
     async queryMainData(id) {

src/SDrpManagement/salerOrder/details/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>

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -12,7 +12,7 @@
         <p><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>
         <!-- <label style="font-size:14px;margin-left:10px" for="">备注:</label>
         <input class="order__note__input" v-model="defaultData.remarks" type="text" placeholder="请输入订单备注"> -->
-         <p>运费:{{data.freefreightamount === 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
+        <p>运费:{{data.amount > data.freefreightamount >= 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">

src/router/index.js

@@ -32,7 +32,7 @@ let routes = [
     name: 'main',
     // components: () => import(/* webpackChunkName: "about" */ '@/components/layout/indexCopy1.vue'),
     component: () => import(/* webpackChunkName: "about" */ '@/components/newLayout/index.vue'),
-    redirect: '/home',
+    redirect: '/message',
     children: [
       {
         path: '/home',

src/template/orderCanUseProduct/index.vue

@@ -112,6 +112,7 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      console.log(res,'mx')
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);