Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

README.md

@@ -48,7 +48,9 @@ form: {
           isMainValue: false // 表示查询条件不是主表的字段的值
         }
       ],
-        isRepeat: true,//是否可以重复添加该条数据
+      verificationPage: ItembasicApi.getItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
+      isShowTableFormSearch: true, //tableForm下方是否出现输入框
+      isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
       // 失去焦点校验参数
       verificationParams: [{
         key: 'code',

src/components/ChangeRecord/src/ChangeRecord.vue

@@ -10,7 +10,7 @@
           <template #icon>
             <slot>
               <Icon color="#9e9e9e"
-                :icon="item.type == 1 ? 'ep:document-add' : item.type == 2 ? 'ep:edit' : item.type == 3 ? 'ep:delete' : item.type == 4 ? 'fa:edit' : item.type == 5 ? 'ep:upload' : item.type == 6 ? 'ep:document-delete' : item.type == 7 ? 'ep:chat-line-square' : item.type == 8 ? 'ep:delete' : ''"
+                :icon="item.type == 1 ? 'ep:document-add' : item.type == 2 ? 'ep:edit' : item.type == 3 ? 'ep:delete' : item.type == 4 ? 'fa:edit' : item.type == 5 ? 'ep:upload' : item.type == 6 ? 'ep:document-delete' : item.type == 7 ? 'ep:chat-line-square' : item.type == 8 ? 'ep:delete' : 'ep:edit'"
                 class="cursor-pointer" size="20" />
             </slot>
           </template>
@@ -21,31 +21,11 @@
           </template>
           <template #description>
             <slot>
-              <div class="dic color-#303133" v-if="item.type == 1">
+              <div class="dic color-#303133">
-                {{ item.nickname }} {{ item.content }}
-              </div>
-              <div class="dic color-#303133" v-else-if="item.type == 2">
-                {{ item.nickname }} {{ item.content }}
-              </div>
-              <div class="dic color-#303133" v-else-if="item.type == 3">
-                {{ item.nickname }} {{ item.content }}
-              </div>
-              <div class="dic color-#303133" v-else-if="item.type == 4">
-                {{ item.nickname }} {{ item.content }}
-              </div>
-              <div class="dic color-#303133" v-else-if="item.type == 5">
-                {{ item.nickname }} {{ item.content }}
-              </div>
-              <div class="dic color-#303133" v-else-if="item.type == 6">
-                {{ item.nickname }} {{ item.content }}
-              </div>
-              <div class="dic color-#303133" v-else-if="item.type == 7">
-                {{ item.nickname }} {{ item.content }}
-              </div>
-              <div class="dic color-#303133" v-else-if="item.type == 8">
                 {{ item.nickname }} {{ item.content }}
               </div>
 
+
               <!-- <div class="tips" v-if="item.type == 2">
                 <span class="color-#f56c6c" style="text-decoration:line-through">原值</span>><span
                   class="color-#67c23a">新值</span>

src/views/qms/counter/index.vue

@@ -101,7 +101,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn({hasPermi:'qms:counter:create'}), // 新增
 //   defaultButtons.defaultImportBtn({hasPermi:'qms:counter:import'}), // 导入
-//   defaultButtons.defaultExportBtn({hasPermi:'qms:counter:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'qms:counter:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置

src/views/qms/inspectionJob/addForm.vue

@@ -1012,10 +1012,10 @@ const submitForm = async () => {
       message.error('检验工序和检验特性有字段未填写完全')
       return
     }
-    if (isOutweigh?.length > 0) {
+    // if (isOutweigh?.length > 0) {
-      message.error('检验特性中有开始时间大于结束时间')
+    //   message.error('检验特性中有开始时间大于结束时间')
-      return
+    //   return
-    }
+    // }
     if (isParseFloat) {
       message.error('合格数量和不合格数量之和不可以是小数')
       return
@@ -1141,10 +1141,10 @@ const staging = async () => {
       message.error('检验工序和检验特性有字段未填写完全')
       return
     }
-    if (isOutweigh?.length > 0) {
+    // if (isOutweigh?.length > 0) {
-      message.error('检验特性中有开始时间大于结束时间')
+    //   message.error('检验特性中有开始时间大于结束时间')
-      return
+    //   return
-    }
+    // }
     if (isParseFloat) {
       message.error('合格数量和不合格数量之和不可以是小数')
       return

src/views/qms/inspectionJob/inspectionJobMain.data.ts

@@ -280,7 +280,7 @@ export const InspectionJobMain = useCrudSchemas(
       isDetail: false,
       isSearch: true,
       isTableForm: false,
-      isForm: false,
+      isForm: false
     },
     // {
     //   label: '检验批来源',
@@ -485,6 +485,35 @@ export const InspectionJobMain = useCrudSchemas(
       }
     },
 
+    {
+      label: '收货时间',
+      field: 'deliveryTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          valueFormat: 'x'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
+      }
+    },
+
     {
       label: '完成人',
       field: 'completeUserName',

src/views/qms/inspectionRecord/inspectionRecordMain.data.ts

@@ -364,6 +364,34 @@ export const InspectionRecordMain = useCrudSchemas(
         width: 175
       }
     },
+    {
+      label: '收货时间',
+      field: 'deliveryTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          valueFormat: 'x'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
+      }
+    },
     {
       label: '检验水平',
       field: 'inspectionLevel',

src/views/qms/inspectionRequest/inspectionRequestMain.data.ts

@@ -169,6 +169,34 @@ export const InspectionMain = useCrudSchemas(
         width: 175
       }
     },
+    {
+      label: '收货时间',
+      field: 'deliveryTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isSearch: false,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        }
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          valueFormat: 'x'
+        }
+      },
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      table: {
+        width: 175
+      }
+    },
     {
       label: '完成时间',
       field: 'finishTime',
@@ -388,79 +416,79 @@ export const InspectionMain = useCrudSchemas(
       }
     },
     {
-      label: '创建时间',
+      label: '创建时间',
-      field: 'createTime',
+      field: 'createTime',
-      isForm: false,
+      isForm: false,
-      table: {
+      table: {
-        width: 180
+        width: 180
-      },
+      },
-      formatter: dateFormatter,
+      formatter: dateFormatter,
-      detail: {
+      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
+      },
-      form: {
+      form: {
-        component: 'DatePicker',
+        component: 'DatePicker',
-        componentProps: {
+        componentProps: {
-          style: { width: '100%' },
+          style: { width: '100%' },
-          type: 'datetime',
+          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
+          valueFormat: 'x'
-        }
+        }
-      }
+      }
-    },
+    },
-    {
+    {
-      label: '创建者',
+      label: '创建者',
-      field: 'creator',
+      field: 'creator',
-      table: {
+      table: {
-        width: 130
+        width: 130
-      },
+      },
-      isForm: false,
+      isForm: false,
-      isTable: true
+      isTable: true
-    },
+    },
-    {
+    {
-      label: '最后更新时间',
+      label: '最后更新时间',
-      field: 'updateTime',
+      field: 'updateTime',
-      sort: 'custom',
+      sort: 'custom',
-      isDetail: true,
+      isDetail: true,
-      isForm: false,
+      isForm: false,
-      isTable: false,
+      isTable: false,
-      formatter: dateFormatter,
+      formatter: dateFormatter,
-      detail: {
+      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
+      },
-      table: {
+      table: {
-        width: 180
+        width: 180
-      },
+      },
-      form: {
+      form: {
-        component: 'DatePicker',
+        component: 'DatePicker',
-        componentProps: {
+        componentProps: {
-          style: { width: '100%' },
+          style: { width: '100%' },
-          type: 'datetime',
+          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
+          valueFormat: 'x'
-        }
+        }
-      }
+      }
-    },
+    },
-    {
+    {
-      label: '最后更新者',
+      label: '最后更新者',
-      field: 'updater',
+      field: 'updater',
-      isDetail: true,
+      isDetail: true,
-      isForm: false,
+      isForm: false,
-      isTable: false,
+      isTable: false,
-      table: {
+      table: {
-        width: 150
+        width: 150
-      }
+      }
-    },
+    },
-    {
+    {
-      label: '操作',
+      label: '操作',
-      field: 'action',
+      field: 'action',
-      isForm: false,
+      isForm: false,
-      isDetail: false,
+      isDetail: false,
-      table: {
+      table: {
-        width: 300,
+        width: 300,
-        fixed: 'right'
+        fixed: 'right'
-      }
+      }
-    }
+    }
   ])
 )
 

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -38,7 +38,7 @@ export const CallmaterialsRules = reactive({
   workStationCode: [required],
   uom: [required],
   callmaterialQty: [required],
-  project: [{ max: 50, message: '最多50字符', trigger: 'blur'}]
+  project: [{ max: 64, message: '最多50字符', trigger: 'blur'}]
 })
 
 export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
