From daf1b166e1c1870446e2fff6a695d194e5238a94 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 17 Mar 2026 20:21:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=90=88=E5=90=8C=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/application/api/controller/Contract.php  |  107 +-
 front/src/api/contract.js                     |    9 +
 .../src/views/contract-mgr/contractsearch.vue |  294 ++++-
 .../views/contract-mgr/operationcontract.vue  | 1100 +++++++++--------
 4 files changed, 958 insertions(+), 552 deletions(-)

diff --git a/back/application/api/controller/Contract.php b/back/application/api/controller/Contract.php
index 419431d..ad2665a 100644
--- a/back/application/api/controller/Contract.php
+++ b/back/application/api/controller/Contract.php
@@ -239,7 +239,7 @@ class Contract extends Common
         if (!isset($param['contract_url']) || $param['contract_url'] == '') {
             $insert_info['contract_url'] = '';
         } else {
-            $insert_info['contract_url'] = $param['cosssntract_url'];
+            $insert_info['contract_url'] = $param['contract_url'];
             // 同理，contract_file_name 也建议做存在性检查，避免同理报错
             $insert_info['contract_file_name'] = isset($param['contract_file_name']) ? $param['contract_file_name'] : '';
         }
@@ -322,4 +322,109 @@ class Contract extends Common
             return $this->sendError('删除失败');
         }
     }
+
+    // 合同检索
+    public function searchContracts()
+    {
+        $param = request()->param();
+        
+        $currPage = isset($param['currPage']) ? $param['currPage'] : 1;
+        $pageSize = isset($param['pageSize']) ? $param['pageSize'] : 20;
+        
+        // 构建查询条件
+        $where = ['del_time' => null];
+        
+        // 时间范围筛选
+        if (isset($param['start_date']) && !empty($param['start_date'])) {
+            $where['create_time'] = ['>=', $param['start_date']];
+        }
+        if (isset($param['end_date']) && !empty($param['end_date'])) {
+            if (isset($where['create_time'])) {
+                $where['create_time'] = [
+                    ['>=', $param['start_date']], 
+                    ['<=', $param['end_date']]
+                ];
+            } else {
+                $where['create_time'] = ['<=', $param['end_date']];
+            }
+        }
+        
+        // 合同分类筛选
+        if (isset($param['contract_category']) && $param['contract_category'] !== '' && $param['contract_category'] !== '0') {
+            $where['contract_category'] = $param['contract_category'];
+        }
+        
+        // 查询合同列表
+        $contractList = db('contract_info')
+            ->where($where)
+            ->order('contract_id', 'desc')
+            ->page($currPage, $pageSize)
+            ->select();
+        
+        // 遍历合同列表，补充关联信息
+        foreach ($contractList as &$contract) {
+            // 获取合同类型名称
+            if ($contract['contract_type']) {
+                $contractType = db('contract_type')
+                    ->where('type_id', $contract['contract_type'])
+                    ->field('type_name')
+                    ->find();
+                $contract['contract_type_name'] = $contractType ? $contractType['type_name'] : '';
+            } else {
+                $contract['contract_type_name'] = '';
+            }
+            
+            // 获取合同分类名称
+            switch ($contract['contract_category']) {
+                case 1:
+                    $contract['contract_category_name'] = '销售合同';
+                    break;
+                case 2:
+                    $contract['contract_category_name'] = '销售技术协议';
+                    break;
+                case 3:
+                    $contract['contract_category_name'] = '采购合同';
+                    break;
+                case 4:
+                    $contract['contract_category_name'] = '采购及技术协议';
+                    break;
+                case 5:
+                    $contract['contract_category_name'] = '其他';
+                    break;
+                default:
+                    $contract['contract_category_name'] = '';
+            }
+            
+            // 获取项目名称
+            if ($contract['project_id']) {
+                $project = db('project_info')
+                    ->where('project_id', $contract['project_id'])
+                    ->field('project_name')
+                    ->find();
+                $contract['project_name'] = $project ? $project['project_name'] : '';
+            } else {
+                $contract['project_name'] = '';
+            }
+            
+            // 获取合作伙伴名称
+            if ($contract['partner_id']) {
+                $partner = db('partner_company')
+                    ->where('company_id', $contract['partner_id'])
+                    ->field('company_name')
+                    ->find();
+                $contract['partner_name'] = $partner ? $partner['company_name'] : '';
+            } else {
+                $contract['partner_name'] = '';
+            }
+        }
+        unset($contract);
+        
+        // 查询总记录数
+        $total = db('contract_info')->where($where)->count();
+        
+        $res['list'] = $contractList;
+        $res['total'] = $total;
+        
+        return $this->sendSuccess($res);
+    }
 }
\ No newline at end of file
diff --git a/front/src/api/contract.js b/front/src/api/contract.js
index 48d4708..551d947 100644
--- a/front/src/api/contract.js
+++ b/front/src/api/contract.js
@@ -90,5 +90,14 @@ export default {
       method: 'post',
       data: param
     })
+  },
+
+  // 合同检索
+  searchContracts(param) {
+    return request({
+      url: `/Contract/searchContracts`,
+      method: 'post',
+      data: param
+    })
   }
 }
diff --git a/front/src/views/contract-mgr/contractsearch.vue b/front/src/views/contract-mgr/contractsearch.vue
index 66a8592..a2e9b37 100644
--- a/front/src/views/contract-mgr/contractsearch.vue
+++ b/front/src/views/contract-mgr/contractsearch.vue
@@ -20,47 +20,309 @@
                 value-format="yyyy-MM-dd"
                 clearable/>
             </el-form-item>
-            <el-form-item label="合同类型">
-              <el-select v-model="map_idx" filterable placeholder="合同类型">
+            <el-form-item label="合同分类">
+              <el-select v-model="queryParam.contract_category" filterable placeholder="合同分类">
                 <el-option label="全部合同" value="0"/>
-                <el-option label="项目合同" value="1"/>
-                <el-option label="运营合同" value="2"/>
+                <el-option label="销售合同" value="1"/>
+                <el-option label="销售技术协议" value="2"/>
+                <el-option label="采购合同" value="3"/>
+                <el-option label="采购及技术协议" value="4"/>
               </el-select>
             </el-form-item>
 
             <el-form-item>
               <el-button type="primary" @click="onSubmit">查询</el-button>
+              <el-button @click="onReset">重置</el-button>
             </el-form-item>
           </el-form>
         </div>
       </el-card>
     </el-row>
