diff --git a/src/components/contract/contractDetail.vue b/src/components/contract/contractDetail.vue
index c7e2932..7587524 100644
--- a/src/components/contract/contractDetail.vue
+++ b/src/components/contract/contractDetail.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24">
         <el-breadcrumb separator="/">
-          <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+          <!-- <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item> -->
           <el-breadcrumb-item :to="{ path: '/contract' }"
             >合同管理</el-breadcrumb-item
           >
@@ -95,70 +95,37 @@
           >
             <el-table-column type="selection" width="55"> </el-table-column>
             <el-table-column type="index" width="50"> </el-table-column>
-            <el-table-column label="设备名称" width="200">
-              <template slot-scope="scope">
-                <el-input
-                  :disabled="readonly"
-                  v-model="scope.row.name"
-                ></el-input>
-              </template>
+            <el-table-column label="设备名称" prop="name" width="200">
             </el-table-column>
-            <el-table-column label="科室">
-              <template slot-scope="scope">
-                <el-input
-                  :disabled="readonly"
-                  v-model="scope.row.ks"
-                ></el-input>
-              </template>
+            <el-table-column label="生产厂家" prop="sccj" width="200">
             </el-table-column>
-            <el-table-column label="型号" width="200">
-              <template slot-scope="scope">
-                <el-input
-                  :disabled="readonly"
-                  v-model="scope.row.xh"
-                ></el-input>
-              </template>
+            <el-table-column label="科室" prop="ks">
             </el-table-column>
-            <el-table-column label="生产厂家" width="200">
-              <template slot-scope="scope">
-                <el-input
-                  :disabled="readonly"
-                  v-model="scope.row.sccj"
-                ></el-input>
-              </template>
+            <el-table-column label="通用名称" prop="name" width="200">
             </el-table-column>
-            <el-table-column label="数量">
-              <template slot-scope="scope">
-                <el-input
-                  :disabled="readonly"
-                  v-model="scope.row.sl"
-                ></el-input>
-              </template>
+            <el-table-column label="设备分类" prop="sbfl">
             </el-table-column>
-            <el-table-column label="单价(万元)">
-              <template slot-scope="scope">
-                <el-input
-                  :disabled="readonly"
-                  v-model="scope.row.dj"
-                ></el-input>
-              </template>
+            <el-table-column label="数量" prop="sl">
             </el-table-column>
-            <el-table-column label="总价(万元)">
-              <template slot-scope="scope">
-                <el-input
-                  :disabled="readonly"
-                  v-model="scope.row.zj"
-                ></el-input>
-              </template>
+            <el-table-column label="单位" prop="dw">
             </el-table-column>
-            <el-table-column label="备注" width="180">
-              <template slot-scope="scope">
-                <el-input
-                  type="textarea"
-                  :disabled="readonly"
-                  v-model="scope.row.bz"
-                ></el-input>
-              </template>
+            <el-table-column label="计划年度" prop="nd">
+            </el-table-column>
+            <el-table-column label="采购权限" prop="cgqx">
+            </el-table-column>
+            <el-table-column label="预算单价(万元)" prop="ysdj">
+            </el-table-column>
+            <el-table-column label="预算总价(万元)" prop="yszj">
+            </el-table-column>
+            <el-table-column label="成交单价(万元)" prop="cjdj">
+            </el-table-column>
+            <el-table-column label="成交总价(万元)" prop="cjzj">
+            </el-table-column>
+            <el-table-column label="质保期（年）" prop="zbq">
+            </el-table-column>
+            <el-table-column label="经费来源" prop="ysdj">
+            </el-table-column>
+            <el-table-column label="备注" width="180" prop="bz">
             </el-table-column>
             <el-table-column label="操作">
               <template slot-scope="scope">
@@ -172,6 +139,98 @@
               </template>
             </el-table-column>
           </el-table>