@@ -361,7 +361,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     } ,
     form: {
       componentProps:{
-        maxlength: 64,
+        maxlength: 50,
         type:'textarea',
         showWordLimit:true
       }

src/views/wms/basicDataManage/subject/mstr/mstr.data.ts

@@ -52,6 +52,26 @@ export const Mstr = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
+  {
+    label: '物料差异账户成本中心',
+    field: 'plMvarCc',
+    sort: 'custom',
+  },
+  {
+    label: '废品账户成本中心',
+    field: 'plScrpCc',
+    sort: 'custom',
+  },
+  {
+    label: '成本重估账户成本中心',
+    field: 'plCchgCc',
+    sort: 'custom',
+  },
+  {
+    label: '盘点差异账户成本中心',
+    field: 'plDscrCc',
+    sort: 'custom',
+  },
   {
     label: '创建时间',
     field: 'createTime',

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -314,7 +314,7 @@ export const DeliverRequestMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: false
+      isTable: true
     },
     {
       label: '申请时间',
@@ -350,7 +350,7 @@ export const DeliverRequestMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: false,
+      isTable: true,
       form: {
         component: 'DatePicker',
         componentProps: {
@@ -567,7 +567,7 @@ export const DeliverRequestMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: false
+      isTable: true
     },
     {
       label: '创建时间',

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@@ -114,6 +114,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择仓库代码',
       searchField: 'code',
@@ -124,11 +125,20 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }]
+      }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -139,7 +149,15 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },

