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

src/components/SearchTable/src/SearchTable.vue

@@ -93,7 +93,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   HeadButttondata.value = [
     defaultButtons.defaultFilterBtn(null), // 筛选
   ] 
-debugger
+
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField

src/views/qms/inspectionMethod/index.vue

@@ -105,9 +105,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:inspectionMethod:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:inspectionMethod:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:inspectionMethod:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:inspection-method:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:inspection-method:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:inspection-method:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -147,9 +147,9 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:inspectionMethod:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspectionMethod:enable'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspectionMethod:disable'}),
+    defaultButtons.mainListEditBtn({hasPermi: 'qms:inspection-method:update'}),
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:inspection-method:enable'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:inspection-method:disable'}),
   ]
 }
 

src/views/qms/sampleCode/index.vue

@@ -100,9 +100,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:sampleCode:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:sampleCode:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:sampleCode:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:sample-code:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:sample-code:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:sample-code:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -148,9 +148,9 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:sampleCode:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampleCode:enable'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampleCode:disable'}),
+    defaultButtons.mainListEditBtn({hasPermi: 'qms:sample-code:update'}),
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sample-code:enable'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sample-code:disable'}),
   ]
 }
 

src/views/qms/sampleCode/sampleCode.data.ts

@@ -19,7 +19,7 @@ export const SampleCodeRules = reactive({
 const samplingSchemeList = await getSamplingScheme()
 export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '采样方案编码',
+    label: '采样方案',
     field: 'code',
     sort: 'custom',
     isSearch: true,

src/views/qms/samplingProcess/index.vue

@@ -101,9 +101,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:samplingProcess:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:samplingProcess:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:samplingProcess:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:sampling-process:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:sampling-process:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:sampling-process:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -143,9 +143,9 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:samplingProcess:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:samplingProcess:enable'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:samplingProcess:disable'}),
+    defaultButtons.mainListEditBtn({hasPermi: 'qms:sampling-process:update'}),
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampling-process:enable'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampling-process:disable'}),
   ]
 }
 

src/views/qms/samplingScheme/index.vue

@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'qms:samplingScheme:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'qms:samplingScheme:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'qms:samplingScheme:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'qms:sampling-scheme:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'qms:sampling-scheme:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'qms:sampling-scheme:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -141,9 +141,9 @@ const isShowMainButton = (row,val) => {
 
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hasPermi: 'qms:samplingScheme:update'}),
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:samplingScheme:enable'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:samplingScheme:disable'}),
+    defaultButtons.mainListEditBtn({hasPermi: 'qms:sampling-scheme:update'}),
+    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'qms:sampling-scheme:enable'}),
+    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'qms:sampling-scheme:disable'}),
   ]
 }
 

src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts

@@ -139,6 +139,7 @@ export const WorkshopRules = reactive({
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   name: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   remark: [

src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts

@@ -291,6 +291,7 @@ export const WorkstationRules = reactive({
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   name: [
+    { required: true, message: '请输入名称', trigger: 'change' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   remark: [

src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts

@@ -6,6 +6,7 @@ export const MesBarCodeRules = reactive({
   available: [required],
   lowerLim: [required],
   partNumber: [required],
+  available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
 })
 
 export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
@@ -166,9 +167,19 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-  table: {
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    table: {
       width: 120
     },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '创建时间',

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

@@ -534,6 +534,9 @@ export const TransferissueRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
 })
 
 /**

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@@ -837,21 +837,21 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault: 18,
     hiddenInMain:true,
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    sortTableDefault: 12,
-  },
+  // {
+  //   label: '数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //   },
+  //   sortTableDefault: 12,
+  // },
   {
     label: '退货数量',
-    field: 'returnedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@@ -484,7 +484,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '退货数量',
-    field: 'returnedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -733,19 +733,19 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortSearchDefault: 7,
     hiddenInMain: true
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable:true,
-    sortTableDefault: 1005,
-    form: {
-      component: 'InputNumber',
-    }
-  },
+  // {
+  //   label: '数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable:true,
+  //   sortTableDefault: 1005,
+  //   form: {
+  //     component: 'InputNumber',
+  //   }
+  // },
   {
     label: '计量单位',
     field: 'uom',

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@@ -99,6 +99,7 @@ import * as PutawayJobMainApi from '@/api/wms/putawayJobMain'
 import * as PutawayJobDetailApi from '@/api/wms/putawayJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import {getAccessToken} from "@/utils/auth";
 // 上架任务主
 defineOptions({ name: 'PutawayJobMain' })
 
@@ -229,10 +230,10 @@ const getSelectionRows = (currentPage,currentPageSelectionRows) => {
 const handleSelectionPoint = async ()=>{
   let rows:any = []
   selectionRows.value.forEach(item=>{
-    rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)]
+    rows = [...rows,...item.selectionRows.map(item1=>item1.masterId)]
   })
   console.log('批量打印',rows.join(','))
-  
+  window.open(src.value+'&id='+rows.join(','))
   // window.open(srcPoint.value+'&relateNumber='+rows.join(','))
 }
 // 根据状态返回该按钮是否显示
@@ -271,11 +272,14 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-承接')
   } else if (val == 'documentPrint') {
     // 单据打印
-    handleDocumentPrint(row.masterId)
+    handleDocumentPrint(row)
   }
 }
-const handleDocumentPrint = async (id) => {
-  alert('单据打印')
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/954234424010665984?token=' + getAccessToken())
+const handleDocumentPrint = async (row) => {
+  window.open(src.value+'&id='+row.masterId)
 }
 // 子包装数据
 const detailParenPackingRef = ref()

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -564,4 +564,5 @@ export const DemandforecastingDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  poLine: [{required:true, message: '请选择订单行', trigger: 'blur'}]
 })