diff --git a/public/favicon.png b/public/favicon.png
index ecd70ca1..562f6dcb 100644
Binary files a/public/favicon.png and b/public/favicon.png differ
diff --git a/public/img/bg/img-logo.png b/public/img/bg/img-logo.png
index 9a6b2a47..ae65ba16 100644
Binary files a/public/img/bg/img-logo.png and b/public/img/bg/img-logo.png differ
diff --git a/public/img/bg/logo.png b/public/img/bg/logo.png
index b3e40cc8..ae65ba16 100644
Binary files a/public/img/bg/logo.png and b/public/img/bg/logo.png differ
diff --git a/public/img/indexbg.png b/public/img/indexbg.png
new file mode 100644
index 00000000..0638cc49
Binary files /dev/null and b/public/img/indexbg.png differ
diff --git a/public/img/logo.png b/public/img/logo.png
index b3e40cc8..ae65ba16 100644
Binary files a/public/img/logo.png and b/public/img/logo.png differ
diff --git a/public/img/p-logo.png b/public/img/p-logo.png
new file mode 100644
index 00000000..b4da7bc1
Binary files /dev/null and b/public/img/p-logo.png differ
diff --git a/src/api/distribution/distributionParcelNumber.js b/src/api/distribution/distributionParcelNumber.js
new file mode 100644
index 00000000..8cc777ec
--- /dev/null
+++ b/src/api/distribution/distributionParcelNumber.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionParcelNumber/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/logpm-distribution/distributionParcelNumber/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/logpm-distribution/distributionParcelNumber/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionParcelNumber/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionParcelNumber/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/api/distribution/distributionReservationZeroPackage.js b/src/api/distribution/distributionReservationZeroPackage.js
new file mode 100644
index 00000000..a1161a77
--- /dev/null
+++ b/src/api/distribution/distributionReservationZeroPackage.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionReservationZeroPackage/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/logpm-distribution/distributionReservationZeroPackage/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/logpm-distribution/distributionReservationZeroPackage/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionReservationZeroPackage/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/logpm-distribution/distributionReservationZeroPackage/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 95b4a372..a3d00a9b 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -91,8 +91,12 @@
               v-if="Number(column.type) < 6 && Number(column.type) > 0"
               >{{ scope.row[column.prop] }}</el-text
             >
-            <el-switch @change="makeCargo(scope.row,column)" v-if="column.type == 11" v-model="scope.row[column.prop]" />
-            
+            <el-switch
+              @change="makeCargo(scope.row, column)"
+              v-if="column.type == 11"
+              v-model="scope.row[column.prop]"
+            />
+
             <!-- <el-text
               class="mx-2 tabculconte"
               v-for="item in column.checkarr"
@@ -114,6 +118,7 @@
               v-model="scope.row[column.prop]"
               type="number"
               :min="0"
+              :max="scope.row.residueNumber"
             ></el-input>
             <div class="slotbuts" v-if="column.type == 6">
               <slot v-if="column.type == 6" :scope="scope"> </slot>
@@ -287,7 +292,7 @@ const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: nu
   }
   return '';
 };
