Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/dispatch/details/index.vue

@@ -178,7 +178,7 @@ import dialogTemplateNew from '@/components/dialogTemplate/index1'
             value:this.mainData.sumamount ? this.tool.formatAmount(this.mainData.sumamount,2) : '--',
           },
           {
-            label:'运费状态',
+            label:'运费方式',
             value:this.$t(this.mainData.freightstatus)
           },
           {

src/HDrpManagement/dispatch/modules/edit.vue

@@ -98,10 +98,10 @@
           </div>
         </div>
       </div>
-      <div class="mt-10">
-        <p class="normal-title inline-16">{{$t(`寄付方式`)}}</p>
+      <div class="mt-10" v-if="tool.checkAuth($route.name,'updShipping')">
+        <p class="normal-title inline-16">{{$t(`运费方式`)}}</p>
       </div>
-      <div class="mt-10 flex-align-center">
+      <div class="mt-10 flex-align-center" v-if="tool.checkAuth($route.name,'updShipping')">
         <div :style="defaultData.freightstatus === '到付'?{background:'#d9ecff'}:{background:'#fff'}" class="reveive__panel normal-margin inline-16" @click="defaultData.freightstatus = '到付'">
           <p>{{$t(`到付`)}}</p>
         </div>

src/HDrpManagement/logistics/details/index.vue

@@ -133,7 +133,7 @@
             value:this.mainData.name
           },
           {
-            label:'寄件方式',
+            label:'运费方式',
             value:this.mainData.paytype
           },
 

src/HDrpManagement/logistics/details/tabs/logisticsBox/add.vue

@@ -45,7 +45,7 @@
             </tableDetail>
           </el-col>
           <el-col :span="24 - setcol">
-            <logisticsCanUseProduct ref="logislist" :sa_logistics_boxid="0" @onConfirm="onConfirm" :addList="tableData">
+            <logisticsCanUseProduct ref="logislist" :sa_logistics_boxid="0" @onConfirm="onConfirm" :addList="tableData" >
               <el-button class="inline-16" slot="allBtn" type="primary" size="small" @click="handlePullData">{{$t(`一键全选`)}}</el-button>
             </logisticsCanUseProduct>
           </el-col>

src/HDrpManagement/logistics/details/tabs/logisticsBox/edit.vue

@@ -45,7 +45,7 @@
             </tableDetail>
           </el-col>
           <el-col :span="24 - setcol">
-            <logisticsCanUseProduct ref="logislist" :sa_logistics_boxid="this.data.sa_logistics_boxid" @onConfirm="onConfirm" :addList="delList" type="edit">
+            <logisticsCanUseProduct ref="logislist" :sa_logistics_boxid="this.data.sa_logistics_boxid" @onConfirm="onConfirm" :addList="tableData" type="edit" :delList="delList">
               <el-button class="inline-16" slot="allBtn" type="primary" size="small" @click="handlePullData">{{$t(`一键全选`)}}</el-button>
             </logisticsCanUseProduct>
           </el-col>

src/HDrpManagement/logistics/modules/add.vue

@@ -21,7 +21,7 @@
         <el-form-item :label="$t(`物流单号`)">
           <el-input v-model="form.logisticno" :placeholder="$t(`物流单号`)"></el-input>
         </el-form-item>
-        <el-form-item :label="$t(`寄付方式`)">
+        <el-form-item :label="$t(`运费方式`)">
           <el-select v-model="form.paytype" :placeholder="$t('请选择')" @change="selectChange" :disabled="isCorrelate > 0">
             <el-option
               :label="$t(`到付`)"

src/HDrpManagement/logistics/modules/defaultInfo.vue

@@ -14,7 +14,7 @@
       <div slot="title" class="my-label__title">{{$t(`物流信息`)}}</div>
       <el-descriptions-item :label="$t(`快递公司`)">{{ mainData.logiscompname?$t(mainData.logiscompname):"--" }}</el-descriptions-item>
       <el-descriptions-item :label="$t(`快递单号`)">{{ mainData.logisticno?$t(mainData.logisticno):"--" }}</el-descriptions-item>
-      <el-descriptions-item :style="style(mainData.status)" :label="$t(`运费状态`)">
+      <el-descriptions-item :style="style(mainData.status)" :label="$t(`运费方式`)">
         {{ $t(mainData.paytype) }}
       </el-descriptions-item>
       <el-descriptions-item :label="$t(`运费`)">{{ mainData.freightamount?$t(mainData.freightamount):"--" }}</el-descriptions-item>

src/HDrpManagement/logistics/modules/edit.vue

@@ -22,7 +22,7 @@ ed<template>
         <el-form-item :label="$t(`物流单号`)">
           <el-input v-model="form.logisticno" :placeholder="$t(`物流单号`)"></el-input>
         </el-form-item>
-        <el-form-item :label="$t(`寄付方式`)">
+        <el-form-item :label="$t(`运费方式`)">
           <el-select v-model="form.paytype" :placeholder="$t('请选择')" :disabled="isCorrelate > 0">
             <el-option
               :label="$t(`到付`)"

src/HDrpManagement/orderManage/details/index.vue

