新增开单包件结算品类维护

src/api/distribution/CreateOrder.js

@@ -154,3 +154,25 @@ export const postFindArrPrice = params => {
     params,
   });
 };
+
+/**
+ * 查询包件列表 -- 开单
+ */
+export const postFindAdvanceDetailListByAdvanceIds = data => {
+  return request({
+    url: '/api/logpm-trunkline/openOrder/findAdvanceDetailListByAdvanceIds ',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 查询包件列表 -- 改单
+ */
+export const postFindAdvanceDetailListByWaybillId = data => {
+  return request({
+    url: '/api/logpm-trunkline/openOrder/findAdvanceDetailListByWaybillId',
+    method: 'post',
+    data,
+  });
+};

src/option/waybill/TemporaryStorageList.js

@@ -557,3 +557,134 @@ export const packageListColumnList = [
     sortable: false,
   },
 ];
+
+export const packageColumnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'orderPackageCode',
+    label: '包条码',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'firstPackName',
+    label: '一级品类',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'secondPackName',
+    label: '二级品类',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'thirdPackName',
+    label: '三级品类',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'materialName',
+    label: '物料名称',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'brand',
+    label: '品牌',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'MaintenanceOrNot',
+    label: '是否维护',
+    type: 14,
+    values: '',
+    width: '150',
+    checkarr: [
+      { label: '是', value: '是' },
+      { label: '否', value: '否' },
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'costCategory',
+    label: '成本品类',
+    type: 6,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: 'right',
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'incomeCategory',
+    label: '收入品类',
+    type: 6,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: 'right',
+    sortable: true,
+    head: false,
+  },
+];

src/styles/common.scss

@@ -178,10 +178,18 @@ a {
   margin-left: 10px;
 }
 
+.ml20 {
+  margin-left: 20px;
+}
+
 .mr10 {
   margin-right: 10px;
 }
 
+.mr20 {
+  margin-right: 20px;
+}
+
 .mt10 {
   margin-top: 10px;
 }
@@ -206,6 +214,14 @@ a {
   font-size: 0.9rem;
 }
 
+.position-r {
+  position: relative;
+}
+
+.overflow-hidden {
+  overflow: hidden;
+}
+
 .word-break-break-all {
   word-break: break-all;
 }

src/views/basicdata/carrier/basicdataCarrier2.vue

@@ -481,7 +481,7 @@ const currentChange = current => {
  * 是否开启全屏
  * @params(_type) 开启或关闭
  */
-const handleFullScrean = (_name: string, _type: 'open' | 'close') => {
+const handleFullScrean = (_name: string, _type: 'open' | 'close' = 'open') => {
   let _node: any = '';
   if (_name) _node = document.querySelector(`.${_name} .maboxhi`);
 

src/views/waybill/TemporaryStorageList.vue

@@ -26,7 +26,6 @@
           </el-form-item>
         </el-form>
       </div>
-handleFullScrean
       <div style="display: flex">
         <el-tabs
           v-model="details.orderStatus"
@@ -1135,13 +1134,16 @@ const handleCreateOrder = () => {
   }
 
   const _htMallName = details.selectionList[0].htMallName;
+  const _brand = details.selectionList[0].brand;
   console.log('_htMallName :>> ', _htMallName);
-  const _flag = details.selectionList.every(item => _htMallName === item.htMallName);
+  const _flag = details.selectionList.every(
+    item => _htMallName === item.htMallName && _brand === item.brand
+  );
 
   if (!_flag) {
     return ElMessage({
       type: 'warning',
-      message: '请选择统一商场开单',
+      message: '请选择统一商场和品牌开单',
     });
   }