+          <el-dialog
+            title="新增"
+            :visible.sync="diviceDialogVisible"
+            width="60%"
+            :before-close="handleClose"
+          >
+            <el-form
+              :inline="true"
+              size="small"
+              label-width="120px"
+              label-position="right"
+              :model="diveceformInline"
+              class="demo-form-inline"
+            >
+              <el-form-item label="设备名称">
+                <el-input
+                  v-model="diveceformInline.sbmc"
+                  placeholder="设备名称"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="科室">
+                <el-input v-model="diveceformInline.ks" placeholder="科室"></el-input>
+              </el-form-item>
+              <el-form-item label="通用名称">
+                <el-input
+                  v-model="diveceformInline.ttmc"
+                  placeholder="通用名称"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="设备分类">
+                <el-select v-model="diveceformInline.sbfl" placeholder="设备分类">
+                  <el-option label="分类一" value="1"></el-option>
+                  <el-option label="分类二" value="2"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="数量">
+                <el-input v-model="diveceformInline.sl" placeholder="数量"></el-input>
+              </el-form-item>
+              <el-form-item label="单位">
+                <el-input v-model="diveceformInline.dw" placeholder="单位"></el-input>
+              </el-form-item>
+              <el-form-item label="计划年度">
+                <el-select v-model="diveceformInline.sbfl" placeholder="计划年度">
+                  <el-option label="2019" value="1"></el-option>
+                  <el-option label="2020" value="2"></el-option>
+                  <el-option label="2021" value="3"></el-option>
+                  <el-option label="2022" value="4"></el-option>
+                  <el-option label="2023" value="5"></el-option>
+                  <el-option label="2024" value="6"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="采购权限">
+                <el-select v-model="diveceformInline.sbfl" placeholder="采购权限">
+                  <el-option label="上级下发" value="1"></el-option>
+                  <el-option label="医院自采" value="2"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="预算单价(万元)">
+                <el-input placeholder="100"></el-input>
+              </el-form-item>
+              <el-form-item label="预算总价(万元)">
+                <el-input placeholder="100"></el-input>
+              </el-form-item>
+              <el-form-item label="成交单价(万元)">
+                <el-input placeholder="80"></el-input>
+              </el-form-item>
+              <el-form-item label="成交总价(万元)">
+                <el-input placeholder="80"></el-input>
+              </el-form-item>
+              <el-form-item label="质保期(年)">
+                <el-input placeholder="2"></el-input>
+              </el-form-item>
+              <el-form-item label="经费来源">
+                <el-input placeholder="折旧基金"></el-input>
+              </el-form-item>
+              <el-form-item label="是否有配套专用耗材" label-width="140px">
+                <el-select v-model="diveceformInline.sbfl" placeholder="有">
+                  <el-option label="有" value="1"></el-option>
+                  <el-option label="没有" value="2"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="备注">
+                <el-input type="textarea"></el-input>
+              </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+              <el-button @click="diviceDialogVisible = false">取 消</el-button>
+              <el-button type="primary" @click="diviceDialogVisible = false"
+                >确 定</el-button
+              >
+            </span>
+          </el-dialog>
         </div>
       </el-card>
       <el-card class="box-card" shadow="always">
@@ -360,7 +419,8 @@ export default {
       formInline: {
         user: "",
         region: "",
-      },
+      },//基本信息对象
+      diveceformInline:{},//新增设备对象
       readonly: true,
       htqd: cddata.htqd,
       timestamps1: [
@@ -394,25 +454,28 @@ export default {
           xh: "inslight iS3",
           sccj: "深圳因赛斯医疗科技有限公司",
           sl: "1",
-          dj: "7.85",
-          zj: "7.85",
+          cjdj: "7.85",
+          cjzj: "7.85",
+          ysdj: "8.00",
+          yszj: "8.00",
           bz: "2022年度计划",
         },
       ],
       multipleSelection: [],
