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

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue

@@ -185,7 +185,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     loadStart()
-    const excelTitle = ref(route.meta.title)
+    // const excelTitle = ref(route.meta.title)
+    const excelTitle = ref('非丰田补给品发货记录')
     const data = await DeliverRecordMainApi.exportDeliverRecordMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts

@@ -110,6 +110,7 @@ export const DeliverRecordMain = useCrudSchemas(
       },
       isTable: false,
       isForm: false,
+      isDetail: false,
     },
     {
       label: '承运商',
@@ -120,6 +121,7 @@ export const DeliverRecordMain = useCrudSchemas(
       },
       isTable: false,
       isForm: false,
+      isDetail: false,
     },
     {
       label: '运输方式',
@@ -131,6 +133,7 @@ export const DeliverRecordMain = useCrudSchemas(
       },
       isTable: false,
       isForm: false,
+      isDetail: false,
     },
     {
       label: '车牌号',
@@ -141,6 +144,7 @@ export const DeliverRecordMain = useCrudSchemas(
       },
       isTable: false,
       isForm: false,
+      isDetail: false,
     },
     {
       label: '申请时间',

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

@@ -27,6 +27,9 @@ import * as QadProjectApi from '@/api/wms/qadProject'
 import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
 import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
 
+import * as BusinesstypeApi from '@/api/wms/businesstype'
+
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -41,6 +44,10 @@ const requestsettingData = data?.list[0] || {}
 // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 import { TableColumn } from '@/types/table'
+
+const Scrap = await BusinesstypeApi.getBusinesstypeCode("Scrap")
+console.log(8787,Scrap)
+
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 // id 转str 否则form回显匹配不到
@@ -637,7 +644,7 @@ export const ScrapRequestMain = useCrudSchemas(
           },
           {
             key: 'type',
-            value: 'SCRAP',
+            value: Scrap.outAreaTypes,
             isMainValue: false
           }
         ],
