YT-1927:补给品发料添加来源

src/utils/dict.ts

@@ -424,6 +424,7 @@ export enum DICT_TYPE {
   DUTY = 'duty', //责任
   DUTY_DETAILS ="duty_details",//责任明细字典
   SHIFT = "shift",// 班次
+  ISSUE_SOURCE="issue_source",//发料来源
   
   
 }

src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts

@@ -129,6 +129,26 @@ export const IssueJobMain = useCrudSchemas(
       },
       sortTableDefault: 1
     },
+    {
+      label: '来源',
+      field: 'sourceType',
+      dictType: DICT_TYPE.ISSUE_SOURCE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: true,
+      isSearch: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1,
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: '到仓库代码',
       field: 'toWarehouseCode',

src/views/wms/issueManage/issue/issueRecordMain/index.vue

@@ -27,6 +27,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+    :isShowPackNumber="true"
     >
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -58,6 +59,7 @@
     :detailAllSchemas="IssueRecordDetail.allSchemas"
     :detailAllSchemasRules="IssueRecordDetailRules"
     :apiPage="IssueRecordDetailApi.getIssueRecordDetailPage"
+     :isShowPackNumber="true"
   />
 </template>
 

src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts

@@ -37,6 +37,26 @@ export const IssueRecordMain = useCrudSchemas(
       isSearch:true,
       sortTableDefault: 1
     },
+    {
+      label: '来源',
+      field: 'sourceType',
+      dictType: DICT_TYPE.ISSUE_SOURCE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: true,
+      isSearch: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1,
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: '状态',
       field: 'status',
@@ -358,15 +378,15 @@ export const IssueRecordMain = useCrudSchemas(
         }
       }
     },
-    {
+    // {
-      label: '包装号', //  子表数据 只是为了展示
+    //   label: '包装号', //  子表数据 只是为了展示
-      field: 'fromPackingNumber',
+    //   field: 'fromPackingNumber',
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 150
+    //     width: 150
-      },
+    //   },
-      sortTableDefault: 6
+    //   sortTableDefault: 6
-    },
+    // },
     {
       label: '发料数量', //  子表数据 只是为了展示
       field: 'qty',
@@ -510,8 +530,7 @@ export const IssueRecordDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      isSearch: false,
+      sortTableDefault: 8
-      hiddenInMain: true
     },
     {
       label: '到包装号',

src/views/wms/issueManage/issue/issueRequestMain/index.vue

@@ -195,7 +195,6 @@ const getDefaultPackUnit = async (packUnitList)=>{
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async() => {
-    debugger
     if (type == 'tableForm') {
       // 明细查询页赋值
       if (formField == 'itemCode') {

src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@@ -259,6 +259,26 @@ export const IssueRequestMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '来源',
+      field: 'sourceType',
+      dictType: DICT_TYPE.ISSUE_SOURCE,
+      dictClass: 'string',
+      isForm: false,
+      isTable: true,
+      isSearch: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 1,
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: '申请时间',
       field: 'requestTime',
@@ -657,6 +677,7 @@ export const IssueRequestMain = useCrudSchemas(
 export const IssueRequestMainRules = reactive({
   workshopCode: [{ required: true, message: '请选择车间代码', trigger: 'change' }],
   productionLineCode: [{ required: true, message: '请选择生产线代码', trigger: 'change' }],
+  workStationCode: [{ required: true, message: '请选择工位代码', trigger: 'change' }],
   // fromWarehouseCode: [
   //   { required: true, message: '请选择从仓库代码', trigger: 'change' }
   // ],