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

src/api/addvalue/distributionAddvalue.js

@@ -48,3 +48,5 @@ export const update = (row) => {
   })
 }
 
+
+

src/api/basicdata/basicdataGoodsArea.js

@@ -22,6 +22,13 @@ export const stockUp = ( params) => {
   })
 }
 
+export const getStockUpArea = () => {
+  return request({
+    url: '/api/logpm-basicdata/goodsArea/getStockUpArea',
+    method: 'get',
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/detail',

src/api/basicdata/basicdataGoodsShelf.js

@@ -108,3 +108,13 @@ export const getQRCodeImg = (qrCode) => {
   })
 }
 
+export const getUploadBefore = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsShelf/preImport',
+    method: 'get',
+    params:{
+      ids
+    }
+  })
+}
+

src/api/distribution/distributionSignfor.js

@@ -55,6 +55,8 @@ export const getDetail = (id) => {
   })
 }
 
+
+
 export const getDetailById = (id) => {
   return request({
     url: '/api/logpm-distribution/signfor/detailById',
@@ -132,3 +134,17 @@ export const getLocationAddress = (signforId) => {
   })
 }
 
+
+/**
+ * 查询对应的增值服务列表信息
+ * @param row
+ * @returns {AxiosPromise}
+ */
+export const addvalueInfoList = (row) => {
+  return request({
+    url: '/api/logpm-distribution/signfor/addvalueInfoList',
+    method: 'post',
+    data: row
+  })
+}
+

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue

@@ -32,6 +32,11 @@
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDisable" plain>禁 用</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleEnable" plain>启 用</el-button>
+            <el-button type="danger"
+                       icon="el-icon-delete"
+                       plain
+                       @click="handleImport">导 入 货 架
+            </el-button>
             <!--            <el-button type="danger" icon="el-icon-delete" @click="aaa" plain>导出二维码</el-button>-->
             <!--            <el-button type="danger" icon="el-icon-delete" @click="viewQrCode" plain>查看二维码</el-button>-->
 
@@ -158,7 +163,7 @@
             <!--                </el-select>-->
             <!--              </el-form-item>-->
             <!--            </el-col>-->
-            <el-col :span="12" v-if="idShowStatus && !allocation">
+            <el-col :span="12" v-if="!allocation">
               <el-form-item label="备 注:" prop="remarks"  label-width="100px">
                 <el-input v-model="form.remarks" placeholder="请输入备注"  style="width: 88%;"/>
               </el-form-item>
@@ -315,11 +320,21 @@
       </el-dialog>
 
     </div>
+    <el-dialog title="货架导入" append-to-body v-model="excelBox" width="555px">
+      <avue-form :option="excelOption" v-model="excelForm" :upload-before="uploadBefore" :upload-after="uploadAfter">
+        <template #excelTemplate>
+          <el-button type="primary" @click="handleTemplate">
+            点击下载<i class="el-icon-download el-icon--right"></i>
+          </el-button>
+        </template>
+      </avue-form>
+    </el-dialog>
+
   </basic-container>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,addAllocation,disable,enable,addlayer, } from "@/api/basicdata/basicdataGoodsShelf";
+import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,addAllocation,disable,enable,addlayer,getUploadBefore} from "@/api/basicdata/basicdataGoodsShelf";
 import {getList as allgetList,update as allupdate,getPrintTemplate} from "@/api/basicdata/basicdataGoodsAllocation";
 import option from "@/option/basicdata/basicdataGoodsShelf";
 import { mapGetters } from "vuex";