@@ -670,7 +677,7 @@ export const ScrapRequestMain = useCrudSchemas(
             },
             {
               key: 'type',
-              value: 'SCRAP',
+              value: Scrap.outAreaTypes,
               isMainValue: false
             }
           ],

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -453,7 +453,7 @@ const buttonTableClick = async (val, row) => {
     handleReAdd(row.masterId)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
-    handleSubmit(row.masterId)
+    handleSubmit(row)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
     handleRefused(row.masterId)
@@ -588,11 +588,24 @@ const handleReAdd = async (id: number) => {
 }
 
 /** 提交按钮操作 */
-const handleSubmit = async (id: number) => {
+const handleSubmit = async (row:any) => {
+   // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('还没有创建标签！！！')
+      return
+    }
   await message.confirm(t('common.confirmSubmit'))
   tableObject.loading = true
   try{
-    await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id)
+    await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(row.masterId)
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
     buttonBaseClick('refresh',null)

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

@@ -1561,9 +1561,11 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       width: 150
     },
     tableForm: {
+      type:'Select',
       disabled: true
     },
     form: {
+      component:'Select',
       componentProps: {
         disabled: true
       }

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

@@ -86,6 +86,9 @@
     :apiDelete="IssueRequestDetailApi.deleteIssueRequestDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
   />
 
   <!-- 导入 -->
@@ -426,6 +429,14 @@ const openForm =async (type: string, row?: number) => {
         itemColumns.componentProps.isSearchList = false
         itemColumns.componentProps.disabled = true
       }
+      if(itemColumns.field == 'productionLineCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
+      if(itemColumns.field == 'workStationCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
     })
   } else {
     // 修改 tableform 属性
@@ -434,6 +445,14 @@ const openForm =async (type: string, row?: number) => {
         itemColumns.componentProps.isSearchList = true
         itemColumns.componentProps.disabled = false
       }
+      if(itemColumns.field == 'productionLineCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
+      if(itemColumns.field == 'workStationCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
     })
   }
   formRef.value.open(type, row)

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -1667,12 +1667,12 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
 
 //表单校验
 export const ProductionreturnRequestDetailLabelRules = reactive({
-  supplierItemCode: [
+  // supplierItemCode: [
-    { required: true, message: '请选择供应商', trigger: 'change' }
+  //   { required: true, message: '请选择供应商', trigger: 'change' }
-  ],
+  // ],
-  productionLineCodePackage: [
+  // productionLineCodePackage: [
-    { required: true, message: '请选择生产线', trigger: 'change' }
+  //   { required: true, message: '请选择生产线', trigger: 'change' }
-  ],
+  // ],
   batch: [
     { required: true, message: '请输入批次', trigger: ['blur', 'change'] }
   ],

src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts

@@ -314,14 +314,14 @@ export const InventorychangeRecordMainRules = reactive({
  * @returns {Array} 库存修改记录子表
  */
 export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  // {
-    label: '单据号',
+  //   label: '单据号',
-    field: 'number',
+  //   field: 'number',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-  },
+  // },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -760,9 +760,9 @@ export const InventorychangeRecordDetailRules = reactive({
   areaCode: [
     { required: true, message: '请选择库区代码', trigger: 'change' }
   ],
-  number: [
+  // number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
+  //   { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
+  // ],
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

@@ -370,20 +370,20 @@ export const InventorychangeRequestMainRules = reactive({
  * @returns {Array} 库存修改申请子表
  */
 export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  // {
-    label: '单据号',
+  //   label: '单据号',
-    field: 'number',
+  //   field: 'number',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    isTableForm: false,
+  //   isTableForm: false,
-    form: {
+  //   form: {
-      componentProps: {
+  //     componentProps: {
-        disabled: true
+  //       disabled: true
-      }
+  //     }
-    }
+  //   }
-  },
+  // },
   {
     label: '从包装号',
     field: 'fromPackingNumber',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue

@@ -74,6 +74,9 @@
     :apiDelete="InventorymoveRequestDetailApi.deleteInventorymoveRequestDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @detailOpenForm="detailOpenForm"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
   />
 
   <!-- 导入 -->
@@ -339,6 +342,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 		      locationCode: val[0][searchField]
         }).then((res) => {
           toManagementPrecision.value = res[0].ManagementPrecision
+          row.toManagementPrecision = toManagementPrecision.value
         })
         if (toManagementPrecision.value == 'BY_BATCH') {
           if(row['fromBatch']==''){
@@ -568,7 +572,24 @@ const buttonTableClick = async (val, row) => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm =async (type: string, row?: number) => {
+const openForm = async (type: string, row?: number) => {
+    if (type == 'create') {
+    InventorymoveRequestMain.allSchemas.formSchema.forEach(item=>{
+      if(item.field == 'fromWarehouseCode'){
+        item.componentProps.enterSearch = true
+        item.componentProps.isSearchList = true
+        item.componentProps.disabled = false
+      }
+    })
+  } else {
+    InventorymoveRequestMain.allSchemas.formSchema.forEach(item=>{
+      if(item.field == 'fromWarehouseCode'){
+        item.componentProps.enterSearch = false
+        item.componentProps.isSearchList = false
+        item.componentProps.disabled = true
+      }
+    })
+  }
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
 }
@@ -704,10 +725,10 @@ const submitForm = async (formType, submitData) => {
     message.warning('从库位和到库位不能相同')
     return
   }
-  let batchList = tableData.value.filter(item=>item.toBatchFormItemType&&item.toBatchFormItemType == 'FormDate')
+  let batchList = tableData.value.filter(item=>item.fromBatchFormItemType&&item.fromBatchFormItemType == 'FormDate' && item.toManagementPrecision == 'BY_BATCH')
-  let noBatch = batchList.some(item => !item.toBatch)
+  let noBatch = batchList.find(item => !item.fromBatch)
   if(noBatch){
-    message.warning('请选择到批次')
+    message.warning(`${noBatch.itemCode}没有填写批次，请填写`)
     return
   }
   data.subList = tableData.value // 拼接子表数据参数

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

@@ -1079,15 +1079,15 @@ const genRecords = async (id: number) => {
   })
   // 发起处理
   SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
-    .then((res) => {
+    .then(async (res) => {
       console.log('res',res)
       message.success(t('ts.处理成功!'))
       // 刷新列表
-      getList()
+     await getList()
       getLoading?.close()
 
       // 单据打印
-      handleDocumentPrint(res,id)
+      await handleDocumentPrint(res,id)
     })
     .catch((err) => {
       getLoading?.close()
@@ -1243,7 +1243,8 @@ const print = async () => {
 const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken())
 // 物料状态是号试显示生准订单的发货单模版
 const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
-const handleDocumentPrint = async (id,stausId) => {
+const handleDocumentPrint = async (id, stausId) => {
+  debugger
   await SupplierdeliverRequestMainApi.getItemStatus(stausId).then(async (res) => {
     if (res) {
       //号试（生准订单）模板