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

src/components/tablecmt/tablecmt.vue

@@ -147,6 +147,8 @@
             >
               <slot :scope="scope"> </slot>
             </div>
+            
+            <el-input  v-else-if="column.type == 15"  v-model.trim="scope.row[column.prop]" style="width: 100%" :placeholder="'请输入' + column.label" :disabled="!scope.row.disabled"  clearable />
             <!-- <el-image
               preview-teleported
               v-else-if="column.type == 7"
@@ -167,7 +169,6 @@
               :src="item"
               :preview-src-list="scope.row[column.prop]?.split(',')"
             />
-            
         
           </template>
         </el-table-column>
@@ -271,6 +272,7 @@ interface TableColumnType {
    * 12.序号
    * 13.带搜索的自定义列表
    * 14.带下拉的自定义列表
+   * 15.文本输入框
    */
   type: number | string;
   /** 用于接受表头的值 */

src/option/distribution/createTask.js

@@ -165,7 +165,7 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '120',
+    width: '170',
     checkarr: [],
     fixed: 'right',
     sortable: false,
@@ -241,7 +241,7 @@ export const columnListInventory = [
   {
     prop: 'questStatusNameS',
     label: '盘点状态',
-    type: 3,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [
@@ -270,7 +270,7 @@ export const columnListInventory = [
   {
     prop: 'positionCode',
     label: '货位',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -282,7 +282,7 @@ export const columnListInventory = [
   {
     prop: 'materialName',
     label: '物料名称',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -307,7 +307,7 @@ export const columnListInventory = [
   {
     prop: 'trayCode',
     label: '托盘码',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -427,7 +427,7 @@ export const columnListInventory = [
   {
     prop: 'firsts',
     label: '一级品类',
-    type: 1,
+    type: 15,
     values: '',
     width: '150',
     checkarr: [],
@@ -439,7 +439,7 @@ export const columnListInventory = [
   {
     prop: 'second',
     label: '二级品类',
-    type: 1,
+    type: 15,
     values: '',
     width: '150',
     checkarr: [],
@@ -451,7 +451,7 @@ export const columnListInventory = [
   {
     prop: 'thirdProduct',
     label: '三级品类',
-    type: 1,
+    type: 15,
     values: '',
     width: '150',
     checkarr: [],
@@ -463,7 +463,7 @@ export const columnListInventory = [
   {
     prop: 'categoryName',
     label: '产品名称',
-    type: 1,
+    type: 15,
     values: '',
     width: '150',
     checkarr: [],
@@ -475,7 +475,7 @@ export const columnListInventory = [
   {
     prop: 'materialCode',
     label: '物料编码',
-    type: 1,
+    type: 15,
     values: '',
     width: '150',
     checkarr: [],
@@ -486,7 +486,7 @@ export const columnListInventory = [
   {
     prop: 'brandName',
     label: '品牌',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -506,3 +506,215 @@ export const columnListInventory = [
     sortable: false,
   },
 ];
+
+export const comparativecolumnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'trayCode',
+    label: '托盘码',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'trayName',
+    label: '托盘名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'brandName',
+    label: '品牌',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'mallName',
+    label: '商场名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'customerName',
+    label: '客户名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'thirdProduct',
+    label: '三级品',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'materialName',
+    label: '物料名称',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'totalNumber',
+    label: '总件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'handQuantity',
+    label: '在库件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'positionCode',
+    label: '货区-货架-货位',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'inventoryPerson',
+    label: '盘点人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'inventoryDate',
+    label: '盘点时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'questNum',
+    label: '盘点件数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+
+  {
+    prop: 'differenceNum',
+    label: '差异数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
+  {
+    prop: 'groundingPositionCode',
+    label: '新货位',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
+  {
+    prop: 'questStatusName',
+    label: '货物状态',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+];

src/option/reportforms/DeliveryDetails.js

@@ -79,6 +79,7 @@ export const columnList = [
       checkarr: [],
       fixed: false,
       sortable: true,
+      isshowSummary: true,
       head: false,
     },
     {

src/option/reportforms/Selfpickupreport.js

@@ -56,6 +56,7 @@ export const columnList = [
       checkarr: [],
       fixed: false,
       sortable: true,
+      isshowSummary: true,//开启统计
       head: false,
     },
     {

src/router/views/index.js

@@ -1731,9 +1731,28 @@ export default [
           keepAlive: true,
         },
         path: '/distribution/checkInventoryTask/createTaskTemp',
-        name: '盘点重构',
-        component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'),
+        name: '盘点旧版',
+        component: () => import('@/views/distribution/checkInventoryTask/createTasktemp.vue'),
       },
     ],
   },
+  {
+    path: '/cost/Deliverycostmanagement/WarehouseTemplateHome',
+    component: Layout,
+    redirect: '/cost/Deliverycostmanagement/WarehouseTemplateHome',
+    children: [
+      {
+        meta: {
+          i18n: 'dict',
+          keepAlive: true,
+        },
+        path: '/cost/Deliverycostmanagement/WarehouseTemplateHome',
+        name: '新增配送成本计价模板',
+        component: () => import('@/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue'),
+      },
+    ],
+  },
+
+
+  
 ];

src/views/Pricesystem/Price/PriceDelivery.vue

@@ -703,7 +703,7 @@ const form = ref({
   // 最低级计费遗留
   Minimumlegacy: [
     {
-      label: '遗留件低于最低件数收费(元)',
+      label: '遗留件低于最低价格收费(元)',
       index: 1,
       disabled: true,
       leaveBehindMinCost: 0, //价格