@@ -337,7 +337,7 @@ export default {
           value:`${this.mainData.saletype}${this.mainData.saletyperemarks?'-':''}${this.mainData.saletyperemarks}`
         },
         {
-          label:'运费状态',
+          label:'运费方式',
           value:this.$t(this.mainData.freightstatus)
         },
         {
@@ -470,7 +470,7 @@ export default {
           value:`${this.mainData.saletype}${this.mainData.saletyperemarks?'-':''}${this.mainData.saletyperemarks}`
         },
         {
-          label:'运费状态',
+          label:'运费方式',
           value:this.$t(this.mainData.freightstatus)
         },
         {

src/HDrpManagement/orderManage/modules/edit.vue

@@ -300,10 +300,10 @@
         <p class="normal-title mt-10 inline-16">{{$t(`项目备注`)}}</p>
         <el-input size="mini" class="order__note__input" type="textarea" v-model="data.projectnote" :autosize="{minRows:5}" :placeholder="$t(`请输入项目备注`)"></el-input>
       </div>
-      <div class="mt-10">
+      <div class="mt-10" v-if="tool.checkAuth($route.name,'updShipping')">
         <p class="normal-title inline-16">{{$t(`运费方式`)}}</p>
       </div>
-      <div class="mt-10 flex-align-center">
+      <div class="mt-10 flex-align-center" v-if="tool.checkAuth($route.name,'updShipping')">
         <div :style="defaultData.freightstatus === '到付'?{background:'#d9ecff'}:{background:'#fff'}" class="reveive__panel normal-margin inline-16" @click="defaultData.freightstatus = '到付'">
           <p>{{$t(`到付`)}}</p>
         </div>

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -37,17 +37,17 @@
       </div>
 
       <div style="flex: 1">
-        <div class="productName normal-margin">
-          <div   class="inline-16">
-            <el-tag
-                @click="actTradefield = item.tradefield"
-                v-for="(item, index) in tradefield"
-                :key="index"
-                size="small"
-                :effect="actTradefield === item.tradefield ? 'dark' : 'plain'"
-            >{{ $t(item.tradefield) }}
-            </el-tag>
-          </div>
+        <div class="productName normal-margin" style="height:42px;line-height:42px;vertical-align: middle">
+          <el-tag
+              class="inline-16"
+              @click="actTradefield = item.tradefield"
+              v-for="(item, index) in tradefield"
+              style="height:30px;line-height: 30px;vertical-align: middle;margin-top: -5px"
+              :key="index"
+              size="small"
+              :effect="actTradefield === item.tradefield ? 'dark' : 'plain'"
+          >{{ $t(item.tradefield) }}
+          </el-tag>
           <div class="inline-16">{{ siteid == 'HY'?$t(selectProduct.model)+$t(selectProduct.itemname):$t(selectProduct.itemname) }}</div>
         </div>
         <p style="color: #888; margin-bottom: 10px">

src/SDrpManagement/agentOrder/details/index.vue

@@ -438,7 +438,7 @@ export default {
           }
         },
         {
-          label: "运费状态",
+          label: "运费方式",
           value: this.$t(this.mainData.freightstatus),
         },
         {
@@ -524,7 +524,7 @@ export default {
           }
         },
         {
-          label: "运费状态",
+          label: "运费方式",
           value: this.$t(this.mainData.freightstatus),
         },
         {

src/SDrpManagement/salerOrder/details/index.vue

@@ -487,7 +487,7 @@ export default {
           value: this.mainData.saletype,
         },
         {
-          label: "运费状态",
+          label: "运费方式",
           value: this.$t(this.mainData.freightstatus),
         },
         {
@@ -642,7 +642,7 @@ export default {
           value: this.mainData.saletype,
         },
         {
-          label: "运费状态",
+          label: "运费方式",
           value: this.$t(this.mainData.freightstatus),
         },
         {

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -504,6 +504,17 @@
             </el-radio-group>
           </div>
         </div>
+        <div class="mt-10" v-if="tool.checkAuth($route.name,'updShipping')">
+          <p class="normal-title inline-16">{{$t(`运费方式`)}}</p>
+        </div>
+        <div class="mt-10 flex-align-center" v-if="tool.checkAuth($route.name,'updShipping')">
+          <div :style="defaultData.freightstatus === '到付'?{background:'#d9ecff'}:{background:'#fff'}" class="reveive__panel normal-margin inline-16" @click="defaultData.freightstatus = '到付'">
+            <p>{{$t(`到付`)}}</p>
+          </div>
+          <div :style="defaultData.freightstatus === '预付'?{background:'#d9ecff'}:{background:'#fff'}" class="reveive__panel normal-margin" @click="defaultData.freightstatus = '预付'">
+            <p>{{$t(`预付`)}}</p>
+          </div>
+        </div>
         <div class="normal-margin">
           <p class="normal-title mt-10 inline-16">{{ $t("订单备注") }}</p>
           <el-input
@@ -640,6 +651,7 @@ export default {
         accountclass: {},
         account_index: 0,
         remarks: this.data.remarks,
+        freightstatus:''
       },
       total: 0,
       setcol: 24,
@@ -766,6 +778,7 @@ export default {
       this.defaultData.fin_info = this.data.finance;
       this.defaultData.accountclass = this.data.accountclass;
       this.defaultData.re_info = this.data.contacts;
+      this.defaultData.freightstatus = this.data.freightstatus
       this.financiallist = this.data.pay_finance;
       this.saletype = this.data.saletype;
       this.signbackstatus = this.data.signbackstatus;
@@ -800,10 +813,12 @@ export default {
           sa_promotionid: this.data.sa_promotionid,
           billdate: this.data.billdate,
           projectnote: this.data.projectnote,
+          freightstatus:this.defaultData.freightstatus
         },
       });
       this.tool.showMessage(res, () => {
         this.$emit("onSuccess");
+        this.drawer = false
         /*if (this.data.type === '标准订单' ||  this.data.type === '特殊订单') {
           this.isusedrebate === 1?this.useRebate(this.data.rebateamount):""
         }*/
@@ -901,7 +916,7 @@ export default {
 </style>
 <style scoped>
 .reveive__panel {
-  font-size: 16px;
+  font-size: 14px;
   line-height: 30px;
   padding: 10px;
   background: #d9ecff;
@@ -909,7 +924,7 @@ export default {
 }
 .account__panel small,
 .reveive__panel small {
-  color: #888;
+  color: #666;
 }
 .account__panel {
   width: calc(25% - 26px);

src/components/newLayout/index.vue

@@ -210,6 +210,7 @@ export default {
   padding-right: 60px;
   margin-right: 10px;
   overflow-y: scroll;
+  scrollbar-width: none;
 }
 .body__panel::-webkit-scrollbar {
   display: none !important;

src/components/newLayout/modules/aside.vue

@@ -290,7 +290,8 @@ export default {
 }
 .menu_scroll__panel{
   height:calc(100vh - 200px);
-  overflow-y:scroll
+  overflow-y:scroll;
+  scrollbar-width: none;
 }
 .menu_scroll__panel::-webkit-scrollbar{
   display:none !important;

src/template/logisticsCanUseProduct/index.vue

@@ -34,7 +34,7 @@
 
 <script>
 export default {
-  props:['sa_logistics_boxid','addList','type'],
+  props:['sa_logistics_boxid','addList','type','delList'],
   data () {
     return {
       params:{
@@ -66,9 +66,38 @@ export default {
         e.remarks = ''
       });
       if (this.type == 'edit'){
-        this.tableData = res.data
+        // console.log(this.addList,'11111删除的数据是什么')
+        // this.tableData = res.data
+        // if (this.addList && this.addList.length > 0){
+        //   this.tableData = [...this.tableData,...this.addList]
+        //   console.log(this.tableData,'输出数据******11111111')
+        // }
         if (this.addList && this.addList.length > 0){
-          this.tableData = [...this.tableData,...this.addList]
+          let indexof = 0
+          let dataNew = []
+          res.data.forEach((t,indexs)=>{
+            let float = 0
+            this.addList.forEach((i,index)=>{
+              if (t.sa_dispatch_itemsid == i.sa_dispatch_itemsid){
+                float = 1
+              }
+            })
+            if (float != 1){
+              dataNew[indexof] = res.data[indexs]
+              indexof = indexof + 1
+            }
+          })
+          if (this.delList && this.delList.length > 0){
+            this.tableData = [...dataNew,...this.delList]
+          }else {
+            this.tableData = dataNew
+          }
+        }else {
+          if (this.delList && this.delList.length > 0){
+            this.tableData = [...res.data,...this.delList]
+          }else {
+            this.tableData = res.data
+          }
         }
       }else {
         if (this.addList && this.addList.length > 0){
@@ -92,7 +121,7 @@ export default {
           this.tableData = res.data
         }
       }
-
+      this.deduplicateObjects()
       // this.tableData = res.data
       // this.total = res.total
       // this.currentPage = res.pageNumber
@@ -110,14 +139,26 @@ export default {
     selectionChange (val) {
       this.tableSelectData = val
     },
+    deduplicateObjects(){
+      const uniqueItems = [];
+      this.tableData = this.tableData.filter(item => {
+        const isExist = uniqueItems.some(uniqueItem => uniqueItem.sa_dispatch_itemsid === item.sa_dispatch_itemsid);
+        if (!isExist) {
+          uniqueItems.push(item);
+        }
+        return !isExist;
+      });
+      console.log(this.tableData,'tableData')
+    },
     onConfirm () {
-      // this.tableSelectData.forEach((item,index) => {
-      //   this.tableData.forEach((item2,indexs) => {
-      //     if (item.itemid == item2.itemid) {
-      //       this.tableData.splice(indexs,1)
-      //     }
-      //   })
-      // })
+      this.tableSelectData.forEach((item,index) => {
+        this.tableData.forEach((item2,indexs) => {
+          if (item.sa_dispatch_itemsid == item2.sa_dispatch_itemsid) {
+            this.tableData.splice(indexs,1)
+          }
+        })
+      })
+      console.log(this.tableData,'111111')
       this.$emit('onConfirm',this.tableSelectData)
     },
   },