From f7be8ea9a4c783aad62937fa8433917ab41850dd Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 13 Aug 2024 08:54:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/demandforecastingDetail/index.ts  |  3 +
 src/api/wms/demandforecastingMain/index.ts    | 52 +++++++++++++
 src/components/Search/src/Search.vue          |  2 +-
 .../demandforecastingMain/index.vue           | 13 ++--
 .../demandforecastingMain.data.ts             | 78 +++++++++----------
 .../demandforecastingSupplierMain/index.vue   | 11 ++-
 6 files changed, 109 insertions(+), 50 deletions(-)

diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts
index e3303bbd1..309422d37 100644
--- a/src/api/wms/demandforecastingDetail/index.ts
+++ b/src/api/wms/demandforecastingDetail/index.ts
@@ -72,6 +72,9 @@ const getPageParams = (params)=>{
 export const getDemandforecastingDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
+    if(params.flag){
+      delete params.flag
+    }
     const data = {...params}
     return await request.post({ url: '/wms/demandforecasting-detail/senior', data })
   } else {
diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index 7d5596a8f..0433af12c 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { isString } from '@/utils/is'
 
 export interface DemandforecastingMainVO {
   supplierCode: string
@@ -66,6 +67,56 @@ export const witPurchaseMain = async (id: number) => {
   return await request.post({ url: `/wms/demandforecasting-main/wit?id=` + id })
 }
 
+// 要货预测-列表和头部请求参数
+const getPageParams = (params)=>{
+  // 到货日期
+  if(params.dueDate&&params.dueDate.length>0){
+    if(isString(params.dueDate[0])){
+      params.startDate = params.dueDate[0]
+    }else{
+      params.startDate = params.dueDate[0].format('YYYY-MM-DD')
+    }
+
+  }
+  if(params.dueDate&&params.dueDate.length>1){
+    if(isString(params.dueDate[1])){
+      params.endDate = params.dueDate[1]
+    }else{
+      params.endDate = params.dueDate[1].format('YYYY-MM-DD')
+    }
+  }
+  params.dueDate = ''
+
+  //计划员
+  if(params.planerId&&params.planerId.length>0){
+    params.planers = params.planerId.join(',')
+  }
+  params.planerId = ''
+  // 供应商代码
+  if(params.supplierCode&&params.supplierCode.length>0){
+    let keyValue = params.supplierCode.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.supplierCodes = keyValue.join(',')
+  }
+  params.supplierCode = ''
+
+  // 物料代码
+  if(params.itemCode&&params.itemCode.length>0){
+    let keyValue = params.itemCode.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.itemCodes = keyValue.join(',')
+  }
+  params.itemCode = ''
+
+  // 版本号
+  if(params.version&&params.version.length>0){
+    let keyValue = params.version.split(' ')
+    keyValue.forEach(item=>{item = item.trim()})
+    params.versions = keyValue.join(',')
+  }
+  params.version = ''
+  return params
+}
 // 导出要货预测主 Excel
 export const exportDemandforecastingMain = async (params) => {
   if (params.isSearch) {
@@ -73,6 +124,7 @@ export const exportDemandforecastingMain = async (params) => {
     const data = {...params}
     return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
   } else {
+    params = getPageParams(params)
     return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
   }
 }
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index c9745202f..a95460d5f 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -271,7 +271,7 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
 }
 const Search = ref()
 onMounted(() => {})
-defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗
+defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
 
 </script>
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 1057b940a..43c77fb2d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -208,13 +208,14 @@ const searchFormClick = (searchData) => {
 
 /** 初始化 **/
 onMounted(async () => {
-  try {
-    await getListHead()
-  } catch (error) {
+  // try {
+  //   await getListHead()
+  // } catch (error) {
     
-  }
-  // updateDateTableColumns()
-  getList()
+  // }
+  // // updateDateTableColumns()
+  // getList()
+  seachRef.value.search()
   importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index b094557b3..19632d743 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -109,45 +109,45 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '版本号',
-    field: 'version',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch:true,
-    search: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        multiple: true,
-        enterSearch: true,
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择版本号', // 输入框占位文本
-        searchField: 'detailVersion', // 查询弹窗赋值字段
-        searchTitle: '版本号', // 查询弹窗标题
-        searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
-        searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'supplierCodes',
-          value: 'supplierCode',
-          message: '请填写供应商代码！',
-          isMainValue: true,
-          isCSV:true,//是否用逗号分隔参数
-        },{
-          key: 'itemCodes',
-          value: 'itemCode',
-          message: '请填写物料代码！',
-          isMainValue: true,
-          isCSV:true,//是否用逗号分隔参数
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
+  // {
+  //   label: '版本号',
+  //   field: 'version',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isSearch:true,
+  //   search: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       multiple: true,
+  //       enterSearch: true,
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择版本号', // 输入框占位文本
+  //       searchField: 'detailVersion', // 查询弹窗赋值字段
+  //       searchTitle: '版本号', // 查询弹窗标题
+  //       searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
+  //       searchPage: DemandforecastingDetailApi.queryVersion, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'supplierCodes',
+  //         value: 'supplierCode',
+  //         message: '请填写供应商代码！',
+  //         isMainValue: true,
+  //         isCSV:true,//是否用逗号分隔参数
+  //       },{
+  //         key: 'itemCodes',
+  //         value: 'itemCode',
+  //         message: '请填写物料代码！',
+  //         isMainValue: true,
+  //         isCSV:true,//是否用逗号分隔参数
+  //       },{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
   {
     label: '到货日期',
     field: 'dueDate',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
index 9e3dea6c8..d53844f8e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/>
+    <Search ref="seachRef" :showSearchTableQueryFields="['supplierCode','itemCode','version']" :hiddenFilterBtnFields="['supplierCode','itemCode','version']" :schema="DemandforecastingMain.allSchemas.searchSchema" @search="searchClick" @reset="searchClick" @searchTableSuccess="searchQueryTableSuccess"/>
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -174,6 +174,7 @@ const buttonBaseClick = async (val, item) => {
 
 
 const searchClick = async (data)=>{
+  data.flag = 1
   console.log('searchClick',data)
   await setSearchParamsHead(data)
   // updateDateTableColumns()
@@ -267,12 +268,14 @@ const readHandle = (row,isAll)=>{
   })
   
 }
+const seachRef = ref()
 
 /** 初始化 **/
 onMounted(async () => {
-  await getListHead()
-  // updateDateTableColumns()
-  getList()
+  // await getListHead()
+  // // updateDateTableColumns()
+  // getList()
+  seachRef.value.search()
   importTemplateData.templateUrl = await DemandforecastingMainApi.importTemplate()
 })
 </script>

From a8e6411b020982f0ce33d47ce0e5a9b2b3541353 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 13 Aug 2024 09:00:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9=E5=86=85=E5=AE=B9=E8=BF=98?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=8E=B7=E5=8F=96=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue |   9 +-
 src/components/TableForm/src/TableForm.vue | 125 +++++++++++----------
 2 files changed, 76 insertions(+), 58 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 16dc70ac4..a4a995345 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -107,6 +107,7 @@
           :routeName="routeName"
           @visibleChange="visibleChange"
           @inputStringFcous='inputStringFcous'
+          :sureDisabled="sureDisabled"
         >
           <template v-slot="{ row }">
             <slot :row="row"></slot>
@@ -373,6 +374,7 @@ const tableAllSchemas = ref(props.tableAllSchemas)
 const tableFormRules = ref(props.tableFormRules)
 const route = useRoute() // 路由信息
 const routeName = ref('')
+const sureDisabled = ref(false)
 routeName.value = route.name
 
 // 列表-按钮
@@ -888,6 +890,7 @@ const onBlur = async (field, e) => {
       ]
       count.value++
     }
+      sureDisabled.value= false
   } else {
     emit('onBlur', field, e)
   }
@@ -956,7 +959,9 @@ const inputStringBlur = async (headerItem, val, row, index) => {
         defaultButtons.formCloseBtn(null) // 关闭
       ]
       count.value++
-    }
+  }
+    
+      sureDisabled.value= false
 }
 // 聚焦
 const onFocus = (field) => {
@@ -969,6 +974,7 @@ const onFocus = (field) => {
       ]
     }
     count.value++
+    sureDisabled.value= true
   }
 }
 const inputStringFcous= (headerItem) => {
@@ -980,6 +986,7 @@ const inputStringFcous= (headerItem) => {
       ]
     }
     count.value++
