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

src/api/system/notify/template/index.ts

@@ -5,6 +5,7 @@ export interface NotifyTemplateVO {
   name: string
   nickname: string
   code: string
+  roleIds: []
   content: string
   type: number
   params: string

src/api/wms/supplierinvoiceRequestMain/index.ts

@@ -88,3 +88,4 @@ export const exportSupplierinvoiceRequestMain = async (params) => {
     return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params })
   }
 }
+

src/utils/dict.ts

@@ -281,4 +281,7 @@ export enum DICT_TYPE {
   MES_WORKBILL_MODEL='mes_workbill_model',// 工单模式 单工单（根据产品数量生成多个工单）、批量工单（一个产品一个工单）
   MES_TASK_MODE='mes_task_mode', //生产模式 派工方式、领工方式
   MES_PLANDO_STATUS='mes_plando_status' //计划执行状态
+  PLAN_PRODUCTION_TYPE = "plan_production_type", // 生产计划类型
+  DELIVER_TYPE="deliver_type",//发货类型
+  BILL_TYPE="bill_type", // 发票类型
 }

src/views/mes/jobcalendar/index.vue

@@ -0,0 +1,10 @@
+<template>
+  <el-calendar v-model="value" />
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+const value = ref(new Date())
+</script>
+  
+  

src/views/system/notify/template/NotifyTemplateForm.vue

@@ -16,6 +16,11 @@
       <el-form-item label="发件人名称" prop="nickname">
         <el-input v-model="formData.nickname" placeholder="请输入发件人名称" />
       </el-form-item>
+      <el-form-item label="角色" prop="roleIds">
+        <el-select v-model="formData.roleIds" multiple placeholder="请选择角色">
+          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
+          /></el-select> 
+      </el-form-item>
       <el-form-item label="模板内容" prop="content">
         <el-input type="textarea" v-model="formData.content" placeholder="请输入模板内容" />
       </el-form-item>
@@ -54,12 +59,15 @@
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as NotifyTemplateApi from '@/api/system/notify/template'
 import { CommonStatusEnum } from '@/utils/constants'
