上传

src/HDrpManagement/ProductGroupMag/modules/table.vue

@@ -26,7 +26,7 @@
           label="排序"
           width="100" v-if="type == 'add'">
         <template slot-scope="scope">
-            <el-input type="text" size="mini" @input="onInput()" v-model="scope.row.sequence"></el-input>
+            <el-input type="text" size="mini" @input="onInput($event,scope.row)" v-model="scope.row.sequence"></el-input>
         </template>
       </el-table-column>
       <el-table-column
@@ -108,6 +108,7 @@
 
 <script>
 import previewImage from '@/components/previewImage/index'
+import { log } from '@antv/g2plot/lib/utils'
 
 export default {
   components:{
@@ -128,7 +129,8 @@ export default {
             return {
               "sa_itemgroupmxid":0,
               "itemno":e.itemno,
-              "itemid":e.itemid
+              "itemid":e.itemid,
+              "sequence":e.sequence
             }
           })
         }
@@ -136,7 +138,7 @@ export default {
       res.code === 1?this.$emit('onSuccess'):this.tool.showMessage(res)
       
     },
-    onInput () {
+    onInput ($event,data) {
       this.$forceUpdate()
     },
     deleteProduct (row) {

src/HDrpManagement/cashcouponPay/component/detailed.vue

@@ -8,7 +8,7 @@
         <el-descriptions-item label="企业名称">{{ data.enterprisename?data.enterprisename:"--"}}</el-descriptions-item>
         <el-descriptions-item label="返利代金券">{{ data.rebate_billno?data.rebate_billno:"--" }}</el-descriptions-item>
         <el-descriptions-item label="返利金有效期">{{ data.rebate_enddate?data.rebate_enddate:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="支出金额">{{ data.rebate_amount?data.rebate_amount:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="支出金额">{{ data.amount?data.amount:"--" }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ data.remarks?data.remarks:"--" }}</el-descriptions-item>
         <el-descriptions-item :style="style(data.status)" label="状态">
           <sapn :style="colorStyle">{{ data.status?data.status:"--" }}</sapn>

src/HDrpManagement/cashcouponPay/modules/detail.vue

@@ -69,7 +69,7 @@ export default {
         },
         {
           label:'支出金额',
-          value:this.mainData.rebate_amount
+          value:this.mainData.amount
         },
         {
           label:'备注',

src/HDrpManagement/invoiceapp/modules/add.vue

@@ -61,31 +61,7 @@
                 <el-input v-model="form.remarks" type="textarea" :aotusize="{minRows:4}" placeholder="备注"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-               <p class="normal-title normal-margin">开票信息</p>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="发票种类">
-                <el-select style="width:100%" v-model="form.invoiceline" placeholder="请选择">
-                  <el-option label="s/专用发票" value="s"></el-option>
-                  <el-option label="p/普通发票(电票)" value="p"></el-option>
-                </el-select>
-              </el-form-item>
-               <el-form-item label="发票限额" prop="quota">
-                <el-input v-model="form.quota" placeholder="发票限额"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="复核人">
-                <el-input v-model="form.invoicechecker" placeholder="发票复核人"></el-input>
-              </el-form-item>
-              <el-form-item label="收款人">
-                <el-input v-model="form.invoicepayee" placeholder="发票收款人"></el-input>
-              </el-form-item>
-              <el-form-item label="开票员">
-                <el-input v-model="form.invoiceclerk" placeholder="发票开票员"></el-input>
-              </el-form-item>
-            </el-col>
+       
           </el-form>
         </el-row>
       </div>

src/HDrpManagement/invoiceapp/modules/edit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="mini" :disabled="data.status !== '新建'" type="primary" @click="onShow">编 辑</el-button>
     <el-drawer
-      title="新建开票申请单"
+      title="编辑开票申请单"
       :visible.sync="drawer"
       direction="rtl"
       :show-close="false"
@@ -60,31 +60,6 @@
                 <el-input v-model="form.remarks" type="textarea" :aotusize="{minRows:4}" placeholder="备注"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-               <p class="normal-title normal-margin">开票信息</p>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="发票种类">
-                <el-select style="width:100%" v-model="value" placeholder="请选择">
-                  <el-option label="s/专用发票" value="s"></el-option>
-                  <el-option label="p/普通发票(电票)" value="p"></el-option>
-                </el-select>
-              </el-form-item>
-               <el-form-item label="发票限额">
-                <el-input v-model="form.quota" placeholder="开户账号"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="复核人">
-                <el-input v-model="form.invoicechecker" placeholder="发票复核人"></el-input>
-              </el-form-item>
-              <el-form-item label="收款人">
-                <el-input v-model="form.invoicepayee" placeholder="发票收款人"></el-input>
-              </el-form-item>
-              <el-form-item label="开票员">
-                <el-input v-model="form.invoiceclerk" placeholder="发票开票员"></el-input>
-              </el-form-item>
-            </el-col>
           </el-form>
         </el-row>
       </div>

src/HDrpManagement/payvoucher/index.vue

@@ -9,7 +9,8 @@
         :options="options"
         :detailPath="{
         path:'/payvoucherDetails'
-        }">
+        }"
+        @listCreate="list">
       <div slot="titleRight">
         <!--        <importExcel style="margin-left:10px" @onSuccess="onSuccess"></importExcel>-->
       </div>
@@ -96,6 +97,9 @@ export default {
     }
   },
   methods:{
+    list (param) {
+      param.content.where.isrebate = 0
+    },
     /*营销账户类型*/
     async accountList(){
       const res = await this.$api.requested({

src/HDrpManagement/recvoucher/index.vue

@@ -9,7 +9,8 @@
         :options="options"
         :detailPath="{
         path:'/recvoucherDetails'
-        }">
+        }"
+        @listCreate="list">
       <div slot="custom" style="display:flex">
         <label class="search__label " style="margin: auto;width: 70px;">账户类型:</label>
         <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.accountname" placeholder="请选择账户类型" size="small" clearable>
@@ -87,6 +88,9 @@ export default {
     }
   },
   methods:{
+    list (param) {
+      param.content.where.isrebate = 0
+    },
     /*营销账户类型*/
     async accountList(){
       const res = await this.$api.requested({

src/HDrpManagement/serveBill/modules/detail.vue

@@ -146,6 +146,7 @@ export default {
         {label:'经销商编号',value:this.mainData.agentnum ? this.mainData.agentnum : ''},
         {label:'经销商',value:this.mainData.enterprisename ? this.mainData.enterprisename : ''},
         {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
+        {label:'地址',value:this.mainData.address ? this.mainData.address : ''},
         {label:'关联订单',value:this.mainData.sonum ? this.mainData.sonum : ''},
         {label:'服务分类',value:this.mainData.servicetype ? this.mainData.servicetype : ''},
         {label:'服务联系人',value:this.mainData.scenecontact ? this.mainData.scenecontact : ''},

src/HDrpManagement/toolBill/components/add.vue

@@ -13,7 +13,7 @@
               </el-form-item>
             </el-col> -->
             <el-col :span="24">
-              <el-form-item label="订单号:" prop="sonum">
+              <el-form-item label="选择借用单:" prop="sonum">
                 <selectOrder ref="order" @selectRow="orderChange">
                     <el-input readonly type="text" slot="input" size="small" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.sonum"></el-input>
                 </selectOrder>

src/HDrpManagement/toolBill/components/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="editBtn">编 辑</el-button>
-    <el-drawer title="新建返退单" append-to-body :visible.sync="dialogFormVisible" size="40%" :show-close="false">
+    <el-drawer title="编辑返退单" append-to-body :visible.sync="dialogFormVisible" size="40%" :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
@@ -43,6 +43,11 @@
                 <el-input type="textarea" size="small" v-model="form.reason"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="物流单号:" prop="logisticno">
+                <el-input type="textarea" size="small" v-model="form.logisticno"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="是否实物退回" prop="isitemreturn">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.isitemreturn"></el-checkbox>
@@ -125,7 +130,18 @@ export default {
           "version":1,
           "content": this.form
         })
-        this.tool.showMessage(res,()=>{
+        this.tool.showMessage(res,async()=>{
+          if (this.form.logisticno) {
+            let res2 = await this.$api.requested({
+              "id": "20230105100203",
+              "content": {
+                  "sa_aftersalesmagid":this.$route.query.id,
+                  "logisticno":this.form.logisticno,
+                  "returnamount":'',
+                  "payamount":''
+              }
+            })
+          }
           this.$emit('onSuccess')
           this.dialogFormVisible = false
         })

src/HDrpManagement/toolBill/components/selectOrder.vue

@@ -20,14 +20,9 @@
             label="订单类型">
           </el-table-column>
           <el-table-column
-            prop="tradefield"
-            label="领域">
+            prop="checkdate"
+            label="审核时间">
           </el-table-column>
-          <el-table-column
-            prop="rebate_userate"
-            label="订单使用返利占比">
-          </el-table-column>
-          
           <el-table-column
             label="操作"
             width="90">
@@ -75,6 +70,7 @@ export default {
   },
   methods:{
     async listData () {
+      this.param.content.istool = 1
       const res = await this.$api.requested(this.param)
       this.tableData = res.data
       this.total = res.total

src/HDrpManagement/toolBillMag/components/selectOrder.vue

@@ -63,7 +63,7 @@ export default {
         "id": 20230105110003,
         "version":1,
         "content": {
-            "sys_enterpriseid":'',
+          istool:1,
           "where":{
               "condition":""
           }

src/SDrpManagement/Products/modules/Select.vue

@@ -3,7 +3,7 @@
     <div>
       <ul class="flex-align-center normal-margin-new">
         <li :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField('')">全部领域</li>
-        <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
+        <li :class="field_act === item.tradefield?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
       <ul class="flex-align-center normal-margin-new">
         <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand('')">全部品牌</li>
@@ -58,6 +58,8 @@ export default {
         }
       })
       this.fields = res1.data
+      console.log(this.fields);
+      
       this.field_act = ''
     },
     async queryBrands () {
@@ -86,7 +88,7 @@ export default {
       this.queryClass()
     },
     clickField (item) {
-      this.field_act = item ? item.sys_enterprise_tradefieldid : ''
+      this.field_act = item ? item.tradefield : ''
       this.$emit('clickField',item)
     },
     clickClass (item) {

src/SDrpManagement/agentOrder/details/index.vue

@@ -15,7 +15,7 @@
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation" class="inline-16">
-          <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData" />
+          <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
           <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>
@@ -24,10 +24,10 @@
         <default-info :mainData="mainData"></default-info>
       </div>
       <div slot="slot1">
-        <product-list :data="mainData" ref="prod"></product-list>
+        <product-list :data="mainData" ref="prod" @qtyChange="queryMainData" @onSuccess="queryMainData"></product-list>
       </div>
       <div slot="slot2">
-        <orderprogress ref="prod"></orderprogress>
+        <orderprogress></orderprogress>
       </div>
       <div slot="slot3">
         <rebat></rebat>
@@ -98,6 +98,7 @@ export default {
         const res = await this.$api.requested({
           "id":'20221108151302',
           "content": {
+            "nocache":true,
             "sa_orderid": this.$route.query.id
           }
         })
@@ -161,24 +162,24 @@ export default {
         },
         {
           label:'合计金额',
-          value:this.mainData.amount,
+          value:this.mainData.defaultamount,
           style:function () {
             let style = {color:"#ff0000"}
             return style
           }
         },
         {
-          label:'折前金额',
-          value:this.mainData.defaultamount,
+          label:'折后金额',
+          value:this.mainData.amount,
           style:function () {
             let style = {color:"#ff0000"}
             return style
           }
         },
-        {
+        /*{
           label:'企业名称',
           value:this.mainData.enterprisename
-        },
+        },*/
         {
           label:'备注',
           value:this.mainData.remarks
@@ -284,8 +285,14 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        this.tool.showMessage(res)
-      })
+        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:'/agent_orderDetails',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
+        this.queryMainData(this.$route.query.id)
+        })
     },
   },
   mounted () {

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

@@ -5,7 +5,7 @@
       <el-descriptions-item label="账户名称">{{ mainData.accountclass?mainData.accountclass.accountname:"--" }}</el-descriptions-item>
       <el-descriptions-item label="使用金额">{{ mainData.accountclass?mainData.accountclass.amount:"--" }}</el-descriptions-item>
       <el-descriptions-item label="是否使用返利金">{{ mainData.accountclass?mainData.accountclass.rebate_used ? '是' : '否' : '--' }}</el-descriptions-item>
-      <el-descriptions-item label="返利金使用金额">{{ mainData.accountclass?mainData.accountclass.rebate_amount:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="返利金使用金额">{{ mainData.rebateamount?mainData.rebateamount:"--" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions  class="normal-margin" border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">开票信息</div>

src/SDrpManagement/agentOrder/index.vue

@@ -10,7 +10,8 @@
       :oldFormPath="{add:'SDrpManagement/agentOrder/modules'}"
       :detailPath="{
         path:'/agent_orderDetails'
-      }">
+      }"
+      @listCreate="list">
       <div slot="custom" style="display:flex">
         <div class="label_center">
           <p class="search__label">订单状态:</p>
@@ -71,6 +72,9 @@ export default {
     }
   },
   methods:{
+    list (param) {
+      param.content.nocache = true
+    }
   }
 }
 

src/SDrpManagement/agentOrder/modules/add.vue

@@ -5,7 +5,7 @@
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="标准订单">标准订单</el-dropdown-item>
         <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
-        <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>
+        <!-- <el-dropdown-item command="促销订单">促销订单</el-dropdown-item> -->
         <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -9,10 +9,16 @@
     size="80%">
     <div slot="title">
       <div class="flex-align-center">
-        <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>
+        <p ><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.defaultamount,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.amount > 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 class="flex-align-center">
+<!--        <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 style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${freefreightamount}元免运费,当前还差${freefreightamount - data.amount}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">
@@ -32,14 +38,15 @@
           <div class="flex-align-center">
             <p class="inline-16"><small>账户余额:&nbsp;</small><b>¥{{tool.formatAmount(defaultData.accountclass.balance?defaultData.accountclass.balance:0,2)}}</b></p>
             <p class="inline-16"><small>账户名称:&nbsp;</small>{{defaultData.accountclass.accountname?defaultData.accountclass.accountname:'未选择账户'}}</p>
-            <p><small>本单金额:&nbsp;</small>{{tool.formatAmount(data.amount - rebateamount,2)}}</p>
+            <p><small>本单金额:&nbsp;</small>{{data.rebate_used ? tool.formatAmount(data.defaultamount - rebateamount,2) : data.defaultamount}}</p>
           </div>
           <div v-if="(data.type === '标准订单' ||  data.type === '特殊订单') && isusedrebate === 1">
-            <el-checkbox v-model="checked" :true-label="1" :false-label="0">使用返利金</el-checkbox>
-            <div v-if="checked" class="flex-align-center">
-              <p class="inline-16"><b>返利金余额:{{tool.formatAmount(defaultData.rebatebalance,2)}}</b></p>
-              <el-input class="inline-16" size="mini" style="width:150px" v-model="rebateamount" @blur="useRebate" placeholder="输入使用金额"></el-input>
-              <small>(返利金最高使用比例{{data.order_rebate_userate}},本单上限:{{tool.formatAmount(data.amount * data.order_rebate_userate / 100,2)}})</small>
+            <el-checkbox v-model="data.rebate_used" :true-label="1" :false-label="0" @change="rebateUsedChange">使用返利金</el-checkbox>
+            <div v-if="data.rebate_used" class="flex-align-center">
+              <p class="inline-16"><b>返利金余额:{{tool.formatAmount(data.rebatebalance,2)}}</b></p>
+              <el-input class="inline-16" size="mini" style="width:150px" v-model="data.rebateamount" @blur="useRebate(data.rebateamount)" placeholder="输入使用金额"></el-input>
+              <small>(返利金最高使用比例{{data.order_rebate_userate}})</small>
+<!--              <small>(返利金最高使用比例{{data.order_rebate_userate}},本单上限:{{tool.formatAmount(data.amount * data.order_rebate_userate / 100,2)}})</small>-->
             </div>
           </div>
         </div>
@@ -92,14 +99,16 @@
           <div class="reveive__panel normal-margin">
             <p><small>抬头:&nbsp;</small><span class="inline-16"><b>{{defaultData.fin_info.enterprisename}}</b></span></p>
             <div class="flex-align-center">
-              <p class="inline-16"><small>开票地址:&nbsp;</small>{{defaultData.fin_info.address?defaultData.fin_info.address:'--'}}</p>
-              <p><small>开户行:&nbsp;</small> {{defaultData.fin_info.bank}} &emsp;<small>开户账号:&nbsp;</small> {{defaultData.fin_info.bankcardno}}</p>
+              <p class="inline-16"><small>开票地址:&nbsp;{{defaultData.fin_info.address?defaultData.fin_info.address:'--'}}</small></p>
+
             </div>
+            <p><small>开户行:&nbsp; {{defaultData.fin_info.bank}} &emsp;</small></p>
+              <p><small>开户账号:&nbsp; {{defaultData.fin_info.bankcardno}}</small></p>
           </div>
         </div>
         <div style="flex:1;">
           <div class="mt-10">
-            <p class="normal-title inline-16">收货信息</p>
+            <p class="normal-title inline-16" >收货信息</p>
             <el-popover
               placement="bottom"
               title="选择地址"
@@ -139,8 +148,10 @@
             </el-popover>
           </div>
           <div class="reveive__panel normal-margin">
-            <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
-            <small>{{defaultData.re_info.province?defaultData.re_info.province:'--'}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:''}}</small>
+            <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span></p>
+              <p><small>{{defaultData.re_info.phonenumber}}</small></p>
+            <p><small>{{defaultData.re_info.province?defaultData.re_info.province:'--'}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:''}}</small></p>
+            <p style="height: 35px"></p>
           </div>
         </div>
         
@@ -173,7 +184,7 @@
       <div class="mt-10">
         <div>
           <p class="normal-title inline-16">订单产品</p>
-          <el-button type="text" size="mini" @click="addMoreProduct">{{setcol === 12?'关闭选择':'添加产品'}}</el-button>
+          <!-- <el-button type="text" size="mini" @click="addMoreProduct">{{setcol === 12?'关闭选择':'添加产品'}}</el-button> -->
         </div>
         <el-row :gutter="10">
           <el-col :span="setcol">
@@ -239,10 +250,20 @@ export default {
       rebateamount:null,
       isusedrebate:0,
       signbackstatus:'不需要',
-      saletype:""
+      saletype:"",
+      freefreightamount:''
     }
   },
+  created () {
+    this.queryBasicInfo()
+  },
   methods:{
+    async queryBasicInfo () {
+      const res = await this.$api.requested({
+        "id":20220920084001,"content":{},
+      })
+      this.freefreightamount = res.data.freefreightamount
+    },
     onShow () {
       this.initPage()
     },
@@ -257,7 +278,11 @@ export default {
       this.selectOptions()
 
       this.checked = this.data.rebate_used
-      this.rebateamount = this.data.rebateamount
+      if (this.data.rebateamount > this.data.defaultamount) {
+        this.rebateamount = this.tool.formatAmount(+this.data.defaultamount / 2)
+      } else {
+        this.rebateamount = this.data.rebateamount
+      }
     },
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
@@ -309,7 +334,7 @@ export default {
           "pay_enterpriseid":this.data.pay_enterpriseid,
           "tradefield":this.data.tradefield,
           "saletype":this.saletype,
-          "rebate_used":this.checked,//默认0，是否使用返利金
+          "rebate_used":this.data.rebate_used,//默认0，是否使用返利金
           "signbacknum":'',
           "sa_promotionid":this.data.sa_promotionid,
           "billdate":this.data.billdate
@@ -318,13 +343,14 @@ export default {
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
         if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
-          this.isusedrebate === 1?this.useRebate():""
+          this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
         }
         this.drawer = false
       })
     },
     onEditSuccess () {
       this.$refs.addpro.listData()
+      this.$emit('onSuccess')
     },
     addMoreProduct () {
       this.setcol === 12?this.setcol = 24 : this.setcol = 12
@@ -353,31 +379,33 @@ export default {
         this.$emit('onSuccess')
       })
     },
-    async useRebate () {
+    async useRebate (e) {
       let that = this
-      if (this.rebateamount > this.defaultData.rebatebalance ||this.rebateamount > (this.data.amount * this.data.order_rebate_userate / 100) ) return  this.$message({
-        message:`余额不足或已超过可用上限!`,
-        type:function () {
-          that.rebateamount = 0
-          return 'error'
-        }()
-      })
-      if (this.rebateamount == null) return this.$message({
-          message:"返利金不能为空",
-          type:'error'
-        })
+      /* 修改返利金 */
+        let rebateamount = e;
+        let amount = this.data.order_rebate_userate * this.data.defaultamount;//最大可用金额
       const res = await this.$api.requested({
-        "id": 20230218225002,
-        "content": {
-          "sa_orderid": this.data.sa_orderid, //订单金额
-          "isused": this.checked, //是否使用
-          "rebateamount": this.rebateamount //返利金使用金额
-        },
-      })
-      if (res.code === 0) this.$message({
-        message:`使用返利金失败!${res.msg}`,
-        type:'error'
-      })
+              "id":20230218225002,
+              "content":{
+                "sa_orderid":this.data.sa_orderid,//订单金额
+                "isused":1,//是否使用
+                "rebateamount":rebateamount>amount?amount:rebateamount
+              }
+            })
+      if(res.data=='成功'){
+        this.$emit('onSuccess')
+        this.initPage()
+        if(rebateamount>amount){
+          this.data.rebateamount=amount
+          this.$message({
+            message: '返利金最大可用值'+ amount,
+            type: 'warning'
+          });
+        }
+      }else{
+        this.$message.error(res.msg);
+      }
+
     },
     // 查询站点是否使用返利金
     async queryUsedrebate () {
@@ -405,6 +433,27 @@ export default {
     async selectOptions () {
       const res = await this.$store.dispatch('optiontypeselect','saletype')
       this.saleroptions = res.data
+    },
+    async rebateUsedChange(){
+      console.log(this.data)
+
+
+      if(this.data.status != '新建') return 1
+
+
+      let amount = parseInt(this.data.order_rebate_userate * this.data.defaultamount); //最大可用金额
+      let rebatebalance = this.data.rebatebalance; //返利金账户余额
+      const res = await this.$api.requested({
+        "id": 20230218225002,
+        "content": {
+          "sa_orderid": this.data.sa_orderid, //订单金额
+          "isused": this.data.rebate_used == 1 ? 0 : 1, //是否使用
+          "rebateamount": rebatebalance > amount ? amount : rebatebalance //返利金使用金额
+        }
+      })
+      console.log(res)
+      this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
+
     }
   },
 }

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -44,6 +44,36 @@
           <span v-else>{{scope.row.qty}}</span>
         </template>
       </el-table-column>
+      
+      <el-table-column
+        prop="defaultprice"
+        label="单价"
+        width="90">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.defaultprice,2)}}</p>
+        </template>
+      </el-table-column>
+        <el-table-column
+        label="金额"
+        width="150">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.defaultamount}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="折后单价"
+        prop="price">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="折后金额"
+        width="150">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.amount}}</p>
+        </template>
+      </el-table-column>
       <el-table-column
         label="需求日期"
         width="200">
