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

src/components/Annex/src/Annex.vue

@@ -3,7 +3,7 @@
   <div class="annex">
     <div class="title flex items-center">
       <div class="title-txt">附件</div>
-      <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件"/>
+      <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData"/>
     </div>
     <div class="list">
       <div class="item flex items-start" v-for="(item, index) in data.annexList" :key="index">
@@ -36,7 +36,11 @@ const props = defineProps({
   data: {
     type: Object,
     required: true
-  }
+  },
+  upData: {
+    type: Object,
+    required: true
+  },
 })
 // 子传父的时候需要先定义好emit这个方法
 const emit = defineEmits(['handleImport','deleteAnnexSuccess'])

src/components/BasicForm/src/BasicForm.vue

@@ -338,20 +338,14 @@ const handleTableSelect = (row, column, event) => {
 
 // 删除数据
 const handleDeleteTable = (row, index) => {
-  console.log(row);
-  console.log(index);
   emit('handleDeleteTable', row)
 }
 // 添加数据
 const handleAddTable = () => {
-  console.log(2);
-  
   emit('handleAddTable')
 }
 // 输入框聚焦
 const inpuFocus = (headerItem) => {
-  console.log(11);
-  
   opensearchTable()
 }
 </script>

src/components/ChangeRecord/src/ChangeRecord.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="list">
       <el-steps direction="vertical" class="mt-16px" :space="90">
-        <el-step v-for="(item, index) in data.changeRecordList" :key="index">
+        <el-step v-for="(item, index) in changeRecordData.changeRecordList" :key="index">
           <template #icon>
             <slot>
               <Icon color="#9e9e9e"
@@ -16,21 +16,24 @@
           </template>
           <template #title>
             <slot>
-              <span class="color-#9e9e9e font-size-16px time">{{ item.time }}</span>
+              <span class="color-#9e9e9e font-size-16px time">{{ formatDate(item.createTime) }}</span>
             </slot>
           </template>
           <template #description>
             <slot>
               <div class="dic color-#303133" v-if="item.type == 1">
-                {{ item.name }} <span>创建了</span> 记录
+                  {{ item.nickname }} {{ item.content }}
+                <!-- {{ item.nickname }} <span>创建了</span> 记录 -->
               </div>
               <div class="dic color-#303133" v-else-if="item.type == 2">
-                {{ item.name }} <span>修改了</span> 状态
+                  {{ item.nickname }} {{ item.content }}
+                <!-- {{ item.nickname }} <span>修改了</span> 状态 -->
               </div>
               <div class="dic color-#303133" v-else-if="item.type == 3">
-                {{ item.name }} <span>添加了</span> 附件
+                {{ item.nickname }} {{ item.content }}
+                 <!-- <span>添加了</span> 附件 -->
               </div>
-              <div class="tips" v-if="item.type == 2">
+              <!-- <div class="tips" v-if="item.type == 2">
                 <span class="color-#f56c6c" style="text-decoration:line-through">原值</span>><span
                   class="color-#67c23a">新值</span>
               </div>
@@ -39,7 +42,7 @@
                   <Icon color="#70b6ff" icon="ep:document" size="20" style="display:bloc"/>
                   <div class="file-text" type="primary">{{cur.name}}</div>
                 </div>
-              </div>
+              </div> -->
 
             </slot>
           </template>
@@ -51,12 +54,13 @@
 
 <script lang="ts" setup>
 import download from '@/utils/download'
+import { formatDate } from '@/utils/formatTime'
 defineComponent({
   name: 'ChangeRecord'
 })
 // 接收父组件数据
 const props = defineProps({
-  data: {
+  changeRecordData: {
     type: Object,
     required: true
   }

src/components/Detail/src/Detail.vue

@@ -17,12 +17,12 @@
       </ContentWrap>
       <ContentWrap class="w-[27%] ml-16px">
         <!-- 附件组件 -->
-        <Annex :data="annexData" @handleImport="handleImport" @deleteAnnex="deleteAnnexSuccess" />
+        <Annex :data="annexData" @handleImport="handleImport" @deleteAnnex="deleteAnnexSuccess" :upData="remarksData.data"/>
         <!-- 备注组件 -->
         <Remarks :remarksData="remarksData"  class="mt-20px"
           @remarksSubmitScuess="remarksSubmitScuess" />
         <!-- 变更记录组件 -->
-        <ChangeRecord :data="changeRecordData" class="mt-20px" />
+        <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
       </ContentWrap>
     </div>
     <ContentWrap v-else>
@@ -175,7 +175,6 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     detailLoading.value = true
     try {
       detailData.value = row
-      console.log(detailData.value);
       getRemarkList()
       getChangeRecordList()
 
@@ -205,6 +204,7 @@ const remarksSubmitScuess = async (remark) => {
 const getChangeRecordList = async () => {
   // remarksData.data.tableId = '1679654720693248010'
   changeRecordData.changeRecordList = await DetailApi.getChangeRecordPage(remarksData.data)
+  
 }
 </script>
 <style lang="scss">

src/components/ImportForm/src/ImportForm.vue

@@ -132,7 +132,6 @@ const updatePart = ref(props.updatePart)//是否部门保存
 const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + props.url
 
-console.log(135, importUrl)
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true
@@ -231,11 +230,6 @@ const handleExceed = (): void => {
 /** 下载模板操作 */
 const importTemplate = () => {
   const res = importTemplateData.value.templateUrl
-  console.log(266,importTemplateData.value.templateUrl)
-  console.log(1);
-  console.log(res);
-  console.log(1);
-  
   download.excel(res, importTemplateData.value.templateTitle)
 }
 </script>

src/components/Search/src/Search.vue

@@ -102,13 +102,6 @@ const setVisible = () => {
 }
 const Search = ref()
 onMounted(() => {
-  // nextTick(() => {
-  //   console.log(4)
-  //   console.log(Search.value.offsetHeight)
-  //   wsCache.set('SearchoffsetHeight', Search.value.offsetHeight)
-  //   console.log(wsCache.get('SearchoffsetHeight'))
-  //   console.log(4)
-  // })
 })
 </script>
 

src/components/UploadFile/src/UploadFile.vue

@@ -8,7 +8,7 @@
       v-model:file-list="fileList"
       :show-file-list="true"
       :auto-upload="autoUpload"
-      :action="updateUrl"
+      :action="updateUrl+'?tableId='+upData?.tableId+'&tableName='+ upData?.tableName"
       :headers="uploadHeaders"
       :limit="props.limit"
       :drag="drag"
@@ -55,6 +55,7 @@ const props = defineProps({
   },
   title: propTypes.string.def('文件上传'),
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
+  upData: propTypes.object.def(),
   fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileSize: propTypes.number.def(5), // 大小限制(MB)
   limit: propTypes.number.def(5), // 数量限制

src/components/UploadFile/src/UploadImg.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="upload-box">
     <el-upload
-      :action="updateUrl"
+      :action="updateUrl + '?tableId=' + upData?.tableId + '&tableName=' + upData?.tableName"
       :id="uuid"
       :class="['upload', drag ? 'no-border' : '']"
       :multiple="false"
@@ -75,6 +75,7 @@ type FileTypes =
 const props = defineProps({
   modelValue: propTypes.string.def(''),
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
+  upData: propTypes.object.def(),
   drag: propTypes.bool.def(true), // 是否支持拖拽上传 ==> 非必传（默认为 true）
   disabled: propTypes.bool.def(false), // 是否禁用上传组件 ==> 非必传（默认为 false）
   fileSize: propTypes.number.def(5), // 图片大小限制 ==> 非必传（默认为 5M）

src/components/UploadFile/src/UploadImgs.vue

@@ -3,7 +3,7 @@
     <el-upload
       v-model:file-list="fileList"
       :accept="fileType.join(',')"
-      :action="updateUrl"
+      :action="updateUrl + '?tableId=' + upData?.tableId + '&tableName=' + upData?.tableName"
       :before-upload="beforeUpload"
       :class="['upload', drag ? 'no-border' : '']"
       :drag="drag"
@@ -75,6 +75,7 @@ const props = defineProps({
     required: true
   },
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
+  upData: propTypes.object.def(),
   drag: propTypes.bool.def(true), // 是否支持拖拽上传 ==> 非必传（默认为 true）
   disabled: propTypes.bool.def(false), // 是否禁用上传组件 ==> 非必传（默认为 false）
   limit: propTypes.number.def(5), // 最大图片上传数 ==> 非必传（默认为 5张）

src/store/modules/user.ts

@@ -3,6 +3,7 @@ import { defineStore } from 'pinia'
 import { getAccessToken, removeToken } from '@/utils/auth'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getInfo, loginOut } from '@/api/login'
+import { getUserProfile } from '@/api/system/user/profile'
 
 const { wsCache } = useCache()
 
@@ -16,6 +17,7 @@ interface UserInfoVO {
   roles: string[]
   isSetUser: boolean
   user: UserVO
+  userSelfInfo:object
 }
 
 export const useUserStore = defineStore('admin-user', {
@@ -27,7 +29,8 @@ export const useUserStore = defineStore('admin-user', {
       id: 0,
       avatar: '',
       nickname: ''
-    }
+    },
+    userSelfInfo:{}
   }),
   getters: {
     getPermissions(): string[] {
@@ -41,6 +44,9 @@ export const useUserStore = defineStore('admin-user', {
     },
     getUser(): UserVO {
       return this.user
+    },
+     getUserSelfInfo(): UserVO {
+      return this.userSelfInfo
     }
   },
   actions: {
@@ -53,6 +59,12 @@ export const useUserStore = defineStore('admin-user', {
       if (!userInfo) {
         userInfo = await getInfo()
       }
+        this.userSelfInfo = await getUserProfile()
+        // userInfo = await getInfo()
+        console.log(4);
+        console.log(this.userSelfInfo);
+        console.log(4);
+        
       this.permissions = userInfo.permissions
       this.roles = userInfo.roles
       this.user = userInfo.user

src/utils/disposition/tableColumns.ts

@@ -1,5 +1,20 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index.ts'
+import { useUserStore } from '@/store/modules/user'
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PurchaseClaimRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsetting = data[0]
+ 
+ 
 /**
  * @returns {Array} 基础物料信息
  */
@@ -10556,16 +10571,30 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '单据号',
-    field: 'number'
+    field: 'number',
+    isForm:false,
   },
   {
     label: '业务类型',
-    field: 'businessType'
+    field: 'businessType',
+    form:{
+      value:'PurchaseClaim',
+      componentProps:{
+      disabled:true,
+      }
+    }
   },
   {
     label: '申请时间',
     field: 'requestTime',
     formatter: dateFormatter,
+    form: {
+      value: new Date(),
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+      }
+    },
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     }
@@ -10574,13 +10603,25 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '截止时间',
     field: 'dueTime',
     formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+      }
+    },
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     }
   },
   {
     label: '部门',
-    field: 'departmentCode'
+    field: 'departmentCode',
+    form: {
+      value:userDept.name,
+      componentProps:{
+        disabled:true,
+      }
+    },
   },
   {
     label: '状态',
@@ -10588,7 +10629,13 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isSearch: true,
-    isTable: true
+    isTable: true,
+     form: {
+      value:'NEW',
+      componentProps:{
+        disabled:true,
+      }
+    },
   },
   {
     label: '备注',
@@ -10597,12 +10644,14 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    isForm:false
   },
   {
     label: '创建时间',
     field: 'createTime',
     isTable: true,
     formatter: dateFormatter,
+    isForm:false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     }
@@ -10610,12 +10659,14 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '最后更新者',
     field: 'updater',
+    isForm:false
   },
   {
     label: '最后更新时间',
     field: 'updateTime',
     isTable: true,
     formatter: dateFormatter,
+    isForm:false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     }
@@ -10626,7 +10677,11 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true
+    isTable: true,
+    form:{
+      component:'Switch',
+      value:true,
+    }
   },
   {
     label: '自动通过',
@@ -10649,13 +10704,36 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true
   }
 ]))
-
 // 表单校验
 export const PurchaseclaimRequestMainRules = reactive({
+  asnNumber: [
+    { required: true, message: '请输入发货单号', trigger: 'blur' }
+  ],
+  ppNumber:  [
+    { required: true, message: '请输入要货计划单号', trigger: 'blur' }
+  ],
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'change' }
+  ],
+  requestTime:  [
+    { required: true, message: '请选择申请时间', trigger: 'change' }
+  ],
+  dueTime:  [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
+  departmentCode:  [
+    { required: true, message: '请选择部门', trigger: 'change' }
+  ],
+  status:  [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
 })
 
 /**

src/views/system/oauth2/client/ClientForm.vue

@@ -17,7 +17,7 @@
         <el-input v-model="formData.name" placeholder="请输入应用名" />
       </el-form-item>
       <el-form-item label="应用图标">
-        <UploadImg v-model="formData.logo" :limit="1" />
+        <UploadImg v-model="formData.logo" :limit="1" :upData="upData"/>
       </el-form-item>
       <el-form-item label="应用描述">
         <el-input v-model="formData.description" placeholder="请输入应用名" type="textarea" />
@@ -193,6 +193,7 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
+const upData = ref()
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
@@ -201,6 +202,10 @@ const open = async (type: string, id?: number) => {
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
+    upData.value = {
+      tableId : id,
+      tableName:'systemOauth2Client'
+    }
     try {
       formData.value = await ClientApi.getOAuth2Client(id)
     } finally {