+import * as RoleApi from '@/api/system/role'
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型
+const roleList = ref([]) // 角色的列表
+
 const formData = ref<NotifyTemplateApi.NotifyTemplateVO>({
   id: null,
   name: '',
@@ -67,6 +75,7 @@ const formData = ref<NotifyTemplateApi.NotifyTemplateVO>({
   code: '',
   content: '',
   type: null,
+  roleIds: [],
   params: '',
   status: CommonStatusEnum.ENABLE,
   remark: ''
@@ -76,6 +85,7 @@ const formRules = reactive({
   status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }],
   code: [{ required: true, message: '模板编码不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
+  roleIds: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
   nickname: [{ required: true, message: '发件人姓名不能为空', trigger: 'blur' }],
   content: [{ required: true, message: '模板内容不能为空', trigger: 'blur' }]
 })
@@ -96,6 +106,8 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  // 获得角色列表
+  roleList.value = await RoleApi.getSimpleRoleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 

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

@@ -1,14 +1,18 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SupplierinvoiceRequestMain.allSchemas.searchSchema" @search="setSearchParams"
+    <Search :schema="SupplierinvoiceRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
-      @reset="setSearchParams" />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+  <TableHead 
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+      :HeadButttondata="HeadButttondata" 
-    :allSchemas="SupplierinvoiceRequestMain.allSchemas" />
+      @button-base-click="buttonBaseClick" 
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns" 
+      @searchFormClick="searchFormClick"
+    :allSchemas="SupplierinvoiceRequestMain.allSchemas" 
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -28,28 +32,48 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="SupplierinvoiceRequestMainRules"
+  <BasicForm 
-    :formAllSchemas="SupplierinvoiceRequestMain.allSchemas" :searchTableParams="searchTableParams"
+    ref="formRef" 
-    :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" :tableFormRules="SupplierinvoiceRequestDetailRules"
+    @success="getList" 
-    :tableData="tableData" :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
+    :rules="SupplierinvoiceRequestMainRules"
-    :apiCreate="SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain" :isBusiness="true"
+    :formAllSchemas="SupplierinvoiceRequestMain.allSchemas" 
-    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
+    :searchTableParams="searchTableParams"
-    @submitForm="submitForm" />
+    :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" 
+    :tableFormRules="SupplierinvoiceRequestDetailRules"
+    :tableData="tableData" 
+    :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
+    :apiCreate="SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain" 
+    :isBusiness="true"
+    @handleAddTable="handleAddTable" 
+    @handleDeleteTable="handleDeleteTable" 
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm" 
+  />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :allSchemas="SupplierinvoiceRequestMain.allSchemas"
+  <Detail 
+    ref="detailRef" 
+    :isBasic="false" 
+    :allSchemas="SupplierinvoiceRequestMain.allSchemas"
     :detailAllSchemas="SupplierinvoiceRequestDetail.allSchemas"
-    :detailAllSchemasRules="SupplierinvoiceRequestDetailRules" :searchTableParams="searchTableParams"
+    :detailAllSchemasRules="SupplierinvoiceRequestDetailRules" 
+    :searchTableParams="searchTableParams"
     :apiCreate="SupplierinvoiceRequestDetailApi.createSupplierinvoiceRequestDetail"
     :apiUpdate="SupplierinvoiceRequestDetailApi.updateSupplierinvoiceRequestDetail"
     :apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage"
-    :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" :Echo="Echo" />
+    :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" 
+    :Echo="Echo" 
+  />
+
 </template>
 
 <script setup lang="ts">
   import download from '@/utils/download'
   import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-  import { SupplierinvoiceRequestMain, SupplierinvoiceRequestMainRules, SupplierinvoiceRequestDetail, SupplierinvoiceRequestDetailRules } from './supplierinvoiceRequestMain.data'
+  import { SupplierinvoiceRequestMain, 
+    SupplierinvoiceRequestMainRules, 
+    SupplierinvoiceRequestDetail, 
+    SupplierinvoiceRequestDetailRules } from './supplierinvoiceRequestMain.data'
   import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
   import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -98,6 +122,10 @@
         }
       } else {
         const setV = {}
+        if(formField == 'recordNumber'){
+          setV['recordNumber'] = val[0]['number']
+          setV['asnBillNum'] = val[0]['asnNumber']
+        }
         setV[formField] = val[0][searchField]
         formRef.setValues(setV)
       }

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 const { t } = useI18n() // 国际化
-const recordTypeList = [{ label: '收货单号', value: '1' }, { label: '退货单号', value: '2' }, { label: '索赔单号', value: '3' }]
+
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 import * as supplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
 import * as supplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
@@ -27,6 +27,94 @@ const requestsettingData = data?.list[0] || {}
  const userDeptArray:any = [userDept]
  
 
+
+ export const PurchaseReceiptOrReturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number'
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode'
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber'
+  },
+  {
+    label: '备注',
+    field: 'remark',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTableForm: false,
+    isForm: false
+  }
+]))
+
+/**
+ * @returns {Array} 采购订单或者采购退货单
+ */
+export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber'
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode'
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode'
+  },
+  {
+    label: '批次',
+    field: 'batch'
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTableForm: false,
+    isForm: false
+  }
+]))
+
+
 /**
  * @returns {Array} 供应商发票申请主表
  */
