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

src/api/qms/sampleCode/index.ts

@@ -55,3 +55,7 @@ export const exportSampleCode = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/qms/sample-code/get-import-template' })
 }
+
+export const getSamplingScheme = async () => {
+  return await request.get({ url: `/qms/sampling-scheme/get-available-list`})
+}

src/components/BasicForm/src/BasicForm.vue

@@ -637,6 +637,9 @@ const handleAddTable = () => {
 }
 // 输入框聚焦
 const inpuFocus = (headerItem, row, index) => {
+  
+  emit('inpuFocus', headerItem, row, index)
+
   opensearchTable(
     headerItem.field,
     headerItem.tableForm.searchField,

src/utils/disposition/defaultButtons.ts

@@ -471,6 +471,19 @@ export function mainListPlanCloBtn(option:any) {
   })
 }
 
+// 主列表-上传质量报告
+export function mainListPlanUploadQualityReportBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '上传质量报告',
+    name: 'mainPlanUploadQualityReport',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+
 // 主列表-计划流程-提交审批按钮
 export function mainListPlanSubBtn(option:any) {
   return __defaultBtnOption(option,{

src/utils/formatTime.ts

@@ -23,6 +23,14 @@ export function formatDate(date: Date | number, format?: string): string {
   return dayjs(date).format(format)
 }
 
+/**
+ * 获取当前的日期+时间
+ */
+export function addDay(date: Date | number,addDay:number) {
+  return dayjs(date).add(addDay,'day')
+}
+
+
 /**
  * 获取当前的日期+时间
  */

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

@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import {getSamplingScheme} from '@/api/qms/sampleCode/index'
 
 // 表单校验
 export const SampleCodeRules = reactive({
@@ -7,7 +8,7 @@ export const SampleCodeRules = reactive({
   batchUpperLimiting: [required],
   available: [required],
 })
-
+const samplingSchemeList = await getSamplingScheme()
 export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: 'id',
@@ -21,6 +22,16 @@ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'code',
     sort: 'custom',
     isSearch: true,
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: samplingSchemeList,
+        optionsAlias: {
+          labelField: 'description',
+          valueField: 'code'
+        },
+      }
+    }
   },
   {
     label: '批量下限',
@@ -84,7 +95,7 @@ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
       dictType: DICT_TYPE.TRUE_FALSE,
       dictClass: 'string', // 默认都是字符串类型其他暂不考虑
         form: {
-          component: 'SelectV2'
+          component: 'Select'
         },
   },
   {

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -237,7 +237,7 @@
                 <el-input v-model="formData.configuration.Receiver" placeholder="请输入收货人名称" clearable />
               </el-form-item>
               <!-- 在途库位 -->
-              <el-form-item label="联系电话" prop="PhoneNumber">
+              <el-form-item label="联系电话" prop="configuration.PhoneNumber">
                 <el-input v-model="formData.configuration.PhoneNumber" placeholder="请输入联系电话" clearable />
               </el-form-item>
             </el-col>
@@ -314,8 +314,8 @@ const rules = ref({
   name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-  PhoneNumber: [{ max: 11, message: '不得超过11个字符', trigger: 'blur' },
+  'configuration.PhoneNumber': [{ max: 11, message: '不得超过11个字符', trigger: 'blur' },
-  {message: '请输入联系电话', trigger: 'blur' ,validator:validateHanset}]
+  {message: '请输入正确格式的电话', trigger: 'blur' ,validator:validateHanset}]
 })
 
 // 所有的范围类型

src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts

@@ -300,6 +300,7 @@ export const SupplierRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   email:  [
+    { required: true, message: '请输入邮箱', trigger: 'blur' },
     { max: 128, message: '不得超过128个字符', trigger: 'blur' },
     { validator:validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur'}
   ],

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

@@ -45,6 +45,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    :indexTableColumn="3"
     @success="getList"
     :rules="SupplierdeliverRequestMainRules"
     :formAllSchemas="SupplierdeliverRequestMain.allSchemas"
@@ -99,6 +101,18 @@
     @submitForm="submitFormLabel"
     :isShowReduceButton="false"
   />
+  <!-- 上传质量报告 -->
+  <BasicForm
+    ref="ploadQualityReportRef"
+    @success="getList"
+    :formAllSchemas="UploadQualityReport.allSchemas"
+    :tableAllSchemas="UploadQualityReport.allSchemas"
+    :tableData="ploadQualityReportTableData"
+    @handleAddTable="handleAddTableUploadQualityReport"
+    @handleDeleteTable="handleDeleteTableUploadQualityReport"
+    @submitForm="submitFormUploadQualityReport"
+    :isShowReduceButton="true"
+  />
  
 </template>
 
@@ -112,6 +126,7 @@ import {
   SupplierdeliverRequestDetail,
   SupplierdeliverRequestDetailRules,
   SupplierdeliverRequestDetailLabel,
+  UploadQualityReport
 } from './supplierdeliverRequestMain.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
@@ -138,17 +153,28 @@ const planArriveTimeStr = ref()
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
+    console.log("type:",type)
     console.log("formField:",formField)
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
+      // row[formField] = val[0][searchField]
-      if (formField == 'poNumber') {
+      // if (formField == 'poNumber') {
-        row['poNumber'] = val[0]['poNumber']
+      //   row['poNumber'] = val[0]['poNumber']
-        row['itemCode'] = val[0]['itemCode']
+      //   row['itemCode'] = val[0]['itemCode']
-        row['poLine'] = val[0]['poLine']
+      //   row['poLine'] = val[0]['poLine']
-        row['orderQty'] = val[0]['orderQty']
+      //   row['orderQty'] = val[0]['orderQty']
-        row['uom'] = val[0]['uom']
+      //   row['uom'] = val[0]['uom']
-      }
+      // }
+      val.forEach(item=>{
+        const newRow = {...row}
+        newRow[formField] = item[searchField]
+        newRow['poNumber'] = item['poNumber']
+        newRow['itemCode'] = item['itemCode']
+        newRow['poLine'] = item['poLine']
+        newRow['orderQty'] = item['orderQty']
+        newRow['uom'] = item['uom']
+        tableData.value.push(newRow)
+      })
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -283,6 +309,7 @@ const isShowMainButtonLabel = (row, val) => {
 const butttondata = (row) => {
   return [
     defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
+    defaultButtons.mainListPlanUploadQualityReportBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
     defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
     defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
     defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
@@ -326,7 +353,10 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPurPlanClo') {
     // 关闭
     handleClo(row.id)
-  } else if (val == 'mainPlanSub') {
+  } else if (val == 'mainPlanUploadQualityReport') {
+    // 上传质量报告
+    handleUploadQualityReport(row.id)
+  }  else if (val == 'mainPlanSub') {
     // 提交审批
     handleSub(row.id)
   } else if (val == 'mainPlanApp') {
@@ -466,6 +496,38 @@ const handleOpe = async (id: number) => {
     tableObject.loading = false
   }
 }
+const ploadQualityReportRef = ref()
+const ploadQualityReportTableData = ref([])
+/** 上传质量报告 */
+const handleUploadQualityReport  = async (id: number) => {
+  console.log('UploadQualityReport',UploadQualityReport.allSchemas)
+  // ploadQualityReportRef.value.dialogVisible = true
+  ploadQualityReportRef.value.open('create', null, null,'上传质量报告')//创建标签页面 createLabel 标题
+  const tableFormKeys  = {}
+  UploadQualityReport.allSchemas.tableFormColumns.forEach((item) => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  ploadQualityReportTableData.value = [tableFormKeys]
+}
+const handleAddTableUploadQualityReport = ()=>{
+  const tableFormKeys  = {}
+  UploadQualityReport.allSchemas.tableFormColumns.forEach((item) => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  ploadQualityReportTableData.value.push(tableFormKeys)
+}
+const handleDeleteTableUploadQualityReport = (item, index) => {
+  ploadQualityReportTableData.value.splice(index, 1)
+}
+
+const submitFormUploadQualityReport = (formType, data) => {
+  console.log("formType==",formType)
+  console.log("data==",data)
+  ploadQualityReportRef.value.dialogVisible = false
+  // formLabelRef.value.formLoading = false
+  // formLabelRef.value.dialogVisible = false
+  
+}
 
 /** 提交审批按钮操作 */
 const handleSub = async (id: number) => {

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

@@ -224,20 +224,20 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  {
+  // {
-    label: '业务类型',
+  //   label: '业务类型',
-    field: 'businessType',
+  //   field: 'businessType',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    form: {
+  //   form: {
-      value: 'SupplierDeliver',
+  //     value: 'SupplierDeliver',
-      componentProps: {
+  //     componentProps: {
-        disabled: true,
+  //       disabled: true,
-      }
+  //     }
-    }
+  //   }
-  },
+  // },
   {
     label: '备注',
     field: 'remark',
@@ -322,29 +322,29 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     isForm: false
   },
-  {
+  // {
-    label: '部门',
+  //   label: '部门',
-    field: 'departmentCode',
+  //   field: 'departmentCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+  //   formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
-      return userDeptArray.find((account) => account.id == cellValue)?.name
+  //     return userDeptArray.find((account) => account.id == cellValue)?.name
-    },
+  //   },
-    form: {
+  //   form: {
-      value: userDept.id,
+  //     value: userDept.id,
-      component: 'Select',
+  //     component: 'Select',
-      api: () => userDeptArray,
+  //     api: () => userDeptArray,
-      componentProps: {
+  //     componentProps: {
-        disabled: true,
+  //       disabled: true,
-        optionsAlias: {
+  //       optionsAlias: {
-          labelField: 'name',
+  //         labelField: 'name',
-          valueField: 'id'
+  //         valueField: 'id'
-        }
+  //       }
-      }
+  //     }
-    }
+  //   }
-  },
+  // },
   {
     label: '状态',
     field: 'status',
@@ -528,9 +528,9 @@ export const SupplierdeliverRequestMainRules = reactive({
   planArriveTime: [
     { required: true, message: '请输入计划到货时间', trigger: 'blur' }
   ],
-  departmentCode: [
+  // departmentCode: [
-    { required: true, message: '请输入部门', trigger: 'blur' }
+  //   { required: true, message: '请输入部门', trigger: 'blur' }
-  ],
+  // ],
   autoCommit: [
     { required: true, message: '请选择是否自动提交', trigger: 'change' }
   ],
@@ -586,19 +586,19 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm: {
-      disabled: true
+      disabled: false
     }
   },
-  {
+  // {
-    label: '替代批次',
+  //   label: '替代批次',
-    field: 'altBatch',
+  //   field: 'altBatch',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTableForm: false,
+  //   isTableForm: false,
-    isForm: false
+  //   isForm: false
-  },
+  // },
   {
     label: '到货日期',
     field: 'arriveDate',
@@ -1014,6 +1014,19 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   }
 ]))
 
+// 批次校验
+const validateBatch = (rule: any, value: any, callback: any) => {
+  const reg = /^[_a-zA-Z0-9]+$/;
+  if (value == '' || value == undefined || value == null) {
+      callback();
+  } else {
+      if (!reg.test(value)) {
+          callback(new Error('英文字母、数字或下划线'));
+      } else {
+          callback();
+      }
+  }
+}
 //表单校验
 export const SupplierdeliverRequestDetailRules = reactive({
   // packingNumber: [
@@ -1022,6 +1035,7 @@ export const SupplierdeliverRequestDetailRules = reactive({
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator: validateBatch, trigger: 'change' }
   ],
   produceDate: [
     { required: true, message: '请输入生产日期', trigger: 'blur' }
@@ -1089,19 +1103,19 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       valueFormat: 'x',
     }
   },
-  {
+  // {
-    label: '替代批次',
+  //   label: '替代批次',
-    field: 'altBatch',
+  //   field: 'altBatch',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTableForm: false,
+  //   isTableForm: false,
-    isForm: false,
+  //   isForm: false,
-    tableForm:{
+  //   tableForm:{
-      disabled:true
+  //     disabled:true
-    }
+  //   }
-  },
+  // },
   {
     label: '到货日期',
     field: 'arriveDate',
@@ -1561,4 +1575,66 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: false,
     isForm: false
   },
+]))
+
+export const UploadQualityReport = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '上传质检报告',
+    field: 'uploadFile',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+        upData:{
+          tableId: '',
+          tableName: ''
+        },
+        limit:1,
+      }
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isForm:false,
+    isTableForm:true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    isForm:false,
+    isTableForm:true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isForm:false,
+    table: {
+      width: 150
+    },
+  },
 ]))