Merge branch 'dev' into pre-production

src/api/basicdata/basicClientAccount.js

@@ -0,0 +1,21 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-basicdata/basicdataClientAccount/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/logpm-basicdata/basicdataClientAccount/submit',
+    method: 'post',
+    data: row
+  })
+}

src/api/basicdata/basicdataGoodsAllocation.js

@@ -49,6 +49,15 @@ export const enable = (ids) => {
     }
   })
 }
+export const downAllocation = (ids) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
 export const shelf = (ids) => {
   return request({
     url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation',

src/api/basicdata/basicdataGoodsArea.js

@@ -128,6 +128,17 @@ export const getGoodsAreaNodeList = () => {
     method: 'get',
   })
 }
+/**
+ * 货区列表信息
+ * @param id 仓库ID
+ * @returns {AxiosPromise}
+ */
+export const getGoodsAreaoptionList = () => {
+  return request({
+    url: '/api/logpm-basicdata/goodsArea/getAreaoption',
+    method: 'get',
+  })
+}
 
 /**
  * 查询当前登录人所能操作的备货区

src/api/basicdata/basicdataGoodsShelf.js

@@ -87,15 +87,15 @@ export const getShowTemplate = (row) => {
   })
 }
 
-export const getPrintTemplate = (ids) => {
+// export const getPrintTemplate = (ids) => {
-  return request({
+//   return request({
-    url: '/api/logpm-basicdata/goodsShelf/getPrintTemplate',
+//     url: '/api/logpm-basicdata/goodsShelf/getPrintTemplate',
-    method: 'get',
+//     method: 'get',
-    params:{
+//     params:{
-      ids
+//       ids
-    }
+//     }
-  })
+//   })
-}
+// }
 
 export const getQRCodeImg = (qrCode) => {
   return request({

src/api/basicdata/basicdataGoodsShelfView.ts

@@ -1,5 +1,5 @@
 import request from '@/axios';
-import { AxiosResponse } from 'axios'; // 假设使用Axios发送HTTP请求
+import { AxiosResponse,AxiosRequestConfig } from 'axios'; // 假设使用Axios发送HTTP请求
 
 interface VisualizationResponseData {
   data: any; // 根据实际返回数据结构进行定义

src/api/basicdata/basicdataTray.js

@@ -102,13 +102,32 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/logpm-basicdata/Tray/remove',
+    url: '/api/logpm-basicdata/tray/remove',
     method: 'post',
     params: {
       ids,
     }
   })
 }
+export const disable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/tray/disable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+export const addable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/tray/addable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
 
 export const add = (row) => {
   return request({
@@ -132,4 +151,11 @@ export const vacant = (row) => {
     data: row
   })
 }
+export const vacants = (row) => {
+  return request({
+    url: '/api/logpm-basicdata/tray/vacants',
+    method: 'post',
+    data: row
+  })
+}
 

src/api/distribution/disStockListDetail.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockListDetail/list',
+    url: '/api/logpm-distribution/disStockListDetail/list',
     method: 'get',
     params: {
       ...params,
@@ -12,9 +12,19 @@ export const getList = (current, size, params) => {
   })
 }
 
+export const getDisStockList = (params) => {
+  return request({
+    url: '/api/logpm-distribution/disStockListDetail/disStockList',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockListDetail/detail',
+    url: '/api/logpm-distribution/disStockListDetail/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +34,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockListDetail/remove',
+    url: '/api/logpm-distribution/disStockListDetail/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +44,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockListDetail/submit',
+    url: '/api/logpm-distribution/disStockListDetail/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +52,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockListDetail/submit',
+    url: '/api/logpm-distribution/disStockListDetail/submit',
     method: 'post',
     data: row
   })

src/api/distribution/disStockOrdercodeReco.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockOrdercodeReco/list',
+    url: '/api/logpm-distribution/disStockOrdercodeReco/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getDetail = (id) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockOrdercodeReco/detail',
+    url: '/api/logpm-distribution/disStockOrdercodeReco/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +24,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockOrdercodeReco/remove',
+    url: '/api/logpm-distribution/disStockOrdercodeReco/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +34,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockOrdercodeReco/submit',
+    url: '/api/logpm-distribution/disStockOrdercodeReco/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +42,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/disStockOrdercodeReco/disStockOrdercodeReco/submit',
+    url: '/api/logpm-distribution/disStockOrdercodeReco/submit',
     method: 'post',
     data: row
   })

src/api/warehouse/warehouseUpdownGoodsLog.js

@@ -12,6 +12,29 @@ export const getpage = (current, size, params) => {
   })
 }
 
+export const getinventorypage = (current, size, params) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/inventorypage',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+export const gettruckloadpage = (current, size, params) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/truckloadpage',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/detail',

src/axios.js

@@ -18,7 +18,7 @@ import 'nprogress/nprogress.css'; // progress bar style
 import { Base64 } from 'js-base64';
 import { baseUrl } from '@/config/env';
 
-axios.defaults.timeout = 10000;
+axios.defaults.timeout = 60000;
 //返回其他状态吗
 axios.defaults.validateStatus = function (status) {
   return status >= 200 && status <= 500; // 默认的

src/components/tablecmt/tablecmt.vue

@@ -634,4 +634,8 @@ function copyContent(content: string) {
   display: flex;
   align-items: center;
 }
+
+.el-popper{
+  max-width:20% !important;
+}
 </style>

src/option/distribution/distributionStockup.js

@@ -724,6 +724,10 @@ export default {
       label: "备货区",
       prop: "stockupArea",
     },
+    {
+      label: "操作",
+      prop: "stockupArea",
+    },
   ],
   columnBasic: [ //基本信息
     {

src/page/index/tags.vue

@@ -39,6 +39,10 @@
           </template>
         </el-tab-pane>
       </el-tabs>
+      <el-dropdown class="avue-tags__menu">
+        <el-button class="btsico" icon="el-icon-refresh" @click="replace" circle></el-button>
+      </el-dropdown>
+      
       <el-dropdown class="avue-tags__menu">
         <el-button type="primary">
           {{ $t('tagsView.menu') }}
@@ -189,6 +193,14 @@ export default {
         });
       });
     },
+    replace(){
+      location.replace(location.href)
+    }
   },
 };
 </script>
+<style lang="scss">
+  .btsico{
+    margin-right: 70px !important;
+  }
+</style>

src/router/views/index.js

@@ -925,7 +925,30 @@ export default [
         component: () => import('@/views/basicdata/team/basicdataTeamStaff.vue'),
       },
     ],
+    
   },
+
+
+  {
+    path: '/basicdata/brand/basicClientAccount',
+    component: Layout,
+    redirect: '/basicdata/brand/basicClient',
+    children: [
+      {
+        path: '/basicdata/brand/basicClientAccount',
+        name: '客户账号列表',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          id: route.query.id
+        }),
+        component: () => import('@/views/basicdata/brand/basicClientAccount.vue'),
+      },
+    ],
+    
+  },
+
   // {
   //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
   //   component: Layout,

src/views/basicdata/brand/basicClient.vue

@@ -126,6 +126,9 @@
                     <el-dropdown-item command="6">
                       <el-text>三方商城</el-text>
                     </el-dropdown-item>
+                    <el-dropdown-item command="7">
+                      <el-text>开通账号</el-text>
+                    </el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
               </el-dropdown>
@@ -313,6 +316,36 @@
           </span>
         </template>
       </el-dialog>
+
+
+      <!-- 账号绑定弹出框页面
+      1、显示登录账号
+      2、显示账号的名称 -->
+      <el-dialog title="开通账号" v-model="openAcountStatus">
+
+        <el-form :disabled="view" ref="openAcountorm" :model="openAcountform" :rules="openAcountrules" label-width="120px">
+
+          <el-form-item label="姓名" prop="linkman" >
+            <el-input v-model="openAcountform.name" placeholder="请输入联系人" maxlength="20" style="width: 100%" />
+          </el-form-item>
+
+          <el-form-item label="账号" prop="linkman" >
+            <el-input v-model="openAcountform.phone" placeholder="请输入电话" type="number" maxlength="11" style="width: 100%" />
+          </el-form-item>
+          <el-form-item label="密码" >
+            <span style="color: red;">默认系统初始化密码</span>
+          </el-form-item>
+        </el-form>
+
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="openAcountStatus = false">取 消</el-button>
+          </span>
+        </template>
+
+      </el-dialog>
+
       <el-drawer
         title="子表操作"
         append-to-body
@@ -345,6 +378,7 @@ import { getSelect, getLazyTree, getLazyList, getLazyTreeAll } from '@/api/base/
 import { getToken } from '@/utils/auth';
 import globalc from '@/api/basicdata/globalc';
 import { Base64 } from 'js-base64';
+import dayjs from 'dayjs';
 
 
 export default {
@@ -389,7 +423,7 @@ export default {
         {
           prop: 'clientTypeName',
           label: '客户类型',
-          type: 2,
+          type: 3,
           values: '',
           width: '150',
           checkarr: [],
@@ -400,7 +434,7 @@ export default {
         {
           prop: 'typeServiceName',
           label: '服务类型',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -598,7 +632,13 @@ export default {
           { required: true, message: '请上传合同文件', trigger: 'blur' }
         ]
       },
-      bianji: false
+      bianji: false,
+
+      openAcountStatus:false,//开通账号弹出框状态
+      openAcountform:{
+        name:"",
+        phone:""
+      }
     };
   },
   created() {
@@ -628,6 +668,70 @@ export default {
     }
   },
   methods: {
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr,type) {
+      // console.log(newarr,'+++++++++++')
+      if(type==1){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
+      }else if(type==2){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
+      }else if(type==3){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+      }
+
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log("123123123",index, row);
+      if(row.prop ==='clientTypeName'){
+        this.query['clientType'] = index;
+      }else{
+        this.query[row.prop] = index;
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+      if (!!index){
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] =  index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+      // console.log(index, row.prop);
+      this.query[row.prop] = index;
+      this.onLoad(this.page);
+    },
+
+
+
     handleCommand(command,row){
       console.log(command,row)
       switch (Number(command)) {
@@ -649,6 +753,9 @@ export default {
         case 6:
         this.handleMall(row)
           break;
+        case 7:
+        this.openAcount(row)
+          break;
       }
     },
     //远程校验
@@ -692,6 +799,26 @@ export default {
       console.log(val);
     },
 
+    /**
+     * 开通账号
+     */
+    openAcount(row) {
+
+
+      // this.openAcountform.name = row.linkman;
+      // this.openAcountform.phone = row.phone;
+      // this.openAcountStatus = true;
+
+      this.$router.push({
+        path: '/basicdata/brand/basicClientAccount',
+        query: {
+          id: row.id,
+          name: '商场 - ' + row.clientName
+        }
+      });
+
+    },
+
     //
     handleMall(row) {
       // console.log('>>>', row);
@@ -706,7 +833,6 @@ export default {
     },
     //打开文件
     downloadLink(row) {
-      console.log('>>>>>', row);
       window.open('http://192.168.10.100:8012/onlinePreview?url=' + encodeURIComponent(Base64.encode(row.leaseAccessories)));
     },
     //控制控货
@@ -800,6 +926,11 @@ export default {
       getDictionaryBiz('client_type').then(res => {
         // console.log("字典》》》",res);
         this.clientType = res.data.data;
+        this.$functions.checkcColumnList("clientTypeName", this.columnList).checkarr=res.data.data.map(item=>{
+          item.value=item.dictKey
+          item.label=item.dictValue
+          return item
+        });
       });
       //字典
       getDictionaryBiz('basic_freight_type').then(res => {

src/views/basicdata/brand/basicClientAccount.vue

@@ -0,0 +1,458 @@
+<template>
+    <basic-container>
+      <div class="avue-crud">
+        <el-row   v-if="!search" style="padding:6px 18px">
+          <!-- 查询模块 -->
+          <el-form :inline="true" :model="query">
+            
+            <el-form-item label="账号:">
+              <el-input v-model="query.account" placeholder="请输入账号"></el-input>
+            </el-form-item>
+  <!--          <el-form-item label="状态:">-->
+  <!--            <el-input v-model="query.condition" placeholder="请输入状态"></el-input>-->
+  <!--          </el-form-item>-->
+            <!-- 查询按钮 -->
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+              <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+            </el-form-item>
+          </el-form>
+        </el-row>
+        <el-row>
+          <div class="avue-crud__header">
+            <!-- 头部左侧按钮模块 -->
+            <div class="avue-crud__left">
+              <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
+              <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
+            </div>
+            <!-- 头部右侧按钮模块 -->
+            <div class="avue-crud__right">
+              <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+              <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+            </div>
+          </div>
+        </el-row>
+        <el-row>
+          <!-- 列表模块 -->
+          <tablecmt
+            :columnList="columnList"
+            :tableData="data"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+          >
+            <template #default="slotProps">
+              
+              <!-- <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)">查看</el-text> -->
+                <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
+            </template>
+          </tablecmt>
+          
+        </el-row>
+        <el-row>
+          <div class="avue-crud__pagination" style="width:100%">
+            <!-- 分页模块 -->
+            <el-pagination align="right"
+                           background
+                           @size-change="sizeChange"
+                           @current-change="currentChange"
+                           :current-page="page.currentPage"
+                           :page-sizes="[30, 50,80, 120]"
+                           :page-size="page.pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="page.total">
+            </el-pagination>
+          </div>
+        </el-row>
+  
+
+  
+        <el-dialog title="创建账号" v-model="openAcountStatus">
+
+           <el-form :disabled="view" ref="openAcountorm" :model="openAcountform" :rules="openAcountrules" label-width="120px">
+
+          <el-form-item label="姓名" prop="openAcountform.name" >
+            <el-input v-model="openAcountform.name" placeholder="请输入联系人" maxlength="20" style="width: 100%" />
+          </el-form-item>
+
+          <el-form-item label="账号" prop="openAcountform.phone" >
+            <el-input v-model="openAcountform.phone" placeholder="请输入电话" type="number" maxlength="11" style="width: 100%" />
+          </el-form-item>
+          <el-form-item label="密码" >
+            <span style="color: red;">默认系统初始化密码</span>
+          </el-form-item>
+          </el-form>
+
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('openAcountorm')">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="openAcountStatus = false">取 消</el-button>
+          </span>
+        </template>
+
+      </el-dialog>
+
+
+      </div>
+    </basic-container>
+  </template>
+  
+  <script>
+  import { getList,add } from "@/api/basicdata/basicClientAccount";
+  import { mapGetters } from "vuex";
+  
+  export default {
+    
+    data () {
+      return {
+        columnList: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 55,
+            checkarr: [],
+            fixed: true,
+          },
+          {
+            prop: 'phone',
+            label: '账号',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'name',
+            label: '姓名',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+        
+         
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            hide: true,
+          },
+        ],
+        optionProps:{
+          value: 'id',
+          label: 'cName',
+          children: 'childrenList',    //子元素字段名
+          emitPath : false,
+          checkStrictly:true,
+          expandTrigger: 'hover'    //设置鼠标悬浮展开，如果点击展开的话，会出现点击父节点后选择器直接关闭，不能选择子节点了
+        },
+        cascaderKey : 1,//防止搜索选项清空数据后出现报错,在加载级联选择器数据的时候+1
+        height: 0,
+        // 弹框标题
+        title: '',
+        costCorrelationId: '',
+        // 是否展示弹框
+        box: false,
+        openAcountStatus:false,//开通账号弹出框状态
+      openAcountform:{
+        name:"",
+        phone:""
+      },
+        // 是否展示抽屉
+        drawer: false,
+        // 抽屉方向
+        direction: 'rtl',
+        // 是否显示查询
+        search: true,
+        // 加载中
+        loading: true,
+        // 是否为查看模式
+        view: false,
+        // 查询信息
+        query: {},
+        // 分页信息
+        page: {
+          currentPage: 1,
+          pageSize: 30,
+          total: 40
+        },
+        // 表单数据
+        form: {},
+        pan: false,
+        // 选择行
+        selectionList: [],
+        // 表单列表
+        data: [],
+        optioner:[],
+        optionsr:[],
+        optionser:[],
+        rules: {
+        //   province: [
+        //     { required: true, message: '请选择地址', trigger: 'blur' },
+        //     // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        //   ],
+        //   brand: [
+        //     { required: true, message: '请选择品牌', trigger: 'change' }
+        //   ],
+        //   freightMark : [
+        //     { required: true, message: '请选择费用类型', trigger: 'blur' }
+        //   ],
+        //   cost: [
+        //     { required: true, message: '请输入费用', trigger: 'blur' }
+        //   ],
+        //   warehousingTimeStatus: [
+        //     { required: true, message: '请选择时间段', trigger: 'change' }
+        //   ],
+        //   warehousingTimeCharge: [
+        //     { required: true, message: '请选择时间段费用', trigger: 'blur' }
+        //   ],
+        //   goalGranary: [
+        //     { required: true, message: '请选择末端仓', trigger: 'blur' }
+        //   ],
+        },
+      }
+    },
+    watch: {
+      
+    },
+    created() {
+       
+    },
+    mounted () {
+      this.init();
+  
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      ids () {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      //关闭浮层
+      hideCascaderInp(){
+        this.$refs.cascaderRef.value.togglePopperVisible(false)
+  
+      },
+      handleDrawerClose(){
+        this.costCorrelationId = '';
+        this.drawer = false;
+      },
+      handleDrawer(row) {
+        this.costCorrelationId = row.id;
+        this.drawer = true;
+      },
+      textWarebox(e,index) {
+        console.log(e,index)
+        this.costWraeList[index] = e;
+      },
+      textbox(e,index) {
+        console.log(e,index)
+        this.costList[index] = e;
+      },
+      handleCheckedCities(value) {
+        console.log(value);
+        if(value.length < 1){
+          this.costWraeList = [];
+        }
+          this.wareType.forEach(i =>{
+            if(value.includes(i.dictValue)){
+              // console.log(i);
+              i.pitch = true;
+              // this.$set(i,'pitch',false);
+              this.costWraeListName = value;
+            }else{
+              i.pitch = false;
+              this.costWraeList[i] = null;
+              i.remark = null;
+            }
+          });
+      },
+      handleCheckedCitiesChange(value) {
+    
+
+
+      },
+      remoteMethod(query){
+    
+      },
+      remoteMethodBin(query){
+   
+      },
+      init () {
+        this.height = this.setPx(document.body.clientHeight - 340);
+      },
+      searchHide () {
+        this.search = !this.search;
+      },
+      searchChange () {
+        this.onLoad(this.page);
+      },
+      searchReset () {
+        this.query = {};
+        this.page.currentPage = 1;
+        this.onLoad(this.page);
+      },
+     
+      handleSubmit (from) {
+        this.$refs[from].validate(async (valid) => {
+          if (valid) {
+            this.openAcountform.clientId=this.$route.query.id;
+            add(this.openAcountform).then(() => {
+              this.openAcountStatus = false;
+              this.onLoad(this.page);
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              });
+            });
+          }
+        })
+  
+      },
+      handleAdd () {
+
+        this.openAcountStatus = true;
+  
+      },
+      handleEdit (row) {
+       
+ 
+      },
+      handleView (row) {
+      
+  
+      },
+      handleDelete () {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.selectionClear();
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      rowDel (row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      beforeClose (done) {
+        done()
+        this.form = {};
+        this.view = false;
+      },
+      selectionChange (list) {
+        this.selectionList = list;
+      },
+      selectionClear () {
+        this.selectionList = [];
+      },
+      currentChange (currentPage) {
+        this.page.currentPage = currentPage;
+        this.onLoad(this.page);
+      },
+      sizeChange (pageSize) {
+        this.page.pageSize = pageSize;
+        this.onLoad(this.page);
+      },
+      onLoad (page, params = {}) {
+        this.loading = true;
+
+        this.query.clientId=  this.$route.query.id;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.clientType.forEach(it =>{
+            data.records.forEach(i =>{
+              if(parseInt( it.dictKey ) == parseInt(i.freightMark)){
+                i.freightMark = it.dictValue
+              }
+              if(i.freightMark == '-1'){
+                i.freightMark = '无'
+              }
+            })
+          })
+    
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+    };
+  </script>
+  <style>
+  .ca .el-radio__inner {
+    top: -18px;
+    left: -19px;
+    border-radius: 0;
+    border: 0;
+    width: 170px;
+    height: 34px;
+    background-color: transparent;
+    cursor: pointer;
+    box-sizing: border-box;
+    position: absolute;
+  }
+  
+  .ca .el-radio__input.is-checked .el-radio__inner {
+    background: transparent;
+  }
+  
+  </style>
+  

src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

@@ -31,6 +31,11 @@
                    plain
                    @click="handleEnable">启 用
         </el-button>
+        <el-button type="danger"
+                   icon="el-icon-delete"
+                   plain
+                   @click="downAllocation">一 键 下 架
+        </el-button>
 <!--        <el-button type="warning"-->
 <!--                   plain-->
 <!--                   icon="el-icon-download"-->
@@ -78,7 +83,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove,getPrintTemplate,shelf,disable,enable} from "@/api/basicdata/basicdataGoodsAllocation";
+  import {getList, getDetail, add, update, remove,getPrintTemplate,shelf,disable,enable,downAllocation} from "@/api/basicdata/basicdataGoodsAllocation";
   import option from "@/option/basicdata/basicdataGoodsAllocation";
   import {mapGetters} from "vuex";
   import {exportBlob} from "@/api/common";
@@ -88,6 +93,7 @@
   import NProgress from 'nprogress';
   import 'nprogress/nprogress.css';
   import {getLodop} from "@/utils/LodopFuncs";
+  import { addlayer } from '@/api/basicdata/basicdataGoodsShelf';
 
   export default {
     data() {
@@ -332,6 +338,28 @@
             this.$refs.crud.toggleSelection();
           });
       },
+      downAllocation() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择库位下架?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            downAllocation(this.ids).then((response) => {
+
+              this.onLoad(this.page);
+              this.$message({
+                type: "success",
+                message: response.data.msg
+              });
+            })
+          })
+
+      },
       //批量打印数据处理代码
       printTemplate() {
         let that=this;

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

@@ -124,26 +124,26 @@
             </el-col>
             <el-col :span="12" v-if="allocation">
               <el-form-item label="列 数:" prop="rowNum"  label-width="100px">
-                <el-input v-model="form.rowNum" placeholder="请输入货架层数"  style="width: 88%;"/>
+                <el-input v-model="form.rowNum" placeholder="请输入货架列数"  style="width: 88%;"/>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="allocation">
               <el-form-item label="层 数:" prop="storeyNum"  label-width="100px">
-                <el-input v-model="form.storeyNum" placeholder="请输入货架列数"  style="width: 88%;"/>
+                <el-input v-model="form.storeyNum" placeholder="请输入货架层数"  style="width: 88%;"/>
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="!allocation">
               <el-form-item label="货  区:" prop="goodsAreaId"  label-width="100px">
-                  <el-cascader :options="optioner"  style="width: 80%"  v-model="form.goodsAreaId"   placeholder="请选择货区" :show-all-levels="false"  clearable />
+<!--                  <el-cascader :options="optioner"  style="width: 80%"  v-model="form.goodsAreaId"   placeholder="请选择货区" :show-all-levels="false"  clearable />-->
 
-                  <!--                <el-select v-model="form.goodsAreaId" clearable  placeholder="请选择货区" style="width: 88%;">-->
+                                  <el-select v-model="form.goodsAreaId" clearable  placeholder="请选择货区" style="width: 88%;">
-<!--                  <el-option-->
+                  <el-option
-<!--                    v-for="item in optioner"-->
+                    v-for="item in areaoption"
-<!--                    :key="item.id"-->
+                    :key="item.id"
-<!--                    :label="item.headline"-->
+                    :label="item.headline"
-<!--                    :value="item.id">-->
+                    :value="item.id">
-<!--                  </el-option>-->
+                  </el-option>
-<!--                </el-select>-->
+                </el-select>
               </el-form-item>
             </el-col>
             <!--            <el-col :span="12">-->
@@ -219,7 +219,7 @@
           <template #footer>
           <span  class="dialog-footer">
             <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitAdd">增 加</el-button>
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitred">减 少</el-button>
+<!--            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitred">减 少</el-button>-->
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
           </template>
@@ -259,20 +259,25 @@
       <el-dialog
         title="二维码"
         :visible.sync="dialogVisible"
-        width="30%"
+        width="600px"
         v-model="dialogVisible">
         <div >
-          <div v-for="(item,index) in qrCodeObj">
+          <!--        <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
-            <el-row>
+          <!--          <el-divider></el-divider>-->
-              <el-col :span="24" >
+
-                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+          <!--          <el-row>-->
-              </el-col>
+          <!--            <el-col :span="24" >-->
-            </el-row>
+          <!--              <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>-->
-          </div>
+          <!--            </el-col>-->
+          <!--          </el-row>-->
+          <!--        </div>-->
+          <!--startprint1-->
+          <div v-html="html"></div>
+          <!--endprint1-->
         </div>
         <span slot="footer" class="dialog-footer">
 <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-         <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
           <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
           <el-button @click="dialogVisible = false">取 消</el-button>
         </span>
@@ -293,13 +298,13 @@
                    @size-change="allsizeChange"
                    @on-load="allonLoad">
 
-<!--          <template #menu-left>-->
+          <template #menu-left>
-<!--            <el-button type="warning"-->
+            <el-button type="warning"
-<!--                       plain-->
+                       plain
-<!--                       icon="el-icon-camera"-->
+                       icon="el-icon-camera"
-<!--                       @click="handleqr">查看二维码-->
+                       @click="handleqr">查看二维码
-<!--            </el-button>-->
+            </el-button>
-<!--          </template>-->
+          </template>
           <template #menu="{size,row,index}">
             <el-button type="primary" text icon="el-icon-view"  v-if="row.enableStatus ==1" @click="losses(row,2)">禁 用</el-button>
 <!--            <el-button type="primary" text icon="el-icon-view"  v-if="row.allocationStatus !=='1'" @click="Offshelf(row)">一 键 下 架</el-button>-->
@@ -314,11 +319,11 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,getPrintTemplate,addAllocation,disable,enable,addlayer } from "@/api/basicdata/basicdataGoodsShelf";
+import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,addAllocation,disable,enable,addlayer, } from "@/api/basicdata/basicdataGoodsShelf";
-import {getList as allgetList,update as allupdate} from "@/api/basicdata/basicdataGoodsAllocation";
+import {getList as allgetList,update as allupdate,getPrintTemplate} from "@/api/basicdata/basicdataGoodsAllocation";
 import option from "@/option/basicdata/basicdataGoodsShelf";
 import { mapGetters } from "vuex";
