From 3a265eb2ef839db8f7b84d4be9eaffd85a9eba1e Mon Sep 17 00:00:00 2001
From: "hongrui.an" <297504645@qq.com>
Date: Fri, 13 Jun 2025 17:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90EQI=E3=80=91=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/api/common/index.js                   |  18 +-
 Web/src/api/system/taskConifgureApi.js        |  10 +
 Web/src/components/ediTtablePage/index.vue    | 161 ++++++--
 Web/src/components/elTable/index.vue          |  42 ++-
 Web/src/components/elTable/index_norule.vue   | 336 +++++++++++++++++
 Web/src/components/elTable/index_rulr.vue     | 353 ++++++++++++++++++
 Web/src/components/tablePage/index.vue        |  10 +-
 Web/src/layout/components/Sidebar/index.vue   |   2 +-
 Web/src/styles/variables.module.scss          |   2 +-
 Web/src/utils/common/apiTableColumns.js       |  70 ++--
 Web/src/utils/common/enumList.js              |  14 +-
 Web/src/utils/request.js                      |   4 +-
 .../logisticsPlan/supplierConMmrp/index.vue   |  14 +-
 .../logisticsPlan/supplierInvData/index.vue   |   6 +-
 .../logisticsPlan/supplierMrpDate/index.vue   |   6 +-
 .../logisticsPlan/supplierMrpMonth/index.vue  |   6 +-
 .../logisticsPlan/supplierMrpState/index.vue  |   6 +-
 .../supplierMrpWarning/index.vue              |   6 +-
 .../views/logisticsPlan/supplierPo/index.vue  |   6 +-
 .../supplierProHschedul/index.vue             |   6 +-
 .../supplierProPlaning/index.vue              |   2 +
 .../supplierProTschedul/index.vue             |   6 +-
 .../logisticsPlan/supplierReturn/index.vue    |   6 +-
 .../logisticsPlan/supplierSaWeek/index.vue    |   6 +-
 .../logisticsPlan/supplierSinvData/index.vue  |   6 +-
 .../productionQuality/supplierBom/index.vue   |   6 +-
 .../supplierEmployee/index.vue                |   6 +-
 .../productionQuality/supplierInfo/index.vue  |   6 +-
 .../supplierProAttachmentData/index.vue       |   6 +-
 .../supplierProCps/index.vue                  |   6 +-
 .../supplierProData/index.vue                 |   6 +-
 .../supplierProFirstPassyield/index.vue       |   6 +-
 .../supplierProFlaw/index.vue                 |   6 +-
 .../supplierProMaterialStock/index.vue        |   6 +-
 .../supplierProProcess/index.vue              |   6 +-
 .../supplierProProcessEquipment/index.vue     |   6 +-
 .../supplierProScheduling/index.vue           |   6 +-
 .../upplierProMaterialData/index.vue          |   6 +-
 .../upplierProStationFirstPassyield/index.vue |   6 +-
 Web/src/views/system/taskConifgure/index.vue  |  68 +++-
 Web/src/views/task/taskSub/index.vue          |   6 +-
 41 files changed, 1132 insertions(+), 130 deletions(-)
 create mode 100644 Web/src/api/system/taskConifgureApi.js
 create mode 100644 Web/src/components/elTable/index_norule.vue
 create mode 100644 Web/src/components/elTable/index_rulr.vue

diff --git a/Web/src/api/common/index.js b/Web/src/api/common/index.js
index ef189f8..d11689b 100644
--- a/Web/src/api/common/index.js
+++ b/Web/src/api/common/index.js
@@ -95,4 +95,20 @@ export function getCommonDetailById(urlName,id) {
   })
 }
 
-// getCommonInfoById
\ No newline at end of file
+// 手动传出（批量）
+export function postCommonConfirmMany(urlName,data) {
+  return request({
+    url: `/api/${urlName}/confirm`,
+    method: 'post',
+    data
+  })
+}
+
+// 保存页面（批量）
+export function postCommonUpdateMany(urlName,data) {
+  return request({
+    url: `/api/${urlName}/batchupdate`,
+    method: 'post',
+    data
+  })
+}
diff --git a/Web/src/api/system/taskConifgureApi.js b/Web/src/api/system/taskConifgureApi.js
new file mode 100644
index 0000000..d2d33aa
--- /dev/null
+++ b/Web/src/api/system/taskConifgureApi.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 是否自动执行
+export function getSetisautoByUid(params) {
+  return request({
+    url: `/api/taskconifgure/setisauto`,
+    method: 'get',
+    params:params
+  })
+}
\ No newline at end of file
diff --git a/Web/src/components/ediTtablePage/index.vue b/Web/src/components/ediTtablePage/index.vue
index 1de87e0..4de5f4f 100644
--- a/Web/src/components/ediTtablePage/index.vue
+++ b/Web/src/components/ediTtablePage/index.vue
@@ -74,7 +74,7 @@
     </el-card>
     <!-- 头部详情 -->
     <el-card v-loading="state.detailLoading" class="headerInfo-container" v-if="!props.hideHeaderInfo">
-      <el-descriptions :border="true" :column="6" v-if="state.headerInfoData && state.headerInfoData.length > 0">
+      <el-descriptions :title="`当前页【第${getIndexById()}行】数据信息`" :border="true" :column="6" v-if="state.headerInfoData && state.headerInfoData.length > 0">
         <el-descriptions-item 
           v-for="(item,index) in state.headerInfoData" 
           :key="index" 
@@ -87,6 +87,7 @@
     <!-- 列表 -->
     <el-card class="paged-table-container">
       <elTable 
+        ref="table_Ref"
         :columnWidth="props.columnWidth"
         :columnHeaderAlign="props.columnHeaderAlign"
         :columnAlign="props.columnAlign"
@@ -105,7 +106,11 @@
         @editItemClearHandle="(item,scope)=>{getItemDetail(item.type,scope.row,'clear')}"
         :getEditItemDisabled="getEditItemDisabled"
         :selectableDisabled="selectableDisabled"
+        :tableRowClassName="tableRowClassName"
+        :showTableIndex="props.showTableIndex"
       ></elTable>
+      
+      <!-- :tableFormRules="state.tableFormRulesData" -->
 
       <elPager
         v-loading="state.pageLoading"
@@ -145,8 +150,10 @@
     postCommonCreate,
     putCommonUpdate,
     deleteCommonApi,
-    getCommonCustominvoke ,
-    getCommonDetailById
+    getCommonCustominvoke,
+    getCommonDetailById,
+    postCommonConfirmMany,
+    postCommonUpdateMany
   } from '@/api/common/index'
   import { ElMessageBox, ElMessage,ElTable, ElTableColumn } from 'element-plus'
   import elTable from '@/components/elTable/index.vue'
@@ -177,7 +184,7 @@
       custominvoke:{icon:'Position',auth:':custominvoke',label:'手动开关',type:'primary'},
       outputMany:{icon:'Position',auth:':outputMany',label:'手动传出',type:'primary'},
     },
-    searchRightBtn:[{icon:'Check',auth:':pageSave',label:'保存页面',type:'warning'}],
+    searchRightBtn:[{name:'pageSave',icon:'Check',auth:':pageSave',label:'保存页面',type:'warning'}],
     tableData:[],
     // table排序处理
     sortFilter:{
@@ -198,6 +205,8 @@
     stage_tableData:[],
     // 暂存更改的行数（用于保留校验更改行数）
     stage_indexs:[],
+    //tabel内部表单验证
+    tableFormRulesData:null,
   })
 
   const props = defineProps({
@@ -226,6 +235,11 @@
       type: Boolean,
       default: false
     },
+    // 序号
+    showTableIndex:{
+      type: Boolean,
+      default: true
+    },
     // 左侧操作列
     leftOperation:{
       type: Object,
@@ -290,6 +304,11 @@
       type: Object,
       default: null
     },
+    // table内表单规则
+    tableFormRules:{
+      type: Object,
+      default: null
+    },
     // 隐藏头部明细
     hideHeaderInfo:{
       type: Boolean,
@@ -301,6 +320,7 @@
       type: Object,
       default: [
         {prop:'readState',ruleValue:true},
+        // {prop:'releaseEdition',ruleValue:'2024121901'},
       ]
     },
   })
@@ -503,6 +523,9 @@
   // 获取页面数据
   function getTableData(page) {
     state.stage_indexs = []
+    state.currentDetailId = null
+    state.headerInfoData = []
+    state.tableSelectList = []
     if(props.apiType == 'detailApi'){
       state.loading = true
       if(!page)page = state.pager.page
@@ -586,25 +609,65 @@
     }
     // 手动传出（多选）
     else if (btn == 'outputMany'){
+      let _idEditData = checkPageEditList()
+      if(_idEditData && _idEditData.length > 0){
+        return ElMessage.warning('当前有未保存修改项，请先保存页面')
+      }
       if(!state.tableSelectList || state.tableSelectList.length <= 0 ){
         return ElMessage.warning('未选中任何数据')
       }
-      // todo:提交接口
-      console.log(state.tableSelectList)
+      ElMessageBox.confirm('是否确定手动传出？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        state.loading = true
+        postCommonConfirmMany(props.apiName,state.tableSelectList)
+        .then(res=>{
+          ElMessage.success('操作成功！')   
+          getTableData(1)
+        })
+        .finally(()=>{state.loading = false})
+      })
     }
   }
