From 7cc0352933263e26ca24642f42a7f4d4c083f6d8 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Tue, 22 Apr 2025 14:29:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/machine/machineProject.js             |   19 +
 src/api/machine/machineProjectIncome.js       |   32 +
 src/api/orderIssure/soIssueNotify.js          |    3 +
 src/api/user.js                               |    3 +
 .../selector/user/userChooseComponent.vue     |  144 ++
 src/views/modules/auth/authMachineProject.vue | 1314 ++++++++++++
 src/views/modules/machine/machineProject.vue  |  924 +++++++++
 .../modules/machine/machineProjectDetail.vue  |  544 +++++
 .../modules/machineProjectAuthTable.vue       |  145 ++
 .../modules/machineProjectCloseAuthForm.vue   |  230 +++
 .../modules/machineProjectCloseTable.vue      |  150 ++
 .../modules/machineProjectDetailForm.vue      |  255 +++
 .../machine/modules/machineProjectForm.vue    |  340 ++++
 .../modules/machineProjectIncomeTable.vue     |  240 +++
 .../modules/machineProjectPlanDetailForm.vue  |  214 ++
 .../modules/machineProjectPlanTable.vue       |  263 +++
 .../modules/machineProjectTaskDetailForm.vue  |  190 ++
 .../modules/machineProjectTaskTable.vue       |  262 +++
 .../searchConfirmIssureNotify.vue             | 1776 +++++++++++++++++
 .../modules/oss/ossProjectComponents.vue      |  341 ++++
 20 files changed, 7389 insertions(+)
 create mode 100644 src/api/machine/machineProject.js
 create mode 100644 src/api/machine/machineProjectIncome.js
 create mode 100644 src/components/selector/user/userChooseComponent.vue
 create mode 100644 src/views/modules/auth/authMachineProject.vue
 create mode 100644 src/views/modules/machine/machineProject.vue
 create mode 100644 src/views/modules/machine/machineProjectDetail.vue
 create mode 100644 src/views/modules/machine/modules/machineProjectAuthTable.vue
 create mode 100644 src/views/modules/machine/modules/machineProjectCloseAuthForm.vue
 create mode 100644 src/views/modules/machine/modules/machineProjectCloseTable.vue
 create mode 100644 src/views/modules/machine/modules/machineProjectDetailForm.vue
 create mode 100644 src/views/modules/machine/modules/machineProjectForm.vue
 create mode 100644 src/views/modules/machine/modules/machineProjectIncomeTable.vue
 create mode 100644 src/views/modules/machine/modules/machineProjectPlanDetailForm.vue
 create mode 100644 src/views/modules/machine/modules/machineProjectPlanTable.vue
 create mode 100644 src/views/modules/machine/modules/machineProjectTaskDetailForm.vue
 create mode 100644 src/views/modules/machine/modules/machineProjectTaskTable.vue
 create mode 100644 src/views/modules/orderIssure/soIssueNotify/searchConfirmIssureNotify.vue
 create mode 100644 src/views/modules/oss/ossProjectComponents.vue

