海盐销售数据默认状态调整

src/HDrpManagement/orderManage/details/index.vue

@@ -17,7 +17,7 @@
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation"  v-if="Object.keys(mainData).length > 0">
           <!-- <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && (mainData.status == '新建')" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" /> -->
-          <Edit style="display: inline-block !important;margin-left: -10px"   v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
+          <Edit style="display: inline-block !important;"   v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
 <!--          <Edit class="inline-16" v-if="mainData.status !== '新建' && mainData.status !== '关闭'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />-->
           <EditRemark style="margin-right: 20px !important;" v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData"></EditRemark>
           <EditRemark style="margin-right: 20px !important;margin-left: -10px" v-if="mainData.status !== '新建' && tool.checkAuth($route.name,'editRemark')" :data="mainData" @onSuccess="queryMainData"></EditRemark>

src/components/normal-basic-layout/details/index.vue

@@ -19,7 +19,7 @@
           </reportCenter>
 
           <div class="mt-10">
-            <slot name="customOperation"></slot>
+            <slot name="customOperation" class="inline-16"></slot>
           </div>
           <el-button v-if="isAdmin || (tool.checkAuth($route.name,'delete') && delApiId)" :type="checkDisabled()?'':'primary'" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData" style="margin-top: -10px">{{$t('删 除')}}</el-button>
          <div v-if="!pageChange" class="mt-10">

src/views/salesData/index.vue

@@ -120,11 +120,16 @@ export default {
         }
       },
       windowWidth: document.documentElement.clientWidth,  //实时屏幕宽度
-      scrollData:''
+      scrollData:'',
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{
     async departmentrtment() {
+      if (this.siteid == 'HY'){
+        this.isleave = ''
+        this.depmentParam.content.isleave = ''
+      }
       const res = await this.$api.requested(this.depmentParam)
       this.deplist = this.createMenu(res.data.dep)
       this.personnelList = res.data.hr
@@ -133,10 +138,10 @@ export default {
       this.departmentid = ''
       const userid = JSON.parse(sessionStorage.getItem('active_account')).userid
 
-      this.otherMethod(userid)
+      this.otherMethod(userid,this.isleave)
     },
     /*其他页面调用*/
-    otherMethod(dataid){
+    otherMethod(dataid,isleave){
       const userName = JSON.parse(sessionStorage.getItem('active_account')).name
       /*数字看板*/
       this.$refs.digitalSigns.$refs.order.param.content.dataid = dataid
@@ -157,6 +162,7 @@ export default {
       this.$refs.customerAccountBalanceAnalysis.person = userName
       this.$refs.customerAccountBalanceAnalysis.deplist = this.deplist
       this.$refs.customerAccountBalanceAnalysis.personnelList = this.personnelList
+      this.$refs.customerAccountBalanceAnalysis.param.content.where.isleave = isleave
       this.$refs.customerAccountBalanceAnalysis.listData(dataid)
       /*客户销售*/
       this.$refs.customer.param.content.dataid = dataid
@@ -167,18 +173,18 @@ export default {
       this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.person = userName
       this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.personnelList = this.personnelList
-      this.$refs.customer.listData(dataid,'1')
-      this.$refs.salesperson.listData(dataid,'1')
+      this.$refs.customer.listData(dataid,isleave)
+      this.$refs.salesperson.listData(dataid,isleave)
       this.activeName = '客户销售'
       /*报价分析*/
-      this.$refs.quotationAnalysis.listData(dataid,'1')
-      this.$refs.quotationAnalysis.queryQuotation(dataid,'1')
+      this.$refs.quotationAnalysis.listData(dataid,isleave)
+      this.$refs.quotationAnalysis.queryQuotation(dataid,isleave)
       /*this.$refs.quotationAnalysis.$refs.departmentSalesperson.depment = dataid*/
       this.$refs.quotationAnalysis.$refs.departmentSalesperson.person = userName
       this.$refs.quotationAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.quotationAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*订单趋势分析*/
-      this.$refs.orderTrendAnalysis.listData(dataid,'1')
+      this.$refs.orderTrendAnalysis.listData(dataid,isleave)
       /*this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.depment = dataid*/
       this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.person = userName
       this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.deplist = this.deplist
@@ -188,51 +194,61 @@ export default {
       this.$refs.orderType.$refs.departmentSalesperson.person = userName
       this.$refs.orderType.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.orderType.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.orderType.param.content.where.isleave = isleave
       /*订单产品类别占比分析*/
       this.$refs.orderProductCategory.listData(dataid)
       this.$refs.orderProductCategory.$refs.departmentSalesperson.person = userName
       this.$refs.orderProductCategory.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.orderProductCategory.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.orderProductCategory.param.content.where.isleave = isleave
       /*出货趋势分析*/
       this.$refs.shippingTrendAnalysis.listData(dataid)
       this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.person = userName
       this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.shippingTrendAnalysis.param.content.where.isleave = isleave
       /*近12月延期出货情况分析*/
       this.$refs.delayedShipmentAnalysis.listData(dataid)
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.person = userName
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.delayedShipmentAnalysis.param.content.where.isleave = isleave
       /*未出货已延期情况分析*/
       this.$refs.unshippedExtensionAnalysisRef.listData(dataid)
       this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.person = userName
       this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.unshippedExtensionAnalysisRef.param.content.where.isleave = isleave
       /*开票金额趋势分析*/
       this.$refs.invoiceAmountAnalysis.listData(dataid)
       this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.person = userName
       this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.invoiceAmountAnalysis.param.content.where.isleave = isleave
       /*近12月出货未开票金额趋势分析*/
       this.$refs.uninvoiceAmountAnalysis.listData(dataid)
       this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.person = userName
       this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.uninvoiceAmountAnalysis.param.content.where.isleave = isleave
       /*已下单未出货分析*/
       this.$refs.orderUnshippedGoods.listData(dataid)
       this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.person = userName
       this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.orderUnshippedGoods.param.content.where.isleave = isleave
       /*出货未开票分析*/
       this.$refs.shippingUninvoiceAnalysis.listData(dataid)
       this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.person = userName
       this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.shippingUninvoiceAnalysis.param.content.where.isleave = isleave
       /*财务回款分析 */
       this.$refs.financialCollectionAnalysis.listData(dataid)
       this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.person = userName
       this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.financialCollectionAnalysis.param.content.where.isleave = isleave
     },
     /*其他页面调用*/
     otherModel(dataid,type,isleave,leave){