Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

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/selectOrder.vue

@@ -75,6 +75,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/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.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>
@@ -27,7 +27,7 @@
         <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>

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -18,7 +18,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 style="font-size: 13px !important;color: #8888;font-weight: normal">{{data.amount > data.freefreightamount >= 0?'当前订单免运费':`订单满${data.freefreightamount}元免运费,当前还差${data.freefreightamount - data.amount}元`}}</p>
+        <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">
@@ -250,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()
     },
@@ -336,6 +346,7 @@ export default {
     },
     onEditSuccess () {
       this.$refs.addpro.listData()
+      this.$emit('onSuccess')
     },
     addMoreProduct () {
       this.setcol === 12?this.setcol = 24 : this.setcol = 12

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -283,7 +283,7 @@ export default {
         "id": 20221109093602,
         "content": val
       })
-      // this.$emit('onSuccess')
+      this.$emit('onSuccess')
     },
     setPickerOptions (val) {
       var startDate = val.deliverydate

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/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/toolBorrowing/detail/tabs/toolList.vue

@@ -276,6 +276,7 @@ export default {
         "id": 20221109093602,
         "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)
     },
 
     // 账号信息
@@ -369,6 +389,7 @@ export default {
     },
     onDelSuccess () {
       this.$refs.addpro.listData()
+      this.$emit('onSuccess')
     },
     addMoreProduct () {
       this.setcol === 12?this.setcol = 24 : this.setcol = 12
@@ -394,6 +415,7 @@ export default {
       this.tool.showMessage(res,()=>{
         this.setcol = 24
         this.$refs['prolist'].listData()
+        this.$emit('onSuccess')
       })
     }
   },