Merge remote-tracking branch 'origin/hella_online_20240803' into hella_online_20240803

src/utils/dict.ts

@@ -401,4 +401,5 @@ export enum DICT_TYPE {
  PUBLISHE_STATUS = 'publishe_status', // 采购收货任务状态
   PUBLISHE_STATUS_FIRST_INSPECTION = 'publishe_status_first_inspection', // 首件检验记录发布状态
   RETURN_REASON_TYPE = 'return_reason_type',  // 采购退货原因类型
+  SCRAPPING_REASON = 'scrapping_reason',  //制品子件报废原因
 }

src/views/qms/inspectionRequest/index.vue

@@ -5,9 +5,7 @@
       <Search
         :schema="InspectionMain.allSchemas.searchSchema"
         @search="setSearchParams"
-        @reset="setSearchParams({
+        @reset="setSearchParams"
-          available: true
-        })"
       />
     </ContentWrap>
 
@@ -510,7 +508,7 @@ const ListTableSubmit = async (formType, data) => {
 /** 初始化 **/
 onMounted(async () => {
   tableObject.params = {
-    available: true
+    available: 'TRUE'
   }
   getList()
   importTemplateData.templateUrl = await InspectionMainApi.importTemplate()

src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@@ -116,6 +116,18 @@ export const ProductscrapRecordMain = useCrudSchemas(
         width: 150
       }
     },
+    {
+      label: '报废原因',
+      field: 'scrappingReason',
+      dictType: DICT_TYPE.SCRAPPING_REASON,
+      dictClass: 'string',
+      isForm: true,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '任务单号',
       field: 'jobNumber',

src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@@ -310,6 +310,18 @@ export const ProductscrapRequestMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '报废原因',
+      field: 'scrappingReason',
+      dictType: DICT_TYPE.SCRAPPING_REASON,
+      dictClass: 'string',
+      isForm: true,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '从仓库代码',
       field: 'fromWarehouseCode',
@@ -644,6 +656,9 @@ export const ProductscrapRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  scrappingReason: [
+    { required: true, message: '请输入报废原因', trigger: 'blur' }
+  ],
 })
 
 /**