@@ -96,29 +126,17 @@
           <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
         </template>
       </el-table-column>
+     
       <el-table-column
-        prop="price"
-        label="价格"
-        width="90">
-        <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="折后价格"
-        prop="totalprice">
+        prop="remarks"
+        label="备注"
+        width="300"
+        fixed="right">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="小计"
-        width="150">
-        <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>
+          <el-input type="textarea"  @blur="onConfirm([scope.row],true)" size="small" v-model="scope.row.remarks" placeholder="请输入备注"></el-input>
         </template>
       </el-table-column>
-      <el-table-column v-if="data.status === '新建'" width="90" fixed="right">
+       <el-table-column v-if="data.status === '新建'" width="90" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>
         </template>
@@ -179,6 +197,7 @@ export default {
     addProduct
   },
   methods:{
+
     async listData () {
       this.param.content.sa_orderid = this.$route.query.id
       const res = await this.$api.requested(this.param)
@@ -236,6 +255,7 @@ export default {
             "needdate": val.needdate//可以不传,修改交期
           }]
         })
+        this.$emit("qtyChange")
       },500)
     },
     onDateChange (val){
@@ -275,7 +295,7 @@ export default {
         "id": 20221109093602,
         "content": val
       })
-      // this.$emit('onSuccess')
+      this.$emit('onSuccess')
     },
     setPickerOptions (val) {
       var startDate = val.deliverydate
@@ -288,7 +308,7 @@ export default {
       }
     },
     // 订单添加商品