-import {  getGoodsAreaNodeList } from '@/api/basicdata/basicdataGoodsArea';
+import {  getGoodsAreaNodeList,getGoodsAreaoptionList } from '@/api/basicdata/basicdataGoodsArea';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getTemplateData} from '@/api/basic/basicPrintTemplate'
 import { getLodop } from '@/utils/LodopFuncs.js'
@@ -373,7 +378,7 @@ export default {
           head: false,
         },
         {
-          prop: 'warehouseId',
+          prop: 'warehouseCode',
           label: '仓库编号',
           type: 2,
           values: '',
@@ -483,6 +488,7 @@ export default {
       selectionList: [],
       //货位 选择行
       allselectionList: [],
+      html: null, // 页面包条码内容
       alloption: {
         height:'auto',
         calcHeight: 30,
@@ -492,7 +498,7 @@ export default {
         border: true,
         index: true,
         viewBtn: true,
-        selection: false,
+        selection: true,
         editBtn:false,
         delBtn:false,
         addBtn:false,
@@ -681,6 +687,8 @@ export default {
       goodsAreaList: [],
       //级联选择器列表数据
       optioner: [],
+      //不需要级联,直接选择货区
+      areaoption:[],
       dialogVisible:false,
       //二维码展示列表
       qrCodeObj:[],
@@ -757,12 +765,40 @@ export default {
         const data = this.formatCascaderData(res.data.data);
         this.optioner = data
       })
+      getGoodsAreaoptionList().then(res=>{
+        const data = res.data.data;
+        this.areaoption = data
+      })
       getTemplateData("9").then(res=>{
         console.log(res.data.data);
         let data = res.data.data
         this.templateData = data;
       })
     },
+    handleqr(){
+      if (this.allselectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+
+      let checkcode=[]
+      this.allselectionList.map(item=>{
+        checkcode.push(item.id)
+        // checkcode.push(item.orderPackageCode)
+      })
+
+      let qr=checkcode.join(',');
+      console.log(qr);
+      getPrintTemplate(qr).then(res => {
+        // this.orderPackageCode = res.data
+        console.log(res.data);
+        this.html=''
+        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+
+      });
+      this.dialogVisible = true;
+
+    },
     // 格式化数据，递归将空的children置为undefined
     formatCascaderData(data){
       console.log("------------>",data);
@@ -1076,45 +1112,45 @@ export default {
         });
     },
     //结合模板生成二维码
-    viewQrCode(){
+    // viewQrCode(){
-      if (this.selectionList.length === 0) {
+    //   if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+    //     this.$message.warning("请选择至少一条数据");
-        return;
+    //     return;
-      }
+    //   }
-      let idInfo =this.ids.split(",");
+    //   let idInfo =this.ids.split(",");
-      this.dialogVisible = true;
+    //   this.dialogVisible = true;
-      this.qrCodeObj = [];
+    //   this.qrCodeObj = [];
-      console.log(">>>>>>>>>>>",this.selectionList);
+    //   console.log(">>>>>>>>>>>",this.selectionList);
-      this.selectionList.forEach((item,index)=>{
+    //   this.selectionList.forEach((item,index)=>{
-        idInfo.forEach(async id=>{
+    //     idInfo.forEach(async id=>{
-          if (id===item.id){
+    //       if (id===item.id){
-            let params = {};
+    //         let params = {};
-            if (item.qrCode){
+    //         if (item.qrCode){
-              getShowTemplate(Object.assign(params,item)).then(res=>{
+    //           getShowTemplate(Object.assign(params,item)).then(res=>{
-                console.log("@@@@@@@@@@@@@",res.data);
+    //             console.log("@@@@@@@@@@@@@",res.data);
-                let url = window.URL.createObjectURL(res.data);
+    //             let url = window.URL.createObjectURL(res.data);
-                // 获取返回参数中的需要的值data
+    //             // 获取返回参数中的需要的值data
-                console.log("@@@@@@@@@@@@@",url);
+    //             console.log("@@@@@@@@@@@@@",url);
-
+    //
-                this.qrCodeObj.push(url);
+    //             this.qrCodeObj.push(url);
-              })
+    //           })
-            }else {
+    //         }else {
-              console.log("参数异常:"+item.qrCode);
+    //           console.log("参数异常:"+item.qrCode);
-              this.$message({
+    //           this.$message({
-                type: "error",
+    //             type: "error",
-                message: "参数异常!"+item.qrCode
+    //             message: "参数异常!"+item.qrCode
-              });
+    //           });
-            }
+    //         }
-          }
+    //       }
-        })
+    //     })
-
+    //
-      })
+    //   })
-    },
+    // },
     printTemplate(){
       let LODOP = getLodop();
       console.log("this.ids>>>>>",this.ids);
-      console.log("this.ids>>>>>",this.selectionList);
+      console.log("this.ids>>>>>",this.allselectionList);
-      if (this.selectionList.length === 0){
+      if (this.allselectionList.length === 0){
         this.$message.warning("请选择至少一条数据");
         return;
       }

src/views/basicdata/warehouse/tray/basicdataTray.vue

@@ -36,12 +36,32 @@
                    icon="el-icon-camera"
                    @click="handleqr">查看二维码
         </el-button>
+        <el-button type="warning"
+                   plain
+                   icon="el-icon-camera"
+                   @click="lossess">报 损
+        </el-button>
+        <el-button type="warning"
+                   plain
+                   icon="el-icon-camera"
+                   @click="disable">禁 用
+        </el-button>
+        <el-button type="warning"
+                   plain
+                   icon="el-icon-camera"
+                   @click="addable">启 用
+        </el-button>
+        <el-button type="warning"
+                   plain
+                   icon="el-icon-camera"
+                   @click="vacants">一 键 空 置
+        </el-button>
       </template>
       <template #menu="{size,row,index}">
-        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="losses(row)">报  损</el-button>
+<!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="losses(row)">报  损</el-button>-->
-        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1 && row.trayStatus !=='1' " @click="vacant(row)">一 键 空 置</el-button>
+<!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1 && row.trayStatus !=='1' " @click="vacant(row)">一 键 空 置</el-button>-->
-        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1" @click="disable(row)">禁 用</el-button>
+<!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==1" @click="disable(row)">禁 用</el-button>-->
-        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==2" @click="addable(row)">启 用</el-button>
+<!--        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3' && row.disableType==2" @click="addable(row)">启 用</el-button>-->
         <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="Details(row)">在 托 详 情</el-button>
         <el-button type="primary" text icon="el-icon-view" @click="historys(row)">历 史 记 录</el-button>
       </template>
@@ -93,7 +113,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove,vacant,getPrintTemplate} from "@/api/basicdata/basicdataTray";
+  import {getList, getDetail, add, update, remove,vacant,getPrintTemplate,disable,addable,vacants} from "@/api/basicdata/basicdataTray";
   import option from "@/option/basicdata/basicdataTray";
   import {mapGetters} from "vuex";
   import {exportBlob} from "@/api/common";
@@ -232,6 +252,19 @@
         this.damagedform = row
         this.damagedBox = true
       },
+      lossess(){
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择一条数据");
+          return;
+        }
+        if (this.selectionList.length > 1) {
+          this.$message.warning("只能选一条数据");
+          return;
+        }
+        console.log("this.selectionList>>>>>>",this.selectionList);
+         this.damagedform.id = this.selectionList[0].id
+         this.damagedBox = true
+      },
       vacant(row){
         this.$confirm('确认空置？')
           .then(_ => {
@@ -250,44 +283,71 @@
           .catch(_ => {
           });
       },
-      disable(row){
+      vacants(){
-        this.$confirm('确认禁用？')
+        if (this.selectionList.length === 0) {
-          .then(_ => {
+          this.$message.warning("请选择至少一条数据");
-            row.disableType =2
+          return;
-            update(row).then(() => {
+        }
-              this.onLoad(this.page);
+        this.$confirm("确定将选择数据空置?", {
-              this.$message({
+          confirmButtonText: "确定",
-                type: "success",
+          cancelButtonText: "取消",
-                message: "操作成功!"
+          type: "warning"
-              });
+        }) .then(() => {
-            }, error => {
+            console.log("this.selectionList>>>>>>>>>>>>>>>>>>",this.selectionList);
-              loading();
+            const newList = this.selectionList.map(item => item.palletCode);
-              console.log(error);
+            return vacants(newList);
-            });
           })
-          .catch(_ => {
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
           });
       },
-      addable(row){
+      disable(){
-        this.$confirm('确认启用？')
+        if (this.selectionList.length === 0) {
-          .then(_ => {
+          this.$message.warning("请选择至少一条数据");
-            row.disableType =1
+          return;
-            update(row).then(() => {
+        }
-              this.onLoad(this.page);
+        this.$confirm("确定将选择数据禁用?", {
-              this.$message({
+          confirmButtonText: "确定",
-                type: "success",
+          cancelButtonText: "取消",
-                message: "操作成功!"
+          type: "warning"
-              });
+        })
-            }, error => {
+          .then(() => {
-              loading();
+            return disable(this.ids);
-              console.log(error);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
             });
+          });
+      },
+      addable(){
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据启用?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return addable(this.ids);
           })
-          .catch(_ => {
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
           });
       },
       //批量打印数据处理代码
-      //批量打印数据处理代码
       printTemplate() {
         let that=this;
         this.selectionList.map(item=>{

src/views/basicdata/warehouse/tray/basicdataTrayedt.vue

@@ -279,6 +279,18 @@ export default {
         border: true,
         selection: true,
         column: [
+          {
+            label: "服务号",
+            prop: "serviceNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "运单号",
+            prop: "waybillNumber",
+            search: true,
+            width:"100px"
+          },
           {
             label: "包条码",
             prop: "orderPackageCode",
@@ -328,11 +340,42 @@ export default {
             width:"100px"
           },
           {
-            label: "运单号",
+            label: "包件状态",
-            prop: "waybillNumber",
+            prop: "orderPackageStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件冻结状态",
+            prop: "orderPackageFreezeStatusName",
             search: true,
             width:"100px"
           },
+          {
+            label: "包件上架状态",
+            prop: "orderPackageGroundingStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件备货状态",
+            prop: "orderPackageStockupStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件预约状态",
+            prop: "orderPackageReservationStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件装车状态",
+            prop: "orderPackageLoadingStatusName",
+            search: true,
+            width:"100px"
+          },
+
           // {
           //   label: "托盘码",
           //   prop: "pallet",

src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue

@@ -299,6 +299,18 @@ export default {
         border: true,
         selection: true,
         column: [
+          {
+            label: "服务号",
+            prop: "serviceNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "运单号",
+            prop: "waybillNumber",
+            search: true,
+            width:"100px"
+          },
           {
             label: "包条码",
             prop: "orderPackageCode",
@@ -348,8 +360,38 @@ export default {
             width:"100px"
           },
           {
-            label: "运单号",
+            label: "包件状态",
-            prop: "waybillNumber",
+            prop: "orderPackageStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件冻结状态",
+            prop: "orderPackageFreezeStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件上架状态",
+            prop: "orderPackageGroundingStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件备货状态",
+            prop: "orderPackageStockupStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件预约状态",
+            prop: "orderPackageReservationStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件装车状态",
+            prop: "orderPackageLoadingStatusName",
             search: true,
             width:"100px"
           },

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -6,10 +6,10 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" clearable  ></el-input>
           </el-form-item>
           <el-form-item label="运单">
-            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" clearable />
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -726,8 +726,11 @@ export default {
     '$route.query.id': {
       handler(newVal, oldVal) {
         // console.log(newVal, oldVal);
-        this.onLoad(this.page);
+        if(!!this.$route.query.id){
-        this.onLoadOwn(this.page);
+          this.onLoad(this.page);
+          this.onLoadOwn(this.page);
+        }
+
       },
       deep: true,
       immediate: true,
@@ -1367,20 +1370,23 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      this.query.id = this.$route.query.id;
+      console.log("执行了查询零零零零");
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      this.query.ids = this.$route.query.id;
+      getDetail(this.$route.query.id).then(res => {
+        console.log("返回的数据》》》》",res.data.data);
         const data = res.data.data;
         // this.page.total = data.total;
-        this.data = data.records;
+        this.data[0]= data;
+
         this.loading = false;
         this.selectionClear();
       });
     },
     onLoadOwn(page, params = {}) {
-      this.loading = true;
+      // this.loading = true;
       this.dataMaterial = false;
       params = {
-        stockArticleId: this.$route.query.id,
+        stockArticleIds: this.$route.query.id,
       };
       getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.queryPage)).then(
         res => {

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -1488,7 +1488,7 @@ export default {
           fixed: false,
           sortable: true,
           head: false,
-          lessThanNum:'available' 
+          lessThanNum:'available'
         },
         {
           prop: '',
@@ -1505,12 +1505,14 @@ export default {
   },
   mounted() {
     this.init();
-    
+
     if (this.$route.query.type == '2') {
       //查询提货编辑数据
       this.getDetailOen();
-    } else {
+    } else if (this.$route.query.type == '1'){
       this.onLoad(this.page);
+    }else if (this.$route.query.type == '3'){
+      this.onLoadCj();
     }
     /**
      * 初始化获取本地缓存的编辑隐藏的列表
@@ -1595,9 +1597,10 @@ export default {
         if (this.$route.query.type == '2') {
           //查询提货编辑数据
           this.getDetailOen();
-        } else {
+        } else if (this.$route.query.type == '1'){
           this.onLoad(this.page);
-          // this.onLoadOwn(this.page);
+        }else if (this.$route.query.type == '3'){
+          this.onLoadCj();
         }
       },
       deep: true,
@@ -1848,6 +1851,10 @@ export default {
     },
     //确定
     callFordelivery(inde) {
+      if(this.selectionListStock.length === 0){
+        this.$message.warning("至少选择一条数据！");
+        return ;
+      }
       let isa = false;
       console.log('执行了');
       this.selectionListStock.some(i => {
@@ -2312,7 +2319,7 @@ export default {
       }
     },
     selectionChangeStock(list) {
-      console.log('执行了啦啦啦', list);
+      // console.log('执行了啦啦啦', list);
       this.selectionListStock = list;
     },
     selectionClear() {
@@ -2338,7 +2345,7 @@ export default {
 
     onLoad(page, params = {}) {
       this.loading = true;
-      params.id = this.$route.query.id;
+      params.ids = this.$route.query.id;
       this.orderAdd = false;
       getListOne(page.currentPage, page.pageSize, params).then(res => {
         const data = res.data.data;
@@ -2348,24 +2355,48 @@ export default {
         this.selectionClear();
       });
     },
+    /**
+     * 创建自提
+     * @param page
+     * @param params
+     */
+    onLoadCj(page, params = {}) {
+      this.orderAdd = true;
+    },
     //库存品
     onLoadList(page, params = {}) {
       this.loading = true;
-      getListStockList(page.currentPage, page.pageSize, params).then(res => {
+      let a = {};
-        const dataOwn = res.data.data;
+      if(this.$route.query.type == '1'){
-        this.pageStock.total = dataOwn.total;
+        a = this.dataList[0];
-        this.dataOwn = dataOwn.records;
+        // console.log("11111111111111");
-        this.dataOwn.forEach(i => {
+      }else if(this.$route.query.type == '3'){
-          i.available = i.quantityStock - i.quantityOccupied;
+        a = this.dataOrder[0];
+        // console.log("2222222222222");
+      }
+      // let a = this.dataList[0];
+      console.log("aaa",a);
+      if(!!a.mallId){
+        params.marketId = a.mallId;
+        getListStockList(page.currentPage, page.pageSize, params).then(res => {
+          const dataOwn = res.data.data;
+          this.pageStock.total = dataOwn.total;
+          this.dataOwn = dataOwn.records;
+          this.dataOwn.forEach(i => {
+            i.available = i.quantityStock - i.quantityOccupied;
+          });
+          this.loading = false;
+          this.selectionClear();
         });
+      }else{
         this.loading = false;
-        this.selectionClear();
+        this.pageStock.total =0;
-      });
+      }
     },
     //包件信息
     onLoadOwn(page, params = {}) {
       this.loading = true;
-      this.query.stockArticleId = this.$route.query.id;
+      this.query.stockArticleIds = this.$route.query.id;
       getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         console.log('包件信息>>>>', res.data.data);
         const dataList = res.data.data;

src/views/distribution/inventory/distrilbutionBillLadingList.vue

@@ -78,7 +78,7 @@
           <div class="avue-crud__left">
            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-<!--            <el-button type="primary" icon="el-icon-plus" @click="handleBillAdd">创建自提</el-button>-->
+            <el-button type="primary" icon="el-icon-plus" @click="handleBillAdd">创建自提</el-button>
             <el-button type="primary" icon="el-icon-plus" @click="handleSign(null,2)">自提签收</el-button>
 
           </div>
@@ -105,8 +105,8 @@
           <template #default="slotProps">
 <!--            <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
             <el-text size="small" text @click="handleLike(slotProps.scope)">查看</el-text>
-            <el-text size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 20">签收</el-text>
+            <el-text size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 30">签收</el-text>
-            <el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)">编辑提货信息</el-text>
+            <el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)" v-if="slotProps.scope.row.conditions < 20">编辑提货信息</el-text>
 <!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
 
           </template>
@@ -856,7 +856,7 @@ export default {
         for(let a = 0;a < clientType.length;a++){
           // console.log("进来了",clientType[a].dictKey , costListName[i]);
           if(clientType[a].dictKey == costListName[i]){
-            console.log("进来了",clientType[a].dictKey , costListName[i]);
+            // console.log("进来了",clientType[a].dictKey , costListName[i]);
             let zhi = costList[costListName[i]];
             if(!zhi){
               this.pan = true;
@@ -908,7 +908,7 @@ export default {
       this.$router.push({
         path: '/distribution/inventory/distrilbutionBillLading',
         query:{
-          type: '1'
+          type: '3'
         }
       });
     },

src/views/distribution/inventory/distrilbutionBillLadingView.vue

@@ -153,6 +153,49 @@ export default {
       columnListarrs:{
         //入库明细
       ordoption:[
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '客户车次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'sendWarehouseName',
+          label: '始发仓',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'orderCode',
           label: '订单自编号',
@@ -164,6 +207,7 @@ export default {
           sortable: true,
           head: false,
         },
+
         {
           prop: 'descriptionGoods',
           label: '货物名称',
@@ -352,6 +396,49 @@ export default {
         //   checkarr: [],
         //   fixed: true,
         // },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '客户车次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'orderPackageCode',
           label: '包条码',

src/views/distribution/reservation/atlas.vue

@@ -122,11 +122,11 @@ export default {
       geocoder.getLocation(item.deliveryAddress, (status, result) => {
         if (status === 'complete' && result.info === 'OK') {
           // result中对应详细地理坐标信息
-          console.log(result.geocodes);
+          console.log(result.geocodes[0].location);
           var marker = new AMap.Marker({
             map: details.mapLoc,
-            position: item.pontion,
+            position: result.geocodes[0].location,
-            offset: new AMap.Pixel(-13, -30),
+            offset: new AMap.Pixel(0, 0),
           });
           marker.setMap(details.mapLoc);
           marker.setLabel({

src/views/distribution/reservation/atlas1.vue

@@ -9,7 +9,9 @@
           <el-scrollbar>
             <div class="mbx">
               <el-text v-for="item in datalists" class="mx-1 txbx" type="primary"
-                >{{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里</el-text
+                >
+                {{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里({{item.items.handQuantity}}件)
+                </el-text
               >
             </div>
           </el-scrollbar>
@@ -109,7 +111,7 @@ function init(data) {
         details.mapLoc.setCenter([result.geocodes[0].location.lng, result.geocodes[0].location.lat])
         geocodess.push({
           pontion: result.geocodes[0].location,
-          content: item.customerName + '--' + item.customerAddress + '--' + item.customerTelephone,
+          content: item.customerName + '--' + item.customerAddress+'' + '--' + item.customerTelephone,
           items: item,
         });
         if (index + 1 == data.length) {
@@ -132,7 +134,7 @@ function maker(geocodess) {
     });
     marker.setMap(details.mapLoc);
     marker.setLabel({
-      offset: new AMap.Pixel(0, -30), //设置文本标注偏移量
+      offset: new AMap.Pixel(0, -5), //设置文本标注偏移量
       content: `<div class='info'>${item.content}</div>`, //设置文本标注内容
       direction: 'top', //设置文本标注方位
     });
@@ -156,6 +158,7 @@ function Driving(geocodess) {
           // console.log(result.routes[0]);
           item.time=formatSeconds(result.routes[0].time)
           item.distance=result.routes[0].distance/1000
+          // item.distance=result.routes[0].distance/1000
           details.datalists.push(item)
         } else {
           console.log('获取驾车数据失败：'+ result)
@@ -205,6 +208,8 @@ const { datalists } = toRefs(details);
     .mbx {
       display: flex;
       flex-direction: column;
+      align-items: flex-start;
+
     }
   }
 }
@@ -214,5 +219,6 @@ const { datalists } = toRefs(details);
 .txbx {
   padding: 5px 0px;
   box-sizing: border-box;
+  width: 100%;
 }
 </style>

src/views/distribution/reservation/reservationSubmitFrom.vue

@@ -117,15 +117,15 @@
                             <el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
                         </el-form-item>
                     </el-col>
-<!--                    <el-col :span="10">-->
+                    <el-col :span="10">
-<!--                        <el-form-item label="服务类型:" prop="serveType" label-width="120px">-->
+                        <el-form-item label="服务类型:" prop="serveType" label-width="120px">
-<!--                            <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
+                            <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
-<!--                                <el-checkbox :label="item.dictKey"-->
+                                <el-checkbox :label="item.dictKey"
-<!--                                             :value="item.dictKey">{{item.dictValue}}&emsp;-->
+                                             :value="item.dictKey">{{item.dictValue}}&emsp;
-<!--                                </el-checkbox>-->
+                                </el-checkbox>
-<!--                            </el-checkbox-group>-->
+                            </el-checkbox-group>
-<!--                        </el-form-item>-->
+                        </el-form-item>
-<!--                    </el-col>-->
+                    </el-col>
 
 
                     <el-col :span="10">
@@ -318,19 +318,19 @@
                 <!--                :before-close="handleClose"-->
                 <el-form :inline="true" :model="query">
                     <el-form-item label="商场名称:">
-                        <el-input v-model="query.marketName" placeholder="请输入服务类型"></el-input>
+                        <el-input v-model="query.marketName" placeholder="请输入商场名称"></el-input>
                     </el-form-item>
                     <el-form-item label="物料名称:">
-                        <el-input v-model="query.descriptionGoods" placeholder="请输入服务类型"></el-input>
+                        <el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>
                     </el-form-item>
                     <el-form-item label="商场编码:">
-                        <el-input v-model="query.marketCode" placeholder="请输入服务类型"></el-input>
+                        <el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>
                     </el-form-item>
                     <el-form-item label="订单自编号:">
-                        <el-input v-model="query.orderCode" placeholder="请输入服务类型"></el-input>
+                        <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
                     </el-form-item>
                     <el-form-item label="品牌:">
-                        <el-input v-model="query.brand" placeholder="请输入服务类型"></el-input>
+                        <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
                     </el-form-item>
                     <!-- 查询按钮 -->
                     <el-form-item>
@@ -500,6 +500,7 @@
   import option from '@/option/distribution/distributionStockArticle';
   import { mapGetters } from 'vuex';
   import { getDictionaryBiz } from '@/api/system/dict';
+  import dayjs from 'dayjs';
 
   export default {
     data() {
@@ -1322,6 +1323,53 @@
         this.page.pageSize = pageSize;
         this.onLoad(this.page);
       },
+      // inputscStockArtic(index, row) {
+      //   console.log(index, row);
+      //   this.query[row.prop] = index;
+      //   this.onLoadOrder(this.page);
+      // },
+      // timescStockArtic(index, row) {
+      //   console.log(index, row);
+      //   if (!!index){
+      //     index = dayjs(index).format('YYYY-MM-DD');
+      //   }
+      //   this.query[row.prop] =  index
+      //   if (!index){
+      //     delete this.query[row.prop]
+      //   }
+      //   this.onLoadOrder(this.page);
+      // },
+      // btnscStockArtic(index, row) {
+      //   console.log(index, row);
+      //   this.onLoad(this.page);
+      // },
+      // selectscStockArtic(index, row) {
+      //   console.log(index, row);
+      //   if(row.prop ==='reservationStatusName'){
+      //     this.query['reservationStatus'] = index;
+      //   }else if(row.prop ==='freezeStatusName'){
+      //     this.query['freezeStatus'] = index;
+      //   }else if(row.prop ==='completeSetName'){
+      //     this.query['completeSet'] = index;
+      //   }
+      //     // else if(row.prop ==='groundingStatusName'){
+      //     //   this.query['groundingStatus'] = index;
+      //     // }else if(row.prop ==='stockupStatusName'){
+      //     //   this.query['stockupStatus'] = index;
+      //     // }else if(row.prop ==='orderStatusName'){
+      //     //   this.query['orderStatus'] = index;
+      //     // }else if(row.prop ==='typeServerName'){
+      //     //   this.query['typeService'] = index;
+      //     // }
+      //     // else if(row.prop ==='orderReceiveStatusName'){
+      //     //   this.query['orderReceiveStatus'] = index;
+      //   // }
+      //
+      //   else{
+      //     this.query[row.prop] = index;
+      //   }
+      //   this.onLoadOrder(this.page);
+      // },
       onLoadOrder(page, params = {}) {
         this.query.typeService = 2;
         this.query.genre = '1';

src/views/distribution/stockup/distributionStockup.vue

@@ -95,16 +95,16 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="装卸班组" :label-width="formLabelWidth">
+<!--          <el-form-item label="装卸班组" :label-width="formLabelWidth">-->
-            <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">
+<!--            <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">-->
-              <el-option
+<!--              <el-option-->
-                v-for="item in loaderData"
+<!--                v-for="item in loaderData"-->
-                :key="item.dictKey"
+<!--                :key="item.dictKey"-->
-                :label="item.dictValue"
+<!--                :label="item.dictValue"-->
-                :value="item.dictKey">
+<!--                :value="item.dictKey">-->
-              </el-option>
+<!--              </el-option>-->
-            </el-select>
+<!--            </el-select>-->
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
             <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
               <el-option
@@ -316,14 +316,14 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-            {
+            // {
-              label: '未指派',
+            //   label: '未指派',
-              value: '1',
+            //   value: '1',
-            },
+            // },
-            {
+            // {
-              label: '已指派',
+            //   label: '已指派',
-              value: '2',
+            //   value: '2',
-            },
+            // },
           ],
           fixed: false,
           sortable: true,
@@ -369,16 +369,16 @@ export default {
           fixed: false,
           sortable: true,
         },*/
-        {
+        // {
-          prop: 'loaderName',
+        //   prop: 'loaderName',
-          label: '装卸班组',
+        //   label: '装卸班组',
-          type: 2,
+        //   type: 2,
-          values: '',
+        //   values: '',
-          width: '150',
+        //   width: '150',
-          checkarr: [],
+        //   checkarr: [],
-          fixed: false,
+        //   fixed: false,
-          sortable: true,
+        //   sortable: true,
-        },
+        // },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',

src/views/distribution/stockup/distributionStockupDetails.vue

@@ -83,6 +83,8 @@
         >
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" v-if="!slotProps.scope.row.stockupStatus" @click="handleStockUp(slotProps.scope.row,'2')">备货</el-text>
+            <el-button type="primary" text icon="el-icon-view"  @click="handleQRCode(row)">查看包条码</el-button>
+
           </template>
         </tablecmt>
 
@@ -112,7 +114,8 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" v-if="!row.stockupStatus" @click="handleStockUp(slotProps.scope.row,'2')">备货</el-text>
+            <el-text type="primary" text icon="el-icon-view"  @click="handleDetail(slotProps.scope.row)">明细</el-text>
+
           </template>
         </tablecmt>
 
@@ -133,6 +136,36 @@
         </el-tabs>
 
       </el-row>
+      <el-dialog title="包条码" :visible.sync="dialogPack" width="780px" v-model="dialogPack">
+        <div >
+          <span>lmy 666</span>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="dialogPack = false">确 定</el-button>
+          <el-button @click="dialogPack = false">取 消</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
+        <div>
+          <div v-html="html"></div>
+
+          <!-- <div v-for="(item,index) in qrCodeObj">
+            <el-row>
+              <el-col :span="24" >
+                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+              </el-col>
+            </el-row>
+          </div> -->
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+        </span>
+      </el-dialog>
       <el-dialog v-model="dialogHand" title="系统备货">
         <el-form :model="form">
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
@@ -214,10 +247,16 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import { getParcelListOwn } from '@/api/distribution/distributionParcelList';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getStockDetail } from '@/api/distribution/distributionStock';
+import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
+import { getLodop } from '@/utils/LodopFuncs';
+import dayjs from 'dayjs';
 
 export default {
   data () {
     return {
+      dialogVisible:false,
+      dialogPack:false,
+      html:'',
       columnListarrs:{
       columnReservation:[
         {
@@ -663,6 +702,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '230',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+
       ],
       },
       height: 0,
@@ -770,6 +820,135 @@ export default {
     }
   },
   methods: {
+    //查看库存品明细
+    handleDetail(row){
+      console.log("row>><><><",row);
+      this.dialogPack = true;
+
+    },
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr,type) {
+      // console.log(newarr,'+++++++++++')
+      if(type==1){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
+      }else if(type==2){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
+      }else if(type==3){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+      }
+
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+      // if(row.prop =='typeServiceName'){
+      //   this.query['typeService'] = index;
+      // }else if(row.prop =='stockupStatusName'){
+      //   this.query["stockupStatus"] = index;
+      // }else if(row.prop =='assignStatusName'){
+      //   this.query["assignStatus"] = index;
+      // }else{
+      //   this.query[row.prop] = index;
+      // }
+      // // this.query[row.prop] = index;
+      // this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+      if (!!index){
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] =  index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+      /*      if(row.prop =='typeServiceName'){
+              this.query['typeService'] = index;
+            }else if(row.prop =='stockupStatusName'){
+              this.query["stockupStatus"] = index;
+            }else if(row.prop =='assignStatusName'){
+              this.query["assignStatus"] = index;
+            }else{
+             this.query[row.prop] = index;
+             }*/
+      this.query[row.prop] = index;
+
+      this.onLoad(this.page);
+    },
+    //打印
+    printTemplate() {
+      let LODOP = getLodop();
+      console.log("LODOP>>>>>",LODOP);
+      // console.log("this.ids>>>>>",this.selectionList);
+      // if (this.selectionList.length === 0){
+      //   this.$message.warning("请选择至少一条数据");
+      //   return;
+      // }
+      getStockTemplate({ id: this.materialQRCode.id }).then(res => {
+        console.log('返回的数据', res.data.data);
+        let templateData = res.data.data;
+        // let templateData = "res.data.data";
+        // console.log(templateData);
+        LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
+        LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
+        LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开
+        // // 设置打印整宽且不变形
+        LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
+        // // 设置打印后自动关闭
+        LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
+        // // data就是一段html文本
+        LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
+        // LODOP.PREVIEW(); //预览(预览打印无脚标)
+        LODOP.PRINT(); //直接打印
+
+      });
+    },
+    //查看包条码
+    handleQRCode(row) {
+      // this.title = '查看'
+      // this.view = true;
+      // this.box = true;
+      this.materialQRCode = row;
+
+      let qr = {
+        ids: row.id,
+      };
+      showOrderPackgeCode(qr).then(res => {
+        // this.orderPackageCode = res.data
+        console.log(res.data);
+        this.html=''
+        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+
+      });
+
+      this.dialogVisible = true;
+    },
     //系统备货确定
     callFordelivery(){
       let c = false;
@@ -1129,16 +1308,19 @@ export default {
    async getStockUpParcelsList(page){
       let a = await getParcelListOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
      console.log("包件...",a.data);
-      const data = a.data.data;
+     const data = a.data.data;
-      this.data1 = data.records;
+     this.data1 = data.records;
-      this.data1.forEach(i =>{
+     if(this.data1.length > 0){
-        if(!i.stockupStatus){
+       this.data1.forEach(i =>{
-          i.stockupStatusName = "待备货";
+         if(!i.stockupStatus){
-          this.isStockUp = true;
+           i.stockupStatusName = "待备货";
-        }else{
+           this.isStockUp = true;
-          i.stockupStatusName = "已备货";
+         }else{
-        }
+           i.stockupStatusName = "已备货";
-      })
+         }
+       })
+     }
+
      this.page1.total = a.data.data.total;
      this.loading = false;
      this.selectionClear();

src/views/distribution/stockup/distributionStockupDetailsSelf.vue

@@ -225,6 +225,7 @@
               <el-table-column prop="menu" label="操作" :width="220" align="center">
                 <template #="{ row }">
                   <el-button type="primary" text icon="el-icon-view" v-if=" row.stockupStatusName== '待备货' " @click="handleStockUp(row,'2')">备货</el-button>
+                  <el-button type="primary" text icon="el-icon-view"  @click="handleQRCode(row)">查看包条码</el-button>
                   <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
                   <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
                   <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
@@ -248,6 +249,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="库存品" name="enter">
+            <el-button type="primary" text icon="el-icon-view" >批量打印</el-button>
             <el-table
               ref="table"
               v-loading="loading"
@@ -278,6 +280,14 @@
                 </el-table-column>
               </template>
               <!-- 操作栏模块 -->
+              <el-table-column prop="menu" label="操作" :width="220" align="center">
+                <template #="{ row }">
+                  <el-button type="primary" text icon="el-icon-view" v-if=" row.stockupStatusName== '已备货' "  @click="onDetail(row)">明细</el-button>
+                  <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
+                  <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
+                  <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
+                </template>
+              </el-table-column>
             </el-table>
             <div class="avue-crud__pagination" style="width: 100%">
               <!-- 分页模块 -->
@@ -312,6 +322,36 @@
           </el-pagination>
         </div>
       </el-row>-->
+      <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
+        <div>
+          <div v-html="html"></div>
+
+          <!-- <div v-for="(item,index) in qrCodeObj">
+            <el-row>
+              <el-col :span="24" >
+                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+              </el-col>
+            </el-row>
+          </div> -->
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          <el-button @click="dialogVisible = false">取 消</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog title="包条码" :visible.sync="dialogPack" width="780px" v-model="dialogPack">
+        <div >
+          <span>lmy 666</span>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <el-button type="primary" @click="printTemplate">打 印</el-button>
+          <el-button type="primary" @click="dialogPack = false">确 定</el-button>
+          <el-button @click="dialogPack = false">取 消</el-button>
+        </span>
+      </el-dialog>
       <el-dialog v-model="dialogHand" title="系统备货">
         <el-form :model="form">
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
@@ -379,12 +419,18 @@ import option from '@/option/distribution/distributionStockup';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getParcelListOwn, getParcelListOwnSelf } from '@/api/distribution/distributionParcelList';
+import { getDisStockList } from '@/api/distribution/disStockListDetail'
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getStockDetail } from '@/api/distribution/distributionStock';
+import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
+import { getLodop } from '@/utils/LodopFuncs';
 
 export default {
   data() {
     return {
+      html: null, // 页面包条码内容
+      dialogVisible: false, //二维码控制
+      dialogPack: false, //包件控制
       height: 0,
       activeName: 'reservation',
       // 弹框标题
@@ -489,6 +535,69 @@ export default {
     },
   },
   methods: {
+    //查询库存包件明细
+    onDetail(row){
+      //
+      this.dialogPack = true;
+      console.log("row>>>",row);
+      //查询信息
+      let po = {
+        stockListId: row.stockListId,
+        reservationId: row.billLadingId,
+      }
+      getDisStockList(po).then( res =>{
+        console.log("res>>>>库存包件码",res.data.data);
+      })
+
+    },
+      //打印
+    printTemplate() {
+      let LODOP = getLodop();
+      console.log("LODOP>>>>>",LODOP);
+      // console.log("this.ids>>>>>",this.selectionList);
+      // if (this.selectionList.length === 0){
+      //   this.$message.warning("请选择至少一条数据");
+      //   return;
+      // }
+      getStockTemplate({ id: this.materialQRCode.id }).then(res => {
+        console.log('返回的数据', res.data.data);
+        let templateData = res.data.data;
+        // let templateData = "res.data.data";
+        // console.log(templateData);
+        LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
+        LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
+        LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开
+        // // 设置打印整宽且不变形
+        LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
+        // // 设置打印后自动关闭
+        LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
+        // // data就是一段html文本
+        LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
+        // LODOP.PREVIEW(); //预览(预览打印无脚标)
+        LODOP.PRINT(); //直接打印
+
+      });
+    },
+    //查看包条码
+    handleQRCode(row) {
+      // this.title = '查看'
+      // this.view = true;
+      // this.box = true;
+      this.materialQRCode = row;
+
+      let qr = {
+        ids: row.id,
+      };
+      showOrderPackgeCode(qr).then(res => {
+        // this.orderPackageCode = res.data
+        console.log(res.data);
+        this.html=''
+        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+
+      });
+
+      this.dialogVisible = true;
+    },
     //选择
     getForklift(row,ty){
       switch (ty){
@@ -599,6 +708,10 @@ export default {
         //配送类型
         this.distributionType = res.data.data;
       });
+      // 费用类型字典
+      getDictionaryBiz('delivery_cost').then(res => {
+        this.clientType = res.data.data;
+      });
       // console.log("配送方式123", this.deliveryWayList);
       getDictionaryBiz('delivery_way').then(res => {
         //配送方式
@@ -832,6 +945,38 @@ export default {
       let a = await billStockList(page.currentPage, page.pageSize, { id: this.$route.query.id });
       this.data3 = a.data.data.records;
       console.log("自提任务》》》》》》",this.data3);
+      console.log("费用类型lll",this.clientType);
+      this.data3.forEach(i =>{
+        if(!!i.list){
+          i.collectFee = 0;
+          i.storageFee = 0;
+          i.transport = 0;
+          i.forklift = 0;
+          i.otherFee = 0;
+          i.list.forEach(a =>{
+            const { cost, money } = a; // 对象解构，获取a对象的cost和money属性
+            switch (cost) {
+              case '1': // 到付
+                i.collectFee = money ? parseInt(money) : 0;
+                break;
+              case '2': // 仓储费用
+                i.storageFee = money ? parseInt(money) : 0;
+                break;
+              case '3': // 搬运费
+                console.log("0=-0-=");
+                i.transport = money ? parseInt(money) : 0;
+                break;
+              case '4': // 叉车费
+                i.forklift = money ? parseInt(money) : 0;
+                break;
+              case '5': // 其他增值费
+                i.otherFee = money ? parseInt(money) : 0;
+                break;
+            }
+          })
+        }
+      });
+
 
       // if (!!this.data3 && this.data3.length > 0) {
       //   this.data3.forEach(i => {

src/views/distribution/stockup/distributionStockupDiscuss.vue

@@ -83,7 +83,7 @@
         >
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-text>
-            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-text>
+            <el-text type="primary" text icon="el-icon-edit" v-if=" slotProps.scope.row.stockupStatusName != '已备货' " @click="handleEdit(slotProps.scope)">编辑</el-text>
             <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
 <!--            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">打印</el-text>-->
           </template>
@@ -177,8 +177,8 @@
           <el-form-item label="备货区" prop="stockupArea">
             <el-input v-model="form.stockupArea" placeholder="请输入备货区"/>
           </el-form-item>
-          <el-form-item label="指派状态;1-未指派、2-已指派" prop="assignStatus">
+          <el-form-item label="指派状态" prop="assignStatus">
-            <el-select v-model="form.assignStatus" clearable placeholder="请选择指派状态;1-未指派、2-已指派">
+            <el-select v-model="form.assignStatus" clearable placeholder="请选择指派状态">
               <el-option
                 v-for="item in assignStatusData"
                 :key="item.dictKey"
@@ -210,7 +210,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="装卸班组" prop="loader">
+          <!--<el-form-item label="装卸班组" prop="loader">
             <el-select v-model="form.loader" clearable placeholder="请选择装卸班组">
               <el-option
                 v-for="item in loaderData"
@@ -219,7 +219,7 @@
                 :value="item.dictKey">
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="确认完成备货时间" prop="fixTime">
             <el-date-picker v-model="form.fixTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择确认完成备货时间"></el-date-picker>
           </el-form-item>
@@ -355,14 +355,14 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-            {
+            // {
-              label: '未指派',
+            //   label: '未指派',
-              value: '1',
+            //   value: '1',
-            },
+            // },
-            {
+            // {
-              label: '已指派',
+            //   label: '已指派',
-              value: '2',
+            //   value: '2',
-            },
+            // },
           ],
           fixed: false,
           sortable: true,
@@ -408,16 +408,16 @@ export default {
           fixed: false,
           sortable: true,
         },*/
-        {
+        // {
-          prop: 'loaderName',
+        //   prop: 'loaderName',
-          label: '装卸班组',
+        //   label: '装卸班组',
-          type: 2,
+        //   type: 2,
-          values: '',
+        //   values: '',
-          width: '150',
+        //   width: '150',
-          checkarr: [],
+        //   checkarr: [],
-          fixed: false,
+        //   fixed: false,
-          sortable: true,
+        //   sortable: true,
-        },
+        // },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',
@@ -893,17 +893,17 @@ export default {
           return item
         });
       });
-      getDictionaryBiz('stock_allocation').then(res => {
+      // getDictionaryBiz('stock_allocation').then(res => {
-        this.stockAllocation = res.data.data;
+      //   this.stockAllocation = res.data.data;
-        this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
+      //   this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
-          item.value = item.dictKey
+      //     item.value = item.dictKey
-          item.label = item.dictValue
+      //     item.label = item.dictValue
-          return item
+      //     return item
-        });
+      //   });
-      })
+      // })
       getDictionaryBiz('stock_assign_status').then(res => { //指派
-        // console.log("8908098080",res.data.data);
+        console.log("8908098080",res.data.data);
-        this.distributionType = res.data.data;
+        // this.distributionType = res.data.data;
         this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr =res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue

src/views/distribution/stockup/distributionStockupMarket.vue

@@ -65,7 +65,7 @@
         >
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-text>
-            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-text>
+            <el-text type="primary" text icon="el-icon-edit" v-if=" slotProps.scope.row.stockupStatusName != '已备货' " @click="handleEdit(slotProps.scope)">编辑</el-text>
             <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
 <!--            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">打印</el-text>-->
           </template>
@@ -107,7 +107,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="装卸班组" :label-width="formLabelWidth">
+          <!--<el-form-item label="装卸班组" :label-width="formLabelWidth">
             <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">
               <el-option
                 v-for="item in loaderData"
@@ -116,7 +116,7 @@
                 :value="item.dictKey">
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
             <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
               <el-option
@@ -401,16 +401,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
+        // {
-          prop: 'loaderName',
+        //   prop: 'loaderName',
-          label: '装卸班组',
+        //   label: '装卸班组',
-          type: 2,
+        //   type: 2,
-          values: '',
+        //   values: '',
-          width: '150',
+        //   width: '150',
-          checkarr: [],
+        //   checkarr: [],
-          fixed: false,
+        //   fixed: false,
-          sortable: true,
+        //   sortable: true,
-        },
+        // },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',
@@ -831,14 +831,14 @@ export default {
           return item
         });
       });
-      getDictionaryBiz('stock_allocation').then(res => {
+      // getDictionaryBiz('stock_allocation').then(res => {
-        this.stockAllocation = res.data.data;
+      //   this.stockAllocation = res.data.data;
-        this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
+      //   this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
-          item.value = item.dictKey
+      //     item.value = item.dictKey
-          item.label = item.dictValue
+      //     item.label = item.dictValue
-          return item
+      //     return item
-        });
+      //   });
-      });
+      // });
       this.onLoad(this.page);
     },
     searchHide () {

src/views/distribution/stockup/distributionStockupSelf.vue

@@ -65,7 +65,7 @@
         >
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-text>
-            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-text>
+            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)" v-if="slotProps.scope.row.stockupStatus != '40'">编辑</el-text>
             <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
 <!--            <el-text type="primary" text icon="el-icon-edit" @click="handleEditPrint(slotProps.scope)">打印</el-text>-->
           </template>
@@ -107,16 +107,16 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="装卸班组" :label-width="formLabelWidth">
+<!--          <el-form-item label="装卸班组" :label-width="formLabelWidth">-->
-            <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">
+<!--            <el-select v-model="form.loaderId" clearable placeholder="请选择装卸班组" @change="getForklift($event,'2')">-->
-              <el-option
+<!--              <el-option-->
-                v-for="item in loaderData"
+<!--                v-for="item in loaderData"-->
-                :key="item.dictKey"
+<!--                :key="item.dictKey"-->
-                :label="item.dictValue"
+<!--                :label="item.dictValue"-->
-                :value="item.dictKey">
+<!--                :value="item.dictKey">-->
-              </el-option>
+<!--              </el-option>-->
-            </el-select>
+<!--            </el-select>-->
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item label="备货区域" :label-width="formLabelWidth" >
             <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
               <el-option
@@ -192,7 +192,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="装卸班组" prop="loader">
+          <!--<el-form-item label="装卸班组" prop="loader">
             <el-select v-model="form.loader" clearable placeholder="请选择装卸班组">
               <el-option
                 v-for="item in loaderData"
@@ -201,7 +201,7 @@
                 :value="item.dictKey">
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="确认完成备货时间" prop="fixTime">
             <el-date-picker v-model="form.fixTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择确认完成备货时间"></el-date-picker>
           </el-form-item>
@@ -401,7 +401,7 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
+        /*{
           prop: 'loaderName',
           label: '装卸班组',
           type: 2,
@@ -410,7 +410,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        },
+        },*/
         {
           prop: 'fixTime',
           label: '确认完成备货时间',
@@ -837,14 +837,14 @@ export default {
           return item
         });
       });
-      getDictionaryBiz('stock_allocation').then(res => {
+      // getDictionaryBiz('stock_allocation').then(res => {
-        this.stockAllocation = res.data.data;
+      //   this.stockAllocation = res.data.data;
-        this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
+      //   this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
-          item.value = item.dictKey
+      //     item.value = item.dictKey
-          item.label = item.dictValue
+      //     item.label = item.dictValue
-          return item
+      //     return item
-        });
+      //   });
-      });
+      // });
       this.onLoad(this.page);
     },
     searchHide () {

src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue

@@ -1,42 +1,121 @@
 <template>
   <basic-container>
     <div class="avue-crud">
+      <el-tabs type="border-card">
+        <el-tab-pane label="订制品">
+          <el-row>
+            <!-- 列表模块 -->
+            <tablecmt
+              :columnList="columnList"
+              :tableData="data"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <!--          <template #default="slotProps">-->
+              <!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
+              <!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
+              <!--          </template>-->
+            </tablecmt>
+          </el-row>
+          <el-row>
+            <div class="avue-crud__pagination" style="width: 100%">
+              <!-- 分页模块 -->
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange"
+                @current-change="currentChange"
+                :current-page="page.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page.total"
+              >
+              </el-pagination>
+            </div>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="库存品">
+          <el-row>
+            <!-- 列表模块 -->
+            <tablecmt
+              :columnList="columnList1"
+              :tableData="data1"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <!--          <template #default="slotProps">-->
+              <!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
+              <!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
+              <!--          </template>-->
+            </tablecmt>
+          </el-row>
+          <el-row>
+            <div class="avue-crud__pagination" style="width: 100%">
+              <!-- 分页模块 -->
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange1"
+                @current-change="currentChange1"
+                :current-page="page1.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page1.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page1.total"
+              >
+              </el-pagination>
+            </div>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="零担订单">
+          <el-row>
+            <!-- 列表模块 -->
+            <tablecmt
+              :columnList="columnList2"
+              :tableData="data2"
+              :loading="loading"
+              @inputTxt="inputsc"
+              @timeCheck="timesc"
+              @btnCheck="btnsc"
+              @selectCheck="selectsc"
+              @selection="selectionChange"
+            >
+              <!--          <template #default="slotProps">-->
+              <!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
+              <!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
+              <!--          </template>-->
+            </tablecmt>
+          </el-row>
+          <el-row>
+            <div class="avue-crud__pagination" style="width: 100%">
+              <!-- 分页模块 -->
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange2"
+                @current-change="currentChange2"
+                :current-page="page2.currentPage"
+                :page-sizes="[30, 50, 80, 120]"
+                :page-size="page2.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page2.total"
+              >
+              </el-pagination>
+            </div>
+          </el-row>
+        </el-tab-pane>
+      </el-tabs>
 
-      <el-row>
-        <!-- 列表模块 -->
-        <tablecmt
-          :columnList="columnList"
-          :tableData="data"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
-<!--          <template #default="slotProps">-->
-<!--            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
-<!--            <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
-<!--          </template>-->
-        </tablecmt>
-      </el-row>
-      <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
-          <!-- 分页模块 -->
-          <el-pagination align="right"
-                         background
-                         @size-change="sizeChange"
-                         @current-change="currentChange"
-                         :current-page="page.currentPage"
-                         :page-sizes="[30, 50,80, 120]"
-                         :page-size="page.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="page.total">
-          </el-pagination>
-        </div>
-      </el-row>
       <!-- 表单模块 -->
-
     </div>
   </basic-container>
   <edittablehead
@@ -48,12 +127,12 @@
 </template>
 
 <script>
-import {  getDetail, getpage, update, remove } from "@/api/warehouse/warehouseUpdownGoodsLog";
+import { getDetail, getpage, update, remove,getinventorypage,gettruckloadpage } from '@/api/warehouse/warehouseUpdownGoodsLog';
-import option from "@/option/warehouse/warehouseUpdownGoodsLog";
+import option from '@/option/warehouse/warehouseUpdownGoodsLog';
-import { mapGetters } from "vuex";
+import { mapGetters } from 'vuex';
 
 export default {
-  data () {
+  data() {
     return {
       columnList: [
         // {
@@ -68,7 +147,7 @@ export default {
         {
           prop: 'warehouseName',
           label: '货物仓库',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -79,7 +158,7 @@ export default {
         {
           prop: 'orderCode',
           label: '订单自编码',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -89,19 +168,125 @@ export default {
         {
           prop: 'orderPackageCode',
           label: '包件编码',
-          type: 2,
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+
+        {
+          prop: 'bindingType',
+          label: '上架类型',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [
+            { label: '上架', value: 1 },
+            { label: '下架', value: 2 },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'areaTitle',
+          label: '货区',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'shelfTitle',
+          label: '货架',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'allocationTitle',
+          label: '货位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'createUserName',
+          label: '操作员',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'palletCode',
+          label: '托盘码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'logWarehouseName',
+          label: '记录仓库',
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: '',
+        //   label: '操作',
+        //   type: 6,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: 'right',
+        //   hide: true,
+        // },
+        // 更多列的配置...
+      ],
+      columnList1: [
+        // {
+        //   prop: '',
+        //   label: '序号',
+        //   type: 0,
+        //   values: '',
+        //   width: 55,
+        //   checkarr: [],
+        //   fixed: true,
+        // },
         {
           prop: 'materialCode',
           label: '物料编号',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -109,9 +294,9 @@ export default {
         {
           prop: 'materialName',
           label: '物料名称',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -119,9 +304,9 @@ export default {
         {
           prop: 'sku',
           label: 'SKU',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -129,12 +314,12 @@ export default {
         {
           prop: 'bindingType',
           label: '上架类型',
-          type: 3,
+          type: 1,
           values: '',
-          width: '230',
+          width: '150',
           checkarr: [
-            {label:'上架',value:1},
+            { label: '上架', value: 1 },
-            {label:'下架',value:2}
+            { label: '下架', value: 2 },
           ],
           fixed: false,
           sortable: true,
@@ -142,9 +327,9 @@ export default {
         {
           prop: 'areaTitle',
           label: '货区',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -152,9 +337,9 @@ export default {
         {
           prop: 'shelfTitle',
           label: '货架',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -162,9 +347,9 @@ export default {
         {
           prop: 'allocationTitle',
           label: '货位',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -172,9 +357,9 @@ export default {
         {
           prop: 'createUserName',
           label: '操作员',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: false,
@@ -182,9 +367,9 @@ export default {
         {
           prop: 'palletCode',
           label: '托盘码',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -194,7 +379,7 @@ export default {
           label: '记录仓库',
           type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -202,9 +387,9 @@ export default {
         {
           prop: 'createTime',
           label: '创建时间',
-          type: 2,
+          type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -214,13 +399,138 @@ export default {
         //   label: '操作',
         //   type: 6,
         //   values: '',
-        //   width: '230',
+        //   width: '150',
         //   checkarr: [],
         //   fixed: 'right',
         //   hide: true,
         // },
         // 更多列的配置...
       ],
+      columnList2: [
+        {
+          prop: 'orderCode',
+          label: '订单号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'mallName',
+          label: '商城名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'bindingType',
+          label: '上架类型',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [
+            { label: '上架', value: 1 },
+            { label: '下架', value: 2 },
+          ],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'areaTitle',
+          label: '货区',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'shelfTitle',
+          label: '货架',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'allocationTitle',
+          label: '货位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'createUserName',
+          label: '操作员',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: false,
+        },
+        {
+          prop: 'mallCode',
+          label: '托盘码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'logWarehouseName',
+          label: '记录仓库',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+      ],
       height: 0,
       // 弹框标题
       title: '',
@@ -238,7 +548,17 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
+      },
+      page1: {
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
+      },
+      page2: {
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -248,11 +568,15 @@ export default {
       option: option,
       // 表单列表
       data: [],
-    }
+      data1:[],
+      data2:[],
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
+    this.onLoad(this.page1, {}, 'page1');
+    this.onLoad(this.page2, {}, 'page2');
     /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
@@ -330,14 +654,14 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(["permission"]),
+    ...mapGetters(['permission']),
-    ids () {
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
+      return ids.join(',');
-    }
+    },
   },
   methods: {
     showdrawer(value) {
@@ -376,140 +700,83 @@ export default {
     },
     selectsc(index, row) {
       console.log(index, row);
-
     },
     timesc(index, row) {
       console.log(index, row);
-
     },
     inputsc(index, row) {
       console.log(index, row);
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    searchHide () {
+
-      this.search = !this.search;
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      // this.$refs.table.clearSelection();
     },
-    searchChange () {
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    searchReset () {
+    sizeChange(pageSize) {
-      this.query = {};
+      this.page.pageSize = pageSize;
-      this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    handleSubmit () {
+    sizeChange1(pageSize) {
-      if (!this.form.id) {
+      this.page1.pageSize = pageSize;
-        add(this.form).then(() => {
+      this.onLoad(this.page1, {}, 'page1');
-          this.box = false;
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        });
-      } else {
-        update(this.form).then(() => {
-          this.box = false;
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        })
-      }
     },
-    handleAdd () {
+    currentChange1(currentPage) {
-      this.title = '新增'
+      this.page1.currentPage = currentPage;
-      this.form = {}
+      this.onLoad(this.page1, {}, 'page1');
-      this.box = true
     },
-    handleEdit (row) {
+    sizeChange2(pageSize) {
-      this.title = '编辑'
+      this.page1.pageSize = pageSize;
-      this.box = true
+      this.onLoad(this.page2, {}, 'page2');
-      getDetail(row.id).then(res => {
-        this.form = res.data.data;
-      });
     },
-    handleView (row) {
+    currentChange2(currentPage) {
-      this.title = '查看'
+      this.page1.currentPage = currentPage;
-      this.view = true;
+      this.onLoad(this.page2, {}, 'page2');
-      this.box = true;
-      getDetail(row.id).then(res => {
-        this.form = res.data.data;
-      });
     },
-    handleDelete () {
+    onLoad(page, params = {}, uname) {
-      if (this.selectionList.length === 0) {
+      this.loading = true;
-        this.$message.warning("请选择至少一条数据");
+      if (uname=='page1') {
-        return;
+        getinventorypage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      }
+          const data = res.data.data;
-      this.$confirm("确定将选择数据删除?", {
+          if (uname) {
-        confirmButtonText: "确定",
+            this[uname].total = data.total;
-        cancelButtonText: "取消",
+          }
-        type: "warning"
+          this.data1 = data.records;
-      })
+          this.data1 = this.$functions.newdatas(this.columnList1, this.data1);
-        .then(() => {
+          this.loading = false;
-          return remove(this.ids);
-        })
-        .then(() => {
           this.selectionClear();
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
         });
-    },
+      }else if(uname=='page2'){
-    rowDel (row) {
+        gettruckloadpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      this.$confirm("确定将选择数据删除?", {
+          const data = res.data.data;
-        confirmButtonText: "确定",
+          if (uname) {
-        cancelButtonText: "取消",
+            this[uname].total = data.total;
-        type: "warning"
+          }
-      })
+          this.data2 = data.records;
-        .then(() => {
+          this.data2 = this.$functions.newdatas(this.columnList2, this.data2);
-          return remove(row.id);
+          this.loading = false;
-        })
+          this.selectionClear();
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
         });
+      } else {
+        getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.data = this.$functions.newdatas(this.columnList, this.data);
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
     },
-    beforeClose (done) {
+  },
-      done()
-      this.form = {};
-      this.view = false;
-    },
-    selectionChange (list) {
-      this.selectionList = list;
-    },
-    selectionClear () {
-      this.selectionList = [];
-      // this.$refs.table.clearSelection();
-    },
-    currentChange (currentPage) {
-      this.page.currentPage = currentPage;
-      this.onLoad(this.page);
-    },
-    sizeChange (pageSize) {
-      this.page.pageSize = pageSize;
-      this.onLoad(this.page);
-    },
-    onLoad (page, params = {}) {
-      this.loading = true;
-      getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.data =this.$functions.newdatas(this.columnList,this.data)
-        this.loading = false;
-        this.selectionClear();
-      });
-    }
-  }
 };
 </script>

src/views/warehouse/warehouseStock/warehouseStock.vue

@@ -79,6 +79,26 @@ export default {
           sortable: false,
           head: false,
         },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'orderCode',
           label: '订单自编码',
@@ -170,18 +190,44 @@ export default {
           sortable: true,
         },
         {
-          prop: 'warehouseEntryTimeEnd',
+          label: "包件状态",
-          label: '入库时间',
+          prop: "orderPackageStatusName",
-          type: 2,
+          search: true,
-          values: '',
+          width:"100px"
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
         },
         {
-          prop: 'waybillNumber',
+          label: "包件冻结状态",
-          label: '运单号',
+          prop: "orderPackageFreezeStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件上架状态",
+          prop: "orderPackageGroundingStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件备货状态",
+          prop: "orderPackageStockupStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件预约状态",
+          prop: "orderPackageReservationStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件装车状态",
+          prop: "orderPackageLoadingStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          prop: 'warehouseEntryTimeEnd',
+          label: '入库时间',
           type: 2,
           values: '',
           width: '180',
@@ -189,6 +235,7 @@ export default {
           fixed: false,
           sortable: true,
         },
+
         {
           prop: 'operatorName',
           label: '操作员',

src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

@@ -50,6 +50,7 @@
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" @click="handleViewAdd(slotProps.scope)">查看</el-text>
             <el-text type="primary" text icon="el-icon-edit" v-if="slotProps.scope.row.conditions != '3'" @click="handleEditOwn(slotProps.scope)">编辑</el-text>
+            <el-text type="primary" text icon="el-icon-edit" v-if="slotProps.scope.row.conditions != '3'" @click="handleEnter(slotProps.scope)">入库</el-text>
 
             <el-dropdown>
               <el-text  type="primary" text >
@@ -63,9 +64,9 @@
                   <el-dropdown-item>
                     <el-text @click="handleDrawer(slotProps.scope)">物品清单</el-text>
                   </el-dropdown-item>
-                  <el-dropdown-item v-if="slotProps.scope.row.conditions != '3'">
+                 <!-- <el-dropdown-item v-if="slotProps.scope.row.conditions != '3'">
                     <el-text @click="handleEnter(slotProps.scope)">入库</el-text>
-                  </el-dropdown-item>
+                  </el-dropdown-item>-->
                 </el-dropdown-menu>
               </template>
             </el-dropdown>