+  const table_Ref = ref(null)
   // 头部右侧按钮功能
   function searchRightBtnHandle(btn){
-    let _idEditData = checkPageEditList()
-    if(!_idEditData || _idEditData.length <= 0)return ElMessage.warning('暂无数据修改')
-    ElMessageBox.confirm('是否确定提交更改？', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    }).then(() => {
-      // todo:提交接口
-      console.log(613,_idEditData)
-    })
+    // 保存页面
+    if(btn.name == 'pageSave'){
+      table_Ref.value.tableForm_Ref.validate((valid)=>{
+        if(valid){
+          let _idEditData = checkPageEditList()
+          if(!_idEditData || _idEditData.length <= 0)return ElMessage.warning('暂无数据修改')
+          // 判断规则 目前风险页面通用，暂时写在通用方式中，如果后期有区别，可拿到页面外处理
+          // 规则：反馈结果[feedbackResults]=1时，风险类型[ventureType],具体风险[ventureSpecific]必填
+          let _indexs = []
+          _idEditData.forEach(item=>{
+            if(item.feedbackResults == '1' && (!item.ventureType || !item.ventureSpecific || item.ventureSpecifi == '')){
+              _indexs.push(getIndexById(item.id))
+            }
+          })
+          if(_indexs && _indexs.length > 0){
+            return ElMessage.error(`修改数据中【第${_indexs}行】数据中，【反馈结果】为异常，但【风险类型】或【具体风险】为空，请修改后重新提交！`)
+          }
+          ElMessageBox.confirm('是否确定提交更改？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            state.loading = true
+            postCommonUpdateMany(props.apiName,_idEditData)
+              .then(res=>{
+                ElMessage.success('操作成功！')   
+                getTableData(1)
+              })
+              .finally(()=>{state.loading = false})
+          })
+        }
+      })
+    }
+    
   }
 
   // 排序
@@ -662,15 +725,18 @@
     return _name
   }
 