+    sureDisabled.value= true
   }
 }
 /**
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 149dc0bc2..47203f269 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -65,7 +65,8 @@
         :width="headerItem?.tableForm?.width"
         :min-width="headerItem?.tableForm?.minWidth || '200px'"
       >
-        <el-form @submit.native.prevent
+        <el-form
+          @submit.native.prevent
           ref="TableBaseForm_Ref"
           :model="row"
           style="width: 100%"
@@ -92,7 +93,7 @@
               :disabled="disabledInput(headerItem, row)"
               style="flex: 1"
               @blur="inputStringBlur(headerItem, row[headerItem.field], row, index)"
-              @clear='clearInput(headerItem.field, row, index)'
+              @clear="clearInput(headerItem.field, row, index)"
               @focus="inputStringFcous(headerItem)"
             />
             <Icon
@@ -116,7 +117,7 @@
             <slot :row="row"></slot>
           </el-form-item>
           <!-- 金额输入框 -->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'number'" :prop="headerItem.field" >
+          <el-form-item v-if="headerItem?.tableForm?.type == 'number'" :prop="headerItem.field">
             <el-input
               :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
@@ -169,10 +170,10 @@
               @visible-change="visibleChange(headerItem.field, $event, row, $index)"
             >
               <el-option
-                v-for="op in initSelectOptions(headerItem,row)"
-                :label="t(`ts.${initLabel(headerItem,op)}`).replace('ts.', '')"
-                :value="initValue(headerItem,op)"
-                :key="initValue(headerItem,op)"
+                v-for="op in initSelectOptions(headerItem, row)"
+                :label="t(`ts.${initLabel(headerItem, op)}`).replace('ts.', '')"
+                :value="initValue(headerItem, op)"
+                :key="initValue(headerItem, op)"
               />
             </el-select>
           </el-form-item>
@@ -199,7 +200,7 @@
               @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)"
             >
               <el-option-group
-                v-for="group in initSelectOptions(headerItem,row)"
+                v-for="group in initSelectOptions(headerItem, row)"
                 :key="group.type"
                 :label="t(`ts.${group.name}`).replace('ts.', '')"
               >
@@ -305,7 +306,7 @@
               :id="headerItem?.tableForm?.id"
             >
               <el-radio
-                v-for="(item, index) in initSelectOptions(headerItem,row)"
+                v-for="(item, index) in initSelectOptions(headerItem, row)"
                 :key="index"
                 :label="t(`ts.${item.value}`).replace('ts.', '')"
                 :size="headerItem?.tableForm?.size"
@@ -329,7 +330,7 @@
               :fill="headerItem?.tableForm?.fill"
             >
               <el-checkbox
-                v-for="(item, index) in initSelectOptions(headerItem,row)"
+                v-for="(item, index) in initSelectOptions(headerItem, row)"
                 :key="index"
                 :label="t(`ts.${item.value}`).replace('ts.', '')"
                 :disabled="itemIsDisabled(headerItem, row)"
@@ -391,32 +392,34 @@
       layout="total, prev, pager, next, jumper"
       :total="tableData.length"
     />
-    <div class="button flex" v-if="isShowButton || isShowReduceButtonSelection">
-      <div class="p-12px" v-if="isShowButton" @click.stop="handleAddTable">
-        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer" />
-        <div>{{ t('ts.添加明细') }}</div>
-      </div>
-      <div class="p-12px" v-if="isShowReduceButtonSelection" @click.stop="handleSelectionDelete">
-        <Icon icon="ep:delete" color="#409eff" size="26" style="cursor: pointer" />
-        <div>{{ t('ts.批量删除') }}</div>
-      </div>
-      <div
-        class="p-12px"
-        v-if="
-          isShowTableFormSearch?.isShowTableFormSearch||
-          routeName == 'PurchaseMain' ||
-          routeName == 'PurchaseMain' ||
-          routeName == 'ProductionMain' ||
-          routeName == 'ZZBJDeliverPlanMain' ||
-          routeName == 'DeliverPlanMain' ||
-          routeName == 'DeliverRequestMain' ||
-          routeName == 'ZZBJDeliverRequestMain' ||
-          routeName == 'UnplannedreceiptRequestMain'||
-          routeName == 'RepleinshRequestMain'
-          
-        "
+    <div class="button flex" style="padding-top: 10px" v-if="isShowButton || isShowReduceButtonSelection">
+      <el-button
+        type="primary"
+        link
+        v-if="isShowButton"
+        @click.stop="handleAddTable"
+        :disabled="sureDisabled"
+        :icon="CirclePlus"
+        size="large"
+      >
+        <span>{{ t('ts.添加明细') }}</span>
+      </el-button>
+      <el-button
+        type="primary"
+        link
+        v-if="isShowReduceButtonSelection"
+        @click.stop="handleSelectionDelete"
+        :icon="Remove"
+        size="large"
       >
-        <el-input v-model="keyWord" style="width: 240px" :placeholder="`请输入${isShowTableFormSearch?.label}，多条数据逗号分隔`" />
+        <span>{{ t('ts.批量删除') }}</span>
+      </el-button>
+      <div class="p-12px" v-if="isShowTableFormSearch?.isShowTableFormSearch">
+        <el-input
+          v-model="keyWord"
+          style="width: 240px"
+          :placeholder="`请输入${isShowTableFormSearch?.label}，多条数据逗号分隔`"
+        />
         <el-button type="primary" style="margin-left: 10px" @click.stop="batchAdd">{{
           t('批量添加')
         }}</el-button>
@@ -429,6 +432,7 @@
 const { t } = useI18n() // 国际化
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import { CirclePlus, Remove } from '@element-plus/icons-vue'
 const props = defineProps({
   // 是否显示添加按钮
   isShowButton: {
@@ -502,11 +506,16 @@ const props = defineProps({
     type: String,
     required: false,
     default: ''
+  },
+  // 添加明细是否可点击
+  sureDisabled: {
+    type: Boolean,
+    default: false
   }
 })
 let isShowTableFormSearch = ref({})
-console.log(33333,props.tableFields)
-isShowTableFormSearch.value =props.tableFields.find(item=>item.isShowTableFormSearch)
+console.log(33333, props.tableFields)
+isShowTableFormSearch.value = props.tableFields.find((item) => item.isShowTableFormSearch)
 
 // 传递给父类
 const emit = defineEmits([
@@ -531,11 +540,13 @@ const emit = defineEmits([
   'inputStringFcous'
 ])
 // 获取下拉列表 | type = radio | type = select
-const initSelectOptions = (headerItem,row) => {
-  if(row[headerItem.field+'InitOptions']){
-    return row[headerItem.field+'InitOptions']
-  }else{
-    return headerItem.dictType ? getStrDictOptions(headerItem.dictType) : headerItem.tableForm.initOptions
+const initSelectOptions = (headerItem, row) => {
+  if (row[headerItem.field + 'InitOptions']) {
+    return row[headerItem.field + 'InitOptions']
+  } else {
+    return headerItem.dictType
+      ? getStrDictOptions(headerItem.dictType)
+      : headerItem.tableForm.initOptions
   }
 }
 //普通下拉改变事件
@@ -622,7 +633,7 @@ const TableBaseForm_Ref = ref()
 
 const validateForm = () => {
   let _lists = TableBaseForm_Ref.value?.map((v) => v.validate())
-  if(!_lists ||_lists.length == 0){
+  if (!_lists || _lists.length == 0) {
     return false
   }
   return Promise.all(_lists)
@@ -657,7 +668,7 @@ const inputStringBlur = (headerItem, val, row, index) => {
 }
 // 聚焦
 const inputStringFcous = (headerItem) => {
-   emit('inputStringFcous', headerItem)
+  emit('inputStringFcous', headerItem)
 }
 const clearInput = (field, row, index) => {
   emit('clearInput', field, row, index)
@@ -667,7 +678,7 @@ const buttonOperationClick = (row, label, index) => {
   emit('buttonOperationClick', row, label, index)
 }
 const visibleChange = (field, val, row, index) => {
-  emit('visibleChange',field, val, row, index)
+  emit('visibleChange', field, val, row, index)
 }
 const currentPage = ref(1)
 const pageSize = ref(10)
@@ -711,19 +722,19 @@ const disabledInput = (headerItem, row) => {
     )
   }
 }
-const  initLabel=(headerItem,op)=>{
-if(headerItem?.tableForm?.labelField){
-  return op[headerItem?.tableForm?.labelField]
-}else{
-  return op.label
-}
-}
-const  initValue=(headerItem,op)=>{
-if(headerItem?.tableForm?.valueField){
-  return op[headerItem?.tableForm?.valueField]
-}else{
-  return op.value
+const initLabel = (headerItem, op) => {
+  if (headerItem?.tableForm?.labelField) {
+    return op[headerItem?.tableForm?.labelField]
+  } else {
+    return op.label
+  }
 }
+const initValue = (headerItem, op) => {
+  if (headerItem?.tableForm?.valueField) {
+    return op[headerItem?.tableForm?.valueField]
+  } else {
+    return op.value
+  }
 }
 // setup 语法糖 抛出方法
 defineExpose({

From 7329db90e1353af9bf2d1517e32310ec3dabd657 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Tue, 13 Aug 2024 09:06:32 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0=E4=BA=BA=E3=80=81=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itemManage/bom/bom.data.ts                |  4 +--
 .../itemManage/itemarea/itemarea.data.ts      |  6 ++--
 .../packageunit/packageunit.data.ts           |  8 ++---
 .../productionitemcodeSpareitemcode.data.ts   | 34 +++++++++++++++++++
 .../productionlineitem.data.ts                |  4 +--
 .../stdcostprice/stdcostprice.data.ts         |  4 +--
 6 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
index a94d3709a..9fd1cfb5d 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -255,7 +255,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -278,7 +278,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index cbad1aab2..df0380761 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -669,7 +669,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'creator',
     sort: 'custom',
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     },
@@ -680,7 +680,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isForm: false,
-    isTable: false,
+    isTable: true,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -693,7 +693,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     sort: 'custom',
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
index 70ae30975..0da0ba386 100644
--- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -199,7 +199,7 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -222,7 +222,7 @@ export const Packageunit1 = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
@@ -543,7 +543,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -566,7 +566,7 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
index 3d6f1be35..2e780eb83 100644
--- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts
@@ -129,6 +129,40 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive<CrudSchem
     },
     isForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    isTable: true,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
index b429541ac..34b928016 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@@ -246,7 +246,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -269,7 +269,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }
diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
index 2ea5edca4..c8bc2b996 100644
--- a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts
@@ -198,7 +198,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -221,7 +221,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

From d170cb2747e24e01198e497caae6a3886fc7d051 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 13 Aug 2024 10:15:57 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=92=8C=E6=89=BF=E6=8E=A5=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/addForm.vue |  5 +-
 src/views/qms/inspectionJob/index.vue   | 78 ++++++++++++++++---------
 2 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 5627ed1a2..9d92b889c 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -925,8 +925,9 @@ const buttonBaseClick = async (val) => {
   }
   // 关闭
   else if (val == 'close') {
-    //  await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
+     await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
     dialogVisible.value = false
+    emit('close')
   }
   // 暂存
   else if (val == 'staging') {
@@ -934,7 +935,7 @@ const buttonBaseClick = async (val) => {
   }
 }
 // 传递给父类
-const emit = defineEmits(['submitForm', 'searchTableSuccess'])
+const emit = defineEmits(['submitForm', 'searchTableSuccess','close'])
 const validateForm = (formRef) => {
   let _lists = formRef?.map((v) => v.validate())
   return Promise.all(_lists)
diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index c6d5d8191..be20c57a1 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -20,7 +20,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -57,6 +58,7 @@
     :rules="InspectionJobMainRules"
     :formAllSchemas="InspectionJobMain.allSchemas"
     @submitForm="submitForm"
+    @close="getList"
   />
   <!-- 详情 -->
   <Detail
@@ -83,13 +85,13 @@
     :list="list"
   />
   <el-dialog
-      v-model="showQualityReport"
-      :title="t('质检明细')"
-      :append-to-body="false"
-      destroy-on-close
-      fullscreen
-    >
-    <iframe :height="reportHeight" width="100%"  :src="qualityReport" frameborder="0"></iframe>
+    v-model="showQualityReport"
+    :title="t('质检明细')"
+    :append-to-body="false"
+    destroy-on-close
+    fullscreen
+  >
+    <iframe :height="reportHeight" width="100%" :src="qualityReport" frameborder="0"></iframe>
   </el-dialog>
 </template>
 
@@ -119,6 +121,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import AddForm from './addForm.vue'
 import Detail from './detail.vue'
 import { getReportUrl } from '@/utils/systemParam'
+import { useUserStore } from '@/store/modules/user'
 
 // 采购订单
 defineOptions({ name: 'inspectionJobMain' })
@@ -129,6 +132,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(InspectionJobMain.allSchemas.tableColumns)
+const userStore = useUserStore()
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -199,7 +203,7 @@ const buttonBaseClick = (val, item) => {
     handleExport()
   } else if (val == 'refresh') {
     // 刷新
-    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
       searchFormClick({
         filters: tableObject.params.filters
       })
@@ -231,24 +235,35 @@ const isShowMainButton2 = (row, val) => {
     return true
   }
 }
-
+// 根据状态返回该按钮是否显示
+const isShowMainButton1 = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    if (userStore.getUser.id == row.acceptUserId) {
+      return false
+    } else {
+      return true
+    }
+  } else {
+    return true
+  }
+}
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({
-      hide: isShowMainButton(row, ['1']),
-      hasPermi: 'qms:inspection-job-main:accept'
-    }), // 承接
+    // defaultButtons.mainListJobAccBtn({
+    //   hide: isShowMainButton(row, ['1']),
+    //   hasPermi: 'qms:inspection-job-main:accept'
+    // }), // 承接
     defaultButtons.mainListJobCloBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'qms:inspection-job-main:close'
     }), // 关闭
     defaultButtons.mainListJobAbaBtn({
-      hide: isShowMainButton(row, ['2']),
+      hide: isShowMainButton1(row, ['2']),
       hasPermi: 'qms:inspection-job-main:abandon'
     }), // 放弃
     defaultButtons.mainListJobExeBtn({
-      hide: isShowMainButton(row, ['2']),
+      hide: isShowMainButton(row, ['1', '2']),
       hasPermi: 'qms:inspection-job-main:execute'
     }), // 执行
     defaultButtons.mainListOrderPubBtn({
@@ -312,10 +327,19 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionJobMain')
 }
 //执行
-
 const formRef = ref()
-const execute = async (type: string, row?: number) => {
-  formRef.value.open(type, row)
+const execute = async (type: string, row?: any) => {
+  if (row.status == '2') {
+    if (userStore.getUser.id == row.acceptUserId) {
+      formRef.value.open(type, row)
+    } else {
+      message.error('承接人与当前登录人不一致')
+    }
+  } else if (row.status == '1') {
+    await handleAccept(row.id)
+    formRef.value.open(type, row)
+    await getList()
+  }
 }
 /** 关闭按钮操作 */
 const handleClose = async (id: number) => {
@@ -326,7 +350,7 @@ const handleClose = async (id: number) => {
     await InspectionJobMainApi.closeInspectionJobMain(id)
     message.success(t('common.closeSuccess'))
     // 刷新列表
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } catch {}
 }
 /** 发布按钮操作 */