src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts

@@ -82,6 +82,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择承运商代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -92,7 +93,15 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -165,6 +174,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择仓库代码',
       searchField: 'code',
@@ -175,11 +185,20 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }]
+      }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -190,7 +209,15 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -202,16 +229,26 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择仓库代码',
       searchField: 'code',
       searchTitle: '仓库信息',
       searchAllSchemas: Warehouse.allSchemas,
-      searchPage: WarehouseApi.getWarehousePage
+      searchPage: WarehouseApi.getWarehousePage,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -222,7 +259,15 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -279,6 +324,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择从月台代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -289,7 +335,15 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -632,11 +686,20 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         value: 'fromWarehouseCode',
         message: '请填写从仓库代码！',
         isMainValue: true,
-      }]
+      }],
+      verificationParams: [{
+        key: 'packingNumber',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择包装号',
         searchField: 'packingNumber',
@@ -648,7 +711,15 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
           value: 'fromWarehouseCode',
           message: '请填写从仓库代码！',
           isMainValue: true,
-        }]
+        }],
+        verificationParams: [{
+          key: 'packingNumber',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -732,6 +803,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择库位代码',
       searchField: 'code',
@@ -747,11 +819,20 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         value: 'toWarehouseCode',
         message: '请填写到仓库代码！',
         isMainValue: true,
-      }]
+        }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -767,7 +848,15 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
           value: 'toWarehouseCode',
           message: '请填写到仓库代码！',
           isMainValue: true,
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts

@@ -133,16 +133,26 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择成本中心代码',
       searchField: 'costcentreCode',
       searchTitle: '成本中心代码',
       searchAllSchemas: QadCostcentre.allSchemas,
-      searchPage: QadCostcentreApi.getQadCostcentrePage
+      searchPage: QadCostcentreApi.getQadCostcentrePage,
+      verificationParams: [{
+        key: 'costcentreCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
         searchField: 'costcentreCode', // 查询弹窗赋值字段
@@ -153,7 +163,15 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'costcentreCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -178,6 +196,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择成领用原因代码',
       searchField: 'code',
@@ -193,11 +212,20 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         value: 'costCenterType',
         message: '成本中心类型不能为空!',
         isMainValue: true
-      }]
+        }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -213,7 +241,15 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'costCenterType',
           message: '成本中心类型不能为空!',
           isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -225,16 +261,26 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择QAD项目信息',
       searchField: 'projectCode',
       searchTitle: '领用原因代码',
       searchAllSchemas: QadProject.allSchemas,
