Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/api/basicdata/basicdataWarehouse.js

@@ -39,6 +39,16 @@ export const getDeptWarehouse = (params) => { //查询部门下的仓库
   })
 }
 
+export const getDetailWarehouse = (params) => { //查询部门下的仓库
+  return request({
+    url: '/api/logpm-basicdata/warehouse/detailWarehouse',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
+
 export const getListBinName = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/warehouse/list',

src/views/basic/property/basicPropertyDetails.vue

@@ -168,6 +168,7 @@ export default {
       // this.emptycolumn();
       this.activeTab = str.val;
       this.edit = true;
+      this.option.disabled=false
       this.getListvalues(this.page, this.query);
     },
     //查看全部维修记录

src/views/distribution/reservation/reservationAddFrom.vue

@@ -136,14 +136,24 @@
                             @selection="selectionChange"
                     >
                         <template #default="slotProps">
-                            <el-text
+
+
+                            <el-text v-if="slotProps.scope.row.resource !=='零担'"
                                     type="primary"
                                     link
                                     icon="el-icon-view"
                                     @click="viewStockArticlePackage(slotProps.scope.row)"
                             >查看包件
-                            </el-text
-                            >
+                            </el-text>
+                            <el-text v-else
+                                    type="primary"
+                                    link
+                                    icon="el-icon-view"
+                                    @click="viewStockArticlePackage(slotProps.scope.row)"
+                            >录入数量
+                            </el-text>
+
+
                             <el-text
                                     type="primary"
                                     link
@@ -595,6 +605,17 @@
             sortable: true,
             head: false
           },
+          {
+            prop: 'resource',
+            label: '订单来源',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
+          },
           {
             prop: 'descriptionGoods',
             label: '货物名称',
@@ -660,6 +681,17 @@
             fixed: false,
             sortable: true,
             head: false
+          },
+           {
+            prop: 'reservationNum',
+            label: '预约数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false
           },
           {
             prop: 'customerName',
@@ -2360,6 +2392,9 @@
             this.stockArticleInfo.splice(index, 1);
           });
         });
+
+
+
         if (this.orderData.length >= 1) {
           let newDate1 = this.orderData.map(item => {
             // map遍历本地数据
@@ -2377,8 +2412,18 @@
           }
           console.log('this.orderData------------->', this.orderData);
         } else {
+
           this.orderData = this.orderList;
         }
+
+
+        this.orderData.forEach(a=>{
+          a.reservationNum= a.handQuantity
+
+        })
+
+
+
         // this.orderData.push(info);
         this.orderShow = false;
       },

src/views/distribution/stockup/distributionStockup.vue

@@ -620,7 +620,6 @@ export default {
         });
         this.forkliftData = fo;
 
-        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();

src/views/distribution/stockup/distributionStockupDiscuss.vue

@@ -747,7 +747,6 @@ export default {
         });
         this.forkliftData = fo;
 
-        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();

src/views/distribution/stockup/distributionStockupMarket.vue

@@ -687,7 +687,6 @@ export default {
         });
         this.forkliftData = fo;
 
-        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();

src/views/distribution/stockup/distributionStockupSelf.vue

@@ -685,7 +685,6 @@ export default {
         });
         this.forkliftData = fo;
 
-        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();

src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

@@ -282,8 +282,7 @@
             @click="showCommitButton"
             :disabled="view && !this.$route.query.type == '3'"
             v-else-if="!hideButton"
-            >提 交</el-button
-          >
+            >提 交</el-button>
           <span v-else-if="hideButton">
             <el-button icon="el-icon-circle-check" @click="handleSubmit"> 预约入库 </el-button>
             <el-button icon="el-icon-circle-check" @click="handleHirectStorage">
@@ -446,11 +445,9 @@ import {
 import option from '@/option/warehouse/warehouseWarehousingDetail';
 import { mapGetters, mapMutations } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
-import { getListUser } from '@/api/distribution/distributionStockup';
 import { getListClient } from '@/api/basicdata/basicClient';
-import { getDept } from '@/api/system/dept';
 import { getListMaterial } from '@/api/basic/basicMaterial';
-import { getListCopy } from '@/api/basicdata/basicdataWarehouse';
+import { getDetailWarehouse, getListCopy } from '@/api/basicdata/basicdataWarehouse';
 import { getListIdsName } from '@/api/basicdata/basicdataStoreBrand';
 import { getListName } from '@/api/basicdata/basicdataStoreBusiness';
 
@@ -1206,19 +1203,12 @@ export default {
      * @returns {Promise<void>}
      */
     async getWareHoust(page, params = {}) {
-      let a = await getListUser();
-      let {data} = a.data
-      let sl = {};
-      if(!!data[0]){
-        let b = await getDept(a.data.data[0].deptId);
-        //查询全部仓库
-        if (b.data.data.deptCategory == '4') {
-          sl.department = b.data.data.id;
-        }
-      }
-      let li = await getListCopy(page.currentPage, page.pageSize, sl);
+
+      let sl ={};
+      let li = await getDetailWarehouse( sl);
+      console.log("li>>>>",li.data.data);
       this.store = [];
-      li.data.data.records.forEach(i => {
+      li.data.data.forEach(i => {
         let st = {
           label: i.name,
           value: i.id,

src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

@@ -649,7 +649,9 @@ export default {
           this.website.tokenHeader
         }=${getToken()}`
       ).then(res => {
+        // console.log("下载过后的数据！！！！！",res.data);
         downloadXls(res.data, '入库物品数据模板.xlsx');
+        // window.open("http://192.168.10.100:9000/htlogpm/upload/20230926/f40fc92786ace87e993399454d4468f1.xlsx",'_blank')
       });
     },
     handleImport() {