+
+    <!-- 合同列表表格 -->
+    <el-row style="margin-top: 20px;">
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>合同列表</span>
+          <span style="float: right;">共 {{ total }} 条记录</span>
+        </div>
+        <el-table
+          v-loading="loading"
+          :data="contractList"
+          style="width: 100%"
+          stripe
+          border>
+          <el-table-column
+            prop="contract_number"
+            label="合同编号"
+            width="150"/>
+          <el-table-column
+            prop="contract_name"
+            label="合同名称"
+            width="200"/>
+          <el-table-column
+            prop="contract_type_name"
+            label="合同类型"
+            width="120"/>
+          <el-table-column
+            prop="contract_category_name"
+            label="合同分类"
+            width="120"/>
+          <el-table-column
+            prop="project_name"
+            label="所属项目"
+            width="150">
+            <template slot-scope="scope">
+              {{ scope.row.project_name || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="partner_name"
+            label="合作伙伴"
+            width="150">
+            <template slot-scope="scope">
+              {{ scope.row.partner_name || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="contract_price"
+            label="合同金额"
+            width="120">
+            <template slot-scope="scope">
+              ¥{{ scope.row.contract_price | currency }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="create_time"
+            label="签署时间"
+            width="120"/>
+          <el-table-column
+            prop="contract_des"
+            label="合同描述"
+            min-width="200">
+            <template slot-scope="scope">
+              {{ scope.row.contract_des || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="100"
+            fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.contract_url"
+                type="text"
+                size="small"
+                @click="viewContract(scope.row)">
+                查看
+              </el-button>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <template slot="empty">
+            <div style="padding: 20px;">
+              <i class="el-icon-document" style="font-size: 48px; color: #ddd;"/>
+              <p style="margin-top: 10px; color: #999;">暂无合同数据</p>
+            </div>
+          </template>
+        </el-table>
+
+        <!-- 分页组件 -->
+        <div style="margin-top: 20px; text-align: right;">
+          <el-pagination
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="pageSize"
+            :total="total"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"/>
+        </div>
+      </el-card>
+    </el-row>
+
+    <!-- 显示文件对话框 -->
+    <el-dialog :visible.sync="dialogVisibleShowFile" title="文件信息" width="80%" append-to-body>
+      <img v-if="isImage" :src="previewUrl" alt="Preview" style="max-width: 40%; max-height: 30%;">
+      <iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"/>
+      <div v-else>
+        <p>该文件类型（{{ fileExtension }}）需要下载后查看</p>
+        <el-button type="primary" @click="downloadFile(previewUrl)">
+          立即下载 {{ fileExtension.toUpperCase() }} 文件
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import contractApi from '@/api/contract'
+
 export default {
+  filters: {
+    currency(value) {
+      if (!value) return '0.00'
+      return Number(value).toLocaleString('zh-CN', {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2
+      })
+    }
+  },
   data() {
     return {
-      queryParam:
-      {
-        busTime: [],
-        map_idx: '16',
-        lock: '2',
-        storage_type: '0',
-        work_type: '0'
-      } // 查询条件
+      queryParam: {
+        contract_category: '0'
+      },
+      busTime: [],
+      contractList: [],
+      loading: false,
+      // 分页相关
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      // 文件预览相关
+      dialogVisibleShowFile: false,
+      previewUrl: '',
+      currentFileName: '',
+      fileExtension: '',
+      isImage: false,
+      isPDF: false,
+      executeTimeOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }
     }
   },
   mounted() {
-
-  },
-  created() {
-
+    this.loadContracts()
   },
   methods: {
     onSubmit() {
+      this.currentPage = 1
+      this.loadContracts()
+    },
+    onReset() {
+      this.queryParam.contract_category = '0'
+      this.busTime = []
+      this.currentPage = 1
+      this.loadContracts()
+    },
+    // 分页大小改变
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.currentPage = 1 // 重置到第一页
+      this.loadContracts()
+    },
+    // 当前页改变
+    handleCurrentChange(val) {
+      this.currentPage = val
+      this.loadContracts()
+    },
+    async loadContracts() {
+      this.loading = true
 
+      try {
+        const params = {
+          contract_category: this.queryParam.contract_category,
+          page: this.currentPage,
+          pageSize: this.pageSize
+        }
+
+        // 添加时间范围参数
+        if (this.busTime && this.busTime.length === 2) {
+          params.start_date = this.busTime[0]
+          params.end_date = this.busTime[1]
+        }
+
+        const response = await contractApi.searchContracts(params)
+
+        // 处理响应数据 - 兼容两种可能的响应结构
+        const apiResponse = response.data || response
+
+        if (apiResponse.code === 20000) {
+          const data = apiResponse.data
+          this.contractList = Array.isArray(data.list) ? data.list : []
+          this.total = parseInt(data.total) || 0
+
+          if (this.contractList.length === 0) {
+            this.$message.info('未找到符合条件的合同数据')
+          }
+        } else {
+          this.$message.error(apiResponse.msg || '查询失败')
+          this.contractList = []
+          this.total = 0
+        }
+      } catch (error) {
+        console.error('查询合同失败:', error)
+        this.$message.error('查询失败，请稍后重试')
+        this.contractList = []
+        this.total = 0
+      } finally {
+        this.loading = false
+      }
+    },
+    viewContract(row) {
+      if (!row.contract_url) {
+        this.$message.warning('该合同暂无文件')
+        return
+      }
+
+      const url = row.contract_url
+      const ext = url.split('.').pop().toLowerCase()
+      this.currentFileName = row.contract_file_name || row.contract_name
+      this.isImage = false
+      this.isPDF = false
+      this.fileExtension = ext
+
+      // 构建完整的文件URL
+      const baseUrl = process.env.BASE_WMS_FILE || (
+        process.env.NODE_ENV === 'development'
+          ? 'http://localhost/oms/back/public'
+          : window.location.origin + '/back/public'
+      )
+
+      if (['jpg', 'jpeg', 'png'].includes(ext)) {
+        this.previewUrl = baseUrl + url
+        this.isImage = true
+      } else if (ext === 'pdf') {
+        this.previewUrl = baseUrl + url
+        this.isPDF = true
+      } else {
+        this.previewUrl = baseUrl + url
+      }
+
+      this.dialogVisibleShowFile = true
+    },
+    downloadFile(url) {
+      const link = document.createElement('a')
+      link.href = url
+      link.setAttribute('download', this.currentFileName)
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link)
     }
   }
 }
diff --git a/front/src/views/contract-mgr/operationcontract.vue b/front/src/views/contract-mgr/operationcontract.vue
index 28541c9..0cb81fe 100644
--- a/front/src/views/contract-mgr/operationcontract.vue
+++ b/front/src/views/contract-mgr/operationcontract.vue
@@ -1,597 +1,627 @@
 <template>
-	<div class="about">
-		<el-row>
-			<el-col :span="6">
-				<el-card class="box-card">
-					<div slot="header" class="clearfix">
-						<span>运营合同</span>
-						<el-button style="float: right; padding: 3px 0" type="text" icon="el-icon-circle-plus-outline"
-							@click="createBaseType"></el-button>
-					</div>
-					<el-tree :data="contract_type_list" node-key="type_id" @node-click="handle_node_click"
-						@node-collapse="closeTreeMenu" :props="defaultProps" @node-contextmenu="openTreeMenu"
-						:expand-on-click-node="false">
-						<span class="custom-tree-node" slot-scope="{ node, data }">
-							<span>{{ node.label }}</span>
-						</span>
-					</el-tree>
-				</el-card>
-			</el-col>
-			<el-col :span="18">
-				<el-card class="box-card" v-if="currentData != null">
-					<span>[合同类型说明]: {{ currentData.type_desp }}</span>
-				</el-card>
-				<el-table :data="contract_info_list" border fit highlight-current-row
-					style="width: 100%; margin-left: 2px;" height="80vh">
-					<!--el-table-column prop="asset_id" label="ID" align="center">
+  <div class="about">
+    <el-row>
+      <el-col :span="6">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>运营合同</span>
+            <el-button
+              style="float: right; padding: 3px 0"
+              type="text"
+              icon="el-icon-circle-plus-outline"
+              @click="createBaseType"/>
+          </div>
+          <el-tree
+            :data="contract_type_list"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            node-key="type_id"
+            @node-click="handle_node_click"
+            @node-collapse="closeTreeMenu"
+            @node-contextmenu="openTreeMenu">
+            <span slot-scope="{ node, data }" class="custom-tree-node">
+              <span>{{ node.label }}</span>
+            </span>
+          </el-tree>
+        </el-card>
+      </el-col>
+      <el-col :span="18">
+        <el-card v-if="currentData != null" class="box-card">
+          <span>[合同类型说明]: {{ currentData.type_desp }}</span>
+        </el-card>
+        <el-table
+          :data="contract_info_list"
+          border
+          fit
+          highlight-current-row
+          style="width: 100%; margin-left: 2px;"
+          height="80vh">
+          <!--el-table-column prop="asset_id" label="ID" align="center">
 					</el-table-column-->
-					<el-table-column prop="contract_number" label="合同编号" align="left">
-					</el-table-column>
-					<el-table-column prop="contract_name" label="合同名称" align="left">
-					</el-table-column>
-					<el-table-column prop="contract_des" label="合同内容" align="left">
-					</el-table-column>
-					<el-table-column label="合同类型" align="left">
-						<template slot-scope="scope">
-							<div v-if="(scope.row.contract_category == 1)">销售合同</div>
-							<div v-if="(scope.row.contract_category == 3)">采购合同</div>
-						</template>
-					</el-table-column>
-					<el-table-column prop="contract_price" label="合同金额" align="left">
-					</el-table-column>
-					<el-table-column prop="create_time" label="签约时间" align="left">
-					</el-table-column>
+          <el-table-column prop="contract_number" label="合同编号" align="left"/>
+          <el-table-column prop="contract_name" label="合同名称" align="left"/>
+          <el-table-column prop="contract_des" label="合同内容" align="left"/>
+          <el-table-column label="合同类型" align="left">
+            <template slot-scope="scope">
+              <div v-if="(scope.row.contract_category == 1)">销售合同</div>
+              <div v-if="(scope.row.contract_category == 3)">采购合同</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="contract_price" label="合同金额" align="left"/>
+          <el-table-column prop="create_time" label="签约时间" align="left"/>
 
+          <el-table-column fixed="right" label="操作" width="250px">
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.contract_url != ''"
+                class="el-icon-view"
+                size="mini"
+                type="primary"
+                @click="showImg(scope.row)"/>
+              <el-button
+                size="mini"
+                class="el-icon-edit"
+                type="primary"
+                @click="update(scope.row)"/>
+              <el-button
+                class="el-icon-delete"
+                size="mini"
+                type="danger"
+                @click="handleClick(scope.row)"/>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
 
-					<el-table-column fixed="right" label="操作" width="250px">
-						<template slot-scope="scope">
-							<el-button class="el-icon-view" v-if="scope.row.contract_url != ''"
-								@click="showImg(scope.row)" size="mini" type="primary"></el-button>
-							<el-button @click="update(scope.row)" size="mini" class="el-icon-edit"
-								type="primary"></el-button>
-							<el-button class="el-icon-delete" @click="handleClick(scope.row)" size="mini"
-								type="danger"></el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</el-col>
-		</el-row>
+    <!-- 显示文件对话框 -->
+    <el-dialog :visible.sync="dialogVisibleShowFile" title="文件信息" width="80%" append-to-body>
+      <img v-if="isImage" :src="previewUrl" alt="Preview" style="max-width: 40%; max-height: 30%;">
+      <iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"/>
+      <div v-else>
+        <p>该文件类型（{{ fileExtension }}）需要下载后查看</p>
+        <el-button type="primary" @click="downloadFile(previewUrl)">
+          立即下载 {{ fileExtension.toUpperCase() }} 文件
+        </el-button>
+      </div>
+    </el-dialog>
 
-		<!-- 显示文件对话框 -->
-		<el-dialog title="文件信息" :visible.sync="dialogVisibleShowFile" width="80%" append-to-body>
-			<img v-if="isImage" :src="previewUrl" alt="Preview" style="max-width: 40%; max-height: 30%;">
-			<iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"></iframe>
-			<div v-else>
-				<p>该文件类型（{{ fileExtension }}）需要下载后查看</p>
-				<el-button type="primary" @click="downloadFile(previewUrl)">
-					立即下载 {{ fileExtension.toUpperCase() }} 文件
-				</el-button>
-			</div>
-		</el-dialog>
+    <div v-show="showTreeMenu" class="treeMenu">
+      <div v-if="currentNodeLevel < 3" style="margin-left: 5px;" @click="createFolder">
+        <i class="el-icon-plus" style="color: #1e9fff"/>
+        增加合同类型
+      </div>
+      <div style="margin-top: 10px;margin-left: 5px;" @click="createContract">
+        <i class="el-icon-plus" style="color: #1e9fff"/>
+        增加合同信息
+      </div>
+    </div>
 
+    <!-- 添加类型对话框 -->
+    <el-dialog :visible.sync="dialogVisibleCreateFolder" title="添加类型" width="30%">
+      <el-form :model="newNode" label-width="80px">
+        <el-form-item label="类型名称">
+          <el-input v-model="newNode.label"/>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleCreateFolder = false">取 消</el-button>
+        <el-button type="primary" @click="confirmAddFolder">确 定</el-button>
+      </span>
+    </el-dialog>
 
-		<div v-show="showTreeMenu" class="treeMenu">
-			<div v-if="currentNodeLevel < 3" @click="createFolder" style="margin-left: 5px;">
-				<i class="el-icon-plus" style="color: #1e9fff"></i>
-				增加合同类型
-			</div>
-			<div @click="createContract" style="margin-top: 10px;margin-left: 5px;">
-				<i class="el-icon-plus" style="color: #1e9fff"></i>
-				增加合同信息
-			</div>
-		</div>
+    <!-- 添加合同信息对话框 -->
+    <el-dialog :visible.sync="dialogVisibleCreateContract" :close-on-click-modal="false" title="添加合同信息" width="30%">
+      <el-form :model="newNode3" label-width="80px">
+        <el-form-item label="合同编号">
+          <el-input v-model="newNode3.contract_number"/>
+        </el-form-item>
+        <el-form-item label="合同名称">
+          <el-input v-model="newNode3.contract_name"/>
+        </el-form-item>
+        <el-form-item label="合同内容">
+          <el-input v-model="newNode3.contract_des"/>
+        </el-form-item>
+        <el-form-item label="合同金额">
+          <el-input v-model="newNode3.contract_price"/>
+        </el-form-item>
+        <el-form-item>
+          <el-radio v-model="newNode3.contract_category" :label="1">销售合同</el-radio>
+          <el-radio v-model="newNode3.contract_category" :label="3">采购合同</el-radio>
+        </el-form-item>
 
-		<!-- 添加类型对话框 -->
-		<el-dialog title="添加类型" :visible.sync="dialogVisibleCreateFolder" width="30%">
-			<el-form :model="newNode" label-width="80px">
-				<el-form-item label="类型名称">
-					<el-input v-model="newNode.label"></el-input>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisibleCreateFolder = false">取 消</el-button>
-				<el-button type="primary" @click="confirmAddFolder">确 定</el-button>
-			</span>
-		</el-dialog>
+        <el-form-item label="生效时间">
+          <el-date-picker
+            v-model="newNode3.create_time"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期时间"/>
+        </el-form-item>
 
+        <el-form-item label="添加文件">
+          <el-upload
+            :action="upload_url"
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :on-success="handleNewSuccess"
+            :before-upload="beforeUpload"
+            :file-list="fileList"
+            class="upload-demo"
+            accept=".jpg,.jpeg,.png,.pdf,.pptx,.xlsx,.xls,.docx,.doc,.ppt,.zip,.rar">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">
+              支持jpg/jpeg/png/pdf/pptx/xlsx/xls/docx/doc/ppt/zip/rar文件，不超过100MB
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleCreateContract = false">取 消</el-button>
+        <el-button type="primary" @click="confirmAddContract">确 定</el-button>
+      </span>
+    </el-dialog>
 
-		<!-- 添加合同信息对话框 -->
-		<el-dialog title="添加合同信息" :visible.sync="dialogVisibleCreateContract" :close-on-click-modal="false" width="30%">
-			<el-form :model="newNode3" label-width="80px">
-				<el-form-item label="合同编号">
-					<el-input v-model="newNode3.contract_number"></el-input>
-				</el-form-item>
-				<el-form-item label="合同名称">
-					<el-input v-model="newNode3.contract_name"></el-input>
-				</el-form-item>
-				<el-form-item label="合同内容">
-					<el-input v-model="newNode3.contract_des"></el-input>
-				</el-form-item>
-				<el-form-item label="合同金额">
-					<el-input v-model="newNode3.contract_price"></el-input>
-				</el-form-item>
-				<el-form-item>
-					<el-radio v-model="newNode3.contract_category" :label="1">销售合同</el-radio>
-					<el-radio v-model="newNode3.contract_category" :label="3">采购合同</el-radio>
-				</el-form-item>
-
-				<el-form-item label="生效时间">
-					<el-date-picker v-model="newNode3.create_time" type="date" format="yyyy-MM-dd"
-						value-format="yyyy-MM-dd" placeholder="选择日期时间">
-					</el-date-picker>
-				</el-form-item>
-
-				<el-form-item label="添加文件">
-					<el-upload class="upload-demo" :action="upload_url" :on-preview="handlePreview"
-						:on-remove="handleRemove" :on-success="handleNewSuccess" :before-upload="beforeUpload"
-						:file-list="fileList" accept=".jpg,.jpeg,.png,.pdf,.pptx,.xlsx,.xls,.docx,.doc,.ppt,.zip,.rar">
-						<el-button size="small" type="primary">点击上传</el-button>
-						<div slot="tip" class="el-upload__tip">
-							支持jpg/jpeg/png/pdf/pptx/xlsx/xls/docx/doc/ppt/zip/rar文件，不超过100MB
-						</div>
-					</el-upload>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisibleCreateContract = false">取 消</el-button>
-				<el-button type="primary" @click="confirmAddContract">确 定</el-button>
-			</span>
-		</el-dialog>
-
-		<!-- 编辑合同对话框 -->
-		<el-dialog title="编辑合同信息" :visible.sync="dialogVisibleEdit" :close-on-click-modal="false" width="30%">
-			<el-form :model="editNode" label-width="80px">
-				<el-form-item label="合同编号">
-					<el-input v-model="editNode.contract_number" disabled></el-input>
-				</el-form-item>
-				<el-form-item label="合同名称">
-					<el-input v-model="editNode.contract_name"></el-input>
-				</el-form-item>
-				<el-form-item label="合同内容">
-					<el-input v-model="editNode.contract_des"></el-input>
-				</el-form-item>
-				<el-form-item label="合同金额">
-					<el-input v-model="editNode.contract_price"></el-input>
-				</el-form-item>
-				<el-form-item>
-					<el-radio v-model="editNode.contract_category" :label="1">销售合同</el-radio>
-					<el-radio v-model="editNode.contract_category" :label="3">采购合同</el-radio>
-				</el-form-item>
-				<el-form-item label="入库时间">
-					<el-date-picker v-model="editNode.create_time" type="datetime" format="yyyy-MM-dd"
-						value-format="yyyy-MM-dd" placeholder="选择日期时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="合同文件">
-					<el-upload class="upload-demo" :action="upload_url" :on-preview="handlePreview"
-						:on-remove="handleRemove" :on-success="handleNewSuccess" :before-upload="beforeUpload"
-						:file-list="fileList" accept=".jpg,.jpeg,.png,.pdf,.pptx,.xlsx,.xls,.docx,.doc,.ppt,.zip,.rar">
-						<el-button size="small" type="primary">点击上传</el-button>
-						<div slot="tip" class="el-upload__tip">
-							支持jpg/jpeg/png/pdf/pptx/xlsx/xls/docx/doc/ppt/zip/rar文件，不超过100MB
-						</div>
-					</el-upload>
-				</el-form-item>
-			</el-form>
-			<span slot="footer" class="dialog-footer">
-				<el-button @click="dialogVisibleEdit = false">取 消</el-button>
-				<el-button type="primary" @click="confirmEdit">确 定</el-button>
-			</span>
-		</el-dialog>
-	</div>
+    <!-- 编辑合同对话框 -->
+    <el-dialog :visible.sync="dialogVisibleEdit" :close-on-click-modal="false" title="编辑合同信息" width="30%">
+      <el-form :model="editNode" label-width="80px">
+        <el-form-item label="合同编号">
+          <el-input v-model="editNode.contract_number" disabled/>
+        </el-form-item>
+        <el-form-item label="合同名称">
+          <el-input v-model="editNode.contract_name"/>
+        </el-form-item>
+        <el-form-item label="合同内容">
+          <el-input v-model="editNode.contract_des"/>
+        </el-form-item>
+        <el-form-item label="合同金额">
+          <el-input v-model="editNode.contract_price"/>
+        </el-form-item>
+        <el-form-item>
+          <el-radio v-model="editNode.contract_category" :label="1">销售合同</el-radio>
+          <el-radio v-model="editNode.contract_category" :label="3">采购合同</el-radio>
+        </el-form-item>
+        <el-form-item label="入库时间">
+          <el-date-picker
+            v-model="editNode.create_time"
+            type="datetime"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期时间"/>
+        </el-form-item>
+        <el-form-item label="合同文件">
+          <el-upload
+            :action="upload_url"
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :on-success="handleNewSuccess"
+            :before-upload="beforeUpload"
+            :file-list="fileList"
+            class="upload-demo"
+            accept=".jpg,.jpeg,.png,.pdf,.pptx,.xlsx,.xls,.docx,.doc,.ppt,.zip,.rar">
+            <el-button size="small" type="primary">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">
+              支持jpg/jpeg/png/pdf/pptx/xlsx/xls/docx/doc/ppt/zip/rar文件，不超过100MB
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleEdit = false">取 消</el-button>
+        <el-button type="primary" @click="confirmEdit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import contract from '@/api/contract'
 
 export default {
-	data() {
-		let id = 1;
-		return {
-			//contract_url:'',
-			upload_url: process.env.BASE_WMS_API + '/upload/uploadFile',
-			contract_type_list: [],
-			contract_info_list: [],
-			defaultProps: {
-				children: 'sub_type',
-				label: 'type_name'
-			},
-			id: id,
-			fileName: '',
-			currentFileName: '',
-			fileExtension: '', // 新增文件类型显示
-			isImage: false,
-			isPDF: false,
-			showTreeMenu: false,
-			dialogVisibleShowFile: false,
-			dialogVisibleCreateFolder: false,
-			dialogVisibleCreateContract: false,
-			dialogVisibleEdit: false,
-			select_create_type: 0,
+  data() {
+    const id = 1
+    return {
+      // contract_url:'',
+      upload_url: process.env.BASE_WMS_API + '/upload/uploadFile',
+      contract_type_list: [],
+      contract_info_list: [],
+      defaultProps: {
+        children: 'sub_type',
+        label: 'type_name'
+      },
+      id: id,
+      fileName: '',
+      currentFileName: '',
+      fileExtension: '', // 新增文件类型显示
+      isImage: false,
+      isPDF: false,
+      showTreeMenu: false,
+      dialogVisibleShowFile: false,
+      dialogVisibleCreateFolder: false,
+      dialogVisibleCreateContract: false,
+      dialogVisibleEdit: false,
+      select_create_type: 0,
 
-			newNode: {
-				label: ''
-			},
-			newNode3: {
-				contract_number: '',
-				contract_name: '',
-				contract_price: '',
-				create_time: '',
-				contract_url: '',
-				contract_category: 0,
-				contract_des: ''
-			},
-			editNode: {
-				contract_id: '',
-				contract_number: '',
-				contract_name: '',
-				contract_price: '',
-				create_time: '',
-				contract_url: '',
-				contract_type: 0,
-				contract_category: 0,
-				contract_des: ''
-			},
+      newNode: {
+        label: ''
+      },
+      newNode3: {
+        contract_number: '',
+        contract_name: '',
+        contract_price: '',
+        create_time: '',
+        contract_url: '',
+        contract_category: 0,
+        contract_des: ''
+      },
+      editNode: {
+        contract_id: '',
+        contract_number: '',
+        contract_name: '',
+        contract_price: '',
+        create_time: '',
+        contract_url: '',
+        contract_type: 0,
+        contract_category: 0,
+        contract_des: ''
+      },
 
-			currentNode: null,
-			currentData: null,
-			currentNodeLevel: 0,
-			products: [],
-			del_id: 0,
-			fileList: [],
-			contract_img: '',
-			contract_pdf_img: ''
-		};
-	},
-	mounted() {
-		this.get_contract_type_list()
-	},
-	created() {
+      currentNode: null,
+      currentData: null,
+      currentNodeLevel: 0,
+      products: [],
+      del_id: 0,
+      fileList: [],
+      contract_img: '',
+      contract_pdf_img: ''
+    }
+  },
+  mounted() {
+    this.get_contract_type_list()
+  },
+  created() {
 
-	},
-	methods: {
-		downloadFile(url) {
-			const link = document.createElement('a');
-			link.href = url;
-			link.setAttribute('download', this.currentFileName); // 使用数据库中的文件名
-			document.body.appendChild(link);
-			link.click();
-			document.body.removeChild(link);
-		},
+  },
+  methods: {
+    downloadFile(url) {
+      const link = document.createElement('a')
+      link.href = url
+      link.setAttribute('download', this.currentFileName) // 使用数据库中的文件名
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link)
+    },
 
-		createFolder() {
-			this.newNode = []
-			this.dialogVisibleCreateFolder = true
-		},
+    createFolder() {
+      this.newNode = []
+      this.dialogVisibleCreateFolder = true
+    },
 
-		createContract() {
-			this.newNode3 = []
-			this.dialogVisibleCreateContract = true
-		},
+    createContract() {
+      this.newNode3 = []
+      this.dialogVisibleCreateContract = true
+    },
 
-		openTreeMenu(event, data, node, target) {
-			console.log(event, data, node, target)
+    openTreeMenu(event, data, node, target) {
+      console.log(event, data, node, target)
 
-			this.showTreeMenu = true // 显示菜单
-			this.currentNode = node;
-			this.currentData = data;
-			this.del_id = 0;
-			this.del_id = data.dept_id
+      this.showTreeMenu = true // 显示菜单
+      this.currentNode = node
+      this.currentData = data
+      this.del_id = 0
+      this.del_id = data.dept_id
 
-			// 记录当前节点的层级
-			this.currentNodeLevel = node.level;
+      // 记录当前节点的层级
+      this.currentNodeLevel = node.level
 
-			document.querySelector('.treeMenu')
-				.setAttribute('style', `top:${event.clientY + 10}px;left:${event.clientX + 10}px;`)
+      document.querySelector('.treeMenu')
+        .setAttribute('style', `top:${event.clientY + 10}px;left:${event.clientX + 10}px;`)
 
-			document.addEventListener('click', this.closeTreeMenu)
-			document.addEventListener('contextmenu', this.closeTreeMenu)
-		},
+      document.addEventListener('click', this.closeTreeMenu)
+      document.addEventListener('contextmenu', this.closeTreeMenu)
+    },
 
-		closeTreeMenu() {
-			this.showTreeMenu = false // 关闭菜单
-			document.removeEventListener('click', this.closeTreeMenu)
-			document.removeEventListener('contextmenu', this.closeTreeMenu)
-		},
+    closeTreeMenu() {
+      this.showTreeMenu = false // 关闭菜单
+      document.removeEventListener('click', this.closeTreeMenu)
+      document.removeEventListener('contextmenu', this.closeTreeMenu)
+    },
 
-		confirmEdit() {
-			// 获取表单数据
-			const formData = {
-				contract_id: this.editNode.contract_id,
-				contract_number: this.editNode.contract_number,
-				contract_name: this.editNode.contract_name,
-				contract_price: this.editNode.contract_price,
-				contract_category: this.editNode.contract_category,
-				create_time: this.editNode.create_time,
-				contract_url: this.editNode.contract_url,
-				contract_des: this.editNode.contract_des,
-				contract_file_name: this.fileName
-			};
+    confirmEdit() {
+      // 获取表单数据
+      const formData = {
+        contract_id: this.editNode.contract_id,
+        contract_number: this.editNode.contract_number,
+        contract_name: this.editNode.contract_name,
+        contract_price: this.editNode.contract_price,
+        contract_category: this.editNode.contract_category,
+        create_time: this.editNode.create_time,
+        contract_url: this.editNode.contract_url,
+        contract_des: this.editNode.contract_des,
+        contract_file_name: this.fileName
+      }
 
-			console.log(formData);
+      console.log(formData)
 
-			// 调用后端接口更新数据
-			contract.UpdateContractInfo(formData).then(response => {
-				if (response.data.code === 20000) {
-					this.$message.success('更新成功')
-					this.dialogVisibleEdit = false
-					this.get_contract_info_list(this.editNode.contract_type) // 刷新资产列表
-					//this.get_contract_type_list()
-				} else {
-					this.$message.error('更新失败：' + response.data.message)
-				}
-			}).catch(error => {
-				this.$message.error('请求失败，请稍后重试')
-			});
-		},
+      // 调用后端接口更新数据
+      contract.UpdateContractInfo(formData).then(response => {
+        if (response.data.code === 20000) {
+          this.$message.success('更新成功')
+          this.dialogVisibleEdit = false
+          this.get_contract_info_list(this.editNode.contract_type) // 刷新资产列表
+          // this.get_contract_type_list()
+        } else {
+          this.$message.error('更新失败：' + response.data.message)
+        }
+      }).catch(error => {
+        this.$message.error('请求失败，请稍后重试')
+      })
+    },
 
-		update(row) {
-			this.editNode.contract_id = row.contract_id
-			this.editNode.contract_number = row.contract_number
-			this.editNode.contract_name = row.contract_name
-			this.editNode.create_time = row.create_time
-			this.editNode.contract_url = row.contract_url
-			this.editNode.contract_type = row.contract_type
-			this.editNode.contract_price = row.contract_price
-			this.editNode.contract_category = row.contract_category
-			this.editNode.contract_des = row.contract_des
-			this.dialogVisibleEdit = true
+    update(row) {
+      this.editNode.contract_id = row.contract_id
+      this.editNode.contract_number = row.contract_number
+      this.editNode.contract_name = row.contract_name
+      this.editNode.create_time = row.create_time
+      this.editNode.contract_url = row.contract_url
+      this.editNode.contract_type = row.contract_type
+      this.editNode.contract_price = row.contract_price
+      this.editNode.contract_category = row.contract_category
+      this.editNode.contract_des = row.contract_des
+      this.dialogVisibleEdit = true
 
-			console.log(this.editNode)
+      console.log(this.editNode)
 
-			// 清空文件列表
-			this.fileList = [];
+      // 清空文件列表
+      this.fileList = []
 
-			const url = this.editNode.contract_url
-			const ext = url.split('.').pop().toLowerCase();
+      const url = this.editNode.contract_url
+      const ext = url.split('.').pop().toLowerCase()
 
-			if (ext === 'jpg' || ext === 'jpeg' || ext === 'png') {
-				this.isImage = true
-				this.isPDF = false
-			} else if (ext === 'pdf') {
-				this.isImage = false
-				this.isPDF = true
-			} else if (ext === '') {
+      if (ext === 'jpg' || ext === 'jpeg' || ext === 'png') {
+        this.isImage = true
+        this.isPDF = false
+      } else if (ext === 'pdf') {
+        this.isImage = false
+        this.isPDF = true
+      } else if (ext === '') {
 
-			} else {
-				this.$message.error('不支持的文件类型')
-			}
-		},
-		handleNewSuccess(file, fileList) {
-			this.newNode3.contract_url = file.url
-			this.editNode.contract_url = file.url
-			this.fileName = file.name
-		},
+      } else {
+        this.$message.error('不支持的文件类型')
+      }
+    },
+    handleNewSuccess(file, fileList) {
+      this.newNode3.contract_url = file.url
+      this.editNode.contract_url = file.url
+      this.fileName = file.name
+    },
 
-		handleEditSuccess(file, fileList) {
-			this.editNode.contract_url = file.url
-			this.fileName = file.name
-		},
+    handleEditSuccess(file, fileList) {
+      this.editNode.contract_url = file.url
+      this.fileName = file.name
+    },
 
-		handleRemove(file, fileList) {
-			console.log(file, fileList)
-		},
-		handlePreview(file) {
-			console.log(file)
-		},
-		beforeUpload(file) {
-			const allowedExtensions = [
-				'jpg', 'jpeg', 'png', 'pdf',
-				'pptx', 'xlsx', 'xls', 'docx',
-				'doc', 'ppt', 'zip', 'rar'
-			];
-			const extension = file.name.split('.').pop().toLowerCase();
-			const isAllowed = allowedExtensions.includes(extension);
-			const isLt100M = file.size / 1024 / 1024 < 100;
+    handleRemove(file, fileList) {
+      console.log(file, fileList)
+    },
+    handlePreview(file) {
+      console.log(file)
+    },
+    beforeUpload(file) {
+      const allowedExtensions = [
+        'jpg', 'jpeg', 'png', 'pdf',
+        'pptx', 'xlsx', 'xls', 'docx',
+        'doc', 'ppt', 'zip', 'rar'
+      ]
+      const extension = file.name.split('.').pop().toLowerCase()
+      const isAllowed = allowedExtensions.includes(extension)
+      const isLt100M = file.size / 1024 / 1024 < 100
 
-			if (!isAllowed) {
-				this.$message.error('不支持的文件类型！');
-				return false;
-			}
-			if (!isLt100M) {
-				this.$message.error('文件大小不能超过100MB！');
-				return false;
-			}
-			return true;
-		},
+      if (!isAllowed) {
+        this.$message.error('不支持的文件类型！')
+        return false
+      }
+      if (!isLt100M) {
+        this.$message.error('文件大小不能超过100MB！')
+        return false
+      }
+      return true
+    },
 
-		showImg(row) {
-			console.log(row)
-			const url = row.contract_url
-			const ext = url.split('.').pop().toLowerCase()
-			this.currentFileName = row.contract_file_name
-			this.isImage = false
-			this.isPDF = false
-			this.fileExtension = ext  // 记录文件扩展名
+    showImg(row) {
+      console.log(row)
+      const url = row.contract_url
+      const ext = url.split('.').pop().toLowerCase()
+      this.currentFileName = row.contract_file_name
+      this.isImage = false
+      this.isPDF = false
+      this.fileExtension = ext // 记录文件扩展名
 
-			if (['jpg', 'jpeg', 'png'].includes(ext)) {
-				this.previewUrl = process.env.BASE_WMS_FILE + url
-				this.isImage = true
-			} else if (ext === 'pdf') {
-				this.previewUrl = process.env.BASE_WMS_FILE + url
-				this.isPDF = true
-			} else {
-				this.previewUrl = process.env.BASE_WMS_FILE + url  // 必须设置预览URL
-			}
-			this.dialogVisibleShowFile = true
-		},
+      if (['jpg', 'jpeg', 'png'].includes(ext)) {
+        this.previewUrl = process.env.BASE_WMS_FILE + url
+        this.isImage = true
+      } else if (ext === 'pdf') {
+        this.previewUrl = process.env.BASE_WMS_FILE + url
+        this.isPDF = true
+      } else {
+        this.previewUrl = process.env.BASE_WMS_FILE + url // 必须设置预览URL
+      }
+      this.dialogVisibleShowFile = true
+    },
 
-		previewImage(url) {
-			this.$dialog({
-				title: '图片预览',
-				content: `<img src="${url}" alt="Preview" style="max-width: 100%; max-height: 100%;">`,
-				closable: true,
-				appendToBody: true
-			});
-		},
+    previewImage(url) {
+      this.$dialog({
+        title: '图片预览',
+        content: `<img src="${url}" alt="Preview" style="max-width: 100%; max-height: 100%;">`,
+        closable: true,
+        appendToBody: true
+      })
+    },
 
-		previewPDF(url) {
-			this.$dialog({
-				title: 'PDF 预览',
-				content: `<iframe src="${url}" frameborder="0" style="width: 100%; height: 600px;"></iframe>`,
-				closable: true,
-				appendToBody: true
-			});
-		},
+    previewPDF(url) {
+      this.$dialog({
+        title: 'PDF 预览',
+        content: `<iframe src="${url}" frameborder="0" style="width: 100%; height: 600px;"></iframe>`,
+        closable: true,
+        appendToBody: true
+      })
+    },
 
-		get_contract_type_list() {
-			contract.GetContractTypeList().then(response => {
-				this.contract_type_list = response.data.data
-				// console.log(this.assets_type_list);
-			})
-		},
+    get_contract_type_list() {
+      contract.GetContractTypeList().then(response => {
+        this.contract_type_list = response.data.data
+        // console.log(this.assets_type_list);
+      })
+    },
 
+    get_contract_info_list(type) {
+      var param = { contract_type: type }
 
+      console.log(param)
+      contract.GetOperationContractList(param).then(response => {
+        this.contract_info_list = response.data.data
+        console.log(this.contract_info_list)
+      })
+    },
 
-		get_contract_info_list(type) {
-			var param = { contract_type: type }
+    handle_node_click(data, node) {
+      this.currentNode = node
+      this.currentData = data
+      this.del_id = 0
+      this.del_id = data.type_id
+      this.closeTreeMenu()
+      // 记录当前节点的层级
+      this.currentNodeLevel = node.level
+      this.get_contract_info_list(data.type_id)
+    },
 
-			console.log(param);
-			contract.GetOperationContractList(param).then(response => {
-				this.contract_info_list = response.data.data
-				console.log(this.contract_info_list);
-			})
-		},
+    createBaseType() {
+      this.currentNode = null
+      this.currentData = null
+      this.newNode.label = ''
+      this.dialogVisibleCreateFolder = true
+    },
 
-		handle_node_click(data, node) {
-			this.currentNode = node;
-			this.currentData = data;
-			this.del_id = 0
-			this.del_id = data.type_id
-			this.closeTreeMenu();
-			// 记录当前节点的层级
-			this.currentNodeLevel = node.level;
-			this.get_contract_info_list(data.type_id);
-		},
+    openDialogForLevel1() {
+      this.currentNode = null
+      this.currentData = null
+      this.newNode.label = ''
+      this.dialogVisibleCreateFolder = true
+    },
 
-		createBaseType() {
-			this.currentNode = null;
-			this.currentData = null;
-			this.newNode.label = '';
-			this.dialogVisibleCreateFolder = true;
-		},
+    confirmAddFolder() {
+      if (this.newNode.label.trim() === '') {
+        this.$message.warning('请输入类型名称')
+        return
+      }
 
-		openDialogForLevel1() {
-			this.currentNode = null;
-			this.currentData = null;
-			this.newNode.label = '';
-			this.dialogVisibleCreateFolder = true;
-		},
+      var type_id = 0
+      var param = { type_id: type_id, type_name: this.newNode.label }
+      if (this.currentData != null) {
+        const newChild = { id: this.id++, label: this.newNode.label, children: [] }
+        if (!this.currentData.children) {
+          this.$set(this.currentData, 'children', [])
+        }
+        this.currentData.children.push(newChild)
+        type_id = this.currentData.type_id
+        param = { type_id: type_id, type_name: newChild.label }
+      }
 
-		confirmAddFolder() {
-			if (this.newNode.label.trim() === '') {
-				this.$message.warning('请输入类型名称');
-				return;
-			}
+      contract.AddContractType(param).then(response => {
+        this.$message({
+          type: 'success',
+          message: '添加成功'
+        })
+        this.get_contract_type_list()
+      })
+      this.dialogVisibleCreateFolder = false
+    },
 
-			var type_id = 0;
-			var param = { type_id: type_id, type_name: this.newNode.label };
-			if (this.currentData != null) {
-				const newChild = { id: this.id++, label: this.newNode.label, children: [] }
-				if (!this.currentData.children) {
-					this.$set(this.currentData, 'children', [])
-				}
-				this.currentData.children.push(newChild);
-				type_id = this.currentData.type_id;
-				param = { type_id: type_id, type_name: newChild.label };
-			}
+    confirmAddContract() {
+      if (this.newNode3.contract_number.trim() === '' || this.newNode3.contract_name.trim() === '') {
+        this.$message.warning('请输入合同编号和合同名称')
+        return
+      }
 
-			contract.AddContractType(param).then(response => {
-				this.$message({
-					type: 'success',
-					message: '添加成功'
-				});
-				this.get_contract_type_list();
-			});
-			this.dialogVisibleCreateFolder = false;
-		},
+      const newChild = {
+        id: this.id++,
+        contract_number: this.newNode3.contract_number,
+        contract_name: this.newNode3.contract_name,
+        create_time: this.newNode3.create_time,
+        contract_url: this.newNode3.contract_url,
+        contract_category: this.newNode3.contract_category,
+        contract_price: this.newNode3.contract_price,
+        contract_des: this.newNode3.contract_des
+      }
 
+      if (!this.currentData.children) {
+        this.$set(this.currentData, 'children', [])
+      }
+      this.currentData.children.push(newChild)
 
-		confirmAddContract() {
-			if (this.newNode3.contract_number.trim() === '' || this.newNode3.contract_name.trim() === '') {
-				this.$message.warning('请输入合同编号和合同名称');
-				return;
-			}
+      var contract_type = this.currentData.type_id
+      var param = {
+        contract_type: contract_type,
+        contract_category: newChild.contract_category,
+        contract_price: newChild.contract_price,
+        contract_number: newChild.contract_number,
+        contract_name: newChild.contract_name,
+        create_time: newChild.create_time,
+        contract_url: newChild.contract_url,
+        contract_des: newChild.contract_des,
+        contract_file_name: this.fileName
+      }
+      this.fileList = []
 
-			const newChild = {
-				id: this.id++,
-				contract_number: this.newNode3.contract_number,
-				contract_name: this.newNode3.contract_name,
-				create_time: this.newNode3.create_time,
-				contract_url: this.newNode3.contract_url,
-				contract_category: this.newNode3.contract_category,
-				contract_price: this.newNode3.contract_price,
-				contract_des: this.newNode3.contract_des
-			}
+      console.log(param)
+      contract.AddContractInfo(param).then(response => {
+        this.$message({
+          type: 'success',
+          message: '添加成功'
+        })
+        // this.get_contract_type_list();
+        this.get_contract_info_list(contract_type)
+      }).catch(error => {
+        this.$message({
+          type: 'error',
+          message: '添加失败，请重试' + error.toString()
+        })
+      })
+      this.dialogVisibleCreateContract = false
+    },
 
-			if (!this.currentData.children) {
-				this.$set(this.currentData, 'children', [])
-			}
-			this.currentData.children.push(newChild);
+    remove(data) {
+      contract.delType({ type_id: data.data.type_id }).then(res => {
+        if (res.data.code === 20000) {
+          this.$message({
+            message: res.data.message,
+            type: 'success'
+          })
+          this.get_contract_type_list()
+          this.get_contract_info_list(data.data.type_id)
+        }
+      })
+    },
+    handleClick(row) {
+      this.$confirm('您确定要删除此合同信息吗？').then(() => {
+        contract.delContractInfo({ contract_id: row.contract_id }).then(res => {
+          if (res.data.code === 20000) {
+            this.$message({
+              message: res.data.message,
+              type: 'success'
+            })
+            this.get_contract_info_list(row.contract_type)
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    }
 
-			var contract_type = this.currentData.type_id
-			var param = {
-				contract_type: contract_type,
-				contract_category: newChild.contract_category,
-				contract_price: newChild.contract_price,
-				contract_number: newChild.contract_number,
-				contract_name: newChild.contract_name,
-				create_time: newChild.create_time,
-				contract_url: newChild.contract_url,
-				contract_des: newChild.contract_des,
-				contract_file_name: this.fileName
-			};
-			this.fileList = []
-
-			console.log(param);
-			contract.AddContractInfo(param).then(response => {
-				this.$message({
-					type: 'success',
-					message: '添加成功'
-				});
-				//this.get_contract_type_list();
-				this.get_contract_info_list(contract_type)
-			}).catch(error => {
-				this.$message({
-					type: 'error',
-					message: '添加失败，请重试' + error.toString()
-				});
-			});
-			this.dialogVisibleCreateContract = false;
-		},
-
-		remove(data) {
-			contract.delType({ type_id: data.data.type_id }).then(res => {
-				if (res.data.code === 20000) {
-					this.$message({
-						message: res.data.message,
-						type: 'success'
-					});
-					this.get_contract_type_list()
-					this.get_contract_info_list(data.data.type_id)
-				}
-			})
-		},
-		handleClick(row) {
-			this.$confirm('您确定要删除此合同信息吗？').then(() => {
-				contract.delContractInfo({ contract_id: row.contract_id }).then(res => {
-					if (res.data.code === 20000) {
-						this.$message({
-							message: res.data.message,
-							type: 'success'
-						});
-						this.get_contract_info_list(row.contract_type)
-					}
-				})
-			}).catch(() => {
-				this.$message({
-					type: 'info',
-					message: '已取消删除'
-				});
-			});
-		},
-
-	}
+  }
 }
 </script>
 

From b6080e9d4b906a0da9493a5fa302ce3ab7c4f7d2 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 18 Mar 2026 11:30:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=A2=E6=88=B7=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/README.md                               |   2 +-
 front/index.html                              |   2 +-
 front/src/api/hr.js                           |   9 +-
 .../src/views/components/ProjectBasicInfo.vue | 473 +++++++++++-------
 .../src/views/components/ProjectImplInfo.vue  |   6 +-
 front/src/views/components/Story.vue          |   2 +-
 front/src/views/customer-mgr/customerlist.vue |  38 +-
 front/src/views/hr-mgr/stafflist.vue          | 181 ++++---
 front/src/views/login/index.vue               |   2 +-
 front/src/views/system-mgr/userList.vue       |   9 +-
 10 files changed, 448 insertions(+), 276 deletions(-)

diff --git a/front/README.md b/front/README.md
index d0ff7d7..6baf907 100644
--- a/front/README.md
+++ b/front/README.md
@@ -1,4 +1,4 @@
-<p align="center">
+npm<p align="center">
   <img width="320" src="https://wpimg.wallstcn.com/ecc53a42-d79b-42e2-8852-5126b810a4c8.svg">
 </p>
 
diff --git a/front/index.html b/front/index.html
index 8e15938..425cb6b 100644
--- a/front/index.html
+++ b/front/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <title>Warehouse Management System</title>
+    <title>上海诺力智能科技有限公司</title>
   </head>
   <body>
     <script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script>
diff --git a/front/src/api/hr.js b/front/src/api/hr.js
index aec01aa..f9ff670 100644
--- a/front/src/api/hr.js
+++ b/front/src/api/hr.js
@@ -45,6 +45,13 @@ export default {
       data: param
     })
   },
+  getStaffPage(param) {
+    return request({
+      url: `/Hr/GetStaffPage`,
+      method: "post",
+      data: param
+    });
+  },
   GetStaffTypeList() {
     return request({
       url: `/Hr/GetStaffTypeList`,
@@ -73,7 +80,7 @@ export default {
       data: param
     })
   },
-  
+
   GetOperationDeptStaff()
   {
     return request({
diff --git a/front/src/views/components/ProjectBasicInfo.vue b/front/src/views/components/ProjectBasicInfo.vue
index 89cee69..8021d48 100644
--- a/front/src/views/components/ProjectBasicInfo.vue
+++ b/front/src/views/components/ProjectBasicInfo.vue
@@ -5,39 +5,62 @@
       <el-collapse-item name="base-info">
         <template slot="title">
           <span class="custom-title">项目基础信息</span>
-          <el-button style="margin_left:20px" size="mini" class="el-icon-edit" type="text" @click="editProjectInfo"
-            v-if="edit_support == true">编辑</el-button>
+          <el-button
+            v-if="edit_support == true"
+            style="margin_left:20px"
+            size="mini"
+            class="el-icon-edit"
+            type="text"
+            @click="editProjectInfo">编辑</el-button>
         </template>
         <span style="border: 1px solid #dcdcdc; padding: 8px; display: inline-block;width: 100%;">项目介绍：{{
-          project_info.project_intro }}
+        project_info.project_intro }}
         </span>
 
-
         <el-descriptions :column="2" border class="resume-label-width" style="margin-top: 5px;">
-          <el-descriptions-item label="客户名称" :span="1">{{ project_info.company_name }}</el-descriptions-item>
-          <el-descriptions-item label="项目名称" :span="1">{{ project_info.project_name }}</el-descriptions-item>
-          <el-descriptions-item label="项目状态" :span="1">{{ project_info.project_state_desp }}
-            <el-button v-if="project_info.project_state == 1 && edit_support == true" type="text"
-              icon="el-icon-video-play" @click="dialogVisibleStartProject = true" style="margin-left: 20px;"
-              size="mini">启动</el-button>
+          <el-descriptions-item :span="1" label="客户名称">{{ project_info.company_name }}</el-descriptions-item>
+          <el-descriptions-item :span="1" label="项目名称">{{ project_info.project_name }}</el-descriptions-item>
+          <el-descriptions-item :span="1" label="项目状态">{{ project_info.project_state_desp }}
+            <el-button
+              v-if="project_info.project_state == 1 && edit_support == true"
+              type="text"
+              icon="el-icon-video-play"
+              style="margin-left: 20px;"
+              size="mini"
+              @click="dialogVisibleStartProject = true">启动</el-button>
           </el-descriptions-item>
-          <el-descriptions-item label="创建时间" :span="1">{{ project_info.create_time }}</el-descriptions-item>
-          <el-descriptions-item label="销售经理" :span="1">{{ project_info.sale_manager }}
-            <el-button type="text" icon="el-icon-edit" @click="setSaleManager()" style="margin-left: 20px;"
-              size="mini" v-if="edit_support == true && allow_change_manager == true">编辑</el-button>
+          <el-descriptions-item :span="1" label="创建时间">{{ project_info.create_time }}</el-descriptions-item>
+          <el-descriptions-item :span="1" label="销售经理">{{ project_info.sale_name }}
+            <el-button
+              v-if="edit_support == true && allow_change_manager == true"
+              type="text"
+              icon="el-icon-edit"
+              style="margin-left: 20px;"
+              size="mini"
+              @click="setSaleManager()">编辑</el-button>
           </el-descriptions-item>
 
-          <el-descriptions-item label="交付经理" :span="1">{{ project_info.project_manager }}
-            <el-button type="text" icon="el-icon-edit" @click="setProjectManager()" style="margin-left: 20px;"
-              size="mini" v-if="edit_support == true && allow_change_manager == true">编辑</el-button>
+          <el-descriptions-item :span="1" label="交付经理">{{ project_info.project_manager }}
+            <el-button
+              v-if="edit_support == true && allow_change_manager == true"
+              type="text"
+              icon="el-icon-edit"
+              style="margin-left: 20px;"
+              size="mini"
+              @click="setProjectManager()">编辑</el-button>
           </el-descriptions-item>
 
-          <el-descriptions-item label="项目成员" :span="1">{{ project_info.project_members }}
-            <el-button type="text" icon="el-icon-edit" @click="addProjectMember()" style="margin-left: 20px;"
-              size="mini" v-if="edit_support == true">编辑</el-button>
+          <el-descriptions-item :span="1" label="项目成员">{{ project_info.project_members }}
+            <el-button
+              v-if="edit_support == true"
+              type="text"
+              icon="el-icon-edit"
+              style="margin-left: 20px;"
+              size="mini"
+              @click="addProjectMember()">编辑</el-button>
           </el-descriptions-item>
-          <el-descriptions-item label="外部成员" :span="1">
-            <el-button class="el-icon-view" @click="showExternalMember()" type="text" size="mini">查看</el-button>
+          <el-descriptions-item :span="1" label="外部成员">
+            <el-button class="el-icon-view" type="text" size="mini" @click="showExternalMember()">查看</el-button>
           </el-descriptions-item>
           <!--el-descriptions-item label="项目合同" :span="1" v-if="project_info.project_state > 1 && edit_support == true">
             <el-button class="el-icon-view" @click="showContract()" type="text" size="mini">查看</el-button>
@@ -47,29 +70,37 @@
             <el-button class="el-icon-view" @click="showProtocol()" type="text" size="mini">查看</el-button>
           </el-descriptions-item-->
 
-          <el-descriptions-item label="项目计划" :span="1" v-if="project_info.project_state > 1">
-            <el-button class="el-icon-view" @click="showPlan()" type="text" size="mini">查看</el-button>
+          <el-descriptions-item v-if="project_info.project_state > 1" :span="1" label="项目计划">
+            <el-button class="el-icon-view" type="text" size="mini" @click="showPlan()">查看</el-button>
           </el-descriptions-item>
 
-          <el-descriptions-item label="项目资料" :span="1">
-            <el-button class="el-icon-view" @click="showContract()" type="text" size="mini"
-              v-if="project_info.project_state > 1 && edit_support == true">项目合同</el-button>
-            <el-button class="el-icon-view" @click="showEquipment()" type="text" size="mini">设备资料</el-button>
-            <el-button class="el-icon-view" @click="showProtocol()" type="text" size="mini">技术协议</el-button>
-            <el-button class="el-icon-view" @click="showSummary()" type="text" size="mini">会议纪要</el-button>
-            <el-button class="el-icon-view" @click="showBid()" type="text" size="mini"
-              v-if="edit_support == true">投标文件</el-button>
+          <el-descriptions-item :span="1" label="项目资料">
+            <el-button
+              v-if="project_info.project_state > 1 && edit_support == true"
+              class="el-icon-view"
+              type="text"
+              size="mini"
+              @click="showContract()">项目合同</el-button>
+            <el-button class="el-icon-view" type="text" size="mini" @click="showEquipment()">设备资料</el-button>
+            <el-button class="el-icon-view" type="text" size="mini" @click="showProtocol()">技术协议</el-button>
+            <el-button class="el-icon-view" type="text" size="mini" @click="showSummary()">会议纪要</el-button>
+            <el-button
+              v-if="edit_support == true"
+              class="el-icon-view"
+              type="text"
+              size="mini"
+              @click="showBid()">投标文件</el-button>
           </el-descriptions-item>
 
           <!--el-descriptions-item label="会议纪要" :span="1">
             <el-button class="el-icon-view" @click="showSummary()" type="text" size="mini">查看</el-button>
           </el-descriptions-item-->
 
-          <el-descriptions-item label="验收报告" :span="1" v-if="project_info.project_state > 8">
-            <el-button class="el-icon-view" @click="showReport()" type="text" size="mini">查看</el-button>
+          <el-descriptions-item v-if="project_info.project_state > 8" :span="1" label="验收报告">
+            <el-button class="el-icon-view" type="text" size="mini" @click="showReport()">查看</el-button>
           </el-descriptions-item>
-          <el-descriptions-item label="供应商" :span="1">
-            <el-button class="el-icon-view" @click="showSupplier()" type="text" size="mini">查看</el-button>
+          <el-descriptions-item :span="1" label="供应商">
+            <el-button class="el-icon-view" type="text" size="mini" @click="showSupplier()">查看</el-button>
           </el-descriptions-item>
         </el-descriptions>
 
@@ -77,92 +108,162 @@
     </el-collapse>
 
     <!-- 问题单对话框 -->
-    <el-dialog title="项目合同" :visible.sync="dialogVisibleShowContract" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowContract"
+      :close-on-click-modal="false"
+      title="项目合同"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <Contract :project_id="project_info.project_id" :contract_category="1" :edid_authority="false"
-          v-if="update_view == false" />
+        <Contract
+          v-if="update_view == false"
+          :project_id="project_info.project_id"
+          :contract_category="1"
+          :edid_authority="false" />
       </div>
     </el-dialog>
 
     <!-- 外部客户对话框 -->
-    <el-dialog title="外部客户" :visible.sync="dialogVisibleShowExternalMember" :close-on-click-modal="false" width="55%"
-      style="position: fixed;" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowExternalMember"
+      :close-on-click-modal="false"
+      title="外部客户"
+      width="55%"
+      style="position: fixed;"
+      append-to-body>
       <div class="custom-dialog">
-        <ExternalMember :project_id="project_info.project_id" :edit_support="edit_support"
-          v-if="update_view == false" />
+        <ExternalMember
+          v-if="update_view == false"
+          :project_id="project_info.project_id"
+          :edit_support="edit_support" />
       </div>
     </el-dialog>
 
-    <el-dialog title="技术协议" :visible.sync="dialogVisibleShowProtocol" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowProtocol"
+      :close-on-click-modal="false"
+      title="技术协议"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <Contract :project_id="project_info.project_id" :contract_category="2" :edid_authority="edit_support"
-          v-if="update_view == false" />
+        <Contract
+          v-if="update_view == false"
+          :project_id="project_info.project_id"
+          :contract_category="2"
+          :edid_authority="edit_support" />
       </div>
     </el-dialog>
 
-    <el-dialog title="设备资料" :visible.sync="dialogVisibleShowEquipment" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowEquipment"
+      :close-on-click-modal="false"
+      title="设备资料"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <Materials :materials_class="1" :materials_owner="project_info.project_id" :materials_type="[18, 19]"
-          :edid_authority="true" v-if="update_view == false" />
+        <Materials
+          v-if="update_view == false"
+          :materials_class="1"
+          :materials_owner="project_info.project_id"
+          :materials_type="[18, 19]"
+          :edid_authority="true" />
       </div>
     </el-dialog>
 
-    <el-dialog title="会议纪要" :visible.sync="dialogVisibleShowSummary" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowSummary"
+      :close-on-click-modal="false"
+      title="会议纪要"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <Materials :materials_class="1" :materials_owner="project_info.project_id" :materials_type="2"
-          :edid_authority="true" v-if="update_view == false" />
+        <Materials
+          v-if="update_view == false"
+          :materials_class="1"
+          :materials_owner="project_info.project_id"
+          :materials_type="2"
+          :edid_authority="true" />
       </div>
     </el-dialog>
 
-    <el-dialog title="项目计划" :visible.sync="dialogVisibleShowPlan" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowPlan"
+      :close-on-click-modal="false"
+      title="项目计划"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
         <ProjectPlan v-if="update_view == false" :project_id="project_info.project_id" />
       </div>
     </el-dialog>
 
-    <el-dialog title="验收报告" :visible.sync="dialogVisibleShowReport" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowReport"
+      :close-on-click-modal="false"
+      title="验收报告"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <Materials :materials_class="1" :materials_owner="project_info.project_id" :materials_type="4"
-          :edid_authority="true" v-if="update_view == false" />
+        <Materials
+          v-if="update_view == false"
+          :materials_class="1"
+          :materials_owner="project_info.project_id"
+          :materials_type="4"
+          :edid_authority="true" />
       </div>
     </el-dialog>
 
-    <el-dialog title="供应商信息" :visible.sync="dialogVisibleShowSupplier" :close-on-click-modal="false" width="60%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowSupplier"
+      :close-on-click-modal="false"
+      title="供应商信息"
+      width="60%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
         <SupplierInfo :project_id="project_info.project_id" :edid_authority="edit_support" />
       </div>
     </el-dialog>
 
-    <el-dialog title="投标文件" :visible.sync="dialogVisibleShowBid" :close-on-click-modal="false" width="95%"
-      style="position: fixed;top:-10%" append-to-body>
+    <el-dialog
+      :visible.sync="dialogVisibleShowBid"
+      :close-on-click-modal="false"
+      title="投标文件"
+      width="95%"
+      style="position: fixed;top:-10%"
+      append-to-body>
       <div class="custom-dialog">
-        <BidInfo :project_id="project_info.project_id" :contract_category="5" :edid_authority="edit_support"
-          v-if="update_view == false" />
+        <BidInfo
+          v-if="update_view == false"
+          :project_id="project_info.project_id"
+          :contract_category="5"
+          :edid_authority="edit_support" />
       </div>
     </el-dialog>
 
     <!-- 对话框 -->
-    <el-dialog title="文件信息" :visible.sync="dialogVisibleShowFile" width="80%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleShowFile" title="文件信息" width="80%" append-to-body>
       <img v-if="isImage" :src="previewUrl" alt="Preview" style="max-width: 40%; max-height: 30%;">
-      <iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"></iframe>
+      <iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"/>
       <p v-else>不支持的文件类型</p>
     </el-dialog>
 
     <!-- 设置项目经理对话框 -->
-    <el-dialog title="设置交付负责人" :visible.sync="dialogVisibleSetManager" width="30%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleSetManager" title="设置交付负责人" width="30%" append-to-body>
       <el-form :model="editProject" label-width="100px">
         <el-form-item label="项目成员">
           <el-select v-model="editProject.project_manager" placeholder="请选择" style="width: 100%;">
-            <el-option v-for="item in dept_member_list" :key="item.staff_id" :label="item.staff_name"
-              :value="item.staff_id">
-            </el-option>
+            <el-option
+              v-for="item in dept_member_list"
+              :key="item.staff_id"
+              :label="item.staff_name"
+              :value="item.staff_id"/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -173,13 +274,15 @@
     </el-dialog>
 
     <!-- 设置项目经理对话框 -->
-    <el-dialog title="设置销售负责人" :visible.sync="dialogVisibleSetSaleManager" width="30%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleSetSaleManager" title="设置销售负责人" width="30%" append-to-body>
       <el-form :model="editProject" label-width="100px">
         <el-form-item label="项目成员">
           <el-select v-model="editProject.sale_manager" placeholder="请选择" style="width: 100%;">
-            <el-option v-for="item in dept_member_list" :key="item.staff_id" :label="item.staff_name"
-              :value="item.staff_id">
-            </el-option>
+            <el-option
+              v-for="item in dept_member_list"
+              :key="item.staff_id"
+              :label="item.staff_name"
+              :value="item.staff_id"/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -190,13 +293,15 @@
     </el-dialog>
 
     <!-- 添加项目成员对话框 -->
-    <el-dialog title="添加项目组成员" :visible.sync="dialogVisibleAddMember" width="30%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleAddMember" title="添加项目组成员" width="30%" append-to-body>
       <el-form :model="editProject" label-width="100px">
         <el-form-item label="项目成员">
           <el-select v-model="editProject.project_members" multiple placeholder="请选择" style="width: 100%;">
-            <el-option v-for="item in dept_member_list" :key="item.staff_id" :label="item.staff_name"
-              :value="item.staff_id">
-            </el-option>
+            <el-option
+              v-for="item in dept_member_list"
+              :key="item.staff_id"
+              :label="item.staff_name"
+              :value="item.staff_id"/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -207,27 +312,29 @@
     </el-dialog>
 
     <!-- 编辑项目对话框 -->
-    <el-dialog title="编辑项目" :visible.sync="dialogVisibleEditProject" width="30%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleEditProject" title="编辑项目" width="30%" append-to-body>
       <el-form :model="editProject" label-width="100px">
         <el-form-item label="项目名称">
-          <el-input v-model="editProject.project_name"></el-input>
+          <el-input v-model="editProject.project_name"/>
         </el-form-item>
         <el-form-item label="项目编号">
-          <el-input v-model="editProject.project_number"></el-input>
+          <el-input v-model="editProject.project_number"/>
         </el-form-item>
         <el-form-item label="项目描述">
-          <el-input v-model="editProject.project_intro"></el-input>
+          <el-input v-model="editProject.project_intro"/>
         </el-form-item>
         <el-form-item label="项目状态">
           <el-select v-model="editProject.project_state" placeholder="请选择" style="width: 80%;">
-            <el-option v-for="item in project_state_list" :key="item.id" :label="item.desp" :value="item.id">
-            </el-option>
+            <el-option v-for="item in project_state_list" :key="item.id" :label="item.desp" :value="item.id"/>
           </el-select>
         </el-form-item>
         <el-form-item label="创建时间">
-          <el-date-picker v-model="editProject.create_time" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
+          <el-date-picker
+            v-model="editProject.create_time"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"/>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -237,20 +344,27 @@
     </el-dialog>
 
     <!-- 启动项目对话框 -->
-    <el-dialog title="启动项目" :visible.sync="dialogVisibleStartProject" width="30%" append-to-body>
+    <el-dialog :visible.sync="dialogVisibleStartProject" title="启动项目" width="30%" append-to-body>
       <el-form :model="editNode" label-width="100px">
         <el-form-item label="参与员工">
-          <el-select v-model="editNode.members" multiple placeholder="请选择" style="width: 100%;">
-            <el-option v-for="item in dept_member_list" :key="item.staff_id" :label="item.staff_name"
-              :value="item.staff_id">
-            </el-option>
+          <el-select v-model="editNode.members" filterable multiple placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in dept_member_list"
+              :key="item.staff_id"
+              :label="item.staff_name"
+              :value="item.staff_id"
+              filterable
+            />
           </el-select>
         </el-form-item>
 
         <el-form-item label="启动时间">
-          <el-date-picker v-model="editNode.start_date" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
+          <el-date-picker
+            v-model="editNode.start_date"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"/>
         </el-form-item>
 
       </el-form>
@@ -268,16 +382,15 @@ import project from '@/api/project'
 import contract from '@/api/contract'
 import hr from '@/api/hr'
 import user from '@/api/user'
-import Contract from './Contract.vue';
-import ExternalMember from './ExternalMember.vue';
+import Contract from './Contract.vue'
+import ExternalMember from './ExternalMember.vue'
 import Materials from '@/views/components/Materials.vue'
-import SupplierInfo from './SupplierInfo.vue';
-import ProjectPlan from './ProjectPlan.vue';
-import BidInfo from '@/views/components/BidInfo.vue';
+import SupplierInfo from './SupplierInfo.vue'
+import ProjectPlan from './ProjectPlan.vue'
+import BidInfo from '@/views/components/BidInfo.vue'
 
 export default {
   name: 'ProjectBasicInfo',
-  props: ['project_id', 'edit_support'],
   components: {
     Contract,
     ExternalMember,
@@ -286,6 +399,7 @@ export default {
     BidInfo,
     ProjectPlan
   },
+  props: ['project_id', 'edit_support'],
   data() {
     return {
       update_view: false,
@@ -343,141 +457,135 @@ export default {
     addProjectMember() {
       this.dialogVisibleAddMember = true
 
-      this.editProject.project_members = [];
+      this.editProject.project_members = []
       if (this.project_info['involve_members'] != '') {
-        this.editProject.project_members = this.project_info['involve_members'].split(',').map(staff_id => parseInt(staff_id, 10));
-
+        this.editProject.project_members = this.project_info['involve_members'].split(',').map(staff_id => parseInt(staff_id, 10))
       }
     },
 
-    //获取项目部所有员工信息
+    // 获取项目部所有员工信息
     get_project_dept_member_list() {
       user.GetProjectDeptStaffList().then(response => {
         this.dept_member_list = response.data.data
-        console.log(this.dept_member_list);
+        console.log(this.dept_member_list)
       })
     },
 
     setProjectManager() {
-      this.dialogVisibleSetManager = true;
+      this.dialogVisibleSetManager = true
     },
 
     setSaleManager() {
-      this.dialogVisibleSetSaleManager = true;
+      this.dialogVisibleSetSaleManager = true
     },
 
     update_sub_component() {
-      this.update_view = true;
-      let that = this;
+      this.update_view = true
+      const that = this
       setTimeout(() => {
-        that.update_view = false;
-      }, 100); // 1000 毫秒后执行
+        that.update_view = false
+      }, 100) // 1000 毫秒后执行
     },
 
     confirmSetManager() {
-
-      var param = { project_id: this.project_id, involve_manager: this.editProject.project_manager };
+      var param = { project_id: this.project_id, involve_manager: this.editProject.project_manager }
       console.log('---------------------------')
       console.log(param)
       project.UpdateProjectManager(param).then(response => {
         this.get_project_info(this.project_id)
-        this.$message({ type: 'success', message: '更新成功' });
-        this.dialogVisibleSetManager = false;
+        this.$message({ type: 'success', message: '更新成功' })
+        this.dialogVisibleSetManager = false
       })
     },
 
     confirmSaleManager() {
-
-      var param = { project_id: this.project_id, sale_manager: this.editProject.sale_manager };
+      var param = { project_id: this.project_id, sale_manager: this.editProject.sale_manager }
       console.log('---------------------------')
       console.log(param)
       project.UpdateProjectSaleManager(param).then(response => {
         this.get_project_info(this.project_id)
-        this.$message({ type: 'success', message: '更新成功' });
-        this.dialogVisibleSetSaleManager = false;
+        this.$message({ type: 'success', message: '更新成功' })
+        this.dialogVisibleSetSaleManager = false
       })
     },
 
     confirmAddMember() {
-      var param = { project_id: this.project_id, involve_members: this.editProject.project_members };
+      var param = { project_id: this.project_id, involve_members: this.editProject.project_members }
       project.UpdateProjectMember(param).then(response => {
         this.get_project_info(this.project_id)
         this.dialogVisibleAddMember = false
-        this.$message({ type: 'success', message: '更新成功' });
+        this.$message({ type: 'success', message: '更新成功' })
       })
-
     },
 
     confirmStartProject() {
-
       if (this.editNode.members.length == 0) {
-        this.$message.warning('请选择项目组成员');
-        return;
+        this.$message.warning('请选择项目组成员')
+        return
       }
 
-      if ('' == this.editNode.start_date) {
-        this.$message.warning('请选择项目启动时间');
-        return;
+      if (this.editNode.start_date == '') {
+        this.$message.warning('请选择项目启动时间')
+        return
       }
 
       var project_id = this.project_id
       var param = {
         project_id: project_id,
-        //manager: this.editNode.manager,
+        // manager: this.editNode.manager,
         members: this.editNode.members,
-        start_date: this.editNode.start_date,
-        //tech_protocol: this.editNode.tech_protocol_url,
+        start_date: this.editNode.start_date
+        // tech_protocol: this.editNode.tech_protocol_url,
 
-      };
+      }
 
-      console.log(param);
+      console.log(param)
       project.StartProject(param).then(response => {
         this.$message({
           type: 'success',
           message: '添加成功'
-        });
+        })
         this.get_project_info(this.project_id)
       }).catch(error => {
         this.$message({
           type: 'error',
           message: '添加失败，请重试'
-        });
-      });
-      this.dialogVisibleStartProject = false;
+        })
+      })
+      this.dialogVisibleStartProject = false
     },
 
     get_project_state_list() {
       project.GetProjectStateList().then(response => {
         this.project_state_list = response.data.data
-        console.log(this.project_state_list);
+        console.log(this.project_state_list)
       })
     },
 
     editProjectInfo() {
-      this.dialogVisibleEditProject = true;
-      this.get_project_info(this.project_id);
+      this.dialogVisibleEditProject = true
+      this.get_project_info(this.project_id)
     },
 
     get_project_info(project_id) {
       this.project_id = project_id
-      var param = { project_id: project_id };
+      var param = { project_id: project_id }
       project.GetProjectInfo(param).then(response => {
         this.project_info = response.data.data
 
-        //从项目管理进入
+        // 从项目管理进入
         if (this.edit_support == false) {
-          //如果登录用户是项目经理，则有编辑项目基本信息的权限
-          var login_user = localStorage.getItem('user_id');
+          // 如果登录用户是项目经理，则有编辑项目基本信息的权限
+          var login_user = localStorage.getItem('user_id')
           if (login_user == this.project_info.involve_manager) {
             this.edit_support = true
-            //不允许编辑项目经理
-            this.allow_change_manager = false;
+            // 不允许编辑项目经理
+            this.allow_change_manager = false
           }
-        }
-        else//从客户管理进入
+        } else// 从客户管理进入
         {
-          //允许编辑项目经理
-          this.allow_change_manager = true;
+          // 允许编辑项目经理
+          this.allow_change_manager = true
         }
 
         this.editProject = response.data.data
@@ -488,47 +596,47 @@ export default {
 
     showProtocol() {
       this.dialogVisibleShowProtocol = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showEquipment() {
       this.dialogVisibleShowEquipment = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showReport() {
       this.dialogVisibleShowReport = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showSupplier() {
       this.dialogVisibleShowSupplier = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showBid() {
       this.dialogVisibleShowBid = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showSummary() {
       this.dialogVisibleShowSummary = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showPlan() {
       this.dialogVisibleShowPlan = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showContract() {
       this.dialogVisibleShowContract = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     showExternalMember() {
       this.dialogVisibleShowExternalMember = true
-      this.update_sub_component();
+      this.update_sub_component()
     },
 
     // showProtocol() {
@@ -539,25 +647,24 @@ export default {
       var param = { project_id: this.project_id, contract_type: 2 }
       contract.GetProjectContractList(param).then(response => {
         this.contract_info_list = response.data.data
-        console.log(this.contract_info_list);
+        console.log(this.contract_info_list)
       })
     },
 
     update_sub_component() {
-      this.update_view = true;
-      let that = this;
+      this.update_view = true
+      const that = this
       setTimeout(() => {
-        that.update_view = false;
-      }, 100); // 1000 毫秒后执行
+        that.update_view = false
+      }, 100) // 1000 毫秒后执行
     },
 
-
     showImg(row) {
       const url = process.env.BASE_WMS_FILE + row.contract_url
-      const ext = url.split('.').pop().toLowerCase();
+      const ext = url.split('.').pop().toLowerCase()
 
-      console.log('-----------------------------------------');
-      console.log(url);
+      console.log('-----------------------------------------')
+      console.log(url)
 
       if (ext === 'jpg' || ext === 'jpeg' || ext === 'png') {
         this.previewUrl = url
@@ -570,16 +677,16 @@ export default {
       } else if (ext === '') {
 
       } else {
-        this.$message.success('不支持的文件类型');
+        this.$message.success('不支持的文件类型')
       }
       this.dialogVisibleShowFile = true
     },
     confirmEditProject() {
       if (this.editProject.project_name.trim() === '') {
-        this.$message.warning('请输入项目名称');
-        return;
+        this.$message.warning('请输入项目名称')
+        return
       }
-      var project_id = this.project_id;
+      var project_id = this.project_id
       var param = {
         project_id: project_id,
         project_name: this.editProject.project_name,
@@ -587,18 +694,18 @@ export default {
         project_number: this.editProject.project_number,
         project_state: this.editProject.project_state,
         create_time: this.editProject.create_time
-      };
+      }
 
-      console.log(param);
+      console.log(param)
 
       project.EditProjectInfo(param).then(response => {
         this.$message({
           type: 'success',
           message: '添加成功'
-        });
-        this.get_project_info(this.project_id);
-      });
-      this.dialogVisibleEditProject = false;
+        })
+        this.get_project_info(this.project_id)
+      })
+      this.dialogVisibleEditProject = false
     }
   }
 }
diff --git a/front/src/views/components/ProjectImplInfo.vue b/front/src/views/components/ProjectImplInfo.vue
index 81ad85f..0296750 100644
--- a/front/src/views/components/ProjectImplInfo.vue
+++ b/front/src/views/components/ProjectImplInfo.vue
@@ -38,7 +38,7 @@
     <el-dialog title="功能需求清单" :visible.sync="dialogVisibleShowDemand" :close-on-click-modal="false" width="95%"
       style="position: fixed;top:-10%" append-to-body>
       <div class="custom-dialog">
-        <Story :project_id="project_info.project_id" :story_type="1" v-if="update_view == false"/>
+        <Story :project_id="project_info.project_id" :is_project_manager=true :story_type="1" v-if="update_view == false"/>
       </div>
     </el-dialog>
 
@@ -118,7 +118,7 @@ export default {
         this.project_info = response.data.data
       })
     },
-    
+
     update_sub_component() {
       this.update_view = true;
       let that = this;
@@ -156,7 +156,7 @@ export default {
     //查看问题单
     showDemand() {
       this.dialogVisibleShowDemand = true
-      this.update_sub_component() 
+      this.update_sub_component()
     },
     //查看项目实施购买清单
     showPorShopping() {
diff --git a/front/src/views/components/Story.vue b/front/src/views/components/Story.vue
index d84dd60..baff609 100644
--- a/front/src/views/components/Story.vue
+++ b/front/src/views/components/Story.vue
@@ -50,7 +50,7 @@
                 <el-button class="el-icon-view" @click="showMaterials(scope.row)" size="mini" type="text">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="story_managers" label="Story管理者" align="left">
+            <el-table-column prop="story_manager" label="Story管理者" align="left">
             </el-table-column>
             <el-table-column prop="story_members" label="Story成员" align="left">
             </el-table-column>
diff --git a/front/src/views/customer-mgr/customerlist.vue b/front/src/views/customer-mgr/customerlist.vue
index f617202..af35cc9 100644
--- a/front/src/views/customer-mgr/customerlist.vue
+++ b/front/src/views/customer-mgr/customerlist.vue
@@ -62,7 +62,9 @@ export default {
 	data() {
 		let id = 1;
 		return {
-			supplier_type_list: [],
+      newPartner: {},
+      dialogVisibleAddPartner: false,
+      supplier_type_list: [],
       update_view:false,
 			defaultProps: {
 				children: 'sub_type',
@@ -88,6 +90,31 @@ export default {
 
 	},
 	methods: {
+    confirmAddPartner() {
+      // this.newPartner.company_type = this.partner_type
+      //如果是供应商,需要设置供应商的服务类型
+      if (this.partner_type == 4) {
+        this.newPartner.service_type = this.service_type
+      }
+      else {
+        this.newPartner.service_type = 0;
+      }
+
+      partner.AddPartnerCompanyInfo(this.newPartner).then(response => {
+        this.$message({
+          type: 'success',
+          message: '添加成功'
+        });
+        //this.get_supplier_type_list(supplier_type)
+      }).catch(error => {
+        this.$message({
+          type: 'error',
+          message: '添加失败，请重试'
+        });
+      });
+      // 关闭所有对话框
+      this.dialogVisibleAddPartner = false;
+    },
 
 		openTreeMenu(event, data, node, target) {
 			console.log(event, data, node, target)
@@ -129,7 +156,14 @@ export default {
           that.update_view = false;
       }, 100); // 1000 毫秒后执行
     },
-
+    addPartnerInfo() {
+      this.dialogVisibleAddPartner = true;
+      this.newPartner = {
+        company_name: '',
+        company_intro: '',
+        create_time: ''
+      }
+    },
 		handle_node_click(data, node) {
 			this.currentNode = node;
 			this.currentData = data;
diff --git a/front/src/views/hr-mgr/stafflist.vue b/front/src/views/hr-mgr/stafflist.vue
index bfb7e0a..69f7567 100644
--- a/front/src/views/hr-mgr/stafflist.vue
+++ b/front/src/views/hr-mgr/stafflist.vue
@@ -1,97 +1,118 @@
 <template>
-	<div class="about">
-		<el-row>
-			<el-table :data="staff_info_list" border fit highlight-current-row style="width: 100%; margin-left: 2px;"
-				height="80vh">
-				<el-table-column prop="staff_idcard" label="员工工号" align="left">
-				</el-table-column>
-				<el-table-column prop="staff_name" label="员工姓名" align="left">
-				</el-table-column>
-				<el-table-column prop="staff_phone" label="员工电话" align="left">
-				</el-table-column>
-				<el-table-column prop="staff_type_desp" label="员工类型" align="left">
-				</el-table-column>
-				<el-table-column prop="staff_dept_desp" label="员工部门" align="left">
-				</el-table-column>
-				<el-table-column prop="staff_email" label="员工邮箱" align="left">
-				</el-table-column>
-				<el-table-column prop="entry_date" label="入职时间" align="left">
-				</el-table-column>
+  <div class="about">
+    <el-card>
+      <el-main id="el-main">
+        <el-table
+          :data="staff_info_list"
+          border
+          fit
+          highlight-current-row
+          style="width: 100%; margin-left: 2px;"
+          height="80vh">
+          <el-table-column prop="staff_idcard" label="员工工号" align="left"/>
+          <el-table-column prop="staff_name" label="员工姓名" align="left"/>
+          <el-table-column prop="staff_phone" label="员工电话" align="left"/>
+          <el-table-column prop="staff_type_desp" label="员工类型" align="left"/>
+          <el-table-column prop="staff_dept_desp" label="员工部门" align="left"/>
+          <el-table-column prop="staff_email" label="员工邮箱" align="left"/>
+          <el-table-column prop="entry_date" label="入职时间" align="left"/>
 
-				<el-table-column fixed="right" label="操作" width="250px">
-					<template slot-scope="scope">
-						<el-button v-if="(scope.row.task_state < 2) && (scope.row.action_state < 4)"
-							@click="handleClick(scope.row)" size="mini" type="danger">删除</el-button>
-						<!--el-button class="el-icon-view" v-if="scope.row.asset_url != ''" @click="showImg(scope.row)" size="mini"
-							type="primary"></el-button-->
-						<!--el-button @click="update(scope.row)" size="mini" class="el-icon-edit" type="primary"></el-button-->
-					</template>
-				</el-table-column>
-			</el-table>
-		</el-row>
+          <el-table-column fixed="right" label="操作" width="250px">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="danger"
+                @click="handleClick(scope.row)">删除</el-button>
+              <el-button
+                class="el-icon-view"
+                size="mini"
+                type="primary"
+                @click="showImg(scope.row)"/>
+              <el-button size="mini" class="el-icon-edit" type="primary" @click="update(scope.row)"/>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-main>
+      <el-pagination
+        :page-sizes="[5, 10, 20, 50]"
+        :page-size="pageSize"
+        :total="total"
+        :current-page.sync="currPage"
+        background
+        layout="sizes,prev, pager, next,  jumper,->,total"
+        @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"/>
+    </el-card>
 
-		<!-- 对话框 -->
-		<el-dialog title="文件信息" :visible.sync="dialogVisibleStaffInfo" width="80%">
-			<img v-if="isImage" :src="previewUrl" alt="Preview" style="max-width: 40%; max-height: 30%;">
-			<iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"></iframe>
-			<p v-else>不支持的文件类型</p>
-		</el-dialog>
+    <!-- 对话框 -->
+    <el-dialog :visible.sync="dialogVisibleStaffInfo" title="文件信息" width="80%">
+      <img v-if="isImage" :src="previewUrl" alt="Preview" style="max-width: 40%; max-height: 30%;">
+      <iframe v-else-if="isPDF" :src="previewUrl" frameborder="0" style="width: 100%; height: 600px;"/>
+      <p v-else>不支持的文件类型</p>
+    </el-dialog>
 
-	</div>
+  </div>
 </template>
 
 <script>
 import hr from '@/api/hr'
 
 export default {
-	data() {
-		let id = 1;
-		return {
-			staff_info_list: [],
-			id: id,
-			dialogVisibleStaffInfo: false,
-			assets_img: '',
-			assets_pdf_img: ''
-		};
-	},
-	mounted() {
-		this.get_staff_info_list()
-	},
-	created() {
+  data() {
+    const id = 1
+    return {
+      pageSize: 20,
+      currPage: 1,
+      total: 0,
+      staff_info_list: [],
+      id: id,
+      dialogVisibleStaffInfo: false,
+      assets_img: '',
+      assets_pdf_img: ''
+    }
+  },
+  mounted() {
+    this.getStaffPageInfo()
+  },
+  created() {
 
-	},
-	methods: {
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.getStaffPageInfo()
+    },
+    handleCurrentChange(val) {
+      this.currPage = val
+      this.getStaffPageInfo()
+    },
+    showImg(row) {
+      const url = row.asset_url
+      const ext = url.split('.').pop().toLowerCase()
 
-		showImg(row) {
-			const url = row.asset_url
-			const ext = url.split('.').pop().toLowerCase();
+      if (ext === 'jpg' || ext === 'jpeg' || ext === 'png') {
+        this.previewUrl = url
+        this.isImage = true
+        this.isPDF = false
+      } else if (ext === 'pdf') {
+        this.previewUrl = url
+        this.isImage = false
+        this.isPDF = true
+      } else if (ext === '') {
 
-			if (ext === 'jpg' || ext === 'jpeg' || ext === 'png') {
-				this.previewUrl = url
-				this.isImage = true
-				this.isPDF = false
-			} else if (ext === 'pdf') {
-				this.previewUrl = url
-				this.isImage = false
-				this.isPDF = true
-			} else if (ext === '') {
+      } else {
+        this.$message.success('不支持的文件类型')
+      }
+      this.dialogVisibleStaffInfo = true
+    },
 
-			} else {
-				this.$message.success('不支持的文件类型');
-			}
-			this.dialogVisibleStaffInfo = true
-		},
-
-		get_staff_info_list() {
-			var param = {}
-
-			console.log(param);
-			hr.GetStaffInfoList(param).then(response => {
-				this.staff_info_list = response.data.data
-				console.log(this.staff_info_list);
-			})
-		},
-	}
+    getStaffPageInfo() {
+      hr.getStaffPage({ currPage: this.currPage, pageSize: this.pageSize }).then(res => {
+        this.staff_info_list = res.data.data.list
+        this.total = res.data.data.total
+      })
+    }
+  }
 }
 </script>
 
diff --git a/front/src/views/login/index.vue b/front/src/views/login/index.vue
index 4397dc2..d05a862 100644
--- a/front/src/views/login/index.vue
+++ b/front/src/views/login/index.vue
@@ -4,7 +4,7 @@
       <img :src="imgTitle" height="100px" alt="" />
     </div>
     <div class="background" style="margin-bottom:110px;margin-top:110px;background-color:#2d3a4b;">
-      <img :src="imgBack" width="70%" height="80%" alt="" />
+      <img :src="imgBack" width="100%" height="100%" alt="" />
     </div>
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
       label-position="left" style="float:right">
diff --git a/front/src/views/system-mgr/userList.vue b/front/src/views/system-mgr/userList.vue
index 508bcf7..a79d3c4 100644
--- a/front/src/views/system-mgr/userList.vue
+++ b/front/src/views/system-mgr/userList.vue
@@ -49,8 +49,11 @@
         </el-form-item>
 
         <el-form-item label="选择添加用户" prop="user_id">
-          <el-select v-model="userData.user_id" placeholder="请选择" style="width: 100%;">
-            <el-option v-for="item in contactsList" :key="item.contacts_id" :label="item.contacts_name"
+          <el-select v-model="userData.user_id" filterable placeholder="请选择" style="width: 100%;">
+            <el-option v-for="item in contactsList"
+                       filterable
+                       :key="item.contacts_id"
+                       :label="item.contacts_name"
               :value="item.contacts_id">
             </el-option>
           </el-select>
@@ -230,7 +233,7 @@ export default {
     },
     //获取用户信息
     getUserInfoList() {
-      user.getUserInfoList({ currPage: this.currPage, pageSize: this.pageSize, }).then(res => {
+      user.getUserInfoList({ currPage: this.currPage, pageSize: this.pageSize}).then(res => {
         this.userList = res.data.data.list;
         console.log('userList', this.userList);
         this.total = res.data.data.total;