-      searchPage: QadProjectApi.getQadProjectPage
+      searchPage: QadProjectApi.getQadProjectPage,
+      verificationParams: [{
+        key: 'projectCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
         searchField: 'projectCode', // 查询弹窗赋值字段
@@ -245,7 +291,15 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'projectCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -133,16 +133,26 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择成本中心代码',
       searchField: 'costcentreCode',
       searchTitle: '成本中心代码',
       searchAllSchemas: QadCostcentre.allSchemas,
-      searchPage: QadCostcentreApi.getQadCostcentrePage
+      searchPage: QadCostcentreApi.getQadCostcentrePage,
+      verificationParams: [{
+        key: 'costcentreCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
         searchField: 'costcentreCode', // 查询弹窗赋值字段
@@ -153,7 +163,15 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'costcentreCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -178,6 +196,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择成领用原因代码',
       searchField: 'code',
@@ -193,11 +212,20 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
         value: 'costCenterType',
         message: '成本中心类型不能为空!',
         isMainValue: true
-      }]
+        }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -213,7 +241,15 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
           value: 'costCenterType',
           message: '成本中心类型不能为空!',
           isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -225,16 +261,26 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择QAD项目信息',
-      searchField: 'projectCode',
+      searchField: ' ',
       searchTitle: '领用原因代码',
       searchAllSchemas: QadProject.allSchemas,
-      searchPage: QadProjectApi.getQadProjectPage
+      searchPage: QadProjectApi.getQadProjectPage,
+      verificationParams: [{
+        key: 'projectCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
         searchField: 'projectCode', // 查询弹窗赋值字段
@@ -245,7 +291,15 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'projectCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -265,16 +319,26 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择仓库代码',
       searchField: 'code',
       searchTitle: '仓库信息',
       searchAllSchemas: Warehouse.allSchemas,
-      searchPage: WarehouseApi.getWarehousePage
+      searchPage: WarehouseApi.getWarehousePage,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -285,7 +349,15 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -618,7 +690,6 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     tableForm:{
       multiple:true,//多选
       isInpuFocusShow: true, // 开启查询弹窗
-      isShowTableFormSearch: true,
       searchListPlaceholder: '请选择物料代码',// 输入框占位文本
       searchField: 'code',// 查询弹窗赋值字段
       searchTitle: '物料基础信息',
@@ -636,7 +707,17 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         action: '==',
         isSearch: true,
         isMainValue: false
-      }]
+        }],
+      verificationPage: ItembasicApi.getItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
+      isShowTableFormSearch: true, //tableForm下方是否出现输入框
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       componentProps: {
@@ -658,7 +739,15 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
           action: '==',
           isSearch: true,
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -829,6 +918,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择库位代码',
       searchField: 'code',
@@ -853,11 +943,20 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         key: 'isIn',
         value: 'in',
         isMainValue: false
-      }]
+        }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -882,7 +981,15 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
           key: 'isIn',
           value: 'in',
           isMainValue: false
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue

@@ -113,6 +113,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'itemCode') {
+        if(tableData.value.find(item1=>item1['itemCode'] == val[0]['componentItemCode'])){
+          message.warning(`物料${val[0]['componentItemCode']}已经存在`)
+          return
+        } 
         row['itemCode'] = val[0]['componentItemCode']
         row['uom'] = val[0]['componentUom']
       } else if(formField == 'workStation'){

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -188,6 +188,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if(formField == 'itemCode') {
+        if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){
+          message.warning(`物料${val[0]['itemCode']}已经存在`)
+          return
+        } 
+
         const isType = await isItemType(val[0]['itemCode'], labelType.value)
         if(!isType){
           message.warning('当前物料可制造与其他数据不一致，请重新选择！')

src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts

@@ -46,15 +46,15 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  {
+  // {
-    label: '供应商代码',
+  //   label: '供应商代码',
-    field: 'supplierCode',
+  //   field: 'supplierCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: false,
+  //   isTable: false,
-  },
+  // },
   {
     label: '出库事务类型',
     field: 'outTransactionType',
@@ -460,6 +460,19 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:8,
   },
+  {
+    label: '补料数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    // hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:8,
+  },
   {
     label: '计量单位',
     field: 'uom',
@@ -696,18 +709,6 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     hiddenInMain:true,
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'InputNumber',
-    }
-  },
   // {
   //   label: '代码',
   //   field: 'code',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -73,22 +73,40 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择从仓库代码',
       searchField: 'code',
       searchTitle: '仓库基础信息',
       searchAllSchemas: Warehouse.allSchemas,
       searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true,
         searchListPlaceholder: '请选择从仓库代码',
         searchField: 'code',
         searchTitle: '仓库基础信息',
         searchAllSchemas: Warehouse.allSchemas,
         searchPage: WarehouseApi.pageBusinessTypeToWarehouse,
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -674,6 +692,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
+      enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择到库位代码',
       searchField: 'code',
@@ -689,11 +708,20 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         key: 'isIn',
         value: 'in',
         isMainValue: false
-      }]
+        }],
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择到库位代码',
         searchField: 'code',