-    async onConfirm (data) {
+    async onConfirm (data,edit) {
       const res = await this.$api.requested({
         "id": 20221109093602,
         "content": {
@@ -297,10 +317,11 @@ export default {
           "type": this.data.type, //订单类型
           "items": data.map(e=>{
             return {
-              sa_orderitemsid:0,
+              sa_orderitemsid:edit?e.sa_orderitemsid : 0,
               itemid:e.itemid,
               qty:e.orderminqty,
-              needdate:e.deliverydate
+              needdate:e.deliverydate,
+              remarks:e.remarks
             }
           })
         },
@@ -308,6 +329,7 @@ export default {
       this.tool.showMessage(res,()=>{
         this.setcol = 24
         this.listData()
+        this.$emit('onSuccess')
       })
     },
   },

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.amount > data.freefreightamount >= 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
+        <p>运费:{{data.amount > freefreightamount >= 0?'当前订单免运费':`订单满${freefreightamount}元免运费,当前还差${freefreightamount - data.amount}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">
@@ -239,10 +239,20 @@ export default {
       rebateamount:null,
       isusedrebate:0,
       signbackstatus:'不需要',
-      saletype:""
+      saletype:"",
+      freefreightamount:''
     }
   },
+  created () {
+    this.queryBasicInfo()
+  },
   methods:{
+    async queryBasicInfo () {
+      const res = await this.$api.requested({
+        "id":20220920084001,"content":{},
+      })
+      this.freefreightamount = res.data.freefreightamount
+    },
     onShow () {
       this.initPage()
     },

src/SDrpManagement/shopCart/index.vue

@@ -23,7 +23,7 @@ export default {
     return {
       selectedProduct:[],
       activeName:'first',
-      istool:''
+      istool:'',
     }
   },
   methods:{

src/SDrpManagement/shopCart/modules/list.vue

@@ -37,46 +37,61 @@
       <el-table-column
         prop="itemname"
         label="产品名称"
-        width="180">
+        width="150">
       </el-table-column>
       <el-table-column
         prop="itemno"
         label="产品编号"
-        width="180">
+        width="150">
+      </el-table-column>
+      <el-table-column
+          label="型号">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.model.length >10?scope.row.model.substring(0,9) + '...':scope.row.model}}</span></p>
+        </template>
       </el-table-column>
       <el-table-column
+          label="规格">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.spec.length >10?scope.row.spec.substring(0,9) + '...':scope.row.spec}}</span></p>
+        </template>
+      </el-table-column>
+<!--      <el-table-column
         label="型号/规格">
         <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>-->
       <el-table-column
         prop="gradeprice"
-        label="单价">
+        label="单价"
+        width="90">
         <template slot-scope="scope">
           <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.gradeprice,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column
         label="数量"
-        width="200">
+        width="150">
         <template slot-scope="scope">
         <el-input-number size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="qtyChange"></el-input-number>
         </template>
       </el-table-column>
       <el-table-column
-        label="计量单位">
+        label="计量单位"
+        width="80">
         <template slot-scope="scope">
           <el-tag>{{ scope.row.unitname }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column
-        label="金额">
+        label="金额"
+        width="80">
         <template slot-scope="scope">
           <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.gradeprice * scope.row.qty,2)}}</p>
         </template>
       </el-table-column>
-      <el-table-column width="90">
+      <el-table-column width="90" label="操作">
         <template slot-scope="scope">
           <slot name="del" :data="scope.row"></slot>
         </template>

src/SDrpManagement/shopCart/modules/total.vue

@@ -7,7 +7,7 @@
       <div class="prcieInfo">
         <p>共&nbsp;{{data.length}}&nbsp;件商品&emsp;总价 : <span class="price">¥&nbsp;{{tool.formatAmount(total,2)}}</span></p>
         <!-- <p class="text-grey">订单满{{freefreightamount}}元,免运费</p> -->
-        <p>{{total > freefreightamount >= 0?'当前订单免运费':`订单满${freefreightamount}元免运费,当前还差${freefreightamount - total}元`}}</p>
+        <p>{{total > freefreightamount ?'当前订单免运费':`订单满${freefreightamount}元免运费,当前还差${+freefreightamount - +total}元`}}</p>
       </div>
       <div class="submitBtn" @click="confirmOrder">生成订单</div>
     </div>
@@ -34,6 +34,7 @@ export default {
       val.forEach(element => {
         this.total += element.gradeprice * element.qty
       });
+
     },
     async deleSelectProd ()  {
       const res = await this.$api.requested({

src/SDrpManagement/sinvoiceapp/detail/detail.vue

@@ -66,10 +66,10 @@ export default {
     changeDataStructure() {
       let that = this
       this.mainAreaData = [
-        {
+        /*{
           label:'经销商',
           value:this.mainData.agententerprisename
-        },
+        },*/
         {
           label:'税号',
           value:this.mainData.taxno
@@ -82,10 +82,10 @@ export default {
           label:'开票地址',
           value:this.mainData.address
         },
-        {
+        /*{
           label:'联系方式',
           value:this.mainData.phonenumber
-        },
+        },*/
         {
           label:'开户行及账号',
           value:this.mainData.bank + this.mainData.bankcardno
@@ -94,10 +94,10 @@ export default {
           label:'发票限额',
           value:this.mainData.quota
         },
-        {
+        /*{
           label:'手工开票',
           value:this.mainData.byhand === 1?'手工开票':'线上开票'
-        },
+        },*/
 
         {
           label:'状态',
@@ -128,7 +128,7 @@ export default {
           label:'备注',
           value:this.mainData.remarks
         },
-        {
+        /*{
           label:'复核人',
           value:this.mainData.invoicechecker
         },
@@ -139,7 +139,7 @@ export default {
         {
           label:'收款人',
           value:this.mainData.invoicepayee
-        },
+        },*/
         
       ]
     },

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -13,7 +13,7 @@
       </div>
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号" width="150"></el-table-column>
-        <el-table-column prop="enterprisename" show-overflow-tooltip label="企业名称" width="150"></el-table-column>
+<!--        <el-table-column prop="enterprisename" show-overflow-tooltip label="企业名称" width="150"></el-table-column>-->
         <el-table-column prop="itemno" show-overflow-tooltip label="产品编号" width="150"></el-table-column>
         <el-table-column prop="itemname" label="产品名称" width="150"></el-table-column>
         <el-table-column prop="spec" label="型号" width="150">
@@ -24,6 +24,11 @@
         <el-table-column prop="qty" label="订单数量" width="90"></el-table-column>
         <!-- <el-table-column prop="qty" label="发货数量"></el-table-column> -->
         <el-table-column prop="writeoffamount" label="已核销金额" width="120"></el-table-column>
+        <el-table-column label="可开票金额" width="120">
+          <template slot-scope="scope">
+          {{ scope.row.amount - scope.row.invoiceamount }}
+          </template>
+        </el-table-column>
         <el-table-column prop="invoiceamount" label="已开票金额" width="120"></el-table-column>
         <el-table-column prop="remarks" show-overflow-tooltip label="备注" width="150" ></el-table-column>
         <el-table-column label="操作" width="90" fixed="right">

src/SDrpManagement/sinvoiceapp/modules/edit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
     <el-drawer
-      title="新建开票申请单"
+      title="编辑开票申请单"
       :visible.sync="drawer"
       direction="rtl"
       :show-close="false"

src/SDrpManagement/toolBorrowing/detail/index.vue

@@ -3,7 +3,6 @@
     <basicDetails
       ref="details"
       :titleText="`单号:${mainData.sonum}`"
-      :oldFormPath="{edit:'SDrpManagement/toolBorrowing/modules'}"
       :editData="mainData"
       :mainAreaData="mainAreaData"
       turnPageId="20230114105002"
@@ -15,11 +14,12 @@
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation" class="inline-16">
-          <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :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>
+        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.tool.listData()"/>
+        <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :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>
       </div>
       <div slot="slot0" >
-        <toolList></toolList>
+        <toolList ref="tool"></toolList>
       </div>
       <div slot="slot1" >
       </div>
@@ -30,6 +30,7 @@
 <script>
 import toolList from './tabs/toolList.vue'
 import confirmDate from '../modules/confirmDate.vue'
+import Edit from '../modules/edit'
 
 export default {
   name: "detail",
@@ -42,6 +43,7 @@ export default {
     }
   },
   components:{
+    Edit,
     toolList,
     confirmDate
   },
@@ -59,6 +61,8 @@ export default {
         }
       })
       this.mainData = res.data
+      console.log(this.mainData);
+      
       this.changeDataStructure()
       this.orderreviewtype()
     },
@@ -140,11 +144,6 @@ export default {
       this.$router.replace({path:'/toolBorrowingDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
       this.queryMainData(id)
     },
-    onSuccess(){
-      this.visible = false
-      this.queryMainData(this.$route.query.id)
-      this.$emit('onSuccess')
-    },
     // 提交订单
     onSubmit (type) {
       this.$confirm(`是否${type}该订单`, '提示', {

src/SDrpManagement/toolBorrowing/detail/tabs/toolList.vue

@@ -273,9 +273,10 @@ export default {
     },
     async updateOrder (val) {
       const res  = await this.$api.requested({
-        "id": 20221109093602,
+        "id": 20230116101602,
         "content": val
       })
+      this.$emit('onSuccess')
     },
     setPickerOptions (val) {
       var startDate = val.deliverydate

src/SDrpManagement/toolBorrowing/modules/edit.vue

@@ -8,7 +8,16 @@
     size="80%">
     <div slot="title">
       <div class="flex-align-center">
-        <p><span style="font-size:14px">合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>
+        <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.amount > data.freefreightamount >= 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>-->
+      </div>
+      <div class="flex-align-center">
+<!--        <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 style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > freefreightamount?'当前订单免运费':`订单满${freefreightamount}元免运费,当前还差${freefreightamount - data.amount}元`}}</p>
       </div>
     </div>
     <div class="drawer__panel">
@@ -251,10 +260,20 @@ export default {
       },
       agnetInfo:{},
       total:0,
-      setcol:24
+      setcol:24,
+      freefreightamount:''
     }
   },
+  created () {
+    this.queryBasicInfo()
+  },
   methods:{
+    async queryBasicInfo () {
+      const res = await this.$api.requested({
+        "id":20220920084001,"content":{},
+      })
+      this.freefreightamount = res.data.freefreightamount
+    },
     onShow () {
       this.queryAgentiInfo()
       this.defaultData.freightstatus = this.data.freightstatus
@@ -287,12 +306,13 @@ export default {
         "sys_enterpriseid":this.agnetInfo.sys_enterpriseid,
           "where":{
             "condition":"",
-            "workaddress":0
+            "workaddress":1
           }
         }
       })
       this.receiveAddresslist = res.data
-      this.defaultData.re_info = res.data[0]
+      this.defaultData.re_info = res.data[0] ? res.data[0] : {}
+      console.log(res.data,this.defaultData.re_info)
     },
 
     // 账号信息
@@ -364,11 +384,12 @@ export default {
         console.log(this.data)
         this.$emit('onSuccess')
         // this.onConfirm()
-        this.drawer = false
+        // this.drawer = false
       })
     },
     onDelSuccess () {
       this.$refs.addpro.listData()
+      this.$emit('onSuccess')
     },
     addMoreProduct () {
       this.setcol === 12?this.setcol = 24 : this.setcol = 12
@@ -376,7 +397,7 @@ export default {
     // 订单添加商品
     async onConfirm (data) {
       const res = await this.$api.requested({
-        "id": 20221109093602,
+        "id": 20230116101602,
         "content": {
           "sa_orderid": this.$route.query.id, //订单ID
           "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
@@ -394,6 +415,7 @@ export default {
       this.tool.showMessage(res,()=>{
         this.setcol = 24
         this.$refs['prolist'].listData()
+        this.$emit('onSuccess')
       })
     }
   },