Merge branch 'master' of http://42.192.7.176:3000/suojin/lab-ops-ui-web

src/views/businessManagement/ordinary.vue

@@ -1274,7 +1274,7 @@ export default {
         this.repairForm.isNeedMaterial = (this.repairForm.status == 201 || this.repairForm.status == 401 || this.repairForm.status == 402 || this.repairForm.status == 105) && this.repairForm.isNeedMaterial == -1 ? '' : this.repairForm.isNeedMaterial
         this.repairForm.laborCost = this.repairForm.laborCost < 0 ? null : this.repairForm.laborCost //人工费
         this.repairForm.travelExpense = this.repairForm.travelExpense < 0 ? null : this.repairForm.travelExpense //差旅费
-        this.getDeviceList(res.data.data.createDept)
+        this.getDeviceList(res.data.data.reportUnit)
 
         if (this.repairForm.isNeedMaterial != '') {
           this.repairVisible = true

src/views/goodsManagement/goodsList.vue

@@ -667,12 +667,12 @@ export default {
     nextTick(() => {
       this.getWareList()
       // this.option.menuWidth = this.permission.goodsReceive ? 100 : 300
-      getChildList(1, 100, '1848271307123818498').then(res => {
+      getChildList(1, 99999, '1848271307123818498').then(res => {
         this.treeData = res.data.data
         this.treeOptions = res.data.data
       })
 
-      getChildList(1, 100, '1848278876525527042').then(res => {
+      getChildList(1, 99999, '1848278876525527042').then(res => {
         this.majorTypeList = res.data.data
       })
       this.getGoodsLists()