diff --git a/src/api/machine/machineProject.js b/src/api/machine/machineProject.js
new file mode 100644
index 0000000..eae4f7b
--- /dev/null
+++ b/src/api/machine/machineProject.js
@@ -0,0 +1,19 @@
+import {createAPI} from "../../utils/httpRequest";
+
+export const queryMachinePage = (data) => createAPI(`/machine/project/machineList`,'get',data)
+
+export const queryMachineList = (data) => createAPI(`/quote`,'post',data)
+export const saveMachine = (data) => createAPI(`/machine/project/machineAdd`,'post',data)
+
+export const updateMachine = (data) => createAPI(`/machine/project/machineEdit`,'put',data)
+export const getMachineById = (data) => createAPI(`/machine/project/getMachineById`,'get',data)
+
+
+export const machineDelete = (data) => createAPI(`/machine/project/machineDelete/${data.id}`,'post',data)
+
+export const projectUpdateStatus = (data) => createAPI(`/machine/project/machineProjectUpdateStatus`,'post',data)
+export const searchUserAuthMachineProjectApplicationInfo = (data) => createAPI(`/machine/project/searchUserAuthMachineProjectApplicationInfo`,'get',data)
+export const updateProjectAuthHist = data => createAPI(`/machine/project/updateProjectAuthHist`,'post',data)
+export const queryMachineProjectAuthList = data => createAPI(`/machine/project/searchMachineProjectAuthRecords`,'get',data)
+
+export const sendTextLoraWatch = data => createAPI(`/pms/eam/sendTextLoraWatch`,'post',data)
diff --git a/src/api/machine/machineProjectIncome.js b/src/api/machine/machineProjectIncome.js
new file mode 100644
index 0000000..13d0a47
--- /dev/null
+++ b/src/api/machine/machineProjectIncome.js
@@ -0,0 +1,32 @@
+import { createAPI } from "../../utils/httpRequest";
+
+export const queryMachineProjectIncomeList = (data) => createAPI(`/machine/projectIncome/incomeList`, 'get', data)
+export const saveMachineProjectIncome = (data) => createAPI(`/machine/projectIncome/projectIncomeAdd`, 'post', data)
+export const updateMachineProjectIncome = (data) => createAPI(`/machine/projectIncome/projectIncomeEdit`, 'put', data)
+export const deleteProjectIncome  = (data) => createAPI(`/machine/projectIncome/projectIncomeDelete/${data.id}`,'post',data)
+
+export const queryMachineProjectPlanList = (data) => createAPI(`/machine/projectPlan/planList`, 'get', data)
+export const saveMachineProjectPlan = (data) => createAPI(`/machine/projectPlan/projectPlanAdd`, 'post', data)
+export const updateMachineProjectPlan = (data) => createAPI(`/machine/projectPlan/projectPlanEdit`, 'put', data)
+export const deleteProjectPlan  = (data) => createAPI(`/machine/projectPlan/projectPlanDelete/${data.id}`,'post',data)
+
+export const queryMachineProjectTaskList = (data) => createAPI(`/machine/projectTask/taskList`, 'get', data)
+export const saveMachineProjectTask = (data) => createAPI(`/machine/projectTask/projectTaskAdd`, 'post', data)
+export const updateMachineProjectTask = (data) => createAPI(`/machine/projectTask/projectTaskEdit`, 'put', data)
+export const deleteProjectTask  = (data) => createAPI(`/machine/projectTask/projectTaskDelete/${data.id}`,'post',data)
+
+
+export const queryMachineProjectCloseList = (data) => createAPI(`/machine/projectClose/closeList`, 'get', data)
+export const saveMachineProjectClose = (data) => createAPI(`/machine/projectClose/projectCloseAdd`, 'post', data)
+export const updateMachineProjectClose = (data) => createAPI(`/machine/projectClose/projectCloseEdit`, 'put', data)
+export const deleteProjectClose  = (data) => createAPI(`/machine/projectClose/projectCloseDelete/${data.id}`,'post',data)
+export const projectCloseAuthSearch = data => createAPI(`/machine/projectClose/projectCloseAuthSearch`,'post',data)
+export const saveBatchProjectClose = (data) => createAPI(`/machine/projectClose/saveBatchProjectClose`, 'post', data)
+export const projectCloseUpdateStatus = (data) => createAPI(`/machine/projectClose/projectCloseUpdateStatus`, 'post', data)
+
+export const currencyList = (data) => createAPI(`/currency/queryList`, 'post', data)
+
+export const projectIncomeUpload = (data) => createAPI(`/machine/projectIncome/upload`,'post',data)
+export const projectIncomeQueryOss = (data) => createAPI(`/machine/projectIncome/queryOssFile`,'post',data)
+
+
diff --git a/src/api/orderIssure/soIssueNotify.js b/src/api/orderIssure/soIssueNotify.js
index 25615d0..81db155 100644
--- a/src/api/orderIssure/soIssueNotify.js
+++ b/src/api/orderIssure/soIssueNotify.js
@@ -41,3 +41,6 @@ export const searchOtherPart= data => createAPI(`/orderIssure/issureNotify/searc
 export const searchNotifyLog= data => createAPI(`/orderIssure/issureNotify/searchNotifyLog`,'post',data)
 export const deleteNotifyMaterialWithOutLog= data => createAPI(`/orderIssure/issureNotify/deleteNotifyMaterialWithOutLog`,'post',data)
 export const searchNotifyLogClose= data => createAPI(`/orderIssure/issureNotify/searchNotifyLogClose`,'post',data)
+
+
+export const updateNotifyConfirmStatus= data => createAPI(`/orderIssure/issureNotify/updateNotifyConfirmStatus`,'post',data)
diff --git a/src/api/user.js b/src/api/user.js
index 52f2da9..70dc716 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -7,3 +7,6 @@ export const updateUserLanguage = data => createAPI(`/sys/user/updateUserLanguag
 
 // 获取用户列表
 export const userList = data => createAPI(`/sys/user/userList`,'Post',data)
+
+export const userChooseComponentList = data => createAPI(`/sys/user/userChooseComponentList`,'get',data)
+export const userChooseComponentPage = data => createAPI(`/sys/user/userChooseComponentPage`,'get',data)
diff --git a/src/components/selector/user/userChooseComponent.vue b/src/components/selector/user/userChooseComponent.vue
new file mode 100644
index 0000000..f2bf2ca
--- /dev/null
+++ b/src/components/selector/user/userChooseComponent.vue
@@ -0,0 +1,144 @@
+<template>
+  <el-dialog :title="title" v-drag :visible.sync="openVisible" :append-to-body='true' :close-on-click-modal="false"
+    width="800px">
+    <el-form :model="user" label-position="top">
+      <el-row :gutter="10">
+        <el-col :span="4">
+          <el-form-item label="用户编号">
+            <el-input v-model="user.username"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="用户描述">
+            <el-input v-model="user.userDisplay"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="是否在用" style="width: 100%;">
+            <el-select v-model="user.status">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="在用" value="1"></el-option>
+              <el-option label="停用" value="0"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label=" ">
+            <el-button type="primary" v-if="isPage" @click="handleQueryUserByPage">查询</el-button>
+            <el-button type="primary" v-else @click="handleQueryUserList">查询</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table v-loading="queryLoading" :data="dataList" style="width: 100%" :height="height" border
+      @row-dblclick="handleDblClick" @header-dragend="handleColumnResize">
+      <el-table-column label="用户编号" prop="username"></el-table-column>
+      <el-table-column label="用户描述" prop="userDisplay"></el-table-column>
+      <el-table-column label="用户状态" prop="statusType"></el-table-column>
+    </el-table>
+    <el-pagination v-if="isPage" @size-change="handleSizeChange" @current-change="handlePageChange"
+      :current-page="current" :page-sizes="[20, 50, 100, 200, 500]" :page-size="size" :total="total"
+      layout="total,sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </el-dialog>
+</template>
+    <script>
+import {
+  userChooseComponentList,
+  userChooseComponentPage,
+} from '../../../api/user'
+
+export default {
+  name: 'userChooseComponent',
+  model: {},
+  props: {
+    isPage: {
+      type: Boolean,
+      default: false,
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    height: {
+      type: [Number, String],
+      default: 300,
+    },
+  },
+  data() {
+    return {
+      user: {
+        userNo: '',
+        userDesc: '',
+        status: '',
+      },
+      dataList: [],
+      current: 1,
+      size: 20,
+      total: 0,
+      queryLoading: false,
+      openVisible: false,
+    }
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  methods: {
+    userInit() {
+      this.openVisible = true
+      this.getUserList()
+    },
+    handleColumnResize(newWidth, oldWidth, column, event) {
+      let inData = this.columnList.filter(
+        (item) => item.columnProp === column.property
+      )[0]
+      inData.columnWidth = newWidth
+      updateColumnSize(inData).then(({ data }) => {
+        if (data.code === 0) {
+          console.log('栏位宽度保存成功！')
+        }
+      })
+    },
+    getUserList() {
+      if (this.isPage) {
+        this.handleQueryUserByPage()
+      } else {
+        this.handleQueryUserList()
+      }
+    },
+    handleQueryUserByPage() {
+      this.user.pageSize = this.pageSize
+      this.user.pageIndex = this.pageIndex
+      this.user.site = this.$store.state.user.site
+      this.queryLoading = true
+      userChooseComponentPage(this.user)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.records
+            this.pageIndex = data.page.current
+            this.pageSize = data.page.size
+            this.totalPage = data.page.total
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    handleQueryUserList() {
+      this.user.site = this.$store.state.user.site
+      userChooseComponentList(this.user).then((res) => {
+        if (res && res.data.code === 0) {
+          this.$set(this, 'dataList', res.data.list)
+        }
+      })
+    },
+    handleDblClick(row) {
+      this.$emit('selectFinish', row)
+    },
+  },
+}
+</script>
\ No newline at end of file
diff --git a/src/views/modules/auth/authMachineProject.vue b/src/views/modules/auth/authMachineProject.vue
new file mode 100644
index 0000000..62837e7
--- /dev/null
+++ b/src/views/modules/auth/authMachineProject.vue
@@ -0,0 +1,1314 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-row :gutter="10">
+        <el-col :span="3">
+          <el-form-item :label="'BU'">
+            <el-select v-model="searchData.buNo" placeholder="请选择" clearable>
+              <el-option v-for="i in userBuList" :key="i.buNo" :label="i.buDesc" :value="i.buNo">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="项目编码">
+            <el-input v-model="searchData.projectNo"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="项目名称">
+            <el-input v-model="searchData.projectName"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label="状态">
+            <el-select v-model="searchData.sstatus" style="width: 100%">
+              <el-option label="全部" value=""></el-option>
+              <el-option label="审核中" value="审核中"></el-option>
+              <el-option label="已驳回" value="已驳回"></el-option>
+              <el-option label="进行中" value="进行中"></el-option>
+              <el-option label="结案" value="结案"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="开始时间">
+            <div style="display: flex">
+              <el-date-picker style="width: 47%" v-model="searchData.startDate" type="date" value-format='yyyy-MM-dd'
+                format='yyyy-MM-dd'></el-date-picker>
+              <div style="width: 6%;text-align: center">-</div>
+              <el-date-picker style="width: 47%" v-model="searchData.endDate" type="date" value-format='yyyy-MM-dd'
+                format='yyyy-MM-dd'></el-date-picker>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item label=" ">
+            <el-button @click="getDataListAll">查 询</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <!-- 询价列表 -->
+    <el-table @header-dragend="handleColumnResize" height="30vh" :data="dataList" border ref="mainTable"
+      highlight-current-row @row-click="projectClickRow" @current-change="changeCurrentRow" v-loading="dataListLoading"
+      style="width: 100%;margin-top: 5px">
+      <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
+      <el-table-column v-for="(item,index) in columnList" :key="index" :sortable="item.columnSortable"
+        :prop="item.columnProp" :header-align="item.headerAlign" :align="item.align"
+        :fixed="item.fixed === ''?false:item.fixed" :min-width="item.columnWidth" :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+              style="width: 100px; height: 80px" /></span>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" header-align="center" align="center" width="180" label="操作">
+        <template slot-scope="scope">
+          <el-link style="cursor: pointer" v-if="scope.row.sstatus == '审核中'" @click="updateModal(scope.row)">审批</el-link>
+          <!-- <el-link style="cursor: pointer" @click="updateModal(scope.row)">驳回</el-link> -->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页插件 -->
+    <el-pagination style="margin-top: 0px" @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+      :current-page="pageIndex" :page-sizes="[20, 50, 100, 200, 500]" :page-size="pageSize" :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <el-tabs style="margin-top: 0px; width: 100%; height: 100%;" v-model="activeTable" class="customer-tab"
+      type="border-card" @tab-click="tabClick">
+      <el-tab-pane label="项目预算" name="projectIncome">
+        <!-- <el-form :inline="true" label-width="120px" label-position="top">
+          <el-form-item label="Application">
+            <el-input v-model="quoteCurrentRow.application" style="width: 210px" readonly></el-input>
+          </el-form-item>
+          <el-form-item label="Customer">
+            <el-input v-model="quoteCurrentRow.customerDesc" readonly></el-input>
+          </el-form-item>
+          <el-form-item label="年需求量">
+            <el-input v-model="quoteCurrentRow.annualDemand" class="right-aligned-input" readonly></el-input>
+          </el-form-item>
+          <el-form-item label="Cost Model">
+            <el-input v-model="quoteCurrentRow.costModel" style="width: 210px" readonly></el-input>
+          </el-form-item>
+          <el-form-item label="Markup">
+            <el-input v-model="quoteCurrentRow.markup" class="right-aligned-input" readonly></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-width="120px" label-position="top">
+          <el-form-item label="备注">
+            <el-input type="textarea" :rows="2" v-model="quoteCurrentRow.remark" style="width: 1019px"
+              readonly></el-input>
+          </el-form-item>
+        </el-form> -->
+        <MachineProjectIncome :projectIncome="projectIncome" :project="model" @IncomeFinished="getIncomeList"
+          :auth-flag="true" :height="'33vh'"></MachineProjectIncome>
+      </el-tab-pane>
+      <el-tab-pane label="项目计划" name="projectPlan">
+        <div style="height: 100%;overflow: auto;">
+          <MachineProjectPlan :projectPlan="projectPlan" :project="model" @planFinished="getPlanList" :auth-flag="true"
+            :height="'33vh'"></MachineProjectPlan>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="项目任务" name="projectTask">
+        <div style="height: 100%;overflow: auto;">
+          <MachineProjectTask :projectTask="projectTask" :project="model" @taskFinished="getTaskList" :auth-flag="true"
+            :height="'33vh'"></MachineProjectTask>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="结案确认" name="projectClose">
+        <div style="height: 100%;overflow: auto;">
+          <MachineProjectCloseTable :projectClose="projectClose" :project="model" @taskFinished="getCloseList"
+            :auth-flag="true" :height="'33vh'"></MachineProjectCloseTable>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="审核记录" name="projectAuth">
+        <div style="height: 100%;overflow: auto;">
+            <MachineProjectAuthTable :projectAuth="projectAuth" :project="model" @taskFinished="getAuthList"
+              :auth-flag="true" :height="'33vh'"></MachineProjectAuthTable>
+          </div>
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-dialog title="申请单审核" :visible.sync="reviewFlag" width="520px" :close-on-click-modal="false" v-drag>
+      <el-row>
+        <el-col :span="24" style="margin-top: 30px">
+          <div style="margin-left: 45px;margin-top: -30px">
+            <el-form :inline="true" label-width="120px" label-position="top">
+              <el-form-item label="申请单号">
+                <el-input style="width: 200px;" readonly placeholder="" :value="modalData.projectNo"></el-input>
+              </el-form-item>
+              <el-form-item label="审批步骤号">
+                <el-input style="width: 200px;" readonly placeholder="" :value="modalData.stepId"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-form :inline="true" label-width="120px" label-position="top">
+              <el-form-item label="审批人">
+                <el-input style="width: 200px;" readonly placeholder="" :value="modalData.userName"></el-input>
+              </el-form-item>
+              <el-form-item label="审批时间">
+                <el-input style="width: 200px;" readonly placeholder=""
+                  :value="modalData.strActAuthorizeDate"></el-input>
+              </el-form-item>
+              <el-form-item label="备注">
+                <el-input type="textarea" :readonly="(modalData.canAuthFlag!=='Y') " :rows="3"
+                  style="text-align: left;width: 415px;" v-model="modalData.authHistRemark"></el-input>
+              </el-form-item>
+            </el-form>
+            <el-footer style="height:30px;margin-top: 5px;margin-left:-35px;text-align:center">
+              <el-button type="primary" v-if="( modalData.canAuthFlag === 'Y') " :loading="loading"
+                @click="saveReview(modalData,'Y')">{{'同意'}}
+              </el-button>
+              <el-button type="primary" v-if="( modalData.canAuthFlag === 'Y') " :loading="loading"
+                @click="saveReview(modalData ,'N')">{{'不同意'}}
+              </el-button>
+            </el-footer>
+          </div>
+        </el-col>
+      </el-row>
+    </el-dialog>
+
+    <!-- chooseList模态框 -->
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+
+  </div>
+</template>
+  
+  <script>
+import Chooselist from '@/views/modules/common/Chooselist_eam'
+import { getSiteAndBuByUserName } from '../../../api/qc/qc'
+import DictDataSelect from '../sys/dict-data-select.vue'
+
+import quotationUpload from '../quote/quotation_upload.vue'
+import TpCost from '../quote/detail/tpCost.vue'
+import QuoteDetail from '../quote/detail/quoteDetail.vue'
+import {
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+  updateColumnSize,
+} from '../../../api/table'
+import { searchUserAuthMachineProjectApplicationInfo,updateProjectAuthHist,queryMachineProjectAuthList } from '../../../api/machine/machineProject'
+import {
+  queryMachineProjectIncomeList,
+  queryMachineProjectPlanList,
+  queryMachineProjectTaskList,
+  queryMachineProjectCloseList,
+} from '../../../api/machine/machineProjectIncome'
+import MachineProjectIncome from '../machine/modules/machineProjectIncomeTable.vue'
+import MachineProjectPlan from '../machine/modules/machineProjectPlanTable.vue'
+import MachineProjectTask from '../machine/modules/machineProjectTaskTable.vue'
+import MachineProjectCloseTable from '../machine/modules/machineProjectCloseTable.vue'
+import MachineProjectAuthTable from '../machine/modules/machineProjectAuthTable.vue'
+
+
+export default {
+  beforeRouteEnter(to, from, next) {
+    next((vm) => {
+      // 跳转后清除 redirectPath
+      localStorage.removeItem('redirectPath')
+      console.log('redirectPath 已清除')
+    })
+  },
+  name: 'authMachineProject',
+  computed: {},
+  components: {
+    QuoteDetail,
+    TpCost,
+    quotationUpload,
+    DictDataSelect,
+    Chooselist,
+    MachineProjectIncome,
+    MachineProjectPlan,
+    MachineProjectTask,
+    MachineProjectCloseTable,
+    MachineProjectAuthTable,
+  },
+  props: {},
+  data() {
+    return {
+      userBuList: [],
+      projectIncome:[],
+      projectPlan: [],
+      projectTask: [],
+      projectClose: [],
+      projectAuth: [],
+      model: {},
+      loading: false,
+      attributeDialog: true,
+      priceCheckRule: {
+        associatedPartNo: [{ required: true, message: ' ', trigger: 'change' }],
+        materialRequired: [{ required: true, message: ' ', trigger: 'change' }],
+        yearlyOrMonthlyRequirement: [
+          { required: true, message: ' ', trigger: 'change' },
+        ],
+        runningWidth: [{ required: true, message: ' ', trigger: 'change' }],
+      },
+      savePriceDetail: {
+        site: '',
+        quotationNo: '',
+        associatedPartNo: '',
+        materialRequired: '',
+        yearlyOrMonthlyRequirement: '',
+        runningWidth: '',
+      },
+      priceCheckPropertiesList: [],
+      // 导出
+      exportData: [],
+      exportName: '询价申请' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ['询价申请'],
+      exportFooter: [],
+      resultList: [],
+      uploadUrl: '/plm/quotationInformation/uploadExcel',
+      // ======== 行高 ========
+      secondHeight: 200,
+      // ======== 分页 ========
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      selectedDataNum: 0,
+      // 条件查询
+      searchData: {
+        userId: this.$store.state.user.id,
+        site: this.$store.state.user.site,
+        id: '',
+        customerNo: '',
+        customerDesc: '',
+        projectNo: '',
+        buNo: '',
+        requestStartDate: '',
+        requestEndDate: '',
+        requiredCompletionStartDate: '',
+        requiredCompletionEndDate: '',
+        status: '',
+        quoterName: '',
+        requesterName: '',
+        priorityLevel: '',
+        orderRef1: 'PJ',
+        page: 1,
+        limit: 10,
+        menuId: this.$route.meta.menuId,
+      },
+      searchData1: {
+        userId: this.$store.state.user.id,
+        site: this.$store.state.user.site,
+        id: '',
+        customerNo: '',
+        customerDesc: '',
+        projectNo: '',
+        bu: '',
+        requestStartDate: '',
+        requestEndDate: '',
+        requiredCompletionStartDate: '',
+        requiredCompletionEndDate: '',
+        status: '',
+        quoterName: '',
+        requesterName: '',
+        priorityLevel: '',
+        orderRef1: 'PJ',
+        page: 1,
+        limit: 10,
+        menuId: this.$route.meta.menuId,
+      },
+      // 其它
+      dataListLoading: false,
+      // 选择项目弹框开关
+      chooseProjectListFlag: false,
+      reviewFlag: false,
+      // 初始页签
+      activeTable: 'projectIncome',
+      // ======== 数据对象 ========
+      modalData: {
+        flag: '',
+        title: '',
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        id: '',
+        projectNo: '',
+        customerNo: '',
+        customerDesc: '',
+        requestDate: '',
+        requester: '',
+        requesterName: '',
+        customerInquiryNo: '',
+        priorityLevel: '',
+        requiredCompletionDate: '',
+        quoter: '',
+        quoterName: '',
+        status: '',
+        remark: '',
+        createDate: '',
+        createBy: '',
+        updateDate: '',
+        updateBy: '',
+        authHistId: '',
+        approveResult: '',
+        authHistRemark: '',
+        canAuthFlag: '',
+        actAuthorizator: '',
+        strActAuthorizeDate: this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        actAuthorizeDate: '',
+      },
+      inquiryPartItemModalData: {
+        bu: '',
+        buDesc: '',
+        projectNo: '',
+        partNo: '',
+        partDesc: '',
+        umId: '',
+        umName: '',
+        codeNo: '',
+        codeDesc: '',
+        textValue: '',
+        numValue: '',
+        valueType: '',
+        valueTypeDb: '',
+        valueChooseFlag: '',
+        availableValueList: [],
+      },
+      // ======== 数据列表 ========
+      dataList: [],
+      inquiryAuthDataList: [],
+      // ======== 列表表头 ========
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1BuDesc',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'buDesc',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'BU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1QuoteVersionNo',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'projectNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '项目编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1QuoteDate',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'projectName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '项目名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 160,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1CustomerNo',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'projectIncome',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '项目收益',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1CustomerDesc',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'projectBudget',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '项目总预算',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1QuoterName',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'projectActualExpenses',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '项目总实际开销',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1PurchaseName',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'responsiblePerson',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '项目负责人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1Currency',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'startDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '开始时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1Currency',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'endDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '结案时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1Status',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'sstatus',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '状态',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 190006,
+          serialNumber: '190006Table1Status',
+          tableId: '190006Table1',
+          tableName: '报价审批表',
+          columnProp: 'stepId',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '审批步骤号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+      ],
+      // ======== 必填规则 ========
+      rules: {
+        bu: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        projectNo: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        customerNo: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        customerDesc: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        requester: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        requesterName: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        quoter: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        quoterName: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        priorityLevel: [{ required: true, message: ' ', trigger: 'change' }],
+        requiredCompletionDate: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        requestDate: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+      },
+      inquiryPartRules: {
+        bu: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        partNo: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        partDesc: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        inquiryQty: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        umId: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+        codeNo: [
+          { required: true, message: ' ', trigger: 'change' },
+          { required: true, message: ' ', trigger: 'blur' },
+        ],
+      },
+      // ======== 选中的当前行数据 ========
+      projectCurrentRow: {},
+      // ======== 模态框开关控制 ========
+      modalFlag: false,
+      modalDisableFlag: false,
+      inquiryPartModalFlag: false,
+      inquiryPartModalDisableFlag: false,
+      inquiryPartItemModalFlag: false,
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      /*第二个表格高度的动态调整*/
+      this.height = window.innerHeight - 210
+    })
+  },
+  created() {
+    this.getSiteAndBuByUserName()
+    // 获取 URL 查询参数
+    const { projectNo } = this.$route.query
+    // 将查询参数赋值给 searchData
+    if (projectNo) {
+      this.searchData1.projectNo = this.$route.query.projectNo
+    }
+    // 动态列
+    this.getTableUserColumn(this.$route.meta.menuId + 'table1', 1)
+    this.getDataList()
+  },
+  methods: {
+    handleColumnResize(newWidth, oldWidth, column, event) {
+      let inData = this.columnList.filter(
+        (item) => item.columnProp === column.property
+      )[0]
+      inData.columnWidth = newWidth
+      updateColumnSize(inData).then(({ data }) => {
+        if (data.code === 0) {
+          console.log('栏位宽度保存成功！')
+        }
+      })
+    },
+    // 获取用户的bu
+    getSiteAndBuByUserName() {
+      let tempData = {
+        username: this.$store.state.user.name,
+      }
+      getSiteAndBuByUserName(tempData).then(({ data }) => {
+        if (data.code === 0) {
+          this.userBuList = data.rows
+        }
+      })
+    },
+    // ======== 分页相关方法 ========
+    /**
+     * 每页数
+     * @param val
+     */
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    /**
+     * 当前页
+     * @param val
+     */
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // ======== 页签切换相关方法 ========
+    /**
+     * 列表表格选择替换
+     * @param tab
+     * @param event
+     */
+    tabClick(tab, event) {
+      // 刷新列表数据
+      this.refreshCurrentTabTable()
+    },
+
+    // ======== 列表操作方法 ========
+    /**
+     * 单机选中询价信息
+     * @param row
+     */
+    projectClickRow(row) {
+      this.projectCurrentRow = JSON.parse(JSON.stringify(row))
+      this.model = JSON.parse(JSON.stringify(row))
+      //刷新当前页表
+      this.refreshCurrentTabTable()
+    },
+    /**
+     * 当前值发生变化的时候修改
+     * @param row
+     * @param oldRow
+     */
+    changeCurrentRow(row, oldRow) {
+      // 判断是否是获取焦点的事件
+      if (row) {
+        this.projectCurrentRow = JSON.parse(JSON.stringify(row))       
+      }
+    },
+    /**
+     * 刷新页签的table数据
+     */
+    refreshCurrentTabTable() {
+        this.getTabs()
+    },
+
+    // ======== 列表数据刷新方法 ========
+    /**
+     * 获取数据列表
+     */
+    getDataListAll() {
+      this.searchData1 = null
+      this.getDataList()
+    },
+
+    getDataList() {
+      //console.log(this.searchData1)
+      this.searchData.pageSize = this.pageSize
+      this.searchData.pageNo = this.pageIndex
+      let inData = this.searchData
+      searchUserAuthMachineProjectApplicationInfo(inData).then(({ data }) => {
+        if (data.code === 0) {
+          this.dataList = data.page.records
+          this.pageIndex = data.page.current
+          this.pageSize = data.page.size
+          this.totalPage = data.page.total
+          this.dataList.forEach((item) => {
+            if (item.groupDesc === '' || item.groupDesc === null) {
+              item.auth = item.userDisplay
+            } else {
+              item.auth = item.groupDesc
+            }
+          })
+          //判断是否全部存在数据
+          if (this.totalPage > 0) {
+            //设置选中行
+            this.$refs.mainTable.setCurrentRow(this.dataList[0])
+            this.projectClickRow(this.dataList[0])
+            this.refreshCurrentTabTable() //加载当前的页签的table         
+          }
+        }
+        this.dataListLoading = false
+      })
+    },
+    getTabs() {
+      switch (this.activeTable) {
+        case 'projectIncome':
+          this.getIncomeList()
+          break
+        case 'projectPlan':
+          this.getPlanList()
+          break
+        case 'projectTask':
+          this.getTaskList()
+          break
+        case 'projectClose':
+          this.getCloseList()
+          break
+        case 'projectAuth':
+          this.getAuthList()
+          break
+        default:
+          this.getIncomeList()
+          break
+      }
+    },
+    getIncomeList() {
+        console.log('this.model.projectNo',this.model.projectNo);
+        
+      let obj = {
+        projectNo: this.model.projectNo,
+      }
+      queryMachineProjectIncomeList(obj)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.projectIncome = data.list
+            //判断是否全部存在数据
+            //if (this.totalPage > 0) {
+            //  this.$refs.mainTable.setCurrentRow(this.dataList[0])
+            //  this.refreshCurrentTabTable()
+            //  this.inquiryClickRow(this.dataList[0])
+            //}
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    incomeFinished() {
+      this.getIncomeList()
+    },
+    getPlanList() {
+      let obj = {
+        projectNo: this.model.projectNo,
+      }
+      queryMachineProjectPlanList(obj)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.projectPlan = data.list
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    getTaskList() {
+      let obj = {
+        projectNo: this.model.projectNo,
+      }
+      queryMachineProjectTaskList(obj)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.projectTask = data.list
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    getCloseList() {
+      let obj = {
+        projectNo: this.model.projectNo,
+      }
+      queryMachineProjectCloseList(obj)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.projectClose = data.list
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    getAuthList(){
+      let obj = {
+        site: this.$store.state.user.site,
+        projectNo: this.model.projectNo,
+      }
+      queryMachineProjectAuthList(obj)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.projectAuth = data.list
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+
+    // /**
+    //  * 获得这些询价号的全部附件
+    //  */
+    // getFileContentList () {
+    //   let currentData = {
+    //     orderRef1: this.$store.state.user.site,
+    //     orderRef2: this.enterResultData.quotationNo
+    //   }
+    //   getFileContentList(currentData).then(({data}) => {
+    //     if (data && data.code === 0) {
+    //       this.enterResultData.fileContentList = data.rows
+    //     } else {
+    //       this.enterResultData.fileContentList = []
+    //     }
+    //   })
+    // },
+
+    // ======== chooseList相关方法 ========
+    /**
+     * 获取基础数据列表S
+     * @param val
+     * @param type
+     */
+    getBaseList(val, type) {
+      this.tagNo = val
+      this.tagNo1 = type
+      this.$nextTick(() => {
+        let strVal = ''
+        let conSql = ''
+        if (val === 509) {
+          if (type === 1) {
+            strVal = this.modalData.customerNo ? this.modalData.customerNo : ''
+          }
+          if (type === 2) {
+            strVal = this.searchData.customerNo
+              ? this.searchData.customerNo
+              : ''
+          }
+        }
+        if (val === 2002) {
+          if (type === 1) {
+            strVal = this.searchData.quoterName
+              ? this.searchData.quoterName
+              : ''
+            conSql = " and b.site = '" + this.$store.state.user.site + "'"
+          }
+          if (type === 2) {
+            strVal = this.modalData.quoterName ? this.modalData.quoterName : ''
+            conSql = " and b.site = '" + this.$store.state.user.site + "'"
+          }
+        }
+        if (val === 2008) {
+          if (type === 1) {
+            strVal = this.searchData.requesterName
+              ? this.searchData.requesterName
+              : ''
+            conSql = " and b.site = '" + this.$store.state.user.site + "'"
+          }
+          if (type === 2) {
+            strVal = this.modalData.requesterName
+              ? this.modalData.requesterName
+              : ''
+            conSql = " and b.site = '" + this.$store.state.user.site + "'"
+          }
+        }
+        this.$refs.baseList.init(val, strVal, conSql)
+      })
+    },
+    /**
+     * 列表方法的回调
+     * @param val
+     */
+    getBaseData(val) {
+      if (this.tagNo === 509) {
+        if (this.tagNo1 === 1) {
+          if (val.customer_no === this.modalData.customerNo) {
+            return
+          }
+          this.modalData.customerNo = val.customer_no
+          this.modalData.customerDesc = val.customer_desc
+        }
+        if (this.tagNo1 === 2) {
+          if (val.customer_no === this.searchData.customerNo) {
+            return
+          }
+          this.searchData.customerNo = val.customer_no
+        }
+      }
+      if (this.tagNo === 2002) {
+        if (this.tagNo1 === 1) {
+          this.searchData.quoter = val.username
+          this.searchData.quoterName = val.user_display
+        }
+        if (this.tagNo1 === 2) {
+          this.modalData.quoter = val.username
+          this.modalData.quoterName = val.user_display
+        }
+      }
+      if (this.tagNo === 2008) {
+        if (this.tagNo1 === 1) {
+          this.searchData.requester = val.username
+          this.searchData.requesterName = val.user_display
+        }
+        if (this.tagNo1 === 2) {
+          this.modalData.requester = val.username
+          this.modalData.requesterName = val.user_display
+        }
+      }
+    },
+
+    updateModal(row) {
+      this.modalData = JSON.parse(JSON.stringify(row))
+      this.modalData.strActAuthorizeDate = this.dayjs().format(
+        'YYYY-MM-DD HH:mm:ss'
+      )
+      this.modalData.userName = this.$store.state.user.name
+      this.reviewFlag = true
+    },
+
+    saveReview(row, val) {
+      if (row.authHistRemark == '') {
+        this.$alert(data.msg, '操作提示', {
+          confirmButtonText: '确定',
+          callback: (action) => {
+            this.saveButton = false
+          },
+        })
+      }
+      this.loading = true
+      this.modalData.id = row.authHistId
+      this.modalData.actAuthorizator = row.userName
+      this.modalData.remark = row.authHistRemark
+      this.modalData.actAuthorizeDate = row.strActAuthorizeDate
+      this.modalData.orderRef1 = row.projectNo
+      if (val === 'Y') {
+        if (row.lastStepFlag === 'Y') {
+          this.modalData.approveResult = '已审批'
+        } else {
+          this.modalData.approveResult = '已审批'
+        }
+      } else if (val === 'N') {
+        this.modalData.approveResult = '未通过'
+      }
+      updateProjectAuthHist(this.modalData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.getDataList()
+          this.reviewFlag = false
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {},
+          })
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+        this.loading = false
+      })
+    },
+
+    // ======== 导出相关方法 ========
+    /**
+     * 导出excel
+     */
+    async createExportData() {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      await searchUserAuthMachineProjectApplicationInfo(this.searchData).then(
+        ({ data }) => {
+          this.resultList = data.page.list
+        }
+      )
+      return this.resultList
+    },
+    startDownload() {},
+    finishDownload() {},
+    fields() {
+      let json = '{'
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json +=
+            '"' + item.columnLabel + '"' + ':' + '"' + item.columnProp + '"'
+        } else {
+          json +=
+            '"' +
+            item.columnLabel +
+            '"' +
+            ':' +
+            '"' +
+            item.columnProp +
+            '"' +
+            ','
+        }
+      })
+      json += '}'
+      let s = eval('(' + json + ')')
+      return s
+    },
+    // ========  导入相关方法 ========
+    handleImportQuotation() {
+      let currentData = {
+        createBy: this.$store.state.user.name,
+        site: this.$store.state.user.site,
+      }
+      //打开组件 去做新增业务
+      this.$nextTick(() => {
+        this.$refs.quotationUpload.init(currentData)
+      })
+    },
+
+    // openSaveDataDialog(){
+    //   if (this.modalData.title === '询价新增') {
+    //     let rfqNos = [];
+    //     this.dataList.forEach((item) => {
+    //       // 如果item.rfqNo为XJ开头
+    //       if (item.projectNo.startsWith('XJ')) {
+    //         // 解析数字部分
+    //         const numPart = parseInt(item.projectNo.replace('XJ', ''), 10);
+    //         if (!isNaN(numPart)) {
+    //           rfqNos.push(numPart);
+    //         }
+    //       }
+    //     });
+    //     if (rfqNos.length === 0) {
+    //       // 如果没有XJ开头的rfqNo
+    //       this.modalData.projectNo = 'XJ00000001';
+    //     } else {
+    //       // 取到最大的XJ开头的rfqNo
+    //       let maxRfqNo = Math.max(...rfqNos);
+    //
+    //       // 生成新的rfqNo，确保有9位数，前面补零
+    //       maxRfqNo += 1; // 增加最大值
+    //       this.modalData.projectNo = 'XJ' + String(maxRfqNo).padStart(8, '0');
+    //     }
+    //   }
+    // },
+    // 保存弹框关闭事件
+    closeSaveDataDialog() {
+      this.modalData = {
+        flag: '',
+        title: '',
+        site: '',
+        bu: '',
+        buNo: '',
+        buDesc: '',
+        id: '',
+        projectNo: '',
+        customerNo: '',
+        customerDesc: '',
+        requester: '',
+        requesterName: '',
+        quoter: '',
+        quoterName: '',
+        customerInquiryNo: '',
+        status: '',
+        priorityLevel: '',
+        requestDate: '',
+        requiredCompletionDate: '',
+        remark: '',
+      }
+      this.modalFlag = false
+    },
+    rowStyle({ row }) {
+      if (this.projectCurrentRow.id === row.id) {
+        return { 'background-color': '#E8F7F6', cursor: 'pointer' }
+      }
+    },
+    // 动态列开始 获取 用户保存的 格式列
+    async getTableUserColumn(tableId, columnId) {
+      let queryTableUser = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        status: true,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableUserListLanguage(queryTableUser).then(({ data }) => {
+        if (data.rows.length > 0) {
+          switch (columnId) {
+            case 1:
+              this.columnList = data.rows
+              break
+          }
+        } else {
+          this.getColumnList(tableId, columnId)
+        }
+      })
+    },
+
+    // 获取 tableDefault 列
+    async getColumnList(tableId, columnId) {
+      let queryTable = {
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableDefaultListLanguage(queryTable).then(({ data }) => {
+        if (!data.rows.length === 0) {
+          switch (columnId) {
+            case 1:
+              this.columnList = data.rows
+              break
+          }
+        }
+      })
+    },
+  },
+}
+</script>
+  
+<style scoped>
+/deep/ .customer-tab .el-tabs__content {
+  padding: 0px !important;
+  height: 100%;
+}
+
+/deep/ .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
+  background-color: #17b3a3;
+  border-color: #17b3a3;
+}
+
+/deep/ .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
+  border-color: #fff;
+}
+/deep/ .el-form-item--medium .el-form-item__content {
+  height: auto;
+}
+
+/deep/ .el-input .el-input--medium {
+  line-height: 20px;
+}
+/deep/ .el-input-number .el-input--medium {
+  line-height: 20px;
+}
+
+/*table中input 修改样式*/
+/deep/ div.table-el-date {
+  padding: 0px 0px;
+  height: 25px !important;
+}
+
+/*table中input*/
+div.table-el-date /deep/ input.el-input__inner {
+  padding: 0px 0px;
+  height: 23px !important;
+  text-align: right;
+}
+
+/* 特殊的样式*/
+/deep/ .el-table div.cell:has(.table-el-date) {
+  /* 直接作用于 <td> 元素 */
+  padding: 0px;
+  height: 25px;
+}
+
+.el-transfer-panel {
+  border: 2px solid #17b3a3;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  display: inline-block;
+  vertical-align: middle;
+  width: 200px;
+  max-height: 100%;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  position: relative;
+}
+
+.el-transfer-panel .el-transfer-panel__header {
+  height: 40px;
+  line-height: 40px;
+  background: #17b3a3;
+  margin: 0;
+  padding-left: 15px;
+  border-bottom: 1px solid #17b3a3;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  color: #000;
+}
+
+.el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label {
+  font-size: 14px;
+  color: #303133;
+  font-weight: 400;
+}
+
+.right-aligned-input /deep/ .el-input__inner {
+  text-align: right;
+  width: 200px; /* 如果需要，可以在这里设置宽度 */
+  padding-right: 5px !important;
+}
+</style>
+  
+  
\ No newline at end of file
diff --git a/src/views/modules/machine/machineProject.vue b/src/views/modules/machine/machineProject.vue
new file mode 100644
index 0000000..24dbbd4
--- /dev/null
+++ b/src/views/modules/machine/machineProject.vue
@@ -0,0 +1,924 @@
+<template>
+  <div>
+    <!--    <el-form :model="queryForm" label-position="top" label-width="100px" style="max-width: 1100px">-->
+    <!--      <el-row :gutter="15">-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label="申请批次号">-->
+    <!--            <el-input v-model="queryForm.quotationBatchNo"></el-input>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label="客户编码" v-if="!isComponent">-->
+    <!--            <el-input v-model="queryForm.customerNo"></el-input>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label="客户名称" v-if="!isComponent">-->
+    <!--            <el-input v-model="queryForm.customerDesc"></el-input>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label="项目料号" v-if="!isComponent">-->
+    <!--            <el-input v-model="queryForm.partNo"></el-input>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label="物料描述" v-if="!isComponent">-->
+    <!--            <el-input v-model="queryForm.partDesc"></el-input>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="6" v-if="!isComponent">-->
+    <!--          <el-form-item label="要求完成日期">-->
+    <!--            <div style="display: flex">-->
+    <!--              <el-date-picker style="width: 47%" v-model="queryForm.startDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker>-->
+    <!--              <div style="width: 6%;text-align: center">-</div>-->
+    <!--              <el-date-picker style="width: 47%" v-model="queryForm.endDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker>-->
+    <!--            </div>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3" v-if="!isComponent">-->
+    <!--          <el-form-item label=" ">-->
+
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label="批次序号">-->
+    <!--            <el-input-number :controls="false" :min="0" style="width: 100%" v-model="queryForm.quotationItemNo"></el-input-number>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label="项目编码">-->
+    <!--            <el-input v-model="queryForm.projectNo"></el-input>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label="项目名称">-->
+    <!--            <el-input v-model="queryForm.projectDesc"></el-input>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label="报价专员" v-if="!isComponent">-->
+    <!--            <el-input v-model="queryForm.quoterName"></el-input>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label="优先等级" v-if="!isComponent">-->
+    <!--            <dict-data-select v-model="queryForm.priorityLevel" clearable :use-default-value="false" dict-type="priority_Level"/>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item :label="'状态'">-->
+    <!--            <el-select v-model="queryForm.quotationStatus" style="width: 100%">-->
+    <!--              <el-option label="全部" value=""></el-option>-->
+    <!--              <el-option label="草稿" value="草稿"></el-option>-->
+    <!--              <el-option label="下达" value="下达"></el-option>-->
+    <!--            </el-select>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--        <el-col :span="3">-->
+    <!--          <el-form-item label=" ">-->
+    <!--            <el-button type="primary" @click="handleQuery">查询</el-button>-->
+    <!--          </el-form-item>-->
+    <!--        </el-col>-->
+    <!--      </el-row>-->
+    <!--    </el-form>-->
+    <!-- 查询条件 -->
+    <el-form :inline="true" label-position="top" :model="queryForm" @keyup.enter.native="handleQuery()">
+      <el-form-item :label="'BU'">
+        <el-select v-model="queryForm.buNo" placeholder="请选择" clearable style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option v-for="i in userBuList" :key="i.buNo" :label="i.buDesc" :value="i.buNo">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目编码">
+        <el-input v-model="queryForm.projectNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item label="项目名称">
+        <el-input v-model="queryForm.projectName" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'状态'">
+        <el-select v-model="queryForm.sstatus" style="width: 120px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="草稿" value="草稿"></el-option>
+          <el-option label="审核中" value="审核中"></el-option>
+          <el-option label="已驳回" value="已驳回"></el-option>
+          <el-option label="进行中" value="进行中"></el-option>
+          <el-option label="结案" value="结案"></el-option>
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item :label="'PjM'">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(2004,1)"><a herf="#">PjM</a></span>
+          <el-input v-model="queryForm.requesterName" clearable style="width: 120px"></el-input>
+        </el-form-item> -->
+      <el-form-item :label="'开始时间'">
+        <el-date-picker style="width: 120px" v-model="queryForm.startDate" type="date" value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label=" ">
+        <div style="text-align: center;"><i class="el-icon-right"></i></div>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-date-picker style="width: 120px" v-model="queryForm.endDate" type="date" value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <!-- <el-form-item :label="'优先等级'">
+          <dict-data-select v-model="queryForm.priorityLevel" clearable style="width: 120px" :use-default-value="false"
+                            dict-type="priority_Level"/>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="queryForm" @keyup.enter.native="handleQuery()">
+        <el-form-item label="客户编码">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(509,2)"><a herf="#">客户编码</a></span>
+          <el-input v-model="queryForm.customerNo" clearable style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'客户名称'">
+          <el-input v-model="queryForm.customerDesc" clearable style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'报价专员'">
+          <span style="cursor: pointer" slot="label" @click="getBaseList(2002,1)"><a herf="#">报价专员</a></span>
+          <el-input v-model="queryForm.quoterName" clearable style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'要求报价日期'">
+          <el-date-picker
+            style="width: 120px"
+            v-model="queryForm.requiredCompletionStartDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label=" ">
+          <div style="text-align: center;"><i class="el-icon-right"></i></div>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-date-picker
+            style="width: 120px"
+            v-model="queryForm.requiredCompletionEndDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item> -->
+
+      <el-form-item :label="' '">
+        <el-button @click="handleQuery()">查询</el-button>
+        <el-button @click="handleAdd()">新增</el-button>
+        <!-- <el-button @click="handleHu()">呼叫</el-button> -->
+      </el-form-item>
+
+    </el-form>
+    <div style="height: 100%;overflow: auto">
+      <el-table :data="dataList" border v-loading="queryLoading" height="78vh" @row-dblclick="handleDblClick"
+        :row-style="rowStyle" ref="mainTable" @row-click="inquiryClickRow" @current-change="changeCurrentRow">
+        <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
+        <el-table-column v-for="(item,index) in columns" :key="index" :sortable="item.columnSortable"
+          :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align" :fixed="item.fixed===''?false:item.fixed" :min-width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="scope.column.property == 'projectIncome'">
+              <el-tooltip class="item" effect="dark" :content="scope.row.projectIncome" placement="top">
+                <div>{{ formatContent(scope.row.projectIncome) }}</div>
+              </el-tooltip>
+            </span>
+            <span v-else>{{scope.row[scope.column.property]}}</span>
+          </template>
+          <!-- <template slot-scope="scope">
+            <div v-if="item.columnProp !== 'status' && item.columnProp !== 'priorityLevel'">
+              <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </div>
+            <div v-else-if="item.columnProp === 'status'">
+              <span v-if="!item.columnHidden">
+                <span v-if="scope.row.status === 'C'">草稿</span>
+                <span v-if="scope.row.status === 'B'">下达</span>
+                <span v-if="scope.row.status === 'A'">已转报价</span>
+                <span v-if="scope.row.status === 'D'">已驳回</span>
+              </span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </div>
+            <div v-else-if="item.columnProp === 'priorityLevel'">
+              <span v-if="!item.columnHidden">
+                <span v-if="scope.row.priorityLevel === 'A'">普通</span>
+                <span v-if="scope.row.priorityLevel === ' B'">重要</span>
+                <span v-if="scope.row.priorityLevel === ' C'">紧急</span>
+              </span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                 style="width: 100px; height: 80px"/></span>
+            </div>
+          </template> -->
+        </el-table-column>
+        <el-table-column v-if="!isComponent" fixed="right" header-align="center" align="center" width="140" label="操作">
+          <template slot-scope="scope">
+            <el-link style="cursor: pointer" v-if="scope.row.sstatus == '草稿' || scope.row.sstatus == '已驳回'"
+              @click="handleEdit(scope.row)">修改</el-link>
+            <el-link style="cursor: pointer" v-if="scope.row.sstatus == '草稿' || scope.row.sstatus == '已驳回'"
+              @click="handleUpdateStatus(scope.row)">下达</el-link>
+            <el-link style="cursor: pointer" v-if="scope.row.sstatus == '草稿' || scope.row.sstatus == '已驳回'"
+              @click="handleRemove(scope.row)">删除</el-link>
+            <el-link style="cursor: pointer" v-if="scope.row.sstatus == '进行中'"
+              @click="chooseCloseUser(scope.row)">选择结案人员</el-link>
+
+            <el-link style="cursor: pointer" @click="handleDetails(scope.row)">详情</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-pagination @size-change="handleSizeChange" @current-change="handlePageChange" :current-page="pageIndex"
+      :page-sizes="[ 50, 100, 200, 500]" :page-size="pageSize" :total="totalPage"
+      layout="total,sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <MachineProjectForm ref="machineProjectForm" v-if="machineProjectVisible" @selectFinished="machineProjectFinished">
+    </MachineProjectForm>
+    <MachineProjectDetail ref="machineProjectDetail" v-if="machineProjectDetailVisible"
+      @selectFinished="machineProjectFinished"></MachineProjectDetail>
+    <MachineProjectCloseAuthForm ref="machineProjectCloseAuth" v-if="machineProjectCloseAuthVisible"
+      @SelectFinished="machineProjectFinished"></MachineProjectCloseAuthForm>
+
+    <!-- 页签 -->
+    <!-- <el-tabs style="margin-top: 0px; width: 100%; height: 40vh;" v-model="activeTable" class="customer-tab" type="border-card" @tab-click="tabClick">
+        <el-tab-pane label="产品明细" name="inquiryPart">
+          <el-table
+            @header-dragend="handleColumnResize"
+            height="37vh"
+            :data="inquiryPartDataList"
+            border
+            ref="secondaryTable"
+            v-loading="dataListLoading"
+            style="width: 100%;margin-top: 5px">
+            <el-table-column
+              v-for="(item,index) in machineColumnList" :key="index"
+              :sortable="item.columnSortable"
+              :prop="item.columnProp"
+              :header-align="item.headerAlign"
+              :align="item.align"
+              :fixed="item.fixed === ''?false:item.fixed"
+              :min-width="item.columnWidth"
+              :label="item.columnLabel">
+              <template slot-scope="scope">
+                <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                   style="width: 100px; height: 80px"/></span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs> -->
+  </div>
+</template>
+
+<script>
+import DictDataSelect from '../sys/dict-data-select.vue'
+import { getSiteAndBuByUserName } from '../../../api/qc/qc'
+import {
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+  updateColumnSize,
+} from '../../../api/table'
+import OssComponents from '../oss/ossComponents.vue'
+import {
+  queryMachinePage,
+  machineDelete,
+  projectUpdateStatus,
+  sendTextLoraWatch
+} from '../../../api/machine/machineProject'
+import MachineProjectForm from './modules/machineProjectForm'
+import BuSelect from '../../../components/selector/select/BuSelect.vue'
+import MachineProjectDetail from './machineProjectDetail.vue'
+import MachineProjectCloseAuthForm from './modules/machineProjectCloseAuthForm.vue'
+
+export default {
+  name: 'machineProject',
+  components: {
+    OssComponents,
+    DictDataSelect,
+    MachineProjectForm,
+    BuSelect,
+    MachineProjectDetail,
+    MachineProjectCloseAuthForm,
+  },
+  props: {
+    isComponent: {
+      type: Boolean,
+      default: false,
+    },
+    height: {
+      type: [String, Number],
+      default: '76vh',
+    },
+  },
+  data() {
+    return {
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      userBuList: [],
+      activeTable: 'inquiryPart',
+      machineProjectVisible: false,
+      machineProjectDetailVisible: false,
+      machineProjectCloseAuthVisible: false,
+      queryForm: {
+        site: this.$store.state.user.site,
+        customerNo: '',
+        customerDesc: '',
+        id: '',
+        rfqNo: '',
+        bu: '',
+        requestStartDate: '',
+        requestEndDate: '',
+        requiredCompletionStartDate: '',
+        requiredCompletionEndDate: '',
+        status: '',
+        quoterName: '',
+        requesterName: '',
+        priorityLevel: '',
+        partNo: '',
+        partDesc: '',
+        page: 1,
+        limit: 10,
+        menuId: this.$route.meta.menuId,
+      },
+      dataList: [],
+      inquiryPartDataList: [],
+      queryLoading: false,
+      dataListLoading: false,
+      columns: [
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1BuDesc',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'id',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1BuDesc',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'buDesc',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'BU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1CustomerNo',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'projectNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '项目编号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1CustomerDesc',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'projectName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '项目名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1RequesterName',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'projectIncome',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '项目收益',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 180,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1QuoterName',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'projectBudget',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '项目总预算',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1RequiredCompletionDate',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'projectActualExpenses',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '项目总实际开销',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1CustomerInquiryNo',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'responsiblePerson',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '项目负责人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1RequestDate',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'startDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '项目开始时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1RequestDate',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'endDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '结案时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1Status',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'sstatus',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '状态',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1CreateDate',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'createDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1CreateBy',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'createBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1UpdateDate',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'updateDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1UpdateBy',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'updateBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+      ],
+      machineColumnList: [],
+      quoteLoading: false,
+      // ======== 选中的当前行数据 ========
+      inquiryCurrentRow: {},
+    }
+  },
+  created() {
+    this.getSiteAndQueryBuByUserName()
+    this.handleQuery()
+    this.getTableUserColumn(this.$route.meta.menuId + 'table1', 1)
+  },
+  methods: {
+    // 动态列开始 获取 用户保存的 格式列
+    async getTableUserColumn(tableId, columnId) {
+      let queryTableUser = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        status: true,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableUserListLanguage(queryTableUser).then(({ data }) => {
+        if (data.rows.length > 0) {
+          switch (columnId) {
+            case 1:
+              this.columns = data.rows
+              break
+          }
+        } else {
+          this.getColumnList(tableId, columnId)
+        }
+      })
+    },
+    // 获取 tableDefault 列
+    async getColumnList(tableId, columnId) {
+      let queryTable = {
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableDefaultListLanguage(queryTable).then(({ data }) => {
+        if (!data.rows.length === 0) {
+          switch (columnId) {
+            case 1:
+              this.columns = data.rows
+              break
+          }
+        }
+      })
+    },
+    handleColumnResize(newWidth, oldWidth, column, event) {
+      let inData = this.columnList.filter(
+        (item) => item.columnProp === column.property
+      )[0]
+      inData.columnWidth = newWidth
+      updateColumnSize(inData).then(({ data }) => {
+        if (data.code === 0) {
+          console.log('栏位宽度保存成功！')
+        }
+      })
+    },
+    // 获取用户的bu
+    getSiteAndQueryBuByUserName() {
+      let tempData = {
+        username: this.$store.state.user.name,
+      }
+      getSiteAndBuByUserName(tempData).then(({ data }) => {
+        if (data.code === 0) {
+          this.userBuList = data.rows
+        }
+      })
+    },
+
+    handleQuery() {
+      this.queryForm.pageSize = this.pageSize
+      this.queryForm.pageIndex = this.pageIndex
+      this.queryLoading = true
+      queryMachinePage(this.queryForm)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.records
+            this.pageIndex = data.page.current
+            this.pageSize = data.page.size
+            this.totalPage = data.page.total
+            //判断是否全部存在数据
+            //if (this.totalPage > 0) {
+            //  this.$refs.mainTable.setCurrentRow(this.dataList[0])
+            //  this.refreshCurrentTabTable()
+            //  this.inquiryClickRow(this.dataList[0])
+            //}
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.handleQuery()
+    },
+    handlePageChange(val) {
+      this.pageIndex = val
+      this.handleQuery()
+    },
+    handleAdd() {
+      this.machineProjectVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectForm.add()
+      })
+    },
+    handleEdit(record) {
+      this.machineProjectVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectForm.edit(record)
+      })
+    },
+    handleRemove(row) {
+      this.$confirm('确认删除该项目信息吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.handleRemoveMachine(row)
+        })
+        .catch(() => {})
+    },
+    handleRemoveMachine(row) {
+      let params = {
+        id: row.id,
+      }
+      machineDelete(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success(data.msg)
+            this.handleQuery()
+          } else {
+            this.$message.warning(data.msg)
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error)
+        })
+    },
+    chooseCloseUser(record) {
+      this.machineProjectCloseAuthVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectCloseAuth.projectCloseInit(record)
+      })
+    },
+    handleDetails(record) {
+      this.machineProjectDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectDetail.projectDetailInit(record)
+      })
+    },
+    handleUpdateStatus(record) {
+      this.$confirm(`确定要下达该项目信息吗?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        callback: () => {},
+        beforeClose: (action, ctx, close) => {
+          if (action !== 'confirm') {
+            close()
+            return
+          }
+          ctx.confirmButtonLoading = true
+
+          record.enSstatus = '审核中'
+          let params = {
+            ...record,
+          }
+          projectUpdateStatus(params)
+            .then((res) => {
+              if (res.data && res.data.code === 0) {
+                this.$message.success(res.data.msg)
+                this.handleQuery()
+                close()
+              } else {
+                this.$message.warning(res.data.msg)
+              }
+            })
+            .catch((error) => {
+              this.$message.warning(error)
+            })
+            .finally(() => {
+              ctx.confirmButtonLoading = false
+            })
+        },
+      })
+      /* .then(() => {
+        console.log("11111111");
+        
+        this.handleQuery()
+        record.enSstatus = '审核中'
+        let params = {
+          ...record,
+        }
+        projectUpdateStatus(params)
+          .then((res) => {
+            if (res.data && res.data.code === 0) {
+              this.$message.success(res.data.msg)
+              this.handleQuery()
+            } else {
+              this.$message.warning(res.data.msg)
+            }
+          })
+          .catch((error) => {
+            this.$message.warning(error)
+          })
+      }) */
+    },
+    machineProjectFinished() {
+      this.handleQuery()
+    },
+    handleDblClick(row) {
+      this.handleDetails(row)
+    },
+
+    // ======== 页签切换相关方法 ========
+    /**
+     * 列表表格选择替换
+     * @param tab
+     * @param event
+     */
+    tabClick(tab, event) {
+      // 刷新列表数据
+      this.refreshCurrentTabTable()
+    },
+
+    // ======== 列表操作方法 ========
+    /**
+     * 单机选中询价信息
+     * @param row
+     */
+    inquiryClickRow(row) {
+      this.inquiryCurrentRow = JSON.parse(JSON.stringify(row))
+    },
+    /**
+     * 当前值发生变化的时候修改
+     * @param row
+     * @param oldRow
+     */
+    changeCurrentRow(row, oldRow) {
+      // 判断是否是获取焦点的事件
+      if (row) {
+        this.inquiryCurrentRow = JSON.parse(JSON.stringify(row))
+        //刷新当前页表
+        this.refreshCurrentTabTable()
+      }
+    },
+    /**
+     * 刷新页签的table数据
+     */
+    refreshCurrentTabTable() {
+      if (this.activeTable === 'inquiryPart') {
+      }
+    },
+
+    rowStyle({ row }) {
+      if (this.inquiryCurrentRow.id === row.id) {
+        return { 'background-color': '#E8F7F6', cursor: 'pointer' }
+      }
+    },
+    formatContent(content, length = 15) {
+      if (content && content.length > length) {
+        return content.substr(0, length) + '...'
+      }
+      return content
+    },
+    handleHu(){
+      let params={
+        site:this.$store.state.user.site
+      }
+      sendTextLoraWatch(params)
+            .then((res) => {
+              if (res) {
+                console.log(res);
+                
+              } 
+            })
+    }
+  },
+}
+</script>
+<style scoped lang="scss">
+/deep/ .customer-tab .el-tabs__content {
+  padding: 0px !important;
+}
+///deep/ .customer-tab .el-tabs__content {
+//
+//}
+.el-table /deep/ .cell {
+  height: auto;
+  line-height: 1.5;
+}
+</style>
diff --git a/src/views/modules/machine/machineProjectDetail.vue b/src/views/modules/machine/machineProjectDetail.vue
new file mode 100644
index 0000000..44a3e44
--- /dev/null
+++ b/src/views/modules/machine/machineProjectDetail.vue
@@ -0,0 +1,544 @@
+<template>
+  <div style="height: 100%;overflow: auto">
+    <el-dialog title="详情" v-drag :close-on-click-modal="false" :visible.sync="saveVisible" width="60%"
+      @close="closeDetail">
+      <!-- 页签 -->
+      <el-tabs v-model="activeTable" @tab-click="getTabs">
+        <el-tab-pane label="项目预算" name="projectIncome">
+          <!-- <el-button @click="addIncome()" :disabled="this.model.sstatus != '草稿'">新增</el-button> -->
+          <div style="height: 100%;overflow: auto">
+            <!-- <el-table :data="dataList" border v-loading="queryLoading" height="33vh" @row-dblclick="handleDblClick"
+              :row-style="rowStyle" ref="mainTable">
+              <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
+              <el-table-column v-for="(item,index) in columns" :key="index" :sortable="item.columnSortable"
+                :prop="item.columnProp" :header-align="item.headerAlign"
+                :show-overflow-tooltip="item.showOverflowTooltip" :align="item.align"
+                :fixed="item.fixed===''?false:item.fixed" :min-width="item.columnWidth"
+                :label="item.columnLabel"></el-table-column>
+              <el-table-column label="备注" width="180" align="left" headerAlign="center">
+                <template slot-scope="scope">
+                  <el-tooltip class="item" effect="dark" :content="scope.row.remark" placement="top">
+                    <div>{{ formatContent(scope.row.remark) }}</div>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+
+              <el-table-column v-if="model.sstatus =='草稿'" header-align="center" align="center" width="140" label="操作">
+                <template slot-scope="scope">
+                  <el-link style="cursor: pointer" @click="editIncome(scope.row)">修改</el-link>
+                  <el-link style="cursor: pointer" @click="removeIncome(scope.row)">删除</el-link>
+                </template>
+              </el-table-column>
+            </el-table> -->
+            <MachineProjectIncome :projectIncome="dataList" :project="model" @IncomeFinished="getIncomeList"
+              :auth-flag="false" :height="'33vh'"></MachineProjectIncome>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="项目计划" name="projectPlan">
+          <div style="height: 100%;overflow: auto;">
+            <MachineProjectPlan :projectPlan="projectPlan" :project="model" @planFinished="getPlanList"
+              :auth-flag="false" :height="'33vh'"></MachineProjectPlan>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="项目任务" name="projectTask">
+          <div style="height: 100%;overflow: auto;">
+            <MachineProjectTask :projectTask="projectTask" :project="model" @taskFinished="getTaskList"
+              :auth-flag="false" :height="'33vh'"></MachineProjectTask>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="结案确认" name="projectClose">
+          <div style="height: 100%;overflow: auto;">
+            <MachineProjectCloseTable :projectClose="projectClose" :project="model" @taskFinished="getCloseList"
+              :auth-flag="false" :height="'33vh'"></MachineProjectCloseTable>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="审核记录" name="projectAuth">
+          <div style="height: 100%;overflow: auto;">
+            <MachineProjectAuthTable :projectAuth="projectAuth" :project="model" @taskFinished="getAuthList"
+              :auth-flag="false" :height="'33vh'"></MachineProjectAuthTable>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="相关文档" name="inquiryDocument">
+          <div style="height: 100%;overflow: auto;">
+            <oss-components ref="inquiryDocument" label="申请单号" style="margin-top: 5px" height="44vh" :columns="ossColumns"
+              :orderRef1="model.site" :orderRef2="model.id" :rfqNo="model.projectNo">
+            </oss-components>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import DictDataSelect from '../sys/dict-data-select.vue'
+import OssComponents from '../oss/ossProjectComponents.vue'
+import BuSelect from '../../../components/selector/select/BuSelect.vue'
+
+import {
+  queryMachineProjectIncomeList,
+  deleteProjectIncome,
+  queryMachineProjectPlanList,
+  queryMachineProjectTaskList,
+  queryMachineProjectCloseList,
+} from '../../../api/machine/machineProjectIncome'
+import { queryMachineProjectAuthList } from '../../../api/machine/machineProject'
+import MachineProjectIncome from './modules/machineProjectIncomeTable.vue'
+import MachineProjectPlan from './modules/machineProjectPlanTable.vue'
+import MachineProjectTask from './modules/machineProjectTaskTable.vue'
+import MachineProjectCloseTable from './modules/machineProjectCloseTable.vue'
+import MachineProjectAuthTable from './modules/machineProjectAuthTable.vue'
+
+export default {
+  name: 'machineProjectDetail',
+  components: {
+    OssComponents,
+    DictDataSelect,
+    BuSelect,
+    MachineProjectIncome,
+    MachineProjectPlan,
+    MachineProjectTask,
+    MachineProjectCloseTable,
+    MachineProjectAuthTable,
+  },
+  props: {
+    isComponent: {
+      type: Boolean,
+      default: false,
+    },
+    height: {
+      type: [String, Number],
+      default: '76vh',
+    },
+  },
+  data() {
+    return {
+      model: {},
+      projectPlan: [],
+      projectTask: [],
+      projectClose: [],
+      projectAuth: [],
+      ossColumns: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101506001001,
+          serialNumber: '101506001001Table2FileName',
+          tableId: '101506001001Table2',
+          tableName: '文件信息表',
+          columnProp: 'fileName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '文件名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101506001001,
+          serialNumber: '101506001001Table2FileRemark',
+          tableId: '101506001001Table2',
+          tableName: '文件信息表',
+          columnProp: 'cadditionalInfo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 240,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101506001001,
+          serialNumber: '101506001001Table2CreateDate',
+          tableId: '101506001001Table2',
+          tableName: '文件信息表',
+          columnProp: 'createDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '上传时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101506001001,
+          serialNumber: '101506001001Table2CreatedBy',
+          tableId: '101506001001Table2',
+          tableName: '文件信息表',
+          columnProp: 'createdBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '上传人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+      ],
+      saveVisible: false,
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      // 初始页签
+      activeTable: 'projectIncome',
+      projectDetalVisible: false,
+      queryForm: {
+        site: this.$store.state.user.site,
+        customerNo: '',
+        customerDesc: '',
+        id: '',
+        rfqNo: '',
+        bu: '',
+        requestStartDate: '',
+        requestEndDate: '',
+        requiredCompletionStartDate: '',
+        requiredCompletionEndDate: '',
+        status: '',
+        quoterName: '',
+        requesterName: '',
+        priorityLevel: '',
+        partNo: '',
+        partDesc: '',
+        page: 1,
+        limit: 10,
+        menuId: this.$route.meta.menuId,
+      },
+      dataList: [],
+      inquiryPartDataList: [],
+      queryLoading: false,
+      dataListLoading: false,
+      columns: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1BuDesc',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'incomeNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '费用编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1CustomerNo',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'incomeName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '费用描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1CustomerDesc',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'incomeBudget',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '预算金额',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1RequesterName',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'actualExpenses',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '实际开销',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1QuoterName',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'currency',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '币种',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1RequiredCompletionDate',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        }, */
+      ],
+      machineColumnList: [],
+      quoteLoading: false,
+      // ======== 选中的当前行数据 ========
+      inquiryCurrentRow: {},
+    }
+  },
+  created() {},
+  methods: {
+    projectDetailInit(record) {
+      this.saveVisible = true
+      this.model = record
+      this.getTabs()
+    },
+    rowStyle({ row }) {
+      if (this.inquiryCurrentRow.id === row.id) {
+        return { 'background-color': '#E8F7F6', cursor: 'pointer' }
+      }
+    },
+    addIncome() {
+      this.projectDetalVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectDetailForm.add(this.model)
+      })
+    },
+    editIncome(record) {
+      this.projectDetalVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectDetailForm.edit(record)
+      })
+    },
+    removeIncome(row) {
+      this.$confirm('确认删除该项目信息吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.handleRemoveIncome(row)
+      })
+    },
+    handleRemoveIncome(row) {
+      let params = {
+        id: row.id,
+      }
+      deleteProjectIncome(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success(data.msg)
+            this.getIncomeList()
+          } else {
+            this.$message.warning(data.msg)
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error)
+        })
+    },
+    getTabs() {
+      switch (this.activeTable) {
+        case 'projectIncome':
+          this.getIncomeList()
+          break
+        case 'projectPlan':
+          this.getPlanList()
+          break
+        case 'projectTask':
+          this.getTaskList()
+          break
+        case 'projectClose':
+          this.getCloseList()
+          break
+        case 'projectAuth':
+          this.getAuthList()
+          break
+        case 'inquiryDocument':
+          this.$refs.inquiryDocument.handleQuery()
+          break
+        default:
+          this.getIncomeList()
+          break
+      }
+    },
+    getIncomeList() {
+      let obj = {
+        projectNo: this.model.projectNo,
+      }
+      queryMachineProjectIncomeList(obj)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.dataList = data.list
+            //判断是否全部存在数据
+            //if (this.totalPage > 0) {
+            //  this.$refs.mainTable.setCurrentRow(this.dataList[0])
+            //  this.refreshCurrentTabTable()
+            //  this.inquiryClickRow(this.dataList[0])
+            //}
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    incomeFinished() {
+      this.getIncomeList()
+    },
+    getPlanList() {
+      let obj = {
+        projectNo: this.model.projectNo,
+      }
+      queryMachineProjectPlanList(obj)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.projectPlan = data.list
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    getTaskList() {
+      let obj = {
+        projectNo: this.model.projectNo,
+      }
+      queryMachineProjectTaskList(obj)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.projectTask = data.list
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    getCloseList() {
+      let obj = {
+        projectNo: this.model.projectNo,
+      }
+      queryMachineProjectCloseList(obj)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.projectClose = data.list
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    getAuthList() {
+      let obj = {
+        site: this.$store.state.user.site,
+        projectNo: this.model.projectNo,
+      }
+      queryMachineProjectAuthList(obj)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.projectAuth = data.list
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.queryLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.queryLoading = false
+        })
+    },
+    closeDetail() {
+      this.$emit('selectFinished')
+    },
+    formatContent(content, length = 10) {
+      if (content && content.length > length) {
+        return content.substr(0, length) + '...'
+      }
+      return content
+    },
+  },
+}
+</script>
+<style scoped lang="scss">
+/deep/ .customer-tab .el-tabs__content {
+  padding: 0px !important;
+}
+///deep/ .customer-tab .el-tabs__content {
+//
+//}
+.MachineProjectTask {
+  z-index: 2003;
+}
+.el-table /deep/ .cell {
+  height: auto;
+  line-height: 1.5;
+}
+</style>
diff --git a/src/views/modules/machine/modules/machineProjectAuthTable.vue b/src/views/modules/machine/modules/machineProjectAuthTable.vue
new file mode 100644
index 0000000..2d2fe81
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectAuthTable.vue
@@ -0,0 +1,145 @@
+<template>
+    <div>
+      <el-table v-loading="queryLoading" border :data="projectAuth" style="width: 100%;margin-top: 5px" :height="height">
+        <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
+        <el-table-column v-for="(item,index) in columns" :key="index" :sortable="item.columnSortable"
+          :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align" :fixed="item.fixed === ''?false:item.fixed" :min-width="item.columnWidth"
+          :label="item.columnLabel">
+        </el-table-column>
+      </el-table>
+    </div>
+  
+  </template>
+    <script>
+  export default {
+    name: 'machineProjectAuthTable',
+    components: {
+    }, 
+    props: {
+      project: {
+        type: Object,
+        required: true,
+      },
+      projectAuth: {
+        type: Array,
+        required: true,
+      },
+      height: {
+        type: [Number, String],
+        default: 300,
+      },
+      authFlag: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    data() {
+      return {
+        model: {},
+        queryLoading: false,
+        saveQuoteDetailRules: {
+        },
+        columns: [
+          /* {
+            userId: this.$store.state.user.name,
+            functionId: 5011,
+            serialNumber: '5011Table2PartNo',
+            tableId: '5011Table2',
+            tableName: '项目任务表',
+            columnProp: 'taskNo',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '任务编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          }, */
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5011,
+            serialNumber: '5011Table2Qty',
+            tableId: '5011Table2',
+            tableName: '项目任务表',
+            columnProp: 'userDisplay',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '审核人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5011,
+            serialNumber: '5011Table2AdjustBomUnYield',
+            tableId: '5011Table2',
+            tableName: '项目任务表',
+            columnProp: 'actAuthorizeDate',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '审核时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5011,
+            serialNumber: '5011Table2AdjustLabourCost',
+            tableId: '5011Table2',
+            tableName: '项目任务表',
+            columnProp: 'approveResult',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '审核结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 5011,
+            serialNumber: '5011Table2AdjustLabourCost',
+            tableId: '5011Table2',
+            tableName: '项目任务表',
+            columnProp: 'authHistRemark',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: '备注',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+        ],
+        formVisible: false,
+      }
+    },
+    methods: {
+    },
+  
+    watch: {},
+  }
+  </script>
+  
+    
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectCloseAuthForm.vue b/src/views/modules/machine/modules/machineProjectCloseAuthForm.vue
new file mode 100644
index 0000000..df0fdce
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectCloseAuthForm.vue
@@ -0,0 +1,230 @@
+<template>
+  <div style="width: 100%;margin-top: 5px">
+    <el-dialog title="结案人员" :close-on-click-modal="false" v-drag @close="closeAuthGroupMemberSaveDialogFlag"
+      :visible.sync="projectCloseAuthSaveDialog" width="900px">
+      <div style="font-size: 12px">
+        <el-form :inline="true" label-position="top" :model="searchAuthBusinessData">
+          <el-form-item :label="'用户名'">
+            <el-input v-model="searchAuthBusinessData.username" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'用户名称'">
+            <el-input v-model="searchAuthBusinessData.userDisplay" clearable style="width: 200px"></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="authGroupBusinessSearch()">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-container style="margin-top: 0px;">
+        <el-main style="width: 400px; padding: 1px">
+          <span style="font-size: 12px">可选结案人</span>
+          <el-table @header-dragend="handleColumnResize" height="400px" :data="allAuthBusinessList" border
+            ref="allAuthBusinessTable" @row-click="allAuthBusinessClickRow" @selection-change="selectionAllAuthBusiness"
+            highlight-current-row style="width: 100%">
+            <el-table-column type="selection" header-align="center" align="center" :selectable="selectFlag" width="50">
+            </el-table-column>
+            <el-table-column prop="username" header-align="center" align="center" min-width="80" label="用户名">
+            </el-table-column>
+            <el-table-column prop="userDisplay" header-align="center" align="center" min-width="120" label="用户名称">
+            </el-table-column>
+          </el-table>
+        </el-main>
+        <el-main style="width: 111px;padding: 1px">
+          <div style="margin-top: 182px;margin-left: 18px">
+            <el-button type="primary" @click="addAuthGroupMemberBusiness()">添加>></el-button>
+          </div>
+          <div style="margin-top: 15px;margin-left: 18px">
+            <el-button type="primary" @click="deleteAuthGroupMemberBusiness()">删除</el-button>
+          </div>
+        </el-main>
+        <el-main style="width: 400px;padding: 1px">
+          <span style="font-size: 12px">已有结案人</span>
+          <el-table @header-dragend="handleColumnResize" height="400px" :data="isAuthBusinessList" border
+            ref="isAuthBusinessTable" @row-click="isAuthBusinessClickRow" @selection-change="selectionIsAuthBusiness"
+            highlight-current-row style="width: 100%">
+            <el-table-column type="selection" header-align="center" align="center" :selectable="selectFlag" width="50">
+            </el-table-column>
+            <el-table-column prop="username" header-align="center" align="center" min-width="80" label="用户名">
+            </el-table-column>
+            <el-table-column prop="userDisplay" header-align="center" align="center" min-width="120" label="用户名称">
+            </el-table-column>
+          </el-table>
+        </el-main>
+      </el-container>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="handleSaveOrUpdateClose" :loading="saveLoading">确
+          定</el-button>
+        <el-button type="primary" @click="projectCloseAuthSaveDialog = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { forEach } from 'lodash'
+import {
+  projectCloseAuthSearch,
+  saveBatchProjectClose,
+} from '../../../../api/machine/machineProjectIncome'
+
+export default {
+  name: 'machineProjectCloseAuthForm',
+  components: {},
+  watch: {},
+  data() {
+    return {
+      project: {},
+      projectCloseAuthSaveDialog: false,
+      searchAuthBusinessData: {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        username: '',
+        userDisplay: '',
+      },
+      allAuthBusinessList: [],
+      isAuthBusinessList: [],
+      saveLoading: false,
+    }
+  },
+  methods: {
+    handleColumnResize(newWidth, oldWidth, column, event) {
+      let inData = this.columnList.filter(
+        (item) => item.columnProp === column.property
+      )[0]
+      inData.columnWidth = newWidth
+      updateColumnSize(inData).then(({ data }) => {
+        if (data.code === 0) {
+          console.log('栏位宽度保存成功！')
+        }
+      })
+    },
+    closeAuthGroupMemberSaveDialogFlag() {
+      this.projectCloseAuthSaveDialog = false
+      this.allAuthBusinessList = []
+      this.isAuthBusinessList = []
+    },
+    /**
+     * 查询可用角色
+     */
+    authGroupBusinessSearch() {
+      let obj = {
+        site: this.$store.state.user.site,
+        username: this.searchAuthBusinessData.username,
+        userDisplay: this.searchAuthBusinessData.userDisplay,
+      }
+      projectCloseAuthSearch(obj).then(({ data }) => {
+        if (data.code === 0) {
+          this.allAuthBusinessList = data.rows
+        }
+      })
+    },
+    //已有角色
+    isAuthBusinessClickRow(row) {
+      this.$refs.isAuthBusinessTable.toggleRowSelection(row)
+    },
+    //可选角色
+    allAuthBusinessClickRow(row) {
+      this.$refs.allAuthBusinessTable.toggleRowSelection(row)
+    },
+    selectionAllAuthBusiness(val) {
+      this.allAuthBusinessSelections = val
+    },
+    selectionIsAuthBusiness(val) {
+      this.isAuthBusinessSelections = val
+    },
+    selectFlag() {
+      return true
+    },
+    //添加角色
+    addAuthGroupMemberBusiness() {
+      if (
+        this.allAuthBusinessSelections == null ||
+        this.allAuthBusinessSelections.length === 0
+      ) {
+        this.$message.warning('请选择可选角色！')
+        return
+      }
+      let array = this.allAuthBusinessSelections.concat(this.isAuthBusinessList)
+      let newArray = array.filter(
+        (item, index, self) =>
+          index === self.findIndex((t) => t.userId === item.userId)
+      )
+      this.isAuthBusinessList = newArray
+
+      let ids = []
+      for (let i = 0; i < this.allAuthBusinessSelections.length; i++) {
+        ids.push(this.allAuthBusinessSelections[i].userId)
+      }
+      for (let i = 0; i < ids.length; i++) {
+        let index = this.allAuthBusinessList.findIndex(
+          (obj) => obj.userId == ids[i]
+        )
+        if (index != -1) {
+          this.allAuthBusinessList.splice(index, 1)
+        }
+      }
+
+      this.allAuthBusinessSelections = []
+      this.$refs.allAuthBusinessTable.clearSelection()
+    },
+    //删除角色
+    deleteAuthGroupMemberBusiness() {
+      if (
+        this.isAuthBusinessSelections == null ||
+        this.isAuthBusinessSelections.length === 0
+      ) {
+        this.$message.warning('请选择已有角色！')
+        return
+      }
+      for (let i = 0; i < this.isAuthBusinessSelections.length; i++) {
+        let obj = {}
+        obj = this.isAuthBusinessSelections[i]
+        this.allAuthBusinessList.push(obj)
+      }
+      this.allAuthBusinessList.sort(function (a, b) {
+        return a.userId - b.userId
+      })
+
+      const difference = this.isAuthBusinessList.filter(
+        (item) =>
+          !this.isAuthBusinessSelections.some(
+            (item2) => item.userId === item2.userId
+          )
+      )
+      this.isAuthBusinessList = difference
+    },
+    projectCloseInit(record) {
+      this.projectCloseAuthSaveDialog = true
+      this.project = record
+      this.searchAuthBusinessData = {}
+      this.authGroupBusinessSearch()
+    },
+    handleSaveOrUpdateClose() {
+      let param = {
+        site: this.project.site,
+        buNo: this.project.buNo,
+        projectNo: this.project.projectNo,
+        userList: this.isAuthBusinessList,
+      }
+      this.saveLoading = true
+      saveBatchProjectClose(param)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.projectCloseAuthSaveDialog = false
+            this.$message.success(data.msg)
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.$emit('selectFinished')
+          this.saveLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.saveLoading = false
+        })
+    },
+  },
+}
+</script>
+<style scoped>
+</style>
diff --git a/src/views/modules/machine/modules/machineProjectCloseTable.vue b/src/views/modules/machine/modules/machineProjectCloseTable.vue
new file mode 100644
index 0000000..9a0af6c
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectCloseTable.vue
@@ -0,0 +1,150 @@
+<template>
+  <div>
+    <el-table v-loading="queryLoading" border :data="projectClose" style="width: 100%;margin-top: 5px" :height="height">
+      <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
+      <el-table-column v-for="(item,index) in columns" :key="index" :sortable="item.columnSortable"
+        :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align" :fixed="item.fixed === ''?false:item.fixed" :min-width="item.columnWidth"
+        :label="item.columnLabel">
+      </el-table-column>
+      <el-table-column label="操作" v-if="!authFlag && this.project.sstatus == '进行中'" align="center" width="120">
+        <template slot-scope="scope">
+          <el-link style="cursor: pointer" v-if="scope.row.sstatus != '已确认'" @click="handleConfirm(scope.row)">确认</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+
+</template>
+
+<script>
+import {
+    projectCloseUpdateStatus,
+} from '../../../../api/machine/machineProjectIncome'
+
+export default {
+  name: 'machineProjectPlanTable',
+  components: {},
+  props: {
+    project: {
+      type: Object,
+      required: true,
+    },
+    projectClose: {
+      type: Array,
+      required: true,
+    },
+    height: {
+      type: [Number, String],
+      default: 300,
+    },
+    authFlag: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      model: {},
+      saveQuoteDetail: {},
+      dataList: [],
+      saveLoading: false,
+      queryLoading: false,
+      saveVisible: false,
+      saveQuoteDetailRules: {},
+      columns: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2PartNo',
+          tableId: '5011Table2',
+          tableName: '项目结案表',
+          columnProp: 'userDisplay',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '确认人员',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2PartDesc',
+          tableId: '5011Table2',
+          tableName: '项目结案表',
+          columnProp: 'startDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '要求确认日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2Qty',
+          tableId: '5011Table2',
+          tableName: '项目结案表',
+          columnProp: 'endDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '确认日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
+      ],
+      formVisible: false,
+    }
+  },
+  methods: {
+    handleConfirm(row) {
+      this.$confirm('是否确认该信息？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.handleConfirmProjectClose(row)
+        })
+        .catch(() => {})
+    },
+    handleConfirmProjectClose(row) {
+      let params = {
+        id: row.id,
+      }
+      projectCloseUpdateStatus(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success(data.msg)
+            this.taskTableFinished()
+          } else {
+            this.$message.warning(data.msg)
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error)
+        })
+    },
+    taskTableFinished() {
+      this.$emit('taskFinished')
+    },
+  },
+
+  watch: {},
+}
+</script>
+  
+    
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectDetailForm.vue b/src/views/modules/machine/modules/machineProjectDetailForm.vue
new file mode 100644
index 0000000..d9e3487
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectDetailForm.vue
@@ -0,0 +1,255 @@
+<template>
+  <div style="height:100%">
+    <el-dialog :title="model.id? '编辑' :'新增'" v-drag :close-on-click-modal="false" :append-to-body='true' :visible.sync="saveVisible"
+      width="500px">
+      <el-form ref="saveForm" :model="model" :rules="saveRules" label-position="top" label-width="100px">
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="费用描述" prop="incomeName" :show-message="false">
+              <el-input v-model="model.incomeName" :disabled="detailFlag" :max="100"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="币种" prop="currency" :show-message="false">
+              <el-select ref="currency" v-model="model.currency"  placeholder="请选择" :disabled="detailFlag">
+                <el-option v-for="i in currencyList" :key="i.currency" :label="i.currencyDesc" :value="i.currency">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预算金额" prop="incomeBudget" :show-message="false">
+              <el-input v-model="model.incomeBudget" :disabled="detailFlag" @input=" value=>model.incomeBudget = value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="实际开销" prop="actualExpenses" :show-message="false">
+              <el-input v-model="model.actualExpenses" :disabled="!(detailFlag || projectStatus == '进行中')" @input=" value=>model.actualExpenses = value.match(/\d+(\.\d{0,2})?/) ? value.match(/\d+(\.\d{0,2})?/)[0] : ''"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark" class="auto" :show-message="false">
+              <el-input v-model="model.remark" :disabled="detailFlag" :rows="3" :max="255" type="textarea"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleSaveOrUpdateIncome" :loading="saveLoading">确
+          定</el-button>
+        <el-button @click="saveVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  saveMachineProjectIncome,
+  updateMachineProjectIncome,
+  currencyList,
+} from '../../../../api/machine/machineProjectIncome'
+import DictDataSelect from "../../sys/dict-data-select.vue";
+
+export default {
+  name: 'machineProjectDetailForm',
+  components: {DictDataSelect},
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+  },
+  data() {
+    return {
+      model: {},
+      saveVisible: false,
+      detailFlag: false,
+      userList: [],
+      currencyList:[],
+      saveRules: {
+        incomeName: [
+          { required: true, message: '请输入项目表述', trigger: ['blur', 'change'] },
+        ],
+        currency: [
+          {
+            required: true,
+            message: '请选择币种',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        incomeBudget: [
+          {
+            required: true,
+            message: '请输入预算金额',
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      saveLoading: false,
+      confirmLoading: false,
+      validatorRules: {
+        contactsName: [{ required: true, message: '请输入姓名!' }],
+        phone: [
+          {
+            required: true,
+            pattern: /^1[3456789]\d{9}$/,
+            message: '请输入正确的手机号码!',
+          },
+        ],
+      },
+      url: {},
+      visible: false,
+      disableSubmit: false,
+      loading: false,
+      projectStatus:'',
+    }
+  },
+  computed: {},
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model))
+  },
+  methods: {
+    add(record) {
+      this.saveVisible = true
+      this.model = JSON.parse(JSON.stringify({}))
+      this.detailFlag = false
+
+      this.model.site = record.site
+      this.model.buNo = record.buNo
+      this.model.projectNo = record.projectNo
+      this.model.projectName = record.projectName
+      this.projectStatus = record.sstatus
+      this.getCurrencyList()
+    },
+    edit(record,project) {
+      this.saveVisible = true
+      this.model = JSON.parse(JSON.stringify(record))
+      this.projectStatus = project.sstatus
+     
+      this.getDetailFlag()
+      this.getCurrencyList()
+    },
+    getDetailFlag(){
+      if(this.projectStatus != '草稿' && this.projectStatus != '已驳回'){
+        this.detailFlag = true
+      }else{
+        this.detailFlag = false
+      }
+      
+    },
+    queryById(id) {
+      let params = {
+        id: id,
+      }
+      getMachineById(params).then((res) => {
+        this.model = res.data.record
+      })
+    },
+    handleSaveOrUpdateIncome() {
+      this.$refs.saveForm.validate((valid, obj) => {
+        if (valid) {
+          if (this.model.id) {
+            this.handleUpdateIncome()
+          } else {
+            this.handleSaveIncome()
+          }
+        } else {
+          let i = 1
+          for (let key in obj) {
+            this.$message.warning(obj[key][0].message)
+            if (i === 1) {
+              return
+            }
+            i++
+          }
+        }
+      })
+    },
+    handleSaveIncome() {
+      let params = {
+        ...this.model,
+        createBy: this.$store.state.user.name,
+      }
+
+      this.saveLoading = true
+      saveMachineProjectIncome(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.saveVisible = false
+            this.$message.success(data.msg)
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.$emit('selectIncomeFinished')
+          this.saveLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.saveLoading = false
+        })
+    },
+    handleUpdateIncome() {
+      let params = {
+        ...this.model,
+        updateBy: this.$store.state.user.name,
+        site: this.$store.state.user.site,
+      }
+      this.saveLoading = true
+      updateMachineProjectIncome(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.saveVisible = false
+            this.currentQuote = {
+              ...this.currentQuote,
+            }
+            this.$message.success(data.msg)
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.$emit('selectIncomeFinished')
+          this.saveLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.saveLoading = false
+        })
+    },
+    getLabel() {
+      this.$nextTick(() => {
+        this.model.responsiblePerson =
+          this.$refs.responsiblePerson.selectedLabel
+      })
+    },
+    getCurrencyList() {
+      let params = {
+        site: this.$store.state.user.site,
+        active: 'Y',
+      }
+      currencyList(params).then((res) => {
+        if (res && res.data.code === 0) {
+          this.$set(this, 'currencyList', res.data.list)
+        }
+      })
+    },
+  },
+}
+</script>
+<style scoped>
+.auto /deep/ .el-form-item__content {
+  height: auto;
+  line-height: 1.5;
+}
+
+.el-table /deep/ .cell {
+  height: auto;
+  line-height: 1.5;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectForm.vue b/src/views/modules/machine/modules/machineProjectForm.vue
new file mode 100644
index 0000000..71a51f9
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectForm.vue
@@ -0,0 +1,340 @@
+<template>
+  <div style="height:100%">
+    <el-dialog :title="model.id? '编辑' :'新增'" v-drag :close-on-click-modal="false" :visible.sync="saveVisible"
+      width="500px">
+      <el-form ref="saveForm" :model="model" :rules="saveRules" label-position="top" label-width="100px">
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="BU" prop="buId" :show-message="false">
+              <bu-select v-model="model.buId" :disabled="model.id > 0"></bu-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目名称" prop="projectName" :show-message="false">
+              <el-input v-model="model.projectName" :disabled="detailFlag"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="项目负责人" prop="responsibleNo" :show-message="false">
+              <span slot="label" v-if="!detailFlag">
+                <a @click="getResponsibleList">项目负责人</a>
+              </span>
+              <el-input v-model="model.responsiblePerson" :disabled="true"></el-input>
+              <!-- <el-select ref="responsiblePerson" v-model="model.responsibleNo" @change="getLabel" placeholder="请选择">
+                <el-option v-for="i in userList" :key="i.userId" :label="i.userDisplay" :value="i.userId">
+                </el-option>
+              </el-select> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="客户询价单号" prop="customerInquiryNo" :show-message="false">
+              <el-input v-model="model.customerInquiryNo" :disabled="detailFlag"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="内部询价单号" prop="insideInquiryNo" :show-message="false">
+              <span slot="label" v-if="model.id <= 0">
+                <a @click="insideInquiryVisible = true">内部询价单号</a>
+              </span>
+              <el-input v-model="model.insideInquiryNo" @blur="handleInquiryBlur" :disabled="model.id > 0"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <!-- <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="客户编码" prop="customerNo" :show-message="false">
+              <span slot="label" v-if="model.id <= 0">
+                <a @click="customerVisible = true">客户编码</a>
+              </span>
+              <el-input v-model="model.customerNo" :disabled="model.id > 0" @blur="customerNoBlur"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="客户描述" prop="customerDesc" :show-message="false">
+              <el-input v-model="model.customerDesc" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="Cost Model" prop="costModel" :show-message="false">
+              <el-select v-model="model.costModel" :disabled="detailFlag">
+                <el-option label="2020" value="2020"></el-option>
+                <el-option label="UFIDA" value="UFIDA"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="Markup" prop="markup" :show-message="false">
+              <el-input-number style="width: 100%" :controls="false" :step="0" v-model="model.markup" :disabled="detailFlag"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="芯片价格" prop="chipPrice" :show-message="false">
+              <el-input v-model="model.chipPrice" :disabled="detailFlag"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="币种" :show-message="false">
+              <span slot="label" v-if="!detailFlag">
+                <a @click="getBaseList(512)">币种</a>
+              </span>
+              <el-input v-model="model.currency" readonly :disabled="detailFlag">
+                <span slot="suffix" v-show="model.currency && !detailFlag" @click="clearModalData('currency')"><i class="el-icon-circle-close" style="margin-left: 5px;cursor: pointer;"></i></span>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="报价日期" prop="quoteDate" :show-message="false">
+              <el-date-picker style="width: 100%" :disabled="detailFlag" v-model="model.quoteDate" type="date" value-format='yyyy-MM-dd' format='yyyy-MM-dd'></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="报价专员" prop="quoter" :show-message="false">
+              <span slot="label" v-if="!detailFlag">
+                <a @click="handleQuoterClick" >报价专员</a>
+              </span>
+              <el-input v-model="model.quoter" :disabled="detailFlag"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="采购专员" :show-message="false">
+              <span slot="label" v-if="!detailFlag">
+                <a @click="handlePurchaseClick" >采购专员</a>
+              </span>
+              <el-input v-model="model.purchase" :disabled="detailFlag"></el-input>
+            </el-form-item>
+          </el-col> -->
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label="项目收益" prop="remark" class="auto" :show-message="false">
+              <el-input v-model="model.projectIncome" :disabled="detailFlag" :rows="3" type="textarea"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" v-if="!detailFlag" @click="handleSaveOrUpdateMachine" :loading="saveLoading">确
+          定</el-button>
+        <el-button @click="saveVisible = false">取 消</el-button>
+      </div>
+      <UserChooseComponent ref="userChooseComponent" v-if="userVisible" :isPage="false" title="项目负责人" @selectFinish="selectResponsibleFinish"></UserChooseComponent>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import BuSelect from '../../../../components/selector/select/BuSelect.vue'
+import DictDataSelect from '../../sys/dict-data-select.vue'
+import {
+  saveMachine,
+  updateMachine,
+  getMachineById,
+} from '../../../../api/machine/machineProject.js'
+import { userList } from '../../../../api/user.js'
+import UserChooseComponent from '../../../../components/selector/user/userChooseComponent.vue'
+
+export default {
+  name: 'machineProjectForm',
+  components: {
+    BuSelect,
+    DictDataSelect,
+    UserChooseComponent,
+  },
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+  },
+  data() {
+    return {
+      model: {},
+      saveVisible: false,
+      userVisible: false,
+      detailFlag: false,
+      userList: [],
+      saveRules: {
+        buId: [
+          { required: true, message: '请选择BU', trigger: ['blur', 'change'] },
+        ],
+        projectName: [
+          {
+            required: true,
+            message: '请输入项目名称',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        responsibleNo: [
+          {
+            required: true,
+            message: '请选择项目负责人',
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      saveLoading: false,
+      confirmLoading: false,
+      validatorRules: {
+        contactsName: [{ required: true, message: '请输入姓名!' }],
+        phone: [
+          {
+            required: true,
+            pattern: /^1[3456789]\d{9}$/,
+            message: '请输入正确的手机号码!',
+          },
+        ],
+      },
+      url: {},
+      title: '添加联系人',
+      width: 800,
+      visible: false,
+      disableSubmit: false,
+      loading: false,
+    }
+  },
+  computed: {},
+  watch:{
+  },
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model))
+  },
+  methods: {
+    add() {
+      this.saveVisible = true
+      this.model = {}
+      this.model = Object.assign({}, this.model)
+      this.getUserList()
+    },
+    edit(record) {
+      this.saveVisible = true
+      this.getUserList()
+      this.model = Object.assign({}, record)
+      this.queryById(record.id)
+    },
+    queryById(id) {
+      let params = {
+        id: id,
+      }
+      getMachineById(params).then((res) => {
+        this.model = res.data.record
+      })
+    },
+    getUserList() {
+      let params = {
+        site: this.$store.state.user.site,
+        status: 1,
+      }
+      userList(params).then((res) => {
+        if (res && res.data.code === 0) {
+          this.$set(this, 'userList', res.data.list)
+        }
+      })
+    },
+    handleSaveOrUpdateMachine() {
+      this.$refs.saveForm.validate((valid, obj) => {
+        if (valid) {
+          if (this.model.id) {
+            this.handleUpdateMachine()
+          } else {
+            this.handleSaveMachine()
+          }
+        } else {
+          let i = 1
+          for (let key in obj) {
+            this.$message.warning(obj[key][0].message)
+            if (i === 1) {
+              return
+            }
+            i++
+          }
+        }
+      })
+    },
+    handleSaveMachine() {
+      let params = {
+        ...this.model,
+        createBy: this.$store.state.user.name,
+      }
+
+      this.saveLoading = true
+      saveMachine(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.saveVisible = false
+            this.$message.success(data.msg)
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.$emit('selectFinished')
+          this.saveLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.saveLoading = false
+        })
+    },
+    handleUpdateMachine() {
+      let params = {
+        ...this.model,
+        updateBy: this.$store.state.user.name,
+      }
+      this.saveLoading = true
+      updateMachine(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.saveVisible = false
+            this.currentQuote = {
+              ...this.currentQuote,
+            }
+            this.$message.success(data.msg)
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.$emit('selectFinished')
+          this.saveLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.saveLoading = false
+        })
+    },
+    getLabel() {
+      this.$nextTick(() => {
+        this.model.responsiblePerson =
+          this.$refs.responsiblePerson.selectedLabel
+      })
+    },
+    getResponsibleList(){
+      this.userVisible = true
+      this.$nextTick(() => {
+          this.$refs.userChooseComponent.userInit()
+      })
+    },
+    selectResponsibleFinish(row){
+      this.userVisible = false
+      this.model.responsibleNo = row.userId
+      this.model.responsiblePerson = row.userDisplay
+      
+    }
+  },
+}
+</script>
+<style scoped>
+.auto /deep/ .el-form-item__content {
+  height: auto;
+  line-height: 1.5;
+}
+
+.el-table /deep/ .cell {
+  height: auto;
+  line-height: 1.5;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectIncomeTable.vue b/src/views/modules/machine/modules/machineProjectIncomeTable.vue
new file mode 100644
index 0000000..0e54807
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectIncomeTable.vue
@@ -0,0 +1,240 @@
+<template>
+  <div>
+    <el-button @click="addIncome()" v-if="!authFlag"
+      :disabled="this.project.sstatus != '草稿' && this.project.sstatus !='已驳回'">新增</el-button>
+    <div style="height: 100%;overflow: auto">
+      <el-table :data="projectIncome" border v-loading="queryLoading" style="width: 100%;margin-top: 5px"
+        :height="height">
+        <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
+        <el-table-column v-for="(item,index) in columns" :key="index" :sortable="item.columnSortable"
+          :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align" :fixed="item.fixed===''?false:item.fixed" :min-width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="scope.column.property == 'incomeName'">
+              <el-tooltip class="item" effect="dark" :content="scope.row.incomeName" placement="top">
+                <div>{{ formatContent(scope.row.incomeName) }}</div>
+              </el-tooltip>
+            </span>
+            <span v-else>{{scope.row[scope.column.property]}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" width="200" align="left" headerAlign="center">
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" :content="scope.row.remark" placement="top">
+              <div>{{ formatContent(scope.row.remark) }}</div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+
+        <el-table-column v-if="project.sstatus =='草稿'||project.sstatus =='进行中'||project.sstatus =='已驳回'"
+          header-align="center" align="center" width="140" label="操作">
+          <template slot-scope="scope">
+            <el-link style="cursor: pointer"
+              v-if="project.sstatus =='草稿'||project.sstatus =='进行中'||project.sstatus =='已驳回'"
+              @click="editIncome(scope.row)">修改</el-link>
+            <el-link style="cursor: pointer" v-if="project.sstatus =='草稿'||project.sstatus =='已驳回'"
+              @click="removeIncome(scope.row)">删除</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <MachineProjectDetailForm ref="machineProjectDetailForm" v-if="projectDetalVisible"
+      @selectIncomeFinished="incomeFinished"></MachineProjectDetailForm>
+  </div>
+
+</template>
+  <script>
+import MachineProjectDetailForm from './machineProjectDetailForm.vue'
+import { deleteProjectIncome } from '../../../../api/machine/machineProjectIncome'
+
+export default {
+  name: 'machineProjectPlanTable',
+  components: {
+    MachineProjectDetailForm,
+  },
+  props: {
+    project: {
+      type: Object,
+      required: true,
+    },
+    projectIncome: {
+      type: Array,
+      required: true,
+    },
+    height: {
+      type: [Number, String],
+      default: 300,
+    },
+    authFlag: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      saveQuoteDetail: {},
+      saveLoading: false,
+      queryLoading: false,
+      saveVisible: false,
+      projectDetalVisible: false,
+      saveQuoteDetailRules: {},
+      columns: [
+        /*  {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1BuDesc',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'incomeNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '费用编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1CustomerNo',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'incomeName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '费用描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1CustomerDesc',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'incomeBudget',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '预算金额',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1RequesterName',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'actualExpenses',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '实际开销',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5012,
+          serialNumber: '5012Table1QuoterName',
+          tableId: '5012Table1',
+          tableName: '项目信息',
+          columnProp: 'currencyDesc',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '币种',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+      ],
+      formVisible: false,
+
+      quoteGroupDetail: {},
+      drawerVisible: false,
+    }
+  },
+  methods: {
+    addIncome() {
+      this.projectDetalVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectDetailForm.add(this.project)
+      })
+    },
+    editIncome(record) {
+      this.projectDetalVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectDetailForm.edit(record, this.project)
+      })
+    },
+    removeIncome(row) {
+      this.$confirm('确认删除该项目信息吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.handleRemoveIncome(row)
+      })
+    },
+    handleRemoveIncome(row) {
+      let params = {
+        id: row.id,
+      }
+      deleteProjectIncome(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success(data.msg)
+            this.incomeFinished()
+          } else {
+            this.$message.warning(data.msg)
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error)
+        })
+    },
+    incomeFinished() {
+      this.$emit('IncomeFinished')
+    },
+    formatContent(content, length = 15) {
+      if (content && content.length > length) {
+        return content.substr(0, length) + '...'
+      }
+      return content
+    },
+  },
+
+  watch: {},
+}
+</script>
+  
+  <style scoped>
+.auto /deep/ .el-form-item__content {
+  height: auto;
+  line-height: 1.5;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectPlanDetailForm.vue b/src/views/modules/machine/modules/machineProjectPlanDetailForm.vue
new file mode 100644
index 0000000..99eea4b
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectPlanDetailForm.vue
@@ -0,0 +1,214 @@
+<template>
+  <div style="height:100%" class="planDetail">
+    <el-dialog :title="model.id? '编辑' :'新增'" v-drag :close-on-click-modal="false" :append-to-body='true' :visible.sync="saveVisible"
+      width="500px">
+      <el-form ref="saveForm" :model="model" :rules="saveRules" label-position="top" label-width="100px">
+        <el-row :gutter="10">
+          <el-col :span="16">
+            <el-form-item label="计划描述" prop="planDescribe" :show-message="false">
+              <el-input v-model="model.planDescribe" :disabled="detailFlag"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="计划开始时间" prop="startDate" :show-message="false">
+              <el-date-picker style="width: 120px" v-model="model.startDate" type="date" value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>   
+          <el-col :span="8">
+            <el-form-item label="计划完成时间" prop="endDate" :show-message="false">
+              <el-date-picker style="width: 120px" v-model="model.endDate" type="date" value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark" class="auto" :show-message="false">
+              <el-input v-model="model.remark" :disabled="detailFlag" :rows="3" :max="255" type="textarea"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" v-if="!detailFlag" @click="handleSaveOrUpdatePlan" :loading="saveLoading">确
+          定</el-button>
+        <el-button @click="saveVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+  
+  <script>
+import {
+  saveMachineProjectPlan,
+  updateMachineProjectPlan,
+} from '../../../../api/machine/machineProjectIncome'
+export default {
+  name: 'machineProjectPlanDetailForm',
+  components: {},
+  props: {
+  },
+  data() {
+    return {
+      model: {},
+      saveVisible: false,
+      detailFlag: false,
+      userList: [],
+      saveRules: {
+        buId: [
+          { required: true, message: '请选择BU', trigger: ['blur', 'change'] },
+        ],
+        projectName: [
+          {
+            required: true,
+            message: '请输入项目名称',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        responsibleNo: [
+          {
+            required: true,
+            message: '请选择项目负责人',
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      saveLoading: false,
+      validatorRules: {
+        contactsName: [{ required: true, message: '请输入姓名!' }],
+        phone: [
+          {
+            required: true,
+            pattern: /^1[3456789]\d{9}$/,
+            message: '请输入正确的手机号码!',
+          },
+        ],
+      },
+      url: {},
+      visible: false,
+      disableSubmit: false,
+      loading: false,
+    }
+  },
+  computed: {},
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model))
+  },
+  methods: {
+    add(record) {
+      console.log(record);
+      
+      this.saveVisible = true
+      this.model = JSON.parse(JSON.stringify({}))
+
+      this.model.site = record.site
+      this.model.buNo = record.buNo
+      this.model.projectNo = record.projectNo
+      this.model.projectName = record.projectName
+    },
+    edit(record) {
+      console.log("????");
+      
+      this.saveVisible = true
+      this.model = JSON.parse(JSON.stringify(record))
+    },
+    queryById(id) {
+      let params = {
+        id: id,
+      }
+      getMachineById(params).then((res) => {
+        this.model = res.data.record
+        console.log('res', this.model)
+      })
+    },
+    handleSaveOrUpdatePlan() {
+      this.$refs.saveForm.validate((valid, obj) => {
+        if (valid) {
+          if (this.model.id) {
+            this.handleUpdatePlan()
+          } else {
+            this.handleSavePlan()
+          }
+        } else {
+          let i = 1
+          for (let key in obj) {
+            this.$message.warning(obj[key][0].message)
+            if (i === 1) {
+              return
+            }
+            i++
+          }
+        }
+      })
+    },
+    handleSavePlan() {
+      let params = {
+        ...this.model,
+        createBy: this.$store.state.user.name,
+      }
+
+      this.saveLoading = true
+      saveMachineProjectPlan(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.saveVisible = false
+            this.$message.success(data.msg)
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.$emit('selectFinished')
+          this.saveLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.saveLoading = false
+        })
+    },
+    handleUpdatePlan() {
+      let params = {
+        ...this.model,
+        updateBy: this.$store.state.user.name,
+        site: this.$store.state.user.site,
+      }
+      this.saveLoading = true
+      updateMachineProjectPlan(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.saveVisible = false
+            this.currentQuote = {
+              ...this.currentQuote,
+            }
+            this.$message.success(data.msg)
+          } else {
+            this.$message.warning(data.msg)
+          }
+          this.$emit('selectFinished')
+          this.saveLoading = false
+        })
+        .catch((error) => {
+          this.$message.error(error)
+          this.saveLoading = false
+        })
+    },
+    getLabel() {
+      this.$nextTick(() => {
+        this.model.responsiblePerson =
+          this.$refs.responsiblePerson.selectedLabel
+      })
+    },
+  },
+}
+</script>
+  <style scoped>
+.auto /deep/ .el-form-item__content {
+  height: auto;
+  line-height: 1.5;
+  
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectPlanTable.vue b/src/views/modules/machine/modules/machineProjectPlanTable.vue
new file mode 100644
index 0000000..6ac05ce
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectPlanTable.vue
@@ -0,0 +1,263 @@
+<template>
+  <div>
+    <el-button v-if="!authFlag" :disabled="this.project.sstatus != '进行中'" @click="addPlan()">新增</el-button>
+    <el-table v-loading="queryLoading" border :data="projectPlan" style="width: 100%;margin-top: 5px" :height="height">
+      <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
+      <el-table-column v-for="(item,index) in columns" :key="index" :sortable="item.columnSortable"
+        :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align" :fixed="item.fixed === ''?false:item.fixed" :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="scope.column.property == 'planDescribe'">
+            <el-tooltip class="item" effect="dark" :content="scope.row.planDescribe" placement="top">
+              <div>{{ formatContent(scope.row.planDescribe) }}</div>
+            </el-tooltip>
+          </span>
+          <span v-else-if="scope.column.property == 'remark'">
+            <el-tooltip class="item" effect="dark" :content="scope.row.remark" placement="top">
+              <div>{{ formatContent(scope.row.remark) }}</div>
+            </el-tooltip>
+          </span>
+          <span v-else>{{scope.row[scope.column.property]}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" v-if="!authFlag && this.project.sstatus == '进行中'" align="center" width="120">
+        <template slot-scope="scope">
+          <el-link style="cursor: pointer" @click="editPlan(scope.row)">修改</el-link>
+          <el-link style="cursor: pointer" @click="removePlan(scope.row)">删除</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+    <MachineProjectPlanDetailForm ref="machineProjectPlanDetailForm" v-if="formVisible"
+      @selectFinished="planTableFinished"></MachineProjectPlanDetailForm>
+  </div>
+
+</template>
+<script>
+import MachineProjectPlanDetailForm from './machineProjectPlanDetailForm.vue'
+import { deleteProjectPlan } from '../../../../api/machine/machineProjectIncome'
+
+export default {
+  name: 'machineProjectPlanTable',
+  components: {
+    MachineProjectPlanDetailForm,
+  },
+  props: {
+    project: {
+      type: Object,
+      required: true,
+    },
+    projectPlan: {
+      type: Array,
+      required: true,
+    },
+    height: {
+      type: [Number, String],
+      default: 300,
+    },
+    authFlag: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      saveQuoteDetail: {},
+      saveLoading: false,
+      queryLoading: false,
+      saveVisible: false,
+      saveQuoteDetailRules: {
+        partNo: [
+          {
+            required: true,
+            message: '请输入物料编码',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        partDesc: [
+          {
+            required: true,
+            message: '请输入物料名称',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        qty: [
+          {
+            required: true,
+            message: '请输入数量',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        type: [
+          {
+            required: true,
+            message: '请选择TP类型',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        costModel: [
+          {
+            required: true,
+            message: '请选择Cost Model',
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      columns: [
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2PartNo',
+          tableId: '5011Table2',
+          tableName: '项目计划表',
+          columnProp: 'planNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '计划编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2PartDesc',
+          tableId: '5011Table2',
+          tableName: '项目计划表',
+          columnProp: 'planDescribe',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '计划描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2Qty',
+          tableId: '5011Table2',
+          tableName: '项目计划表',
+          columnProp: 'startDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '计划开始时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2AdjustBomUnYield',
+          tableId: '5011Table2',
+          tableName: '项目计划表',
+          columnProp: 'endDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '计划完成时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2AdjustLabourCost',
+          tableId: '5011Table2',
+          tableName: '项目计划表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+      ],
+      formVisible: false,
+
+      quoteGroupDetail: {},
+      drawerVisible: false,
+    }
+  },
+  methods: {
+    addPlan() {
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectPlanDetailForm.add(this.project)
+      })
+    },
+    editPlan(row) {
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectPlanDetailForm.edit(row)
+      })
+    },
+    planTableFinished() {
+      this.$emit('planFinished')
+    },
+    removePlan(row) {
+      this.$confirm('确认删除该项目信息吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.handleRemovePlan(row)
+      })
+    },
+    handleRemovePlan(row) {
+      let params = {
+        id: row.id,
+      }
+      deleteProjectPlan(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success(data.msg)
+            this.planTableFinished()
+          } else {
+            this.$message.warning(data.msg)
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error)
+        })
+    },
+    formatContent(content, length = 15) {
+      if (content && content.length > length) {
+        return content.substr(0, length) + '...'
+      }
+      return content
+    },
+  },
+
+  watch: {},
+}
+</script>
+
+<style scoped>
+.auto /deep/ .el-form-item__content {
+  height: auto;
+  line-height: 1.5;
+}
+</style>
diff --git a/src/views/modules/machine/modules/machineProjectTaskDetailForm.vue b/src/views/modules/machine/modules/machineProjectTaskDetailForm.vue
new file mode 100644
index 0000000..648f0d9
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectTaskDetailForm.vue
@@ -0,0 +1,190 @@
+<template>
+    <div>
+      <el-dialog :title="model.id? '编辑' :'新增'" v-drag :close-on-click-modal="false"  :append-to-body='true' :visible.sync="saveVisible"
+        width="500px">
+        <el-form ref="saveForm" :model="model" :rules="saveRules" label-position="top" label-width="100px">
+          <el-row :gutter="10">
+            <el-col :span="16">
+              <el-form-item label="任务描述" prop="taskDescribe" :show-message="false">
+                <el-input v-model="model.taskDescribe" :disabled="detailFlag"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="8">
+              <el-form-item label="任务开始时间" prop="startDate" :show-message="false">
+                <el-date-picker style="width: 120px" v-model="model.startDate" type="date" value-format="yyyy-MM-dd"
+                  placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="任务完成时间" prop="endDate" :show-message="false">
+                <el-date-picker style="width: 120px" v-model="model.endDate" type="date" value-format="yyyy-MM-dd"
+                  placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="10">
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark" class="auto" :show-message="false">
+                <el-input v-model="model.remark" :disabled="detailFlag" :rows="3" :max="255" type="textarea"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" v-if="!detailFlag" @click="handleSaveOrUpdateTask" :loading="saveLoading">确
+            定</el-button>
+          <el-button @click="saveVisible = false">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </template>
+    
+    <script>
+  import {
+    saveMachineProjectTask,
+    updateMachineProjectTask,
+  } from '../../../../api/machine/machineProjectIncome'
+  export default {
+    name: 'machineProjectPlanDetailForm',
+    components: {},
+    props: {
+    },
+    data() {
+      return {
+        model: {},
+        saveVisible: false,
+        detailFlag: false,
+        userList: [],
+        saveRules: {
+          buId: [
+            { required: true, message: '请选择BU', trigger: ['blur', 'change'] },
+          ],
+          projectName: [
+            {
+              required: true,
+              message: '请输入项目名称',
+              trigger: ['blur', 'change'],
+            },
+          ],
+          responsibleNo: [
+            {
+              required: true,
+              message: '请选择项目负责人',
+              trigger: ['blur', 'change'],
+            },
+          ],
+        },
+        saveLoading: false,
+        url: {},
+        visible: false,
+        disableSubmit: false,
+        loading: false,
+      }
+    },
+    computed: {},
+    created() {
+      //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model))
+    },
+    methods: {
+      add(record) {
+        this.saveVisible = true
+        this.model = JSON.parse(JSON.stringify({}))
+  
+        this.model.site = record.site
+        this.model.buNo = record.buNo
+        this.model.projectNo = record.projectNo
+        this.model.projectName = record.projectName
+      },
+      edit(record) {
+        this.saveVisible = true
+        this.model = JSON.parse(JSON.stringify(record))
+      },
+      handleSaveOrUpdateTask() {
+        this.$refs.saveForm.validate((valid, obj) => {
+          if (valid) {
+            if (this.model.id) {
+              this.handleUpdateTask()
+            } else {
+              this.handleSaveTask()
+            }
+          } else {
+            let i = 1
+            for (let key in obj) {
+              this.$message.warning(obj[key][0].message)
+              if (i === 1) {
+                return
+              }
+              i++
+            }
+          }
+        })
+      },
+      handleSaveTask() {
+        let params = {
+          ...this.model,
+          createBy: this.$store.state.user.name,
+        }
+  
+        this.saveLoading = true
+        saveMachineProjectTask(params)
+          .then(({ data }) => {
+            if (data && data.code === 0) {
+              this.saveVisible = false
+              this.$message.success(data.msg)
+            } else {
+              this.$message.warning(data.msg)
+            }
+            this.$emit('selectFinished')
+            this.saveLoading = false
+          })
+          .catch((error) => {
+            this.$message.error(error)
+            this.saveLoading = false
+          })
+      },
+      handleUpdateTask() {
+        let params = {
+          ...this.model,
+          updateBy: this.$store.state.user.name,
+          site: this.$store.state.user.site,
+        }
+        this.saveLoading = true
+        updateMachineProjectTask(params)
+          .then(({ data }) => {
+            if (data && data.code === 0) {
+              this.saveVisible = false
+              this.currentQuote = {
+                ...this.currentQuote,
+              }
+              this.$message.success(data.msg)
+            } else {
+              this.$message.warning(data.msg)
+            }
+            this.$emit('selectFinished')
+            this.saveLoading = false
+          })
+          .catch((error) => {
+            this.$message.error(error)
+            this.saveLoading = false
+          })
+      },
+      getLabel() {
+        this.$nextTick(() => {
+          this.model.responsiblePerson =
+            this.$refs.responsiblePerson.selectedLabel
+        })
+      },
+    },
+  }
+  </script>
+<style scoped>
+.auto /deep/ .el-form-item__content {
+  height: auto;
+  line-height: 1.5;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/machine/modules/machineProjectTaskTable.vue b/src/views/modules/machine/modules/machineProjectTaskTable.vue
new file mode 100644
index 0000000..c4059d4
--- /dev/null
+++ b/src/views/modules/machine/modules/machineProjectTaskTable.vue
@@ -0,0 +1,262 @@
+<template>
+  <div>
+    <el-button v-if="!authFlag" :disabled="this.project.sstatus != '进行中'" @click="addTask()">新增</el-button>
+    <el-table v-loading="queryLoading" border :data="projectTask" style="width: 100%;margin-top: 5px" :height="height">
+      <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
+      <el-table-column v-for="(item,index) in columns" :key="index" :sortable="item.columnSortable"
+        :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align" :fixed="item.fixed === ''?false:item.fixed" :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="scope.column.property == 'taskDescribe'">
+            <el-tooltip class="item" effect="dark" :content="scope.row.taskDescribe" placement="top">
+              <div>{{ formatContent(scope.row.taskDescribe) }}</div>
+            </el-tooltip>
+          </span>
+          <span v-else-if="scope.column.property == 'remark'">
+            <el-tooltip class="item" effect="dark" :content="scope.row.remark" placement="top">
+              <div>{{ formatContent(scope.row.remark) }}</div>
+            </el-tooltip>
+          </span>
+          <span v-else>{{scope.row[scope.column.property]}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" v-if="!authFlag && this.project.sstatus == '进行中'" align="center" width="120">
+        <template slot-scope="scope">
+          <el-link style="cursor: pointer" @click="editTask(scope.row)">修改</el-link>
+          <el-link style="cursor: pointer" @click="removeTask(scope.row)">删除</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+    <MachineProjectTaskDetailForm ref="machineProjectTaskDetailForm" v-if="formVisible"
+      @selectFinished="taskTableFinished"></MachineProjectTaskDetailForm>
+  </div>
+
+</template>
+  <script>
+import MachineProjectTaskDetailForm from './machineProjectTaskDetailForm.vue'
+import { deleteProjectTask } from '../../../../api/machine/machineProjectIncome'
+
+export default {
+  name: 'machineProjectPlanTable',
+  components: {
+    MachineProjectTaskDetailForm,
+  },
+
+  props: {
+    project: {
+      type: Object,
+      required: true,
+    },
+    projectTask: {
+      type: Array,
+      required: true,
+    },
+    height: {
+      type: [Number, String],
+      default: 300,
+    },
+    authFlag: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      model: {},
+      saveQuoteDetail: {},
+      dataList: [],
+      saveLoading: false,
+      queryLoading: false,
+      saveVisible: false,
+      saveQuoteDetailRules: {
+        partNo: [
+          {
+            required: true,
+            message: '请输入物料编码',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        partDesc: [
+          {
+            required: true,
+            message: '请输入物料名称',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        qty: [
+          {
+            required: true,
+            message: '请输入数量',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        type: [
+          {
+            required: true,
+            message: '请选择TP类型',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        costModel: [
+          {
+            required: true,
+            message: '请选择Cost Model',
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      columns: [
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2PartNo',
+          tableId: '5011Table2',
+          tableName: '项目任务表',
+          columnProp: 'taskNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '任务编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2PartDesc',
+          tableId: '5011Table2',
+          tableName: '项目任务表',
+          columnProp: 'taskDescribe',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '任务描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2Qty',
+          tableId: '5011Table2',
+          tableName: '项目任务表',
+          columnProp: 'startDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '任务开始时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2AdjustBomUnYield',
+          tableId: '5011Table2',
+          tableName: '项目任务表',
+          columnProp: 'endDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '任务完成时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5011,
+          serialNumber: '5011Table2AdjustLabourCost',
+          tableId: '5011Table2',
+          tableName: '项目任务表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+      ],
+      formVisible: false,
+
+      quoteGroupDetail: {},
+      drawerVisible: false,
+    }
+  },
+  methods: {
+    addTask() {
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectTaskDetailForm.add(this.project)
+      })
+    },
+    editTask(row) {
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.machineProjectTaskDetailForm.edit(row)
+      })
+    },
+    taskTableFinished() {
+      this.$emit('taskFinished')
+    },
+    removeTask(row) {
+      this.$confirm('确认删除该项目信息吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.handleRemoveTask(row)
+      })
+    },
+    handleRemoveTask(row) {
+      let params = {
+        id: row.id,
+      }
+      deleteProjectTask(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success(data.msg)
+            this.taskTableFinished()
+          } else {
+            this.$message.warning(data.msg)
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error)
+        })
+    },
+    formatContent(content, length = 15) {
+      if (content && content.length > length) {
+        return content.substr(0, length) + '...'
+      }
+      return content
+    },
+  },
+
+  watch: {},
+}
+</script>
+
+  
\ No newline at end of file
diff --git a/src/views/modules/orderIssure/soIssueNotify/searchConfirmIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchConfirmIssureNotify.vue
new file mode 100644
index 0000000..5722d3d
--- /dev/null
+++ b/src/views/modules/orderIssure/soIssueNotify/searchConfirmIssureNotify.vue
@@ -0,0 +1,1776 @@
+<template>
+  <div class="mod-config yzz">
+    <!--    <div>-->
+    <!--        <span @click="favoriteFunction()">-->
+    <!--         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
+    <!--        </span>-->
+    <!--    </div>-->
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+      <el-form :inline="true" label-position="top" style="margin-top: 0px">
+        <el-form-item :label="'申请单号'">
+          <el-input v-model="searchData.notifyNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'申请账号'">
+          <el-input v-model="searchData.userName" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'申请单日期'">
+          <el-date-picker style="width: 120px" v-model="searchData.startDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item style="margin-top: 23px;">
+          <label style="margin-left: 0px;font-size: 19px">&#10142</label>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-date-picker style="width: 120px" v-model="searchData.endDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="searchData.status" placeholder="请选择" style="width: 120px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="已下达" value="已下达"></el-option>
+            <el-option label="已关闭" value="已关闭"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否领料">
+          <el-select v-model="searchData.issueFlag" placeholder="请选择" style="width: 120px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="Y" value="Y"></el-option>
+            <el-option label="N" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="领料结果">
+          <el-select v-model="searchData.issueResult" placeholder="请选择" style="width: 120px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="部分发料" value="部分发料"></el-option>
+            <el-option label="全部发料" value="全部发料"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="确认状态">
+          <el-select v-model="searchData.confirmStatus" placeholder="请选择" style="width: 120px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="确认" value="确认"></el-option>
+            <el-option label="未确认" value="未确认"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'车间'">
+          <el-select v-model="searchData.workShopList" multiple style="width: 360px">
+            <el-option v-for="i in workShopList" :key="i.workShopId" :label="i.workShopName" :value="i.workShopId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-button type="primary" @click="searchTable()">查询</el-button>
+          <download-excel :fields="fields()" :data="exportData" type="xls" :name="exportName" :header="exportHeader"
+            :footer="exportFooter" :fetch="createExportData" :before-generate="startDownload"
+            :before-finish="finishDownload" worksheet="导出信息" class="el-button el-button--primary el-button--medium">
+            {{ '导出' }}
+          </download-excel>
+        </el-form-item>
+      </el-form>
+    </el-form>
+    <el-table :data="dataList" @row-click="changeData" :height="height" border highlight-current-row ref="mainTable"
+      v-loading="dataListLoading" style="width: 100%; ">
+      <el-table-column v-for="(item,index) in columnList1" :key="index" :sortable="item.columnSortable"
+        :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+              style="width: 100px; height: 80px" /></span>
+        </template>
+      </el-table-column>
+      <el-table-column header-align="center" fixed="right" align="center" width="80" label="操作">
+        <template slot-scope="scope">
+          <!-- <a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotifyModel(scope.row)">关闭</a>
+          <a type="text" size="small" v-if="scope.row.status==='已关闭'" @click="openNotify(scope.row)">开启</a> -->
+          <el-link style="cursor: pointer" v-if="scope.row.confirmStatus==='确认'"
+            @click="cancelConfirmNotify(scope.row)">取消确认</el-link>
+          <el-link style="cursor: pointer" v-if="scope.row.confirmStatus !='确认'"
+            @click="confirmNotify(scope.row)">确认</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 1000]" :page-size="pageSize" :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card"
+      @tab-click="tabClick">
+      <el-tab-pane label="派工单明细" name="detail">
+        <el-table :data="dataList2" :height="height" border v-loading="dataListLoading" style="width: 100%; ">
+          <el-table-column header-align="center" align="center" width="80" label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" v-if="currentRow.status==='已下达'"
+                @click="deleteNotifySOSPlus(scope.row)">删除</a>
+
+            </template>
+          </el-table-column>
+          <el-table-column v-for="(item,index) in columnList2" :key="index" :sortable="item.columnSortable"
+            :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                  style="width: 100px; height: 80px" /></span>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-tab-pane>
+      <el-tab-pane label="材料明细" name="sub">
+        <el-table :data="dataList3" :height="height" border :row-class-name="tableRowClassName"
+          v-loading="dataListLoading" style="width: 100%; ">
+          <!--          <el-table-column-->
+          <!--            header-align="center"-->
+          <!--            align="center"-->
+          <!--            width="80"-->
+          <!--            fixed="left"-->
+          <!--            label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column header-align="center" align="center" width="80" label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" v-if="currentRow.status==='已下达'"
+                @click="deleteNotifyMaterial(scope.row)">删除</a>
+
+            </template>
+          </el-table-column>
+          <el-table-column v-for="(item,index) in columnList3" :key="index" :sortable="item.columnSortable"
+            :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                  style="width: 100px; height: 80px" /></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="材料汇总" name="sum">
+        <el-table :data="dataList4" :height="height" border v-loading="dataListLoading" style="width: 100%; ">
+          <!--          <el-table-column-->
+          <!--            header-align="center"-->
+          <!--            align="center"-->
+          <!--            width="80"-->
+          <!--            fixed="left"-->
+          <!--            label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column v-for="(item,index) in columnList4" :key="index" :sortable="item.columnSortable"
+            :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                  style="width: 100px; height: 80px" /></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="删除记录" name="change">
+        <el-table :data="dataList5" :height="height" border v-loading="dataListLoading" style="width: 100%; ">
+          <!--          <el-table-column-->
+          <!--            header-align="center"-->
+          <!--            align="center"-->
+          <!--            width="80"-->
+          <!--            fixed="left"-->
+          <!--            label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column v-for="(item,index) in columnList5" :key="index" :sortable="item.columnSortable"
+            :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                  style="width: 100px; height: 80px" /></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="关闭记录" name="close">
+        <el-table :data="dataList6" :height="height" border v-loading="dataListLoading" style="width: 100%; ">
+          <!--          <el-table-column-->
+          <!--            header-align="center"-->
+          <!--            align="center"-->
+          <!--            width="80"-->
+          <!--            fixed="left"-->
+          <!--            label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column v-for="(item,index) in columnList6" :key="index" :sortable="item.columnSortable"
+            :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                  style="width: 100px; height: 80px" /></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-dialog title="关闭原因" :close-on-click-modal="false" v-drag :visible.sync="closeModalFlag" width="450px">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item>
+              <el-input type="textarea" v-model="closeData.closeRemark " :rows="3" resize='none' maxlength="200"
+                show-word-limit style="height: 60px">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+        <el-button type="primary" @click="closeNotify()">保存</el-button>
+        <el-button type="primary" @click="closeModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+import {
+  searchNotifyHeader,
+  searchNotifyOrderList,
+  searchNotifyMaterialList,
+  searchSumNotifyMaterialList,
+  deleteNotifySOSPlus,
+  updateNotifyStatus,
+  deleteNotifyMaterial,
+  searchNotifyLog,
+  searchNotifyLogClose,
+  updateNotifyConfirmStatus,
+} from '@/api/orderIssure/soIssueNotify.js'
+import Chooselist from '@/views/modules/common/Chooselist'
+import { getEamWorkShop } from '@/api/factory/site.js'
+import {
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+} from '@/api/table.js'
+import {
+  userFavoriteList,
+  saveUserFavorite,
+  removeUserFavorite,
+} from '@/api/userFavorite.js'
+
+export default {
+  components: {
+    Chooselist,
+  },
+  data() {
+    return {
+      height: 200,
+      modelFlag: false,
+      activeName: 'detail',
+      dataList: [],
+      dataList2: [],
+      dataList3: [],
+      dataList4: [],
+      dataList5: [],
+      dataList6: [],
+      addOrUpdateVisible: false,
+      closeData: {
+        site: '',
+        notifyNo: '',
+        closeRemark: '',
+        username: this.$store.state.user.name,
+      },
+      closeModalFlag: false,
+      searchData: {
+        page: 1,
+        limit: 100,
+        site: this.$store.state.user.site,
+        userName: '',
+        notifyNo: '',
+        status: '',
+        issueFlag: '',
+        issueResult: '',
+        confirmStatus: '',
+        workShopList: [],
+        startDate: this.dayjs().format('YYYY-MM-DD'),
+        endDate: this.dayjs().format('YYYY-MM-DD'),
+        sql: " and a.status!='已计划' ",
+      },
+      workShopList: [],
+      exportList: [],
+      pageIndex: 1,
+      pageSize: 100,
+      totalPage: 0,
+      dataListLoading: false,
+      currentRow: '',
+      headerData: '',
+      columnList1: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1NotifyNo',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'notifyNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '申请单单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1WorkShopName',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'workShopName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '车间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1NotifyDate',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'notifyDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '申请日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1UserName',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'userName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '申请账号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1UserName',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'userDisplay',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '申请人姓名',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1IssueFlag',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'issueFlag',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '是否领料',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1IssueResult',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'issueResult',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '领料结果',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1Status',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'status',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '状态',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1Status',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'confirmStatus',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '确认状态',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1Status',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'confirmUserDisplay',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '确认人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1Status',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'confirmDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '确认时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table1Remark',
+          tableId: '701004Table1',
+          tableName: '领料申请主表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200,
+        },
+      ],
+      columnList2: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table2ItemNo',
+          tableId: '701004Table2',
+          tableName: '申请单派工单明细表',
+          columnProp: 'itemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 40,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table2NeedDate',
+          tableId: '701004Table2',
+          tableName: '领料申请派工单子表',
+          columnProp: 'needDate',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '要求发料时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table2SOOrderNo',
+          tableId: '701004Table2',
+          tableName: '申请单派工单明细表',
+          columnProp: 'sOOrderNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '生产订单',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table2OpsItemNo',
+          tableId: '701004Table2',
+          tableName: '申请单派工单明细表',
+          columnProp: 'opsItemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '工序',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 50,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table2ItemDesc',
+          tableId: '701004Table2',
+          tableName: '申请单派工单明细表',
+          columnProp: 'itemDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '工序名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table2SeqNo',
+          tableId: '701004Table2',
+          tableName: '申请单派工单明细表',
+          columnProp: 'seqNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '派工单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table2FGPartNo',
+          tableId: '701004Table2',
+          tableName: '申请单派工单明细表',
+          columnProp: 'fGPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '派工单物料',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table2PartDesc',
+          tableId: '701004Table2',
+          tableName: '申请单派工单明细表',
+          columnProp: 'partDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table2LocationNo',
+          tableId: '701004Table2',
+          tableName: '领料申请派工单子表',
+          columnProp: 'locationNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '库位编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table2IssureQty',
+          tableId: '701004Table2',
+          tableName: '申请单派工单明细表',
+          columnProp: 'issureQty',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '发料数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+      ],
+      columnList3: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3ItemNo',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'itemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '申请单序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3ComponentPartNo',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '材料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3PartDesc',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'partDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '材料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3NeedDate',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'needDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '需求时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3QtyToIssue',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3QtyToIssueOriginal',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'qtyToIssueOriginal',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '已发数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3IssueType',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'issueType',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3Remark',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 160,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3SOOrderNo',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'orderNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '生产订单',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3OpsItemNo',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'opsItemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '工序',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 50,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3SeqNo',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'seqNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '派工单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3LocationNo',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'locationNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '机台',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table3BOMItemNo',
+          tableId: '701004Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'bOMItemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: 'BOM序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+      ],
+      columnList4: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table4IssueType',
+          tableId: '701004Table4',
+          tableName: '申请单材料明细表',
+          columnProp: 'issueType',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table4ComponentPartNo',
+          tableId: '701004Table4',
+          tableName: '申请单材料明细表',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '材料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table4PartDesc',
+          tableId: '701004Table4',
+          tableName: '申请单材料明细表',
+          columnProp: 'partDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '材料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table4QtyToIssue',
+          tableId: '701004Table4',
+          tableName: '申请单材料明细表',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '合计申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table4QtyToIssueOriginal',
+          tableId: '701004Table4',
+          tableName: '申请单材料明细表',
+          columnProp: 'qtyToIssueOriginal',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '合计已发数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+      ],
+      columnList5: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table5UpdateType',
+          tableId: '701004Table5',
+          tableName: '申请单材料删除记录表',
+          columnProp: 'updateType',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '删除类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table5ItemNo',
+          tableId: '701004Table5',
+          tableName: '申请单材料删除记录表',
+          columnProp: 'itemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '领料单序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table5SOOrderNo',
+          tableId: '701004Table5',
+          tableName: '申请单材料删除记录表',
+          columnProp: 'sOOrderNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '生产订单',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table5SeqNo',
+          tableId: '701004Table5',
+          tableName: '申请单材料删除记录表',
+          columnProp: 'seqNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '派工单',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table5ComponentPartNo',
+          tableId: '701004Table5',
+          tableName: '申请单材料删除记录表',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '材料物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table5IssueType',
+          tableId: '701004Table5',
+          tableName: '申请单材料删除记录表',
+          columnProp: 'issueType',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '材料类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table5QtyToIssue',
+          tableId: '701004Table5',
+          tableName: '申请单材料删除记录表',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '要求领料数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table5UpdateBy',
+          tableId: '701004Table5',
+          tableName: '申请单材料删除记录表',
+          columnProp: 'updateBy',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '删除账号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table5UpdateDate',
+          tableId: '701004Table5',
+          tableName: '申请单材料删除记录表',
+          columnProp: 'updateDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '删除时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+      ],
+      columnList6: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table6UserDisplay',
+          tableId: '701004Table6',
+          tableName: '申请单材料关闭明细',
+          columnProp: 'userDisplay',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '操作人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table6ActionTime',
+          tableId: '701004Table6',
+          tableName: '申请单材料关闭明细',
+          columnProp: 'actionTime',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '操作时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701004,
+          serialNumber: '701004Table6ActionRemark',
+          tableId: '701004Table6',
+          tableName: '申请单材料关闭明细',
+          columnProp: 'actionRemark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '关闭原因',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 300,
+        },
+      ],
+      favorite: false,
+      dataRole: {
+        partTypeDesc: [
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change',
+          },
+        ],
+        partName: [
+          {
+            required: true,
+            message: ' ',
+            trigger: 'change',
+          },
+        ],
+      },
+      // 导出 start
+      exportData: [],
+      exportName: '发料申请单' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ['发料申请单'],
+      exportFooter: [],
+      // 导出 end
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.height = (window.innerHeight - 250) / 2
+      getEamWorkShop({}).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.workShopList = data.rows
+        }
+      })
+    })
+  },
+
+  // watch: {
+  //   searchData: {
+  //     deep: true,
+  //     handler: function (newV, oldV) {
+  //       this.searchData.partNo = this.searchData.partNo.toUpperCase()
+  //     }
+  //   },
+  // },
+  created() {
+    // 按钮控制
+    // this.getButtonAuthData()
+    // 获取用户的 site 和 bu
+    // this.getSiteAndBuByUserName()
+    // 校验用户是否收藏
+    this.favoriteIsOk()
+
+    // 动态列
+    this.getTableUserColumn(this.$route.meta.menuId + 'table1', 1)
+    this.getTableUserColumn(this.$route.meta.menuId + 'table2', 2)
+    this.getTableUserColumn(this.$route.meta.menuId + 'table3', 3)
+    this.getTableUserColumn(this.$route.meta.menuId + 'table4', 4)
+    this.getTableUserColumn(this.$route.meta.menuId + 'table5', 5)
+    // if (!this.authSearch) {
+    //   // 获取数据列表
+    //   this.getDataList()
+    // }
+  },
+  methods: {
+    // 动态列开始 获取 用户保存的 格式列
+    async getTableUserColumn(tableId, columnId) {
+      let queryTableUser = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        status: true,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableUserListLanguage(queryTableUser).then(({ data }) => {
+        if (data.rows.length > 0) {
+          //this.columnList1 = []
+          switch (columnId) {
+            case 1:
+              this.columnList1 = data.rows
+              break
+            case 2:
+              this.columnList2 = data.rows
+              break
+            case 3:
+              this.columnList3 = data.rows
+              break
+            case 4:
+              this.columnList4 = data.rows
+              break
+            case 5:
+              this.columnList5 = data.rows
+              break
+          }
+        } else {
+          this.getColumnList(tableId, columnId)
+        }
+      })
+    },
+
+    // 获取 tableDefault 列
+    async getColumnList(tableId, columnId) {
+      let queryTable = {
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableDefaultListLanguage(queryTable).then(({ data }) => {
+        if (!data.rows.length == 0) {
+          switch (columnId) {
+            case 1:
+              this.columnList1 = data.rows
+              break
+            case 2:
+              this.columnList2 = data.rows
+              break
+            case 3:
+              this.columnList3 = data.rows
+              break
+            case 4:
+              this.columnList4 = data.rows
+              break
+            case 5:
+              this.columnList5 = data.rows
+              break
+          }
+        } else {
+          // this.showDefault = true.
+        }
+      })
+    },
+    // 获取基础数据列表S
+    getBaseList(val, type) {
+      this.tagNo = val
+      this.tagNo1 = type
+      this.$nextTick(() => {
+        let strVal = ''
+        if (val === 1013) {
+          if (type == 23) {
+            strVal = this.modelData.supplierId
+          }
+        }
+        this.$refs.baseList.init(val, strVal)
+      })
+    },
+    /* 列表方法的回调 */
+    getBaseData(val) {
+      if (this.tagNo === 23) {
+        if (this.tagNo1 == 1) {
+          this.modelData.supplierId = val.SupplierID
+          this.modelData.supplierName = val.SupplierName
+        }
+      }
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.searchTable()
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.searchTable()
+    },
+    tabClick(tab, event) {
+      // 刷新列表数据
+      this.refreshCurrentTabTable()
+    },
+    changeData(row) {
+      this.currentRow = JSON.parse(JSON.stringify(row))
+      this.headerData = row
+      this.refreshCurrentTabTable()
+    },
+    refreshCurrentTabTable() {
+      if (this.currentRow === '' || this.currentRow === null) {
+        this.currentRow = { site: '', notifyNo: '' }
+      }
+      if (this.activeName === 'detail') {
+        searchNotifyOrderList(this.currentRow).then(({ data }) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 0) {
+            this.dataList2 = data.rows
+          } else {
+            this.dataList2 = []
+          }
+        })
+      } else if (this.activeName === 'sub') {
+        searchNotifyMaterialList(this.currentRow).then(({ data }) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 0) {
+            this.dataList3 = data.rows
+          } else {
+            this.dataList3 = []
+          }
+        })
+      } else if (this.activeName === 'change') {
+        searchNotifyLog(this.currentRow).then(({ data }) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 0) {
+            this.dataList5 = data.rows
+          } else {
+            this.dataList5 = []
+          }
+        })
+      } else if (this.activeName === 'close') {
+        searchNotifyLogClose(this.currentRow).then(({ data }) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 0) {
+            this.dataList6 = data.rows
+          } else {
+            this.dataList6 = []
+          }
+        })
+      } else {
+        searchSumNotifyMaterialList(this.currentRow).then(({ data }) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 0) {
+            this.dataList4 = data.rows
+          } else {
+            this.dataList4 = []
+          }
+        })
+      }
+    },
+    searchTable() {
+      this.searchData.limit = this.pageSize
+      this.searchData.page = this.pageIndex
+      searchNotifyHeader(this.searchData).then(({ data }) => {
+        //区分请求成功和失败的状况
+        if (data && data.code == 0) {
+          this.dataList = data.page.list
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+          if (this.dataList.length > 0) {
+            this.$refs.mainTable.setCurrentRow(this.dataList[0])
+            this.changeData(this.dataList[0])
+          } else {
+            this.changeData(null)
+          }
+        } else {
+          this.dataList = []
+        }
+      })
+    },
+    closeNotifyModel(row) {
+      this.closeData.site = row.site
+      this.closeData.notifyNo = row.notifyNo
+      this.closeData.closeRemark = ''
+      this.closeModalFlag = true
+    },
+    closeNotify() {
+      if (
+        this.closeData.closeRemark == null ||
+        this.closeData.closeRemark === ''
+      ) {
+        this.$alert('必须输入关闭原因', '错误', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+
+      let inData = {
+        site: this.closeData.site,
+        notifyNo: this.closeData.notifyNo,
+        closeRemark: this.closeData.closeRemark,
+        username: this.$store.state.user.name,
+        status: '已关闭',
+      }
+      updateNotifyStatus(inData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.closeModalFlag = false
+          this.searchTable()
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {},
+          })
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    openNotify(row) {
+      this.$confirm('确认打开?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        let inData = {
+          site: row.site,
+          notifyNo: row.notifyNo,
+          status: '已下达',
+        }
+        updateNotifyStatus(inData).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.searchTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {},
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    confirmNotify(row) {
+      this.$confirm('确认该条领料单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        let inData = {
+          site: row.site,
+          notifyNo: row.notifyNo,
+          confirmStatus: 'Y',
+        }
+        updateNotifyConfirmStatus(inData).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.searchTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {},
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    cancelConfirmNotify(row) {
+      this.$confirm('确定要取消该条领料单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        let inData = {
+          site: row.site,
+          notifyNo: row.notifyNo,
+          confirmStatus: 'N',
+        }
+        updateNotifyConfirmStatus(inData).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.searchTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {},
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    deleteNotifyMaterial(row) {
+      this.$confirm('确认删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        deleteNotifyMaterial(row).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.refreshCurrentTabTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {},
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    deleteNotifySOSPlus(row) {
+      this.$confirm('确认删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        deleteNotifySOSPlus(row).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.refreshCurrentTabTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {},
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    //导出excel
+    //导出excel
+    async createExportData() {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      await searchNotifyHeader(this.searchData).then(({ data }) => {
+        this.exportList = data.page.list
+      })
+
+      return this.exportList
+    },
+    startDownload() {
+      //  this.exportData = this.dataList
+    },
+    finishDownload() {},
+    fields() {
+      let json = '{'
+      this.columnList1.forEach((item, index) => {
+        if (index == this.columnList1.length - 1) {
+          json +=
+            '"' + item.columnLabel + '"' + ':' + '"' + item.columnProp + '"'
+        } else {
+          json +=
+            '"' +
+            item.columnLabel +
+            '"' +
+            ':' +
+            '"' +
+            item.columnProp +
+            '"' +
+            ','
+        }
+      })
+      json += '}'
+      let s = eval('(' + json + ')')
+
+      return s
+    },
+
+    tableRowClassName({ row, rowIndex }) {
+      if (
+        row.qtyToIssueOriginal < row.qtyToIssue &&
+        new Date(row.needDate) <
+          new Date(this.dayjs().format('YYYY-MM-DD HH:mm'))
+      ) {
+        return 'error-row'
+      }
+
+      return ''
+    },
+    // 校验用户是否收藏
+    favoriteIsOk() {
+      let userFavorite = {
+        userId: this.$store.state.user.id,
+        languageCode: this.$i18n.locale,
+      }
+      userFavoriteList(userFavorite).then(({ data }) => {
+        for (let i = 0; i < data.list.length; i++) {
+          if (this.$route.meta.menuId === data.list[i].menuId) {
+            this.favorite = true
+          }
+        }
+      })
+    },
+
+    // 收藏 OR 取消收藏
+    favoriteFunction() {
+      let userFavorite = {
+        userId: this.$store.state.user.id,
+        functionId: this.$route.meta.menuId,
+      }
+      if (this.favorite) {
+        removeUserFavorite(userFavorite).then(({ data }) => {
+          this.$message.success(data.msg)
+          this.favorite = false
+        })
+      } else {
+        // 收藏
+        saveUserFavorite(userFavorite).then(({ data }) => {
+          this.$message.success(data.msg)
+          this.favorite = true
+        })
+      }
+    },
+  },
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/modules/oss/ossProjectComponents.vue b/src/views/modules/oss/ossProjectComponents.vue
new file mode 100644
index 0000000..ebb37c2
--- /dev/null
+++ b/src/views/modules/oss/ossProjectComponents.vue
@@ -0,0 +1,341 @@
+<script>
+import {ossUpload, previewOssFileById, previewOssFileById2, removeOss} from "../../../api/oss/oss";
+import {projectIncomeUpload,projectIncomeQueryOss} from "../../../api/machine/machineProjectIncome";
+import XLSX from 'xlsx';
+import jsPDF from 'jspdf';
+import * as mammoth from 'mammoth';  // Ensure it's correctly imported
+
+export default {
+  name: "ossProjectComponents",
+  props:{
+    orderRef1:{
+      type:String,
+      default:''
+    },
+    orderRef2:{
+      type:[Number,String],
+      default:''
+    },
+    rfqNo:{
+      type:String,
+      default:''
+    },
+    columns:{
+      type:Array,
+      required:true
+    },
+    height:{
+      type:[String,Number],
+      default:'35vh'
+    },
+    title:{
+      type:String,
+      default:'附件信息'
+    },
+    label:{
+      type:String,
+      default:'单号'
+    },
+    disabled:{
+      type:Boolean,
+      default:false
+    },
+  },
+  data(){
+    return{
+      dataList:[],
+      queryLoading:false,
+      uploadLoading:false,
+      selectionDataList:[],
+      ossVisible:false,
+      ossForm:{
+        orderRef2:'',
+        rfqNo:'',
+        remark:''
+      },
+      fileList:[],
+    }
+  },
+  methods:{
+    handleSelectionChange(val){
+      this.selectionDataList = val
+    },
+    handleQuery(){
+      if (!this.params.orderRef1 && !this.params.orderRef2){
+        return;
+      }
+      let params = {
+        ...this.params,
+      }
+      this.queryLoading = true;
+      projectIncomeQueryOss(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.dataList = data.rows;
+        }else {
+          this.$message.warning(data.msg);
+        }
+        this.queryLoading = false;
+      }).catch((error)=>{
+        this.$message.error(error);
+        this.queryLoading = false;
+      })
+    },
+    handleUpload(){   
+      this.ossForm.rfqNo = this.rfqNo
+      this.$nextTick(()=>{
+        if (this.$refs.upload){
+          this.$refs.upload.clearFiles();
+        }
+      })
+      this.fileList = [];
+      this.ossForm.remark = '';
+      this.ossVisible = true
+    },
+    onRemoveFile(file, fileList){
+      this.fileList = fileList
+    },
+    onChangeFile(file, fileList){
+      this.fileList = fileList
+    },
+    handleUploadFiles(){
+      if (this.fileList.length === 0){
+        this.$message.error('请选择文件');
+        return;
+      }
+      let formData = new FormData();
+      for (let i = 0; i < this.fileList.length; i++) {
+        formData.append('file', this.fileList[i].raw);
+      }
+      formData.append('orderRef1', this.orderRef1);
+      formData.append('orderRef2', this.orderRef2);
+      formData.append('orderRef3', this.rfqNo);
+      formData.append('createdBy', this.$store.state.user.name);
+      formData.append('cAdditionalInfo', this.ossForm.remark);
+      
+      this.uploadLoading = true;
+      projectIncomeUpload(formData).then(({data})=>{
+        if (data && data.code === 0){
+          this.$message.success(data.msg);
+          this.handleQuery();
+          this.ossVisible = false;
+        }else {
+          this.$message.warning(data.msg);
+        }
+        this.uploadLoading = false;
+      }).catch((error)=>{
+        this.$message.error(error);
+        this.uploadLoading = false;
+      })
+    },
+    handleRemove(row){
+      this.$confirm('确认删除吗？', '提示').then(() => {
+        let ids = [row.id]
+        removeOss(ids).then(({data})=>{
+          if (data && data.code === 0){
+            this.$message.success(data.msg);
+            this.handleQuery();
+          }else {
+            this.$message.warning(data.msg);
+          }
+        }).catch((error)=>{
+          this.$message.error(error);
+        })
+      }).catch(()=>{
+
+      })
+    },
+    previewFile(row){
+      // 预览文件
+      let type = '';
+      let image = ['jpg', 'jpeg', 'png', 'gif', 'bmp'];
+      if (image.includes(row.fileType.toLowerCase())){
+        type = 'image/' + row.fileType;
+      }
+      let video = ['mp4', 'avi', 'mov', 'wmv', 'flv'];
+      if (video.includes(row.fileType.toLowerCase())){
+        type = 'video/' + row.fileType;
+      }
+
+      let txt = ['txt'];
+      if (txt.includes(row.fileType.toLowerCase())){
+        type = 'text/plain;charset=utf-8';
+      }
+      let office = ['doc', 'ppt', 'pptx'];
+      if (office.includes(row.fileType.toLowerCase())){
+        this.$message.warning(`该文件格式暂不支持预览`)
+        return
+      }
+
+      let excel = ['xlsx','xls'];
+      if (excel.includes(row.fileType.toLowerCase())){
+        type = 'excel';
+      }
+      let word = ['docx'];
+      if (word.includes(row.fileType.toLowerCase())){
+        type = 'word'
+      }
+      let pdf = ['pdf'];
+      if (pdf.includes(row.fileType.toLowerCase())){
+        type = 'application/pdf;charset-UTF-8';
+      }
+
+      if (type === ''){
+        this.$message.warning(`该文件格式暂不支持预览`)
+        return;
+      }
+      let params = {
+        id:row.id,
+        fileType:type
+      }
+      previewOssFileById2(params).then(({data}) => {
+        if (type === 'excel' || type === 'word'){
+          type = 'application/pdf;charset=UTF-8'
+        }
+        const blob = new Blob([data], { type: type });
+        // 创建URL来生成预览
+        const fileURL = URL.createObjectURL(blob);
+        if (type === 'xls' || type === 'docx' || type === 'xlsx'){
+          const { href } = this.$router.resolve({
+            name: 'pre',
+            query:{
+              src: fileURL,
+              type: 'pdf'  // 直接传递 pdf 类型
+            }
+          })
+          window.open(href, '_blank')
+        }else {
+          // 在新标签页中打开文件预览
+          const newTab = window.open(fileURL, '_blank');
+        }
+      });
+    },
+    handleDownload(){
+      if (this.selectionDataList.length === 0){
+        this.$message.warning('请选择要下载的附件');
+        return;
+      }
+      for (let i = 0; i < this.selectionDataList.length; i++) {
+        let params = {
+          id:this.selectionDataList[i].id,
+        }
+        previewOssFileById(params).then((response) => {
+          const blob = new Blob([response.data], { type: response.headers['content-type'] });
+          const link = document.createElement('a');
+          link.href = URL.createObjectURL(blob);
+          link.setAttribute('download', this.selectionDataList[i].fileName);
+          link.target = '_blank';  // 打开新窗口预览
+          link.click();
+          URL.revokeObjectURL(link.href);
+          this.$refs.table.clearSelection();
+        });
+      }
+    }
+  },
+  computed:{
+    params:{
+      get(){
+        return{
+          orderRef1:this.orderRef1,
+          orderRef2:this.orderRef2,
+          orderRef3:this.rfqNo,
+        }
+      }
+    }
+  },
+  watch:{
+    params:{
+      handler(){             
+        this.ossForm.orderRef2 = this.orderRef2;
+        this.ossForm.rfqNo = this.rfqNo;
+        this.dataList = [];
+        this.handleQuery();
+      }
+    }
+  }
+}
+</script>
+
+<template>
+<div>
+  <el-button type="primary" v-if="this.orderRef1 && this.orderRef2 && !disabled" @click="handleUpload">上传附件</el-button>
+  <el-button type="primary" @click="handleDownload">下载</el-button>
+  <el-table
+    :height="height"
+    :data="dataList"
+    ref="table"
+    v-loading="queryLoading"
+    border
+    @selection-change="handleSelectionChange"
+    style="width: 100%;margin-top: 5px">
+    <el-table-column type="selection" label="序号" align="center"/>
+    <el-table-column
+      v-for="(item,index) in columns" :key="index"
+      :sortable="item.columnSortable"
+      :prop="item.columnProp"
+      :header-align="item.headerAlign"
+      :show-overflow-tooltip="item.showOverflowTooltip"
+      :align="item.align"
+      :fixed="item.fixed===''?false:item.fixed"
+      :min-width="item.columnWidth"
+      :label="item.columnLabel">
+      <template slot-scope="scope">
+        <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+        <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      fixed="right"
+      header-align="center"
+      align="center"
+      width="120"
+      label="操作">
+      <template slot-scope="{row,$index}">
+        <el-link style="cursor:pointer;" v-if="!disabled" @click="handleRemove(row)">删除</el-link>
+        <el-link style="cursor:pointer;" @click="previewFile(row)">预览</el-link>
+      </template>
+    </el-table-column>
+  </el-table>
+
+  <el-dialog :title="title" :visible.sync="ossVisible" v-drag width="400px" append-to-body :close-on-click-modal="false">
+    <el-form ref="form" :model="ossForm" label-width="80px" label-position="top">
+      <el-row :gutter="10">
+        <el-col :span="8">
+          <el-form-item label="项目单号">
+            <el-input v-model="ossForm.rfqNo" readonly></el-input>
+          </el-form-item>
+        </el-col>
+        <slot></slot>
+        <el-col :span="24">
+          <el-form-item label=" " class="auto">
+            <el-upload drag :file-list="fileList"
+                       action="#" ref="upload"
+                       :on-remove="onRemoveFile"
+                       :on-change="onChangeFile"
+                       multiple
+                       :auto-upload="false">
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" class="auto">
+            <el-input type="textarea" v-model="ossForm.remark" resize="none" :autosize="{minRows: 3, maxRows: 3}"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" :loading="uploadLoading" @click="handleUploadFiles">确定</el-button>
+      <el-button @click="ossVisible = false">关闭</el-button>
+    </span>
+  </el-dialog>
+</div>
+</template>
+
+<style scoped>
+.auto /deep/ .el-form-item__content{
+  height: auto;
+  line-height: 1.5;
+}
+</style>