@@ -338,19 +362,19 @@ const handleRelease = async (id: number) => {
     await InspectionJobMainApi.releaseInspectionJobMain(id)
     message.success('发布成功！')
     // 刷新列表
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } catch {}
 }
 // 承接
 const handleAccept = async (id: number) => {
   try {
     // 承接的二次确认
-    await message.confirm(t('common.confirmAccept'))
+    // await message.confirm(t('common.confirmAccept'))
     // 发起承接
     await InspectionJobMainApi.acceptInspectionJobMain(id)
-    message.success(t('common.acceptSuccess'))
+    // message.success(t('common.acceptSuccess'))
     // 刷新列表(TB反馈，取消承接后刷新页面)
-    buttonBaseClick('refresh',null)
+    // buttonBaseClick('refresh',null)
   } catch {}
 }
 // 放弃任务
@@ -362,7 +386,7 @@ const handleAbandon = async (id: number) => {
     await InspectionJobMainApi.abandonInspectionJobMain(id)
     message.success(t('common.giveupSuccess'))
     // 刷新列表
-    buttonBaseClick('refresh',null)
+    buttonBaseClick('refresh', null)
   } catch {}
 }
 
@@ -408,8 +432,8 @@ const submitForm = async (formType, data) => {
     // 刷新当前列表
     if (formType === 'create') {
       getList()
-    }else{
-      buttonBaseClick('refresh',null)
+    } else {
+      buttonBaseClick('refresh', null)
     }
   } finally {
     formRef.value.formLoading = false