-  // 判断可编辑元素是否禁用
-  function getEditItemDisabled(item,row,index){
-    let _auth = auths.hasPermission(props.apiName+':pageSave')
-    if(item.disabled || !_auth){
-      return true
-    }
-    if(state.tableSelectList && state.tableSelectList.length > 0){
-      return true
+  // 获取当前第几行数据的明细
+  function getIndexById(id){
+    let _id = id || state.currentDetailId
+    for(let i=0;i<state.stage_tableData.length;i++){
+      if(state.stage_tableData[i].id == _id){
+        return i + 1
+      }
     }
+  }
+
+  // 检查行数据是否符合禁用规则
+  function checkDisableByRowRule(row){
     let hasDisable = false
     for(let i = 0;i<props.editDisabledConfig.length;i++){
       if(row[props.editDisabledConfig[i].prop] == props.editDisabledConfig[i].ruleValue){
@@ -681,17 +747,34 @@
     return hasDisable
   }
 
+  // 判断可编辑元素是否禁用
+  function getEditItemDisabled(item,row,index){
+    // 无权限禁用
+    let _auth = auths.hasPermission(props.apiName+':pageSave')
+    if(item.disabled || !_auth){
+      return true
+    }
+    // 已勾选禁用
+    if(state.tableSelectList && state.tableSelectList.length > 0){
+      return true
+    }
+    // 行条件禁用
+    return checkDisableByRowRule(row)
+  }
+
   // table的复选框是否禁用判断
   function selectableDisabled(row,index){
+    // 无权限禁用
     let _auth = auths.hasPermission(props.apiName+':outputMany')
-    if(!_auth)return false
+    // 已修改禁用
     let _idEditData = checkPageEditList()
-    return !_idEditData || _idEditData.length <= 0
+    // 行条件禁用(暂时与编辑页面用一个条件，如有区别再进行封装)
+    let checkRow = checkDisableByRowRule(row)
+    return _auth && (!_idEditData || _idEditData.length <= 0) && !checkRow
   }
 
-  // 可编辑元素Focus事件
+  // 可编辑元素Focus事件 todo:如果加上表单验证后，需要处理表单点击
   function getItemDetail(type,row,eventType) {
-    state.tableSelectList = []
     // 如果是相同id，避免重复：阻止接口
     if(row.id == state.currentDetailId){return}
     let _focuseExt = ['input','numberInput']
@@ -761,7 +844,29 @@
     }
   }
 
+  // 行变色
+  function tableRowClassName(data){
+    if(data.row.id == state.currentDetailId){return 'current-select-tableRow'}
+    else{return 'normal-tableRow'}
+  }
+
+  // 根据apiTableColumns转义table内表单默认规则
+  // todo:feedbackResults相应的特殊规则处理,measures也需要处理
+  function getTableFormRules(){
+    if(props.tableFormRules) {
+      state.tableFormRulesData = props.tableFormRules
+    }else{
+      state.tableFormRulesData = {}
+      apiTableColumns[props.apiName].forEach(item=>{
+        if(item.required){
+          state.tableFormRulesData[item.prop] = [{ required: true, message: '必填项', trigger: 'change' }]
+        }
+      })
+    }
+  }
+
   onMounted(() => {
+    // getTableFormRules()
     getTableData()
   })
 
diff --git a/Web/src/components/elTable/index.vue b/Web/src/components/elTable/index.vue
index 0cbc993..9789b91 100644
--- a/Web/src/components/elTable/index.vue
+++ b/Web/src/components/elTable/index.vue
@@ -6,7 +6,8 @@
     :border="true"
     @sort-change="sortChange"
     @selection-change="tableSelectionHandle"
-    :row-class-name="'setDisabledStyle'"
+    :row-class-name="props.tableRowClassName"
+    :cell-class-name="props.tableCellClassName"
   >
     <!-- 多选框 -->
     <el-table-column 
@@ -16,6 +17,8 @@
       width="55" 
       :selectable="selectableDisabled"
     />
+    <!-- 序号 -->
+    <el-table-column v-if="props.showTableIndex" :fixed="'left'" type="index" width="50" />
     <!-- 左侧操作列 -->
     <el-table-column 
       v-if="props.leftOperation && props.leftOperation.length > 0"
@@ -91,9 +94,9 @@
           v-else-if="item.type == 'datetimeInput'"
           v-model="scope.row[item.prop]"
           style="width:100%"
-          type="datetime"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          :type="item.inputType || 'datetime'"
+          :format="item.format || 'YYYY-MM-DD HH:mm:ss'"
+          :value-format="item.valueFormat || 'YYYY-MM-DD HH:mm:ss'"
           :clearable="!item.noClear"
           :disabled="getEditItemDisabled(item,scope.row,scope)"
           @focus="(event)=>{editItemFocusHandle(item,scope,event)}"
@@ -152,6 +155,11 @@
       type: Boolean,
       default: false
     },
+    // 序号
+    showTableIndex:{
+      type: Boolean,
+      default: false
+    },
     // 左侧操作列
     leftOperation:{
       type: Object,
@@ -206,7 +214,17 @@
     selectableDisabled:{
       type: [Function,Boolean],
       default: true
-    }
+    },
+    // 行class
+    tableRowClassName:{
+      type: Function,
+      default: null
+    },
+    // 单元格class
+    tableCellClassName:{
+      type: Function,
+      default: null
+    },
   })
 
   const emits = defineEmits([
@@ -302,5 +320,17 @@
 
 </script>
   
-<style></style>
+<style scope lang="scss">
+.current-select-tableRow{
+  background:#e1f3d8 !important;
+  td{
+    background:#e1f3d8 !important;
+  }
+}
+.normal-tableRow{
+  td{
+    background:#fff;
+  }
+}
+</style>
   
\ No newline at end of file
diff --git a/Web/src/components/elTable/index_norule.vue b/Web/src/components/elTable/index_norule.vue
new file mode 100644
index 0000000..9789b91
--- /dev/null
+++ b/Web/src/components/elTable/index_norule.vue
@@ -0,0 +1,336 @@
+<template>
+  <el-table 
+    ref="tableRef" 
+    row-key="id" 
+    :data="props.tableData" 
+    :border="true"
+    @sort-change="sortChange"
+    @selection-change="tableSelectionHandle"
+    :row-class-name="props.tableRowClassName"
+    :cell-class-name="props.tableCellClassName"
+  >
+    <!-- 多选框 -->
+    <el-table-column 
+      v-if="props.multipleTable"
+      type="selection" 
+      :fixed="'left'"
+      width="55" 
+      :selectable="selectableDisabled"
+    />
+    <!-- 序号 -->
+    <el-table-column v-if="props.showTableIndex" :fixed="'left'" type="index" width="50" />
+    <!-- 左侧操作列 -->
+    <el-table-column 
+      v-if="props.leftOperation && props.leftOperation.length > 0"
+      :fixed="'left'"
+      :width="props.leftOperationColumnWidth"
+      label="操作"
+      :align="'center'">
+      <template #default="scope">
+        <el-button
+          v-for="(btn,index) in props.leftOperation"
+          :key="index"
+          :type="btn.type"
+          :link="btn.link"
+          @click="leftOperationHadel(btn,scope)"
+        >{{btn.label}}</el-button>
+      </template>
+    </el-table-column>
+
+    <!-- 数据列 -->
+    <el-table-column
+      v-for="(item, index) in props.tableColumns" 
+      :key="index"
+      :label="item.title"
+      :prop="item.prop"
+      :sortable="item.sortable || 'custom'"
+      :fixed="item.fixed"
+      :width="item.width || props.columnWidth"
+      :align="item.align || props.columnAlign"
+      :header-align="item.headerAlign || props.columnHeaderAlign">
+      <template #default="scope">
+        <!-- 时间格式 -->
+        <span v-if="item.type == 'datetime'"> {{ formatTableDate(scope.row[item.prop]) }} </span>
+        <!-- 标签格式 -->
+        <el-tag
+          v-else-if="item.type == 'tagFilter'"
+          :type="formatTableTagFilter('type',scope.row,item)"
+        >
+          {{ formatTableTagFilter('label',scope.row,item) }}
+        </el-tag>
+        <!-- 字典 -->
+        <span v-else-if="item.type == 'filter'">{{ formatTableTagFilter('label',scope.row,item) }}</span>
+        <!-- 【可编辑】文本 -->
+        <el-input 
+          v-else-if="item.type == 'input'"
+          v-model="scope.row[item.prop]" 
+          :placeholder="item.label" 
+          :disabled="getEditItemDisabled(item,scope.row,scope)"
+          :clearable="!item.noClear"
+          @focus="(event)=>{editItemFocusHandle(item,scope,event)}"
+          @change="editItemChangeHandle(item,scope,arguments)"
+          @clear="editItemClearHandle(item,scope)"
+        />
+        <!-- 【可编辑】字典选择 -->
+        <el-select
+          v-else-if="item.type == 'filterSelect'"
+          v-model="scope.row[item.prop]"
+          :filterable="!item.noSearch"
+          placeholder="请选择"
+          :disabled="getEditItemDisabled(item,scope.row,scope)"
+          :clearable="!item.noClear"
+          @focus="(event)=>{editItemFocusHandle(item,scope,event)}"
+          @change="editItemChangeHandle(item,scope,arguments)"
+          @clear="editItemClearHandle(item,scope)">
+          <el-option
+            v-for="(op,op_index) in item.options"
+            :key="op_index"
+            :label="op.label"
+            :value="op.value"
+          />
+        </el-select>
+        <!-- 【可编辑】时间 -->
+        <el-date-picker
+          v-else-if="item.type == 'datetimeInput'"
+          v-model="scope.row[item.prop]"
+          style="width:100%"
+          :type="item.inputType || 'datetime'"
+          :format="item.format || 'YYYY-MM-DD HH:mm:ss'"
+          :value-format="item.valueFormat || 'YYYY-MM-DD HH:mm:ss'"
+          :clearable="!item.noClear"
+          :disabled="getEditItemDisabled(item,scope.row,scope)"
+          @focus="(event)=>{editItemFocusHandle(item,scope,event)}"
+          @change="editItemChangeHandle(item,scope,arguments)"
+          @clear="editItemClearHandle(item,scope)"
+        />
+        <!-- 【可编辑】数字 -->
+        <el-input-number 
+          v-else-if="item.type == 'numberInput'"
+          v-model="scope.row[item.prop]" 
+          :min="item.min"
+          :max="item.max"
+          :disabled="getEditItemDisabled(item,scope.row,scope)"
+          @focus="(event)=>{editItemFocusHandle(item,scope,event)}"
+          @change="editItemChangeHandle(item,scope,arguments)"
+        />
+        <!-- 正常直接显示 -->
+        <span v-else> {{ scope.row[item.prop] }} </span>
+      </template>
+    </el-table-column>
+
+    <!-- 右侧操作列 -->
+    <el-table-column 
+      v-if="props.rightOperation && props.rightOperation.length > 0"
+      v-auth-any="getShowRightOpera()"
+      :fixed="'right'"
+      :width="props.rightOperationColumnWidth"
+      :align="'center'"
+      label="操作">
+      <template #default="scope">
+        <el-button
+          v-for="(btn,index) in props.rightOperation"
+          v-show="typeof btn.hide == 'function' ? !btn.hide(scope.row,scope) : !btn.hide"
+          :key="index"
+          :type="btn.type"
+          :link="btn.link"
+          @click="rightOperationHadel(btn,scope)"
+          v-auth="btn.auth"
+        >{{btn.label}}</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+  
+<script setup>
+  defineOptions({ name: 'elTable' })
+  import { reactive, ref, onMounted } from 'vue'
+  import { ElMessageBox, ElMessage,ElTable, ElTableColumn } from 'element-plus'
+  import { formatTimeStrToStr } from "@/utils/formatTime";
+  
+  const state = reactive({})
+
+  const props = defineProps({
+    // 多选
+    multipleTable:{
+      type: Boolean,
+      default: false
+    },
+    // 序号
+    showTableIndex:{
+      type: Boolean,
+      default: false
+    },
+    // 左侧操作列
+    leftOperation:{
+      type: Object,
+      default: null
+    },
+    // 左侧操作列宽度
+    leftOperationColumnWidth:{
+      type: Number,
+      default: 120
+    },
+    // 右侧操作列
+    rightOperation:{
+      type: Object,
+      default: null
+    },
+    // 右侧操作列宽度
+    rightOperationColumnWidth:{
+      type: Number,
+      default: 150
+    },
+    // table数据
+    tableData: {
+      type: Object,
+      default: []
+    },
+    // table表头
+    tableColumns: {
+      type: Object,
+      default: []
+    },
+    // 表头宽度
+    columnWidth:{
+      type: Number,
+      default: null
+    },
+    // 表头对齐
+    columnHeaderAlign:{
+      type: String,
+      default: 'center'
+    },
+    // 表内容对齐
+    columnAlign:{
+      type: String,
+      default: 'center'
+    },
+    // 可编辑单元格判断禁用
+    getEditItemDisabled:{
+      type: [Function,Boolean],
+      default: false
+    },
+    // table的复选框是否禁用判断
+    selectableDisabled:{
+      type: [Function,Boolean],
+      default: true
+    },
+    // 行class
+    tableRowClassName:{
+      type: Function,
+      default: null
+    },
+    // 单元格class
+    tableCellClassName:{
+      type: Function,
+      default: null
+    },
+  })
+
+  const emits = defineEmits([
+    'sortChange',
+    'leftOperationHadel',
+    'rightOperationHadel',
+    'tableSelectionHandle',
+    'editItemFocusHandle',
+    'editItemChangeHandle',
+    'editItemClearHandle',
+  ])
+
+  // 多选
+  function tableSelectionHandle (val){
+    emits('tableSelectionHandle',val)
+  }
+
+  // 格式化时间
+  function formatTableDate(time) {
+    let _time = '-'
+    if (time) { _time = formatTimeStrToStr(time) }
+    return _time
+  }
+  
+  // 格式化TagFilter
+  function formatTableTagFilter(type,row,item){
+    let _op = item.options.filter(op=>op.value == row[item.prop])
+    if(!_op || _op.length <=0 || !_op[0][type]){
+      if(type=='type'){return 'info'}
+      else{return '--'}
+    }else{
+      return _op[0][type]
+    }
+  }
+
+  
+  //排序
+  function sortChange(data) {
+    emits('sortChange',data)
+  }
+
+  // 左侧操作列
+  function leftOperationHadel(btn,scope) {
+    emits('leftOperationHadel',btn,scope)
+  }
+
+  // 判断是否显示右侧操作权限
+  function getShowRightOpera(){
+    let _arr = []
+    props.rightOperation.forEach(item=>{_arr.push(item.auth)})
+    return _arr
+  }
+
+  // 判断可编辑元素是否禁用
+  function getEditItemDisabled(item,row,scope){
+    if(typeof props.getEditItemDisabled == 'boolean'){
+      return props.getEditItemDisabled
+    }else{
+      return props.getEditItemDisabled(item,row,scope.$index)
+    }
+  }
+
+  // table的复选框是否禁用判断
+  function selectableDisabled(row,index){
+    if(typeof props.selectableDisabled == 'function'){
+      return props.selectableDisabled(row,index)
+    }else{
+      return props.selectableDisabled
+    }
+  }
+
+  // 可编辑元素Focus事件
+  function editItemFocusHandle(item,scope,event) {
+    emits('editItemFocusHandle',item,scope,event)
+  }
+
+  // 可编辑元素change事件
+  function editItemChangeHandle(item,scope,data) {
+    emits('editItemChangeHandle',item,scope,data)
+  }
+
+  // 可编辑元素clear事件
+  function editItemClearHandle(item,scope) {
+    emits('editItemClearHandle',item,scope)
+  }
+
+  // 右侧操作列
+  function rightOperationHadel(btn,scope) {
+    emits('rightOperationHadel',btn,scope)
+  }
+
+  onMounted(() => {})
+
+</script>
+  
+<style scope lang="scss">
+.current-select-tableRow{
+  background:#e1f3d8 !important;
+  td{
+    background:#e1f3d8 !important;
+  }
+}
+.normal-tableRow{
+  td{
+    background:#fff;
+  }
+}
+</style>
+  
\ No newline at end of file
diff --git a/Web/src/components/elTable/index_rulr.vue b/Web/src/components/elTable/index_rulr.vue
new file mode 100644
index 0000000..4862e6a
--- /dev/null
+++ b/Web/src/components/elTable/index_rulr.vue
@@ -0,0 +1,353 @@
+<template>
+<el-form style="height:calc(100% - 45px)" :model="props" :rules="props.tableFormRules" ref="tableForm_Ref">
+  <el-table 
+    style="height:100%"
+    row-key="id" 
+    :data="props.tableData" 
+    :border="true"
+    @sort-change="sortChange"
+    @selection-change="tableSelectionHandle"
+    :row-class-name="props.tableRowClassName"
+    :cell-class-name="props.tableCellClassName"
+  >
+    <!-- 多选框 -->
+    <el-table-column 
+      v-if="props.multipleTable"
+      type="selection" 
+      :fixed="'left'"
+      width="55" 
+      :selectable="selectableDisabled"
+    />
+    <!-- 序号 -->
+    <el-table-column v-if="props.showTableIndex" :fixed="'left'" type="index" width="50" />
+    <!-- 左侧操作列 -->
+    <el-table-column 
+      v-if="props.leftOperation && props.leftOperation.length > 0"
+      :fixed="'left'"
+      :width="props.leftOperationColumnWidth"
+      label="操作"
+      :align="'center'">
+      <template #default="scope">
+        <el-button
+          v-for="(btn,index) in props.leftOperation"
+          :key="index"
+          :type="btn.type"
+          :link="btn.link"
+          @click="leftOperationHadel(btn,scope)"
+        >{{btn.label}}</el-button>
+      </template>
+    </el-table-column>
+
+    <!-- 数据列 -->
+    <el-table-column
+      v-for="(item, index) in props.tableColumns" 
+      :key="index"
+      :label="item.title"
+      :prop="item.prop"
+      :sortable="item.sortable || 'custom'"
+      :fixed="item.fixed"
+      :width="item.width || props.columnWidth"
+      :align="item.align || props.columnAlign"
+      :header-align="item.headerAlign || props.columnHeaderAlign">
+      <template #default="scope">
+          <!-- `tableData[${scope.$index}][${item.prop}]` -->
+          <el-form-item 
+            :prop="'tableData.'+ scope.$index + '.' + item.prop"
+            :rules="props.tableFormRules[item.prop]"
+          >
+            <!-- 时间格式 -->
+            <span v-if="item.type == 'datetime'"> {{ formatTableDate(scope.row[item.prop]) }} </span>
+            <!-- 标签格式 -->
+            <el-tag
+              v-else-if="item.type == 'tagFilter'"
+              :type="formatTableTagFilter('type',scope.row,item)"
+            >
+              {{ formatTableTagFilter('label',scope.row,item) }}
+            </el-tag>
+            <!-- 字典 -->
+            <span v-else-if="item.type == 'filter'">{{ formatTableTagFilter('label',scope.row,item) }}</span>
+            <!-- 【可编辑】文本 -->
+            <el-input 
+              v-else-if="item.type == 'input'"
+              v-model="scope.row[item.prop]" 
+              :placeholder="item.label" 
+              :disabled="getEditItemDisabled(item,scope.row,scope)"
+              :clearable="!item.noClear"
+              @focus="(event)=>{editItemFocusHandle(item,scope,event)}"
+              @change="editItemChangeHandle(item,scope,arguments)"
+              @clear="editItemClearHandle(item,scope)"
+            />
+            <!-- 【可编辑】字典选择 -->
+            <el-select
+              v-else-if="item.type == 'filterSelect'"
+              v-model="scope.row[item.prop]"
+              :filterable="!item.noSearch"
+              placeholder="请选择"
+              :disabled="getEditItemDisabled(item,scope.row,scope)"
+              :clearable="!item.noClear"
+              @focus="(event)=>{editItemFocusHandle(item,scope,event)}"
+              @change="editItemChangeHandle(item,scope,arguments)"
+              @clear="editItemClearHandle(item,scope)">
+              <el-option
+                v-for="(op,op_index) in item.options"
+                :key="op_index"
+                :label="op.label"
+                :value="op.value"
+              />
+            </el-select>
+            <!-- 【可编辑】时间 -->
+            <el-date-picker
+              v-else-if="item.type == 'datetimeInput'"
+              v-model="scope.row[item.prop]"
+              style="width:100%"
+              :type="item.inputType || 'datetime'"
+              :format="item.format || 'YYYY-MM-DD HH:mm:ss'"
+              :value-format="item.valueFormat || 'YYYY-MM-DD HH:mm:ss'"
+              :clearable="!item.noClear"
+              :disabled="getEditItemDisabled(item,scope.row,scope)"
+              @focus="(event)=>{editItemFocusHandle(item,scope,event)}"
+              @change="editItemChangeHandle(item,scope,arguments)"
+              @clear="editItemClearHandle(item,scope)"
+            />
+            <!-- 【可编辑】数字 -->
+            <el-input-number 
+              v-else-if="item.type == 'numberInput'"
+              v-model="scope.row[item.prop]" 
+              :min="item.min"
+              :max="item.max"
+              :disabled="getEditItemDisabled(item,scope.row,scope)"
+              @focus="(event)=>{editItemFocusHandle(item,scope,event)}"
+              @change="editItemChangeHandle(item,scope,arguments)"
+            />
+            <!-- 正常直接显示 -->
+            <span v-else> {{ scope.row[item.prop] }} </span>
+          </el-form-item>
+      </template>
+    </el-table-column>
+
+    <!-- 右侧操作列 -->
+    <el-table-column 
+      v-if="props.rightOperation && props.rightOperation.length > 0"
+      v-auth-any="getShowRightOpera()"
+      :fixed="'right'"
+      :width="props.rightOperationColumnWidth"
+      :align="'center'"
+      label="操作">
+      <template #default="scope">
+        <el-button
+          v-for="(btn,index) in props.rightOperation"
+          v-show="typeof btn.hide == 'function' ? !btn.hide(scope.row,scope) : !btn.hide"
+          :key="index"
+          :type="btn.type"
+          :link="btn.link"
+          @click="rightOperationHadel(btn,scope)"
+          v-auth="btn.auth"
+        >{{btn.label}}</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</el-form>
+</template>
+  
+<script setup>
+  defineOptions({ name: 'elTable' })
+  import { reactive, ref, onMounted,defineExpose } from 'vue'
+  import { ElMessageBox, ElMessage,ElTable, ElTableColumn } from 'element-plus'
+  import { formatTimeStrToStr } from "@/utils/formatTime";
+  
+  const state = reactive({})
+
+  const props = defineProps({
+    // 多选
+    multipleTable:{
+      type: Boolean,
+      default: false
+    },
+    // 序号
+    showTableIndex:{
+      type: Boolean,
+      default: false
+    },
+    // 左侧操作列
+    leftOperation:{
+      type: Object,
+      default: null
+    },
+    // 左侧操作列宽度
+    leftOperationColumnWidth:{
+      type: Number,
+      default: 120
+    },
+    // 右侧操作列
+    rightOperation:{
+      type: Object,
+      default: null
+    },
+    // 右侧操作列宽度
+    rightOperationColumnWidth:{
+      type: Number,
+      default: 150
+    },
+    // table数据
+    tableData: {
+      type: Object,
+      default: []
+    },
+    // table表头
+    tableColumns: {
+      type: Object,
+      default: []
+    },
+    // 表头宽度
+    columnWidth:{
+      type: Number,
+      default: null
+    },
+    // 表头对齐
+    columnHeaderAlign:{
+      type: String,
+      default: 'center'
+    },
+    // 表内容对齐
+    columnAlign:{
+      type: String,
+      default: 'center'
+    },
+    // table输入表单的rules
+    tableFormRules: {
+      type: Object,
+      default: null
+    },
+    // 可编辑单元格判断禁用
+    getEditItemDisabled:{
+      type: [Function,Boolean],
+      default: false
+    },
+    // table的复选框是否禁用判断
+    selectableDisabled:{
+      type: [Function,Boolean],
+      default: true
+    },
+    // 行class
+    tableRowClassName:{
+      type: Function,
+      default: null
+    },
+    // 单元格class
+    tableCellClassName:{
+      type: Function,
+      default: null
+    },
+  })
+
+  const emits = defineEmits([
+    'sortChange',
+    'leftOperationHadel',
+    'rightOperationHadel',
+    'tableSelectionHandle',
+    'editItemFocusHandle',
+    'editItemChangeHandle',
+    'editItemClearHandle',
+  ])
+
+  // 多选
+  function tableSelectionHandle (val){
+    emits('tableSelectionHandle',val)
+  }
+
+  // 格式化时间
+  function formatTableDate(time) {
+    let _time = '-'
+    if (time) { _time = formatTimeStrToStr(time) }
+    return _time
+  }
+  
+  // 格式化TagFilter
+  function formatTableTagFilter(type,row,item){
+    let _op = item.options.filter(op=>op.value == row[item.prop])
+    if(!_op || _op.length <=0 || !_op[0][type]){
+      if(type=='type'){return 'info'}
+      else{return '--'}
+    }else{
+      return _op[0][type]
+    }
+  }
+
+  
+  //排序
+  function sortChange(data) {
+    emits('sortChange',data)
+  }
+
+  // 左侧操作列
+  function leftOperationHadel(btn,scope) {
+    emits('leftOperationHadel',btn,scope)
+  }
+
+  // 判断是否显示右侧操作权限
+  function getShowRightOpera(){
+    let _arr = []
+    props.rightOperation.forEach(item=>{_arr.push(item.auth)})
+    return _arr
+  }
+
+  // 判断可编辑元素是否禁用
+  function getEditItemDisabled(item,row,scope){
+    if(typeof props.getEditItemDisabled == 'boolean'){
+      return props.getEditItemDisabled
+    }else{
+      return props.getEditItemDisabled(item,row,scope.$index)
+    }
+  }
+
+  // table的复选框是否禁用判断
+  function selectableDisabled(row,index){
+    if(typeof props.selectableDisabled == 'function'){
+      return props.selectableDisabled(row,index)
+    }else{
+      return props.selectableDisabled
+    }
+  }
+
+  // 可编辑元素Focus事件
+  function editItemFocusHandle(item,scope,event) {
+    emits('editItemFocusHandle',item,scope,event)
+  }
+
+  // 可编辑元素change事件
+  function editItemChangeHandle(item,scope,data) {
+    emits('editItemChangeHandle',item,scope,data)
+  }
+
+  // 可编辑元素clear事件
+  function editItemClearHandle(item,scope) {
+    emits('editItemClearHandle',item,scope)
+  }
+
+  // 右侧操作列
+  function rightOperationHadel(btn,scope) {
+    emits('rightOperationHadel',btn,scope)
+  }
+
+  const tableForm_Ref = ref(null)
+  defineExpose({
+    tableForm_Ref,
+  });
+  onMounted(() => {})
+
+</script>
+  
+<style scope lang="scss">
+.current-select-tableRow{
+  background:#e1f3d8 !important;
+  td{
+    background:#e1f3d8 !important;
+  }
+}
+.normal-tableRow{
+  td{
+    background:#fff;
+  }
+}
+</style>
+  
\ No newline at end of file
diff --git a/Web/src/components/tablePage/index.vue b/Web/src/components/tablePage/index.vue
index 9530657..1bb72e9 100644
--- a/Web/src/components/tablePage/index.vue
+++ b/Web/src/components/tablePage/index.vue
@@ -106,7 +106,7 @@
   defineOptions({ name: 'tablePage' })
   import store from '@/stores'
   import apiTableColumns from '@/utils/common/apiTableColumns'
-  import { reactive, ref, onMounted,computed } from 'vue'
+  import { reactive, ref, onMounted,computed,defineExpose } from 'vue'
   import { 
     getCommonPaged,
     getCommonDeatailPaged,
@@ -323,7 +323,6 @@
           ElMessage.success('操作成功！')      
           getTableData(1);
         })
-        .catch(err=>{ElMessage.error('操作失败！')})
         .finally(()=>{state.loading = false})
       })
     }