@@ -709,7 +737,15 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
             key: 'isIn',
             value: 'in',
             isMainValue: false
-          }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },

src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

@@ -846,7 +846,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '合格数量',
+    label: '完工数量',
     field: 'goodQty',
     sort: 'custom',
     table: {
@@ -868,29 +868,29 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
-  {
+  // {
-    label: '不合格数量',
+  //   label: '不合格数量',
-    field: 'notGoodQty',
+  //   field: 'notGoodQty',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    hiddenInMain: true,
+  //   hiddenInMain: true,
-    form: {
+  //   form: {
-      component: 'InputNumber',
+  //     component: 'InputNumber',
-      componentProps: {
+  //     componentProps: {
-        min: 1,
+  //       min: 1,
-        precision: 6
+  //       precision: 6
-      }
+  //     }
-    },
+  //   },
-    tableForm: {
+  //   tableForm: {
-      type: 'InputNumber',
+  //     type: 'InputNumber',
-      min: 1,
+  //     min: 1,
-      precision: 6
+  //     precision: 6
-    },
+  //   },
-    isTableForm: false,
+  //   isTableForm: false,
-    isForm: false
+  //   isForm: false
-  },
+  // },
   {
     label: '创建者',
     field: 'creator',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue

@@ -3,7 +3,7 @@
             <ContentWrap >
             <Annex
             :annexData="reportAnnex"
-            :showDownload = "false"
+            :showDownload = "true"
             :showPreview="true"
             :hiddenDelete = "true"
             :upData="{
@@ -21,7 +21,11 @@
                 :columns="subDetailTableData.tableColumns"
                 :data="subDetailTableData.tableList"
                 :loading="false"
-            />
+            >
+            <template #uomName="scope">
+                <el-tag>{{scope.row.uomName}}</el-tag>
+            </template>
+            </Table>
         </ContentWrap>
            </div>
      
@@ -30,7 +34,7 @@
 import { DictTag } from '@/components/DictTag'
 import { TableColumn } from '@/types/table'
 
-// 查看质检报告
+// 查看质检报告 purchasereceiptReport
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import {queryQualityInspection} from '@/api/wms/supplierdeliverInspectionDetail'
 import Annex from '@/components/Annex/src/Annex.vue'
@@ -101,15 +105,7 @@ const getAnnexList = async () => {
     {
         "width": 150,
         "label": "计量单位",
-        "field": "uom",
+        "field": "uomName",
-        "dictType": "uom",
-        "dictClass": "string",
-        formatter : (_: Recordable, __: TableColumn, cellValue: any) => {
-            return h(DictTag, {
-              type: "uom", // ! 表示一定不为空
-              value: cellValue
-            })
-        },
         "isTable": true,
         "isForm": false,
         "sort": "custom",

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -1015,7 +1015,7 @@ const { getList: getDetailList } = detatableMethods
 // 生成标签按钮操作
 const submitFormLabel = async (list) => {
   try {
-    let data = {
+    const data = {
       subList: list
     }
     await message.confirm(t('ts.是否为此数据生成标签？'))

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue

@@ -139,7 +139,9 @@
                     <el-button
                       type="warning"
                       link
-                      @click="removeX(scope.row, scope.$index, item, index,scope1.row, scope1.$index )"
+                      @click="
+                        removeX(scope.row, scope.$index, item, index, scope1.row, scope1.$index)
+                      "
                       >移出</el-button
                     >
                   </template>
@@ -177,7 +179,7 @@
 </template>
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import * as accuracyFun from "@/utils/calculate"
+import * as accuracyFun from '@/utils/calculate'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -220,7 +222,6 @@ const intData = async () => {
   })
 }
 const expandChange = (row: any, expandedRows: any[]) => {
- 
   // 判断托信息和箱信息是否都存在
   if (row.secondPackUnit && row.secondPackQty && row.packUnit && row.packQty) {
     // 总共需要多少箱
@@ -269,7 +270,10 @@ const expandChange = (row: any, expandedRows: any[]) => {
       } else {
         // 如果沒有余数,直接展示一托的全部箱数和全部数量
         row.packageList[i].xNumber = row.otherNumber
-        row.packageList[i].qtyOne = accuracyFun.multiply( parseFloat(row.otherNumber),parseFloat(row.packQty))
+        row.packageList[i].qtyOne = accuracyFun.multiply(
+          parseFloat(row.otherNumber),
+          parseFloat(row.packQty)
+        )
       }
     }
     // 判断箱信息是否存在
@@ -282,7 +286,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
         for (let j = 0; j < cur.xNumber; j++) {
           twoId.value++
           cur.children[j] = {
-            id: twoId.value,
+            id: twoId.value
             // xPoNumber: j + 1
           }
           // 如果有余数
@@ -325,7 +329,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
       for (let j = 0; j < row.allXiangQty; j++) {
         twoId.value++
         cur.children[j] = {
-          id: twoId.value,
+          id: twoId.value
           // xPoNumber: j + 1
         }
         // 数量除以箱数量获取余数
@@ -392,9 +396,14 @@ const submitForm = () => {
     let obj = tableData.value.find((item) => {
       item.allNumber = 0
       item.packageList.forEach((cur) => {
-        item.allNumber = accuracyFun.add(item.allNumber , parseFloat(cur.qtyOne)?parseFloat(cur.qtyOne):0)
+        item.allNumber = accuracyFun.add(
+          item.allNumber,
+          parseFloat(cur.qtyOne) ? parseFloat(cur.qtyOne) : 0
+        )
         // item.allNumber += parseFloat(cur.qtyOne) || 0
       })
+      console.log(111, item.allNumber)
+      console.log(222, parseFloat(item.qty))
       return item.allNumber != parseFloat(item.qty)
     })
     console.log(222, obj)
@@ -427,7 +436,7 @@ const addT = (oneRow) => {
 }
 // 移出托
 const removeT = (oneRow, oneIndex, twoRow, twoIndex) => {
-   oneRow.packageList= oneRow.packageList.filter(item=>item.id!=twoRow.id)
+  oneRow.packageList = oneRow.packageList.filter((item) => item.id != twoRow.id)
   oneRow.allTuoQty = oneRow.packageList.length
 }
 // 添加箱
@@ -455,10 +464,14 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => {
     oneRow.isTuo = 1 //无托
     twoRow.children.push({
       id: twoId.value,
-      // xPoNumber:
-      //   twoRow.children.length > 0 ? twoRow.children[twoRow.children.length - 1].xPoNumber + 1 : 1,
       qtyTwo: oneRow.packQty
     })
+    //无托的时候默认显示一条托用来记录托数量
+    let num = 0
+    twoRow.children.forEach((item) => {
+      num = accuracyFun.add(parseFloat(num), parseFloat(item.qtyTwo))
+    })
+    twoRow.qtyOne = num
   }
 }
 // 移除箱
@@ -466,7 +479,7 @@ const removeX = (oneRow, oneIndex, twoRow, twoIndex, threeRow, threeIndex, type)
   //  有父级托的时候
   if (type == 1) {
     // 在托下移除箱
-     twoRow.children= twoRow.children.filter(item=>item.id!=threeRow.id)
+    twoRow.children = twoRow.children.filter((item) => item.id != threeRow.id)
     let num = 0
     twoRow.children.forEach((item) => {
       num = accuracyFun.add(parseFloat(num), parseFloat(item.qtyTwo) || 0)
@@ -474,7 +487,13 @@ const removeX = (oneRow, oneIndex, twoRow, twoIndex, threeRow, threeIndex, type)
     twoRow.qtyOne = num
     twoRow.xNumber = twoRow.children.length
   } else {
-     twoRow.children= twoRow.children.filter(item=>item.id!=threeRow.id)
+    twoRow.children = twoRow.children.filter((item) => item.id != threeRow.id)
+    //无托的时候默认显示一条托用来记录托数量
+    let num = 0
+    twoRow.children.forEach((item) => {
+      num = accuracyFun.add(parseFloat(num), parseFloat(item.qtyTwo) || 0)
+    })
+    twoRow.qtyOne = num
   }
 }
 // 是否显示展开图标
@@ -494,8 +513,8 @@ const blurOne = (oneRow, twoRow) => {
   //   twoRow.children = []
   //   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
   // }
-  twoRow.qtyOne = parseFloat(twoRow.xNumber) ?
+  twoRow.qtyOne = parseFloat(twoRow.xNumber)
-    accuracyFun.multiply( parseFloat(twoRow.xNumber),parseFloat(oneRow.packQty))
+    ? accuracyFun.multiply(parseFloat(twoRow.xNumber), parseFloat(oneRow.packQty))
     : ''
   // let num = 0
   // oneRow.packageList.forEach((item) => {