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

src/api/wms/supplierinvoiceRequestMain/index.ts

@@ -68,11 +68,11 @@ export const cloSupplierinvoiceRequestMain = async (id: number) => {
 export const subSupplierinvoiceRequestMain = async (id: number) => {
   return await request.post({ url: `/wms/supplierinvoice-request-main/sub?id=` + id })
 }
-// 供应商--审批通过供应商发货申请主
+// 采购--审批通过供应商发货申请主
 export const appSupplierinvoiceRequestMain = async (id: number) => {
   return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id })
 }
-// 供应商--驳回供应商发货申请主
+// 采购--驳回供应商发货申请主
 export const rejSupplierinvoiceRequestMain = async (id: number) => {
   return await request.post({ url: `/wms/supplierinvoice-request-main/rej?id=` + id })
 }

src/views/qms/aql/aql.data.ts

@@ -1,66 +1,66 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import {getSamplingScheme} from "@/api/qms/aql";
+import { getSamplingScheme } from "@/api/qms/aql";
-import {validateNum} from "@/utils/validator";
+import { validateNum } from "@/utils/validator";
 
 // 表单校验
 export const AqlRules = reactive({
   code: [required],
   inspectionQualification: [required],
-  sampleCharacterCode: [required],
+  sampleCharacterCode: [{ required, max: 1, message: '长度不得超过1个字符', trigger: 'blur' }],
   sampleSize: [required],
-  a0separator010: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a0separator010: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator010: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r0separator010: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator015: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a0separator015: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator015: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r0separator015: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator025: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a0separator025: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator025: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r0separator025: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator040: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a0separator040: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator040: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r0separator040: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator065: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a0separator065: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator065: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r0separator065: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a0separator10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r0separator10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a0separator15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r0separator15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a0separator25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r0separator25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a0separator40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r0separator40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a0separator65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a0separator65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r0separator65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r0separator65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a1separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a1separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r1separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r1separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a1separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a1separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r1separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r1separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a2separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a2separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r2separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r2separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a4separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a4separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r4separator0: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r4separator0: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a6separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a6separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r6separator5: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r6separator5: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r10: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r10: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r15: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r15: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r25: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r25: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r40: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r40: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r65: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r65: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a100: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a100: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r100: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r100: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a150: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a150: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r150: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r150: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a250: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a250: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r250: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r250: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a400: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a400: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r400: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r400: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a650: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a650: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r650: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r650: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  a1000: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  a1000: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
-  r1000: [{ validator:validateNum, message: '请输入整数', trigger: 'blur'}],
+  r1000: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
 })
 const samplingSchemeList = await getSamplingScheme()
 export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
@@ -543,7 +543,7 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',

src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts

@@ -36,11 +36,11 @@ export const DynamicRule = useCrudSchemas(reactive<CrudSchema[]>([
  {
    label: '操作',
    field: 'action',
-    isForm: false,
    isDetail: false,
+   isForm: false,
    table: {
-      width: 150,
+     width: 330,
      fixed: 'right'
-    }
+   },
  }
 ]))

src/views/qms/basicDataManage/selectedSet/index.vue

@@ -77,6 +77,7 @@
     :detailButtonIsShowDelete=true
     @detailOpenForm="detailOpenForm"
     @detailBasicFormOnChange="detailBasiFormOnChange"
+     :detailButtonIsShowFilter="false"
   />
 
   <!-- 导入 -->

src/views/qms/qualityNotice/components/notaicType.vue

@@ -175,7 +175,7 @@ nextTick(()=>{
   type.value = parseInt(props.data.type)
   q1.value = props.data?.q1 ? props.data?.q1 :{}
   q2.value = props.data?.q2 ? props.data?.q2 :{}
-  q3.value = props.data?.q3 ? props.data?.q3 :{},
+  q3.value = props.data?.q3 ? props.data?.q3 :{}
 })
 
 // 质量通知校验

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -254,8 +254,8 @@
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1']) }), // 打开
+      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) }), // 打开
-      defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
+      defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']) }), // 提交审批
       {
         label: '采购通过',
         name: 'purchase_mainPlanSub',
@@ -303,8 +303,8 @@
       },
       // defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
       //defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
-      defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8'])}), // 编辑
+      defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8','6'])}), // 编辑
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1','8']) }), // 关闭
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1','8','6']) }), // 关闭
       // 生成记录
       // {
       //   label: '处理',
@@ -440,7 +440,7 @@ const handleImport = () => {
     }
   }
 
-  /** 审批通过按钮操作 */
+  /** 采购审批通过按钮操作 */
   const handleApp = async (id : number) => {
     try {
       // 审批通过的二次确认