61修改问题

src/api/count.js

@@ -934,6 +934,12 @@ export function searchSaleOrderReport(query) {
   if (query.customerType !== '' && query.customerType !== null && query.customerType !== undefined) {
     params.append('customerType', query.customerType) // 你要传给后台的参数值 key/value
   }
+  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
+    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
+  }
   if (query.pageNum !== '' && query.pageNum !== null && query.pageNum !== undefined) {
     params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
   }
@@ -958,6 +964,9 @@ export function searchSaleOrderDetailReport(query) {
   if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
     params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
   }
+  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
+    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
+  }
   if (query.productCategory !== '' && query.productCategory !== null && query.productCategory !== undefined) {
     params.append('productCategory', query.productCategory) // 你要传给后台的参数值 key/value
   }
@@ -994,6 +1003,12 @@ export function searchSaleReport(query) {
   if (query.customerType !== '' && query.customerType !== null && query.customerType !== undefined) {
     params.append('customerType', query.customerType) // 你要传给后台的参数值 key/value
   }
+  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
+  }
+  if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
+    params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
+  }
   if (query.pageNum !== '' && query.pageNum !== null && query.pageNum !== undefined) {
     params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
   }

src/views/AccessComponent/components/DetailList.vue

@@ -326,7 +326,7 @@ export default {
           { field: 'lossQuantity', displayName: '丢失数量', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">工具领用单</div>
                         <br>

src/views/AccessMaterials/components/DetailList.vue

@@ -334,7 +334,7 @@ export default {
           { field: 'retreatQuantity', displayName: '已退料数量', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">领料订单</div>
                         <br>

src/views/AccessMaterials/components/DetailList2.vue

@@ -314,7 +314,7 @@ export default {
           { field: 'reason', displayName: '退料原因', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">退料订单</div>
                         <br>

src/views/AccessTools/components/DetailList.vue

@@ -379,7 +379,7 @@ export default {
           { field: 'lossQuantity', displayName: '丢失数量', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">工具领用单</div>
                         <br>

src/views/Advancemanage/components/DetailList.vue

@@ -241,7 +241,7 @@ export default {
           { field: 'deposit', displayName: '预售定金', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">预售商品列表</div>
                         <br>

src/views/Advancemanage/components/DetailList2.vue

@@ -303,7 +303,7 @@ export default {
           { field: 'salePrice', displayName: '单价', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">预售单列表</div>
                         <br>

src/views/Advancemanage/components/MyCustomer.vue

@@ -223,7 +223,8 @@ export default {
         type: '',
         pagenum: 1,
         pagesize: 10,
-        repositoryid: '',
+        repositoryid: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
         source: ''
       },
       // 部门列表
@@ -309,6 +310,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/CheckReport/components/DetailList.vue

@@ -421,7 +421,7 @@ export default {
           { field: 'failedReason', displayName: '不良原因', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">质检报告</div>
                         <br>

src/views/Collection/components/MyCustomer.vue

@@ -217,7 +217,9 @@ export default {
         type: '',
         pagenum: 1,
         pagesize: 10,
-        repositoryid: '',
+        repositoryid: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
+
         source: ''
       },
       // 部门列表
@@ -299,6 +301,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/Customer/CustomerList.vue

@@ -379,8 +379,16 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
-      this.getemplist.repositoryId = 0
+
       this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/CustomerMarketing/components/MyCustomer.vue

@@ -217,7 +217,8 @@ export default {
         type: '',
         pagenum: 1,
         pagesize: 10,
-        repositoryid: '',
+        repositoryid: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
         source: ''
       },
       // 部门列表
@@ -299,6 +300,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/DeliverGoods/components/MyCustomer.vue

@@ -222,7 +222,8 @@ export default {
         type: '',
         pagenum: 1,
         pagesize: 10,
-        repositoryid: '',
+        repositoryid: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
         source: ''
       },
       // 部门列表
@@ -307,6 +308,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/InventoryAlarm/components/DetailList.vue

@@ -174,7 +174,7 @@ export default {
           { field: 'quantity', displayName: '订单数量', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">销售出货单列表</div>
                         <br>

src/views/MaterialsList/components/DetailList.vue

@@ -291,7 +291,7 @@ export default {
           { field: 'productCategory', displayName: '子件类型', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">查看物料清单</div>
                         <br>

src/views/OutSourceEnter/components/DetailList.vue

@@ -626,7 +626,7 @@ export default {
           { field: 'remarks', displayName: '备注', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购入库单</div>
                         <br>

src/views/OutSourceEnter/components/DetailList3.vue

@@ -571,7 +571,7 @@ export default {
             { field: 'batch', displayName: '批次', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">委外入库单</div>
                         <br>
@@ -667,7 +667,7 @@ export default {
                 { field: 'outQuantity', displayName: '出库数量', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">其他出库列表</div>
                         <br>

src/views/OutSourceOut/components/DetailList.vue

@@ -602,7 +602,7 @@ export default {
             { field: 'batch', displayName: '批次', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">委外出库单</div>
                         <br>
@@ -698,7 +698,7 @@ export default {
                 { field: 'outQuantity', displayName: '出库数量', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">其他出库列表</div>
                         <br>

src/views/OutSourcing/components/DetailList.vue

@@ -336,7 +336,7 @@ export default {
           { field: 'quantity', displayName: '数量', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">外包订单</div>
                         <br>

src/views/ProducePlan/components/DetailList.vue

@@ -152,7 +152,7 @@ export default {
           { field: 'planQuantity', displayName: '计划生产数量', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">生产计划表</div>
                         <br>

src/views/ProduceTask/components/DetailList.vue

@@ -263,7 +263,7 @@ export default {
 
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购订单</div>
                         <br>

src/views/Receipt/components/MyCustomer.vue

@@ -311,6 +311,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/Recycling/components/MyCustomer.vue

@@ -223,7 +223,8 @@ export default {
         type: '',
         pagenum: 1,
         pagesize: 10,
-        repositoryid: '',
+        repositoryid: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
         source: ''
       },
       // 部门列表
@@ -309,6 +310,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/RequirePlan/components/DetailList.vue

@@ -254,7 +254,7 @@ export default {
           { field: 'materialsSource', displayName: '物料来源', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">物料需求计划列表</div>
                         <br>

src/views/ReturnExchange/components/MyCustomer.vue

@@ -224,7 +224,8 @@ export default {
         type: '',
         pagenum: 1,
         pagesize: 10,
-        repositoryid: '',
+        repositoryid: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
         source: ''
       },
       // 部门列表
@@ -309,6 +310,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/SaleContract/components/MyCustomer.vue

@@ -309,8 +309,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
-      this.getemplist.repositoryId = 0
       this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/SaleOrder/components/DetailList.vue

@@ -701,7 +701,7 @@ export default {
             { field: 'deliveryDate', displayName: '需求日期', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">销售订单列表</div>
                         <br>
@@ -797,7 +797,7 @@ export default {
                 { field: 'deliveryDate', displayName: '需求日期', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">销售订单列表</div>
                         <br>

src/views/SaleOrder/components/MyCustomer.vue

@@ -223,7 +223,8 @@ export default {
         type: '',
         pagenum: 1,
         pagesize: 10,
-        repositoryid: '',
+        repositoryid: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
         source: ''
       },
       // 部门列表
@@ -308,6 +309,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/SaleOut/components/DetailList.vue

@@ -783,7 +783,7 @@ export default {
             { field: 'quantity', displayName: '订单数量', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">销售出货单列表</div>
                         <br>
@@ -878,7 +878,7 @@ export default {
                 { field: 'quantity', displayName: '订单数量', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">销售出货单列表</div>
                         <br>

src/views/SaleOut/components/MyCustomer.vue

@@ -223,7 +223,8 @@ export default {
         type: '',
         pagenum: 1,
         pagesize: 10,
-        repositoryid: '',
+        repositoryid: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
         source: ''
       },
       // 部门列表
@@ -308,6 +309,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/SaleReceipt/components/MyCustomer.vue

@@ -225,7 +225,8 @@ export default {
         type: '',
         pagenum: 1,
         pagesize: 10,
-        repositoryid: '',
+        repositoryid: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
         source: ''
       },
       // 部门列表
@@ -311,6 +312,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/SaleReport/components/DetailList2.vue

@@ -662,7 +662,7 @@ export default {
           { field: 'quantity', displayName: '订单数量', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">销售出货单列表</div>
                         <br>

src/views/SaleReport/saleBillList.vue

@@ -12,8 +12,8 @@
         <el-option :label="$t('otherlanguage.pjj')" value="7"/>
         <el-option :label="$t('otherlanguage.hj')" value="8"/>
       </el-select>
-
       <el-cascader
+        v-show="ishidden"
         :options="regions"
         :props="props"
         v-model="getemplist.region"
@@ -24,7 +24,6 @@
         clearable
         @change="handlechange4"
       />
-
       <el-input v-model="repositoryId" :placeholder="$t('updates.repository')" class="filter-item" clearable @keyup.enter.native="handleFilter" @focus="handlechooseRep" @clear="restFilter2"/>
       <my-repository :repositorycontrol.sync="repositorycontrol" @repositoryname="repositoryname"/>
 
@@ -303,6 +302,7 @@ export default {
   },
   data() {
     return {
+      ishidden: false,
       props: {
         value: 'id',
         label: 'regionName',
@@ -388,6 +388,7 @@ export default {
 
   mounted() {
     this.gettype()
+    this.judgehidden()
     setTimeout(() => {
       this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 150
     }, 100)
@@ -396,6 +397,13 @@ export default {
     _that = this
   },
   methods: {
+    judgehidden() {
+      if (this.$store.getters.repositoryId === 0) {
+        this.ishidden = true
+      } else {
+        this.ishidden = false
+      }
+    },
     handleReceipt2(row) {
       this.getemplist.productCode = row.productCode
       saleBillListDetail(this.getemplist).then(res => {

src/views/SaleReport/saleDetailCount.vue

@@ -17,6 +17,7 @@
       <el-input v-model="saleRepositoryId" :placeholder="$t('updates.repository')" class="filter-item" clearable @keyup.enter.native="handleFilter" @focus="handlechooseRep" @clear="restFilter2"/>
       <my-repository :repositorycontrol.sync="repositorycontrol" @repositoryname="repositoryname"/>
       <el-cascader
+        v-show="ishidden"
         :options="regions"
         :props="props"
         v-model="getemplist.region"
@@ -303,6 +304,7 @@ export default {
   },
   data() {
     return {
+      ishidden: false,
       tableHeight: 50,
       // 更多搜索条件问题
       visible2: false,
@@ -397,6 +399,7 @@ export default {
 
   mounted() {
     this.gettype()
+    this.judgehidden()
     setTimeout(() => {
       this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 150
     }, 100)
@@ -405,6 +408,13 @@ export default {
     _that = this
   },
   methods: {
+    judgehidden() {
+      if (this.$store.getters.repositoryId === 0) {
+        this.ishidden = true
+      } else {
+        this.ishidden = false
+      }
+    },
     // 清空搜索条件
     restFilter() {
       this.createPersonId = ''

src/views/SaleReport/searchSaleOrderDetailReport.vue

@@ -236,7 +236,9 @@ export default {
       getemplist: {
         pageNum: 1,
         pageSize: 10,
-        type: '3'
+        type: '3',
+        repositoryId: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionId
       },
       // 传给组件的数据
       personalForm: {},

src/views/SaleReport/searchSaleOrderReport.vue

@@ -201,7 +201,9 @@ export default {
       getemplist: {
         pageNum: 1,
         pageSize: 10,
-        type: '3'
+        type: '3',
+        repositoryId: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionId
       },
       // 传给组件的数据
       personalForm: {},

src/views/SaleReport/searchSaleReport.vue

@@ -250,7 +250,9 @@ export default {
       getemplist: {
         pageNum: 1,
         pageSize: 10,
-        type: '3'
+        type: '3',
+        repositoryId: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionId
       },
       // 传给组件的数据
       personalForm: {},

src/views/SaleReturn/components/MyCustomer.vue

@@ -223,7 +223,8 @@ export default {
         type: '',
         pagenum: 1,
         pagesize: 10,
-        repositoryid: '',
+        repositoryid: this.$store.getters.repositoryId,
+        regionIds: this.$store.getters.regionIds,
         source: ''
       },
       // 部门列表
@@ -309,6 +310,15 @@ export default {
     // 搜索
     handleFilter() {
       this.getemplist.pagenum = 1
+      this.getemplist.regionIds = ''
+      if (!this.getemplist.repositoryid) {
+        this.getemplist.repositoryid = 0
+      }
+
+      if (!this.getemplist.customername && !this.getemplist.customerphone && !this.getemplist.type && !this.getemplist.source && !this.getemplist.level) {
+        this.getemplist.repositoryId = this.$store.getters.repositoryId
+        this.getemplist.regionIds = this.$store.getters.regionIds
+      }
       customerlist(this.getemplist).then(res => {
         if (res.data.ret === 200) {
           this.list = res.data.data.content.list

src/views/StockArrival/components/DetailList.vue

@@ -680,7 +680,7 @@ export default {
             { field: 'remark', displayName: '备注', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购到货订单</div>
                         <br>
@@ -779,7 +779,7 @@ export default {
                 { field: 'remark', displayName: '备注', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购到货订单</div>
                         <br>

src/views/StockContract/components/DetailList.vue

@@ -408,7 +408,7 @@ export default {
           { field: 'applicationReason', displayName: '备注', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购合同列表</div>
                         <br>

src/views/StockInquiry/components/DetailList.vue

@@ -347,7 +347,7 @@ export default {
             { field: 'applicationReason', displayName: '备注', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购询价订单</div>
                         <br>
@@ -448,7 +448,7 @@ export default {
                 { field: 'applicationReason', displayName: '备注', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购询价订单</div>
                         <br>

src/views/StockOrder/components/DetailList.vue

@@ -461,7 +461,7 @@ export default {
             { field: 'remarks', displayName: '备注', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购订单</div>
                         <br>
@@ -562,7 +562,7 @@ export default {
                 { field: 'remarks', displayName: '备注', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购订单</div>
                         <br>

src/views/StockOut/components/DetailList.vue

@@ -572,7 +572,7 @@ export default {
           { field: 'outQuantity', displayName: '出库数量', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">其他出库列表</div>
                         <br>

src/views/StockPlan/AddStockPlan.vue

@@ -84,7 +84,7 @@
           <my-detail :control.sync="control" @product="productdetail" @product2="productdetail2"/>
           <el-button :disabled="addsouce" size="mini" style="width: 130px" @click="handleAddSouce">{{ $t('updates.cydzxz') }}</el-button>
           <my-apply :applycontrol.sync="applycontrol" @apply="apply" @apply2="apply2" @allinfo="allinfo"/>
-          <my-require :requirecontrol.sync="requirecontrol" @require="requiredata" @require2="requiredata2"/>
+          <my-require :requirecontrol.sync="requirecontrol" :requirerep.sync="requirerep" @require="requiredata" @require2="requiredata2"/>
           <el-button type="danger" size="mini" @click="deleteEdit">{{ $t('Hmodule.delete') }}</el-button>
           <el-button type="primary" size="mini" @click="checkStock()">{{ $t('updates.kckz') }}</el-button>
         </div>
@@ -341,6 +341,7 @@ export default {
       }
     }
     return {
+      requirerep: '',
       repositorycontrol: false,
       planRepositoryId: this.$store.getters.repositoryName,
       suppliers: [],
@@ -921,6 +922,11 @@ export default {
       if (this.personalForm.sourceType === '1') {
         this.applycontrol = true
       } else if (this.personalForm.sourceType === '2') {
+        if (!this.personalForm.planRepositoryId) {
+          this.requirerep = String(this.$store.getters.repositoryId)
+        } else {
+          this.requirerep = String(this.personalForm.planRepositoryId)
+        }
         this.requirecontrol = true
       }
     },

src/views/StockPlan/components/DetailList.vue

@@ -341,7 +341,7 @@ export default {
             { field: 'remarks', displayName: '备注', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购计划</div>
                         <br>
@@ -443,7 +443,7 @@ export default {
                 { field: 'remarks', displayName: '备注', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购计划</div>
                         <br>

src/views/StockPlan/components/MyRequire.vue

@@ -189,6 +189,10 @@ export default {
     requirecontrol: {
       type: Boolean,
       default: false
+    },
+    requirerep: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -242,10 +246,15 @@ export default {
   watch: {
     requirecontrol() {
       this.employeeVisible = this.requirecontrol
-      this.getlist()
+
       setTimeout(() => {
         this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 180
       }, 100)
+    },
+    requirerep() {
+      this.getemplist.repositoryId = this.requirerep
+      console.log('this.requirerep', this.requirerep)
+      this.getlist()
     }
   },
   beforeCreate() {

src/views/StockRetreat/components/DetailList.vue

@@ -416,7 +416,7 @@ export default {
             { field: 'remark', displayName: '备注', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购退货单</div>
                         <br>
@@ -510,7 +510,7 @@ export default {
                 { field: 'remark', displayName: '备注', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购退货单</div>
                         <br>

src/views/Stockenter/components/DetailList.vue

@@ -733,7 +733,7 @@ export default {
             { field: 'remarks', displayName: '备注', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购入库单</div>
                         <br>
@@ -838,7 +838,7 @@ export default {
                 { field: 'remarks', displayName: '备注', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购入库单</div>
                         <br>

src/views/Storagemovediff/components/DetailList.vue

@@ -648,7 +648,7 @@ export default {
             { field: 'result', displayName: '处理结果', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">调拨差异报告单</div>
                         <br>
@@ -763,7 +763,7 @@ export default {
                 { field: 'result', displayName: '处理结果', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">调拨差异报告单</div>
                         <br>

src/views/SupplierAdjust/components/DetailList.vue

@@ -318,7 +318,7 @@ export default {
             { field: 'remarks', displayName: '备注', columnSize: `100px` }
           ],
           header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购订单</div>
                         <br>
@@ -419,7 +419,7 @@ export default {
                 { field: 'remarks', displayName: '备注', columnSize: `100px` }
               ],
               header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">采购订单</div>
                         <br>

src/views/WarehouseAdjust/components/DetailList.vue

@@ -446,7 +446,7 @@ export default {
           { field: 'enterQuantity', displayName: '入库数量', columnSize: `100px` }
         ],
         header: `<div class="pringtitle">
-                    <div class="custom-p"> 江苏新世窗国际贸易有限公司 </div>
+                    <div class="custom-p"> 江苏嗯哇科技有限公司 </div>
                       <br>
                       <div class="ordername">期初库存单</div>
                         <br>

src/views/countlist/index.vue

@@ -40,7 +40,7 @@
       <!-- 表格导出操作 -->
       <el-button v-permission="['131-153-6']" v-waves :loading="downloadLoading" size="small" class="filter-item2" style="width: 86px" @click="handleExport"> <svg-icon icon-class="daochu"/>{{ $t('public.export') }}</el-button>
       <!-- 打印操作 -->
-      <!-- <el-button v-permission="['131-153-7']" v-waves size="small" class="filter-item2" icon="el-icon-printer" style="width: 86px" @click="handlePrint">{{ $t('public.print') }}</el-button> -->
+      <el-button v-permission="['131-153-7']" v-waves size="small" class="filter-item2" icon="el-icon-printer" style="width: 86px" @click="handlePrint">{{ $t('public.print') }}</el-button>
       <my-repository2 :repositorycontrol.sync="repositorycontrol2" @repositoryname="repositoryname2"/>
     </el-card>
     <el-card :body-style="	{ padding: '10px' }" class="box-card" shadow="never">