-let emit = defineEmits(['inputTxt', 'timeCheck', 'selectCheck', 'selection','makeCargo']);
+let emit = defineEmits(['inputTxt', 'timeCheck', 'selectCheck', 'selection', 'makeCargo']);
 let newcolumnList = ref<TableColumnType[]>([]);
 watchEffect(() => {
   newcolumnList.value = [];
@@ -344,21 +349,43 @@ function handleNumberRange(column: TableColumnType, row: TableDataType) {
     //如果替换后还有值
     row[column.prop] = parseInt(row[column.prop]); //把字符型转成整数型
   }
-  if (column.lessThanNum) {
-    if (row[column.prop] > row[column.lessThanNum]) {
-      row[column.prop] = row[column.lessThanNum];
+
+  // if (column.lessThanNum) {
+  //   if (row[column.prop] > row[column.lessThanNum]) {
+  //     row[column.prop] = row[column.lessThanNum];
+  //     proxy.$message({
+  //       type: 'error',
+  //       message: '数量不能大于可用数量',
+  //     });
+  //   }
+  // }
+  // 上架数量判断
+  if (row.residueNumber) {
+    if (row.enterNum > row.residueNumber) {
       proxy.$message({
         type: 'error',
-        message: '数量不能大于可用数量',
+        message: '数量不能大于可上架总数,已调整为最大数量！',
       });
+      row.enterNum = row.residueNumber;
     }
   }
-  console.log(column, row);
+  // 下架数量判断
+  if (row.num) {
+    if (row.enterNum > row.num) {
+      proxy.$message({
+        type: 'error',
+        message: '数量不能大于可下架总数,已调整为最大数量！',
+      });
+      row.enterNum = row.num;
+    }
+  }
+
+  console.log(row, 'row');
 }
 function handleEdit(index: number, row: TableDataType) {
   console.log(index, row);
 }
-function makeCargo(value,column: TableColumnType){
+function makeCargo(value, column: TableColumnType) {
   emit('makeCargo', value, column);
 }
 function inputchange(value, column: TableColumnType) {
@@ -493,7 +520,7 @@ function copyContent(content: string) {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scope>
 // :root{
 //   --el-checkbox-checked-bg-color:'#D3832A';
 //   --el-checkbox-checked-input-border-color:'#D3832A';
@@ -641,7 +668,10 @@ function copyContent(content: string) {
   align-items: center;
 }
 
-.el-table .el-popper{
-  max-width:20% !important;
+.el-table .el-popper {
+  max-width: 20% !important;
+}
+.el-input {
+  // width: 200px !important;
 }
 </style>
diff --git a/src/config/website.js b/src/config/website.js
index aeec4df4..f56d9154 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -2,7 +2,7 @@
  * 全局配置文件
  */
 export default {
-  title: 'TWMS',
+  title: '货无忧物流信息平台',
   logo: 'S',
   key: 'TWMS', //配置主键,目前用于存储
   indexTitle: '货无优 Admin',
diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js
index 61bc7cf8..b06b14be 100644
--- a/src/option/basicdata/basicdataGoodsAllocation.js
+++ b/src/option/basicdata/basicdataGoodsAllocation.js
@@ -2,7 +2,7 @@ export default {
   height: 'auto',
   calcHeight: 30,
   tip: false,
-  searchShow: true,
+  searchShow: false, //搜索展开
   searchMenuSpan: 6,
   border: true,
   index: true,
diff --git a/src/option/distribution/distributionParcelNumber.js b/src/option/distribution/distributionParcelNumber.js
new file mode 100644
index 00000000..24e2c4fa
--- /dev/null
+++ b/src/option/distribution/distributionParcelNumber.js
@@ -0,0 +1,120 @@
+export default {
+  expand: false,
+  index: true,
+  border: true,
+  selection: true,
+  column: [
+    {
+      label: "主键",
+      prop: "id",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "租户号",
+      prop: "tenantId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新人",
+      prop: "updateUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新时间",
+      prop: "updateTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "是否已删除",
+      prop: "isDeleted",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留1",
+      prop: "reserve1",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留2",
+      prop: "reserve2",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留3",
+      prop: "reserve3",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留4",
+      prop: "reserve4",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留5",
+      prop: "reserve5",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "订单ID",
+      prop: "stockArticleId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预约ID",
+      prop: "parcelListId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "总数量",
+      prop: "quantity",
+    },
+    {
+      label: "在库数量",
+      prop: "handQuantity",
+    },
+    {
+      label: "配送数量",
+      prop: "deliveryQuantity",
+    },
+    {
+      label: "签收数量",
+      prop: "signinQuantity",
+    },
+  ]
+}
diff --git a/src/option/distribution/distributionReservationZeroPackage.js b/src/option/distribution/distributionReservationZeroPackage.js
new file mode 100644
index 00000000..cfe311df
--- /dev/null
+++ b/src/option/distribution/distributionReservationZeroPackage.js
@@ -0,0 +1,120 @@
+export default {
+  expand: false,
+  index: true,
+  border: true,
+  selection: true,
+  column: [
+    {
+      label: "主键",
+      prop: "id",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "租户号",
+      prop: "tenantId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新人",
+      prop: "updateUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新时间",
+      prop: "updateTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "是否已删除",
+      prop: "isDeleted",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留1",
+      prop: "reserve1",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留2",
+      prop: "reserve2",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留3",
+      prop: "reserve3",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留4",
+      prop: "reserve4",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "预留5",
+      prop: "reserve5",
+      display: false,
+      hide: true,
+    },
+    {
+      label: " 10 自提",
+      prop: "typesOf",
+    },
+    {
+      label: "订单ID",
+      prop: "stockArticleId",
+    },
+    {
+      label: "数量",
+      prop: "quantity",
+    },
+    {
+      label: "预约ID",
+      prop: "reservationId",
+    },
+    {
+      label: "零担包件状态;1-正常 ； 2 -取消 ； 3-新增",
+      prop: "zeroPackageStatus",
+    },
+    {
+      label: "品类名称",
+      prop: "categoryName",
+    },
+    {
+      label: "零担包件类型;1-商配 2-市配 3-自提",
+      prop: "type",
+    },
+  ]
+}
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index f3742812..908117d0 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -1,15 +1,21 @@
 <template>
   <div class="avue-logo">
-    <transition name="fade">
+    <div class="logo-x">
+      <div class="logo-img">
+        <img src="../../../public/img/p-logo.png" />
+      </div>
+      <!-- <transition name="fade">
       <span v-if="getScreen(isCollapse)" class="avue-logo_subtitle" key="0">
         {{ website.logo }}
       </span>
-    </transition>
-    <transition-group name="fade">
-      <template v-if="getScreen(!isCollapse)">
-        <span class="avue-logo_title" key="1">{{ website.indexTitle }} </span>
-      </template>
-    </transition-group>
+    </transition> -->
+
+      <transition-group name="fade">
+        <template v-if="getScreen(!isCollapse)">
+          <span class="avue-logo_title" key="1">{{ website.indexTitle }} </span>
+        </template>
+      </transition-group>
+    </div>
   </div>
 </template>
 
@@ -28,3 +34,15 @@ export default {
   methods: {},
 };
 </script>
+<style lang="scss" scope>
+.logo-img {
+  img {
+    width: 60px;
+    height: 60px;
+    margin-top: -5px;
+  }
+}
+.logo-x {
+  display: flex;
+}
+</style>
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index 04e5c6db..28054448 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -5,25 +5,26 @@
         <div class="login-time">
           {{ time }}
         </div>
-        <p class="title">{{ $t('login.info') }}</p>
-   
-        <!-- <img class="img" src="/img/logo.png" alt=""> -->
+
+        <img src="../../../public/img/indexbg.png" />
+        <!-- <p class="title">{{ $t('login.info') }}</p> -->
+
+        <!-- <img class="img" src="/img/logo.png" alt="" /> -->
       </div>
       <div class="login-border">
-      
-
         <div class="login-main">
           <h4 class="login-title">
-            
-            {{ $t('login.title') }}{{ website.title }}
-            <top-lang></top-lang>
+            <!-- {{ $t('login.title') }} -->
+            {{ website.title }}
+            <!-- <top-lang></top-lang> -->
+            <!-- 语言转换 -->
           </h4>
           <userLogin v-if="activeName === 'user'"></userLogin>
           <codeLogin v-else-if="activeName === 'code'"></codeLogin>
           <thirdLogin v-else-if="activeName === 'third'"></thirdLogin>
           <div class="login-menu">
             <!-- <a href="#" @click.stop="activeName = 'user'">{{ $t('login.userLogin') }}</a> -->
-            <!--<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
+            <!-- <a href="#" @click.stop="activeName = 'code'">{{ $t('login.phoneLogin') }}</a> -->
             <!-- <a href="#" @click.stop="activeName = 'third'">{{ $t('login.thirdLogin') }}</a> -->
             <!-- <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a> -->
           </div>
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 51b38eb5..2791d861 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -1,4 +1,7 @@
 <template>
+  <div class="login-logo">
+    <img src="../../../public/img/p-logo.png" />
+  </div>
   <el-form
     class="login-form"
     status-icon
@@ -8,45 +11,57 @@
     label-width="0"
   >
     <el-form-item v-if="tenantMode" prop="tenantId">
-      <el-input
-        @keyup.enter="handleLogin"
-        v-model="loginForm.tenantId"
-        auto-complete="off"
-        :placeholder="$t('login.tenantId')"
-      >
-        <template #prefix>
-          <i class="icon-quanxian" />
-        </template>
-      </el-input>
+      <div class="inputLog">
+        <span class="login-tit">租户密钥</span>
+        <el-input
+          @keyup.enter="handleLogin"
+          v-model="loginForm.tenantId"
+          auto-complete="off"
+          :placeholder="$t('login.tenantId')"
+        >
+          <!-- <template #prefix>
+           <i class="icon-quanxian" /> 
+          </template> -->
+        </el-input>
+      </div>
     </el-form-item>
+
     <el-form-item prop="username">
-      <el-input
-        @keyup.enter="handleLogin"
-        v-model="loginForm.username"
-        auto-complete="off"
-        :placeholder="$t('login.username')"
-      >
-        <template #prefix>
-          <i class="icon-yonghu" />
-        </template>
-      </el-input>
+      <div class="inputLog">
+        <span class="login-tit">用户账号</span>
+        <el-input
+          @keyup.enter="handleLogin"
+          v-model="loginForm.username"
+          auto-complete="off"
+          :placeholder="$t('login.username')"
+        >
+          <!-- <template #prefix>
+            <i class="icon-yonghu" /> 
+          </template> -->
+        </el-input>
+      </div>
     </el-form-item>
     <el-form-item prop="password">
-      <el-input
-        @keyup.enter="handleLogin"
-        :type="passwordType"
-        v-model="loginForm.password"
-        auto-complete="off"
-        :placeholder="$t('login.password')"
-      >
-        <template #suffix>
-          <i class="el-icon-view el-input__icon" @click="showPassword" />
-        </template>
-        <template #prefix>
-          <i class="icon-mima" />
-        </template>
-      </el-input>
+      <div class="inputLog">
+        <span class="login-tit">登录密码</span>
+        <el-input
+          @keyup.enter="handleLogin"
+          :type="passwordType"
+          v-model="loginForm.password"
+          auto-complete="off"
+          :placeholder="$t('login.password')"
+        >
+          <!-- <template #suffix>
+            <i class="el-icon-view el-input__icon" @click="showPassword" />
+          </template> -->
+          <!-- <template #prefix>
+            <i class="icon-mima" /> 
+          </template> -->
+        </el-input>
+      </div>
     </el-form-item>
+
+    <el-checkbox v-model="checked2">记住密码</el-checkbox>
     <el-form-item v-if="this.website.captchaMode" prop="code">
       <el-row :span="24">
         <el-col :span="16">
@@ -171,6 +186,7 @@ export default {
         ],
       },
     };
+    const checked2 = ref(true);
   },
   created() {
     this.getTenant();
@@ -198,7 +214,7 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(['tagWel', 'userInfo','setting']),
+    ...mapGetters(['tagWel', 'userInfo', 'setting']),
   },
   props: [],
   methods: {
@@ -240,7 +256,7 @@ export default {
               if (this.website.switchMode) {
                 const deptId = this.userInfo.dept_id;
                 const roleId = this.userInfo.role_id;
-                
+
                 if (deptId.includes(',') || roleId.includes(',')) {
                   this.loginForm.deptId = deptId;
                   this.loginForm.roleId = roleId;
@@ -279,4 +295,69 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss" scope>
+.inputLog {
+  display: flex;
+  color: #002e55;
+  font-weight: bold;
+  span {
+    width: 100px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    letter-spacing: 2px;
+  }
+}
+.el-input__inner {
+  border-radius: 6px;
+  background-color: #f4f8fb;
+  padding: 0 10px;
+  color: #002e55;
+  font-weight: 700;
+  letter-spacing: 2px;
+}
+.el-checkbox {
+  margin-left: 24%;
+}
+.el-input__wrapper {
+  padding-bottom: 0 !important;
+  border: 0 !important  ;
+}
+
+.el-button {
+  border-radius: 8px;
+}
+.el-checkbox__input.is-checked + .el-checkbox__label {
+  font-weight: 500;
+  color: #002e55 !important;
+}
+.el-input__wrapper {
+  background-color: #f4f8fb !important;
+  border-radius: 4px;
+}
+.login-main {
+  position: reactive;
+}
+.login-logo {
+  position: absolute;
+  right: 60px;
+  top: 82px;
+  img {
+    width: 60px;
+    height: 60px;
+  }
+}
+.login-title {
+  padding-right: 16px;
+}
+.inputLog span {
+  justify-content: flex-end;
+}
+.login-tit {
+  display: flex;
+  justify-content: flex-start !important;
+}
+.el-form-item__error {
+  color: #ff0000;
+}
+</style>
diff --git a/src/styles/flowStyle.scss b/src/styles/flowStyle.scss
index f6e3c6a0..1fefe955 100644
--- a/src/styles/flowStyle.scss
+++ b/src/styles/flowStyle.scss
@@ -1,339 +1,343 @@
 .bx {
-    position: relative;
-    .ztjk {
+  position: relative;
+  margin-left: 7.5%;
+  margin-top: 2%;
+  .ztjk {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    position: absolute;
+    font-size: 14px;
+    font-size: #747474;
+    top: 235px;
+    left: 680px;
+    > img {
+      width: 62px;
+      height: 62px;
+    }
+  }
+  .left {
+    width: 640px !important;
+    height: 500px;
+    background: #ffffff;
+    box-shadow: 0px 6px 0 #f3e2cc, 0px 0px 20px #f3e2cc;
+    border-radius: 32px;
+    opacity: 1;
+    box-sizing: border-box;
+    position: absolute;
+    left: 20px;
+    top: 10px;
+    padding: 30px 44px;
+    .tptitl {
       display: flex;
-      flex-direction: column;
       align-items: center;
-      position: absolute;
-      font-size: 14px;
-      font-size: #747474;
-      top: 235px;
-      left: 680px;
       > img {
-        width: 62px;
-        height: 62px;
+        width: 32px;
+        height: 22px;
+        margin-right: 8px;
       }
     }
-    .left {
-      width: 640px !important;
-      height: 500px;
-      background: #ffffff;
-      box-shadow: 0px 0px 16px 0px rgba(211, 131, 42, 0.1);
-      border-radius: 32px;
-      opacity: 1;
-      box-sizing: border-box;
-      position: absolute;
-      left: 20px;
-      top: 10px;
-      padding: 30px 44px;
-      .tptitl {
+    .onebx1 {
+      width: 100%;
+      height: 100%;
+      position: relative;
+      margin-top: 30px;
+      > div {
         display: flex;
+        flex-direction: column;
         align-items: center;
+        position: absolute;
+        font-size: 14px;
+        font-size: #747474;
         > img {
-          width: 32px;
-          height: 22px;
-          margin-right: 8px;
+          width: 62px;
+          height: 62px;
         }
       }
-      .onebx1 {
-        width: 100%;
-        height: 100%;
-        position: relative;
-        margin-top: 30px;
-        > div {
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          position: absolute;
-          font-size: 14px;
-          font-size: #747474;
-          > img {
-            width: 62px;
-            height: 62px;
-          }
-        }
-        .item1 {
-          top: 10px;
-          left: 0px;
-        }
-        .item2 {
-          top: 140px;
-          left: 0px;
-        }
-        .item3 {
-          top: 10px;
-          left: 140px;
-        }
-        .item4 {
-          top: 140px;
-          left: 140px;
-        }
-        .item5 {
-          top: 270px;
-          left: 140px;
-        }
-        .item6 {
-          top: 10px;
-          left: 330px;
-        }
-        .item7 {
-          top: 140px;
-          left: 330px;
-        }
-        .item8 {
-          top: 140px;
-          left: 450px;
-        }
-        .upimg {
-          width: 15px;
-          height: 40px;
-          position: absolute;
-          left: 355px;
-          top: 100px;
-        }
-        .rigth1 {
-          width: 40px;
-          height: 15px;
-          position: absolute;
-          left: 80px;
-          top: 40px;
-        }
-        .rigth2 {
-          width: 40px;
-          height: 15px;
-          position: absolute;
-          left: 80px;
-          top: 180px;
-        }
-        .rigth3 {
-          width: 40px;
-          height: 15px;
-          position: absolute;
-          left: 400px;
-          top: 180px;
-        }
-        .rigth4 {
-          width: 40px;
-          height: 15px;
-          position: absolute;
-          left: 530px;
-          top: 180px;
-        }
-        .rigthall {
-          width: 40px;
-          height: 270px;
-          position: absolute;
-          left: 250px;
-          top: 50px;
-        }
+      .item1 {
+        top: 10px;
+        left: 0px;
+      }
+      .item2 {
+        top: 140px;
+        left: 0px;
+      }
+      .item3 {
+        top: 10px;
+        left: 140px;
+      }
+      .item4 {
+        top: 140px;
+        left: 140px;
+      }
+      .item5 {
+        top: 270px;
+        left: 140px;
+      }
+      .item6 {
+        top: 10px;
+        left: 330px;
+      }
+      .item7 {
+        top: 140px;
+        left: 330px;
+      }
+      .item8 {
+        top: 140px;
+        left: 450px;
+      }
+      .upimg {
+        width: 15px;
+        height: 40px;
+        position: absolute;
+        left: 355px;
+        top: 100px;
+      }
+      .rigth1 {
+        width: 40px;
+        height: 15px;
+        position: absolute;
+        left: 80px;
+        top: 40px;
+      }
+      .rigth2 {
+        width: 40px;
+        height: 15px;
+        position: absolute;
+        left: 80px;
+        top: 180px;
+      }
+      .rigth3 {
+        width: 40px;
+        height: 15px;
+        position: absolute;
+        left: 400px;
+        top: 180px;
+      }
+      .rigth4 {
+        width: 40px;
+        height: 15px;
+        position: absolute;
+        left: 530px;
+        top: 180px;
+      }
+      .rigthall {
+        width: 40px;
+        height: 270px;
+        position: absolute;
+        left: 250px;
+        top: 50px;
+      }
+    }
+  }
+  .rigth {
+    width: 640px;
+    height: 500px;
+    background: #ffffff;
+
+    box-shadow: 0px 6px 0 #d3f6ef, 0px 0px 20px #d3f6ef;
+
+    border-radius: 32px;
+    opacity: 1;
+    box-sizing: border-box;
+    position: absolute;
+    left: 760px;
+    top: 10px;
+    padding: 30px 44px;
+    .tptitl {
+      display: flex;
+      align-items: center;
+      > img {
+        width: 32px;
+        height: 22px;
+        margin-right: 8px;
       }
     }
-    .rigth {
-      width: 640px;
-      height: 500px;
-      background: #ffffff;
-      box-shadow: 0px 0px 16px 0px rgba(58, 216, 188, 0.102);
-      border-radius: 32px;
-      opacity: 1;
-      box-sizing: border-box;
-      position: absolute;
-      left: 760px;
-      top: 10px;
-      padding: 30px 44px;
-      .tptitl {
+    .onebx1 {
+      width: 100%;
+      height: 100%;
+      position: relative;
+      margin-top: 30px;
+      > div {
         display: flex;
+        flex-direction: column;
         align-items: center;
+        position: absolute;
+        font-size: 14px;
+        font-size: #747474;
         > img {
-          width: 32px;
-          height: 22px;
-          margin-right: 8px;
+          width: 62px;
+          height: 62px;
         }
       }
-      .onebx1 {
-        width: 100%;
-        height: 100%;
-        position: relative;
-        margin-top: 30px;
-        > div {
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          position: absolute;
-          font-size: 14px;
-          font-size: #747474;
-          > img {
-            width: 62px;
-            height: 62px;
-          }
-        }
-        .item1 {
-          top: 140px;
-          left: 50px;
-        }
-        .item2 {
-          top: 140px;
-          left: 170px;
-        }
-        .item3 {
-          top: 270px;
-          left: 170px;
-        }
-        .item4 {
-          top: 10px;
-          left: 300px;
-        }
-        .item5 {
-          top: 140px;
-          left: 300px;
-        }
-        .item6 {
-          top: 10px;
-          left: 430px;
-        }
-        .item7 {
-          top: 140px;
-          left: 430px;
-        }
-        .item8 {
-          top: 270px;
-          left: 430px;
-        }
-        .upimg {
-          width: 15px;
-          height: 40px;
-          position: absolute;
-          left: 190px;
-          top: 230px;
-        }
-        .rigth1 {
-          width: 40px;
-          height: 15px;
-          position: absolute;
-          left: 0px;
-          top: 180px;
-        }
-        .rigth2 {
-          width: 40px;
-          height: 15px;
-          position: absolute;
-          left: 120px;
-          top: 180px;
-        }
-        .rigth3 {
-          width: 40px;
-          height: 15px;
-          position: absolute;
-          left: 375px;
-          top: 180px;
-        }
-        .rigth4 {
-          width: 40px;
-          height: 15px;
-          position: absolute;
-          left: 375px;
-          top: 50px;
-        }
-        .leftall {
-          width: 182px;
-          height: 540px;
-          position: absolute;
-          left: 350px;
-          top: 50px;
-          z-index: 99;
-        }
-        .rigthall {
-          width: 165px;
-          height: 270px;
-          position: absolute;
-          left: 250px;
-          top: 50px;
-        }
+      .item1 {
+        top: 140px;
+        left: 50px;
+      }
+      .item2 {
+        top: 140px;
+        left: 170px;
+      }
+      .item3 {
+        top: 270px;
+        left: 170px;
+      }
+      .item4 {
+        top: 10px;
+        left: 300px;
+      }
+      .item5 {
+        top: 140px;
+        left: 300px;
+      }
+      .item6 {
+        top: 10px;
+        left: 430px;
+      }
+      .item7 {
+        top: 140px;
+        left: 430px;
+      }
+      .item8 {
+        top: 270px;
+        left: 430px;
+      }
+      .upimg {
+        width: 15px;
+        height: 40px;
+        position: absolute;
+        left: 190px;
+        top: 230px;
+      }
+      .rigth1 {
+        width: 40px;
+        height: 15px;
+        position: absolute;
+        left: 0px;
+        top: 180px;
+      }
+      .rigth2 {
+        width: 40px;
+        height: 15px;
+        position: absolute;
+        left: 120px;
+        top: 180px;
+      }
+      .rigth3 {
+        width: 40px;
+        height: 15px;
+        position: absolute;
+        left: 375px;
+        top: 180px;
+      }
+      .rigth4 {
+        width: 40px;
+        height: 15px;
+        position: absolute;
+        left: 375px;
+        top: 50px;
+      }
+      .leftall {
+        width: 182px;
+        height: 540px;
+        position: absolute;
+        left: 350px;
+        top: 50px;
+        z-index: 99;
+      }
+      .rigthall {
+        width: 165px;
+        height: 270px;
+        position: absolute;
+        left: 250px;
+        top: 50px;
       }
     }
-    .buts {
-      width: 1380px;
-      height: 234px;
-      background: #ffffff;
-      box-shadow: 0 0 16px 0 rgba(0, 134, 241, 0.102);
-      border-radius: 32px;
-      opacity: 1;
-      position: absolute;
-      box-sizing: border-box;
-      left: 20px;
-      top: 540px;
-      padding: 30px 44px;
-      .tptitl {
+  }
+  .buts {
+    width: 1380px;
+    height: 234px;
+    background: #ffffff;
+    box-shadow: 0px 6px 0 #c5e5fa, 0px 0px 20px #c5e5fa;
+    border-radius: 32px;
+    opacity: 1;
+    position: absolute;
+    box-sizing: border-box;
+    left: 20px;
+    top: 540px;
+    padding: 30px 44px;
+    .tptitl {
+      display: flex;
+      align-items: center;
+      > img {
+        width: 32px;
+        height: 22px;
+        margin-right: 8px;
+      }
+    }
+    .onebx1 {
+      width: 100%;
+      height: 100%;
+      position: relative;
+      margin-top: 30px;
+      > div {
         display: flex;
+        flex-direction: column;
         align-items: center;
+        position: absolute;
+        font-size: 14px;
+        font-size: #747474;
         > img {
-          width: 32px;
-          height: 22px;
-          margin-right: 8px;
+          width: 62px;
+          height: 62px;
         }
       }
-      .onebx1{
-        width: 100%;
-        height: 100%;
-        position: relative;
-        margin-top: 30px;
-        > div {
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          position: absolute;
-          font-size: 14px;
-          font-size: #747474;
-          > img {
-            width: 62px;
-            height: 62px;
-          }
-        }
-        .item1{
-          left: 1000px;
-          top:10px;
-        }
-        .item2{
-          left: 800px;
-          top:10px;
-        }
-        .item3{
-          left: 600px;
-          top:10px;
-        }
-        .item4{
-          left: 400px;
-          top:10px;
-        }
-        .left1{
-          width: 60px;
-          height: 15px;
-          position: absolute;
-          left: 900px;
-          top: 50px;
-          transform: rotate(180deg);
-        }
-        .left2{
-          width: 60px;
-          height: 15px;
-          position: absolute;
-          left: 700px;
-          top: 50px;
-          transform: rotate(180deg);
-        }
-        .left3{
-          width: 60px;
-          height: 15px;
-          position: absolute;
-          left: 500px;
-          top: 50px;
-          transform: rotate(180deg);
-        }
+      .item1 {
+        left: 1000px;
+        top: 10px;
+      }
+      .item2 {
+        left: 800px;
+        top: 10px;
+      }
+      .item3 {
+        left: 600px;
+        top: 10px;
+      }
+      .item4 {
+        left: 400px;
+        top: 10px;
+      }
+      .left1 {
+        width: 60px;
+        height: 15px;
+        position: absolute;
+        left: 900px;
+        top: 50px;
+        transform: rotate(180deg);
+      }
+      .left2 {
+        width: 60px;
+        height: 15px;
+        position: absolute;
+        left: 700px;
+        top: 50px;
+        transform: rotate(180deg);
+      }
+      .left3 {
+        width: 60px;
+        height: 15px;
+        position: absolute;
+        left: 500px;
+        top: 50px;
+        transform: rotate(180deg);
       }
     }
   }
-  .tptitl{
-    color: #172E60;
-  }
-  .bx{
-    user-select: none;
-  }
\ No newline at end of file
+}
+.tptitl {
+  color: #172e60;
+}
+.bx {
+  user-select: none;
+}
diff --git a/src/styles/login.scss b/src/styles/login.scss
index 743f1fbc..23f95e80 100644
--- a/src/styles/login.scss
+++ b/src/styles/login.scss
@@ -5,14 +5,14 @@
   width: 100%;
   height: 100%;
   margin: 0 auto;
-  background-image: url("/img/bg/bg.jpg");
+  background-image: url('/img/bg/bg.jpg');
   background-size: 100% 100%;
 }
 
 .login-weaper {
   margin: 0 auto;
   width: 1000px;
-  box-shadow: -4px 5px 10px rgba(0, 0, 0, 0.4);
+  box-shadow: 1px 1px 4px #d9d9d9;
 
   .el-input-group__append {
     border: none;
@@ -32,7 +32,7 @@
   border-bottom-left-radius: 5px;
   justify-content: center;
   flex-direction: column;
-  background-color: #8b9aac;
+  background-color: #fff;
   color: #fff;
   float: left;
   width: 50%;
@@ -48,8 +48,8 @@
   left: 25px;
   top: 25px;
   width: 100%;
-  color: #fff;
-  font-weight: 200;
+  color: #002e55;
+  font-weight: 500;
   opacity: 0.9;
   font-size: 18px;
   overflow: hidden;
@@ -76,7 +76,7 @@
 
 .login-main {
   margin: 0 auto;
-  width: 65%;
+  width: 100%;
   box-sizing: border-box;
 }
 
@@ -89,10 +89,10 @@
 }
 
 .login-title {
-  color: #333;
+  color: #002e55;
   margin-bottom: 40px;
-  font-weight: 500;
-  font-size: 22px;
+  font-weight: 600;
+  font-size: 30px;
   text-align: center;
   letter-spacing: 4px;
 }
@@ -112,20 +112,24 @@
 .login-submit {
   width: 100%;
   height: 45px;
-  border: 1px solid #172e60;
+  // border: 1px solid #172e60;
+  border: 0;
   background: none;
   font-size: 18px;
   letter-spacing: 2px;
   font-weight: 300;
-  color: #172e60;
+  color: #fff;
   cursor: pointer;
   margin-top: 30px;
-  font-family: "neo";
+  font-family: 'neo';
   transition: 0.25s;
+  background-color: #d3822a !important;
 }
 
 .login-form {
   margin: 10px 0;
+  width: 65%;
+  margin: 0 auto;
 
   i {
     color: #333;
@@ -181,3 +185,9 @@
   text-align: center;
   cursor: pointer !important;
 }
+.el-input__suffix {
+  // width: 5px !important;
+}
+.inputLog span.el-input__suffix-inner {
+  width: 5px !important;
+}
diff --git a/src/views/addvalue/distributionAddvalue.vue b/src/views/addvalue/distributionAddvalue.vue
index eb871586..eb4bf08f 100644
--- a/src/views/addvalue/distributionAddvalue.vue
+++ b/src/views/addvalue/distributionAddvalue.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row :hidden="!search" style="padding:6px 18px">
+      <el-row :hidden="!search" style="padding: 6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <!-- 查询按钮 -->
@@ -16,7 +16,9 @@
           <!-- 头部左侧按钮模块 -->
           <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="danger" icon="el-icon-delete" @click="handleDelete" plain
+              >删 除</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -27,93 +29,121 @@
       </el-row>
       <el-row>
         <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="data"
-                  :height="height"
-                  style="width: 100%"
-                  :border="option.border">
-          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+        <el-table
+          ref="table"
+          v-loading="loading"
+          @selection-change="selectionChange"
+          :data="data"
+          :height="height"
+          style="width: 100%"
+          :border="option.border"
+        >
+          <el-table-column
+            type="selection"
+            v-if="option.selection"
+            width="55"
+            align="center"
+          ></el-table-column>
           <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
           <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
           </el-table-column>
-          <template v-for="(item,index) in option.column">
+          <template v-for="(item, index) in option.column">
             <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index">
+            <el-table-column
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+            >
             </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" @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 #="{ row }">
+              <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>
       </el-row>
       <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
+        <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="[10, 20, 30, 40, 50, 100]"
-                         :page-size="page.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="page.total">
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[10, 20, 30, 40, 50, 100]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
           </el-pagination>
         </div>
       </el-row>
       <!-- 表单模块 -->
-      <el-dialog :title="title"
-                 v-model="box"
-                 width="50%"
-                 :before-close="beforeClose"
-                 append-to-body>
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
         <el-form :disabled="view" ref="form" :model="form" label-width="80px">
           <!-- 表单字段 -->
-          <el-form-item label="增值服务关联码表;码表；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；" prop="addvalueId">
-            <el-input v-model="form.addvalueId" placeholder="请输入增值服务关联码表;码表；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；"/>
+          <el-form-item
+            label="增值服务关联码表;码表；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；"
+            prop="addvalueId"
+          >
+            <el-input
+              v-model="form.addvalueId"
+              placeholder="请输入增值服务关联码表;码表；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；"
+            />
           </el-form-item>
           <el-form-item label="关联表ID" prop="refId">
-            <el-input v-model="form.refId" placeholder="请输入关联表ID"/>
+            <el-input v-model="form.refId" placeholder="请输入关联表ID" />
           </el-form-item>
           <el-form-item label="关联类型 1 预约单 2 配送单 3 ." prop="refType">
-            <el-input v-model="form.refType" placeholder="请输入关联类型 1 预约单 2 配送单 3 ."/>
+            <el-input v-model="form.refType" placeholder="请输入关联类型 1 预约单 2 配送单 3 ." />
           </el-form-item>
           <el-form-item label="编号" prop="code">
-            <el-input v-model="form.code" placeholder="请输入编号"/>
+            <el-input v-model="form.code" placeholder="请输入编号" />
           </el-form-item>
           <el-form-item label="预留1" prop="reserve1">
-            <el-input v-model="form.reserve1" placeholder="请输入预留1"/>
+            <el-input v-model="form.reserve1" placeholder="请输入预留1" />
           </el-form-item>
           <el-form-item label="预留2" prop="reserve2">
-            <el-input v-model="form.reserve2" placeholder="请输入预留2"/>
+            <el-input v-model="form.reserve2" placeholder="请输入预留2" />
           </el-form-item>
           <el-form-item label="预留3" prop="reserve3">
-            <el-input v-model="form.reserve3" placeholder="请输入预留3"/>
+            <el-input v-model="form.reserve3" placeholder="请输入预留3" />
           </el-form-item>
           <el-form-item label="预留4" prop="reserve4">
-            <el-input v-model="form.reserve4" placeholder="请输入预留4"/>
+            <el-input v-model="form.reserve4" placeholder="请输入预留4" />
           </el-form-item>
           <el-form-item label="预留5" prop="reserve5">
-            <el-input v-model="form.reserve5" placeholder="请输入预留5"/>
+            <el-input v-model="form.reserve5" placeholder="请输入预留5" />
           </el-form-item>
           <el-form-item label="费用" prop="fee">
-            <el-input v-model="form.fee" placeholder="请输入费用"/>
+            <el-input v-model="form.fee" placeholder="请输入费用" />
           </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">提 交</el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+              >提 交</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
@@ -123,12 +153,12 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/addvalue/distributionAddvalue";
-import option from "@/option/addvalue/distributionAddvalue";
-import { mapGetters } from "vuex";
+import { getList, getDetail, add, update, remove } from '@/api/addvalue/distributionAddvalue';
+import option from '@/option/addvalue/distributionAddvalue';
+import { mapGetters } from 'vuex';
 
 export default {
-  data () {
+  data() {
     return {
       height: 0,
       // 弹框标题
@@ -147,7 +177,7 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 10,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -157,45 +187,45 @@ export default {
       option: option,
       // 表单列表
       data: [],
-    }
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    handleSubmit () {
+    handleSubmit() {
       if (!this.form.id) {
         add(this.form).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
       } else {
@@ -203,41 +233,41 @@ export default {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
-        })
+        });
       }
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -246,16 +276,16 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -263,32 +293,32 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       this.selectionList = list;
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
       this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
@@ -297,7 +327,7 @@ export default {
         this.loading = false;
         this.selectionClear();
       });
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/views/basic/deline/basicDeline.vue b/src/views/basic/deline/basicDeline.vue
index 90d9f11a..6d6a18e5 100644
--- a/src/views/basic/deline/basicDeline.vue
+++ b/src/views/basic/deline/basicDeline.vue
@@ -1,278 +1,286 @@
 <template>
   <basic-container>
-    <avue-crud  v-if="edit"
+    <avue-crud
+      v-if="edit"
       :option="option"
-               v-model:search="search"
-               v-model:page="page"
-               v-model="form"
-               :table-loading="loading"
-               :data="data"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+      v-model:search="search"
+      v-model:page="page"
+      v-model="form"
+      :table-loading="loading"
+      :data="data"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
       <template #menu-left>
-        <el-button type="danger"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.basicDeline_delete"
-                   @click="handleDelete">删 除
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          v-if="permission.basicDeline_delete"
+          @click="handleDelete"
+          >删 除
         </el-button>
-        <el-button type="primary" icon="el-icon-plus"  @click="addEditDeline()">新  增</el-button>
-        <el-button type="primary"  @click="nodeManagement()">节 点 管 理</el-button>
-<!--        <el-button type="warning"-->
-<!--                   plain-->
-<!--                   icon="el-icon-download"-->
-<!--                   @click="handleExport">导 出-->
-<!--        </el-button>-->
+        <el-button type="primary" icon="el-icon-plus" @click="addEditDeline()">新 增</el-button>
+        <el-button type="primary" @click="nodeManagement()">节 点 管 理</el-button>
+        <!--        <el-button type="warning"-->
+        <!--                   plain-->
+        <!--                   icon="el-icon-download"-->
+        <!--                   @click="handleExport">导 出-->
+        <!--        </el-button>-->
       </template>
-      <template #menu="{size,row,index}">
-        <el-button type="primary" text icon="el-icon-view" @click="addEditDeline(row)">编  辑</el-button>
-        <el-button type="primary" text icon="el-icon-view" @click="viewDeline(row)">查  看</el-button>
+      <template #menu="{ size, row, index }">
+        <el-button type="primary" text icon="el-icon-view" @click="addEditDeline(row)"
+          >编 辑</el-button
+        >
+        <el-button type="primary" text icon="el-icon-view" @click="viewDeline(row)"
+          >查 看</el-button
+        >
       </template>
     </avue-crud>
-    <basicDeLineform v-if="!edit"   @returnDeline ="returnDeline" :delineformdata="delineformdata" />
+    <basicDeLineform v-if="!edit" @returnDeline="returnDeline" :delineformdata="delineformdata" />
   </basic-container>
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove} from "@/api/basic/basicDeline";
-  import option from "@/option/basic/basicDeline";
-  import {mapGetters} from "vuex";
-  import {exportBlob} from "@/api/common";
-  import {getToken} from '@/utils/auth';
-  import {downloadXls} from "@/utils/util";
-  import {dateNow} from "@/utils/date";
-  import NProgress from 'nprogress';
-  import 'nprogress/nprogress.css';
-  import basicDeLineform from '/src/views/basic/deline/basicdeLineform.vue'
-  export default {
-    components: { basicDeLineform },
-    data() {
+import { getList, getDetail, add, update, remove } from '@/api/basic/basicDeline';
+import option from '@/option/basic/basicDeline';
+import { mapGetters } from 'vuex';
+import { exportBlob } from '@/api/common';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { dateNow } from '@/utils/date';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import basicDeLineform from '/src/views/basic/deline/basicdeLineform.vue';
+export default {
+  components: { basicDeLineform },
+  data() {
+    return {
+      form: {},
+      query: {},
+      search: {},
+      loading: true,
+      edit: true,
+      delineformdata: {},
+      page: {
+        pageSize: 30,
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option: option,
+      data: [],
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
       return {
-        form: {},
-        query: {},
-        search: {},
-        loading: true,
-        edit:true,
-        delineformdata:{},
-        page: {
-          pageSize: 30,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: option,
-        data: []
+        addBtn: this.validData(this.permission.basicDeline_add, false),
+        viewBtn: this.validData(this.permission.basicDeline_view, false),
+        delBtn: this.validData(this.permission.basicDeline_delete, false),
+        editBtn: this.validData(this.permission.basicDeline_edit, false),
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.validData(this.permission.basicDeline_add, false),
-          viewBtn: this.validData(this.permission.basicDeline_view, false),
-          delBtn: this.validData(this.permission.basicDeline_delete, false),
-          editBtn: this.validData(this.permission.basicDeline_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+  },
+  methods: {
+    //节点管理
+    nodeManagement() {
+      this.$router.push({
+        path: '/basic/delinenode/basicDelineNode',
+        query: {},
+      });
+    },
+    returnDeline(val) {
+      console.log('取消>>>>>', val);
+      this.edit = true;
+    },
+    addEditDeline(row) {
+      console.log('row>>>>>>>>>>>>>>>>>>>>', row);
+      this.delineformdata = {};
+      this.delineformdata.view = false;
+      if (!!row) {
+        this.delineformdata = row;
+        this.delineformdata.view = false;
+        this.delineformdata.delinenode = [{}];
+        this.delineformdata.end = [{}];
       }
+      this.edit = false;
     },
-    methods: {
-      //节点管理
-      nodeManagement(){
-        this.$router.push({
-          path: '/basic/delinenode/basicDelineNode',
-          query: {
-          }
-        });
-      },
-      returnDeline(val){
-        console.log("取消>>>>>",val);
-        this.edit = true;
-      },
-      addEditDeline(row){
-        console.log("row>>>>>>>>>>>>>>>>>>>>",row);
-        this.delineformdata={}
-        this.delineformdata.view =false;
-        if (!!row){
-          this.delineformdata  = row
-          this.delineformdata.view =false;
-          this.delineformdata.delinenode = [{}]
-          this.delineformdata.end = [{}]
-        }
-        this.edit =false
 
-      },
-
-      viewDeline(row){
-        console.log("row>>>>>>>>>>>>>>>>>>>>",row);
-        this.delineformdata={}
+    viewDeline(row) {
+      console.log('row>>>>>>>>>>>>>>>>>>>>', row);
+      this.delineformdata = {};
       //  if (!!row){
-          this.delineformdata  = row
-          this.delineformdata.view =true;
-          this.delineformdata.delinenode = [{}]
-          this.delineformdata.end = [{}]
-     //   }
-        this.edit =false
-
-      },
-      rowSave(row, done, loading) {
-        add(row).then(() => {
+      this.delineformdata = row;
+      this.delineformdata.view = true;
+      this.delineformdata.delinenode = [{}];
+      this.delineformdata.end = [{}];
+      //   }
+      this.edit = false;
+    },
+    rowSave(row, done, loading) {
+      add(row).then(
+        () => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
           done();
-        }, error => {
+        },
+        error => {
           loading();
           window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
           done();
-        }, error => {
+        },
+        error => {
           loading();
           console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
         }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
         })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-      },
-      handleExport() {
-        let downloadUrl = `/basic/basicDeline/export-basicDeline?${this.website.tokenHeader}=${getToken()}`;
-        const {
-            warehouseId,
-        } = this.query;
-        let values = {
-            warehouseId_equal: warehouseId,
-        };
-        this.$confirm("是否导出数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          NProgress.start();
-          exportBlob(downloadUrl, values).then(res => {
-            downloadXls(res.data, `提货路线${dateNow()}.xlsx`);
-            NProgress.done();
-          })
         });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleExport() {
+      let downloadUrl = `/basic/basicDeline/export-basicDeline?${
+        this.website.tokenHeader
+      }=${getToken()}`;
+      const { warehouseId } = this.query;
+      let values = {
+        warehouseId_equal: warehouseId,
+      };
+      this.$confirm('是否导出数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        NProgress.start();
+        exportBlob(downloadUrl, values).then(res => {
+          downloadXls(res.data, `提货路线${dateNow()}.xlsx`);
+          NProgress.done();
+        });
+      });
+    },
+    beforeOpen(done, type) {
+      if (['edit', 'view'].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
 
-        const {
-            warehouseId,
-        } = this.query;
+      const { warehouseId } = this.query;
 
-        let values = {
-            warehouseId_equal: warehouseId,
-        };
+      let values = {
+        warehouseId_equal: warehouseId,
+      };
 
-        getList(page.currentPage, page.pageSize, values).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
 </script>
 
-<style>
-</style>
+<style></style>
diff --git a/src/views/basic/forklift/basicForklift.vue b/src/views/basic/forklift/basicForklift.vue
index cd7d380e..d7ae576b 100644
--- a/src/views/basic/forklift/basicForklift.vue
+++ b/src/views/basic/forklift/basicForklift.vue
@@ -1,16 +1,17 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
+      <el-row v-if="!search" style="padding: 6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="请选择事业线">
-            <el-select v-model="query.businessLine" clearable placeholder="请选择事业线" >
+            <el-select v-model="query.businessLine" clearable placeholder="请选择事业线">
               <el-option
                 v-for="item in businessLineData"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -19,12 +20,13 @@
           <!--            </el-form-item>-->
           <el-form-item label="供应商">
             <!--              <el-input v-model="query.supplier" placeholder="请输入供应商;1-汉智叉车,2-荆门荆拓,3-天津德丰,4-力至优叉车,5-深圳鑫涛"></el-input>-->
-            <el-select v-model="query.supplier" clearable placeholder="请选择供应商" >
+            <el-select v-model="query.supplier" clearable placeholder="请选择供应商">
               <el-option
                 v-for="item in supplierData"
                 :key="item.dictKey"
                 :label="item.dictValue"
-                :value="item.dictKey">
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -49,7 +51,9 @@
           <!-- 头部左侧按钮模块 -->
           <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="danger" icon="el-icon-delete" @click="handleDelete" plain
+              >删 除</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -60,7 +64,6 @@
         </div>
       </el-row>
       <el-row>
-
         <!-- 列表模块 -->
         <tablecmt
           :columnList="columnList"
@@ -73,47 +76,76 @@
           @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-edit" @click="handleEdit(slotProps.scope.row)">编辑</el-text>
-              <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-view"
+              @click="handleView(slotProps.scope.row)"
+              >查看</el-text
+            >
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-edit"
+              @click="handleEdit(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 flex-c-sb" style="width:100%;">
-          <div style="font-size: 14px;">
-            勾选数量: {{ selectionList.length }}
-          </div>
+      <el-row>
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
-          <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
+            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="title"
-                 v-model="box"
-                 width="50%"
-                 :before-close="beforeClose"
-                 append-to-body>
-        <el-form :disabled="view" :size="option.size" ref="form" :rules="validatorRules" :model="form" label-width="80px">
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
+        <el-form
+          :disabled="view"
+          :size="option.size"
+          ref="form"
+          :rules="validatorRules"
+          :model="form"
+          label-width="80px"
+        >
           <!-- 表单字段 -->
           <el-row>
             <el-col :span="11">
-              <el-form-item label="事业线" prop="businessLine"  label-width="80px">
-                <el-select v-model="form.businessLine" clearable placeholder="请选择事业线" style="position: absolute;right: 0px;width: 100%">
+              <el-form-item label="事业线" prop="businessLine" label-width="80px">
+                <el-select
+                  v-model="form.businessLine"
+                  clearable
+                  placeholder="请选择事业线"
+                  style="position: absolute; right: 0px; width: 100%"
+                >
                   <el-option
                     v-for="item in businessLineData"
                     :key="item.dictKey"
                     :label="item.dictValue"
-                    :value="item.dictKey">
+                    :value="item.dictKey"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -121,7 +153,11 @@
 
             <el-col :span="12">
               <el-form-item label="使用单位" prop="useUnit" label-width="120px">
-                <el-input v-model="form.useUnit" placeholder="请输入使用单位" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.useUnit"
+                  placeholder="请输入使用单位"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -129,18 +165,28 @@
           <el-row>
             <el-col :span="11">
               <el-form-item label="受票主体" prop="ticketRecipient" label-width="80px">
-                <el-input v-model="form.ticketRecipient" placeholder="请输入受票主体" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.ticketRecipient"
+                  placeholder="请输入受票主体"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="供应商" prop="supplier" label-width="120px">
-                <el-select v-model="form.supplier" clearable placeholder="供应商" style="position: absolute;right: 0px;width: 100%">
+                <el-select
+                  v-model="form.supplier"
+                  clearable
+                  placeholder="供应商"
+                  style="position: absolute; right: 0px; width: 100%"
+                >
                   <el-option
                     v-for="item in supplierData"
                     :key="item.dictKey"
                     :label="item.dictValue"
-                    :value="item.dictKey">
+                    :value="item.dictKey"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -150,12 +196,18 @@
           <el-row>
             <el-col :span="11">
               <el-form-item label="资产类型" prop="assetType" label-width="80px">
-                <el-select v-model="form.assetType" clearable placeholder="资产类型" style="position: absolute;right: 0px;width: 100%">
+                <el-select
+                  v-model="form.assetType"
+                  clearable
+                  placeholder="资产类型"
+                  style="position: absolute; right: 0px; width: 100%"
+                >
                   <el-option
                     v-for="item in assetTypeData"
                     :key="item.dictKey"
                     :label="item.dictValue"
-                    :value="item.dictKey">
+                    :value="item.dictKey"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -163,12 +215,18 @@
 
             <el-col :span="12">
               <el-form-item label="类型" prop="forkliftType" label-width="120px">
-                <el-select v-model="form.forkliftType" clearable placeholder="请选择类型" style="position: absolute;right: 0px;width: 100%">
+                <el-select
+                  v-model="form.forkliftType"
+                  clearable
+                  placeholder="请选择类型"
+                  style="position: absolute; right: 0px; width: 100%"
+                >
                   <el-option
                     v-for="item in forkliftTypeData"
                     :key="item.dictKey"
                     :label="item.dictValue"
-                    :value="item.dictKey">
+                    :value="item.dictKey"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -178,44 +236,65 @@
           <el-row>
             <el-col :span="11">
               <el-form-item label="摘要" prop="abstracts" label-width="80px">
-                <el-input v-model="form.abstract" placeholder="请输入摘要" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.abstract"
+                  placeholder="请输入摘要"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="载重" prop="loads" label-width="120px">
-                <el-input v-model="form.loads" placeholder="请输入载重;单位（T）" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.loads"
+                  placeholder="请输入载重;单位（T）"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
 
-
           <el-row>
             <el-col :span="11">
               <el-form-item label="载高" prop="loadHeight" label-width="80px">
-                <el-input v-model="form.loadHeight" placeholder="请输入载高;单位（M）" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.loadHeight"
+                  placeholder="请输入载高;单位（M）"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="整车尺寸" prop="vehicleSize" label-width="120px">
-                <el-input v-model="form.vehicleSize" placeholder="请输入整车尺寸;长*宽*高" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.vehicleSize"
+                  placeholder="请输入整车尺寸;长*宽*高"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
 
-
-
           <el-row>
             <el-col :span="11">
               <el-form-item label="货叉宽度" prop="forkArmsWidth" label-width="80px">
-                <el-input v-model="form.forkArmsWidth" placeholder="请输入货叉宽度;（MAX外宽,单位M）" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.forkArmsWidth"
+                  placeholder="请输入货叉宽度;（MAX外宽,单位M）"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="货叉长度" prop="forkArmsHeight" label-width="120px">
-                <el-input v-model="form.forkArmsHeight" placeholder="请输入货叉长度;(单位M)" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.forkArmsHeight"
+                  placeholder="请输入货叉长度;(单位M)"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -223,79 +302,120 @@
           <el-row>
             <el-col :span="11">
               <el-form-item label="最小转弯半径" prop="minimumTurningRadius" label-width="80px">
-                <el-input v-model="form.minimumTurningRadius" placeholder="请输入最小转弯半径;(单位M)" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.minimumTurningRadius"
+                  placeholder="请输入最小转弯半径;(单位M)"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="通道宽度" prop="channelWidth" label-width="120px">
-                <el-input v-model="form.channelWidth" placeholder="请输入通道宽度;((min),单位M)" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.channelWidth"
+                  placeholder="请输入通道宽度;((min),单位M)"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
 
-
-
           <el-row>
             <el-col :span="11">
               <el-form-item label="月租" prop="monthlyRent" label-width="80px">
-                <el-input v-model="form.monthlyRent" placeholder="请输入月租(元/月)" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.monthlyRent"
+                  placeholder="请输入月租(元/月)"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="数量" prop="number" label-width="120px">
-                <el-input v-model="form.number" placeholder="请输入数量(台)" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.number"
+                  placeholder="请输入数量(台)"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
 
-
           <el-row>
             <el-col :span="11">
               <el-form-item label="合同编号" prop="contractNumber" label-width="80px">
-                <el-input v-model="form.contractNumber" placeholder="请输入合同编号" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.contractNumber"
+                  placeholder="请输入合同编号"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="起租期限" prop="leaseStartPeriod" label-width="120px">
-                <el-input v-model="form.leaseStartPeriod" placeholder="请输入起租期限;中文大写" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.leaseStartPeriod"
+                  placeholder="请输入起租期限;中文大写"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
 
-
           <el-row>
             <el-col :span="11">
               <el-form-item label="租赁开始时间" prop="leaseStartTime" label-width="80px">
-                <el-date-picker v-model="form.leaseStartTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择租赁开始时间" style="position: absolute;right: 0px;width: 100%"></el-date-picker>
+                <el-date-picker
+                  v-model="form.leaseStartTime"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                  placeholder="请选择租赁开始时间"
+                  style="position: absolute; right: 0px; width: 100%"
+                ></el-date-picker>
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="租赁结束时间" prop="leaseEndTime" label-width="120px">
-                <el-date-picker v-model="form.leaseEndTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择租赁结束时间" style="position: absolute;right: 0px;width: 100%"></el-date-picker>
+                <el-date-picker
+                  v-model="form.leaseEndTime"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                  placeholder="请选择租赁结束时间"
+                  style="position: absolute; right: 0px; width: 100%"
+                ></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
 
-
           <el-row>
             <el-col :span="11">
               <el-form-item label="付款周期" prop="paymentCycle" label-width="80px">
-                <el-input v-model="form.paymentCycle" placeholder="请输入付款周期;(月)" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.paymentCycle"
+                  placeholder="请输入付款周期;(月)"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="付款方式" prop="paymentMethod" label-width="120px">
-                <el-select v-model="form.paymentMethod" clearable placeholder="请选择付款方式" style="position: absolute;right: 0px;width: 100%">
+                <el-select
+                  v-model="form.paymentMethod"
+                  clearable
+                  placeholder="请选择付款方式"
+                  style="position: absolute; right: 0px; width: 100%"
+                >
                   <el-option
                     v-for="item in paymentMethodData"
                     :key="item.dictKey"
                     :label="item.dictValue"
-                    :value="item.dictKey">
+                    :value="item.dictKey"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -303,45 +423,53 @@
           </el-row>
 
           <el-row>
-
-
             <el-col :span="11">
               <el-form-item label="押金" prop="deposit" label-width="80px">
-                <el-input v-model="form.deposit" placeholder="请输入押金;（元）" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.deposit"
+                  placeholder="请输入押金;（元）"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="备注" prop="notes" label-width="120px">
-                <el-input v-model="form.notes" placeholder="请输入备注" style="position: absolute;right: 0px;width: 100%"/>
+                <el-input
+                  v-model="form.notes"
+                  placeholder="请输入备注"
+                  style="position: absolute; right: 0px; width: 100%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
 
           <el-row>
-
-
             <el-col :span="11">
               <el-form-item label="所属仓库" prop="owningWarehouse">
-                <el-select v-model="form.owningWarehouse" clearable placeholder="请选择仓库" style="position: absolute;right: 0px;width: 100%">
+                <el-select
+                  v-model="form.owningWarehouse"
+                  clearable
+                  placeholder="请选择仓库"
+                  style="position: absolute; right: 0px; width: 100%"
+                >
                   <el-option
                     v-for="item in owningWarehouseData"
                     :key="item.dictKey"
                     :label="item.dictValue"
-                    :value="item.dictKey+''">
+                    :value="item.dictKey + ''"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
-
             </el-col>
           </el-row>
 
-
           <!--          <el-form-item label="整车图片" prop="forkliftPhoto">-->
           <!--            <el-input v-model="form.forkliftPhoto" placeholder="请输入整车图片"/>-->
           <!--          </el-form-item>-->
           <el-row>
             <el-col :span="11">
-              <el-form-item label="叉车图片"  label-width="100px">
+              <el-form-item label="叉车图片" label-width="100px">
                 <el-upload
                   multiple
                   v-model:file-list="fileList"
@@ -352,23 +480,29 @@
                   :headers="headers"
                   :auto-upload="true"
                   :on-preview="handlePictureCardPreview"
-                  :on-remove="handleRemove">
+                  :on-remove="handleRemove"
+                >
                   <el-icon><Plus /></el-icon>
                 </el-upload>
-                <span v-if="!view"> 上传文件只能是<b style="color: #C03639">png，jpeg，jpg</b>格式,大小不能超过<b style="color: #C03639">10M,最多3张</b> </span>
-                <el-dialog v-model="dialogVisible" >
+                <span v-if="!view">
+                  上传文件只能是<b style="color: #c03639">png，jpeg，jpg</b>格式,大小不能超过<b
+                    style="color: #c03639"
+                    >10M,最多3张</b
+                  >
+                </span>
+                <el-dialog v-model="dialogVisible">
                   <img w-full :src="dialogImageUrl" alt="Preview Image" />
                 </el-dialog>
-
               </el-form-item>
             </el-col>
           </el-row>
-
         </el-form>
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+              >提 交</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
@@ -384,290 +518,290 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/basic/basicForklift";
-import option from "@/option/basic/basicForklift2";
-import { mapGetters } from "vuex";
+import { getList, getDetail, add, update, remove } from '@/api/basic/basicForklift';
+import option from '@/option/basic/basicForklift2';
+import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getToken } from '@/utils/auth';
 
 export default {
-  data () {
+  data() {
     return {
       columnList: [
-          {
-            prop: '',
-            label: '序号',
-            type: 0,
-            values: '',
-            width: 55,
-            checkarr: [],
-            fixed: true,
-          },
-          {
-            prop: 'businessLine',
-            label: '事业线',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-            // head: true,
-          },
-          {
-            prop: 'useUnit',
-            label: '使用单位',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-            // head: true,
-          },
-          {
-            prop: 'ticketRecipient',
-            label: '受票主体',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'supplier',
-            label: '供应商',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'assetType',
-            label: '资产类型',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'forkliftType',
-            label: '类型',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'abstract',
-            label: '摘要',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'load',
-            label: '载重(T)',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'loadHeight',
-            label: '载高(M)',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'vehicleSize',
-            label: '整车尺寸',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'forkArmsWidth',
-            label: '货叉宽(M)',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'forkArmsHeight',
-            label: '货叉长(M)',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'minimumTurningRadius',
-            label: '最小转弯半径(M)',
-            type: 2,
-            values: '',
-            width: '180',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'channelWidth',
-            label: '通道宽(M)',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'monthlyRent',
-            label: '月租(元/月)',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'number',
-            label: '数量(台)',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'contractNumber',
-            label: '合同编号',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'leaseStartPeriod',
-            label: '起租期限',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'leaseStartTime',
-            label: '租赁开始时间',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'leaseEndTime',
-            label: '租赁结束时间',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'paymentCycle',
-            label: '付款周期(月)',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'deposit',
-            label: '押金(元)',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'paymentMethod',
-            label: '付款方式',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'notes',
-            label: '备注',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'owningWarehouse',
-            label: '所属仓库',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: '',
-            label: '操作',
-            type: 6,
-            values: '',
-            width: '200',
-            checkarr: [],
-            fixed: 'right',
-            sortable: false
-          }
-          // 更多列的配置...
-        ],
-        drawerShow: false,
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'businessLine',
+          label: '事业线',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          // head: true,
+        },
+        {
+          prop: 'useUnit',
+          label: '使用单位',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          // head: true,
+        },
+        {
+          prop: 'ticketRecipient',
+          label: '受票主体',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'supplier',
+          label: '供应商',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'assetType',
+          label: '资产类型',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'forkliftType',
+          label: '类型',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'abstract',
+          label: '摘要',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'load',
+          label: '载重(T)',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'loadHeight',
+          label: '载高(M)',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'vehicleSize',
+          label: '整车尺寸',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'forkArmsWidth',
+          label: '货叉宽(M)',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'forkArmsHeight',
+          label: '货叉长(M)',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'minimumTurningRadius',
+          label: '最小转弯半径(M)',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'channelWidth',
+          label: '通道宽(M)',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'monthlyRent',
+          label: '月租(元/月)',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'number',
+          label: '数量(台)',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'contractNumber',
+          label: '合同编号',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'leaseStartPeriod',
+          label: '起租期限',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'leaseStartTime',
+          label: '租赁开始时间',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'leaseEndTime',
+          label: '租赁结束时间',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'paymentCycle',
+          label: '付款周期(月)',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deposit',
+          label: '押金(元)',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'paymentMethod',
+          label: '付款方式',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'notes',
+          label: '备注',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'owningWarehouse',
+          label: '所属仓库',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: 'right',
+          sortable: false,
+        },
+        // 更多列的配置...
+      ],
+      drawerShow: false,
       height: 0,
       // 弹框标题
       title: '',
@@ -675,8 +809,8 @@ export default {
       box: false,
       //文件上传
       fileList: [],
-      dialogVisible:false,
-      dialogImageUrl:'',
+      dialogVisible: false,
+      dialogImageUrl: '',
       // 是否显示查询
       search: true,
       // 加载中
@@ -689,30 +823,26 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
       // 选择行
       selectionList: [],
-      businessLineData:[],
-      supplierData:[],
-      owningWarehouseData:[],
-      paymentMethodData:[],
-      forkliftTypeData:[],
-      assetTypeData:[],
+      businessLineData: [],
+      supplierData: [],
+      owningWarehouseData: [],
+      paymentMethodData: [],
+      forkliftTypeData: [],
+      assetTypeData: [],
       // 表单配置
       option: option,
       // 表单列表
       data: [],
       //表单校验
       validatorRules: {
-        businessLine: [
-          { required: true, message: '请选择事业线!',trigger: 'blur'}
-        ],
-        ticketRecipient: [
-          { required: true, message: '请输入受票主体!',trigger: 'blur'}
-        ],
+        businessLine: [{ required: true, message: '请选择事业线!', trigger: 'blur' }],
+        ticketRecipient: [{ required: true, message: '请输入受票主体!', trigger: 'blur' }],
         // deviceSerialNumber: [
         //   { required: true, message: '请输入序列号!',trigger: 'blur'}
         // ],
@@ -720,16 +850,16 @@ export default {
         //   { required: true, message: '请选择状态!',trigger: 'blur'}
         // ],
         monthlyRent: [
-          { required: true, message: '请输入月租!',trigger: 'blur'},{pattern: /(^[1-9]\d{0,9}(\.\d{1,3})?$)|(^0(\.\d{1,2})?$)/, message: '月租格式不正确!'}
+          { required: true, message: '请输入月租!', trigger: 'blur' },
+          { pattern: /(^[1-9]\d{0,9}(\.\d{1,3})?$)|(^0(\.\d{1,2})?$)/, message: '月租格式不正确!' },
         ],
         // purchaseAmount: [
         //   {pattern: /(^[1-9]\d{0,9}(\.\d{1,3})?$)|(^0(\.\d{1,2})?$)/, message: '押金格式不正确!'}
         // ],
-
       },
-    }
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     //查询字典
     this.queryDictionary();
@@ -737,9 +867,9 @@ export default {
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-    let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
-    let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
-    let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
     if (checkListnewarr) {
       this.columnList.map(item => {
         item.head = false;
@@ -751,14 +881,14 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.head){
-          arr.push(item.label)
+        if (item.head) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'checkList',arr)
+      this.$functions.setStorage(window.location.pathname + 'checkList', arr);
     }
     if (flexListnewarr) {
       this.columnList.map(item => {
@@ -767,22 +897,22 @@ export default {
       flexListnewarr.map(ite => {
         this.columnList.map(item => {
           if (ite == item.label) {
-            if(item.type==6){
+            if (item.type == 6) {
               item.fixed = 'right';
-            }else{
+            } else {
               item.fixed = true;
             }
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.fixed){
-          arr.push(item.label)
+        if (item.fixed) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'flexList',arr)
+      this.$functions.setStorage(window.location.pathname + 'flexList', arr);
     }
     if (sortlistnewarr) {
       this.columnList.map(item => {
@@ -795,58 +925,55 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.sortable){
-          arr.push(item.label)
+        if (item.sortable) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+      this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
     }
   },
-  created() {
-
-  },
+  created() {},
   computed: {
-    ...mapGetters(["permission"]),
+    ...mapGetters(['permission']),
     headers() {
       return {
-        "Blade-Auth":'Bearer ' + getToken()
-      }
+        'Blade-Auth': 'Bearer ' + getToken(),
+      };
     },
     action() {
-      return '/api/blade-resource/oss/endpoint/put-file'
+      return '/api/blade-resource/oss/endpoint/put-file';
     },
-    ids () {
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
-    showdrawer(value){
-      this.drawerShow=value
+    showdrawer(value) {
+      this.drawerShow = value;
     },
     /**
      * 弹窗的勾选回调，用于更改头部数组
      * 固定搭配，只需要更换   columnList
      */
-    setnewcolum(newarr, headarr,type) {
+    setnewcolum(newarr, headarr, type) {
       // console.log(newarr,'+++++++++++')
-      if(type==1){
+      if (type == 1) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
-      }else if(type==2){
+        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.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+      } else if (type == 3) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+        this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
       }
-
     },
     selectionsc(value) {
       console.log(value);
@@ -857,152 +984,154 @@ export default {
     },
     editsolt(scope) {
       const { row } = scope;
-      console.log("row>>>>>>>>>>>>>>>>>>>",row);
+      console.log('row>>>>>>>>>>>>>>>>>>>', row);
     },
     btnsc(index, row) {
       console.log(index, row);
     },
     selectsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
     timesc(index, row) {
-      if (!!index){
+      if (!!index) {
         index = dayjs(index).format('YYYY-MM-DD');
       }
-      this.query[row.prop] =  index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
     inputsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
-    queryDictionary(){
-      getDictionaryBiz("basic_business_line").then(res=>{
-        this.businessLineData =res.data.data
-      })
-      getDictionaryBiz("basic_forklift_supplier").then(res=>{
-        this.supplierData =res.data.data
-      })
-      getDictionaryBiz("basic_forklift_assettype").then(res=>{
-        this.assetTypeData =res.data.data
-      })
-      getDictionaryBiz("basic_forklift_type").then(res=>{
-        this.forkliftTypeData =res.data.data
-      })
-      getDictionaryBiz("basic_forklift_payment").then(res=>{
-        this.paymentMethodData =res.data.data
+    queryDictionary() {
+      getDictionaryBiz('basic_business_line').then(res => {
+        this.businessLineData = res.data.data;
+      });
+      getDictionaryBiz('basic_forklift_supplier').then(res => {
+        this.supplierData = res.data.data;
+      });
+      getDictionaryBiz('basic_forklift_assettype').then(res => {
+        this.assetTypeData = res.data.data;
+      });
+      getDictionaryBiz('basic_forklift_type').then(res => {
+        this.forkliftTypeData = res.data.data;
+      });
+      getDictionaryBiz('basic_forklift_payment').then(res => {
+        this.paymentMethodData = res.data.data;
         this.onLoad(this.page);
-      })
+      });
     },
     //查看图片
     handlePictureCardPreview(file) {
-      if (!!file.response){this.dialogImageUrl = file.response.data.link;}
-      else
-      {this.dialogImageUrl=file.url}
+      if (!!file.response) {
+        this.dialogImageUrl = file.response.data.link;
+      } else {
+        this.dialogImageUrl = file.url;
+      }
       this.dialogVisible = true;
     },
     //移除图片
     handleRemove(file, fileList) {
       console.log(file, fileList);
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    handleSubmit () {
-      this.$refs.form.validate(valid=>{
+    handleSubmit() {
+      this.$refs.form.validate(valid => {
         if (valid) {
-      this.urlsplit();
-      if (!this.form.id) {
-        add(this.form).then(() => {
-          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: "操作成功!"
-          });
-        })
-      }
+          this.urlsplit();
+          if (!this.form.id) {
+            add(this.form).then(() => {
+              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: '操作成功!',
+              });
+            });
+          }
         } else {
           console.log('error submit!!');
           return false;
         }
       });
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
-        if (!!res.data.data.forkliftPhoto){
-          let fileList = res.data.data.forkliftPhoto.split(",")
+        if (!!res.data.data.forkliftPhoto) {
+          let fileList = res.data.data.forkliftPhoto.split(',');
           this.fileList = fileList.map(item => {
             return {
-              url:  item
-            }
+              url: item,
+            };
           });
         }
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
-        if (!!res.data.data.photo){
-          let fileList = res.data.data.photo.split(",")
+        if (!!res.data.data.photo) {
+          let fileList = res.data.data.photo.split(',');
           this.fileList = fileList.map(item => {
             return {
-              url:  item
-            }
+              url: item,
+            };
           });
         }
       });
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -1011,16 +1140,16 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -1028,32 +1157,32 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       this.selectionList = list;
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
       // this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
@@ -1062,37 +1191,36 @@ export default {
           // 事业线转换
           for (let j = 0; j < this.businessLineData.length; j++) {
             // eslint-disable-next-line no-empty
-            if (data.records[i].businessLine == this.businessLineData[j].dictKey){
-              data.records[i].businessLine=this.businessLineData[j].dictValue;
+            if (data.records[i].businessLine == this.businessLineData[j].dictKey) {
+              data.records[i].businessLine = this.businessLineData[j].dictValue;
             }
           }
           //供应商
           for (let j = 0; j < this.supplierData.length; j++) {
             // eslint-disable-next-line no-empty
-            if (data.records[i].supplier == this.supplierData[j].dictKey){
-              data.records[i].supplier=this.supplierData[j].dictValue;
+            if (data.records[i].supplier == this.supplierData[j].dictKey) {
+              data.records[i].supplier = this.supplierData[j].dictValue;
             }
           }
           for (let j = 0; j < this.assetTypeData.length; j++) {
             // eslint-disable-next-line no-empty
-            if (data.records[i].assetType == this.assetTypeData[j].dictKey){
-              data.records[i].assetType=this.assetTypeData[j].dictValue;
+            if (data.records[i].assetType == this.assetTypeData[j].dictKey) {
+              data.records[i].assetType = this.assetTypeData[j].dictValue;
             }
           }
           for (let j = 0; j < this.forkliftTypeData.length; j++) {
             // eslint-disable-next-line no-empty
-            if (data.records[i].forkliftType == this.forkliftTypeData[j].dictKey){
-              data.records[i].forkliftType=this.forkliftTypeData[j].dictValue;
+            if (data.records[i].forkliftType == this.forkliftTypeData[j].dictKey) {
+              data.records[i].forkliftType = this.forkliftTypeData[j].dictValue;
             }
           }
           for (let j = 0; j < this.paymentMethodData.length; j++) {
             // eslint-disable-next-line no-empty
-            if (data.records[i].paymentMethod == this.paymentMethodData[j].dictKey){
-              data.records[i].paymentMethod=this.paymentMethodData[j].dictValue;
+            if (data.records[i].paymentMethod == this.paymentMethodData[j].dictKey) {
+              data.records[i].paymentMethod = this.paymentMethodData[j].dictValue;
             }
           }
-
-        } 
+        }
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
@@ -1100,14 +1228,18 @@ export default {
       });
     },
     urlsplit() {
-      if(this.fileList.length>0){
-        let url=[]
+      if (this.fileList.length > 0) {
+        let url = [];
         for (let i = 0; i < this.fileList.length; i++) {
-          if (!!this.fileList[i].response){url.push(this.fileList[i].response.data.link)}else {url.push(this.fileList[i].url)}
+          if (!!this.fileList[i].response) {
+            url.push(this.fileList[i].response.data.link);
+          } else {
+            url.push(this.fileList[i].url);
+          }
         }
-        this.form.photo= url.toString()
+        this.form.photo = url.toString();
       }
     },
-  }
+  },
 };
 </script>
diff --git a/src/views/basic/material/basicTripartiteMaterial.vue b/src/views/basic/material/basicTripartiteMaterial.vue
index 2bfac75b..ef6a97c3 100644
--- a/src/views/basic/material/basicTripartiteMaterial.vue
+++ b/src/views/basic/material/basicTripartiteMaterial.vue
@@ -207,7 +207,7 @@ export default {
       option: option,
       // 表单列表
       data: [],
-      drawerShow:false,
+      drawerShow: false,
     };
   },
   mounted() {
diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index 4fa34c10..509c508a 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -691,7 +691,7 @@ export default {
           { type: 'date', required: true, message: '请选择合同开始时间', trigger: 'change' },
         ],
         bladeRegionProvinceId: [{ required: true, message: '请选择地址', trigger: 'change' }],
-        leaseAccessories: [{ required: true, message: '请上传合同文件', trigger: 'blur' }],
+        // leaseAccessories: [{ required: true, message: '请上传合同文件', trigger: 'blur' }],
       },
       bianji: false,
 
@@ -1049,7 +1049,7 @@ export default {
           });
           this.form.leaseAccessories = li.length > 0 ? li.join(',') : null;
         } else {
-          return this.$message.warning('请上传文件！');
+          // return this.$message.warning('请上传文件！');
         }
       } else {
         if (this.fileList.length > 0) {
@@ -1060,7 +1060,7 @@ export default {
           });
           this.form.leaseAccessories = li.length > 0 ? li.join(',') : null;
         } else {
-          return this.$message.warning('请上传文件！');
+          // return this.$message.warning('请上传文件！');
         }
       }
 
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index d84f7176..ee3116d8 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -1,423 +1,448 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
-               v-model:search="search"
-               v-model:page="page"
-               v-model="form"
-               :table-loading="loading"
-               :data="data"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-
+    <avue-crud
+      :option="option"
+      v-model:search="search"
+      v-model:page="page"
+      v-model="form"
+      :table-loading="loading"
+      :data="data"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
       <template #menu-left>
-        <el-button type="danger"
-                   icon="el-icon-delete"
-                   plain
-                   @click="handleDisable">禁 用
+        <el-button type="danger" icon="el-icon-delete" plain @click="handleDisable"
+          >禁 用
         </el-button>
-        <el-button type="danger"
-                   icon="el-icon-delete"
-                   plain
-                   @click="handleEnable">启 用
+        <el-button type="danger" icon="el-icon-delete" plain @click="handleEnable"
+          >启 用
         </el-button>
-        <el-button type="danger"
-                   icon="el-icon-delete"
-                   plain
-                   @click="downAllocation">一 键 下 架
+        <el-button type="danger" icon="el-icon-delete" plain @click="downAllocation"
+          >一 键 下 架
         </el-button>
-<!--        <el-button type="warning"-->
-<!--                   plain-->
-<!--                   icon="el-icon-download"-->
-<!--                   @click="handleExport">导 出-->
-<!--        </el-button>-->
-        <el-button type="warning"
-                   plain
-                   icon="el-icon-camera"
-                   @click="handleqr">查看二维码
+        <!--        <el-button type="warning"-->
+        <!--                   plain-->
+        <!--                   icon="el-icon-download"-->
+        <!--                   @click="handleExport">导 出-->
+        <!--        </el-button>-->
+        <el-button type="warning" plain icon="el-icon-camera" @click="handleqr"
+          >查看二维码
         </el-button>
       </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>
-        <el-button type="primary" text icon="el-icon-view"  v-if="row.enableStatus ==2" @click="losses(row,1)">启 用</el-button>
+
+      <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
+        >
+        <el-button
+          type="primary"
+          text
+          icon="el-icon-view"
+          v-if="row.enableStatus == 2"
+          @click="losses(row, 1)"
+          >启 用</el-button
+        >
       </template>
     </avue-crud>
-    <el-dialog
-            title="二维码"
-            :visible.sync="dialogVisible"
-            width="600px"
-            v-model="dialogVisible">
-      <div >
-<!--        <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
-<!--          <el-divider></el-divider>-->
+    <el-dialog title="二维码" :visible.sync="dialogVisible" width="600px" v-model="dialogVisible">
+      <div>
+        <!--        <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
+        <!--          <el-divider></el-divider>-->
 
-<!--          <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>-->
+        <!--          <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>-->
         <!--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="dialogVisible = false">确 定</el-button>
-          <el-button @click="dialogVisible = false">取 消</el-button>
-        </span>
+        <!--    <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>
   </basic-container>
 </template>
 
 <script>
-  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";
-  import {getToken} from '@/utils/auth';
-  import {downloadXls} from "@/utils/util";
-  import {dateNow} from "@/utils/date";
-  import NProgress from 'nprogress';
-  import 'nprogress/nprogress.css';
-  import {getLodop} from "@/utils/LodopFuncs";
-  import { addlayer } from '@/api/basicdata/basicdataGoodsShelf';
+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';
+import { getToken } from '@/utils/auth';
+import { downloadXls } from '@/utils/util';
+import { dateNow } from '@/utils/date';
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import { getLodop } from '@/utils/LodopFuncs';
+import { addlayer } from '@/api/basicdata/basicdataGoodsShelf';
 
-  export default {
-    data() {
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      search: {},
+      loading: true,
+      page: {
+        pageSize: 30,
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option: option,
+      data: [],
+      imgUrl: '',
+      qrCodeObj: [],
+      dialogVisible: false,
+      html: null, // 页面包条码内容
+    };
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    permissionList() {
       return {
-        form: {},
-        query: {},
-        search: {},
-        loading: true,
-        page: {
-          pageSize: 30,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: option,
-        data: [],
-        imgUrl:'',
-        qrCodeObj:[],
-        dialogVisible:false,
-        html: null, // 页面包条码内容
+        addBtn: this.validData(this.permission.BasicdataGoodsAllocation_add, false),
+        viewBtn: this.validData(this.permission.BasicdataGoodsAllocation_view, false),
+        delBtn: this.validData(this.permission.BasicdataGoodsAllocation_delete, false),
+        editBtn: this.validData(this.permission.BasicdataGoodsAllocation_edit, false),
       };
     },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.validData(this.permission.BasicdataGoodsAllocation_add, false),
-          viewBtn: this.validData(this.permission.BasicdataGoodsAllocation_view, false),
-          delBtn: this.validData(this.permission.BasicdataGoodsAllocation_delete, false),
-          editBtn: this.validData(this.permission.BasicdataGoodsAllocation_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      //该仓库未设置货区、货架概念，货位直接和仓库进行绑定
+      console.log(this.form);
+      if (this.form.nodeInfo.length === 1) {
+        this.$message({
+          type: 'warning',
+          message: '请先为该仓库添加货区',
         });
-        return ids.join(",");
       }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        //该仓库未设置货区、货架概念，货位直接和仓库进行绑定
-        console.log(this.form);
-        if (this.form.nodeInfo.length===1){
-          this.$message({
-            type:'warning',
-            message:'请先为该仓库添加货区'
-          })
-        }
-        if (this.form.nodeInfo.length===2){
-          console.log(">>>>>>",this.form.nodeInfo);
-          row.warehouseId=this.form.nodeInfo[0];
-          row.goodsAreaId=this.form.nodeInfo[1];
-          row.nodeInfo=null;
-        }
-        if (this.form.nodeInfo.length===3){
-          row.warehouseId=this.form.nodeInfo[0];
-          row.goodsAreaId=this.form.nodeInfo[1];
-          row.goodsShelfId=this.form.nodeInfo[2];
-          row.nodeInfo=null;
-        }else {
-          done();
-          this.$message({
-            type:'warning',
-            message:'请先完善货架信息!!!'
-          })
-          return;
-        }
-        add(row).then(() => {
+      if (this.form.nodeInfo.length === 2) {
+        console.log('>>>>>>', this.form.nodeInfo);
+        row.warehouseId = this.form.nodeInfo[0];
+        row.goodsAreaId = this.form.nodeInfo[1];
+        row.nodeInfo = null;
+      }
+      if (this.form.nodeInfo.length === 3) {
+        row.warehouseId = this.form.nodeInfo[0];
+        row.goodsAreaId = this.form.nodeInfo[1];
+        row.goodsShelfId = this.form.nodeInfo[2];
+        row.nodeInfo = null;
+      } else {
+        done();
+        this.$message({
+          type: 'warning',
+          message: '请先完善货架信息!!!',
+        });
+        return;
+      }
+      add(row).then(
+        () => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
           done();
-        }, error => {
+        },
+        error => {
           loading();
           window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
           done();
-        }, error => {
+        },
+        error => {
           loading();
           console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+        }
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
         })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(res => {
-           if (res.success){
-             this.onLoad(this.page);
-             this.$message({
-               type: "success",
-               message: "操作成功!"
-             });
-           }else {
-             this.$message({
-               type: "error",
-               message: "操作成功!"
-             })
-           }
-          });
-      },
-      handleEdit(row){
-
-        console.log(">>>>>>",row);
-      },
-      losses(row,mub){
-        if (mub ==2){
-          this.$confirm('确认禁用？')
-            .then(_ => {
-              row.enableStatus =mub;
-              let id = row.id
-              disable(id).then(() => {
+        .then(res => {
+          if (res.success) {
+            this.onLoad(this.page);
+            this.$message({
+              type: 'success',
+              message: '操作成功!',
+            });
+          } else {
+            this.$message({
+              type: 'error',
+              message: '操作成功!',
+            });
+          }
+        });
+    },
+    handleEdit(row) {
+      console.log('>>>>>>', row);
+    },
+    losses(row, mub) {
+      if (mub == 2) {
+        this.$confirm('确认禁用？')
+          .then(_ => {
+            row.enableStatus = mub;
+            let id = row.id;
+            disable(id).then(
+              () => {
                 this.onLoad(this.page);
                 this.$message({
-                  type: "success",
-                  message: "操作成功!"
+                  type: 'success',
+                  message: '操作成功!',
                 });
-              }, error => {
+              },
+              error => {
                 loading();
                 console.log(error);
-              });
-            })
-            .catch(_ => {
-            });
-        }else {
-          this.$confirm('确认启用？')
-            .then(_ => {
-              row.enableStatus =mub;
-              let id = row.id
-              enable(id).then(() => {
+              }
+            );
+          })
+          .catch(_ => {});
+      } else {
+        this.$confirm('确认启用？')
+          .then(_ => {
+            row.enableStatus = mub;
+            let id = row.id;
+            enable(id).then(
+              () => {
                 this.onLoad(this.page);
                 this.$message({
-                  type: "success",
-                  message: "操作成功!"
+                  type: 'success',
+                  message: '操作成功!',
                 });
-              }, error => {
+              },
+              error => {
                 loading();
                 console.log(error);
-              });
-            })
-            .catch(_ => {
-            });
-        }
-      },
-      Offshelf(row){
-        this.$confirm('确认下架？')
-          .then(_ => {
-            shelf(row.id).then(() => {
+              }
+            );
+          })
+          .catch(_ => {});
+      }
+    },
+    Offshelf(row) {
+      this.$confirm('确认下架？')
+        .then(_ => {
+          shelf(row.id).then(
+            () => {
               this.onLoad(this.page);
               this.$message({
-                type: "success",
-                message: "操作成功!"
+                type: 'success',
+                message: '操作成功!',
               });
-            }, error => {
+            },
+            error => {
               loading();
               console.log(error);
-            });
-          })
-          .catch(_ => {
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+            }
+          );
         })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      handleDisable() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据禁用?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+        .catch(_ => {});
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
         })
-          .then(() => {
-            return disable(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-      },
-      handleEnable() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据启用?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleDisable() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据禁用?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return disable(this.ids);
         })
-          .then(() => {
-            return enable(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-      },
-      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;
-        this.selectionList.map(item=>{
-          let ids=item.id;
-          console.log(ids);
-            getPrintTemplate(ids).then(res => {
-             let pri_html="";
-              pri_html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
-              // console.log(pri_html);
-              that.w_print(pri_html);
-            });
-          // checkcode.push(item.orderPackageCode)
-        })
-
-      },
-      //批量打印打印代码
-      w_print(templateData){
-        let LODOP = getLodop();
-        // 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(); //直接打印
-
-      },
-      handleqr(){
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-
-        let checkcode=[]
-        this.selectionList.map(item=>{
-          checkcode.push(item.id)
-          // checkcode.push(item.orderPackageCode)
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    handleEnable() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据启用?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return enable(this.ids);
         })
-
-        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)
-
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.$refs.crud.toggleSelection();
         });
-        this.dialogVisible = true;
+    },
+    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;
+      this.selectionList.map(item => {
+        let ids = item.id;
+        console.log(ids);
+        getPrintTemplate(ids).then(res => {
+          let pri_html = '';
+          pri_html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+          // console.log(pri_html);
+          that.w_print(pri_html);
+        });
+        // checkcode.push(item.orderPackageCode)
+      });
+    },
+    //批量打印打印代码
+    w_print(templateData) {
+      let LODOP = getLodop();
+      // 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(); //直接打印
+    },
+    handleqr() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
 
+      let checkcode = [];
+      this.selectionList.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;
 
       /*  this.dialogVisible = true;
         this.qrCodeObj=[];
@@ -432,108 +457,98 @@
           })
 
         })*/
-
-
-      },
-      handleExport() {
-        let downloadUrl = `/blade-BasicdataGoodsAllocation/BasicdataGoodsAllocation/export-BasicdataGoodsAllocation?${this.website.tokenHeader}=${getToken()}`;
-        const {
-        } = this.query;
-        let values = {
-        };
-        this.$confirm("是否导出数据?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          NProgress.start();
-          exportBlob(downloadUrl, values).then(res => {
-            downloadXls(res.data, `货位${dateNow()}.xlsx`);
-            NProgress.done();
-          })
+    },
+    handleExport() {
+      let downloadUrl = `/blade-BasicdataGoodsAllocation/BasicdataGoodsAllocation/export-BasicdataGoodsAllocation?${
+        this.website.tokenHeader
+      }=${getToken()}`;
+      const {} = this.query;
+      let values = {};
+      this.$confirm('是否导出数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        NProgress.start();
+        exportBlob(downloadUrl, values).then(res => {
+          downloadXls(res.data, `货位${dateNow()}.xlsx`);
+          NProgress.done();
         });
-      },
-     async beforeOpen(done, type) {
-        // if (["edit", "view"].includes(type)) {
-        // await  getDetail(this.form.id).then(async res => {
-        //     // 这里还需要进行二维码图片显示
-        //    await getQRCode(this.form.qrCode).then(res=>{
-        //       let url = window.URL.createObjectURL(res.data);
-        //      console.log("url>>>>>>>",url);
-        //       this.form.qrCodeUrl = url;
-        //       console.log(res);
-        //     })
-        //     console.log(this.form);
-        //     this.form = res.data.data;
-        //   });
-        // }
-        // done();
-       if (["edit", "view"].includes(type)) {
-         getDetail(this.form.id).then(res => {
-           this.form = res.data.data;
-         });
-       }
-       done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        const {
-          nodeInfo,
-          enableStatus,
-          allocationStatus,
-          layerNum,
-          columnNum,
-        } = this.query;
-
-          let values = {
-            enableStatus:enableStatus,
-            allocationStatus:allocationStatus,
-            layerNum:layerNum,
-            columnNum:columnNum
-          };
-          if (!!this.query.nodeInfo){
-            values.warehouseId=nodeInfo[0];
-            values.goodsAreaId=nodeInfo[1];
-            values.goodsShelfId=nodeInfo[2];
-          }
-        getList(page.currentPage, page.pageSize, values).then(res => {
-          const data = res.data.data
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-
+      });
+    },
+    async beforeOpen(done, type) {
+      // if (["edit", "view"].includes(type)) {
+      // await  getDetail(this.form.id).then(async res => {
+      //     // 这里还需要进行二维码图片显示
+      //    await getQRCode(this.form.qrCode).then(res=>{
+      //       let url = window.URL.createObjectURL(res.data);
+      //      console.log("url>>>>>>>",url);
+      //       this.form.qrCodeUrl = url;
+      //       console.log(res);
+      //     })
+      //     console.log(this.form);
+      //     this.form = res.data.data;
+      //   });
+      // }
+      // done();
+      if (['edit', 'view'].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
         });
       }
-    }
-  };
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      const { nodeInfo, enableStatus, allocationStatus, layerNum, columnNum } = this.query;
+
+      let values = {
+        enableStatus: enableStatus,
+        allocationStatus: allocationStatus,
+        layerNum: layerNum,
+        columnNum: columnNum,
+      };
+      if (!!this.query.nodeInfo) {
+        values.warehouseId = nodeInfo[0];
+        values.goodsAreaId = nodeInfo[1];
+        values.goodsShelfId = nodeInfo[2];
+      }
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
 </script>
 
-<style>
-</style>
+<style></style>
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index 6c001291..85fdb5ee 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -1,23 +1,32 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
+      <el-row v-if="!search" style="padding: 6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <!-- 查询按钮 -->
           <el-form-item>
             <el-row>
-              <el-col >
-                <el-form-item label="货区:" prop="info" >
-<!--                  <el-cascader :options="optioner"   :show-all-levels="false" clearable >-->
-                    <el-cascader :options="optioner"  style="width: 80%"  v-model="query.goodsAreaInfo"   placeholder="请选择货区" :show-all-levels="false"  clearable />
-<!--                  </el-cascader>-->
+              <el-col>
+                <el-form-item label="货区:" prop="info">
+                  <!--                  <el-cascader :options="optioner"   :show-all-levels="false" clearable >-->
+                  <el-cascader
+                    :options="optioner"
+                    style="width: 80%"
+                    v-model="query.goodsAreaInfo"
+                    placeholder="请选择货区"
+                    :show-all-levels="false"
+                    clearable
+                  />
+                  <!--                  </el-cascader>-->
                 </el-form-item>
-                <el-form-item label="货架名称" prop="info" >
-                  <el-input v-model="query.goodsShelfName" placeholder="请输入货架名称"/>
+                <el-form-item label="货架名称" prop="info">
+                  <el-input v-model="query.goodsShelfName" placeholder="请输入货架名称" />
                 </el-form-item>
 
-                <el-button type="primary" icon="el-icon-search" @click="searchChange" >搜 索</el-button>
+                <el-button type="primary" icon="el-icon-search" @click="searchChange"
+                  >搜 索</el-button
+                >
                 <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
               </el-col>
             </el-row>
@@ -29,17 +38,20 @@
           <!-- 头部左侧按钮模块 -->
           <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="danger" icon="el-icon-delete" @click="handleDisable" plain>禁 用</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleEnable" plain>启 用</el-button>
-            <el-button type="danger"
-                       icon="el-icon-delete"
-                       plain
-                       @click="handleImport">导 入 货 架
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
+              >删 除</el-button
+            >
+            <el-button type="danger" icon="el-icon-delete" @click="handleDisable" plain
+              >禁 用</el-button
+            >
+            <el-button type="danger" icon="el-icon-delete" @click="handleEnable" plain
+              >启 用</el-button
+            >
+            <el-button type="danger" icon="el-icon-delete" plain @click="handleImport"
+              >导 入 货 架
             </el-button>
             <!--            <el-button type="danger" icon="el-icon-delete" @click="aaa" plain>导出二维码</el-button>-->
             <!--            <el-button type="danger" icon="el-icon-delete" @click="viewQrCode" plain>查看二维码</el-button>-->
-
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -61,95 +73,141 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope.row)">编辑</el-text>
-              <el-text type="primary" text icon="el-icon-edit" @click="addAllocation(slotProps.scope.row)">编辑货位</el-text>
-              <el-text type="primary" text icon="el-icon-edit" @click="layerAllocation(slotProps.scope.row)">列加层</el-text>
-              <el-text type="primary" text icon="el-icon-edit" @click="locationList(slotProps.scope.row)">货位列表</el-text>
-              <el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)">删除</el-text>
-
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-edit"
+              @click="handleEdit(slotProps.scope.row)"
+              >编辑</el-text
+            >
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-edit"
+              @click="addAllocation(slotProps.scope.row)"
+              >编辑货位</el-text
+            >
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-edit"
+              @click="layerAllocation(slotProps.scope.row)"
+              >列加层</el-text
+            >
+            <el-text
+              type="primary"
+              text
+              icon="el-icon-edit"
+              @click="locationList(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 flex-c-sb" style="width:100%;">
-          <div style="font-size: 14px;">
-            勾选数量: {{ selectionList.length }}
-          </div>
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
-          <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
+            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="title"
-                 v-model="box"
-                 width="50%"
-                 :before-close="beforeClose"
-                 append-to-body>
-        <el-form :disabled="view" ref="form"   :rules="validatorRules" :model="form" label-width="80px">
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
+        <el-form
+          :disabled="view"
+          ref="form"
+          :rules="validatorRules"
+          :model="form"
+          label-width="80px"
+        >
           <!-- 表单字段 -->
 
           <el-row>
-<!--            <el-col :span="12" v-if="idShowStatus && !allocation" >-->
-<!--              <el-form-item label="启用状态:"  prop="enableStatus" label-width="100px" >-->
-<!--                &lt;!&ndash;            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>&ndash;&gt;-->
-<!--                <el-select v-model="form.enableStatus" clearable  placeholder="请选择货区状态"  style="width: 88%" >-->
-<!--                  <el-option-->
-<!--                    v-for="item in enableStatusData"-->
-<!--                    :key="item.dictKey"-->
-<!--                    :label="item.dictValue"-->
-<!--                    :value="item.dictKey">-->
-<!--                  </el-option>-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="12"  v-if="idShowStatus && !allocation" >-->
-<!--              <el-form-item label="货架状态:" prop="goodsShelfStatus" label-width="100px" >-->
-<!--                <el-select v-model="form.goodsShelfStatus" clearable  placeholder="请选择货架状态"  style="width: 88%" >-->
-<!--                  <el-option-->
-<!--                    v-for="item in goodsShelfStatusData"-->
-<!--                    :key="item.dictKey"-->
-<!--                    :label="item.dictValue"-->
-<!--                    :value="item.dictKey">-->
-<!--                  </el-option>-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
+            <!--            <el-col :span="12" v-if="idShowStatus && !allocation" >-->
+            <!--              <el-form-item label="启用状态:"  prop="enableStatus" label-width="100px" >-->
+            <!--                &lt;!&ndash;            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>&ndash;&gt;-->
+            <!--                <el-select v-model="form.enableStatus" clearable  placeholder="请选择货区状态"  style="width: 88%" >-->
+            <!--                  <el-option-->
+            <!--                    v-for="item in enableStatusData"-->
+            <!--                    :key="item.dictKey"-->
+            <!--                    :label="item.dictValue"-->
+            <!--                    :value="item.dictKey">-->
+            <!--                  </el-option>-->
+            <!--                </el-select>-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
+            <!--            <el-col :span="12"  v-if="idShowStatus && !allocation" >-->
+            <!--              <el-form-item label="货架状态:" prop="goodsShelfStatus" label-width="100px" >-->
+            <!--                <el-select v-model="form.goodsShelfStatus" clearable  placeholder="请选择货架状态"  style="width: 88%" >-->
+            <!--                  <el-option-->
+            <!--                    v-for="item in goodsShelfStatusData"-->
+            <!--                    :key="item.dictKey"-->
+            <!--                    :label="item.dictValue"-->
+            <!--                    :value="item.dictKey">-->
+            <!--                  </el-option>-->
+            <!--                </el-select>-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
             <el-col :span="12" v-if="!allocation">
-              <el-form-item label="货架名称:" prop="goodsShelfName"  label-width="100px" >
-                <el-input v-model="form.goodsShelfName" placeholder="请输入货架名称" style="width: 88%;"/>
+              <el-form-item label="货架名称:" prop="goodsShelfName" label-width="100px">
+                <el-input
+                  v-model="form.goodsShelfName"
+                  placeholder="请输入货架名称"
+                  style="width: 88%"
+                />
               </el-form-item>
             </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-form-item label="列 数:" prop="rowNum" label-width="100px">
+                <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-form-item label="层 数:" prop="storeyNum" label-width="100px">
+                <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-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-select v-model="form.goodsAreaId" clearable  placeholder="请选择货区" style="width: 88%;">
+                <el-select
+                  v-model="form.goodsAreaId"
+                  clearable
+                  placeholder="请选择货区"
+                  style="width: 88%"
+                >
                   <el-option
                     v-for="item in areaoption"
                     :key="item.id"
                     :label="item.headline"
-                    :value="item.id">
+                    :value="item.id"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -167,8 +225,8 @@
             <!--              </el-form-item>-->
             <!--            </el-col>-->
             <el-col :span="12" v-if="!allocation">
-              <el-form-item label="备 注:" prop="remarks"  label-width="100px">
-                <el-input v-model="form.remarks" placeholder="请输入备注"  style="width: 88%;"/>
+              <el-form-item label="备 注:" prop="remarks" label-width="100px">
+                <el-input v-model="form.remarks" placeholder="请输入备注" style="width: 88%" />
               </el-form-item>
             </el-col>
             <!--            <el-col :span="12">-->
@@ -181,95 +239,104 @@
           </el-row>
         </el-form>
 
-
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+              >提 交</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
       </el-dialog>
-        <el-dialog :title="title"
-                   v-model="box2"
-                   width="50%"
-                   append-to-body>
-          <el-form :disabled="view"  :model="form2" label-width="80px">
-            <!-- 表单字段 -->
-            <el-row>
-              <el-col :span="12" >
-                <el-form-item label="当 前 层:"   label-width="100px">
-<!--                  <el-select v-model="form2.currentLayer" placeholder="选择当前层(不选则为所有层加列)"  style="width: 88%;">-->
-<!--                    <el-optio-->
-<!--                                                v-for="item in currentData"-->
-<!--                                                :key="item.id"-->
-<!--                                                :label="item.templateName"-->
-<!--                                                :value="item.id">-->
-<!--                      </el-optio>-->
-<!--                  </el-select>-->
-                  <el-input v-model="form2.storeyNum" placeholder="请输入当前层(不填则为所有层加列)"  style="width: 88%;"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12" >
-                <el-form-item label="当 前 列:"   label-width="100px">
-                  <el-input v-model="form2.rowNum" placeholder="请输入当前列(新增为最后一列)"  style="width: 88%;"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12" >
-                <el-form-item label="修改/增加列:"  label-width="100px">
-                  <el-input v-model="form2.columnNum" placeholder="请输入修改/增加列数"  style="width: 88%;"/>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
+      <el-dialog :title="title" v-model="box2" width="50%" append-to-body>
+        <el-form :disabled="view" :model="form2" label-width="80px">
+          <!-- 表单字段 -->
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="当 前 层:" label-width="100px">
+                <!--                  <el-select v-model="form2.currentLayer" placeholder="选择当前层(不选则为所有层加列)"  style="width: 88%;">-->
+                <!--                    <el-optio-->
+                <!--                                                v-for="item in currentData"-->
+                <!--                                                :key="item.id"-->
+                <!--                                                :label="item.templateName"-->
+                <!--                                                :value="item.id">-->
+                <!--                      </el-optio>-->
+                <!--                  </el-select>-->
+                <el-input
+                  v-model="form2.storeyNum"
+                  placeholder="请输入当前层(不填则为所有层加列)"
+                  style="width: 88%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="当 前 列:" label-width="100px">
+                <el-input
+                  v-model="form2.rowNum"
+                  placeholder="请输入当前列(新增为最后一列)"
+                  style="width: 88%"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="修改/增加列:" label-width="100px">
+                <el-input
+                  v-model="form2.columnNum"
+                  placeholder="请输入修改/增加列数"
+                  style="width: 88%"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-          <!-- 表单按钮 -->
-          <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>-->
+        <!-- 表单按钮 -->
+        <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 icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
-          </template>
+        </template>
       </el-dialog>
 
-      <el-dialog :title="title"
-                 v-model="box3"
-                 width="50%"
-                 append-to-body>
-        <el-form :disabled="view"  :model="form3" label-width="80px">
+      <el-dialog :title="title" v-model="box3" width="50%" append-to-body>
+        <el-form :disabled="view" :model="form3" label-width="80px">
           <!-- 表单字段 -->
           <el-row>
-            <el-col :span="12" >
-              <el-form-item label="加层所在列:"   label-width="100px">
-                <el-input v-model="form3.rowNum" placeholder="请输入当前列"  style="width: 88%;"/>
+            <el-col :span="12">
+              <el-form-item label="加层所在列:" label-width="100px">
+                <el-input v-model="form3.rowNum" placeholder="请输入当前列" style="width: 88%" />
               </el-form-item>
             </el-col>
-            <el-col :span="12" >
-              <el-form-item label="添加层数:"   label-width="100px">
-                <el-input v-model="form3.layerNum" placeholder="请输入添加层数："  style="width: 88%;"/>
+            <el-col :span="12">
+              <el-form-item label="添加层数:" label-width="100px">
+                <el-input
+                  v-model="form3.layerNum"
+                  placeholder="请输入添加层数："
+                  style="width: 88%"
+                />
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
 
-
         <!-- 表单按钮 -->
         <template #footer>
-          <span  class="dialog-footer">
-             <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitly">提 交</el-button>
+          <span class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitly"
+              >提 交</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
-
       </el-dialog>
 
-      <el-dialog
-        title="二维码"
-        :visible.sync="dialogVisible"
-        width="600px"
-        v-model="dialogVisible">
-        <div >
+      <el-dialog title="二维码" :visible.sync="dialogVisible" width="600px" v-model="dialogVisible">
+        <div>
           <!--        <div v-for="(item,index) in qrCodeObj" class="pdf-dom">-->
           <!--          <el-divider></el-divider>-->
 
@@ -284,47 +351,60 @@
           <!--endprint1-->
         </div>
         <span slot="footer" class="dialog-footer">
-<!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
+          <!--    <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="货位列表"
-        width="80%"
-        v-model="box1">
-        <avue-crud :option="alloption"
-                   v-model:page="allpage"
-                   v-model="allform"
-                   :table-loading="loading"
-                   :data="alldata"
-                   ref="crud"
-                   @selection-change="allselectionChange"
-                   @current-change="allcurrentChange"
-                   @size-change="allsizeChange"
-                   @on-load="allonLoad">
-
+      <el-dialog title="货位列表" width="80%" v-model="box1">
+        <avue-crud
+          :option="alloption"
+          v-model:page="allpage"
+          v-model="allform"
+          :table-loading="loading"
+          :data="alldata"
+          ref="crud"
+          @selection-change="allselectionChange"
+          @current-change="allcurrentChange"
+          @size-change="allsizeChange"
+          @on-load="allonLoad"
+        >
           <template #menu-left>
-            <el-button type="warning"
-                       plain
-                       icon="el-icon-camera"
-                       @click="handleqr">查看二维码
+            <el-button type="warning" plain icon="el-icon-camera" @click="handleqr"
+              >查看二维码
             </el-button>
           </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>-->
-            <el-button type="primary" text icon="el-icon-view"  v-if="row.enableStatus ==2" @click="losses(row,1)">启 用</el-button>
+          <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>-->
+            <el-button
+              type="primary"
+              text
+              icon="el-icon-view"
+              v-if="row.enableStatus == 2"
+              @click="losses(row, 1)"
+              >启 用</el-button
+            >
           </template>
         </avue-crud>
-
       </el-dialog>
-
     </div>
     <el-dialog title="货架导入" append-to-body v-model="excelBox" width="555px">
-      <avue-form :option="excelOption" v-model="excelForm" :upload-before="uploadBefore" :upload-after="uploadAfter">
+      <avue-form
+        :option="excelOption"
+        v-model="excelForm"
+        :upload-before="uploadBefore"
+        :upload-after="uploadAfter"
+      >
         <template #excelTemplate>
           <el-button type="primary" @click="handleTemplate">
             点击下载<i class="el-icon-download el-icon--right"></i>
@@ -332,33 +412,49 @@
         </template>
       </avue-form>
     </el-dialog>
-
   </basic-container>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,addAllocation,disable,enable,addlayer,getUploadBefore} from "@/api/basicdata/basicdataGoodsShelf";
-import {getList as allgetList,update as allupdate,getPrintTemplate} from "@/api/basicdata/basicdataGoodsAllocation";
-import option from "@/option/basicdata/basicdataGoodsShelf";
-import { mapGetters } from "vuex";
-import {  getGoodsAreaNodeList,getGoodsAreaoptionList } from '@/api/basicdata/basicdataGoodsArea';
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getQRCodeImg,
+  getShowTemplate,
+  addAllocation,
+  disable,
+  enable,
+  addlayer,
+  getUploadBefore,
+} from '@/api/basicdata/basicdataGoodsShelf';
+import {
+  getList as allgetList,
+  update as allupdate,
+  getPrintTemplate,
+} from '@/api/basicdata/basicdataGoodsAllocation';
+import option from '@/option/basicdata/basicdataGoodsShelf';
+import { mapGetters } from 'vuex';
+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'
+import { getTemplateData } from '@/api/basic/basicPrintTemplate';
+import { getLodop } from '@/utils/LodopFuncs.js';
 import { exportBlob } from '@/api/common';
 import { getToken } from '@/utils/auth';
 import { downloadXls } from '@/utils/util';
 export default {
-  data () {
+  data() {
     return {
       excelBox: false,
       excelForm: {
-        goodsAreaId:null,
+        goodsAreaId: null,
       },
-      form2:{},
-      box2:false,
-      form3:{},
-      box3:false,
+      form2: {},
+      box2: false,
+      form3: {},
+      box3: false,
       columnList: [
         {
           prop: '',
@@ -474,7 +570,7 @@ export default {
         },
         // 更多列的配置...
       ],
-      currentData:[],
+      currentData: [],
       columnListedit: [],
       a: [],
       height: 0,
@@ -490,25 +586,25 @@ export default {
       // 是否为查看模式
       view: false,
       //区分货架编辑
-      allocation:false,
+      allocation: false,
       // 查询信息
       query: {},
       // 分页信息
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       allpage: {
         pageSize: 30,
         currentPage: 1,
-        total: 0
+        total: 0,
       },
-      allform:{},
-      alldata:[],
+      allform: {},
+      alldata: [],
       // 表单数据
       form: {},
-      isShowQRCode:false,
+      isShowQRCode: false,
       // 选择行
       selectionList: [],
       //货位 选择行
@@ -519,23 +615,25 @@ export default {
         emptyBtn: false,
         column: [
           {
-            label: "所属货区",
-            prop: "goodsAreaId",
-            type: "select",
+            label: '所属货区',
+            prop: 'goodsAreaId',
+            type: 'select',
             search: true,
-            align:'center',
+            align: 'center',
             width: 200,
             filterable: true,
-            dicUrl: "/api/logpm-basicdata/goodsArea/dict",
+            dicUrl: '/api/logpm-basicdata/goodsArea/dict',
             props: {
-              label: "headline",
-              value: "id",
+              label: 'headline',
+              value: 'id',
             },
-            rules: [{
-              required: true,
-              message: "请选择货区",
-              trigger: "blur"
-            }],
+            rules: [
+              {
+                required: true,
+                message: '请选择货区',
+                trigger: 'blur',
+              },
+            ],
           },
           {
             label: '文件上传',
@@ -559,7 +657,7 @@ export default {
         ],
       },
       alloption: {
-        height:'auto',
+        height: 'auto',
         calcHeight: 30,
         tip: false,
         searchShow: true,
@@ -568,55 +666,54 @@ export default {
         index: true,
         viewBtn: true,
         selection: true,
-        editBtn:false,
-        delBtn:false,
-        addBtn:false,
-        indexWidth:'150',
-        indexLabel:"序号",
+        editBtn: false,
+        delBtn: false,
+        addBtn: false,
+        indexWidth: '150',
+        indexLabel: '序号',
         dialogClickModal: false,
         column: [
           {
-            label: "仓库名称",
-            prop: "warehouseName",
-            type: "input",
+            label: '仓库名称',
+            prop: 'warehouseName',
+            type: 'input',
             addDisplay: false,
             editDisplay: false,
-            align:'center',
-            labelWidth:'100',
+            align: 'center',
+            labelWidth: '100',
           },
           {
-            label: "货区名称",
-            prop: "goodsAreaName",
-            type: "input",
+            label: '货区名称',
+            prop: 'goodsAreaName',
+            type: 'input',
             addDisplay: false,
             editDisplay: false,
-            align:'center',
-            labelWidth:'100',
+            align: 'center',
+            labelWidth: '100',
           },
           {
-            label: "货架名称",
-            prop: "goodsShelfName",
-            type: "input",
+            label: '货架名称',
+            prop: 'goodsShelfName',
+            type: 'input',
             addDisplay: false,
             editDisplay: false,
-            align:'center',
-            labelWidth:'100',
-
+            align: 'center',
+            labelWidth: '100',
           },
           {
             label: '货架',
             prop: 'nodeInfo',
-            type: "cascader",
-            labelWidth:'100',
-            clearable:true,
-            placeholder:'仓库/货区',
+            type: 'cascader',
+            labelWidth: '100',
+            clearable: true,
+            placeholder: '仓库/货区',
             dicUrl: '/api/logpm-basicdata/goodsAllocation/getNode',
             // dicData:dicData ,
             props: {
-              label:'label',
-              value:'value',
-              children:'children',
-              leaf:'leaf',
+              label: 'label',
+              value: 'value',
+              children: 'children',
+              leaf: 'leaf',
             },
             addDisplay: true,
             editDisplay: false,
@@ -624,110 +721,111 @@ export default {
             hide: true,
           },
           {
-            label: "货位名称",
-            prop: "goodsAllocationName",
-            type: "input",
+            label: '货位名称',
+            prop: 'goodsAllocationName',
+            type: 'input',
             addDisplay: true,
             editDisplay: true,
-            align:'center',
-            labelWidth:'100',
-            rules: [{
-              required: true,
-              message: "请输入货位名称",
-              trigger: "blur"
-            }]
-
+            align: 'center',
+            labelWidth: '100',
+            rules: [
+              {
+                required: true,
+                message: '请输入货位名称',
+                trigger: 'blur',
+              },
+            ],
           },
           {
-            label: "所在列",
-            prop: "columnNum",
-            type: "input",
-            align:'center',
-            labelWidth:'100',
+            label: '所在列',
+            prop: 'columnNum',
+            type: 'input',
+            align: 'center',
+            labelWidth: '100',
             addDisplay: true,
             editDisplay: true,
             viewDisplay: true,
             hide: false,
           },
           {
-            label: "所在层",
-            prop: "layerNum",
-            type: "input",
-            align:'center',
-            labelWidth:'100',
+            label: '所在层',
+            prop: 'layerNum',
+            type: 'input',
+            align: 'center',
+            labelWidth: '100',
             addDisplay: true,
             editDisplay: true,
             viewDisplay: true,
             hide: false,
           },
           {
-            label: "启用状态",
-            prop: "enableStatus",
-            type: "select",
+            label: '启用状态',
+            prop: 'enableStatus',
+            type: 'select',
             search: false,
-            labelWidth:'100',
+            labelWidth: '100',
             dicUrl: '/api/blade-system/dict-biz/dictionary?code=enable_status',
             props: {
               label: 'dictValue',
               value: 'dictKey',
             },
             addDisplay: false,
-            align:'center',
+            align: 'center',
             editDisplay: false,
             viewDisplay: false,
             hide: false,
           },
           {
-            label: "货位状态",
-            prop: "allocationStatus",
-            type: "select",
-            labelWidth:'100',
+            label: '货位状态',
+            prop: 'allocationStatus',
+            type: 'select',
+            labelWidth: '100',
             dicUrl: '/api/blade-system/dict-biz/dictionary?code=allocation_status',
             props: {
               label: 'dictValue',
               value: 'dictKey',
             },
             addDisplay: false,
-            align:'center',
+            align: 'center',
           },
           {
-            label: "货位码",
-            prop: "qrCode",
-            type: "input",
-            align:'center',
-            labelWidth:'100',
+            label: '货位码',
+            prop: 'qrCode',
+            type: 'input',
+            align: 'center',
+            labelWidth: '100',
             viewDisplay: true,
             addDisplay: false,
             editDisplay: false,
-            hide:true,
+            hide: true,
           },
           {
-            label: "旧ID",
-            prop: "oldId",
-            type: "input",
-            align:'center',
-            labelWidth:'100',
+            label: '旧ID',
+            prop: 'oldId',
+            type: 'input',
+            align: 'center',
+            labelWidth: '100',
             viewDisplay: true,
             addDisplay: false,
             editDisplay: false,
-            hide:true,
+            hide: true,
           },
           {
-            label: "旧货位码",
-            prop: "oldQrCode",
-            type: "input",
-            align:'center',
-            labelWidth:'100',
+            label: '旧货位码',
+            prop: 'oldQrCode',
+            type: 'input',
+            align: 'center',
+            labelWidth: '100',
             viewDisplay: true,
             addDisplay: false,
             editDisplay: true,
           },
           {
-            label: "模 板",
-            prop: "templateId",
-            type: "select",
-            align:'center',
-            labelWidth:'100',
+            label: '模 板',
+            prop: 'templateId',
+            type: 'select',
+            align: 'center',
+            labelWidth: '100',
             dicUrl: '/api/logpm-basic/printTemplate/getTemplate?templateType=8',
             props: {
               label: 'templateName',
@@ -736,12 +834,11 @@ export default {
             viewDisplay: true,
             addDisplay: true,
             editDisplay: false,
-            hide:true,
+            hide: true,
           },
-
-        ]
+        ],
       },
-      goodsShelfId:null,
+      goodsShelfId: null,
       // 表单配置
       option: option,
       // 表单列表
@@ -757,16 +854,14 @@ export default {
       //级联选择器列表数据
       optioner: [],
       //不需要级联,直接选择货区
-      areaoption:[],
-      dialogVisible:false,
+      areaoption: [],
+      dialogVisible: false,
       //二维码展示列表
-      qrCodeObj:[],
+      qrCodeObj: [],
       //模板列表
-      templateData:[],
+      templateData: [],
       validatorRules: {
-        goodsAreaId: [
-          { required: true, message: '请选择货区!', trigger: 'change' }
-        ],
+        goodsAreaId: [{ required: true, message: '请选择货区!', trigger: 'change' }],
         // goodsShelfName: [
         //   { required: true, message: '请填写货架名称!', trigger: 'blur' }
         // ],
@@ -778,61 +873,65 @@ export default {
         // ],
       },
       //货架状态控制
-      idShowStatus:false,
-    }
+      idShowStatus: false,
+    };
   },
   created() {
-    this.getListInfo()
+    this.getListInfo();
     this.onLoad(this.page);
   },
 
-  mounted () {
+  mounted() {
     this.init();
     // this.onLoad(this.page);
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
-    losses(row,mub){
+    losses(row, mub) {
       this.$confirm('确认操作？')
         .then(_ => {
-          row.enableStatus =mub
-          allupdate(row).then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          }, error => {
-            loading();
-            console.log(error);
-          });
+          row.enableStatus = mub;
+          allupdate(row).then(
+            () => {
+              this.onLoad(this.page);
+              this.$message({
+                type: 'success',
+                message: '操作成功!',
+              });
+            },
+            error => {
+              loading();
+              console.log(error);
+            }
+          );
         })
-        .catch(_ => {
-        });
+        .catch(_ => {});
     },
     //导入
-    handleImport(){
+    handleImport() {
       this.excelBox = true;
     },
     //下载模板
     handleTemplate() {
-      console.log("下载模板！！！~~~~~~~~~~~");
+      console.log('下载模板！！！~~~~~~~~~~~');
       exportBlob(
-        `/api/logpm-basicdata/goodsShelf/exportmb-BasicdataGoodsShelf?${this.website.tokenHeader}=${getToken()}`
+        `/api/logpm-basicdata/goodsShelf/exportmb-BasicdataGoodsShelf?${
+          this.website.tokenHeader
+        }=${getToken()}`
       ).then(res => {
         downloadXls(res.data, '货架模板.xlsx');
       });
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
     uploadAfter(res, done, loading, column) {
@@ -843,197 +942,192 @@ export default {
       this.excelBox = false;
       done();
     },
-    uploadBefore(res, done, loading, column){
+    uploadBefore(res, done, loading, column) {
       let id = this.excelForm.goodsAreaId;
-      console.log("之前>>>>>>>>>>>>>>",id);
-      if (null == id){
-        console.log("只杀杀杀");
+      console.log('之前>>>>>>>>>>>>>>', id);
+      if (null == id) {
+        console.log('只杀杀杀');
         this.$message({
           type: 'warning',
           message: '无选择仓库!',
         });
         loading();
-        return ;
-
+        return;
       }
       getUploadBefore(id);
       done();
     },
-    getListInfo(){
+    getListInfo() {
       //启用状态字典列表数据
-      getDictionaryBiz( 'enable_status').then(res => {
+      getDictionaryBiz('enable_status').then(res => {
         this.enableStatusData = res.data.data;
       });
-      getDictionaryBiz( 'goods_shelf_status').then(res => {
+      getDictionaryBiz('goods_shelf_status').then(res => {
         this.goodsShelfStatusData = res.data.data;
       });
-      getGoodsAreaNodeList().then(res=>{
+      getGoodsAreaNodeList().then(res => {
         const data = this.formatCascaderData(res.data.data);
-        this.optioner = data
-      })
-      getGoodsAreaoptionList().then(res=>{
+        this.optioner = data;
+      });
+      getGoodsAreaoptionList().then(res => {
         const data = res.data.data;
-        this.areaoption = data
-        console.log("this.areaoption>>>>>>>>>>>>>",this.areaoption
-        );
-      })
-      getTemplateData("9").then(res=>{
+        this.areaoption = data;
+        console.log('this.areaoption>>>>>>>>>>>>>', this.areaoption);
+      });
+      getTemplateData('9').then(res => {
         console.log(res.data.data);
-        let data = res.data.data
+        let data = res.data.data;
         this.templateData = data;
-      })
+      });
     },
-    handleqr(){
+    handleqr() {
       if (this.allselectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
 
-      let checkcode=[]
-      this.allselectionList.map(item=>{
-        checkcode.push(item.id)
+      let checkcode = [];
+      this.allselectionList.map(item => {
+        checkcode.push(item.id);
         // checkcode.push(item.orderPackageCode)
-      })
+      });
 
-      let qr=checkcode.join(',');
+      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.html = '';
+        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
       });
       this.dialogVisible = true;
-
     },
     // 格式化数据，递归将空的children置为undefined
-    formatCascaderData(data){
-      console.log("------------>",data);
-      const a =[];
+    formatCascaderData(data) {
+      console.log('------------>', data);
+      const a = [];
       for (var i = 0; i < data.length; i++) {
-        let b =
-          {
-            value:data[i].id,
-            label:data[i].name,
-            children:[]
-          }
+        let b = {
+          value: data[i].id,
+          label: data[i].name,
+          children: [],
+        };
         if (!!data[i].children && data[i].children.length > 1) {
           let k = data[i].children;
-          let j=[];
-          k.forEach(item=>{
-            let c={
-              value:item.id,
-              label:item.headline,
-            }
+          let j = [];
+          k.forEach(item => {
+            let c = {
+              value: item.id,
+              label: item.headline,
+            };
             j.push(c);
-          })
+          });
           //处理货区
-          b.children=j;
+          b.children = j;
         }
 
         a.push(b);
       }
-      console.log("--------------->a".a);
-      return a
+      console.log('--------------->a'.a);
+      return a;
     },
 
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    changeStatus(e,row,index){
-      if (row.enableState===true){
-        row.enableStatus = 1
-      }else {
-        row.enableStatus = 2
+    changeStatus(e, row, index) {
+      if (row.enableState === true) {
+        row.enableStatus = 1;
+      } else {
+        row.enableStatus = 2;
       }
       this.form = row;
       this.handleSubmit();
     },
     //编辑货位
-    addAllocation(row){
-      console.log("row>>>>>>>>",row);
-      this.title = '编辑货位'
-      this.box = true
+    addAllocation(row) {
+      console.log('row>>>>>>>>', row);
+      this.title = '编辑货位';
+      this.box = true;
       this.isShowQRCode = true;
       this.idShowStatus = false;
       this.allocation = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
-        console.log(">>>>>>>>>>",this.form);
+        console.log('>>>>>>>>>>', this.form);
         //TODO 这里还需要对二维码图片进行控制显示
       });
     },
 
     //列加层
-    layerAllocation(row){
-      console.log("row>>>>>>>>",row);
-      this.title = '列加层'
-      this.box3 = true
+    layerAllocation(row) {
+      console.log('row>>>>>>>>', row);
+      this.title = '列加层';
+      this.box3 = true;
       // this.isShowQRCode = true;
       // this.idShowStatus = false;
       // this.allocation = true;
       getDetail(row.id).then(res => {
         this.form3 = res.data.data;
-        console.log(">>>>>>>>>>",this.form);
+        console.log('>>>>>>>>>>', this.form);
         //TODO 这里还需要对二维码图片进行控制显示
       });
     },
     //货位列表
-    locationList(row){
-      console.log("row>>>>>>xx>>",row);
-      this.title = '货位列表'
-      this.box1 = true
-      this.goodsShelfId = row.id
-      this.allonLoad(this.allpage)
+    locationList(row) {
+      console.log('row>>>>>>xx>>', row);
+      this.title = '货位列表';
+      this.box1 = true;
+      this.goodsShelfId = row.id;
+      this.allonLoad(this.allpage);
     },
-    handleSubmitAdd(){
-      this.form2.addFlag = 1
+    handleSubmitAdd() {
+      this.form2.addFlag = 1;
       addAllocation(this.form2).then(() => {
         this.box2 = false;
         this.onLoad(this.page);
         this.$message({
-          type: "success",
-          message: "操作成功!"
+          type: 'success',
+          message: '操作成功!',
         });
       });
     },
-    handleSubmitly(){
+    handleSubmitly() {
       addlayer(this.form3).then(() => {
         this.box3 = false;
         this.onLoad(this.page);
         this.$message({
-          type: "success",
-          message: "操作成功!"
+          type: 'success',
+          message: '操作成功!',
         });
       });
     },
-    handleSubmit () {
-      if (this.allocation){
-        console.log("this.form>>>>>>>货位", this.form);
+    handleSubmit() {
+      if (this.allocation) {
+        console.log('this.form>>>>>>>货位', this.form);
         addAllocation(this.form).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
-      }else {
+      } else {
         //表单校验添加租户编码
-        this.$refs.form.validate(valid=>{
+        this.$refs.form.validate(valid => {
           if (valid) {
             if (!this.form.id) {
-              console.log("this.form>>>>>>>", this.form);
-              console.log("this.optioner>>>>>>>", this.optioner);
+              console.log('this.form>>>>>>>', this.form);
+              console.log('this.optioner>>>>>>>', this.optioner);
               // if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){
               //       //这里需要截取最后一个ID
               //       let a = this.form.goodsAreaId;
@@ -1048,8 +1142,8 @@ export default {
                 this.box = false;
                 this.onLoad(this.page);
                 this.$message({
-                  type: "success",
-                  message: "操作成功!"
+                  type: 'success',
+                  message: '操作成功!',
                 });
               });
             } else {
@@ -1057,78 +1151,75 @@ export default {
                 this.box = false;
                 this.onLoad(this.page);
                 this.$message({
-                  type: "success",
-                  message: "操作成功!"
+                  type: 'success',
+                  message: '操作成功!',
                 });
               });
             }
-
-          }else {
+          } else {
             console.log('error submit!!');
             return false;
           }
-        })
+        });
       }
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
       this.isShowQRCode = false;
       this.idShowStatus = false;
       this.allocation = false;
       // this.$refs['form'].resetFields();
       // this.$refs.resetFields();
-
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
       this.isShowQRCode = false;
       this.allocation = false;
       this.idShowStatus = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
-        console.log(">>>>>>>>>>",this.form);
+        console.log('>>>>>>>>>>', this.form);
         //TODO 这里还需要对二维码图片进行控制显示
       });
     },
-    async handleView (row) {
-      this.title = '查看'
+    async handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       this.allocation = false;
-      this.isShowgoodsArea=true;
+      this.isShowgoodsArea = true;
       this.isShowQRCode = true;
       await getDetail(row.id).then(async res => {
-        res.data.data.goodsShelfStatus = res.data.data.goodsShelfStatus.toString()
-        res.data.data.enableStatus = res.data.data.enableStatus.toString()
+        res.data.data.goodsShelfStatus = res.data.data.goodsShelfStatus.toString();
+        res.data.data.enableStatus = res.data.data.enableStatus.toString();
         this.form = res.data.data;
         //解析货架的仓库/货区信息
-        let a=[];
-        if (!!res.data.data.goodsAreaId&&!!res.data.data.warehouseId){
-          a.push(res.data.data.warehouseId)
-          a.push(res.data.data.goodsAreaId)
+        let a = [];
+        if (!!res.data.data.goodsAreaId && !!res.data.data.warehouseId) {
+          a.push(res.data.data.warehouseId);
+          a.push(res.data.data.goodsAreaId);
         }
-        this.form.goodsAreaInfo=a;
+        this.form.goodsAreaInfo = a;
         //完成二维码的表单展示
         //获取二维码
-        await getQRCodeImg(row.qrCode).then(res=>{
+        await getQRCodeImg(row.qrCode).then(res => {
           let url = window.URL.createObjectURL(res.data);
           this.form.qrCodeUrl = url;
-        })
+        });
       });
-
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择货架删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择货架删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -1137,20 +1228,20 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    handleDisable () {
+    handleDisable() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据禁用?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据禁用?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return disable(this.ids);
@@ -1159,20 +1250,20 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    handleEnable () {
+    handleEnable() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择货架启用?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择货架启用?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return enable(this.ids);
@@ -1181,16 +1272,16 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDis (row) {
-      this.$confirm("确定将选择货架禁用?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDis(row) {
+      this.$confirm('确定将选择货架禁用?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return disable(row.id);
@@ -1198,16 +1289,16 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowEna (row) {
-      this.$confirm("确定将选择货架启用?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowEna(row) {
+      this.$confirm('确定将选择货架启用?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return enable(row.id);
@@ -1215,8 +1306,8 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
@@ -1255,37 +1346,37 @@ export default {
     //
     //   })
     // },
-    printTemplate(){
+    printTemplate() {
       let LODOP = getLodop();
-      console.log("this.ids>>>>>",this.ids);
-      console.log("this.ids>>>>>",this.allselectionList);
-      if (this.allselectionList.length === 0){
-        this.$message.warning("请选择至少一条数据");
+      console.log('this.ids>>>>>', this.ids);
+      console.log('this.ids>>>>>', this.allselectionList);
+      if (this.allselectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      getPrintTemplate(this.ids).then(res=>{
+      getPrintTemplate(this.ids).then(res => {
         let templateData = res.data.data;
         // let templateData = "res.data.data";
         console.log(templateData);
-        LODOP.PRINT_INITA("测试预览功能");
+        LODOP.PRINT_INITA('测试预览功能');
         // LODOP.PRINT_INITA("测试预览功能");
         //    LODOP.SET_PRINT_PAGESIZE(1, 0, 0, 'A4');
-        LODOP.SET_PRINT_MODE("WINDOW_DEFPRINTER","Deli DL-888T");
-        LODOP.SET_PRINT_PAGESIZE(2,"210mm","50mm" ,"")
-        LODOP.SET_SHOW_MODE("LANDSCAPE_DEFROTATED",1);
+        LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Deli DL-888T');
+        LODOP.SET_PRINT_PAGESIZE(2, '210mm', '50mm', '');
+        LODOP.SET_SHOW_MODE('LANDSCAPE_DEFROTATED', 1);
 
         // // 设置打印后自动关闭
-        LODOP.SET_PRINT_MODE("WINDOW_DEFPAGESIZE", 1);
+        LODOP.SET_PRINT_MODE('WINDOW_DEFPAGESIZE', 1);
         // // data就是一段html文本
-        LODOP.ADD_PRINT_HTM("0%","0%","100%","100%",templateData);
+        LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
         LODOP.PREVIEW(); //预览(预览打印无脚标)
-      })
+      });
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -1293,100 +1384,97 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       this.selectionList = list;
     },
-    allselectionChange (list) {
+    allselectionChange(list) {
       this.allselectionList = list;
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
-      this.query.warehouseId=null;
-      this.query.goodsAreaId=null;
+      this.query.warehouseId = null;
+      this.query.goodsAreaId = null;
       // this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    allcurrentChange (currentPage) {
+    allcurrentChange(currentPage) {
       this.allpage.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    allsizeChange (pageSize) {
+    allsizeChange(pageSize) {
       this.allpage.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    allonLoad(page){
-      let values ={
-        goodsShelfId:this.goodsShelfId,
-      }
+    allonLoad(page) {
+      let values = {
+        goodsShelfId: this.goodsShelfId,
+      };
       allgetList(page.currentPage, page.pageSize, values).then(res => {
-        const data = res.data.data
-        console.log("data>>>>>>>>>>>>>>>",data);
+        const data = res.data.data;
+        console.log('data>>>>>>>>>>>>>>>', data);
         this.allpage.total = data.total;
         this.alldata = data.records;
         this.loading = false;
       });
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       let ids = {};
-      if (!!this.query.goodsAreaInfo){
-        if (this.query.goodsAreaInfo.length===1){
+      if (!!this.query.goodsAreaInfo) {
+        if (this.query.goodsAreaInfo.length === 1) {
           //仓库下没有货区信息
           ids.warehouseId = this.query.goodsAreaInfo[0];
           ids.goodsAreaId = null;
           // this.query.goodsAreaInfo = null;
-        }else if (this.query.goodsAreaInfo.length===2){
+        } else if (this.query.goodsAreaInfo.length === 2) {
           //正常查询
-          ids.warehouseId= this.query.goodsAreaInfo[0];
+          ids.warehouseId = this.query.goodsAreaInfo[0];
           ids.goodsAreaId = this.query.goodsAreaInfo[1];
-        }else {
+        } else {
           console.log('error!!');
         }
-        Object.assign(this.query,ids)
+        Object.assign(this.query, ids);
       }
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res=>{
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
-        console.log(">>>>>",data);
-        data.records.forEach((item,index)=>{
-          if (item.enableStatus==1){
-            item.enableStatus='启用';
-          }else {
-            item.enableStatus='禁用';
+        console.log('>>>>>', data);
+        data.records.forEach((item, index) => {
+          if (item.enableStatus == 1) {
+            item.enableStatus = '启用';
+          } else {
+            item.enableStatus = '禁用';
           }
-          this.goodsShelfStatusData.forEach(goodsShelfStatus=>{
-            if (item.goodsShelfStatus === goodsShelfStatus.sort){
+          this.goodsShelfStatusData.forEach(goodsShelfStatus => {
+            if (item.goodsShelfStatus === goodsShelfStatus.sort) {
               item.goodsShelfStatus = goodsShelfStatus.dictValue;
             }
-          })
-        })
+          });
+        });
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
         this.selectionClear();
-      })
+      });
     },
   },
-
 };
-
-
 </script>
 <style>
 /*.el-cascader__dropdown .el-cascader-menu:first-child .el-cascader-node label{*/
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index 6329ea9d..9a3763f1 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -33,19 +33,19 @@
     <div class="tips">
       <el-button icon="el-icon-refresh" @click="checkshelves" circle></el-button>
       <div class="exprbuts" @click="handleExportArea">导出</div>
-      <div>
+      <div class="ls-box">
         总货位:
         <span class="def">{{ countnumber.cargoNub }}</span>
       </div>
-      <div>
+      <div class="ls-box">
         占用货位:
         <span class="red">{{ countnumber.employNub }}</span>
       </div>
-      <div>
+      <div class="ls-box">
         未用货位:
         <span class="green">{{ countnumber.unusedNub }}</span>
       </div>
-      <div>
+      <div class="ls-box">
         禁用货位:
         <span class="red">{{ countnumber.disableNub }}</span>
       </div>
@@ -66,37 +66,42 @@
       </div>
     </el-scrollbar>
   </div>
-  <div class="tips">
-      <div>
-        总货位:
-        <span class="def">{{ boxdetails.cargoNub }}</span>
-      </div>
-      <div>
-        占用货位:
-        <span class="red">{{ boxdetails.employNub }}</span>
-      </div>
-      <div>
-        未用货位:
-        <span class="green">{{ boxdetails.unusedNub }}</span>
-      </div>
-      <div>
-        禁用货位:
-        <span class="red">{{ boxdetails.disableNub }}</span>
-      </div>
-      <div>
-        货物总数:
-        <span class="red">{{ boxdetails.goodsNub }}</span>
-      </div>
+  <div class="tips tips-Menu">
+    <div>
+      总货位:
+      <span class="def">{{ boxdetails.cargoNub }}</span>
     </div>
+    <div>
+      占用货位:
+      <span class="red">{{ boxdetails.employNub }}</span>
+    </div>
+    <div>
+      未用货位:
+      <span class="green">{{ boxdetails.unusedNub }}</span>
+    </div>
+    <div>
+      禁用货位:
+      <span class="red">{{ boxdetails.disableNub }}</span>
+    </div>
+    <div>
+      货物总数:
+      <span class="red">{{ boxdetails.goodsNub }}</span>
+    </div>
+  </div>
   <div class="mabx">
-    <el-scrollbar max-height="70vh">
+    <el-scrollbar max-height="70vh" class="contentbj">
       <div class="contentbx" :style="contenbxsty">
         <div class="itemwbox" v-for="item in contenarr">
-          <div class="itemmibox" v-for="ite in item">
+          <div
+            :class="ite.enableStatus == 2 ? 'itemmibox rotate' : 'itemmibox'"
+            v-for="ite in item"
+          >
+            <div v-if="ite.enableStatus == 2">禁用货位</div>
             <el-tooltip
               :disabled="Number(ite.enableStatus) == 2"
               placement="bottom"
               hide-after="50"
+              v-else
             >
               <template #content>
                 <div v-if="ite.allocationStatus == 1">没有货位信息</div>
@@ -131,11 +136,26 @@
                     : 'itembox'
                 "
               >
-                <div class="titls">{{ (arrlist[checkselect]?.warehouseGoodsAreaVOList[checkregionselect].headline)+'-'+ite.layerNum + '层' + '-' + ite.columnNum + '列' }}</div>
-                <div>{{ '包件数:' + ite.packageNum }}</div>
-                <div>{{ '订单数:' + ite.orderNum }}</div>
-                <div>{{ '零担数:' + ite.lessNum }}</div>
-                <div>{{ '库存品数:' + ite.inventoryNum }}</div>
+                <div class="titls">
+                  {{
+                    arrlist[checkselect]?.warehouseGoodsAreaVOList[checkregionselect].headline +
+                    '-' +
+                    ite.layerNum +
+                    '层' +
+                    '-' +
+                    ite.columnNum +
+                    '列'
+                  }}
+                </div>
+                <div
+                  class="tilts-info"
+                  v-if="ite.packageNum || ite.orderNum || ite.lessNum || ite.inventoryNum"
+                >
+                  <span>包件数:{{ Number(ite.packageNum) }}</span>
+                  <span>订单数:{{ Number(ite.orderNum) }}</span>
+                  <span>零担数:{{ Number(ite.lessNum) }}</span>
+                  <span>库存品数:{{ Number(ite.inventoryNum) }}</span>
+                </div>
               </div>
             </el-tooltip>
           </div>
@@ -188,7 +208,7 @@
     </template>
   </el-dialog>
   <!-- 上架 -->
-   <el-dialog
+  <el-dialog
     v-model="isshowupt"
     :title="
       '请选择' +
@@ -209,6 +229,7 @@
     "
     width="80%"
     center
+    class="loadtc"
   >
     <div class="disbox">
       <div class="headtopscan">
@@ -228,7 +249,7 @@
             />
           </el-select> -->
           <div class="inptx">
-            <div>
+            <div class="asbor">
               {{
                 isshowupt == 1
                   ? '服务号'
@@ -315,15 +336,8 @@
     </template> -->
   </el-dialog>
 
-   <el-dialog
-    v-model="isshowConfirmedListing"
-    :title="
-      '确定上架'
-    "
-    width="50%"
-    center
-  >
-    <div style="text-align: center;">
+  <el-dialog v-model="isshowConfirmedListing" :title="'确定上架'" width="50%" center>
+    <div style="text-align: center">
       <el-button type="primary" @click="confirmedListing">确定</el-button>
       <el-button @click="isshowConfirmedListing = false">取消</el-button>
     </div>
@@ -346,6 +360,7 @@
     "
     width="80%"
     center
+    class="loadtc"
   >
     <div class="disbox">
       <div class="headtopscan">
@@ -411,7 +426,6 @@
             </div>
             <el-input
               style="flex: 1"
-
               v-model="inputtxts1"
               :placeholder="
                 '请输入' +
@@ -492,6 +506,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { dateNow } from '@/utils/date';
 const { proxy } = getCurrentInstance();
+let loadtc = ref(false);
 let details = reactive({
   columnList: [],
   tablistarr: [],
@@ -533,7 +548,7 @@ let details = reactive({
   checkselectchangearr: [],
   isshowdow: false,
   inputtxts1: '',
-  boxdetails:{}
+  boxdetails: {},
 });
 onMounted(() => {
   details.contenbxsty['--length'] = details.contenarr[0]?.length || 0;
@@ -571,32 +586,35 @@ function initpage() {
   // let warehousearr=
 }
 function handleExportArea() {
-  let id=details.arrlist[details.checkselect]?.id||0
-   let name=details.arrlist[details.checkselect]?.name||''
-  if (id ===0){
+  let id = details.arrlist[details.checkselect]?.id || 0;
+  let name = details.arrlist[details.checkselect]?.name || '';
+  if (id === 0) {
     proxy.$message({
-      type: "success",
-      message: "无选择仓库!"
+      type: 'success',
+      message: '无选择仓库!',
     });
     return;
   }
-  let downloadUrl = `/logpm-basicdata/goodsArea/export-visualizationwarehouse?${proxy.website.tokenHeader}=${getToken()}`;
-  console.log("id>>>>>>>>>>>>>>",id);
+  let downloadUrl = `/logpm-basicdata/goodsArea/export-visualizationwarehouse?${
+    proxy.website.tokenHeader
+  }=${getToken()}`;
+  console.log('id>>>>>>>>>>>>>>', id);
   let values = {
-    areaId:id,
+    areaId: id,
   };
-  proxy.$confirm("是否导出数据?", "提示", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning"
-  }).then(() => {
-    NProgress.start();
-    exportBlob(downloadUrl, values).then(res => {
-      downloadXls(res.data, name+`${dateNow()}.xlsx`);
-      NProgress.done();
+  proxy
+    .$confirm('是否导出数据?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
     })
-  });
-
+    .then(() => {
+      NProgress.start();
+      exportBlob(downloadUrl, values).then(res => {
+        downloadXls(res.data, name + `${dateNow()}.xlsx`);
+        NProgress.done();
+      });
+    });
 }
 
 function currentChange(currentPage) {
@@ -608,6 +626,7 @@ function sizeChange(pageSize) {
   searchbuts();
 }
 async function searchbuts() {
+  loadtc = true; //弹窗样式修改
   let url = '';
   let data = null;
   // console.log(details.arrlist[details.checkindex].id);
@@ -754,7 +773,7 @@ async function checkshelves() {
   console.log(res.data, 'res.data.datares.data.datares.data.datares.data.datares.data.data');
   let arrs = [];
   let maxlength = 0;
-  details.boxdetails=res.data.data
+  details.boxdetails = res.data.data;
   res.data.data.list.map(item => {
     if (item.columnNum > maxlength) {
       maxlength = item.columnNum;
@@ -787,8 +806,8 @@ async function checkshelves() {
 //   }
 // };
 const showupt = value => {
-  details.inputtxts=''
-  details.inputtxts1=''
+  details.inputtxts = '';
+  details.inputtxts1 = '';
   console.log('112312');
   details.isshowupt = value;
   switch (details.isshowupt) {
@@ -849,7 +868,7 @@ const showupt = value => {
         },
         {
           prop: 'customerAddress',
-          label: '顾客电话',
+          label: '顾客地址',
           type: 1,
           values: '',
           width: '260',
@@ -928,7 +947,7 @@ const showupt = value => {
         },
         {
           prop: 'customerAddress',
-          label: '顾客电话',
+          label: '顾客地址',
           type: 1,
           values: '',
           width: '260',
@@ -1029,7 +1048,7 @@ const showupt = value => {
         },
         {
           prop: 'customerAddress',
-          label: '顾客电话',
+          label: '顾客地址',
           type: 1,
           values: '',
           width: '150',
@@ -1247,6 +1266,17 @@ const showupt = value => {
           values: '',
           width: '200',
           checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'enterNum',
+          label: '可上架数量',
+          type: 10,
+          values: '',
+          width: '200',
+          checkarr: [],
           fixed: true,
           sortable: true,
           head: false,
@@ -1333,7 +1363,18 @@ const showupt = value => {
 
         {
           prop: 'customerAddress',
-          label: '顾客电话',
+          label: '顾客地址',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'residueNumber',
+          label: '可上架数量',
           type: 1,
           values: '',
           width: '150',
@@ -1365,7 +1406,7 @@ const alldown = async () => {
   let data = {
     allocationId: details.checkite.id,
   };
-  if(details.checkselectchangearr.length==0){
+  if (details.checkselectchangearr.length == 0) {
     proxy.$message({
       type: 'error',
       message: '请先勾选数据',
@@ -1385,7 +1426,7 @@ const alldown = async () => {
       break;
     case 3:
       url = 'downStock';
-      scope.row.stockType=1;
+      scope.row.stockType = 1;
       scope.row.allocationId = details.checkite.id;
       data.upShelfStockList = details.checkselectchangearr;
       break;
@@ -1403,7 +1444,7 @@ const alldown = async () => {
       type: 'success',
       message: response.data.msg,
     });
-    searchbutdown()
+    searchbutdown();
     // details.tablistarr = response.data.data.records;
     // details.total = response.data.data.total;
   } else {
@@ -1439,7 +1480,7 @@ const downhj = async scope => {
       break;
     case 3:
       url = 'downStock';
-      scope.row.stockType=1;
+      scope.row.stockType = 1;
       scope.row.allocationId = details.checkite.id;
       data.upShelfStockList = [scope.row];
       break;
@@ -1457,7 +1498,7 @@ const downhj = async scope => {
       type: 'success',
       message: response.data.msg,
     });
-    searchbutdown()
+    searchbutdown();
     // details.tablistarr = response.data.data.records;
     // details.total = response.data.data.total;
   } else {
@@ -1539,13 +1580,13 @@ const searchbutdown = async () => {
   }
 };
 const showdown = async value => {
-  details.inputtxts=''
-  details.inputtxts1=''
+  details.inputtxts = '';
+  details.inputtxts1 = '';
   if (value == 5) {
-    let url = 'downAllocation?ids='+details.checkite.id;
-    let data={
-      ids:details.checkite.id
-    }
+    let url = 'downAllocation?ids=' + details.checkite.id;
+    let data = {
+      ids: details.checkite.id,
+    };
     let response = await posturl(url, data);
     if (response.data.code == 200) {
       console.log(response.data);
@@ -1561,7 +1602,7 @@ const showdown = async value => {
         message: response.data.msg,
       });
     }
-    return
+    return;
   }
   details.isshowdow = value;
   switch (details.isshowdow) {
@@ -1783,7 +1824,7 @@ const showdown = async value => {
           values: '',
           width: '200',
           checkarr: [],
-          fixed: true,
+          fixed: false,
           sortable: true,
           head: false,
         },
@@ -1822,7 +1863,18 @@ const showdown = async value => {
         },
         {
           prop: 'customerAddress',
-          label: '顾客电话',
+          label: '顾客地址',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'num',
+          label: '可下架数量',
           type: 1,
           values: '',
           width: '150',
@@ -1831,6 +1883,7 @@ const showdown = async value => {
           sortable: true,
           head: false,
         },
+
         {
           prop: '',
           label: '操作',
@@ -1888,17 +1941,6 @@ const showdown = async value => {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'num',
-          label: '货位剩余数',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
         {
           prop: 'orderCode',
           label: '订单号',
@@ -2009,8 +2051,8 @@ const showdown = async value => {
   searchbutdown();
 };
 const addhuoj = async scope => {
-  details.addhuojData = scope
-  details.isshowConfirmedListing = true
+  details.addhuojData = scope;
+  details.isshowConfirmedListing = true;
   console.log(scope.row);
 };
 // 确定上架
@@ -2018,7 +2060,7 @@ const confirmedListing = async () => {
   let data = {
     allocationId: details.checkite.id,
   };
-  const scope = details.addhuojData
+  const scope = details.addhuojData;
   let url = '';
   switch (details.isshowupt) {
     case 1:
@@ -2035,12 +2077,12 @@ const confirmedListing = async () => {
       break;
     case 4:
       url = 'upTray';
-      let obj={
-        code:scope.row.palletCode,
-        allocationId:details.checkite.id
-      }
+      let obj = {
+        code: scope.row.palletCode,
+        allocationId: details.checkite.id,
+      };
 
-      data =obj
+      data = obj;
       break;
     case 5:
       url = 'upStock';
@@ -2057,14 +2099,14 @@ const confirmedListing = async () => {
   }
   let response = await posturl(url, data);
   // 关闭弹窗
-  details.isshowConfirmedListing = false
+  details.isshowConfirmedListing = false;
   if (response.data.code == 200) {
     console.log(response.data);
     proxy.$message({
       type: 'success',
       message: response.data.msg,
     });
-    searchbuts()
+    searchbuts();
     // details.tablistarr = response.data.data.records;
     // details.total = response.data.data.total;
   } else {
@@ -2073,7 +2115,7 @@ const confirmedListing = async () => {
       message: response.data.msg,
     });
   }
-}
+};
 async function allup() {
   // console.log(scope.row);
   let data = {
@@ -2125,7 +2167,7 @@ async function allup() {
       type: 'success',
       message: response.data.msg,
     });
-    searchbuts()
+    searchbuts();
     // details.tablistarr = response.data.data.records;
     // details.total = response.data.data.total;
   } else {
@@ -2140,11 +2182,11 @@ const removeinputup = () => {
   details.inputtxts1 = '';
   searchbuts();
 };
-const removeinputdown=()=>{
+const removeinputdown = () => {
   details.inputtxts = '';
   details.inputtxts1 = '';
   searchbutdown();
-}
+};
 const btnsc = scope => {
   console.log(scope);
 };
@@ -2162,8 +2204,8 @@ const selectionChange = scope => {
   details.checkselectchangearr = scope;
 };
 const checkitem = ite => {
-  details.inputtxts=''
-  details.inputtxts1=''
+  details.inputtxts = '';
+  details.inputtxts1 = '';
   if (Number(ite.allocationStatus) == 2) {
     details.isshowcon = 2;
     details.checkite = ite;
@@ -2228,7 +2270,7 @@ const {
   countnumber,
 } = toRefs(details);
 </script>
-<style lang="scss">
+<style lang="scss" scope>
 .fwhserveNub {
   display: flex;
   flex-direction: column;
@@ -2245,12 +2287,13 @@ const {
       display: flex;
       align-items: center;
       .inptx {
-        width: 260px;
-        margin-left: 20px;
         display: flex;
         align-items: center;
-        > div {
-          width: 60px;
+        .el-input {
+          margin-left: 10px;
+        }
+        .asbor {
+          width: 100px;
         }
       }
     }
@@ -2263,6 +2306,7 @@ const {
 }
 :root {
   --boxcolor: #adadad;
+  --bordercolor: #ccc;
 }
 .mabx {
   height: 70vh;
@@ -2271,12 +2315,17 @@ const {
   box-sizing: border-box;
   .contentbx {
     width: calc(150 * var(--length) * 0.0521vw);
+
+    // border: 0 !important;
+
     display: flex;
     // flex-direction: column;
     align-items: flex-end;
     border: 1.5px solid var(--boxcolor);
+    border: none;
     background-color: #fff;
     box-sizing: border-box;
+    align-items: flex-end;
     .headtop {
       display: flex;
       align-items: center;
@@ -2285,14 +2334,15 @@ const {
       // height: 90px;
       width: 150px;
       box-sizing: border-box;
-      border-right: 1.5px solid var(--boxcolor);
+      margin-right: 2px;
+      // border-right: 1.5px solid var(--boxcolor);
       &:nth-last-child(1) {
         border-right: 0;
       }
 
       &:nth-last-child(1) {
         .itemmibox {
-          border-bottom: 1.5px solid var(--boxcolor);
+          // border-bottom: 1.5px solid var(--boxcolor);
         }
       }
       .titls {
@@ -2318,8 +2368,9 @@ const {
 
         box-sizing: border-box;
         color: rgba(237, 25, 25);
+        margin-bottom: 2px;
         &:nth-last-child(1) {
-          border-right: 0;
+          // border-right: 0;
         }
       }
     }
@@ -2334,7 +2385,7 @@ const {
     height: 100%;
     display: flex;
     align-items: center;
-    justify-content: center;
+    justify-content: flex-start;
     flex-direction: column;
     // font-size: 14px;
   }
@@ -2360,15 +2411,16 @@ const {
   display: flex;
   align-items: center;
   justify-content: flex-start;
-  padding: 20px;
   box-sizing: border-box;
+  background-color: #fff;
+  width: 99%;
+  margin: 10px auto;
+  padding: 4px;
   .liebs {
     display: flex;
     align-items: center;
     justify-content: flex-start;
-    padding-bottom: 15px;
     // width: 6000px;
-    width: 100%;
   }
   .item {
     margin-right: 10px;
@@ -2399,7 +2451,8 @@ const {
   > .tips {
     display: flex;
     align-items: center;
-    .exprbuts{
+
+    .exprbuts {
       width: 70px;
       height: 30px;
       color: #666666;
@@ -2409,11 +2462,11 @@ const {
       display: flex;
       align-items: center;
       justify-content: center;
-      border: 1.5px solid #E8E8E8;
+      border: 1.5px solid #e8e8e8;
       cursor: pointer;
     }
     > div {
-      margin-left: 20px;
+      // margin-left: 20px;
     }
     .def {
       color: rgb(30, 159, 255);
@@ -2430,35 +2483,84 @@ const {
   }
 }
 .tips {
+  display: flex;
+  align-items: center;
+  .exprbuts {
+    width: 70px;
+    height: 30px;
+    color: #666666;
+    font-size: 12px;
+    background-color: #fff;
+    border-radius: 3px;
     display: flex;
     align-items: center;
-    .exprbuts{
-      width: 70px;
-      height: 30px;
-      color: #666666;
-      font-size: 12px;
-      background-color: #fff;
-      border-radius: 3px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border: 1.5px solid #E8E8E8;
-      cursor: pointer;
-    }
-    > div {
-      margin-left: 20px;
-    }
-    .def {
-      color: rgb(30, 159, 255);
-      font-weight: 600;
-    }
-    .red {
-      color: rgb(255, 87, 34);
-      font-weight: 600;
-    }
-    .green {
-      color: rgb(95, 184, 120);
-      font-weight: 600;
-    }
+    justify-content: center;
+    border: 1.5px solid #e8e8e8;
+    cursor: pointer;
+  }
+  > div {
+    padding: 0 8px;
+    font-weight: 500;
+  }
+  .def {
+    color: rgb(30, 159, 255);
+    font-weight: 600;
+  }
+  .red {
+    color: rgb(255, 87, 34);
+    font-weight: 600;
+  }
+  .green {
+    color: rgb(95, 184, 120);
+    font-weight: 600;
   }
+}
+.tips-Menu {
+  background-color: #fff;
+  padding: 8px 0;
+  width: 99%;
+  margin: 0 auto;
+}
+
+.contentbj {
+  background-color: #fff;
+  // border: 1px solid var(--bordercolor);
+}
+
+.itemwbox:last-child {
+  // .itemmibox {
+  //   border-right: 1px solid var(--boxcolor);
+  // }
+}
+.itemwbox {
+  overflow: hidden;
+}
+.itemwbox {
+  border-top: none !important;
+}
+.tilts-info {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  width: 120px;
+}
+.itemmibox {
+  border: 0 !important;
+}
+
+.mabx .contentbx .itemwbox .rotate {
+  border: 1px solid #ff0000 !important;
+  background-color: #bd3a52 !important;
+  color: #fff;
+}
+.el-input__inner {
+  background-color: transparent !important;
+}
+.loadtc {
+  margin-top: 2% !important;
+}
+
+.el-input__suffix {
+  width: 16px !important;
+}
 </style>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index f3998343..df7cf3c3 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -1,215 +1,239 @@
 <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.trainNumber" placeholder="请输入配送车次"></el-input>
-                    </el-form-item>
-                    <el-form-item label="配送日期:">
-                        <el-date-picker
-                                v-model="query.taskTime"
-                                type="date"
-                                placeholder="选择日期"
-                                format="YYYY-MM-DD "
-                                value-format="YYYY-MM-DD"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="配送类型:">
-                        <el-select v-model="query.businessType" placeholder="请选择业务类型">
-                            <el-option
-                                    :key="'1'"
-                                    :value="'商配'">商配
-                            </el-option>
-                            <el-option
-                                    :key="'2'"
-                                    :value="'市配'">市配
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="配送种类:">
-                        <el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
-                            <el-option
-                                    :key="'1'"
-                                    :value="'自主配送'">自主配送
-                            </el-option>
-                            <el-option
-                                    :key="'2'"
-                                    :value="'外协配送'">外协配送
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="配送司机:">
-                        <el-select
-                                v-model="query.driverName"
-                                filterable
-                                placeholder="请输入司机名称"
-                                :loading="loading">
-                            <el-option
-                                    v-for="item in driverData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictValue">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="配送车辆:">
-                        <el-select
-                                v-model="query.vehicleName"
-                                filterable
-                                placeholder="请输入司机名称"
-                                :loading="loading">
-                            <el-option
-                                    v-for="item in vehicleData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictValue">
-                            </el-option>
-                        </el-select>
-                    </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 :gutter="24" class="rows">
-                <el-col :xl="7" :lg="7" :md="8" :sm="24">
-                    <span>配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>
-                </el-col>
-                <el-col :xl="7" :lg="7" :md="8" :sm="24">
-                    <span>商配总车次：{{statistics.commercialNub}}/总包件数：{{statistics.commercialTotal}}/总库存品数：{{statistics.cinventoryTotal}} </span>
-                </el-col>
-                <el-col :xl="7" :lg="7" :md="8" :sm="24">
-                    <span>市配总车次：{{statistics.marketNub}}/总包件数：{{statistics.marketTotal}}/总库存品数：{{statistics.minventoryTotal}} </span>
-                </el-col>
-            </el-row>
-            <el-row>
-                <div class="avue-crud__header">
-                    <!-- 头部左侧按钮模块 -->
-                    <div class="avue-crud__left" style="margin-top: 20px">
-                                   <el-button type="primary" icon="el-icon-plus" @click="printBatchOrder">批量打印</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="Operation" @click="showdrawer(true)" 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="selectionsc"
-                >
-                    <template #default="slotProps">
-                      <el-text @click="editsolt(slotProps.scope)">查 看</el-text>
-                      <el-text @click="editmap(slotProps.scope)">地 图</el-text>
-                    </template>
-                </tablecmt>
-               
-            </el-row>
-            <el-row>
-              <div class="avue-crud__pagination flex-c-sb" style="width:100%;">
-                <div style="font-size: 14px;">
-                  勾选数量: {{ selectionList.length }}
-                </div>
-                <!-- 分页模块 -->
-                <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>
-            <!-- 表单模块 -->
+  <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.trainNumber" placeholder="请输入配送车次"></el-input>
+          </el-form-item>
+          <el-form-item label="配送日期:">
+            <el-date-picker
+              v-model="query.taskTime"
+              type="date"
+              placeholder="选择日期"
+              format="YYYY-MM-DD "
+              value-format="YYYY-MM-DD"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="配送类型:">
+            <el-select v-model="query.businessType" placeholder="请选择业务类型">
+              <el-option :key="'1'" :value="'商配'">商配 </el-option>
+              <el-option :key="'2'" :value="'市配'">市配 </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="配送种类:">
+            <el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
+              <el-option :key="'1'" :value="'自主配送'">自主配送 </el-option>
+              <el-option :key="'2'" :value="'外协配送'">外协配送 </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="配送司机:">
+            <el-select
+              v-model="query.driverName"
+              filterable
+              placeholder="请输入司机名称"
+              :loading="loading"
+            >
+              <el-option
+                v-for="item in driverData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="配送车辆:">
+            <el-select
+              v-model="query.vehicleName"
+              filterable
+              placeholder="请输入司机名称"
+              :loading="loading"
+            >
+              <el-option
+                v-for="item in vehicleData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </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 :gutter="24" class="rows">
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span
+            >配送总车次：{{ statistics.vehiclesNub }}/总包件数：{{
+              statistics.deliveriesTotal
+            }}/总库存品数：{{ statistics.dinventoryTotal }}
+          </span>
+        </el-col>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span
+            >商配总车次：{{ statistics.commercialNub }}/总包件数：{{
+              statistics.commercialTotal
+            }}/总库存品数：{{ statistics.cinventoryTotal }}
+          </span>
+        </el-col>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span
+            >市配总车次：{{ statistics.marketNub }}/总包件数：{{
+              statistics.marketTotal
+            }}/总库存品数：{{ statistics.minventoryTotal }}
+          </span>
+        </el-col>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left" style="margin-top: 20px">
+            <el-button type="primary" icon="el-icon-plus" @click="printBatchOrder"
+              >批量打印</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="Operation" @click="showdrawer(true)" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
         </div>
-        <el-dialog
-                v-model="dialogVisible"
-                title="增值服务"
-                width="30%"
-                :before-close="handleClose">
-            <el-form-item label="增值服务" prop="freightMark">
-                <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
-                    <el-checkbox style="width: 100%;margin-bottom: 3%;"
-                                 v-for="(item,index) in addvalueServeTypeData"
-                                 :key="item.dictKey"
-                                 :label="item.dictKey"
-                    >{{item.dictValue}}
-                        <span v-if="index===0||index===6||index===2||index===4">&nbsp;件数:
-                         <el-input type="number" v-model="item.f"
-                                   :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                   @change="textbox($event,index,1)"
-                                   style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                        <span v-if="index===1">公里:
-                          <el-input type="primary" v-model="item.a"
-                                    :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                    @change="textbox($event,index,2)"
-                                    style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                        <span v-if="index===3">距离:
-                      <el-input type="number" v-model="item.b"
-                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                @change="textbox($event,index,3)"
-                                style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                        <span v-if="index===5">人数:
-                      <el-input type="number" v-model="item.c"
-                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                @change="textbox($event,index,4)"
-                                style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                        <span v-if="index===0">楼层:
-                      <el-input type="number" v-model="item.d"
-                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                @change="textbox($event,index,5)"
-                                style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                        <span v-if="item">预计费用:
-                        <el-input type="number" v-model="item.e"
-                                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                                  @change="textbox($event,index,6)"
-                                  style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-            <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="aaa">
-          确定(增值服务)
-        </el-button>
-      </span>
-            </template>
-        </el-dialog>
-    </basic-container>
-    <edittablehead
-            @setcolum="setnewcolum"
-            @closce="showdrawer"
-            :drawerShow="drawerShow"
-            :columnList="columnList"
-    ></edittablehead>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          :columnList="columnList"
+          :tableData="data"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionsc"
+        >
+          <template #default="slotProps">
+            <el-text @click="editsolt(slotProps.scope)">查 看</el-text>
+            <el-text @click="editmap(slotProps.scope)">地 图</el-text>
+          </template>
+        </tablecmt>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+          <!-- 分页模块 -->
+          <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>
+    <el-dialog v-model="dialogVisible" title="增值服务" width="30%" :before-close="handleClose">
+      <el-form-item label="增值服务" prop="freightMark">
+        <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
+          <el-checkbox
+            style="width: 100%; margin-bottom: 3%"
+            v-for="(item, index) in addvalueServeTypeData"
+            :key="item.dictKey"
+            :label="item.dictKey"
+            >{{ item.dictValue }}
+            <span v-if="index === 0 || index === 6 || index === 2 || index === 4"
+              >&nbsp;件数:
+              <el-input
+                type="number"
+                v-model="item.f"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 1)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 1"
+              >公里:
+              <el-input
+                type="primary"
+                v-model="item.a"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 2)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 3"
+              >距离:
+              <el-input
+                type="number"
+                v-model="item.b"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 3)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 5"
+              >人数:
+              <el-input
+                type="number"
+                v-model="item.c"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 4)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="index === 0"
+              >楼层:
+              <el-input
+                type="number"
+                v-model="item.d"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 5)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+            <span v-if="item"
+              >预计费用:
+              <el-input
+                type="number"
+                v-model="item.e"
+                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                @change="textbox($event, index, 6)"
+                style="width: 20%; border: none; border-bottom: 2px solid #eee"
+              />
+            </span>
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="aaa"> 确定(增值服务) </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </basic-container>
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="columnList"
+  ></edittablehead>
 
-      <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
+  <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
     <div>
       <div v-html="html"></div>
 
@@ -231,824 +255,818 @@
 </template>
 
 <script>
-  import {
-    getList,
-    getDetail,
-    add,
-    update,
-    remove,
-    getPage,
-    getstatistics,
-    printBatch
-  } from '@/api/distribution/distributionDeliveryList';
-  import option from '@/option/distribution/distributionDeliveryList';
-  import { mapGetters } from 'vuex';
-  import { getDictionaryBiz } from '@/api/system/dict';
-  import { addIncrement } from '@/api/distribution/distributionStockArticle';
-  import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
-  import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
-  import print from '@/utils/print';
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getPage,
+  getstatistics,
+  printBatch,
+} from '@/api/distribution/distributionDeliveryList';
+import option from '@/option/distribution/distributionDeliveryList';
+import { mapGetters } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+import { addIncrement } from '@/api/distribution/distributionStockArticle';
+import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
+import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
+import print from '@/utils/print';
 
-  export default {
-    data() {
-      return {
-
-        height: 0,
-        // 弹框标题
-        title: '',
-        // 是否展示弹框
-        box: false,
-        // 是否显示查询
-        search: true,
-        // 加载中
-        loading: true,
-        // 是否为查看模式
-        view: false,
-              // 打印模版
+export default {
+  data() {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 打印模版
       html: '',
       // 是否显示打印模版
       isShow: false,
-        // 查询信息
-        query: {},
-        //数据统计
-        statistics: {},
-        drawerShow: false,
-        // 分页信息
-        page: {
-          currentPage: 1,
-          pageSize: 30,
-          total: 40
-        },
-        //配送类型
-        deliverytypeData: [],
-        //配送种类
-        deliverykindData: [],
-        //配送状态
-        deliveryliststateData: [],
-        // 表单数据
-        form: {},
-        // 选择行
-        selectionList: [],
-        columnList: [
-          {
-            prop: '',
-            label: '序号',
-            type: 0,
-            values: '',
-            width: 55,
-            checkarr: [],
-            fixed: true,
-          },
-          {
-            prop: 'trainNumber',
-            label: '车次',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: true,
-            sortable: true
-            // head: true,
-          },
-          {
-            prop: 'taskTime',
-            label: '配送日期',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: true,
-            sortable: true
-            // head: true,
-          },
-          {
-            prop: 'warehouseName',
-            label: '仓库',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'kindName',
-            label: '配送种类',
-            type: 3,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'typeName',
-            label: '配送类型',
-            type: 3,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'vehicleName',
-            label: '配送车辆',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'driverName',
-            label: '配送司机',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'distributionCompany',
-            label: '配送公司',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'deliveryStatusName',
-            label: '配送状态',
-            type: 3,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          // {
-          //   prop: 'deliveryListLoadingStatusName',
-          //   label: '装车状态',
-          //   type: 3,
-          //   values: '',
-          //   width: '150',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true
-          // },
-          {
-            prop: 'customersNumber',
-            label: '配送客户数',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'price',
-            label: '配送价格',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          // {
-          //   prop: 'fee',
-          //   label: '增值服务',
-          //   type: 1,
-          //   values: '',
-          //   width: '130',
-          //   checkarr: [],
-          //   fixed: false,
-          //   sortable: true
-          // },
-          {
-            prop: 'orderNumber',
-            label: '订单总数',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'deliveryNumber',
-            label: '配送包件数',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'inventoryNub',
-            label: '配送库存品件数',
-            type: 1,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'scannedNumber',
-            label: '扫描件数',
-            type: 1,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: 'loadingTeamName',
-            label: '装卸班组',
-            type: 2,
-            values: '',
-            width: '130',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
-          {
-            prop: '',
-            label: '操作',
-            type: 6,
-            values: '',
-            width: '200',
-            checkarr: [],
-            fixed: 'right',
-            sortable: false
-          }
-          // 更多列的配置...
-        ],
-        // 表单配置
-        option: option,
-        //增值服务弹窗
-        dialogVisible: false,
-        //增值服务字典列表
-        addvalueServeTypeData: [],
-        //增值服务列表
-        addvalueServeType: [],
-        //配送方式字典列表
-        deliveryWayData: [],
-        //增值服务对象
-        addvalueObj: {},
-        //订单行数据
-        orderInfo: {},
-        deliverId: null,
-        //费用列表
-        feeList: [],
-        //楼层
-        floorList: [],
-        // 表单列表
-        data: [],
-        driverData: [],
-        vehicleData: []
-      };
-    },
-    watch: {
-      handler(newVal, oldVal) {
-        this.fetchData();
-        this.onLoad(this.page);
+      // 查询信息
+      query: {},
+      //数据统计
+      statistics: {},
+      drawerShow: false,
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
       },
-      deep: false,
-      immediate: true
-
+      //配送类型
+      deliverytypeData: [],
+      //配送种类
+      deliverykindData: [],
+      //配送状态
+      deliveryliststateData: [],
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      columnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'trainNumber',
+          label: '车次',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          // head: true,
+        },
+        {
+          prop: 'taskTime',
+          label: '配送日期',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          // head: true,
+        },
+        {
+          prop: 'warehouseName',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'kindName',
+          label: '配送种类',
+          type: 3,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'typeName',
+          label: '配送类型',
+          type: 3,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'vehicleName',
+          label: '配送车辆',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'driverName',
+          label: '配送司机',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'distributionCompany',
+          label: '配送公司',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryStatusName',
+          label: '配送状态',
+          type: 3,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'deliveryListLoadingStatusName',
+        //   label: '装车状态',
+        //   type: 3,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true
+        // },
+        {
+          prop: 'customersNumber',
+          label: '配送客户数',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'price',
+          label: '配送价格',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        // {
+        //   prop: 'fee',
+        //   label: '增值服务',
+        //   type: 1,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true
+        // },
+        {
+          prop: 'orderNumber',
+          label: '订单总数',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryNumber',
+          label: '配送包件数',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'inventoryNub',
+          label: '配送库存品件数',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'scannedNumber',
+          label: '扫描件数',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'loadingTeamName',
+          label: '装卸班组',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: 'right',
+          sortable: false,
+        },
+        // 更多列的配置...
+      ],
+      // 表单配置
+      option: option,
+      //增值服务弹窗
+      dialogVisible: false,
+      //增值服务字典列表
+      addvalueServeTypeData: [],
+      //增值服务列表
+      addvalueServeType: [],
+      //配送方式字典列表
+      deliveryWayData: [],
+      //增值服务对象
+      addvalueObj: {},
+      //订单行数据
+      orderInfo: {},
+      deliverId: null,
+      //费用列表
+      feeList: [],
+      //楼层
+      floorList: [],
+      // 表单列表
+      data: [],
+      driverData: [],
+      vehicleData: [],
+    };
+  },
+  watch: {
+    handler(newVal, oldVal) {
+      this.fetchData();
+      this.onLoad(this.page);
     },
-    mounted() {
-      this.getvehicleData();
-      this.getDriverData();
-      this.queryDictionary();
-      this.init();
-      /**
-       * 初始化获取本地缓存的编辑隐藏的列表
-       *  固定搭配，不能更改
-       */
-      let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
-      let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
-      let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
-      if (checkListnewarr) {
-        this.columnList.map(item => {
-          item.head = false;
-        });
-        checkListnewarr.map(ite => {
-          this.columnList.map(item => {
-            if (ite == item.label) {
-              item.head = true;
-            }
-          });
-        });
-      } else {
-        let arr = [];
+    deep: false,
+    immediate: true,
+  },
+  mounted() {
+    this.getvehicleData();
+    this.getDriverData();
+    this.queryDictionary();
+    this.init();
+    /**
+     * 初始化获取本地缓存的编辑隐藏的列表
+     *  固定搭配，不能更改
+     */
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
+    if (checkListnewarr) {
+      this.columnList.map(item => {
+        item.head = false;
+      });
+      checkListnewarr.map(ite => {
         this.columnList.map(item => {
-          if (item.head) {
-            arr.push(item.label);
+          if (ite == item.label) {
+            item.head = true;
           }
         });
-        this.$functions.setStorage(window.location.pathname + 'checkList', arr);
-      }
-      if (flexListnewarr) {
+      });
+    } else {
+      let arr = [];
+      this.columnList.map(item => {
+        if (item.head) {
+          arr.push(item.label);
+        }
+      });
+      this.$functions.setStorage(window.location.pathname + 'checkList', arr);
+    }
+    if (flexListnewarr) {
+      this.columnList.map(item => {
+        item.fixed = false;
+      });
+      flexListnewarr.map(ite => {
         this.columnList.map(item => {
-          item.fixed = false;
-        });
-        flexListnewarr.map(ite => {
-          this.columnList.map(item => {
-            if (ite == item.label) {
-              if (item.type == 6) {
-                item.fixed = 'right';
-              } else {
-                item.fixed = true;
-              }
+          if (ite == item.label) {
+            if (item.type == 6) {
+              item.fixed = 'right';
+            } else {
+              item.fixed = true;
             }
-          });
-        });
-      } else {
-        let arr = [];
-        this.columnList.map(item => {
-          if (item.fixed) {
-            arr.push(item.label);
           }
         });
-        this.$functions.setStorage(window.location.pathname + 'flexList', arr);
-      }
-      if (sortlistnewarr) {
-        this.columnList.map(item => {
-          item.sortable = false;
-        });
-        sortlistnewarr.map(ite => {
-          this.columnList.map(item => {
-            if (ite == item.label) {
-              item.sortable = true;
-            }
-          });
-        });
-      } else {
-        let arr = [];
+      });
+    } else {
+      let arr = [];
+      this.columnList.map(item => {
+        if (item.fixed) {
+          arr.push(item.label);
+        }
+      });
+      this.$functions.setStorage(window.location.pathname + 'flexList', arr);
+    }
+    if (sortlistnewarr) {
+      this.columnList.map(item => {
+        item.sortable = false;
+      });
+      sortlistnewarr.map(ite => {
         this.columnList.map(item => {
-          if (item.sortable) {
-            arr.push(item.label);
+          if (ite == item.label) {
+            item.sortable = true;
           }
         });
-        this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
-      }
-    },
-    computed: {
-      ...mapGetters(['permission']),
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(',');
-      }
+      });
+    } else {
+      let arr = [];
+      this.columnList.map(item => {
+        if (item.sortable) {
+          arr.push(item.label);
+        }
+      });
+      this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
+    }
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
     },
-    methods: {
-      getvehicleData() {
-        return new Promise((rv, rev) => {
-          getVehicleList(1, 10, '').then(res => {
-            const data = res.data.data;
-            let po = [];
-            data.records.forEach(item => {
-              let a = {
-                dictKey: item.id,
-                dictValue: item.vehicleNub
-              };
-              po.push(a);
-            });
-            this.vehicleData = po;
-            rv(res.data.data.records);
+  },
+  methods: {
+    getvehicleData() {
+      return new Promise((rv, rev) => {
+        getVehicleList(1, 10, '').then(res => {
+          const data = res.data.data;
+          let po = [];
+          data.records.forEach(item => {
+            let a = {
+              dictKey: item.id,
+              dictValue: item.vehicleNub,
+            };
+            po.push(a);
           });
+          this.vehicleData = po;
+          rv(res.data.data.records);
         });
-      },
-      getDriverData() {
-        return new Promise((rv, rev) => {
-          getDriverList(1, 10, '').then(res => {
-            const data = res.data.data;
-            let po = [];
-            data.records.forEach(item => {
-              let a = {
-                dictKey: item.id,
-                dictValue: item.name
-              };
-              po.push(a);
-            });
-            this.driverData = po;
-            rv(res.data.data.records);
+      });
+    },
+    getDriverData() {
+      return new Promise((rv, rev) => {
+        getDriverList(1, 10, '').then(res => {
+          const data = res.data.data;
+          let po = [];
+          data.records.forEach(item => {
+            let a = {
+              dictKey: item.id,
+              dictValue: item.name,
+            };
+            po.push(a);
           });
+          this.driverData = po;
+          rv(res.data.data.records);
         });
-      },
-      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);
-        }
-
-      },
-      handleCheckedCitiesChange(value) {
-        if (value) {
-          this.form.addvalueType = value;
-        }
-        if (value.length < 1) {
-          this.costList = [];
-          this.costListName = [];
+      });
+    },
+    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);
+      }
+    },
+    handleCheckedCitiesChange(value) {
+      if (value) {
+        this.form.addvalueType = value;
+      }
+      if (value.length < 1) {
+        this.costList = [];
+        this.costListName = [];
+      }
+      this.deliveryWayData.forEach(i => {
+        if (value.includes(i.dictKey)) {
+          i.pitch = true;
+          this.costListName = value;
         }
-        this.deliveryWayData.forEach(i => {
-          if (value.includes(i.dictKey)) {
-            i.pitch = true;
-            this.costListName = value;
-          }
-        });
-
-      },
-      textbox(e, index, a) {
-        if (a === 6) {
-          this.feeList[index + 1] = e;
+      });
+    },
+    textbox(e, index, a) {
+      if (a === 6) {
+        this.feeList[index + 1] = e;
+        return;
+      }
+      if (a === 5)
+        if (index === 0 && a === 5) {
+          this.floorList[index + 1] = e;
           return;
         }
-        if (a === 5)
-          if (index === 0 && a === 5) {
-            this.floorList[index + 1] = e;
-            return;
-          }
-        this.costList[index + 1] = e;
+      this.costList[index + 1] = e;
 
-        //费用列表
-      },
+      //费用列表
+    },
 
     /**
      * 批量打印
      */
-     printBatchOrder(){
+    printBatchOrder() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      const ids = Array.from(this.selectionList).join(',')
-      printBatch({ids, type: 1})
-        this.isShow = true;
-
+      const ids = Array.from(this.selectionList).join(',');
+      printBatch({ ids, type: 1 });
+      this.isShow = true;
     },
-      aaa() {
-        let addvalueInfos = [];
-        this.form.addvalueType.forEach((item, index) => {
-          let addvalueInfo = {};
-          addvalueInfo.addvalueId = item;
-          if (item == 1 || item == 3 || item == 5 || item == 7) {
-            addvalueInfo.number = this.costList[item];
-          }
-          if (item == 2) {
-            addvalueInfo.kilometer = this.costList[item];
-          }
-          if (item == 4) {
-            addvalueInfo.distance = this.costList[item];
-          }
-          if (item == 6) {
-            addvalueInfo.peopleNum = this.costList[item];
-          }
-          if (this.floorList.length > 1) {
-            addvalueInfo.floor = this.floorList[1];
-            this.floorList = [];
-          }
-          addvalueInfo.fee = this.feeList[item];
-          addvalueInfos.push(addvalueInfo);
-        });
-        let params = {};
-        params.id = this.deliverId;
-        params.addvalue = addvalueInfos;
-        params.relatedId = 2;
-        addIncrement(params).then(res => {
-          this.dialogVisible = false;
-          this.$message({
-            type: 'success',
-            message: '操作成功!'
-          });
-        });
-        this.onLoad(this.page);
-      },
-      selectionsc(value) {
-        console.log('value :>> ', value);
-        // 筛选出所有被选中项的id
-        this.selectionList = value.map(item => item.id)
-      },
-      editmap(scope) {
-        const { row } = scope;
-        this.$router.push({
-          path: '/distribution/reservation/atlas1',
-          query: {
-            item: JSON.stringify(row),
-            type: '2'
-          }
-        });
-      },
-      delectsolt(scope) {
-        const { row } = scope;
-      },
-      handleClose(done) {
-        this.$confirm('确认关闭？')
-          .then(_ => {
-            done();
-          })
-          .catch(_ => {
-          });
-      },
-      editsolt(scope) {
-        const { row } = scope;
-        this.$router.push({
-          path: '/distribution/deliverylist/distributionDeliveryListedt',
-          query: {
-            data: encodeURIComponent(JSON.stringify(row)),
-            name: row.trainNumber + '-查看配送'
-          }
-        });
-      },
-      costadd(scope) {
-        const { row } = scope;
-        this.deliverId = row.id;
-        //查询订单的增值服务，
-        this.addvalueServeType = [];
-        this.addvalue = {};
-        this.dialogVisible = true;
-        this.costList = [];
-        this.feeList = [];
-        this.floorList = [];
-        // this.orderInfo = row;
-      },
-      btnsc(index, row) {
-      },
-      selectsc(index, row) {
-        this.query[row.prop] = index;
-        if (!index) {
-          delete this.query[row.prop];
+    aaa() {
+      let addvalueInfos = [];
+      this.form.addvalueType.forEach((item, index) => {
+        let addvalueInfo = {};
+        addvalueInfo.addvalueId = item;
+        if (item == 1 || item == 3 || item == 5 || item == 7) {
+          addvalueInfo.number = this.costList[item];
         }
-        if (row.prop === 'deliveryStatusName') {
-          this.query['deliveryStatus'] = index;
-        } else if (row.prop === 'kindName') {
-          this.query['kind'] = index;
-
+        if (item == 2) {
+          addvalueInfo.kilometer = this.costList[item];
         }
-        this.onLoad(this.page);
-      },
-      timesc(index, row) {
-      },
-      inputsc(index, row) {
-        this.query[row.prop] = index;
-        if (!index) {
-          delete this.query[row.prop];
+        if (item == 4) {
+          addvalueInfo.distance = this.costList[item];
         }
-        this.onLoad(this.page);
-      },
-      queryDictionary() {
-        getDictionaryBiz('addvalue_serve_type').then(res => {
-          this.addvalueServeTypeData = res.data.data;
-        });
-        getDictionaryBiz('delivery_way').then(res => {
-          this.deliveryWayData = res.data.data;
+        if (item == 6) {
+          addvalueInfo.peopleNum = this.costList[item];
+        }
+        if (this.floorList.length > 1) {
+          addvalueInfo.floor = this.floorList[1];
+          this.floorList = [];
+        }
+        addvalueInfo.fee = this.feeList[item];
+        addvalueInfos.push(addvalueInfo);
+      });
+      let params = {};
+      params.id = this.deliverId;
+      params.addvalue = addvalueInfos;
+      params.relatedId = 2;
+      addIncrement(params).then(res => {
+        this.dialogVisible = false;
+        this.$message({
+          type: 'success',
+          message: '操作成功!',
         });
+      });
+      this.onLoad(this.page);
+    },
+    selectionsc(value) {
+      console.log('value :>> ', value);
+      // 筛选出所有被选中项的id
+      this.selectionList = value.map(item => item.id);
+    },
+    editmap(scope) {
+      const { row } = scope;
+      this.$router.push({
+        path: '/distribution/reservation/atlas1',
+        query: {
+          item: JSON.stringify(row),
+          type: '2',
+        },
+      });
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {});
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      this.$router.push({
+        path: '/distribution/deliverylist/distributionDeliveryListedt',
+        query: {
+          data: encodeURIComponent(JSON.stringify(row)),
+          name: row.trainNumber + '-查看配送',
+        },
+      });
+    },
+    costadd(scope) {
+      const { row } = scope;
+      this.deliverId = row.id;
+      //查询订单的增值服务，
+      this.addvalueServeType = [];
+      this.addvalue = {};
+      this.dialogVisible = true;
+      this.costList = [];
+      this.feeList = [];
+      this.floorList = [];
+      // this.orderInfo = row;
+    },
+    btnsc(index, row) {},
+    selectsc(index, row) {
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
+      }
+      if (row.prop === 'deliveryStatusName') {
+        this.query['deliveryStatus'] = index;
+      } else if (row.prop === 'kindName') {
+        this.query['kind'] = index;
+      }
+      this.onLoad(this.page);
+    },
+    timesc(index, row) {},
+    inputsc(index, row) {
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
+      }
+      this.onLoad(this.page);
+    },
+    queryDictionary() {
+      getDictionaryBiz('addvalue_serve_type').then(res => {
+        this.addvalueServeTypeData = res.data.data;
+      });
+      getDictionaryBiz('delivery_way').then(res => {
+        this.deliveryWayData = res.data.data;
+      });
 
-
-        //配送状态
-        getDictionaryBiz('distribution_delivery_status').then(res => {
-          this.$functions.checkcColumnList('deliveryStatusName', this.columnList).checkarr = res.data.data.map(item => {
+      //配送状态
+      getDictionaryBiz('distribution_delivery_status').then(res => {
+        this.$functions.checkcColumnList('deliveryStatusName', this.columnList).checkarr =
+          res.data.data.map(item => {
             item.value = item.dictKey;
             item.label = item.dictValue;
             return item;
           });
-        });
-        //配送种类
-        getDictionaryBiz('distribution_deliverylist_kind').then(res => {
-          this.$functions.checkcColumnList('kindName', this.columnList).checkarr = res.data.data.map(item => {
+      });
+      //配送种类
+      getDictionaryBiz('distribution_deliverylist_kind').then(res => {
+        this.$functions.checkcColumnList('kindName', this.columnList).checkarr = res.data.data.map(
+          item => {
             item.value = item.dictKey;
             item.label = item.dictValue;
             return item;
-          });
-        });
-        this.onLoad(this.page);
-
-      },
-      //类型切换
-      // deliverytype(type){
-      //   this.query.type=type;
-      //   this.onLoad(this.page)
-      // },
-      init() {
-        this.height = this.setPx(document.body.clientHeight - 340);
-      },
-      searchHide() {
-        this.search = !this.search;
-      },
-      searchChange() {
-        if (this.query.deliveryKind) {
-          let deliveryKind = this.query.deliveryKind;
-          switch (deliveryKind) {
-            case '自主配送':
-              this.query.kind = '1';
-              break;
-            case '外协配送':
-              this.query.kind = '2';
-              break;
           }
+        );
+      });
+      this.onLoad(this.page);
+    },
+    //类型切换
+    // deliverytype(type){
+    //   this.query.type=type;
+    //   this.onLoad(this.page)
+    // },
+    init() {
+      this.height = this.setPx(document.body.clientHeight - 340);
+    },
+    searchHide() {
+      this.search = !this.search;
+    },
+    searchChange() {
+      if (this.query.deliveryKind) {
+        let deliveryKind = this.query.deliveryKind;
+        switch (deliveryKind) {
+          case '自主配送':
+            this.query.kind = '1';
+            break;
+          case '外协配送':
+            this.query.kind = '2';
+            break;
         }
-        if (this.query.businessType) {
-          let businessType = this.query.businessType;
-          switch (businessType) {
-            case '商配':
-              this.query.type = '1';
-              break;
-            case '市配':
-              this.query.type = '2';
-              break;
-          }
+      }
+      if (this.query.businessType) {
+        let businessType = this.query.businessType;
+        switch (businessType) {
+          case '商配':
+            this.query.type = '1';
+            break;
+          case '市配':
+            this.query.type = '2';
+            break;
         }
-        this.onLoad(this.page);
-      },
-      searchReset() {
-        this.query = {};
-        this.page.currentPage = 1;
-        this.onLoad(this.page);
-      },
-      handleSubmit() {
-        if (!this.form.id) {
-          add(this.form).then(() => {
-            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: '操作成功!'
-            });
+      }
+      this.onLoad(this.page);
+    },
+    searchReset() {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    handleSubmit() {
+      if (!this.form.id) {
+        add(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-        }
-      },
-      handleAdd() {
-        this.title = '新增';
-        this.form = {};
-        this.box = true;
-      },
-      handleEdit(scope) {
-        const { row } = scope;
-        this.$router.push({
-          path: '/distribution/turndelivery/deliveryDiscuss',
-          query: {
-            id: row.id,
-            name: row.trainNumber + '-编辑配送'
-          }
         });
-      },
-      handleView(row) {
-        this.title = '查看';
-        this.view = true;
-        this.box = true;
-        getDetail(row.id).then(res => {
-          this.form = res.data.data;
-        });
-      },
-      handleViewBlank(row) {
-        this.$router.push({
-          path: '/distribution/deliverylist/distributionDeliveryListedt',
-          query: {
-            data: encodeURIComponent(JSON.stringify(row)),
-            name: row.trainNumber + '-查看配送'
-          }
+      } else {
+        update(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
         });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
-        }
-        this.$confirm('确定将选择数据删除?', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+      }
+    },
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
+    },
+    handleEdit(scope) {
+      const { row } = scope;
+      this.$router.push({
+        path: '/distribution/turndelivery/deliveryDiscuss',
+        query: {
+          id: row.id,
+          name: row.trainNumber + '-编辑配送',
+        },
+      });
+    },
+    handleView(row) {
+      this.title = '查看';
+      this.view = true;
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleViewBlank(row) {
+      this.$router.push({
+        path: '/distribution/deliverylist/distributionDeliveryListedt',
+        query: {
+          data: encodeURIComponent(JSON.stringify(row)),
+          name: row.trainNumber + '-查看配送',
+        },
+      });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
         })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.selectionClear();
-            this.onLoad(this.page);
-            this.$message({
-              type: 'success',
-              message: '操作成功!'
-            });
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
           });
-      },
-      rowDel(row) {
-        this.$confirm('确定将选择数据删除?', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+        });
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
         })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: 'success',
-              message: '操作成功!'
-            });
+        .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 = [];
-        // 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;
+        });
+    },
+    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;
+        // eslint-disable-next-line no-empty
+        for (let i = 0; i < data.records.length; i++) {
           // eslint-disable-next-line no-empty
-          for (let i = 0; i < data.records.length; i++) {
+          for (let j = 0; j < this.deliverytypeData.length; j++) {
             // eslint-disable-next-line no-empty
-            for (let j = 0; j < this.deliverytypeData.length; j++) {
-              // eslint-disable-next-line no-empty
-              if (data.records[i].type == this.deliverytypeData[j].dictKey) {
-                data.records[i].type = this.deliverytypeData[j].dictValue;
-              }
+            if (data.records[i].type == this.deliverytypeData[j].dictKey) {
+              data.records[i].type = this.deliverytypeData[j].dictValue;
             }
-            for (let j = 0; j < this.deliverykindData.length; j++) {
-              // eslint-disable-next-line no-empty
-              if (data.records[i].kind == this.deliverykindData[j].dictKey) {
-                data.records[i].kind = this.deliverykindData[j].dictValue;
-              }
+          }
+          for (let j = 0; j < this.deliverykindData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].kind == this.deliverykindData[j].dictKey) {
+              data.records[i].kind = this.deliverykindData[j].dictValue;
             }
-            for (let j = 0; j < this.deliveryliststateData.length; j++) {
-              // eslint-disable-next-line no-empty
-              if (data.records[i].state == this.deliveryliststateData[j].dictKey) {
-                data.records[i].state = this.deliveryliststateData[j].dictValue;
-              }
+          }
+          for (let j = 0; j < this.deliveryliststateData.length; j++) {
+            // eslint-disable-next-line no-empty
+            if (data.records[i].state == this.deliveryliststateData[j].dictKey) {
+              data.records[i].state = this.deliveryliststateData[j].dictValue;
             }
           }
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-        getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        }
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+      getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
           this.statistics = res.data.data;
-        });
-        // getDetail(row.id).then(res => {
-        //   this.form = res.data.data;
-        // });
-      },
+        }
+      );
+      // getDetail(row.id).then(res => {
+      //   this.form = res.data.data;
+      // });
+    },
 
-      /**
-       * 打印
-       */
-      printTemplate(){
-        print()
-      }
-    }
-  };
+    /**
+     * 打印
+     */
+    printTemplate() {
+      print();
+    },
+  },
+};
 </script>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 7e014715..80c93098 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -155,20 +155,20 @@
         <!--        </el-table>-->
       </el-row>
       <el-row>
-        <div class="avue-crud__pagination flex-c-sb" style="width:100%;">
-          <div style="font-size: 14px;">
-            勾选数量: {{ selectionList.length }}
-          </div>
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
-          <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
+            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>
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 20319656..ccd5aaad 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -1111,14 +1111,18 @@ export default {
             st = true;
             this.$message.warning(i.orderCode+" - 为冻结单，无法转为库存品！！！");
           }
+          if(i.isZero === "1" && i.completeSet === "1"){
+            st = true;
+            this.$message.warning(i.orderCode+" - 未齐套，无法转为库存品！！！");
+          }
           if(!st){
             //查询库存数据
             // console.log("cxcxcxc",i);
             let aa = await getListOwn(this.page.currentPage,this.page.pageSize,{ stockArticleId : i.id } ).then();
             // console.log("包件物料不存在！！",aa.data.data.records);
             aa.data.data.records.forEach( l =>{
-              console.log(l.materialId , l.materialName , l.materialCode , l.materialUnit);
-              if(!l.materialId || l.materialId == '-1'){
+              // console.log(l.materialId , l.materialName , l.materialCode , l.materialUnit);
+              if(!l.materialId){
                 lost = true;
               }
             })
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 1ab927ab..d5c4d510 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -534,6 +534,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'isZero',
+          label: '零担',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'warehouse',
           label: '所在仓库',
@@ -1425,7 +1435,8 @@ export default {
         path: '/distribution/inventory/distrilbutionBillLading',
         query:{
           id: this.ids,
-          type: '1'
+          type: '1',
+          
         }
       });
     },
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index b6930e63..c496c06c 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -328,7 +328,7 @@ export default {
           head: false,
         },
         {
-          prop: 'marketName',
+          prop: 'descriptionGoods',
           label: '货物名称',
           type: 2,
           values: '',
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index aa6bcbae..8de5bf30 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -181,7 +181,7 @@
             <el-form-item label="费用" prop="freightMark">
               <el-checkbox-group v-model="form.freightMark" @change="handleCheckedCitiesChange">
                 <el-checkbox
-                  style="width: 16%; margin-bottom: 3%"
+                  style="min-width: 16%;  margin-bottom: 8px;"
                   v-for="(item, index) in clientType"
                   :key="item.dictKey"
                   :label="item.dictKey"
@@ -229,6 +229,14 @@
                     @selection="selectionChange"
                   >
                     <template #default="slotProps">
+                      <el-text
+                        v-if="slotProps.scope.row.isZero === '1'"
+                        type="primary"
+                        text
+                        icon="el-icon-delete"
+                        @click="handleZeroOrder(slotProps.scope.row)"
+                        >操作</el-text
+                      >
                       <el-text
                         type="primary"
                         text
@@ -455,6 +463,10 @@
         </span>
       </template>
     </el-dialog>
+
+    <el-dialog v-model="dialogFormZeroOrderVisible" title="修改零担" style="width: 50%">
+
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -494,6 +506,7 @@ export default {
       ],
       dialogFormVisible: false,
       dialogFormOrderVisible: false, //订单详细
+      dialogFormZeroOrderVisible: false, // 零担订单弹出层
       height: 0,
       // 弹框标题
       title: '',
@@ -2420,6 +2433,12 @@ export default {
         this.selectionClear();
       });
     },
+    // 修改零担订单
+    handleZeroOrder(row){
+      console.log('row :>> ', row);
+      console.log('row.isZero', row.isZero)
+      this.dialogFormZeroOrderVisible = true
+    }
   },
   watch: {
     clientType(newVal, oldVal) {
@@ -2463,4 +2482,8 @@ export default {
 :deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper) {
   height: 100% !important;
 }
+
+.el-checkbox {
+  margin-left: 0;
+}
 </style>
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 696cc16e..ec29015d 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -1,57 +1,55 @@
 <template>
-    <div class="head_top">
-        <div @click="ccc" :class="aaa?'buts check':'buts'">
-            自主配送
-        </div>
-        <div @click="ddd" :class="bbb?'buts check':'buts'">
-            外协
-        </div>
-    </div>
-    <div style="margin: 2%;background-color: #ffffff;padding: 20px;box-sizing: border-box;" v-if="aaa">
-        <el-form ref="form" :model="driverForm" label-width="100px" style="margin: 3px">
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="配送司机信息:" prop="goodsShelfId">
-                        <!--                        @change="changeSlaveDriver"-->
-                        <el-select
-                                v-model="deliveryDriver"
-                                multiple
-                                filterable
-                                @change="changeDriver"
-
-                                placeholder="请选择司机"
-                        >
-                            <el-option
-                                    v-for="item in driverData"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="配送车辆信息:" prop="vehicleIds">
-                        <el-select
-                                filterable
-                                multiple
-                                v-model="vehicleIds"
-                                placeholder="请选择车辆"
-                                @change="changeVehicle"
-                        >
-                            <el-option
-                                    v-for="item in vehicleData"
-                                    :key="item.id"
-                                    :label="item.vehicleNub"
-                                    :value="item.id"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
+  <div class="head_top">
+    <div @click="ccc" :class="aaa ? 'buts check' : 'buts'">自主配送</div>
+    <div @click="ddd" :class="bbb ? 'buts check' : 'buts'">外协</div>
+  </div>
+  <div
+    style="margin: 2%; background-color: #ffffff; padding: 20px; box-sizing: border-box"
+    v-if="aaa"
+  >
+    <el-form ref="form" :model="driverForm" label-width="100px" style="margin: 3px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="配送车辆:" prop="vehicleIds">
+            <el-select
+              filterable
+              multiple
+              v-model="vehicleIds"
+              placeholder="请选择车辆"
+              @change="changeVehicle"
+            >
+              <el-option
+                v-for="item in vehicleData"
+                :key="item.id"
+                :label="item.vehicleNub"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="配送司机:" prop="goodsShelfId">
+            <!--                        @change="changeSlaveDriver"-->
+            <el-select
+              v-model="deliveryDriver"
+              multiple
+              filterable
+              @change="changeDriver"
+              placeholder="请选择司机"
+            >
+              <el-option
+                v-for="item in driverData"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
-                <el-col :span="6">
+        <el-col :span="6">
           <span>
             <el-form-item label="主司机:" prop="forklift">
               <el-input v-model="driverForm.masterDriverName" :disabled="true"> </el-input>
@@ -60,1595 +58,1589 @@
               <el-input v-model="driverForm.masterVehicleNub" :disabled="true"> </el-input>
             </el-form-item>
           </span>
-                </el-col>
-                <el-col :span="6">
-                    <el-button round @click="viewDriverInfo" style="margin-left: 10%">查看司机配置</el-button>
-                </el-col>
-            </el-row>
-        </el-form>
-    </div>
-
-    <div style="margin: 2%;background-color: #ffffff;padding: 20px;box-sizing: border-box;" v-if="bbb">
-        <el-form ref="form" :model="waixieForm" label-width="100px" style="margin: 3px">
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="外协来源:" prop="goodsShelfId">
-                        <el-select filterable v-model="waixieForm.tripartiteSource" placeholder="请选择来源">
-                            <el-option
-                                    v-for="item in tripartiteSourceData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="司机名称:" prop="goodsShelfId">
-                        <el-input v-model="waixieForm.driverName" placeholder="请输入司机名称"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="司机电话:" prop="goodsShelfId">
-                        <el-input v-model="waixieForm.driverPhone" placeholder="请输入司机电话"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="车辆车牌:" prop="goodsShelfId">
-                        <el-input v-model="waixieForm.vehicleNum" placeholder="请输入本次费用"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="配送费用:" prop="goodsShelfId">
-                        <el-input v-model="waixieForm.deliveryFee" placeholder="请输入本次费用"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-    </div>
-    <div style="margin: 2%;background-color: #ffffff;padding: 20px;box-sizing: border-box;">
-        <el-form ref="form" :model="stockUpForm" label-width="100px" style="margin: 3px">
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="备货人员:" prop="forklift">
-                        <el-select filterable v-model="stockUpForm.forklift" placeholder="请选择备货人员">
-                            <el-option
-                                    v-for="item in this.forkliftData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey"
-                            >
-                            </el-option>
-                            <!--                            {{this.forkliftData}}-->
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="装车班组:" prop="loader">
-                        <el-select filterable v-model="stockUpForm.loader" placeholder="请选择装卸班组">
-                            <el-option
-                                    v-for="item in loaderData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="卸车班组:" prop="loader">
-                        <el-select filterable v-model="stockUpForm.unloader" placeholder="请选择装卸班组">
-                            <el-option
-                                    v-for="item in loaderData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-<!--                <el-col :span="6">-->
-<!--                    <el-form-item label="班组职能:" prop="goodsAreaId">-->
-<!--                        <el-checkbox-group v-model="loadAndUnload">-->
-<!--                            <el-checkbox-->
-<!--                                    v-for="item in loadAndUnloadData"-->
-<!--                                    :label="item.dictKey"-->
-<!--                                    :value="item.dictKey"-->
-<!--                            >-->
-<!--                                <span>{{ item.dictValue }}</span>-->
-<!--                            </el-checkbox>-->
-<!--                        </el-checkbox-group>-->
-<!--                    </el-form-item>-->
-<!--                </el-col>-->
-                <el-col :span="6">
-                    <el-form-item label="配送类型:" prop="goodsAreaId">
-                        <el-radio-group v-model="stockUpForm.deliveryType">
-                            <el-radio :label="'1'" :value="'1'">商配&emsp;</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="备货区域:" prop="goodsAreaId">
-                        <el-select filterable v-model="stockUpForm.goodsAreaId" placeholder="请选择备货区域">
-                            <el-option
-                                    v-for="item in goodsAreaData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="备货时间:" prop="goodsShelfId">
-                        <el-date-picker v-model="stockUpForm.stockupDate"
-                                        type="datetime"
-                                        placeholder="请选择备货时间"
-                                        format="YYYY-MM-DD HH:mm:ss"
-                                        value-format="YYYY-MM-DD HH:mm:ss"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="出库时间:" prop="outboundDate" label-width="100px">
-                        <el-date-picker v-model="stockUpForm.outboundDate"
-                                        type="datetime"
-                                        placeholder="请选择配车时间"
-                                        format="YYYY-MM-DD HH:mm:ss"
-                                        value-format="YYYY-MM-DD HH:mm:ss"
+        </el-col>
+        <el-col :span="6">
+          <el-button round @click="viewDriverInfo" style="margin-left: 10%">查看司机配置</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
 
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="配送日期:" prop="taskTime" label-width="100px">
-                        <el-date-picker v-model="stockUpForm.taskTime"
-                                        type="date"
-                                        placeholder="请选择配送时间"
-                                        format="YYYY-MM-DD"
-                                        value-format="YYYY-MM-DD"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col>
-                <el-row>
+  <div
+    style="margin: 2%; background-color: #ffffff; padding: 20px; box-sizing: border-box"
+    v-if="bbb"
+  >
+    <el-form ref="form" :model="waixieForm" label-width="100px" style="margin: 3px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="外协来源:" prop="goodsShelfId">
+            <el-select filterable v-model="waixieForm.tripartiteSource" placeholder="请选择来源">
+              <el-option
+                v-for="item in tripartiteSourceData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="司机名称:" prop="goodsShelfId">
+            <el-input v-model="waixieForm.driverName" placeholder="请输入司机名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="司机电话:" prop="goodsShelfId">
+            <el-input v-model="waixieForm.driverPhone" placeholder="请输入司机电话"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="车辆车牌:" prop="goodsShelfId">
+            <el-input v-model="waixieForm.vehicleNum" placeholder="请输入本次费用"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="配送费用:" prop="goodsShelfId">
+            <el-input v-model="waixieForm.deliveryFee" placeholder="请输入本次费用"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
 
-                </el-row>
-                <!--                <el-col :span="6">-->
-                <!--                    <el-form-item label="配送方式:" prop="serveType" label-width="100px">-->
-                <!--                        &lt;!&ndash;              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>&ndash;&gt;-->
-                <!--                        <el-radio-group v-model="stockUpForm.deliveryWay" v-for="item in this.deliveryWayData">-->
-                <!--                            <el-radio :label="item.dictKey" :value="item.dictKey"-->
-                <!--                            >{{ item.dictValue }}&emsp;-->
-                <!--                            </el-radio>-->
-                <!--                        </el-radio-group>-->
-                <!--                    </el-form-item>-->
-                <!--                </el-col>-->
-
-                <!--                <el-col :span="6">-->
-                <!--                    <el-form-item label="服务类型:" prop="serveType" label-width="100px">-->
-                <!--                        &lt;!&ndash;              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>&ndash;&gt;-->
-                <!--                        <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
-                <!--                            <el-checkbox :label="item.dictKey" :value="item.dictKey"-->
-                <!--                            >{{ item.dictValue }}&emsp;-->
-                <!--                            </el-checkbox>-->
-                <!--                        </el-checkbox-group>-->
-                <!--                    </el-form-item>-->
-                <!--                </el-col>-->
-            </el-row>
-
-
-            <el-row>
-                <el-col :span="24">
-                    <el-form-item label="备注:" prop="remarks">
-                        <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="stockUpForm.remarks">
-                        </el-input>
-                    </el-form-item>
-                </el-col>
-                <!--                <el-col :span="8">-->
-                <!--                    <el-form-item label="其他费用:" prop="collectFee" label-width="100px">-->
-                <!--                        <el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用"/>-->
-                <!--                    </el-form-item>-->
-                <!--                </el-col>-->
-            </el-row>
-        </el-form>
-    </div>
-    <div>
-        <el-tabs type="border-card">
-            <el-tab-pane label="订单">
-                <el-button type="primary" link @click="handleAddOrder">新 增</el-button>
-                <el-table
-                        ref="table"
-                        v-loading="loading"
-                        :data="orderData"
-                        :height="height"
-                        style="width: 100%; height: 50%"
-                        :border="option.border"
-                >
-                    <el-table-column
-                            v-if="option.index"
-                            label="序号"
-                            type="index"
-                            width="80px"
-                            align="center"
-                    ></el-table-column>
-                    <template v-for="(item, index) in option.columnStockArticles">
-                        <el-table-column
-                                v-if="item.hide !== true"
-                                :prop="item.prop"
-                                :label="item.label"
-                                :width="item.width"
-                                :key="index"
-                        >
-                        </el-table-column>
-                    </template>
-                    <!-- 操作栏模块 -->
-                    <el-table-column prop="menu" label="操作" :width="220" align="center">
-                        <template #="{ row }">
-                            <el-button
-                                    type="primary"
-                                    link
-                                    icon="el-icon-view"
-                                    @click="viewStockArticlePackage(row)"
-                            >查看包件
-                            </el-button>
-                            <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)"
-                            >移除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-tab-pane>
-        </el-tabs>
-
-        <el-form-item style="margin-left: 45%; margin-top: 10px">
-            <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitBusiness"
-            >提交(商配订单)
-            </el-button
+  <div style="margin: 2%; background-color: #ffffff; padding: 20px; box-sizing: border-box">
+    <el-form ref="form" :model="stockUpForm" label-width="100px" style="margin: 3px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="备货人员:" prop="forklift">
+            <el-select filterable v-model="stockUpForm.forklift" placeholder="请选择备货人员">
+              <el-option
+                v-for="item in this.forkliftData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
+              </el-option>
+              <!--                            {{this.forkliftData}}-->
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="装车班组:" prop="loader">
+            <el-select filterable v-model="stockUpForm.loader" placeholder="请选择装卸班组">
+              <el-option
+                v-for="item in loaderData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="卸车班组:" prop="loader">
+            <el-select filterable v-model="stockUpForm.unloader" placeholder="请选择装卸班组">
+              <el-option
+                v-for="item in loaderData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!--                <el-col :span="6">-->
+        <!--                    <el-form-item label="班组职能:" prop="goodsAreaId">-->
+        <!--                        <el-checkbox-group v-model="loadAndUnload">-->
+        <!--                            <el-checkbox-->
+        <!--                                    v-for="item in loadAndUnloadData"-->
+        <!--                                    :label="item.dictKey"-->
+        <!--                                    :value="item.dictKey"-->
+        <!--                            >-->
+        <!--                                <span>{{ item.dictValue }}</span>-->
+        <!--                            </el-checkbox>-->
+        <!--                        </el-checkbox-group>-->
+        <!--                    </el-form-item>-->
+        <!--                </el-col>-->
+        <el-col :span="6">
+          <el-form-item label="配送类型:" prop="goodsAreaId">
+            <el-radio-group v-model="stockUpForm.deliveryType">
+              <el-radio :label="'1'" :value="'1'">商配&emsp;</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="备货区域:" prop="goodsAreaId">
+            <el-select filterable v-model="stockUpForm.goodsAreaId" placeholder="请选择备货区域">
+              <el-option
+                v-for="item in goodsAreaData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="备货时间:" prop="goodsShelfId" class="zytim">
+            <el-date-picker
+              v-model="stockUpForm.stockupDate"
+              type="datetime"
+              placeholder="请选择备货时间"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
             >
-            <el-button icon="el-icon-circle-close" @click="this.$router.go(-1)">返 回</el-button>
-        </el-form-item>
-    </div>
-
-    <el-dialog v-model="orderShow" title="在库订单信息" width="100%">
-        <span v-for="item in this.deliveryTypeData">{{ item }}</span>
-        <el-form :inline="true" :model="query">
-            <el-form-item label="商场名称:">
-                <el-input v-model="query.mallName" placeholder="请输入商场名称"></el-input>
-            </el-form-item>
-            <el-form-item label="货物名称:">
-                <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
-            </el-form-item>
-            <el-form-item label="运单号:">
-                <el-input v-model="query.waybillNumber" placeholder="请输入运单号"></el-input>
-            </el-form-item>
-            <el-form-item label="订单自编号:">
-                <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
-            </el-form-item>
-            <el-form-item label="服务号:">
-                <el-input v-model="query.serviceNumber" placeholder="请输入服务号"></el-input>
-            </el-form-item>
-
-            <el-form-item label="顾客姓名:">
-                <el-input v-model="query.customerName" placeholder="请输入客户姓名"></el-input>
-            </el-form-item>
-            <el-form-item label="顾客电话:">
-                <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
-            </el-form-item>
-            <el-form-item label="顾客地址:">
-                <el-input v-model="query.customerAddress" 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-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="出库时间:" prop="outboundDate" label-width="100px">
+            <el-date-picker
+              v-model="stockUpForm.outboundDate"
+              type="datetime"
+              placeholder="请选择配车时间"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <div class="pstime">
+            <el-form-item label="配送日期:" prop="taskTime" label-width="100px">
+              <el-date-picker
+                v-model="stockUpForm.taskTime"
+                type="date"
+                placeholder="请选择配送时间"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+              >
+              </el-date-picker>
             </el-form-item>
-        </el-form>
+          </div>
+        </el-col>
+        <el-row> </el-row>
+        <!--                <el-col :span="6">-->
+        <!--                    <el-form-item label="配送方式:" prop="serveType" label-width="100px">-->
+        <!--                        &lt;!&ndash;              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>&ndash;&gt;-->
+        <!--                        <el-radio-group v-model="stockUpForm.deliveryWay" v-for="item in this.deliveryWayData">-->
+        <!--                            <el-radio :label="item.dictKey" :value="item.dictKey"-->
+        <!--                            >{{ item.dictValue }}&emsp;-->
+        <!--                            </el-radio>-->
+        <!--                        </el-radio-group>-->
+        <!--                    </el-form-item>-->
+        <!--                </el-col>-->
 
-        <!--        @selection-change="selectionChange"-->
+        <!--                <el-col :span="6">-->
+        <!--                    <el-form-item label="服务类型:" prop="serveType" label-width="100px">-->
+        <!--                        &lt;!&ndash;              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>&ndash;&gt;-->
+        <!--                        <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
+        <!--                            <el-checkbox :label="item.dictKey" :value="item.dictKey"-->
+        <!--                            >{{ item.dictValue }}&emsp;-->
+        <!--                            </el-checkbox>-->
+        <!--                        </el-checkbox-group>-->
+        <!--                    </el-form-item>-->
+        <!--                </el-col>-->
+      </el-row>
 
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注:" prop="remarks">
+            <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="stockUpForm.remarks"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <!--                <el-col :span="8">-->
+        <!--                    <el-form-item label="其他费用:" prop="collectFee" label-width="100px">-->
+        <!--                        <el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用"/>-->
+        <!--                    </el-form-item>-->
+        <!--                </el-col>-->
+      </el-row>
+    </el-form>
+  </div>
+  <div>
+    <el-tabs type="border-card">
+      <el-tab-pane label="订单">
+        <el-button type="primary" link @click="handleAddOrder">新增</el-button>
         <el-table
-                ref="stockArticleTable"
-                v-loading="loading"
-                @selection-change="selectionStockArticleChange"
-                :data="stockArticleInfo"
-                :height="height"
-                style="width: 100%; height: 80%"
-                :border="option.border"
+          ref="table"
+          v-loading="loading"
+          :data="orderData"
+          :height="height"
+          style="width: 100%; height: 50%"
+          :border="option.border"
         >
+          <el-table-column
+            v-if="option.index"
+            label="序号"
+            type="index"
+            width="80px"
+            align="center"
+          ></el-table-column>
+          <template v-for="(item, index) in option.columnStockArticles">
             <el-table-column
-                    type="selection"
-                    v-if="option.selection"
-                    width="55"
-                    align="center"
-                    :selectable="checkOrder"
-            ></el-table-column>
-            <el-table-column
-                    v-if="option.index"
-                    label="序号"
-                    type="index"
-                    width="80px"
-                    align="center"
-            ></el-table-column>
-            <template v-for="(item, index) in option.columnStockArticles">
-                <el-table-column
-                        v-if="item.hide !== true"
-                        :prop="item.prop"
-                        :label="item.label"
-                        :width="item.width"
-                        :key="index"
-                >
-                </el-table-column>
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+            >
+            </el-table-column>
+          </template>
+          <!-- 操作栏模块 -->
+          <el-table-column prop="menu" label="操作" :width="220" align="center">
+            <template #="{ row }">
+              <el-button
+                type="primary"
+                link
+                icon="el-icon-view"
+                @click="viewStockArticlePackage(row)"
+                >查看包件
+              </el-button>
+              <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)"
+                >移除
+              </el-button>
             </template>
+          </el-table-column>
         </el-table>
-        <el-form-item style="margin-left: 45%; margin-top: 5px">
-            <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
-            >提交(订单)
-            </el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
-        </el-form-item>
-        <el-row>
-            <div class="avue-crud__pagination" style="width: 100%">
-                <!-- 分页模块 -->
-                <el-pagination
-                        align="right"
-                        background
-                        @size-change="sizeOrderChange"
-                        @current-change="currentOrderChange"
-                        :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>
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-form-item style="margin-left: 45%; margin-top: 10px">
+      <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitBusiness"
+        >提交(商配订单)
+      </el-button>
+      <el-button icon="el-icon-circle-close" @click="this.$router.go(-1)">返 回</el-button>
+    </el-form-item>
+  </div>
+
+  <el-dialog v-model="orderShow" title="在库订单信息" width="100%">
+    <span v-for="item in this.deliveryTypeData">{{ item }}</span>
+    <el-form :inline="true" :model="query">
+      <el-form-item label="商场名称:">
+        <el-input v-model="query.mallName" placeholder="请输入商场名称"></el-input>
+      </el-form-item>
+      <el-form-item label="货物名称:">
+        <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
+      </el-form-item>
+      <el-form-item label="运单号:">
+        <el-input v-model="query.waybillNumber" placeholder="请输入运单号"></el-input>
+      </el-form-item>
+      <el-form-item label="订单自编号:">
+        <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
+      </el-form-item>
+      <el-form-item label="服务号:">
+        <el-input v-model="query.serviceNumber" placeholder="请输入服务号"></el-input>
+      </el-form-item>
 
-    <el-dialog
-            v-model="stockListShow"
-            title="库存品信息"
-            width="100%"
-            :before-close="handleClose"
+      <el-form-item label="顾客姓名:">
+        <el-input v-model="query.customerName" placeholder="请输入客户姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="顾客电话:">
+        <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
+      </el-form-item>
+      <el-form-item label="顾客地址:">
+        <el-input v-model="query.customerAddress" 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>
+
+    <!--        @selection-change="selectionChange"-->
+
+    <el-table
+      ref="stockArticleTable"
+      v-loading="loading"
+      @selection-change="selectionStockArticleChange"
+      :data="stockArticleInfo"
+      :height="height"
+      style="width: 100%; height: 80%"
+      :border="option.border"
     >
-        <el-form :inline="true" :model="query">
-            <el-form-item label="顾客电话:">
-                <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
-            </el-form-item>
-            <el-form-item label="顾客地址:">
-                <el-input v-model="query.customerAddress" 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-table
-                ref="table"
-                v-loading="loading"
-                @selection-change="selectionChange"
-                :data="inventoryInfo"
-                :height="height"
-                style="width: 90%; height: 80%"
-                :border="option.border"
+      <el-table-column
+        type="selection"
+        v-if="option.selection"
+        width="55"
+        align="center"
+        :selectable="checkOrder"
+      ></el-table-column>
+      <el-table-column
+        v-if="option.index"
+        label="序号"
+        type="index"
+        width="80px"
+        align="center"
+      ></el-table-column>
+      <template v-for="(item, index) in option.columnStockArticles">
+        <el-table-column
+          v-if="item.hide !== true"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          :key="index"
         >
-            <el-table-column
-                    type="selection"
-                    v-if="option.selection"
-                    width="55"
-                    align="center"
-            ></el-table-column>
-            <el-table-column
-                    v-if="option.index"
-                    label="序号"
-                    type="index"
-                    width="80px"
-                    align="center"
-            ></el-table-column>
-            <template v-for="(item, index) in option.columnStockLists">
-                <el-table-column
+        </el-table-column>
+      </template>
+    </el-table>
+    <el-form-item style="margin-left: 45%; margin-top: 5px">
+      <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
+        >提交(订单)
+      </el-button>
+      <el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
+    </el-form-item>
+    <el-row>
+      <div class="avue-crud__pagination" style="width: 100%">
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeOrderChange"
+          @current-change="currentOrderChange"
+          :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>
 
-                        v-if="item.hide !== true"
-                        :prop="item.prop"
-                        :label="item.label"
-                        :width="item.width"
-                        :key="index"
-                >
-                </el-table-column>
-            </template>
-            <el-table-column label="预约数量" type="index" width="100px">
-                <template #="{ row }">
-                    <el-input v-model="row.reservationNum" type="number" :min="0"></el-input>
-                </template>
-            </el-table-column>
-        </el-table>
-        <el-form-item style="margin-left: 45%; margin-top: 5px">
-            <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
-            >提交(库存品)
-            </el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
-        </el-form-item>
-    </el-dialog>
+  <el-dialog v-model="stockListShow" title="库存品信息" width="100%" :before-close="handleClose">
+    <el-form :inline="true" :model="query">
+      <el-form-item label="顾客电话:">
+        <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
+      </el-form-item>
+      <el-form-item label="顾客地址:">
+        <el-input v-model="query.customerAddress" 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-table
+      ref="table"
+      v-loading="loading"
+      @selection-change="selectionChange"
+      :data="inventoryInfo"
+      :height="height"
+      style="width: 90%; height: 80%"
+      :border="option.border"
+    >
+      <el-table-column
+        type="selection"
+        v-if="option.selection"
+        width="55"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        v-if="option.index"
+        label="序号"
+        type="index"
+        width="80px"
+        align="center"
+      ></el-table-column>
+      <template v-for="(item, index) in option.columnStockLists">
+        <el-table-column
+          v-if="item.hide !== true"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          :key="index"
+        >
+        </el-table-column>
+      </template>
+      <el-table-column label="预约数量" type="index" width="100px">
+        <template #="{ row }">
+          <el-input v-model="row.reservationNum" type="number" :min="0"></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-form-item style="margin-left: 45%; margin-top: 5px">
+      <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
+        >提交(库存品)
+      </el-button>
+      <el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
+    </el-form-item>
+  </el-dialog>
+
+  <el-dialog v-model="isShowPackage" title="包件信息" width="100%">
+    <!-- 列表模块 -->
+    <el-table
+      ref="packageList"
+      v-loading="loading"
+      @selection-change="selectionChange"
+      :data="packageData"
+      :height="height"
+      style="width: 100%; height: 100%"
+      :border="option.border"
+    >
+      <el-table-column type="selection" v-if="option.selection" width="55" align="center">
+        <!--        :selectable="checkPackage"-->
+
+        <!--        <el-checkbox v-model="checked"></el-checkbox>-->
+      </el-table-column>
+      <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+      <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
+      </el-table-column>
+      <template v-for="(item, index) in option.columnPackage">
+        <!-- table字段 -->
+        <el-table-column
+          v-if="item.hide !== true"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          :key="index"
+        >
+        </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" @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>
+    <el-form-item style="margin-left: 45%; margin-top: 5px">
+      <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
+        >提交(包件)
+      </el-button>
+      <el-button icon="el-icon-circle-close" @click="isShowPackage = false">返 回</el-button>
+    </el-form-item>
+  </el-dialog>
 
-    <el-dialog v-model="isShowPackage" title="包件信息" width="100%">
-        <!-- 列表模块 -->
+  <el-dialog title="司机配置" v-model="isDriverShow" width="50%">
+    <div style="display: flex">
+      <div style="flex: 1">
         <el-table
-                ref="packageList"
-                v-loading="loading"
-                @selection-change="selectionChange"
-                :data="packageData"
-                :height="height"
-                style="width: 100%; height: 100%"
-                :border="option.border"
+          ref="multipleTable"
+          v-loading="loading"
+          :data="driverInfo"
+          style="width: 100%"
+          :border="option.border"
+          @select-all="handleSelect"
+          @select="handleSelect"
         >
+          <el-table-column
+            type="selection"
+            v-if="option.selection"
+            width="55"
+            align="center"
+          ></el-table-column>
+          <template v-for="(item, index) in option.columnDriverInfo">
+            <!-- table字段 -->
             <el-table-column
-                    type="selection"
-                    v-if="option.selection"
-                    width="55"
-                    align="center"
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+              style="height: 50px"
             >
-                <!--        :selectable="checkPackage"-->
-
-                <!--        <el-checkbox v-model="checked"></el-checkbox>-->
-            </el-table-column>
-            <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-            <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
-            </el-table-column>
-            <template v-for="(item, index) in option.columnPackage">
-                <!-- table字段 -->
-                <el-table-column
-                        v-if="item.hide !== true"
-                        :prop="item.prop"
-                        :label="item.label"
-                        :width="item.width"
-                        :key="index"
-                >
-                </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" @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>
+          </template>
+          <!-- 操作栏模块 -->
         </el-table>
-        <el-form-item style="margin-left: 45%; margin-top: 5px">
-            <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage"
-            >提交(包件)
-            </el-button
+      </div>
+      <div style="flex: 1">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          :data="vehticleInfo"
+          style="width: 100%"
+          :border="option.border"
+        >
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          <template v-for="(item, index) in option.columnVehicleInfo">
+            <!-- table字段 -->
+            <el-table-column
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+              style="height: 50px"
             >
-            <el-button icon="el-icon-circle-close" @click="isShowPackage = false">返 回</el-button>
-        </el-form-item>
-    </el-dialog>
-
-    <el-dialog title="司机配置" v-model="isDriverShow" width="50%">
-        <div style="display: flex">
-            <div style="flex: 1">
-                <el-table
-                        ref="multipleTable"
-                        v-loading="loading"
-                        :data="driverInfo"
-                        style="width: 100%"
-                        :border="option.border"
-                        @select-all="handleSelect"
-                        @select="handleSelect"
-                >
-                    <el-table-column
-                            type="selection"
-                            v-if="option.selection"
-                            width="55"
-                            align="center"
-
-                    ></el-table-column>
-                    <template v-for="(item, index) in option.columnDriverInfo">
-                        <!-- table字段 -->
-                        <el-table-column
-                                v-if="item.hide !== true"
-                                :prop="item.prop"
-                                :label="item.label"
-                                :width="item.width"
-                                :key="index"
-                                style="height: 50px"
-
-                        >
-                        </el-table-column>
-                    </template>
-                    <!-- 操作栏模块 -->
-                </el-table>
-            </div>
-            <div style="flex: 1">
-                <el-table
-                        ref="table"
-                        v-loading="loading"
-                        :data="vehticleInfo"
-                        style="width: 100%"
-                        :border="option.border"
-                >
-                    <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-                    <template v-for="(item, index) in option.columnVehicleInfo">
-                        <!-- table字段 -->
-                        <el-table-column
-                                v-if="item.hide !== true"
-                                :prop="item.prop"
-                                :label="item.label"
-                                :width="item.width"
-                                :key="index"
-                                style="height: 50px"
-                        >
-                        </el-table-column>
-                    </template>
-                    <!-- 操作栏模块 -->
-                    <el-table-column label="预约数量" type="index" width="200px">
-                        <template #="{ row }">
+            </el-table-column>
+          </template>
+          <!-- 操作栏模块 -->
+          <el-table-column label="预约数量" type="index" width="200px">
+            <template #="{ row }">
               <span>
                 <el-button type="primary" text size="small" @click="moveUpVehictle(row)"
-                >上移
+                  >上移
                 </el-button>
               </span>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-        </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
 
-        <el-form-item style="margin-left: 45%; margin-top: 10px">
+    <el-form-item style="margin-left: 45%; margin-top: 10px">
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="confirmDriver">确 定</el-button>
         <el-button @click="isDriverShow = false">取 消</el-button>
       </span>
-        </el-form-item>
-    </el-dialog>
+    </el-form-item>
+  </el-dialog>
 </template>
 
 <script>
-  import { getDictionaryBiz } from '@/api/system/dict';
-  import option from '@/option/distribution/distributionReservation';
-  import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup';
-  import { deliveryBusinessTask } from '@/api/distribution/distributionReservation';
-  import { getListUser } from '@/api/distribution/distributionStockup';
-  import { getPostList } from '@/api/system/post';
-  import { getListOwn } from '@/api/system/user';
-  import { stockUpInfo } from '@/api/basicdata/basicdataGoodsArea';
-  import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
-  import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
-  import {
-    selectStockArticleInfoList,
-    selectDiscussStockArticleInfoList
-  } from '@/api/distribution/distributionStockArticle';
-  import { getInventoryList } from '@/api/distribution/distributionStockList';
-  import { getDeliveryList, updateDeliveryList } from '@/api/distribution/distributionDeliveryList';
-  import { mapGetters } from 'vuex';
-  import dayjs from 'dayjs';
+import { getDictionaryBiz } from '@/api/system/dict';
+import option from '@/option/distribution/distributionReservation';
+import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup';
+import { deliveryBusinessTask } from '@/api/distribution/distributionReservation';
+import { getListUser } from '@/api/distribution/distributionStockup';
+import { getPostList } from '@/api/system/post';
+import { getListOwn } from '@/api/system/user';
+import { stockUpInfo } from '@/api/basicdata/basicdataGoodsArea';
+import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
+import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
+import {
+  selectStockArticleInfoList,
+  selectDiscussStockArticleInfoList,
+} from '@/api/distribution/distributionStockArticle';
+import { getInventoryList } from '@/api/distribution/distributionStockList';
+import { getDeliveryList, updateDeliveryList } from '@/api/distribution/distributionDeliveryList';
+import { mapGetters } from 'vuex';
+import dayjs from 'dayjs';
 
-  export default {
-    data() {
-      return {
-        height: 0,
-        loading: false,
-        error: null,
-        form: {},
-        driverForm: {},
-        stockUpForm: {},
-        waixieForm: {},
-        data: [],
-        // 分页信息
-        page: {
-          currentPage: 1,
-          pageSize: 30,
-          total: 40
-        },
+export default {
+  data() {
+    return {
+      // 加载中
+      loading: true,
+      height: 0,
+      loading: false,
+      error: null,
+      form: {},
+      driverForm: {},
+      stockUpForm: {},
+      waixieForm: {},
+      data: [],
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
+      },
 
-        query: {},
-        aaa: true,
-        bbb: false,
-        option: option,
-        deliveryTypeData: [],
-        //配送类型字典列表
-        resvervationStatusData: [],
-        //备货状态
-        stockupStatusData: [],
-        //订单来源
-        orderSourceData: [],
-        //预约时段
-        periodOfTimeData: [],
-        //配送方式
-        deliveryWayData: [],
-        //服务内容
-        addvalueServeTypeData: [],
-        //基础车辆信息
-        vehicleData: [],
-        //叉车信息
-        forkliftData: [],
-        //班组信息
-        loaderData: [],
-        //备货区信息
-        goodsAreaData: [],
-        //部门信息
-        deptId: '',
-        //司机信息
-        driverData: [],
-        //装卸班组
-        loadAndUnloadData: [],
-        //装卸
-        tripartiteSourceData: [],
-        //装卸只能
-        loadAndUnload: [],
-        //车辆信息
-        vehicleIds: [],
-        //配送司机信息
-        deliveryDriver: [],
-        //司机配置
-        isDriverShow: false,
-        //车辆表格信息
-        driverInfo: [],
-        //司机表格信息
-        vehticleInfo: [],
-        //主司机
-        masterDriverName: '',
-        //主车辆
-        masterVehictleName: '',
-        //司机配置选中行信息
-        multipleSelection: [],
-        //
-        multipleTable: {},
-        stockArticleTable: [],
-        stockArticleList: [],
-        driverList: [],
-        vehticleList: [],
-        packageList: [],
-        //订单数据
-        orderData: [],
-        //库存品数据
-        inventoryData: [],
-        //
-        selectionList: [],
-        addvalue: {},
-        //订单弹窗
-        orderShow: false,
-        //库存品弹窗
-        stockListShow: false,
-        //在库订单数据
-        stockArticleInfo: [],
-        //库存品信息列表
-        inventoryInfo: [],
-        //包件弹窗控制
-        isShowPackage: false,
-        //包件数据
-        packageData: [],
-        //班组职能
-        loadAndUnload: [],
-        //服务类型
-        serveType: [],
-        page: {
-          currentPage: 1,
-          pageSize: 30,
-          total: 40
-        },
-        //外协数据来源
-        tripartiteSourceData: [],
-        deliveryListId: '',
-        isDisable: false,
-        checked: true,
-        obj: {
-          type: Object,
-          default: () => ({})
-        },
-        isInitialized: false,
-        isUpdate: false
-      };
+      query: {},
+      aaa: true,
+      bbb: false,
+      option: option,
+      deliveryTypeData: [],
+      //配送类型字典列表
+      resvervationStatusData: [],
+      //备货状态
+      stockupStatusData: [],
+      //订单来源
+      orderSourceData: [],
+      //预约时段
+      periodOfTimeData: [],
+      //配送方式
+      deliveryWayData: [],
+      //服务内容
+      addvalueServeTypeData: [],
+      //基础车辆信息
+      vehicleData: [],
+      //叉车信息
+      forkliftData: [],
+      //班组信息
+      loaderData: [],
+      //备货区信息
+      goodsAreaData: [],
+      //部门信息
+      deptId: '',
+      //司机信息
+      driverData: [],
+      //装卸班组
+      loadAndUnloadData: [],
+      //装卸
+      tripartiteSourceData: [],
+      //装卸只能
+      loadAndUnload: [],
+      //车辆信息
+      vehicleIds: [],
+      //配送司机信息
+      deliveryDriver: [],
+      //司机配置
+      isDriverShow: false,
+      //车辆表格信息
+      driverInfo: [],
+      //司机表格信息
+      vehticleInfo: [],
+      //主司机
+      masterDriverName: '',
+      //主车辆
+      masterVehictleName: '',
+      //司机配置选中行信息
+      multipleSelection: [],
+      //
+      multipleTable: {},
+      stockArticleTable: [],
+      stockArticleList: [],
+      driverList: [],
+      vehticleList: [],
+      packageList: [],
+      //订单数据
+      orderData: [],
+      //库存品数据
+      inventoryData: [],
+      //
+      selectionList: [],
+      addvalue: {},
+      //订单弹窗
+      orderShow: false,
+      //库存品弹窗
+      stockListShow: false,
+      //在库订单数据
+      stockArticleInfo: [],
+      //库存品信息列表
+      inventoryInfo: [],
+      //包件弹窗控制
+      isShowPackage: false,
+      //包件数据
+      packageData: [],
+      //班组职能
+      loadAndUnload: [],
+      //服务类型
+      serveType: [],
+      page: {
+        currentPage: 1,
+        pageSize: 30,
+        total: 40,
+      },
+      //外协数据来源
+      tripartiteSourceData: [],
+      deliveryListId: '',
+      isDisable: false,
+      checked: true,
+      obj: {
+        type: Object,
+        default: () => ({}),
+      },
+      isInitialized: false,
+      isUpdate: false,
+    };
+  },
+  watch: {
+    '$route.query.id': {
+      handler(newVal, oldVal) {
+        console.log(newVal, oldVal);
+        if (!!this.$route.query.id) {
+          this.fetchData();
+          this.onLoad(this.page);
+        }
+        this.driverForm = {};
+        this.vehicleIds = [];
+        this.deliveryDriver = [];
+      },
+      deep: true,
+      immediate: true,
     },
-    watch: {
-      '$route.query.id': {
-        handler(newVal, oldVal) {
-          console.log(newVal, oldVal);
-          if (!!this.$route.query.id) {
-            this.fetchData();
-            this.onLoad(this.page);
+  },
+  created() {
+    this.$watch(
+      () => this.$route.params,
+      () => {
+        this.fetchData();
+      },
+      // 组件创建完后获取数据，
+      // 此时 data 已经被 observed 了
+      { immediate: true }
+    );
+    this.getDictionary();
+    this.getFork();
+    this.getTeam();
+    this.getvehicleData();
+    this.getDriverData();
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    },
+  },
+
+  mounted() {
+    this.onLoad(this.page);
+  },
+  methods: {
+    //查询叉车人员
+    async getFork() {
+      await getListUser().then(res => {
+        //查询当前人信息
+        console.log('查询当前人信息>>>', res.data.data);
+        let fo = [];
+        res.data.data.forEach(i => {
+          let a = {
+            dictKey: i.id,
+            dictValue: i.realName,
+          };
+          fo.push(a);
+          if (!this.deptId) {
+            this.deptId = i.deptId;
           }
-          this.driverForm = {};
-          this.vehicleIds = [];
-          this.deliveryDriver = [];
-        },
-        deep: true,
-        immediate: true
-      }
+        });
+        this.forkliftData = fo;
+      });
+      // let ides = '';
+      // let ide = {};
+      // await getListUser().then(res => {
+      //   console.log('res>>>', res.data.data);
+      //   ides = res.data.data.tenantId;
+      //   this.deptId = res.data.data.deptId;
+      // });
+      // await getPostList(ides).then(res => {
+      //   console.log('>>>>', res.data.data);
+      //   // this.forkliftData = res.data.data;
+      //   res.data.data.forEach(i => {
+      //     if (i.postName == '叉车') {
+      //       ide = i;
+      //     }
+      //   });
+      // });
+      // // console.log("ied>>>>>",ide);
+      // let params = {
+      //   postId: ide.id, //岗位
+      //   deptId: this.deptId //部门
+      //   // roleId: '', //角色
+      // };
+      // getListOwn(Object.assign(params, this.query)).then(res => {
+      //   // console.log(".............",res.data.data);
+      //   let fo = [];
+      //   res.data.data.forEach(i => {
+      //     let a = {
+      //       dictKey: i.id,
+      //       dictValue: i.name
+      //     };
+      //     fo.push(a);
+      //   });
+      //   this.forkliftData = fo;
+      // });
+      await this.getStorageArea();
+      await this.getTeam();
+    },
+    //查询班组
+    async getTeam() {
+      let params = this.deptId;
+      console.log('%%%%%%%%%', params);
+      getListTeamInfo(params).then(res => {
+        console.log('aaaaaaaaa', res.data.data);
+        let fo = [];
+        res.data.data.forEach(i => {
+          let a = {
+            dictKey: i.id,
+            dictValue: i.groupName,
+          };
+          fo.push(a);
+        });
+        this.loaderData = fo;
+      });
+    },
+    //备货区
+    async getStorageArea() {
+      let params = this.deptId;
+      console.log('^^^^^^^^^^^^^', params);
+      stockUpInfo(params).then(res => {
+        console.log('=========================》', res);
+        let fo = [];
+        res.data.data.forEach(i => {
+          let v = {
+            dictKey: i.id,
+            dictValue: i.headline,
+          };
+          fo.push(v);
+        });
+        this.goodsAreaData = fo;
+      });
+    },
 
+    //查询司机信息
+    getDriverData() {
+      return new Promise((rv, rev) => {
+        getDriverList(1, 10, '').then(res => {
+          this.driverData = res.data.data.records;
+          console.log('===============>', res.data.data);
+          rv(res.data.data.records);
+        });
+      });
     },
-    created() {
-      this.$watch(
-        () => this.$route.params,
-        () => {
-          this.fetchData();
-        },
-        // 组件创建完后获取数据，
-        // 此时 data 已经被 observed 了
-        { immediate: true }
-      );
-      this.getDictionary();
-      this.getFork();
-      this.getTeam();
-      this.getvehicleData();
-      this.getDriverData();
+    selectionChange(list) {
+      //只要这个触发就认定为该包件进行了重新勾选，不论数据是否发生变化
+      this.selectionList = list;
+      console.log(' this.selectionList = list', this.selectionList);
+      this.orderData.forEach(item => {
+        if (item.id === this.obj.id) {
+          item.isUpdate = true;
+        }
+      });
+      console.log('?????????????????', this.orderData);
+      //这里就为当前选择的订单进行包件信息的添加
+      // this.obj.
+    },
+    selectionStockArticleChange(list) {
+      console.log('selectionStockArticleChange', list);
+      this.stockArticleList = list;
     },
-    computed: {
-      ...mapGetters(['permission']),
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
+
+    //查询车辆信息
+    getvehicleData() {
+      return new Promise((rv, rev) => {
+        getVehicleList(1, 10, '').then(res => {
+          this.vehicleData = res.data.data.records;
+          console.log('^^^^^^^^^^^^^^^^', res.data.data);
+          rv(res.data.data.records);
         });
-        return ids.join(',');
+      });
+    },
+    fetchData() {
+      this.error = this.post = null;
+      this.loading = true;
+      if (this.$route.query.id) {
+        this.deliveryListId = this.$route.query.id;
       }
+      this.loading = false;
     },
-
-    mounted() {
-      this.onLoad(this.page);
+    sizeOrderChange(pageSize) {
+      this.page.pageSize = pageSize;
+      if (this.deliveryListId) {
+        //这里的编辑需要进行特殊处理
+        this.onLoadEditOrder(this.page, this.deliveryListId);
+      } else {
+        this.onLoadOrder(this.page);
+      }
+    },
+    currentOrderChange(currentPage) {
+      this.page.currentPage = currentPage;
+      if (this.deliveryListId) {
+        this.onLoadEditOrder(this.page, this.deliveryListId);
+      } else {
+        this.onLoadOrder(this.page);
+      }
+    },
+    checkPackage(row, index) {
+      console.log('>>>>>>>>>>>>', row, index);
+      // return false;
+    },
+    viewDriverInfo() {
+      console.log(this.driverInfo.length);
+      console.log(this.vehticleInfo.length);
+      if (this.driverList.length !== this.vehticleList.length) {
+        this.$message({
+          message: '司机车辆数量有误!!!',
+          type: 'warning',
+        });
+        return;
+      }
+      this.isDriverShow = true;
     },
-    methods: {
-      //查询叉车人员
-      async getFork() {
-        await getListUser().then(res =>{ //查询当前人信息
-            console.log("查询当前人信息>>>",res.data.data);
-            let fo = [];
-            res.data.data.forEach( i =>{
-              let a ={
-                dictKey: i.id,
-                dictValue: i.realName
-              };
-              fo.push(a);
-              if(!this.deptId){
-                this.deptId =i.deptId;
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done();
+        })
+        .catch(_ => {});
+    },
+    /**
+     * 查看包件
+     */
+    viewStockArticlePackage(row) {
+      //这里应该先对订单下的所有包件信息进行获取，然后结合查询出预约单下以选择的包件信息进行勾选状态的回显
+      //查询该订单下所有的包件信息
+      this.loading = true;
+      this.obj = row;
+      console.log('++++++++++++', row);
+      if (this.deliveryListId) {
+        //编辑
+        let params = {};
+        console.log('^^^^^^^^', row);
+        //这里订单的对象中应该存在三个数组，一个数组是该订单下的所有包件细信息
+        //一个数组是该订单被选择使用的包件信息
+        //还有一个就是正在操作的包件信息
+        let packageInfo = row.parcelListVOS;
+        if (row.packageList) {
+          let packageListInfo = row.packageList;
+          packageInfo.forEach((item, index) => {
+            packageListInfo.forEach(p => {
+              if (item.id === p.id) {
+                this.$nextTick(() => {
+                  this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
+                });
               }
             });
-            this.forkliftData = fo;
-        })
-        // let ides = '';
-        // let ide = {};
-        // await getListUser().then(res => {
-        //   console.log('res>>>', res.data.data);
-        //   ides = res.data.data.tenantId;
-        //   this.deptId = res.data.data.deptId;
-        // });
-        // await getPostList(ides).then(res => {
-        //   console.log('>>>>', res.data.data);
-        //   // this.forkliftData = res.data.data;
-        //   res.data.data.forEach(i => {
-        //     if (i.postName == '叉车') {
-        //       ide = i;
-        //     }
-        //   });
-        // });
-        // // console.log("ied>>>>>",ide);
-        // let params = {
-        //   postId: ide.id, //岗位
-        //   deptId: this.deptId //部门
-        //   // roleId: '', //角色
-        // };
-        // getListOwn(Object.assign(params, this.query)).then(res => {
-        //   // console.log(".............",res.data.data);
-        //   let fo = [];
-        //   res.data.data.forEach(i => {
-        //     let a = {
-        //       dictKey: i.id,
-        //       dictValue: i.name
-        //     };
-        //     fo.push(a);
-        //   });
-        //   this.forkliftData = fo;
-        // });
-        await this.getStorageArea();
-        await this.getTeam();
-      },
-      //查询班组
-      async getTeam() {
-        let params = this.deptId;
-        console.log('%%%%%%%%%', params);
-        getListTeamInfo(params).then(res => {
-          console.log('aaaaaaaaa', res.data.data);
-          let fo = [];
-          res.data.data.forEach(i => {
-            let a = {
-              dictKey: i.id,
-              dictValue: i.groupName
-            };
-            fo.push(a);
           });
-          this.loaderData = fo;
-        });
-      },
-      //备货区
-      async getStorageArea() {
-        let params = this.deptId;
-        console.log('^^^^^^^^^^^^^', params);
-        stockUpInfo(params).then(res => {
-          console.log('=========================》', res);
-          let fo = [];
-          res.data.data.forEach(i => {
-            let v = {
-              dictKey: i.id,
-              dictValue: i.headline
-            };
-            fo.push(v);
-          });
-          this.goodsAreaData = fo;
-        });
-      },
-
-      //查询司机信息
-      getDriverData() {
-        return new Promise((rv, rev) => {
-          getDriverList(1, 10, '').then(res => {
-            this.driverData = res.data.data.records;
-            console.log('===============>', res.data.data);
-            rv(res.data.data.records);
+        }
+        this.packageData = row.parcelListVOS;
+      } else {
+        //新增
+        //默认打开包件信息，包件列表处于全选状态
+        let params = {};
+        this.packageData = row.parcelListVOS;
+        this.packageData.forEach((item, index) => {
+          this.$nextTick(() => {
+            this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
           });
         });
-      },
-      selectionChange(list) {
-        //只要这个触发就认定为该包件进行了重新勾选，不论数据是否发生变化
-        this.selectionList = list;
-        console.log(' this.selectionList = list', this.selectionList);
-        this.orderData.forEach(item => {
-          if (item.id === this.obj.id) {
-            item.isUpdate = true;
-          }
-        });
-        console.log('?????????????????', this.orderData);
-        //这里就为当前选择的订单进行包件信息的添加
-        // this.obj.
-      },
-      selectionStockArticleChange(list) {
-        console.log('selectionStockArticleChange', list);
-        this.stockArticleList = list;
-      },
-
+        console.log('^^^^^^^^', row);
+      }
+      this.loading = false;
+      this.isShowPackage = true;
+    },
+    checkOrder(row, index) {
+      if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') {
+        return false;
+      } else {
+        return true;
+      }
+      return false;
+    },
+    /**
+     * 提交包件信息
+     */
+    onSubmitPackage() {
+      //包件处于默认全选的状态这里不需要要求进行包件选择
+      //如果这里用户进行全部包件的取消，那么这里会对订单下的所有包件进行添加，由后台完成
 
-      //查询车辆信息
-      getvehicleData() {
-        return new Promise((rv, rev) => {
-          getVehicleList(1, 10, '').then(res => {
-            this.vehicleData = res.data.data.records;
-            console.log('^^^^^^^^^^^^^^^^', res.data.data);
-            rv(res.data.data.records);
-          });
-        });
-      },
-      fetchData() {
-        this.error = this.post = null;
-        this.loading = true;
-        if (this.$route.query.id) {
-          this.deliveryListId = this.$route.query.id;
-        }
-        this.loading = false;
-      },
-      sizeOrderChange(pageSize) {
-        this.page.pageSize = pageSize;
-        if (this.deliveryListId) {
-          //这里的编辑需要进行特殊处理
-          this.onLoadEditOrder(this.page, this.deliveryListId);
-        } else {
-          this.onLoadOrder(this.page);
-        }
-      },
-      currentOrderChange(currentPage) {
-        this.page.currentPage = currentPage;
-        if (this.deliveryListId) {
-          this.onLoadEditOrder(this.page, this.deliveryListId);
-        } else {
-          this.onLoadOrder(this.page);
-        }
-      },
-      checkPackage(row, index) {
-        console.log('>>>>>>>>>>>>', row, index);
-        // return false;
-      },
-      viewDriverInfo() {
-        console.log(this.driverInfo.length);
-        console.log(this.vehticleInfo.length);
-        if (this.driverList.length !== this.vehticleList.length) {
-          this.$message({
-            message: '司机车辆数量有误!!!',
-            type: 'warning'
-          });
-          return;
+      //这里就需要对原来包件是否发生变化进行处理
+      //如果发生变化该订单下的某一字段就会发生改变，后台根据该字段进行判断是否发生包件选择的变化
+      console.log(this.obj.parcelListVOS);
+      console.log('___________', this.obj);
+      this.orderData.forEach(item => {
+        if (item.id === this.obj.id) {
+          item.packageListInfo = this.selectionList;
         }
-        this.isDriverShow = true;
-      },
-      handleClose(done) {
-        this.$confirm('确认关闭？')
-          .then(_ => {
-            done();
-          })
-          .catch(_ => {
-          });
-      },
-      /**
-       * 查看包件
-       */
-      viewStockArticlePackage(row) {
-        //这里应该先对订单下的所有包件信息进行获取，然后结合查询出预约单下以选择的包件信息进行勾选状态的回显
-        //查询该订单下所有的包件信息
-        this.loading = true;
-        this.obj = row;
-        console.log('++++++++++++', row);
-        if (this.deliveryListId) {
-          //编辑
-          let params = {};
-          console.log('^^^^^^^^', row);
-          //这里订单的对象中应该存在三个数组，一个数组是该订单下的所有包件细信息
-          //一个数组是该订单被选择使用的包件信息
-          //还有一个就是正在操作的包件信息
-          let packageInfo = row.parcelListVOS;
-          if (row.packageList) {
-            let packageListInfo = row.packageList;
-            packageInfo.forEach((item, index) => {
-              packageListInfo.forEach(p => {
-                if (item.id === p.id) {
-                  this.$nextTick(() => {
-                    this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
-                  });
-                }
-              });
-            });
-          }
-          this.packageData = row.parcelListVOS;
-        } else {
-          //新增
-          //默认打开包件信息，包件列表处于全选状态
-          let params = {};
-          this.packageData = row.parcelListVOS;
-          this.packageData.forEach((item, index) => {
-            this.$nextTick(() => {
-              this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
-            });
-          });
-          console.log('^^^^^^^^', row);
-        }
-        this.loading = false;
-        this.isShowPackage = true;
-      },
-      checkOrder(row, index) {
-        if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') {
-          return false;
-        } else {
-          return true;
-        }
-        return false;
-      },
-      /**
-       * 提交包件信息
-       */
-      onSubmitPackage() {
-        //包件处于默认全选的状态这里不需要要求进行包件选择
-        //如果这里用户进行全部包件的取消，那么这里会对订单下的所有包件进行添加，由后台完成
+      });
+      console.log('**********', this.orderData);
+      // if (this.selectionList.length ===this.obj.parcelListVOS.length){
+      //   //这里就需要考虑，如果选中包件的数组长度和原来不同，那么包件信息必定发生变化
+      //   //当包件长度一致需要判断包件数组的内容是否一致，然后进行字段的改变和赋值
+      //
+      //   console.log(this.obj);
 
-        //这里就需要对原来包件是否发生变化进行处理
-        //如果发生变化该订单下的某一字段就会发生改变，后台根据该字段进行判断是否发生包件选择的变化
-        console.log(this.obj.parcelListVOS);
-        console.log('___________', this.obj);
-        this.orderData.forEach(item => {
-          if (item.id === this.obj.id) {
-            item.packageListInfo = this.selectionList;
+      // }
+      //这里就需要将具体的包件信息和订单进行关系绑定
+      console.log('this.selectionList', this.selectionList);
+      this.isShowPackage = false;
+    },
+    removeStockArticle(row) {
+      this.orderData.forEach((item, index) => {
+        if (item.id === row.id) {
+          this.orderData.splice(index, 1);
+        }
+        console.log(item);
+      });
+      console.log('>>>>>>>>>>>>>>>row', row);
+    },
+    onSubmitInventory() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      if (this.orderData.length) {
+        this.selectionList.some(i => {
+          let a = this.inventoryData.filter(ele => ele.id == i.id).length >= 1;
+          if (!a) {
+            this.inventoryData.push(i);
           }
         });
-        console.log('**********', this.orderData);
-        // if (this.selectionList.length ===this.obj.parcelListVOS.length){
-        //   //这里就需要考虑，如果选中包件的数组长度和原来不同，那么包件信息必定发生变化
-        //   //当包件长度一致需要判断包件数组的内容是否一致，然后进行字段的改变和赋值
-        //
-        //   console.log(this.obj);
+      } else {
+        this.inventoryData = this.selectionList;
+      }
+      this.stockListShow = false;
+    },
+    onSubmitOrder() {
+      console.log('>>>>>>>>>>>>', this.stockArticleList);
+      console.log('>>>>>>>>orderData', this.orderData);
+      const data = this.stockArticleList;
+      const info = [];
+      this.stockArticleInfo.forEach((item, index) => {
+        this.stockArticleList.forEach(order => {
+          // const newDate1 = this.orderData.map(item => { // map遍历本地数据
+          //   if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
+          //     return item;
+          // });
+          //   }              info.push(order);
+          //清理原来订单列表的订单数据
+          info.push(order);
+          this.stockArticleInfo.splice(index, 1);
+        });
+      });
 
-        // }
-        //这里就需要将具体的包件信息和订单进行关系绑定
-        console.log('this.selectionList', this.selectionList);
-        this.isShowPackage = false;
-      },
-      removeStockArticle(row) {
-        this.orderData.forEach((item, index) => {
-          if (item.id === row.id) {
-            this.orderData.splice(index, 1);
+      if (this.orderData.length >= 1) {
+        let newDate1 = this.stockArticleList.map(item => {
+          // map遍历本地数据
+          if (this.orderData.find(o => o.id !== item.id)) {
+            // 如果在接口数据中包含本地数据，则返回这条本地数据
+            return item;
           }
-          console.log(item);
         });
-        console.log('>>>>>>>>>>>>>>>row', row);
-      },
-      onSubmitInventory() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
+        console.log('newDate1-------------->', newDate1.length);
+        if (newDate1.length >= 1) {
+          console.log('newDate1-------------->', newDate1);
+          newDate1.forEach(a => {
+            this.orderData.push(a);
+          });
         }
-        if (this.orderData.length) {
-          this.selectionList.some(i => {
-            let a = this.inventoryData.filter((ele) => ele.id == i.id).length >= 1;
-            if (!a) {
-              this.inventoryData.push(i);
+        console.log('this.orderData------------->', this.orderData);
+      } else {
+        this.orderData = this.stockArticleList;
+      }
+      // data.map(item=>{
+      //   console.log(item);
+      //     this.orderData.forEach(order=>{
+      //       if (item.id !== order.id){
+      //         this.orderData.push(item);
+      //       }
+      //     })
+      // })
+      // // this.orderData = info;
+      console.log('+++++++++++++++', this.orderData);
+      this.orderShow = false;
+    },
+    /**
+     * 订单提交
+     */
+    onSubmitBusiness() {
+      if (this.orderData.length === 0) {
+        this.$message.warning('请选择订单');
+        return;
+      }
+      if (this.deliveryListId) {
+        let data = {};
+        let tripartite = {};
+        let stockup = {};
+        let allocationInfo = [];
+        //备货区数据构建
+        if (this.stockUpForm.loader) {
+          this.loaderData.forEach(a => {
+            if (this.stockUpForm.loader === a.dictKey) {
+              stockup.loaderName = a.dictValue;
+              stockup.loaderId = a.dictKey;
             }
           });
-        } else {
-          this.inventoryData = this.selectionList;
         }
-        this.stockListShow = false;
-      },
-      onSubmitOrder() {
-        console.log('>>>>>>>>>>>>', this.stockArticleList);
-        console.log('>>>>>>>>orderData', this.orderData);
-        const data = this.stockArticleList;
-        const info = [];
-        this.stockArticleInfo.forEach((item, index) => {
-          this.stockArticleList.forEach(order => {
-            // const newDate1 = this.orderData.map(item => { // map遍历本地数据
-            //   if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
-            //     return item;
-            // });
-            //   }              info.push(order);
-            //清理原来订单列表的订单数据
-            info.push(order);
-            this.stockArticleInfo.splice(index, 1);
-          });
-        });
-
-        if (this.orderData.length >= 1) {
-          let newDate1 = this.stockArticleList.map(item => { // map遍历本地数据
-            if (this.orderData.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据
-              return item;
+        if (this.stockUpForm.unloader) {
+          this.loaderData.forEach(a => {
+            if (this.stockUpForm.loader === a.dictKey) {
+              stockup.unloaderName = a.dictValue;
+              stockup.unloaderId = a.dictKey;
             }
           });
-          console.log('newDate1-------------->', newDate1.length);
-          if (newDate1.length >= 1) {
-            console.log('newDate1-------------->', newDate1);
-            newDate1.forEach(a => {
-              this.orderData.push(a);
-            });
-          }
-          console.log('this.orderData------------->', this.orderData);
-        } else {
-          this.orderData = this.stockArticleList;
         }
-        // data.map(item=>{
-        //   console.log(item);
-        //     this.orderData.forEach(order=>{
-        //       if (item.id !== order.id){
-        //         this.orderData.push(item);
-        //       }
-        //     })
-        // })
-        // // this.orderData = info;
-        console.log('+++++++++++++++', this.orderData);
-        this.orderShow = false;
-      },
-      /**
-       * 订单提交
-       */
-      onSubmitBusiness() {
-        if (this.orderData.length === 0) {
-          this.$message.warning('请选择订单');
-          return;
-        }
-        if (this.deliveryListId) {
-          let data = {};
-          let tripartite = {};
-          let stockup = {};
-          let allocationInfo = [];
-          //备货区数据构建
-          if (this.stockUpForm.loader) {
-            this.loaderData.forEach(a => {
-              if (this.stockUpForm.loader === a.dictKey) {
-                stockup.loaderName = a.dictValue;
-                stockup.loaderId = a.dictKey;
-              }
-            });
+        console.log('this.stockUpForm.forklift-------->', this.stockUpForm.forklift);
+        this.forkliftData.forEach(b => {
+          if (this.stockUpForm.forklift === b.dictKey) {
+            stockup.forkliftName = b.dictValue;
+            stockup.forkliftId = b.dictKey;
           }
-          if (this.stockUpForm.unloader) {
-            this.loaderData.forEach(a => {
-              if (this.stockUpForm.loader === a.dictKey) {
-                stockup.unloaderName = a.dictValue;
-                stockup.unloaderId = a.dictKey;
-              }
-            });
+        });
+        this.goodsAreaData.forEach(c => {
+          if (this.stockUpForm.goodsAreaId === c.dictKey) {
+            stockup.goodsAreaId = c.dictKey;
+            stockup.goodsAreaName = c.dictValue;
           }
-          console.log('this.stockUpForm.forklift-------->', this.stockUpForm.forklift);
-          this.forkliftData.forEach(b => {
-            if (this.stockUpForm.forklift === b.dictKey) {
-              stockup.forkliftName = b.dictValue;
-              stockup.forkliftId = b.dictKey;
-            }
-          });
-          this.goodsAreaData.forEach(c => {
-            if (this.stockUpForm.goodsAreaId === c.dictKey) {
-              stockup.goodsAreaId = c.dictKey;
-              stockup.goodsAreaName = c.dictValue;
-            }
+        });
+        if (this.stockUpForm.stockupDate) {
+          stockup.stockupDate = this.stockUpForm.stockupDate;
+        }
+        if (this.stockUpForm.remarks) {
+          data.remarks = this.stockUpForm.remarks;
+        }
+        if (this.stockUpForm.outboundDate) {
+          stockup.outboundDate = this.stockUpForm.outboundDate;
+        }
+        // stockup.loadAndUnload = this.loadAndUnload.join(',');
+        data.stockupInfo = stockup;
+        //将服务类型转为数组
+        if (this.serveType) {
+          console.log('this.serveType---------->', this.serveType);
+          let serve = Object.values(this.serveType);
+          serve = serve.sort((a, b) => {
+            return a - b;
           });
-          if (this.stockUpForm.stockupDate) {
-            stockup.stockupDate = this.stockUpForm.stockupDate;
+          this.stockUpForm.serveType = serve.join(',');
+          console.log('this.stockUpForm.serveType----------->', this.stockUpForm.serveType);
+        }
+        //判断是否是三方配送
+        if (this.waixieForm.tripartiteSource) {
+          //三方配送数据构建
+          if (this.waixieForm.driverName) {
+            tripartite.driverName = this.waixieForm.driverName;
           }
-          if (this.stockUpForm.remarks) {
-            data.remarks = this.stockUpForm.remarks;
+          if (this.waixieForm.driverPhone) {
+            tripartite.driverPhone = this.waixieForm.driverPhone;
           }
-          if (this.stockUpForm.outboundDate) {
-            stockup.outboundDate = this.stockUpForm.outboundDate;
+          if (this.waixieForm.vehicleNum) {
+            tripartite.vehicleNum = this.waixieForm.vehicleNum;
           }
-          // stockup.loadAndUnload = this.loadAndUnload.join(',');
-          data.stockupInfo = stockup;
-          //将服务类型转为数组
-          if (this.serveType) {
-            console.log('this.serveType---------->', this.serveType);
-            let serve = Object.values(this.serveType);
-            serve = serve.sort((a, b) => {
-              return a - b;
-            });
-            this.stockUpForm.serveType = serve.join(',');
-            console.log('this.stockUpForm.serveType----------->', this.stockUpForm.serveType);
+          if (this.waixieForm.deliveryFee) {
+            tripartite.deliveryFee = this.waixieForm.deliveryFee;
           }
-          //判断是否是三方配送
           if (this.waixieForm.tripartiteSource) {
-            //三方配送数据构建
-            if (this.waixieForm.driverName) {
-              tripartite.driverName = this.waixieForm.driverName;
-            }
-            if (this.waixieForm.driverPhone) {
-              tripartite.driverPhone = this.waixieForm.driverPhone;
-            }
-            if (this.waixieForm.vehicleNum) {
-              tripartite.vehicleNum = this.waixieForm.vehicleNum;
-            }
-            if (this.waixieForm.deliveryFee) {
-              tripartite.deliveryFee = this.waixieForm.deliveryFee;
-            }
-            if (this.waixieForm.tripartiteSource) {
-              this.tripartiteSourceData.forEach(item => {
-                if (this.waixieForm.tripartiteSource === item.dictKey) {
-                  tripartite.distributionCompanyId = item.dictKey;
-                  tripartite.distributionCompany = item.dictValue;
-                }
-              });
-              data.tripartite = tripartite;
-            }
-          } else {
-            //自主配送数据构建
-            console.log('this.driverList', this.driverList);
-            console.log('this.vehticleList', this.vehticleList);
-            if (this.driverList.length !== this.vehticleList.length) {
-              this.$message({
-                message: '司机车辆数量有误!!!',
-                type: 'warning'
-              });
-              return;
-            } else {
-              let info = [];
-              for (let i = 0; i < this.driverInfo.length; i++) {
-                let obj = {};
-                obj.driverName = this.driverInfo[i].name;
-                obj.driverPhone = this.driverInfo[i].phone;
-                obj.driverId = this.driverInfo[i].id;
-                obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
-                obj.vehicleId = this.vehticleInfo[i].id;
-                info.push(obj);
-                this.driverInfo[i].name;
+            this.tripartiteSourceData.forEach(item => {
+              if (this.waixieForm.tripartiteSource === item.dictKey) {
+                tripartite.distributionCompanyId = item.dictKey;
+                tripartite.distributionCompany = item.dictValue;
               }
-              allocationInfo = info;
-            }
-            console.log(allocationInfo);
-            data.allocationInfo = allocationInfo;
-          }
-          data.masterDriverName = this.driverForm.masterDriverName;
-          data.masterVehicleNub = this.driverForm.masterVehicleNub;
-          data.stockArticle = this.orderData;
-          let reservation = {};
-          reservation.deliveryType = this.stockUpForm.deliveryType;
-          reservation.deliveryWay = this.stockUpForm.deliveryWay;
-          reservation.serveType = this.stockUpForm.serveType;
-          reservation.otherFee = this.stockUpForm.otherFee;
-          data.taskTime = this.stockUpForm.taskTime;
-          data.reservation = reservation;
-          data.id = this.deliveryListId;
-          this.orderData.map((item, index) => {
-            console.log('item=>', item);
-            if (!item.packageListInfo) {
-              item.packageListInfo = item.parcelListVOS;
-            }
-          });
-          console.log('data>>>>>>>>>>>', data);
-          updateDeliveryList(data).then(res => {
-            this.$router.push({
-              path: '/distribution/deliverylist/distributionDeliveryListdis'
             });
-          });
+            data.tripartite = tripartite;
+          }
         } else {
-          let data = {};
-          let stockup = {};
-          let tripartite = {};
-          let allocationInfo = [];
-          //备货区数据构建
-          if (this.stockUpForm.loader) {
-            this.loaderData.forEach(a => {
-              if (this.stockUpForm.loader === a.dictKey) {
-                stockup.loaderName = a.dictValue;
-                stockup.loaderId = a.dictKey;
-              }
+          //自主配送数据构建
+          console.log('this.driverList', this.driverList);
+          console.log('this.vehticleList', this.vehticleList);
+          if (this.driverList.length !== this.vehticleList.length) {
+            this.$message({
+              message: '司机车辆数量有误!!!',
+              type: 'warning',
             });
+            return;
+          } else {
+            let info = [];
+            for (let i = 0; i < this.driverInfo.length; i++) {
+              let obj = {};
+              obj.driverName = this.driverInfo[i].name;
+              obj.driverPhone = this.driverInfo[i].phone;
+              obj.driverId = this.driverInfo[i].id;
+              obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
+              obj.vehicleId = this.vehticleInfo[i].id;
+              info.push(obj);
+              this.driverInfo[i].name;
+            }
+            allocationInfo = info;
           }
-          if (this.stockUpForm.unloader) {
-            this.loaderData.forEach(a => {
-              if (this.stockUpForm.loader === a.dictKey) {
-                stockup.unloaderName = a.dictValue;
-                stockup.unloaderId = a.dictKey;
-              }
-            });
+          console.log(allocationInfo);
+          data.allocationInfo = allocationInfo;
+        }
+        data.masterDriverName = this.driverForm.masterDriverName;
+        data.masterVehicleNub = this.driverForm.masterVehicleNub;
+        data.stockArticle = this.orderData;
+        let reservation = {};
+        reservation.deliveryType = this.stockUpForm.deliveryType;
+        reservation.deliveryWay = this.stockUpForm.deliveryWay;
+        reservation.serveType = this.stockUpForm.serveType;
+        reservation.otherFee = this.stockUpForm.otherFee;
+        data.taskTime = this.stockUpForm.taskTime;
+        data.reservation = reservation;
+        data.id = this.deliveryListId;
+        this.orderData.map((item, index) => {
+          console.log('item=>', item);
+          if (!item.packageListInfo) {
+            item.packageListInfo = item.parcelListVOS;
           }
-          this.forkliftData.forEach(b => {
-            if (this.stockUpForm.forklift === b.dictKey) {
-              stockup.forkliftName = b.dictValue;
-              stockup.forkliftId = b.dictKey;
+        });
+        console.log('data>>>>>>>>>>>', data);
+        updateDeliveryList(data).then(res => {
+          this.$router.push({
+            path: '/distribution/deliverylist/distributionDeliveryListdis',
+          });
+        });
+      } else {
+        let data = {};
+        let stockup = {};
+        let tripartite = {};
+        let allocationInfo = [];
+        //备货区数据构建
+        if (this.stockUpForm.loader) {
+          this.loaderData.forEach(a => {
+            if (this.stockUpForm.loader === a.dictKey) {
+              stockup.loaderName = a.dictValue;
+              stockup.loaderId = a.dictKey;
             }
           });
-          this.goodsAreaData.forEach(c => {
-            if (this.stockUpForm.goodsAreaId === c.dictKey) {
-              stockup.goodsAreaId = c.dictKey;
-              stockup.goodsAreaName = c.dictValue;
+        }
+        if (this.stockUpForm.unloader) {
+          this.loaderData.forEach(a => {
+            if (this.stockUpForm.loader === a.dictKey) {
+              stockup.unloaderName = a.dictValue;
+              stockup.unloaderId = a.dictKey;
             }
           });
-          if (this.stockUpForm.stockupDate) {
-            stockup.stockupDate = this.stockUpForm.stockupDate;
+        }
+        this.forkliftData.forEach(b => {
+          if (this.stockUpForm.forklift === b.dictKey) {
+            stockup.forkliftName = b.dictValue;
+            stockup.forkliftId = b.dictKey;
           }
-          if (this.stockUpForm.remarks) {
-            data.remarks = this.stockUpForm.remarks;
+        });
+        this.goodsAreaData.forEach(c => {
+          if (this.stockUpForm.goodsAreaId === c.dictKey) {
+            stockup.goodsAreaId = c.dictKey;
+            stockup.goodsAreaName = c.dictValue;
           }
-          if (this.stockUpForm.outboundDate) {
-            stockup.outboundDate = this.stockUpForm.outboundDate;
+        });
+        if (this.stockUpForm.stockupDate) {
+          stockup.stockupDate = this.stockUpForm.stockupDate;
+        }
+        if (this.stockUpForm.remarks) {
+          data.remarks = this.stockUpForm.remarks;
+        }
+        if (this.stockUpForm.outboundDate) {
+          stockup.outboundDate = this.stockUpForm.outboundDate;
+        }
+        //将服务类型转为数组
+        let serve = Object.values(this.serveType);
+        serve = serve.sort((a, b) => {
+          return a - b;
+        });
+        this.stockUpForm.serveType = serve.join(',');
+        // stockup.loadAndUnload = this.loadAndUnload.join(',');
+        //判断是否是三方配送
+        if (this.waixieForm.tripartiteSource) {
+          //三方配送数据构建
+          if (this.waixieForm.driverName) {
+            tripartite.driverName = this.waixieForm.driverName;
+          }
+          console.log('-------------->', this.waixieForm);
+          if (this.waixieForm.driverPhone) {
+            tripartite.driverPhone = this.waixieForm.driverPhone;
+          }
+          if (this.waixieForm.vehicleNum) {
+            tripartite.vehicleNum = this.waixieForm.vehicleNum;
+          }
+          if (this.waixieForm.deliveryFee) {
+            tripartite.deliveryFee = this.waixieForm.deliveryFee;
           }
-          //将服务类型转为数组
-          let serve = Object.values(this.serveType);
-          serve = serve.sort((a, b) => {
-            return a - b;
-          });
-          this.stockUpForm.serveType = serve.join(',');
-          // stockup.loadAndUnload = this.loadAndUnload.join(',');
-          //判断是否是三方配送
           if (this.waixieForm.tripartiteSource) {
-            //三方配送数据构建
-            if (this.waixieForm.driverName) {
-              tripartite.driverName = this.waixieForm.driverName;
-            }
-            console.log('-------------->', this.waixieForm);
-            if (this.waixieForm.driverPhone) {
-              tripartite.driverPhone = this.waixieForm.driverPhone;
-            }
-            if (this.waixieForm.vehicleNum) {
-              tripartite.vehicleNum = this.waixieForm.vehicleNum;
-            }
-            if (this.waixieForm.deliveryFee) {
-              tripartite.deliveryFee = this.waixieForm.deliveryFee;
-            }
-            if (this.waixieForm.tripartiteSource) {
-              this.tripartiteSourceData.forEach(item => {
-                if (this.waixieForm.tripartiteSource === item.dictValue) {
-                  tripartite.distributionCompanyId = item.dictKey;
-                  tripartite.distributionCompany = item.dictValue;
-                }
-              });
-              data.tripartite = tripartite;
-            }
-          } else {
-            //自主配送数据构建
-            if (this.driverList.length !== this.vehticleList.length) {
-              this.$message({
-                message: '司机车辆数量有误!!!',
-                type: 'warning'
-              });
-              return;
-            } else {
-              let info = [];
-              for (let i = 0; i < this.driverInfo.length; i++) {
-                let obj = {};
-                obj.driverName = this.driverInfo[i].name;
-                obj.driverPhone = this.driverInfo[i].phone;
-                obj.driverId = this.driverInfo[i].id;
-                obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
-                obj.vehicleId = this.vehticleInfo[i].id;
-                info.push(obj);
-                this.driverInfo[i].name;
+            this.tripartiteSourceData.forEach(item => {
+              if (this.waixieForm.tripartiteSource === item.dictValue) {
+                tripartite.distributionCompanyId = item.dictKey;
+                tripartite.distributionCompany = item.dictValue;
               }
-              allocationInfo = info;
-            }
-          }
-          data.stockup = stockup;
-          data.masterDriverName = this.driverForm.masterDriverName;
-          data.masterVehicleNub = this.driverForm.masterVehicleNub;
-          data.allocationInfo = allocationInfo;
-          data.stockArticle = this.orderData;
-          let reservation = {};
-          reservation.deliveryType = this.stockUpForm.deliveryType;
-          reservation.deliveryWay = this.stockUpForm.deliveryWay;
-          reservation.serveType = this.stockUpForm.serveType;
-          reservation.otherFee = this.stockUpForm.otherFee;
-          data.taskTime = this.stockUpForm.taskTime;
-          data.reservation = reservation;
-          //编辑
-          //如果用户没有进行包件选择，这里对可选择的包件进行全选操作
-          this.orderData.map((item, index) => {
-            console.log('item=>', item);
-            if (!item.packageListInfo) {
-              item.packageListInfo = item.parcelListVOS;
-            }
-          });
-
-          console.log('data>>>>>>>>>>>', data);
-          // 新增
-          deliveryBusinessTask(data).then((res) => {
-            this.$router.push({
-              path: '/distribution/deliverylist/distributionDeliveryListdis'
             });
-          });
-        }
-      },
-      changeVehicle(params) {
-        console.log(params);
-        this.vehticleList = params;
-        let b = [];
-        if (params) {
-          this.vehicleData.forEach(item => {
-            this.vehticleList.forEach(p => {
-              if (p == item.id) {
-                b.push(item);
-                console.log(this.driverInfo);
-              }
+            data.tripartite = tripartite;
+          }
+        } else {
+          //自主配送数据构建
+          if (this.driverList.length !== this.vehticleList.length) {
+            this.$message({
+              message: '司机车辆数量有误!!!',
+              type: 'warning',
             });
-            if (params[0] === item.id) {
-              this.driverForm.masterVehicleNub = item.vehicleNub;
+            return;
+          } else {
+            let info = [];
+            for (let i = 0; i < this.driverInfo.length; i++) {
+              let obj = {};
+              obj.driverName = this.driverInfo[i].name;
+              obj.driverPhone = this.driverInfo[i].phone;
+              obj.driverId = this.driverInfo[i].id;
+              obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
+              obj.vehicleId = this.vehticleInfo[i].id;
+              info.push(obj);
+              this.driverInfo[i].name;
             }
-          });
-          this.vehticleInfo = b;
+            allocationInfo = info;
+          }
         }
-      },
-      changeDriver(params) {
-        console.log("params---------->",params);
-        this.driverList = params;
-        let a = [];
-        if (params) {
-          this.driverData.forEach(item => {
-            this.driverList.forEach(p => {
-              if (p == item.id) {
-                a.push(item);
-                console.log(this.driverInfo);
-                //TODO 这里发送车辆的请求，如果有车辆信息则进行车牌号的填充
+        data.stockup = stockup;
+        data.masterDriverName = this.driverForm.masterDriverName;
+        data.masterVehicleNub = this.driverForm.masterVehicleNub;
+        data.allocationInfo = allocationInfo;
+        data.stockArticle = this.orderData;
+        let reservation = {};
+        reservation.deliveryType = this.stockUpForm.deliveryType;
+        reservation.deliveryWay = this.stockUpForm.deliveryWay;
+        reservation.serveType = this.stockUpForm.serveType;
+        reservation.otherFee = this.stockUpForm.otherFee;
+        data.taskTime = this.stockUpForm.taskTime;
+        data.reservation = reservation;
+        //编辑
+        //如果用户没有进行包件选择，这里对可选择的包件进行全选操作
+        this.orderData.map((item, index) => {
+          console.log('item=>', item);
+          if (!item.packageListInfo) {
+            item.packageListInfo = item.parcelListVOS;
+          }
+        });
 
-                // console.log("------------>item",item);
-                // console.log("---------------->",this.vehicleData);
-              }
-            });
-            if (params[0] === item.id) {
-              this.driverForm.masterDriverName = item.name;
+        console.log('data>>>>>>>>>>>', data);
+        // 新增
+        deliveryBusinessTask(data).then(res => {
+          this.$router.push({
+            path: '/distribution/deliverylist/distributionDeliveryListdis',
+          });
+        });
+      }
+    },
+    changeVehicle(params) {
+      console.log(params);
+      this.vehticleList = params;
+      let b = [];
+      if (params) {
+        this.vehicleData.forEach(item => {
+          this.vehticleList.forEach(p => {
+            if (p == item.id) {
+              b.push(item);
+              console.log(this.driverInfo);
             }
           });
-          this.driverInfo = a;
-        }
-      },
-      //上移
-      moveUpVehictle(row) {
-        let i = 0;
-        this.vehticleInfo.forEach((item, index) => {
-          if (item.id === row.id) {
-            i = index;
+          if (params[0] === item.id) {
+            this.driverForm.masterVehicleNub = item.vehicleNub;
           }
         });
-        //获取当当前选中的下标，如果下标为第一个则不能上移
-        if (i > 0) {
-          let a = this.vehticleInfo[i - 1];
-          this.vehticleInfo.splice(i - 1, 1);
-          this.vehticleInfo.splice(i, 0, a);
-        } else {
-          this.$message({
-            message: '已经是第一条，上移失败',
-            type: 'warning'
+        this.vehticleInfo = b;
+      }
+    },
+    changeDriver(params) {
+      console.log('params---------->', params);
+      this.driverList = params;
+      let a = [];
+      if (params) {
+        this.driverData.forEach(item => {
+          this.driverList.forEach(p => {
+            if (p == item.id) {
+              a.push(item);
+              console.log(this.driverInfo);
+              //TODO 这里发送车辆的请求，如果有车辆信息则进行车牌号的填充
+
+              // console.log("------------>item",item);
+              // console.log("---------------->",this.vehicleData);
+            }
           });
-        }
-        console.log(this.vehticleInfo);
-      },
-      handleSelect(selection, row) {
-        // 阻止全选框原有逻辑
-        this.$refs.multipleTable.clearSelection();
-        if (row) {
-          if (selection.length === 1) {
-            this.multipleSelection = row;
-            this.$refs.multipleTable.toggleRowSelection(row, true);
-          } else if (selection.length > 1) {
-            let a = {};
-            selection.forEach((s, index) => {
-              if (s.id === row.id) {
-                selection.splice(index, 1);
-                a = s;
-              }
-            });
-            this.multipleSelection = selection;
-            this.$refs.multipleTable.toggleRowSelection(a, true);
-          }
-        }
-      },
-      confirmDriver() {
-        if (this.multipleSelection.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
-        }
-        console.log('this.adada', this.multipleSelection);
-        this.isDriverShow = false;
-        //获取到表格的行坐标
-        let a = 0;
-        this.driverInfo.forEach((item, index) => {
-          if (item.id === this.multipleSelection.id) {
-            a = index;
+          if (params[0] === item.id) {
+            this.driverForm.masterDriverName = item.name;
           }
         });
-        this.driverForm.masterDriverName = this.driverInfo[a].name;
-        this.driverForm.masterVehicleNub = this.vehticleInfo[a].vehicleNub;
-      },
-      // //数据字典数据获取
-      getDictionary() {
-        getDictionaryBiz('addvalue_serve_type').then(res => {
-          this.addvalueServeTypeData = res.data.data;
-        });
-        // getDictionaryBiz('load_and_unload').then(res => {
-        //   this.loadAndUnloadData = res.data.data;
-        // });
-        getDictionaryBiz('delivery_way').then(res => {
-          this.deliveryWayData = res.data.data;
-        });
-        //三方外协来源
-        getDictionaryBiz('tripartite_source').then(res => {
-          this.tripartiteSourceData = res.data.data;
+        this.driverInfo = a;
+      }
+    },
+    //上移
+    moveUpVehictle(row) {
+      let i = 0;
+      this.vehticleInfo.forEach((item, index) => {
+        if (item.id === row.id) {
+          i = index;
+        }
+      });
+      //获取当当前选中的下标，如果下标为第一个则不能上移
+      if (i > 0) {
+        let a = this.vehticleInfo[i - 1];
+        this.vehticleInfo.splice(i - 1, 1);
+        this.vehticleInfo.splice(i, 0, a);
+      } else {
+        this.$message({
+          message: '已经是第一条，上移失败',
+          type: 'warning',
         });
-      },
-      ccc() {
-        if (this.deliveryListId) {
-          //清空司机、车辆信息
-          this.waixieForm.tripartiteSource = '';
-          this.waixieForm.driverName = '';
-          this.waixieForm.driverPhone = '';
-          this.waixieForm.vehicleNum = '';
-          this.waixieForm.deliveryFee = '';
-
-        } else {
-          // this.loadAndUnload = [];
-          this.serveType = [];
-          this.waixieForm = {};
+      }
+      console.log(this.vehticleInfo);
+    },
+    handleSelect(selection, row) {
+      // 阻止全选框原有逻辑
+      this.$refs.multipleTable.clearSelection();
+      if (row) {
+        if (selection.length === 1) {
+          this.multipleSelection = row;
+          this.$refs.multipleTable.toggleRowSelection(row, true);
+        } else if (selection.length > 1) {
+          let a = {};
+          selection.forEach((s, index) => {
+            if (s.id === row.id) {
+              selection.splice(index, 1);
+              a = s;
+            }
+          });
+          this.multipleSelection = selection;
+          this.$refs.multipleTable.toggleRowSelection(a, true);
         }
-        this.aaa = true;
-        this.bbb = false;
-        this.stockUpForm.deliveryType = '1';
-        this.stockUpForm.deliveryWay = '10';
-        // this.loadAndUnload = ['1', '2'];
-        this.stockUpForm.otherFee = 0;
-        this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
-        this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
-        this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-      },
-      ddd() {
-        if (this.deliveryListId) {
-          this.vehicleIds = [];
-          this.deliveryDriver = [];
-          this.driverForm.masterDriverName = '';
-          this.driverForm.masterVehicleNub = '';
-        } else {
-          // this.loadAndUnload = [];
-          this.serveType = [];
-          this.waixieForm = {};
+      }
+    },
+    confirmDriver() {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      console.log('this.adada', this.multipleSelection);
+      this.isDriverShow = false;
+      //获取到表格的行坐标
+      let a = 0;
+      this.driverInfo.forEach((item, index) => {
+        if (item.id === this.multipleSelection.id) {
+          a = index;
         }
-        this.aaa = false;
-        this.bbb = true;
-        this.stockUpForm.deliveryType = '1';
-        this.stockUpForm.deliveryWay = '10';
-        // this.loadAndUnload = ['1', '2'];
-        this.stockUpForm.otherFee = 0;
-        this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
-        this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
-        this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-      },
-      handleAddOrder() {
-        //TODO 这里还缺少对于订单状态的筛选条件
-        this.query.typeService = 1;
-        this.query.genre = '1';
-        const page = this.page;
-        this.query = {};
-        //初始化新增订单数据
-        this.onLoadOrder(page);
-        this.query = {};
-        this.loading = false;
-        this.orderShow = true;
-      },
-      searchReset() {
-        this.query = {
-          typeService: 1,
-          genre: '1'
-        };
-        this.searchChange();
-      },
-      // selectDiscussStockArticle(arg,params={}){
-      //   this.query.typeService = 1;
-      //   this.query.genre = '1';
-      //   const page = arg;
-      //   selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-      //     console.log("----------------------------->",res.data.data);
-      //     const data = res.data.data;
-      //     // this.page.total = data.total;
-      //     this.stockArticleInfo = data.records;
+      });
+      this.driverForm.masterDriverName = this.driverInfo[a].name;
+      this.driverForm.masterVehicleNub = this.vehticleInfo[a].vehicleNub;
+    },
+    // //数据字典数据获取
+    getDictionary() {
+      getDictionaryBiz('addvalue_serve_type').then(res => {
+        this.addvalueServeTypeData = res.data.data;
+      });
+      // getDictionaryBiz('load_and_unload').then(res => {
+      //   this.loadAndUnloadData = res.data.data;
+      // });
+      getDictionaryBiz('delivery_way').then(res => {
+        this.deliveryWayData = res.data.data;
+      });
+      //三方外协来源
+      getDictionaryBiz('tripartite_source').then(res => {
+        this.tripartiteSourceData = res.data.data;
+      });
+    },
+    ccc() {
+      if (this.deliveryListId) {
+        //清空司机、车辆信息
+        this.waixieForm.tripartiteSource = '';
+        this.waixieForm.driverName = '';
+        this.waixieForm.driverPhone = '';
+        this.waixieForm.vehicleNum = '';
+        this.waixieForm.deliveryFee = '';
+      } else {
+        // this.loadAndUnload = [];
+        this.serveType = [];
+        this.waixieForm = {};
+      }
+      this.aaa = true;
+      this.bbb = false;
+      this.stockUpForm.deliveryType = '1';
+      this.stockUpForm.deliveryWay = '10';
+      // this.loadAndUnload = ['1', '2'];
+      this.stockUpForm.otherFee = 0;
+      this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
+      this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+      this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+    },
+    ddd() {
+      if (this.deliveryListId) {
+        this.vehicleIds = [];
+        this.deliveryDriver = [];
+        this.driverForm.masterDriverName = '';
+        this.driverForm.masterVehicleNub = '';
+      } else {
+        // this.loadAndUnload = [];
+        this.serveType = [];
+        this.waixieForm = {};
+      }
+      this.aaa = false;
+      this.bbb = true;
+      this.stockUpForm.deliveryType = '1';
+      this.stockUpForm.deliveryWay = '10';
+      // this.loadAndUnload = ['1', '2'];
+      this.stockUpForm.otherFee = 0;
+      this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
+      this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+      this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+    },
+    handleAddOrder() {
+      //TODO 这里还缺少对于订单状态的筛选条件
+      this.query.typeService = 1;
+      this.query.genre = '1';
+      const page = this.page;
+      this.query = {};
+      //初始化新增订单数据
+      this.onLoadOrder(page);
+      this.query = {};
+      this.loading = false;
+      this.orderShow = true;
+    },
+    searchReset() {
+      this.query = {
+        typeService: 1,
+        genre: '1',
+      };
+      this.searchChange();
+    },
+    // selectDiscussStockArticle(arg,params={}){
+    //   this.query.typeService = 1;
+    //   this.query.genre = '1';
+    //   const page = arg;
+    //   selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+    //     console.log("----------------------------->",res.data.data);
+    //     const data = res.data.data;
+    //     // this.page.total = data.total;
+    //     this.stockArticleInfo = data.records;
+    //     this.stockArticleInfo.forEach((item, index) => {
+    //       if (this.orderData) {
+    //         this.orderData.forEach(a => {
+    //           if (item.id === a.id) {
+    //             this.$nextTick(() => {
+    //               this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
+    //             });
+    //             console.log("item---------------->",item);
+    //             this.checkOrder(item,index)
+    //           }
+    //         });
+    //       }
+    //     });
+    //     this.page.total = data.total;
+    //   });
+    // },
+    searchChange() {
+      let params = {};
+      this.query.typeService = 1;
+      this.query.genre = '1';
+      console.log('query------------->', this.query);
+      const page = this.page;
+      this.onLoadOrder(page);
+      // selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      //   console.log('------------------->', res);
+      //   const data = res.data.data;
+      //   this.stockArticleInfo = data.records;
+      //   if (this.orderData) {
       //     this.stockArticleInfo.forEach((item, index) => {
-      //       if (this.orderData) {
-      //         this.orderData.forEach(a => {
-      //           if (item.id === a.id) {
-      //             this.$nextTick(() => {
-      //               this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
-      //             });
-      //             console.log("item---------------->",item);
-      //             this.checkOrder(item,index)
-      //           }
-      //         });
-      //       }
+      //       this.orderData.forEach(order => {
+      //         if (item.id === order.id) {
+      //           console.log('----------->');
+      //           this.$nextTick(() => {
+      //             this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
+      //           });
+      //         }
+      //       });
       //     });
-      //     this.page.total = data.total;
-      //   });
-      // },
-      searchChange() {
-        let params = {};
-        this.query.typeService = 1;
-        this.query.genre = '1';
-        console.log('query------------->', this.query);
-        const page = this.page;
-        this.onLoadOrder(page);
-        // selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        //   console.log('------------------->', res);
-        //   const data = res.data.data;
-        //   this.stockArticleInfo = data.records;
-        //   if (this.orderData) {
-        //     this.stockArticleInfo.forEach((item, index) => {
-        //       this.orderData.forEach(order => {
-        //         if (item.id === order.id) {
-        //           console.log('----------->');
-        //           this.$nextTick(() => {
-        //             this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
-        //           });
-        //         }
-        //       });
-        //     });
-        //   }
-        // });
-        // selectStockArticleAndParcel(Object.assign(params,this.query)).then(res=>{
-        //   console.log("res------------>",res.data.data);
-        //   const data = res.data.data
-        //   this.stockArticleInfo = data;
-        //   if (this.deliveryListId){
-        //     this.stockArticleInfo.forEach((item,index)=>{
-        //       this.orderData.forEach(order=>{
-        //         if (item.id === order.id){
-        //           console.log("----------->");
-        //           this.$nextTick(() => {
-        //             this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
-        //           })
-        //         }
-        //       })
-        //     })
-        //   }
-        // })
-      }
-      ,
-      handleAddInventory() {
-        this.form.deliveryType = '1';
-        let params = {};
-        let page = this.page;
-        getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      //   }
+      // });
+      // selectStockArticleAndParcel(Object.assign(params,this.query)).then(res=>{
+      //   console.log("res------------>",res.data.data);
+      //   const data = res.data.data
+      //   this.stockArticleInfo = data;
+      //   if (this.deliveryListId){
+      //     this.stockArticleInfo.forEach((item,index)=>{
+      //       this.orderData.forEach(order=>{
+      //         if (item.id === order.id){
+      //           console.log("----------->");
+      //           this.$nextTick(() => {
+      //             this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
+      //           })
+      //         }
+      //       })
+      //     })
+      //   }
+      // })
+    },
+    handleAddInventory() {
+      this.form.deliveryType = '1';
+      let params = {};
+      let page = this.page;
+      getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+        res => {
           const inventoryList = res.data.data;
           console.log('>>>>>>>>>>', inventoryList);
           inventoryList.records.forEach(item => {
@@ -1658,199 +1650,246 @@
           this.inventoryInfo = inventoryList.records;
           this.loading = false;
           this.selectionClear();
+        }
+      );
+      this.selectionList = [];
+      this.stockListShow = true;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.query = {};
+    },
+    onLoadEditOrder(arg, deliveryListId, params = {}) {
+      this.query.typeService = 1;
+      this.query.genre = '1';
+      const page = arg;
+      const id = deliveryListId;
+      selectDiscussStockArticleInfoList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query),
+        id
+      ).then(res => {
+        console.log('----------------------------->', res.data.data);
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.stockArticleInfo = data.records;
+        this.stockArticleInfo.forEach((item, index) => {
+          if (this.orderData) {
+            this.orderData.forEach(a => {
+              if (item.id === a.id) {
+                this.$nextTick(() => {
+                  this.$refs.stockArticleTable.toggleRowSelection(
+                    this.stockArticleInfo[index],
+                    true
+                  );
+                });
+                console.log('item---------------->', item);
+                this.checkOrder(item, index);
+              }
+            });
+          }
+        });
+        // this.page.total = data.total;
+      });
+    },
+    onLoadOrder(arg, params = {}) {
+      this.query.typeService = 1;
+      this.query.genre = '1';
+      const page = arg;
+      let a = [];
+      if (this.orderData) {
+        this.orderData.forEach(item => {
+          a.push(item.id);
         });
-        this.selectionList = [];
-        this.stockListShow = true;
       }
-      ,
-      selectionClear() {
-        this.selectionList = [];
-        this.query = {};
-      },
-      onLoadEditOrder(arg, deliveryListId, params = {}) {
-        this.query.typeService = 1;
-        this.query.genre = '1';
-        const page = arg;
-        const id = deliveryListId;
-        selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query), id).then(res => {
-          console.log('----------------------------->', res.data.data);
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.stockArticleInfo = data.records;
-          this.stockArticleInfo.forEach((item, index) => {
-            if (this.orderData) {
-              this.orderData.forEach(a => {
-                if (item.id === a.id) {
-                  this.$nextTick(() => {
-                    this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
-                  });
-                  console.log('item---------------->', item);
-                  this.checkOrder(item, index);
-                }
-              });
-            }
-          });
-          // this.page.total = data.total;
+      this.query.orderIds = a.join(',');
+      selectStockArticleInfoList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query)
+      ).then(res => {
+        console.log(res.data.data);
+        const data = res.data.data;
+        // this.page.total = data.total;
+        this.stockArticleInfo = data.records;
+        this.stockArticleInfo.forEach((item, index) => {
+          //检查订单是否冻结
+          this.checkOrder(item, index);
         });
-      },
-      onLoadOrder(arg, params = {}) {
-        this.query.typeService = 1;
-        this.query.genre = '1';
-        const page = arg;
-        let a = [];
-        if (this.orderData) {
-          this.orderData.forEach(item => {
-            a.push(item.id);
-          });
-        }
-        this.query.orderIds = a.join(',');
-        selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          console.log(res.data.data);
-          const data = res.data.data;
-          // this.page.total = data.total;
-          this.stockArticleInfo = data.records;
-          this.stockArticleInfo.forEach((item, index) => {
-            //检查订单是否冻结
-            this.checkOrder(item, index);
+        this.page.total = data.total;
+      });
+    },
+    async onLoad(page, params = {}) {
+      this.stockUpForm.deliveryType = '1';
+      console.log('》》》》》》》》》》》》》》》', this.deliveryListId);
+      if (this.deliveryListId) {
+        getDeliveryList(this.deliveryListId).then(async res => {
+          let data = res.data.data;
+          Object.assign(this.stockUpForm, data.reservationInfo);
+          Object.assign(this.stockUpForm, data.stockupInfo);
+          this.stockUpForm.deliveryType = '1';
+          this.stockUpForm.deliveryWay = data.reservationInfo.deliveryWay;
+          // this.serveType = data.reservationInfo.serveType.split(',');
+          // if (data.stockupInfo) {
+          //   this.loadAndUnload = data.stockupInfo.teamResponsibility.split(',');
+          // }
+          // data.deliverySelfVO
+          this.stockUpForm.loader = data.loadingTeamId;
+          this.stockUpForm.unloader = data.unloadingTeamId;
+          this.stockUpForm.forklift = data.stockupInfo.forkliftId;
+          this.stockUpForm.outboundDate = data.stockupInfo.outboundDate;
+          this.stockUpForm.remarks = data.remarks;
+          this.stockUpForm.taskTime = data.taskTime;
+          data.stockArticleList.forEach(item => {
+            if (item.packageList) {
+              item.packageList = item.packageList;
+              item.packageListInfo = item.packageList;
+            }
           });
-          this.page.total = data.total;
-        });
-      },
-      async onLoad(page, params = {}) {
-        this.stockUpForm.deliveryType = '1';
-        console.log('》》》》》》》》》》》》》》》', this.deliveryListId);
-        if (this.deliveryListId) {
-          getDeliveryList(this.deliveryListId).then(async res => {
-            let data = res.data.data;
-            Object.assign(this.stockUpForm, data.reservationInfo);
-            Object.assign(this.stockUpForm, data.stockupInfo);
-            this.stockUpForm.deliveryType = '1';
-            this.stockUpForm.deliveryWay = data.reservationInfo.deliveryWay;
-            // this.serveType = data.reservationInfo.serveType.split(',');
-            // if (data.stockupInfo) {
-            //   this.loadAndUnload = data.stockupInfo.teamResponsibility.split(',');
-            // }
-            // data.deliverySelfVO
-            this.stockUpForm.loader = data.loadingTeamId;
-            this.stockUpForm.unloader = data.unloadingTeamId;
-            this.stockUpForm.forklift = data.stockupInfo.forkliftId;
-            this.stockUpForm.outboundDate = data.stockupInfo.outboundDate;
-            this.stockUpForm.remarks = data.remarks;
-            this.stockUpForm.taskTime = data.taskTime;
-            data.stockArticleList.forEach(item => {
-              if (item.packageList) {
-                item.packageList = item.packageList;
-                item.packageListInfo = item.packageList;
-              }
-            });
-            this.orderData = data.stockArticleList;
-            // if (data.teamResponsibility) {
-            //   this.loadAndUnload = data.teamResponsibility.split(',');
-            // }
-            console.log('data.kind', data.kind);
-            if (data.kind === '1') {
-              //自主配送
-              let self = data.deliverySelfVO;
-              let vehicle = await this.getvehicleData();
-              console.log('___________________-->', vehicle);
-              let driver = await this.getDriverData();
-              let a = [];
-              let b = [];
-              let vehicleInfo = [];
-              vehicle.forEach(item => {
-                self.forEach(s => {
-                  if (item.id === s.vehicleId) {
-                    a.push(s.vehicleId);
-                    vehicleInfo.push(item);
-                  }
-                  if (s.isMaster === 2) {
-                    this.driverForm.masterVehicleNub = s.vehicleNub;
-                  }
-                });
+          this.orderData = data.stockArticleList;
+          // if (data.teamResponsibility) {
+          //   this.loadAndUnload = data.teamResponsibility.split(',');
+          // }
+          console.log('data.kind', data.kind);
+          if (data.kind === '1') {
+            //自主配送
+            let self = data.deliverySelfVO;
+            let vehicle = await this.getvehicleData();
+            console.log('___________________-->', vehicle);
+            let driver = await this.getDriverData();
+            let a = [];
+            let b = [];
+            let vehicleInfo = [];
+            vehicle.forEach(item => {
+              self.forEach(s => {
+                if (item.id === s.vehicleId) {
+                  a.push(s.vehicleId);
+                  vehicleInfo.push(item);
+                }
+                if (s.isMaster === 2) {
+                  this.driverForm.masterVehicleNub = s.vehicleNub;
+                }
               });
-              this.vehticleList = a;
-              this.vehicleIds = a;
-              console.log(' this.vehicleIds', this.vehicleIds);
-              this.vehticleInfo = vehicleInfo;
-              let driverInfo = [];
-              driver.forEach(item => {
-                self.forEach(s => {
-                  if (item.id === s.driverId) {
-                    b.push(s.driverId);
-                    driverInfo.push(item);
-                  }
-                  if (s.isMaster === 2) {
-                    this.driverForm.masterDriverName = s.driverName;
-                  }
-                });
+            });
+            this.vehticleList = a;
+            this.vehicleIds = a;
+            console.log(' this.vehicleIds', this.vehicleIds);
+            this.vehticleInfo = vehicleInfo;
+            let driverInfo = [];
+            driver.forEach(item => {
+              self.forEach(s => {
+                if (item.id === s.driverId) {
+                  b.push(s.driverId);
+                  driverInfo.push(item);
+                }
+                if (s.isMaster === 2) {
+                  this.driverForm.masterDriverName = s.driverName;
+                }
               });
-              this.deliveryDriver = b;
-              this.driverList = b;
-              this.driverInfo = driverInfo;
-            } else {
-              let deliveryTripartiteVO = data.deliveryTripartiteVO;
-              this.aaa = false;
-              this.bbb = true;
-              this.waixieForm.tripartiteSource = data.distributionCompanyId;
-              console.log('distributionCompanyId---------------->', deliveryTripartiteVO.distributionCompanyId);
-              console.log('deliveryTripartiteVO---------------->', deliveryTripartiteVO);
-              this.waixieForm.driverName = deliveryTripartiteVO.driverName;
-              this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum;
-              this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone;
-              this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee;
-              //外协配送
-            }
-            console.log('-------------->', res.data.data);
-          });
-          this.isDisable = true;
-        } else {
-          this.stockUpForm.deliveryType = '1';
-          this.stockUpForm.deliveryWay = '10';
-          // this.loadAndUnload = ['1', '2'];
-          this.stockUpForm.otherFee = 0;
-          this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
-          this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
-          this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
-        }
-        this.loading = false;
+            });
+            this.deliveryDriver = b;
+            this.driverList = b;
+            this.driverInfo = driverInfo;
+          } else {
+            let deliveryTripartiteVO = data.deliveryTripartiteVO;
+            this.aaa = false;
+            this.bbb = true;
+            this.waixieForm.tripartiteSource = data.distributionCompanyId;
+            console.log(
+              'distributionCompanyId---------------->',
+              deliveryTripartiteVO.distributionCompanyId
+            );
+            console.log('deliveryTripartiteVO---------------->', deliveryTripartiteVO);
+            this.waixieForm.driverName = deliveryTripartiteVO.driverName;
+            this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum;
+            this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone;
+            this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee;
+            //外协配送
+          }
+          console.log('-------------->', res.data.data);
+        });
+        this.isDisable = true;
+      } else {
+        this.stockUpForm.deliveryType = '1';
+        this.stockUpForm.deliveryWay = '10';
+        // this.loadAndUnload = ['1', '2'];
+        this.stockUpForm.otherFee = 0;
+        this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD');
+        this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
       }
-
-    }
-  };
+      this.loading = false;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-    .head_top {
-        width: 100%;
-        display: flex;
-        align-items: center;
-        background-color: #ffffff;
-        // border-bottom: 1px solid rgb(228, 228, 228);
-        padding-left: 10px;
+.head_top {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  background-color: #ffffff;
+  // border-bottom: 1px solid rgb(228, 228, 228);
+  padding-left: 10px;
 
-        > .buts {
-            padding: 10px 20px;
-            cursor: pointer;
-            margin-right: 10px;
-            font-size: 18px;
-            border-bottom: 4px solid #ffffff;
-            // background-color: #ffffff;
-        }
+  > .buts {
+    padding: 10px 20px;
+    cursor: pointer;
+    margin-right: 10px;
+    font-size: 18px;
+    border-bottom: 4px solid #ffffff;
+    // background-color: #ffffff;
+  }
 
-        .check {
-            color: #D3832A;
-            border-bottom: 4px solid #D3832A;
-        }
-    }
+  .check {
+    color: #d3832a;
+    border-bottom: 4px solid #d3832a;
+  }
+}
 
-    .minaxbox {
-        display: flex;
-        flex-direction: column;
+.minaxbox {
+  display: flex;
+  flex-direction: column;
 
-        .tophed {
-            display: flex;
-            flex-wrap: wrap;
+  .tophed {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+.head_top {
+  justify-content: flex-start;
+}
+:deep(.el-tag) {
+  background-color: transparent !important;
+  border-bottom: 1px solid #eeeeee;
+  width: 100%;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.has-prefix {
+  width: 100%;
+}
+:deep(.el-select__input) {
+  display: none;
+}
 
-        }
-    }
+:deep(.has-prefix) {
+  width: 100% !important;
+}
+:deep(.el-date-picker) {
+}
+:deep(.el-date-picker) {
+  width: 500px !important;
+}
+.el-date-picker {
+  width: auto !important;
+}
+.el-date-table {
+  margin-left: 16%;
+}
+.pstime {
+}
 </style>
diff --git a/src/views/distribution/zero/distributionParcelNumber.vue b/src/views/distribution/zero/distributionParcelNumber.vue
new file mode 100644
index 00000000..92ce8f03
--- /dev/null
+++ b/src/views/distribution/zero/distributionParcelNumber.vue
@@ -0,0 +1,285 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <!-- 查询按钮 -->
+          <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>
+        <!-- 列表模块 -->
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  :height="height"
+                  style="width: 100%"
+                  :border="option.border">
+          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
+          </el-table-column>
+          <template v-for="(item,index) in option.column">
+            <!-- table字段 -->
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
+            </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" @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>
+      </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="[10, 20, 30, 40, 50, 100]"
+                         :page-size="page.pageSize"
+                         layout="total, sizes, prev, pager, next, jumper"
+                         :total="page.total">
+          </el-pagination>
+        </div>
+      </el-row>
+      <!-- 表单模块 -->
+      <el-dialog :title="title"
+                 v-model="box"
+                 width="50%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <el-form-item label="总数量" prop="quantity">
+            <el-input v-model="form.quantity" placeholder="请输入总数量"/>
+          </el-form-item>
+          <el-form-item label="在库数量" prop="handQuantity">
+            <el-input v-model="form.handQuantity" placeholder="请输入在库数量"/>
+          </el-form-item>
+          <el-form-item label="配送数量" prop="deliveryQuantity">
+            <el-input v-model="form.deliveryQuantity" placeholder="请输入配送数量"/>
+          </el-form-item>
+          <el-form-item label="签收数量" prop="signinQuantity">
+            <el-input v-model="form.signinQuantity" placeholder="请输入签收数量"/>
+          </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">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionParcelNumber";
+import option from "@/option/distribution/distributionParcelNumber";
+import { mapGetters } from "vuex";
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted () {
+    this.init();
+    this.onLoad(this.page);
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    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 () {
+      if (!this.form.id) {
+        add(this.form).then(() => {
+          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 () {
+      this.title = '新增'
+      this.form = {}
+      this.box = true
+    },
+    handleEdit (row) {
+      this.title = '编辑'
+      this.box = true
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleView (row) {
+      this.title = '查看'
+      this.view = true;
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    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 = [];
+      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;
+      getList(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.loading = false;
+        this.selectionClear();
+      });
+    }
+  }
+};
+</script>
diff --git a/src/views/distribution/zero/distributionReservationZeroPackage.vue b/src/views/distribution/zero/distributionReservationZeroPackage.vue
new file mode 100644
index 00000000..d379337e
--- /dev/null
+++ b/src/views/distribution/zero/distributionReservationZeroPackage.vue
@@ -0,0 +1,294 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <!-- 查询按钮 -->
+          <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>
+        <!-- 列表模块 -->
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  :height="height"
+                  style="width: 100%"
+                  :border="option.border">
+          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
+          </el-table-column>
+          <template v-for="(item,index) in option.column">
+            <!-- table字段 -->
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
+            </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" @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>
+      </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="[10, 20, 30, 40, 50, 100]"
+                         :page-size="page.pageSize"
+                         layout="total, sizes, prev, pager, next, jumper"
+                         :total="page.total">
+          </el-pagination>
+        </div>
+      </el-row>
+      <!-- 表单模块 -->
+      <el-dialog :title="title"
+                 v-model="box"
+                 width="50%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <el-form-item label=" 10 自提" prop="typesOf">
+            <el-input v-model="form.typesOf" placeholder="请输入 10 自提"/>
+          </el-form-item>
+          <el-form-item label="订单ID" prop="stockArticleId">
+            <el-input v-model="form.stockArticleId" placeholder="请输入订单ID"/>
+          </el-form-item>
+          <el-form-item label="数量" prop="quantity">
+            <el-input v-model="form.quantity" placeholder="请输入数量"/>
+          </el-form-item>
+          <el-form-item label="预约ID" prop="reservationId">
+            <el-input v-model="form.reservationId" placeholder="请输入预约ID"/>
+          </el-form-item>
+          <el-form-item label="零担包件状态;1-正常 ； 2 -取消 ； 3-新增" prop="zeroPackageStatus">
+            <el-input v-model="form.zeroPackageStatus" placeholder="请输入零担包件状态;1-正常 ； 2 -取消 ； 3-新增"/>
+          </el-form-item>
+          <el-form-item label="品类名称" prop="categoryName">
+            <el-input v-model="form.categoryName" placeholder="请输入品类名称"/>
+          </el-form-item>
+          <el-form-item label="零担包件类型;1-商配 2-市配 3-自提" prop="type">
+            <el-input v-model="form.type" placeholder="请输入零担包件类型;1-商配 2-市配 3-自提"/>
+          </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">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionReservationZeroPackage";
+import option from "@/option/distribution/distributionReservationZeroPackage";
+import { mapGetters } from "vuex";
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted () {
+    this.init();
+    this.onLoad(this.page);
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    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 () {
+      if (!this.form.id) {
+        add(this.form).then(() => {
+          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 () {
+      this.title = '新增'
+      this.form = {}
+      this.box = true
+    },
+    handleEdit (row) {
+      this.title = '编辑'
+      this.box = true
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleView (row) {
+      this.title = '查看'
+      this.view = true;
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    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 = [];
+      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;
+      getList(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.loading = false;
+        this.selectionClear();
+      });
+    }
+  }
+};
+</script>
diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue
index e5256394..0dbede34 100644
--- a/src/views/system/topmenu.vue
+++ b/src/views/system/topmenu.vue
@@ -357,7 +357,7 @@ export default {
 };
 </script>
 
-<style>
+<style scope>
 .none-border {
   border: 0;
   background-color: transparent !important;
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 05275d61..e8a577c3 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -127,7 +127,7 @@
   </div>
 </template>
 <script lang="ts" setup></script>
-<style lang="scss">
+<style lang="scss" scope>
 @import '../../styles/flowStyle.scss';
 
 // .bx {
@@ -469,6 +469,9 @@
 // .bx{
 //   user-select: none;
 // }
+#avue-view {
+  background-color: #fff;
+}
 </style>
 <script>
 import { mapGetters } from 'vuex';