@@ -327,9 +342,16 @@ import {  getGoodsAreaNodeList,getGoodsAreaoptionList } from '@/api/basicdata/ba
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getTemplateData} from '@/api/basic/basicPrintTemplate'
 import { getLodop } from '@/utils/LodopFuncs.js'
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
 export default {
   data () {
     return {
+      excelBox: false,
+      excelForm: {
+        goodsAreaId:null,
+      },
       form2:{},
       box2:false,
       form3:{},
@@ -489,6 +511,50 @@ export default {
       //货位 选择行
       allselectionList: [],
       html: null, // 页面包条码内容
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "所属货区",
+            prop: "goodsAreaId",
+            type: "select",
+            search: true,
+            align:'center',
+            width: 200,
+            filterable: true,
+            dicUrl: "/api/logpm-basicdata/goodsArea/dict",
+            props: {
+              label: "headline",
+              value: "id",
+            },
+            rules: [{
+              required: true,
+              message: "请选择货区",
+              trigger: "blur"
+            }],
+          },
+          {
+            label: '文件上传',
+            prop: 'excelFile',
+            type: 'upload',
+            drag: true,
+            loadText: '文件上传，请稍等',
+            span: 24,
+            propsHttp: {
+              res: 'data',
+            },
+            tip: '请上传 .xls,.xlsx 标准格式文件',
+            action: '/api/logpm-basicdata/goodsShelf/import-BasicdataGoodsShelf',
+          },
+          {
+            label: '模板下载',
+            prop: 'excelTemplate',
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
       alloption: {
         height:'auto',
         calcHeight: 30,
@@ -672,7 +738,7 @@ export default {
 
         ]
       },
-
+      goodsShelfId:null,
       // 表单配置
       option: option,
       // 表单列表
@@ -750,9 +816,46 @@ export default {
         .catch(_ => {
         });
     },
+    //导入
+    handleImport(){
+      this.excelBox = true;
+    },
+    //下载模板
+    handleTemplate() {
+      console.log("下载模板！！！~~~~~~~~~~~");
+      exportBlob(
+        `/api/logpm-basicdata/goodsShelf/exportmb-BasicdataGoodsShelf?${this.website.tokenHeader}=${getToken()}`
+      ).then(res => {
+        downloadXls(res.data, '货架模板.xlsx');
+      });
+    },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
+    uploadAfter(res, done, loading, column) {
+      this.$message({
+        type: 'success',
+        message: '操作成功!',
+      });
+      this.excelBox = false;
+      done();
+    },
+    uploadBefore(res, done, loading, column){
+      let id = this.excelForm.goodsAreaId;
+      console.log("之前>>>>>>>>>>>>>>",id);
+      if (null == id){
+        console.log("只杀杀杀");
+        this.$message({
+          type: 'warning',
+          message: '无选择仓库!',
+        });
+        loading();
+        return ;
+
+      }
+      getUploadBefore(id);
+      done();
+    },
     getListInfo(){
       //启用状态字典列表数据
       getDictionaryBiz( 'enable_status').then(res => {
@@ -883,9 +986,10 @@ export default {
     },
     //货位列表
     locationList(row){
-      console.log("row>>>>>>>>",row);
+      console.log("row>>>>>>xx>>",row);
       this.title = '货位列表'
       this.box1 = true
+      this.goodsShelfId = row.id
       this.allonLoad(this.allpage)
     },
     handleSubmitAdd(){
@@ -1225,7 +1329,9 @@ export default {
       this.onLoad(this.page);
     },
     allonLoad(page){
-      let values ={}
+      let values ={
+        goodsShelfId:this.goodsShelfId,
+      }
       allgetList(page.currentPage, page.pageSize, values).then(res => {
         const data = res.data.data
         console.log("data>>>>>>>>>>>>>>>",data);

src/views/distribution/reservation/reservation.vue

@@ -404,7 +404,7 @@
   import { getPostList } from '@/api/system/post';
   import { getListOwn } from '@/api/system/user';
   import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
-  import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
+  import { stockUp ,getStockUpArea} from '@/api/basicdata/basicdataGoodsArea';
   import dayjs from 'dayjs';
 
   export default {
@@ -1234,6 +1234,22 @@
           this.goodsAreaIdData = fo;
         });
       },
+
+      //备货区
+      async getStockUpArea() {
+        getStockUpArea().then(res => {
+          // console.log("res>>>",res.data.data);
+          let fo = [];
+          res.data.data.forEach(i => {
+            let v = {
+              dictKey: i.id,
+              dictValue: i.name + '-' + i.headline
+            };
+            fo.push(v);
+          });
+          this.goodsAreaIdData = fo;
+        });
+      },
       searchHide() {
         this.search = !this.search;
       },
@@ -1368,9 +1384,9 @@
         }
         this.dialogFormCustomer = true;
         this.info.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
-
-        this.getFork();
-        this.getTeam();
+        this.getStockUpArea();
+        // this.getFork();
+        // this.getTeam();
       },
       //确定指派
       callFordelivery() {

src/views/distribution/reservation/reservationAddFrom.vue

@@ -1702,7 +1702,7 @@
     },
     mounted() {
       this.init();
-      
+
       this.onLoad(this.page);
       this.getDictionary();
     },
@@ -2054,6 +2054,7 @@
               message: '请输入' + item.orderCode + '正确数量!'
             });
             operation = false;
+            return;
           }
           item.reservationNum = item.reservationNum;
           inventoryIds.push(item.id);
@@ -2095,9 +2096,20 @@
             item.packageListInfo = item.parcelListVOS;
           }
         });
+        console.log("------------------->this.form.inventoryList",this.form.inventoryList);
+        console.log("------------------->this.form.stockArticleList",this.form.stockArticleList);
+
+        if (JSON.stringify(this.form.inventoryList) === '[]' && JSON.stringify(this.form.stockArticleList) === '[]' ){
+          this.$message({
+            type: 'warning',
+            message: '无效的预约计划!'
+          });
+          operation = false;
+          return;
+        }
         // this.form.stockArticleList = this.packageList;
         console.log('>>>>>>>>', this.form);
-        if (this.reservationId) {
+      if (this.reservationId) {
           this.form.id = this.reservationId;
           update(this.form).then(() => {
             this.$router.go(-1);

vite.config.js

@@ -14,7 +14,7 @@ export default ({ mode, command }) => {
         '/api': {
           target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.48:8888',
-          // target: 'http://192.168.10.123:8889',
+          // target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.75:8777',
           // target: 'http://test.api.huitongys.com',
           // target: 'http://192.168.10.101:8888',