+      diviceDialogVisible: false, //添加设备
     };
   },
   methods: {
     //汇总设备总价
-    getSummaries(){
-        const sums = [];
-        sums[7] = '总价(万元)';
-        var price = 0
-        this.tableData.forEach((item) => {
-          price +=  parseFloat(item.zj)
-         });
-        sums[8] = price;
-        return sums;
+    getSummaries() {
+      const sums = [];
+      sums[13] = "总价(万元)";
+      var price = 0;
+      this.tableData.forEach((item) => {
+        price += parseFloat(item.cjzj);
+      });
+      sums[14] = price;
+      return sums;
     },
     //删除设备
     handleDelete(index) {
@@ -421,17 +484,19 @@ export default {
     },
     //新增设备
     onAddDevice() {
-      var obj = {
-        name: "",
-        ks: "",
-        xh: "",
-        sccj: "",
-        sl: "",
-        dj: "0",
-        zj: "0",
-        bz: "",
-      };
-      this.tableData.push(obj);
+      //显示弹框
+      this.diviceDialogVisible = true;
+      // var obj = {
+      //   name: "",
+      //   ks: "",
+      //   xh: "",
+      //   sccj: "",
+      //   sl: "",
+      //   dj: "0",
+      //   zj: "0",
+      //   bz: "",
+      // };
+      // this.tableData.push(obj);
     },
     onSubmit() {
       console.log("submit!");
diff --git a/src/components/contract/contractList.vue b/src/components/contract/contractList.vue
index 3889db2..c16f11b 100644
--- a/src/components/contract/contractList.vue
+++ b/src/components/contract/contractList.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="box">
-    <el-row>
+    <!-- <el-row>
       <el-col :span="24">
         <el-breadcrumb separator="/">
           <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
           <el-breadcrumb-item>合同管理</el-breadcrumb-item>
         </el-breadcrumb>
       </el-col>
-    </el-row>
+    </el-row> -->
     <div class="container">
       <el-row>
         <el-form
diff --git a/src/components/device/deviceDetial.vue b/src/components/device/deviceDetial.vue
index afab7ea..fb64b55 100644
--- a/src/components/device/deviceDetial.vue
+++ b/src/components/device/deviceDetial.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24">
         <el-breadcrumb separator="/">
-          <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+          <!-- <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item> -->
           <el-breadcrumb-item :to="{ path: '/device' }"
             >设备管理</el-breadcrumb-item
           >
@@ -212,15 +212,6 @@
                   v-model="cg.xqgs"
                 ></el-date-picker>
               </el-form-item>
-              <el-form-item label="第一次招标">
-                <el-input v-model="cg.zb1" placeholder="第一次招标"></el-input>
-              </el-form-item>
-              <el-form-item label="第二次招标">
-                <el-input v-model="cg.zb2" placeholder="第二次招标"></el-input>
-              </el-form-item>
-              <el-form-item label="第三次招标">
-                <el-input v-model="cg.zb3" placeholder="第三次招标"></el-input>
-              </el-form-item>
               <el-form-item label="退回">
                 <el-input v-model="cg.th" placeholder="退回"></el-input>
               </el-form-item>
@@ -235,6 +226,38 @@
                 <el-input type="textarea" v-model="cg.remark"></el-input>
               </el-form-item>
             </el-form>
+            <el-timeline>
+              <el-timeline-item
+                v-for="(item, index) in cg2"
+                :key="timestamps2[index]"
+                :timestamp="timestamps2[index]"
+                placement="top"
+              >
+                <el-card>
+                  <el-form
+                    :disabled="readonly"
+                    :inline="true"
+                    size="small"
+                    :model="item"
+                    class="demo-form-inline"
+                  >
+                    <el-form-item label="招标进展">
+                      <el-select v-model="item.process" placeholder="进展">
+                        <el-option label="未开始" value="01"></el-option>
+                        <el-option label="进行中" value="02"></el-option>
+                        <el-option label="已完成" value="03"></el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="备注">
+                      <el-input
+                        type="textarea"
+                        v-model="item.remark"
+                      ></el-input>
+                    </el-form-item>
+                  </el-form>
+                </el-card>
+              </el-timeline-item>
+            </el-timeline>
           </el-collapse-item>
           <el-collapse-item title="合同签订" name="3">
             <template slot="title">
@@ -421,6 +444,7 @@ export default {
       readonly: true,
       xqbb: dddData.xqbb,
       htqd: dddData.htqd,
+      cg2: dddData.cg2,
       timestamps1: [
         "组织需求形式审查 2018/4/12 20:46",
         "业务行政会议审议 2018/4/3",
@@ -430,6 +454,12 @@ export default {
         "采购需求编报 2018/4/2",
         "质疑答复流标复核 2018/4/2",
       ],
+      timestamps2: [
+        "第一次招标 2018/4/12 20:46",
+        "第二次招标 2019/4/3",
+        "第三次招标 2020/4/2",
+        "第四次招标 2021/4/2",
+      ],
       timestamps3: [
         "采购交接 2018/4/12 20:46",
         "医工科审核 2018/4/3",
diff --git a/src/components/device/deviceList.vue b/src/components/device/deviceList.vue
index 2861705..577e157 100644
--- a/src/components/device/deviceList.vue
+++ b/src/components/device/deviceList.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="box">
-    <el-row>
+    <!-- <el-row>
       <el-col :span="24">
         <el-breadcrumb separator="/">
           <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
           <el-breadcrumb-item>设备管理</el-breadcrumb-item>
         </el-breadcrumb>
       </el-col>
-    </el-row>
+    </el-row> -->
     <div class="container">
       <el-row>
         <el-form
diff --git a/src/data/deviceDataDetail.js b/src/data/deviceDataDetail.js
index d2a473f..44c4226 100644
--- a/src/data/deviceDataDetail.js
+++ b/src/data/deviceDataDetail.js
@@ -53,13 +53,31 @@ const xqbb = [
 //采购状态
 const cg = {
     xqgs: "", //需求公示
-    zb1: "", //第一次招标
-    zb2: "", //第二次招标
-    zb3: "", //第三次招标
     th: "", //退回
     cgzt: "", //采购状态
     bz: "", //备注
 }
+
+//采购状态 时间轴列表数据
+const cg2 = [{
+    process: "", //第一次招标结果
+    remark: "",//备注1
+},
+{
+    process: "", //第二次招标结果
+    remark: "",//备注2
+},
+{
+    process: "", //第三次招标结果
+    remark: "",//备注3
+},
+{
+    process: "", //第四次招标结果
+    remark: "",//备注4
+},
+]
+
+
 //合同签订
 const htqd = [
     {
@@ -145,6 +163,6 @@ const zbj = {
     bz: "", //备注
 }
 
-const dddata = { xqbb: xqbb, htqd: htqd, cg: cg, sbys: sbys,fk:fk ,zbj:zbj}
+const dddata = { xqbb: xqbb, htqd: htqd, cg: cg, sbys: sbys, fk: fk, zbj: zbj,cg2:cg2 }
 
 export default dddata
\ No newline at end of file