@@ -62,6 +150,136 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+  {
+    label: '单据类型',
+    field: 'billType',
+    dictType: DICT_TYPE.BILL_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '记录单号',
+    field: 'recordNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '单号信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseReceiptOrReturnRecordMain.allSchemas,
+        searchPage: supplierinvoiceRequestMainApi.getNumber,
+        searchCondition: [{
+          key: 'supplierCode',
+          value: 'supplierCode',
+          message: '请填写供应商代码！',
+          isMainValue: true
+        },
+        {
+          key: 'billType',
+          value: 'billType',
+          message: '请填写单据类型！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择单号',
+      searchField: 'number',
+      searchTitle: '单号信息',
+      searchAllSchemas: PurchaseReceiptOrReturnRecordMain.allSchemas,
+      searchPage: supplierinvoiceRequestMainApi.getNumber,
+      searchCondition: [{
+        key: 'supplierCode',
+        value: 'supplierCode',
+        message: '请填写供应商代码！',
+        isMainValue: true
+      },
+      {
+        key: 'billType',
+        value: 'billType',
+        message: '请填写单据类型！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '发货单号',
+    field: 'asnBillNum',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '订单号信息',
+        searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
+        searchPage: supplierinvoiceRequestDetailApi.getPoNumber,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'recordNumber',
+            message: '请填写记录单号！',
+            isMainValue: true
+          }
+          ,
+          {
+            key: 'billType',
+            value: 'billType',
+            message: '请填写单号类型！',
+            isMainValue: true
+          }]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '订单号信息',
+      searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
+      searchPage: supplierinvoiceRequestDetailApi.getPoNumber,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'recordNumber',
+          message: '请填写记录单号！',
+          isMainValue: true
+        }
+        ,
+        {
+          key: 'billType',
+          value: 'billType',
+          message: '请填写单号类型！',
+          isMainValue: true
+        }]
+    }
+  },
   {
     label: '调增金额',
     field: 'adjustAmount',
@@ -69,6 +287,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isForm:false,
+    isTable:false,
     form: {
       component: 'InputNumber',
     },
@@ -80,6 +300,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
+    isForm:false,
     form: {
       value: 'SupplierInvoice',
       componentProps: {
@@ -98,6 +320,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    isForm:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -118,6 +341,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    isForm:false,
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -236,7 +461,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -256,7 +482,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -276,7 +503,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isForm: false,
     sort: 'custom',
     table: {
       width: 150
@@ -351,78 +579,7 @@ export const SupplierinvoiceRequestMainRules = reactive({
   ],
 })
 
-/**
- * @returns {Array} 展示的表格
- */
-export const SupplierinvoiceRequestDetailaa = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '订单行',
-    field: 'poNumber'
-  },
-  {
-    label: '订单行',
-    field: 'poLine'
-  },
-  {
-    label: '物料代码',
-    field: 'itemCode'
-  },
-  {
-    label: '货主代码',
-    field: 'ownerCode'
-  },
-  {
-    label: '批次',
-    field: 'batch'
-  },
-  {
-    label: '单价',
-    field: 'singlePrice',
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '金额',
-    field: 'amount',
-    form: {
-      component: 'InputNumber',
-    }
-  },
 
-  {
-    label: '备注',
-    field: 'remark',
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm: false,
-  }
-]))
 /**
  * @returns {Array} 供应商发票申请子表
  */
@@ -436,36 +593,8 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     tableForm: {
       type: 'Select',
-      initOptions: recordTypeList,
+      initOptions: [{ label: '收货单号', value: '1' }, { label: '退货单号', value: '2' }],
-    },
-  },
-  {
-    label: '单号',
-    field: 'recordNumber',
-    sort: 'custom',
-    table: {
-      width: 150
     },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择单号',
-      searchField: 'number',
-      searchTitle: '单号信息',
-      searchAllSchemas: SupplierinvoiceRequestMain.allSchemas,
-      searchPage: supplierinvoiceRequestMainApi.getNumber,
-      searchCondition: [{
-        key: 'supplierCode',
-        value: 'supplierCode',
-        message: '请填写供应商代码！',
-        isMainValue: true
-      },
-      {
-        key: 'recordType',
-        value: 'recordType',
-        message: '请填写单号类型！',
-        isMainValue: true
-      }]
-    }
   },
   {
     label: '订单号',
@@ -481,7 +610,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         searchListPlaceholder: '请选择订单号',
         searchField: 'number',
         searchTitle: '订单号信息',
-        searchAllSchemas: SupplierinvoiceRequestDetailaa.allSchemas,
+        searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
         searchPage: supplierinvoiceRequestDetailApi.getPoNumber
       }
     },
@@ -490,7 +619,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       searchListPlaceholder: '请选择订单号',
       searchField: 'number',
       searchTitle: '订单号信息',
-      searchAllSchemas: SupplierinvoiceRequestDetailaa.allSchemas,
+      searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
       searchPage: supplierinvoiceRequestDetailApi.getPoNumber,
       searchCondition: [
         {