@@ -381,10 +380,12 @@
   // 格式化页面传参
   function getPageParams(){
     let _filters = []
+    console.log(383,props.searchFilter)
     if(props.hideSearch){
       _filters = props.searchFilter
     }else{
       for(let i in props.searchFilter){
+        console.log(388,i)
         let _item = props.searchOptions.filter(item=>item.prop == i)
         let _type = (_item && _item.length > 0) ? _item[0].type : null
         if(props.searchFilter[i] || props.searchFilter[i] == 0){
@@ -566,4 +567,9 @@
   onMounted(() => {
     getTableData()
   })
+
+  defineExpose({
+    state,
+    getTableData
+  });
 </script>
\ No newline at end of file
diff --git a/Web/src/layout/components/Sidebar/index.vue b/Web/src/layout/components/Sidebar/index.vue
index 552d3be..cee4d5f 100644
--- a/Web/src/layout/components/Sidebar/index.vue
+++ b/Web/src/layout/components/Sidebar/index.vue
@@ -113,7 +113,7 @@ div.el-scrollbar__view {
 }
 
 .aside-container:not(.collapsed) {
-  width: 210px; /* 默认宽度 */
+  width: 260px; /* 默认宽度 */
 }
 
 .el-menu{
diff --git a/Web/src/styles/variables.module.scss b/Web/src/styles/variables.module.scss
index 7faa471..a1dd0a9 100644
--- a/Web/src/styles/variables.module.scss
+++ b/Web/src/styles/variables.module.scss
@@ -15,7 +15,7 @@ $menuHover_dark: #1e1e1e;
 $subMenuBg_dark: #3c3c3c;
 $subMenuHover_dark: #1e1e1e;
 
-$sideBarWidth: 210px;
+$sideBarWidth: 260px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/Web/src/utils/common/apiTableColumns.js b/Web/src/utils/common/apiTableColumns.js
index 92449ca..84a09aa 100644
--- a/Web/src/utils/common/apiTableColumns.js
+++ b/Web/src/utils/common/apiTableColumns.js
@@ -10,7 +10,7 @@ const apiTableColumns = {
         {prop:'corn',title:'corn'},
         {prop:'writeState',title:'writeState',type:'tagFilter',options:EnumList.whetherBoolean},
         {prop:'readState',title:'readState',type:'tagFilter',options:EnumList.whetherBoolean},
-        {prop:'isAuto',title:'isAuto',type:'tagFilter',options:EnumList.whetherBoolean},
+        {prop:'isAuto',title:'是否自动执行',type:'tagFilter',options:EnumList.whetherBoolean},
         {prop:'remark',title:'remark',align:'left',width:300},
         {prop:'creationTime',title:'创建时间',width:180,type:'datetime',noEdit:true},
         {prop:'module',title:'module'},
@@ -57,7 +57,7 @@ const apiTableColumns = {
         {prop:'quantity6',title:'数量6'},
         {prop:'plant',title:'工厂'},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
@@ -85,7 +85,7 @@ const apiTableColumns = {
         {prop:'quantityDemand12',title:'需求数量12',width:130},
         {prop:'isUpdate',title:'是否更新',type:'tagFilter',options:EnumList.whether},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
@@ -93,17 +93,14 @@ const apiTableColumns = {
     ],
     // M+6月物料需求计划风险确认
     cherysupplierconmmrp:[
-        {prop:'supplierCode',title:'供应商代码',type:'input',required:true},
-        {prop:'releaseEdition',title:'需求发布版次',width:150,type:'input',required:true},
-        {prop:'materialCode',title:'零件号',type:'input',required:true},
-        {prop:'plantId',title:'工厂代码',type:'input',required:true},
+        {prop:'supplierCode',title:'供应商代码',width:150,align:'left'},
+        {prop:'releaseEdition',title:'需求发布版次',width:150},
+        {prop:'materialCode',title:'零件号'},
+        {prop:'plantId',title:'工厂代码',width:120},
         {prop:'feedbackResults',title:'反馈结果',type:'filterSelect',options:EnumList.feedbackResults,required:true},
-        // todo:当反馈结果=1时，此字段必输
         {prop:'ventureType',title:'风险类型',type:'filterSelect',options:EnumList.ventureType},
-        // todo:当反馈结果=1时，此字段必输
         {prop:'ventureSpecific',title:'具体风险',type:'input'},
         {prop:'measures',title:'应对措施',type:'input'},
-        {prop:'startMonth',title:'起始月份',type:'datetimeInput',required:true},
         {prop:'quantityMeet1',title:'满足数量1',type:'numberInput',required:true},
         {prop:'quantityMeet2',title:'满足数量2',type:'numberInput',required:true},
         {prop:'quantityMeet3',title:'满足数量3',type:'numberInput',required:true},
@@ -116,6 +113,8 @@ const apiTableColumns = {
         {prop:'quantityMeet10',title:'满足数量10',type:'numberInput'},
         {prop:'quantityMeet11',title:'满足数量11',type:'numberInput'},
         {prop:'quantityMeet12',title:'满足数量12',type:'numberInput'},
+        {prop:'startMonth',title:'起始月份'},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // M+6月物料需求计划风险确认-明细
     cherysupplierconmmrpDetail:[
@@ -191,7 +190,7 @@ const apiTableColumns = {
         {prop:'quantityDemand31',title:'需求数量31',width:130},
         {prop:'is_update',title:'是否更新',type:'tagFilter',options:EnumList.whether},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
@@ -208,7 +207,7 @@ const apiTableColumns = {
         {prop:'quantityDemand',title:'需求数量'},
         {prop:'dateReceived',title:'交货日期',width:180},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
@@ -219,29 +218,41 @@ const apiTableColumns = {
         {prop:'purchaseOrder',title:'采购订单号',width:120},
         {prop:'serialNumber',title:'行项目号'},
         {prop:'plantId',title:'工厂代码'},
-        {prop:'plantName',title:'工厂名称'},
+        {prop:'plantName',title:'工厂名称',width:160},
         {prop:'voucherDate',title:'凭证日期',width:180},
         {prop:'purchaser',title:'需方联系人'},
         {prop:'supplier',title:'供方联系人'},
-        {prop:'materialCode',title:'物料编码'},
-        {prop:'materialDescription',title:'物料描述'},
+        {prop:'materialCode',title:'物料编码',width:180},
+        {prop:'materialDescription',title:'物料描述',width:180},
         {prop:'quantityDemand',title:'需求数量'},
         {prop:'materialUnit',title:'物料单位'},
         {prop:'deliveryDate',title:'交货日期',width:180},
         {prop:'deliveryPlace',title:'交货地点'},
         {prop:'quantityDelivery',title:'到货数量'},
-        {prop:'note',title:'备注'},
+        {prop:'note',title:'备注',width:200},
         {prop:'itemType',title:'项目类别文本',width:150},
         {prop:'tradeTerms',title:'国际贸易条件',width:150},
         {prop:'country',title:'出口国家'},
         {prop:'batch',title:'批次'},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
         {prop:'version',title:'版本号'},
     ],
+    // 采购订单风险确认
+    cherysupplierconpo:[
+        {prop:'supplierCode',title:'供应商代码'},
+        {prop:'purchaseOrder',title:'采购订单号',type:'input',required:true,width:120},
+        {prop:'serialNumber',title:'行项目号',type:'input',required:true},
+        {prop:'quantityMeet',title:'满足数量',type:'numberInput',required:true},
+        {prop:'feedbackResults',title:'反馈结果',type:'filterSelect',options:EnumList.feedbackResults,required:true},
+        {prop:'ventureType',title:'风险类型',type:'filterSelect',options:EnumList.ventureType},
+        {prop:'ventureSpecific',title:'具体风险',type:'input'},
+        {prop:'measures',title:'应对措施',type:'input'},
+        {prop:'creationTime',title:'创建时间',width:180},
+    ],
     // 过焊装未过总装
     cherysupplierporhschedul:[
         {prop:'models',title:'车型'},
@@ -253,7 +264,7 @@ const apiTableColumns = {
         {prop:'productionType',title:'报工类型'},
         {prop:'onLineTime',title:'上线日期时间',width:180},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
@@ -271,7 +282,7 @@ const apiTableColumns = {
         {prop:'finalWorkshop',title:'总装车间'},
         {prop:'finalOnLineTime',title:'总装上线日期时间',width:180},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
@@ -295,7 +306,7 @@ const apiTableColumns = {
         {prop:'judge',title:'判定人'},
         {prop:'returnReason',title:'退货原因'},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
@@ -311,7 +322,7 @@ const apiTableColumns = {
         {prop:'stockState',title:'库存状态'},
         {prop:'dataUpdateTime',title:'更新时间',width:180},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
@@ -357,7 +368,7 @@ const apiTableColumns = {
         {prop:'summaryQuantityReceive',title:'集货件已收货数量'},
         {prop:'summaryQuantityInTransit',title:'集货件已在途数量'},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
@@ -377,7 +388,7 @@ const apiTableColumns = {
         {prop:'inventoryGap',title:'库存GAP'},
         {prop:'inventoryGap',title:'库存GAP'},
         {prop:'createByUser',title:'创建人'},
-        {prop:'createTime',title:'创建时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
         {prop:'updateByUser',title:'修改人'},
         {prop:'updateTime',title:'修改时间',width:180},
         {prop:'isDelete',title:'是否删除',type:'tagFilter',options:EnumList.whether},
@@ -417,6 +428,7 @@ const apiTableColumns = {
         {prop:'vendorFieldDesc',title:'控制项描述'},
         {prop:'vendorFieldCode',title:'控制项代码',required:true},
         {prop:'deadLine',title:'库存有效日期',type:'datetime',width:180,required:true},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 排产数据
     cherysupplierproscheduling:[
@@ -439,6 +451,7 @@ const apiTableColumns = {
         {prop:'planEndTime',title:'计划结束时间',width:180},
         {prop:'actualBeginTime',title:'实际开始时间',width:180},
         {prop:'actualEndTime',title:'实际结束时间',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 供应商基础信息
     cherysupplierinfo:[
@@ -460,6 +473,7 @@ const apiTableColumns = {
         {prop:'vendorProductName',title:'供应商总成零件名称',width:180,required:true},
         {prop:'cheryProductNo',title:'奇瑞零件号',required:true},
         {prop:'cheryProductName',title:'奇瑞零件名称',width:180,required:true},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 人员资质信息
     cherysupplieremployee:[
@@ -482,6 +496,7 @@ const apiTableColumns = {
         {prop:'qualificationLevel',title:'资质等级',required:true},
         {prop:'checkInTime',title:'资质获取时间',width:180,type:'datetime',required:true},
         {prop:'checkOutTime',title:'资质失去时间',width:180,type:'datetime',required:true},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // BOM主数据
     cherysupplierbom:[
@@ -502,6 +517,7 @@ const apiTableColumns = {
         {prop:'subMaterialUnit',title:'子件单位'},
         {prop:'subMaterialQuota',title:'子件用量',type:'number'},
         {prop:'dataUpdateTime',title:'BOM变更时间',width:180,type:'datetime'},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 过程控制项质量数据
     cherysupplierprocps:[
@@ -553,6 +569,7 @@ const apiTableColumns = {
         {prop:'checkMode',title:'检测方式',type:'filter',options:EnumList.checkMode,required:true},
         {prop:'deviceCode',title:'检测设备编号',required:true},
         {prop:'deviceName',title:'检测设备名称',required:true},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 生产过程数据
     cherysupplierprodata:[
@@ -600,6 +617,7 @@ const apiTableColumns = {
         {prop:'parentSoftwareRevision',title:'父件软件版本号',width:180},
         {prop:'childHardwareRevision',title:'子件硬件版本号',width:180},
         {prop:'childSoftwareRevision',title:'子件软件版本号',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 产品一次合格率
     cherysupplierprofirstpassyield:[
@@ -625,6 +643,7 @@ const apiTableColumns = {
         {prop:'workShift',title:'班次',type:'filter',options:EnumList.workShift,required:true},
         {prop:'statisticalTime',title:'生产日期',width:180,type:'datetime',required:true},
         {prop:'dateTime',title:'值统计时间',width:180,type:'datetime',required:true},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 工位一次合格率
     cherysupplierprostationfirstpassyield:[
@@ -652,6 +671,7 @@ const apiTableColumns = {
         {prop:'workShift',title:'班次',type:'filter',options:EnumList.workShift,required:true},
         {prop:'statisticalTime',title:'生产日期',width:180,type:'datetime',required:true},
         {prop:'dateTime',title:'值统计时间',width:180,type:'datetime',required:true},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 缺陷业务数据
     cherysupplierproflaw:[
@@ -682,6 +702,7 @@ const apiTableColumns = {
         {prop:'defectsDesc',title:'缺陷描述',required:true},
         {prop:'defectsLevel',title:'缺陷等级',type:'filter',options:EnumList.defectsLevel,required:true},
         {prop:'statisticalTime',title:'缺陷录入时间',width:180,type:'datetime',required:true},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 物料主数据
     cherysupplierpromaterialdata:[
@@ -705,6 +726,7 @@ const apiTableColumns = {
         {prop:'mpnCode',title:'芯片MPN标识码',width:180},
         {prop:'mpnName',title:'芯片MPN标识名称',width:180},
         {prop:'validDays',title:'物料有效期（天）',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 附件类数据
     cherysupplierproattachmentdata:[
@@ -725,6 +747,7 @@ const apiTableColumns = {
         {prop:'cheryProductNo',title:'奇瑞零件号',required:true},
         {prop:'cheryProductName',title:'奇瑞零件名称',width:180,required:true},
         {prop:'vendorProductSn',title:'供应商总成SN码',width:180},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 工艺装备
     cherysupplierproprocessequipment:[
@@ -758,6 +781,7 @@ const apiTableColumns = {
         {prop:'wearThreshold',title:'磨损阈值',required:true},
         {prop:'detectionRange',title:'检测范围',required:true},
         {prop:'unitType',title:'检测单位',required:true},
+        {prop:'creationTime',title:'创建时间',width:180},
     ],
     // 工艺
     cherysupplierproprocess:[
diff --git a/Web/src/utils/common/enumList.js b/Web/src/utils/common/enumList.js
index e62d059..aa2b87e 100644
--- a/Web/src/utils/common/enumList.js
+++ b/Web/src/utils/common/enumList.js
@@ -44,16 +44,16 @@ const EnumList = {
     ],
     // 反馈结果
     feedbackResults:[
-        {label:'异常',value:1}, 
-        {label:'无异常',value:0}, 
+        {label:'异常',value:'1'}, 
+        {label:'无异常',value:'0'}, 
     ],
     // 风险类型
     ventureType:[
-        {label:'生产节拍不足',value:1}, 
-        {label:'人员不足',value:2}, 
-        {label:'原材料不足',value:3}, 
-        {label:'设备异常',value:4}, 
-        {label:'其他',value:5}, 
+        {label:'生产节拍不足',value:'1'}, 
+        {label:'人员不足',value:'2'}, 
+        {label:'原材料不足',value:'3'}, 
+        {label:'设备异常',value:'4'}, 
+        {label:'其他',value:'5'}, 
     ],
     // 批次的最终判定结果
     checkResult:[
diff --git a/Web/src/utils/request.js b/Web/src/utils/request.js
index ffc5f14..2ec2886 100644
--- a/Web/src/utils/request.js
+++ b/Web/src/utils/request.js
@@ -63,11 +63,11 @@ service.interceptors.response.use(
       if (res.code != 1 && res.code != 200) {
         //报错
         ElMessage({
-          message: res.message || 'Error',
+          message: res.message || res.Message || 'Error',
           type: 'error',
           duration: 5 * 1000
         })
-        return Promise.reject(new Error(res.message || 'Error'))
+        return Promise.reject(new Error(res.message || res.Message || 'Error'))
       } else {
         return res
       }
diff --git a/Web/src/views/logisticsPlan/supplierConMmrp/index.vue b/Web/src/views/logisticsPlan/supplierConMmrp/index.vue
index da640a1..704d818 100644
--- a/Web/src/views/logisticsPlan/supplierConMmrp/index.vue
+++ b/Web/src/views/logisticsPlan/supplierConMmrp/index.vue
@@ -7,7 +7,7 @@
     :rightOperation="state.rightOperation"
     :detailColumName="'cherysupplierconmmrpDetail'"
     :searchButtons="['search','export','outputMany']"
-    :multipleTable="true"
+    :multipleTable="state.auths.hasPermission(state.apiName+':outputMany')"
   ></ediTtablePage>
 </template>
 
@@ -15,16 +15,24 @@
 <script setup>
 // M+6月物料需求计划风险确认
 defineOptions({ name: 'supplierConMmrp' })
+import store from '@/stores'
 import { reactive, ref, onMounted } from 'vue'
 import ediTtablePage from '@/components/ediTtablePage/index.vue'
 
 const state = reactive({
   apiName:'cherysupplierconmmrp',
   searchFilter: {
-    supplierCode: null
+    supplierCode: null,
+    creationTime: null
   },
   searchOptions:[
-    {type:'input',prop:'supplierCode',label:'供应商代码'}
+    {type:'input',prop:'supplierCode',label:'供应商代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
+  auths:store.permissionStore(),
+  // :tableFormRules="state.tableFormRules"
+  // tableFormRules:{
+  //   plantId:[{ required: true, message: '必填', trigger: 'change' },]
+  // }
 })
 </script>
\ No newline at end of file
diff --git a/Web/src/views/logisticsPlan/supplierInvData/index.vue b/Web/src/views/logisticsPlan/supplierInvData/index.vue
index 06f33ff..1d0805c 100644
--- a/Web/src/views/logisticsPlan/supplierInvData/index.vue
+++ b/Web/src/views/logisticsPlan/supplierInvData/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'supplierinvdata',
   searchFilter: {
-    plantId: null
+    plantId: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'plantId',label:'工厂代码'}
+    {type:'input',prop:'plantId',label:'工厂代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
\ No newline at end of file
diff --git a/Web/src/views/logisticsPlan/supplierMrpDate/index.vue b/Web/src/views/logisticsPlan/supplierMrpDate/index.vue
index a8d70e9..bdeff9e 100644
--- a/Web/src/views/logisticsPlan/supplierMrpDate/index.vue
+++ b/Web/src/views/logisticsPlan/supplierMrpDate/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysuppliermrpdata',
   searchFilter: {
-    materialCode: null
+    materialCode: null,
+    creationTime: null
   },
   searchOptions:[
-    {type:'input',prop:'materialCode',label:'零件号'}
+    {type:'input',prop:'materialCode',label:'零件号'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
diff --git a/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue b/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue
index 3bd93b3..f09d6fa 100644
--- a/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue
+++ b/Web/src/views/logisticsPlan/supplierMrpMonth/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysuppliermrpmonth',
   searchFilter: {
-    materialCode: null
+    materialCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'materialCode',label:'零件号'}
+    {type:'input',prop:'materialCode',label:'零件号'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
diff --git a/Web/src/views/logisticsPlan/supplierMrpState/index.vue b/Web/src/views/logisticsPlan/supplierMrpState/index.vue
index 12484e6..1fd7825 100644
--- a/Web/src/views/logisticsPlan/supplierMrpState/index.vue
+++ b/Web/src/views/logisticsPlan/supplierMrpState/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysuppliermrp',
   searchFilter: {
-    plantId: null
+    plantId: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'plantId',label:'工厂代码'}
+    {type:'input',prop:'plantId',label:'工厂代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
diff --git a/Web/src/views/logisticsPlan/supplierMrpWarning/index.vue b/Web/src/views/logisticsPlan/supplierMrpWarning/index.vue
index 8fc5069..86a1fae 100644
--- a/Web/src/views/logisticsPlan/supplierMrpWarning/index.vue
+++ b/Web/src/views/logisticsPlan/supplierMrpWarning/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysuppliermrpwarning',
   searchFilter: {
-    plantId: null
+    plantId: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'plantId',label:'工厂代码'}
+    {type:'input',prop:'plantId',label:'工厂代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
\ No newline at end of file
diff --git a/Web/src/views/logisticsPlan/supplierPo/index.vue b/Web/src/views/logisticsPlan/supplierPo/index.vue
index 97d1a28..9e86924 100644
--- a/Web/src/views/logisticsPlan/supplierPo/index.vue
+++ b/Web/src/views/logisticsPlan/supplierPo/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierpo',
   searchFilter: {
-    purchaseOrder: null
+    purchaseOrder: null,
+    creationTime: null
   },
   searchOptions:[
-    {type:'input',prop:'purchaseOrder',label:'采购订单号'}
+    {type:'input',prop:'purchaseOrder',label:'采购订单号'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
\ No newline at end of file
diff --git a/Web/src/views/logisticsPlan/supplierProHschedul/index.vue b/Web/src/views/logisticsPlan/supplierProHschedul/index.vue
index 18d11eb..8aaf0d0 100644
--- a/Web/src/views/logisticsPlan/supplierProHschedul/index.vue
+++ b/Web/src/views/logisticsPlan/supplierProHschedul/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierporhschedul',
   searchFilter: {
-    productionLineId: null
+    productionLineId: null,
+    creationTime: null
   },
   searchOptions:[
-    {type:'input',prop:'productionLineId',label:'产线代码'}
+    {type:'input',prop:'productionLineId',label:'产线代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
diff --git a/Web/src/views/logisticsPlan/supplierProPlaning/index.vue b/Web/src/views/logisticsPlan/supplierProPlaning/index.vue
index 7db62db..c362919 100644
--- a/Web/src/views/logisticsPlan/supplierProPlaning/index.vue
+++ b/Web/src/views/logisticsPlan/supplierProPlaning/index.vue
@@ -16,9 +16,11 @@ const state = reactive({
   apiName:'supplierproplaning',
   searchFilter: {
     materialCode: null,
+    creationTime:null,
   },
   searchOptions:[
     {type:'input',prop:'materialCode',label:'物料号'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
\ No newline at end of file
diff --git a/Web/src/views/logisticsPlan/supplierProTschedul/index.vue b/Web/src/views/logisticsPlan/supplierProTschedul/index.vue
index 86cbf7d..d298efe 100644
--- a/Web/src/views/logisticsPlan/supplierProTschedul/index.vue
+++ b/Web/src/views/logisticsPlan/supplierProTschedul/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierprotschedul',
   searchFilter: {
-    productionLineId: null
+    productionLineId: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'productionLineId',label:'产线代码'}
+    {type:'input',prop:'productionLineId',label:'产线代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
\ No newline at end of file
diff --git a/Web/src/views/logisticsPlan/supplierReturn/index.vue b/Web/src/views/logisticsPlan/supplierReturn/index.vue
index a73b6af..243b782 100644
--- a/Web/src/views/logisticsPlan/supplierReturn/index.vue
+++ b/Web/src/views/logisticsPlan/supplierReturn/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierreturn',
   searchFilter: {
-    returnNumber: null
+    returnNumber: null,
+    creationTime: null
   },
   searchOptions:[
-    {type:'input',prop:'returnNumber',label:'退货单号'}
+    {type:'input',prop:'returnNumber',label:'退货单号'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
\ No newline at end of file
diff --git a/Web/src/views/logisticsPlan/supplierSaWeek/index.vue b/Web/src/views/logisticsPlan/supplierSaWeek/index.vue
index b602aaa..c078713 100644
--- a/Web/src/views/logisticsPlan/supplierSaWeek/index.vue
+++ b/Web/src/views/logisticsPlan/supplierSaWeek/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysuppliersaweek',
   searchFilter: {
-    scheduleAgreement: null
+    scheduleAgreement: null,
+    creationTime: null
   },
   searchOptions:[
-    {type:'input',prop:'scheduleAgreement',label:'计划协议号'}
+    {type:'input',prop:'scheduleAgreement',label:'计划协议号'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
\ No newline at end of file
diff --git a/Web/src/views/logisticsPlan/supplierSinvData/index.vue b/Web/src/views/logisticsPlan/supplierSinvData/index.vue
index 641f5a8..e956987 100644
--- a/Web/src/views/logisticsPlan/supplierSinvData/index.vue
+++ b/Web/src/views/logisticsPlan/supplierSinvData/index.vue
@@ -17,10 +17,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysuppliersinvdata',
   searchFilter: {
-    supplierCode: null
+    supplierCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'supplierCode',label:'供应商代码'}
+    {type:'input',prop:'supplierCode',label:'供应商代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate',
 })
diff --git a/Web/src/views/productionQuality/supplierBom/index.vue b/Web/src/views/productionQuality/supplierBom/index.vue
index 2b41553..791e65f 100644
--- a/Web/src/views/productionQuality/supplierBom/index.vue
+++ b/Web/src/views/productionQuality/supplierBom/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierbom',
   searchFilter: {
-    supplierCode: null
+    supplierCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'supplierCode',label:'供应商代码'}
+    {type:'input',prop:'supplierCode',label:'供应商代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierEmployee/index.vue b/Web/src/views/productionQuality/supplierEmployee/index.vue
index d4c6cb6..76e5188 100644
--- a/Web/src/views/productionQuality/supplierEmployee/index.vue
+++ b/Web/src/views/productionQuality/supplierEmployee/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplieremployee',
   searchFilter: {
-    supplierCode: null
+    supplierCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'supplierCode',label:'供应商代码'}
+    {type:'input',prop:'supplierCode',label:'供应商代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate,apiDelete',
 })
diff --git a/Web/src/views/productionQuality/supplierInfo/index.vue b/Web/src/views/productionQuality/supplierInfo/index.vue
index dfc0ff0..e32bc24 100644
--- a/Web/src/views/productionQuality/supplierInfo/index.vue
+++ b/Web/src/views/productionQuality/supplierInfo/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierinfo',
   searchFilter: {
-    supplierCode: null
+    supplierCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'supplierCode',label:'供应商代码'}
+    {type:'input',prop:'supplierCode',label:'供应商代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate,apiDelete',
 })
diff --git a/Web/src/views/productionQuality/supplierProAttachmentData/index.vue b/Web/src/views/productionQuality/supplierProAttachmentData/index.vue
index 842ce56..6dae2e0 100644
--- a/Web/src/views/productionQuality/supplierProAttachmentData/index.vue
+++ b/Web/src/views/productionQuality/supplierProAttachmentData/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierproattachmentdata',
   searchFilter: {
-    supplierCode: null
+    supplierCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'supplierCode',label:'供应商代码'}
+    {type:'input',prop:'supplierCode',label:'供应商代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate,apiDelete',
 })
diff --git a/Web/src/views/productionQuality/supplierProCps/index.vue b/Web/src/views/productionQuality/supplierProCps/index.vue
index a885862..646195d 100644
--- a/Web/src/views/productionQuality/supplierProCps/index.vue
+++ b/Web/src/views/productionQuality/supplierProCps/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierprocps',
   searchFilter: {
-    supplierCode: null
+    supplierCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'supplierCode',label:'供应商代码'}
+    {type:'input',prop:'supplierCode',label:'供应商代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate',
 })
diff --git a/Web/src/views/productionQuality/supplierProData/index.vue b/Web/src/views/productionQuality/supplierProData/index.vue
index a5dfebe..5221c6d 100644
--- a/Web/src/views/productionQuality/supplierProData/index.vue
+++ b/Web/src/views/productionQuality/supplierProData/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierprodata',
   searchFilter: {
-    supplierCode: null
+    supplierCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'supplierCode',label:'供应商代码'}
+    {type:'input',prop:'supplierCode',label:'供应商代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate',
 })
diff --git a/Web/src/views/productionQuality/supplierProFirstPassyield/index.vue b/Web/src/views/productionQuality/supplierProFirstPassyield/index.vue
index 208c14d..afe9dbe 100644
--- a/Web/src/views/productionQuality/supplierProFirstPassyield/index.vue
+++ b/Web/src/views/productionQuality/supplierProFirstPassyield/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierprofirstpassyield',
   searchFilter: {
-    cheryProductNo: null
+    cheryProductNo: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'cheryProductNo',label:'奇瑞零件号'}
+    {type:'input',prop:'cheryProductNo',label:'奇瑞零件号'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate',
 })
diff --git a/Web/src/views/productionQuality/supplierProFlaw/index.vue b/Web/src/views/productionQuality/supplierProFlaw/index.vue
index 433c229..bef1d32 100644
--- a/Web/src/views/productionQuality/supplierProFlaw/index.vue
+++ b/Web/src/views/productionQuality/supplierProFlaw/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierproflaw',
   searchFilter: {
-    supplierCode: null
+    supplierCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'supplierCode',label:'供应商代码'}
+    {type:'input',prop:'supplierCode',label:'供应商代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate',
 })
diff --git a/Web/src/views/productionQuality/supplierProMaterialStock/index.vue b/Web/src/views/productionQuality/supplierProMaterialStock/index.vue
index c8e23b3..5a09663 100644
--- a/Web/src/views/productionQuality/supplierProMaterialStock/index.vue
+++ b/Web/src/views/productionQuality/supplierProMaterialStock/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'supplierpromaterialstock',
   searchFilter: {
-    supplierCode: null
+    supplierCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'supplierCode',label:'供应商代码'}
+    {type:'input',prop:'supplierCode',label:'供应商代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate',
 })
diff --git a/Web/src/views/productionQuality/supplierProProcess/index.vue b/Web/src/views/productionQuality/supplierProProcess/index.vue
index abab56f..07f8fec 100644
--- a/Web/src/views/productionQuality/supplierProProcess/index.vue
+++ b/Web/src/views/productionQuality/supplierProProcess/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierproprocess',
   searchFilter: {
-    techCode: null
+    techCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'techCode',label:'工艺编码'}
+    {type:'input',prop:'techCode',label:'工艺编码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
\ No newline at end of file
diff --git a/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue b/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue
index b2a6dd1..0931465 100644
--- a/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue
+++ b/Web/src/views/productionQuality/supplierProProcessEquipment/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierproprocessequipment',
   searchFilter: {
-    deviceCode: null
+    deviceCode: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'deviceCode',label:'工艺装备编码'}
+    {type:'input',prop:'deviceCode',label:'工艺装备编码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate,apiDelete',
 })
diff --git a/Web/src/views/productionQuality/supplierProScheduling/index.vue b/Web/src/views/productionQuality/supplierProScheduling/index.vue
index a5b611e..1de9e64 100644
--- a/Web/src/views/productionQuality/supplierProScheduling/index.vue
+++ b/Web/src/views/productionQuality/supplierProScheduling/index.vue
@@ -15,10 +15,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierproscheduling',
   searchFilter: {
-    plantId: null
+    plantId: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'plantId',label:'工厂代码'}
+    {type:'input',prop:'plantId',label:'工厂代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
 })
 </script>
diff --git a/Web/src/views/productionQuality/upplierProMaterialData/index.vue b/Web/src/views/productionQuality/upplierProMaterialData/index.vue
index 43eaaf9..55b409e 100644
--- a/Web/src/views/productionQuality/upplierProMaterialData/index.vue
+++ b/Web/src/views/productionQuality/upplierProMaterialData/index.vue
@@ -17,10 +17,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierpromaterialdata',
   searchFilter: {
-    cheryProductNo: null
+    cheryProductNo: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'cheryProductNo',label:'奇瑞零件号'}
+    {type:'input',prop:'cheryProductNo',label:'奇瑞零件号'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate',
 })
diff --git a/Web/src/views/productionQuality/upplierProStationFirstPassyield/index.vue b/Web/src/views/productionQuality/upplierProStationFirstPassyield/index.vue
index a4d874e..40ae4d2 100644
--- a/Web/src/views/productionQuality/upplierProStationFirstPassyield/index.vue
+++ b/Web/src/views/productionQuality/upplierProStationFirstPassyield/index.vue
@@ -18,10 +18,12 @@ import tablePage from '@/components/tablePage/index.vue'
 const state = reactive({
   apiName:'cherysupplierprostationfirstpassyield',
   searchFilter: {
-    stationId: null
+    stationId: null,
+    creationTime:null
   },
   searchOptions:[
-    {type:'input',prop:'stationId',label:'工位代码'}
+    {type:'input',prop:'stationId',label:'工位代码'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
   rightOperation:'apiUpdate',
 })
diff --git a/Web/src/views/system/taskConifgure/index.vue b/Web/src/views/system/taskConifgure/index.vue
index c12711e..108e139 100644
--- a/Web/src/views/system/taskConifgure/index.vue
+++ b/Web/src/views/system/taskConifgure/index.vue
@@ -1,28 +1,37 @@
 <template>
   <tablePage 
+    ref="tablePageRef"
     :columnWidth="150"
     :apiName="state.apiName"
     :searchOptions="state.searchOptions"
     :searchFilter="state.searchFilter"
     :rightOperation="state.rightOperation"
+    :showApiRightOperation="state.showApiRightOperation"
     :apiEditFormRules="state.apiEditFormRules"
+    @rightOperationHadel="rightOperationHadel"
   ></tablePage>
 </template>
 
 <script setup>
 defineOptions({ name: 'taskConifgure' })
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted,nextTick  } from 'vue'
 import tablePage from '@/components/tablePage/index.vue'
+import { getSetisautoByUid } from '@/api/system/taskConifgureApi'
+import { ElMessageBox,ElMessage } from 'element-plus'
+  
 
 const state = reactive({
   apiName:'taskconifgure',
   searchFilter: {
-    tableName: null
+    tableName: null,
+    creationTime:null,
   },
   searchOptions:[
-    {type:'input',prop:'tableName',label:'表名'}
+    {type:'input',prop:'tableName',label:'表名'},
+    {type:'datetimerange',prop:'creationTime',label:'创建时间'},
   ],
-  rightOperation:'apiUpdate',
+  rightOperation:[],
+  showApiRightOperation:['apiUpdate'],
   apiEditFormRules:{
     tableName: [{ required: true, message: '必填项', trigger: 'blur' }],
     taskName: [{ required: true, message: '必填项', trigger: 'blur' }],
@@ -31,4 +40,55 @@ const state = reactive({
     corn: [{ required: true, message: '必填项', trigger: 'blur' }],
   }
 })
+
+state.rightOperation = [
+  {
+    label:'启动',
+    name:'setisautoOk',
+    link:true,
+    type:'success',
+    auth:state.apiName+':setisautoOk',
+    hide:(row,scope) => {return row.isAuto}
+  },
+  {
+    label:'关闭',
+    name:'setisautoNo',
+    link:true,
+    type:'danger',
+    auth:state.apiName+':setisautoNo',
+    hide:(row,scope) => {return !row.isAuto}
+  },
+]
+
+const tablePageRef = ref(null)
+
+// 自动执行-启动/关闭  接口执行
+function changeSetisautoHttp(row,btn){
+  ElMessageBox.confirm(`是否确定${btn}？`, '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    tablePageRef.value.state.loading = true
+    getSetisautoByUid({uid:row.uId,isauto:!row.isAuto})
+    .then(res=>{
+      ElMessage.success('操作成功！')   
+      tablePageRef.value.getTableData()
+    })
+    .finally(()=>{tablePageRef.value.state.loading = false})
+  })
+}
+
+// 右侧按钮操作
+function rightOperationHadel(btn,scope){
+  // 自动执行-启动
+  if(btn.name == 'setisautoOk'){
+    changeSetisautoHttp(scope.row,btn.label)
+  }
+  // 自动执行-关闭
+  if(btn.name == 'setisautoNo'){
+    changeSetisautoHttp(scope.row,btn.label)
+  }
+}
+
 </script>
\ No newline at end of file
diff --git a/Web/src/views/task/taskSub/index.vue b/Web/src/views/task/taskSub/index.vue
index e5feac1..13d9814 100644
--- a/Web/src/views/task/taskSub/index.vue
+++ b/Web/src/views/task/taskSub/index.vue
@@ -42,10 +42,12 @@
   const state = reactive({
     apiName:'tasksub',
     searchFilter: {
-      taskName: null
+      taskName: null,
+      creationTime:null,
     },
     searchOptions:[
-      {type:'input',prop:'taskName',label:'任务名称'}
+      {type:'input',prop:'taskName',label:'任务名称'},
+      {type:'datetimerange',prop:'creationTime',label:'创建时间'},
     ],
     leftOperation:[
       {label:'查看详情',name:'showInfo',link:true,type:'primary'}