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

src/api/wms/packageoverJobMain/index.ts

@@ -74,8 +74,3 @@ export const deletePackageoverJobMain = async (id: number) => {
 export const exportPackageoverJobMain = async (params) => {
   return await request.download({ url: `/wms/packageover-job-main/export-excel`, params })
 }
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/wms/packageover-job-main/get-import-template' })
-}

src/api/wms/supplierdeliverRequestMain/index.ts

@@ -31,6 +31,7 @@ export interface SupplierdeliverRequestMainVO {
   autoAgree: string
   autoExecute: string
   directCreateRecord: string
+  labelStatus: string
 }
 
 // 查询供应商发货申请主列表

src/components/BasicForm/src/BasicForm.vue

@@ -245,6 +245,12 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: true
+  },
+  // 明细数据长度校验
+  tableFormDataLength: {
+    type: Boolean,
+    required: false,
+    default: true
   }
 })
 
@@ -432,7 +438,7 @@ const submitForm = async () => {
     formLoading.value = true
     if (formType.value == 'create') {
       const validateForm = await tableFormRef.value.validateForm()
-      if (!validateForm) {
+      if (!validateForm && props.tableFormDataLength) {
         if (props.tableData.length == 0) {
           message.warning('请填写明细信息！')
           formLoading.value = false

src/views/wms/basicDataManage/factoryModeling/workstation/index.vue

@@ -210,10 +210,10 @@ const formsSuccess = async (formType,data) => {
 Workstation.allSchemas.tableFormColumns.map(item => {
   if(item.field == 'rawLocationCode') {
       item.form.componentProps.searchCondition = [
-      // {
-      //   key: 'areaType',
-      //   value: 'RAW',
-      // },
+      {
+        key: 'areaType',
+        value: 'RAW',
+      },
       {
           key: 'available',
           value: 'TRUE',
@@ -222,10 +222,10 @@ Workstation.allSchemas.tableFormColumns.map(item => {
     }
     if(item.field == 'fgLocationCode') {
       item.form.componentProps.searchCondition = [
-      // {
-      //   key: 'areaType',
-      //   value: 'FG',
-      // },
+      {
+        key: 'areaType',
+        value: 'FG',
+      },
       {
           key: 'available',
           value: 'TRUE',

src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@@ -57,6 +57,7 @@
     @submitForm="submitForm"
     :isShowButton = isShowButton
     :basicFormWidth="75"
+    :tableFormDataLength="false"
   />
 
   <!-- 详情 -->
@@ -130,6 +131,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         setV['inPackUnit'] = val[0]['code']
       }else  if(formField == 'outPackUnit') {
         setV['outPackUnit'] = val[0]['code']
+      }else  if(formField == 'itemCode') {
+        setV['itemCode'] = val[0]['code']
       }else{ 
         setV[formField] = setV[0][searchField]
       }
@@ -171,6 +174,23 @@ const HeadButttondata = [
   // },
 ]
 
+// /**
+//  * 监听改变事件
+//  * @param field 当前操作字段
+//  * @param cur 改变后值
+//  */
+//  const onChangeArea = (field, cur) => {
+//   console.log(field,cur);
+//   if(field == "maxQty" && cur == "0"){
+//     Itemarea.allSchemas.formSchema.forEach((item) => {
+//       if (item.field == 'allowIssueRequest') {
+//               cur.value = "FALSE"
+//               item.componentProps.disabled = true
+//             }})
+//   }
+// }
+
+
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
@@ -285,7 +305,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ItemareaApi.exportItemarea(tableObject.params)
-    download.excel(data, '发货申请主.xlsx')
+    download.excel(data, '物料库区配置管理主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue

@@ -62,6 +62,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
 import { CustomerreturnRecordMain,CustomerreturnRecordMainRules,CustomerreturnRecordDetail,CustomerreturnRecordDetailRules } from './customerreturnRecordMain.data'
 import * as CustomerreturnRecordMainApi from '@/api/wms/customerreturnRecordMain'
 import * as CustomerreturnRecordDetailApi from '@/api/wms/customerreturnRecordDetail'
@@ -125,12 +126,15 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
-  return []
-}
+const butttondata = (row) => [
+  defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
+]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'documentPrint') { // 标签打印
+    handlePoint(row)
+  }
 }
 
 /** 详情操作 */
@@ -164,6 +168,13 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/929216638195793920?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&id='+row.id)
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()

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

@@ -62,6 +62,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
 import { DeliverRecordMain,DeliverRecordMainRules,DeliverRecordDetail,DeliverRecordDetailRules } from './deliverRecordMain.data'
 import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
 import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
@@ -125,12 +126,15 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
-  return []
-}
+const butttondata = (row) => [
+  defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
+]
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'documentPrint') { // 标签打印
+    handlePoint(row)
+  }
 }
 
 /** 详情操作 */
@@ -155,6 +159,13 @@ const handleExport = async () => {
   }
 }
 
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/929209659733770240?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&id='+row.id)
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue

@@ -62,8 +62,6 @@
     :apiPage="PackageoverJobDetailApi.getPackageoverJobDetailPage"
   />
 
-  <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/packageover-job-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -73,7 +71,6 @@ import * as PackageoverJobMainApi from '@/api/wms/packageoverJobMain'
 import * as PackageoverJobDetailApi from '@/api/wms/packageoverJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 
 defineOptions({ name: 'PackageoverJobMain' })
@@ -109,8 +106,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:packageover-job-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-job-main:import'}), // 导入
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:packageover-job-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-job-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-job-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -226,15 +223,6 @@ const importFormRef = ref()
 const handleImport = () => {
   importFormRef.value.open()
 }
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '翻包任务主导入模版.xlsx'
-})
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
 
 // 筛选提交
 const searchFormClick = (searchData) => {
@@ -248,7 +236,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await PackageoverJobMainApi.importTemplate()
 })
 
 </script>

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts

@@ -603,22 +603,22 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '从包装号',
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到包装号',
-    field: 'toPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '从包装号',
+  //   field: 'fromPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到包装号',
+  //   field: 'toPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '从包装规格',
     field: 'fromPackUnit',

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue

@@ -92,7 +92,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-main:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-record-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -139,7 +139,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PackageoverRecordMainApi.exportPackageoverMainApi(tableObject.params)
+    const data = await PackageoverRecordMainApi.exportPackageoverMain(tableObject.params)
     download.excel(data, '翻包记录.xlsx')
   } catch {
   } finally {

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts

@@ -11,6 +11,15 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
+  {
+    label: '任务单据号',
+    field: 'jobNumber',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180
+    },
+  },
   {
     label: '仓库代码',
     field: 'warehouseCode',
@@ -129,12 +138,6 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isTable:false
   },
-  {
-    label: '用户组',
-    field: 'userGroupCode',
-    sort: 'custom',
-    isTable:false
-  },
   {
     label: '接口类型',
     field: 'interfaceType',
@@ -154,7 +157,6 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
-    isSearch: true,
     sort: 'custom',
     table: {
       width: 150
@@ -214,173 +216,182 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '库位代码',
-    field: 'locationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库位组代码',
-    field: 'locationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库区代码',
-    field: 'areaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '从包装号',
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '到包装号',
-    field: 'toPackingNumber',
+    label: '物料代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从数量',
-    field: 'fromQty',
+    label: '物料名称',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到数量',
-    field: 'toQty',
+    label: '物料描述1',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从批次',
-    field: 'fromBatch',
+    label: '物料描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到批次',
-    field: 'toBatch',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库存状态',
-    field: 'fromInventoryStatus',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到库存状态',
-    field: 'toInventoryStatus',
+    label: '从数量',
+    field: 'fromQty',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从器具号',
-    field: 'fromContainerNumber',
+    label: '到数量',
+    field: 'toQty',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到器具号',
-    field: 'toContainerNumber',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '到包装号',
+    field: 'toPackingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '库位代码',
+    field: 'locationCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '库位组代码',
+    field: 'locationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料名称',
-    field: 'itemName',
+    label: '库区代码',
+    field: 'areaCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料描述1',
-    field: 'itemDesc1',
+    label: '从批次',
+    field: 'fromBatch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '物料描述2',
-    field: 'itemDesc2',
+    label: '到批次',
+    field: 'toBatch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '从库存状态',
+    field: 'fromInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '计量单位',
-    field: 'uom',
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '从货主代码',
+  //   field: 'fromOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到货主代码',
+  //   field: 'toOwnerCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '备注',
     field: 'remark',
@@ -389,27 +400,27 @@ export const PackageoverDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false
-  },
+  // {
+  //   label: '创建时间',
+  //   field: 'createTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false
+  // },
 ]))
 
 // 表单校验

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

@@ -264,6 +264,20 @@ const isShowMainButton = (row, val) => {
   }
 }
 
+
+// 根据状态返回该按钮是否显示
+const isShowMainButtonLabel = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.labelStatus == '2'){
+      return true
+    }else{
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
@@ -280,7 +294,7 @@ const butttondata = (row) => {
     {
       label: '生成标签',
       name: 'ssbq',
-      hide: isShowMainButton(row, ['3']),
+      hide: isShowMainButtonLabel(row, ['3']),
       type: 'primary',
       icon: '',
       color: '',